955efd65f1 · 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: 2016-03-16 00:16+0800\n"

77 -"PO-Revision-Date: 2016-03-14 20:26+0100\n"

76 +"POT-Creation-Date: 2016-05-24 23:42+0800\n"

77 +"PO-Revision-Date: 2016-05-26 22:46+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"

@@ -96,7 +96,7 @@ msgstr ""

96 "Corrigez-les puis lancez 'git add/rm <fichier>'\n"

97 "si nécessaire pour marquer la résolution et valider."

98

99 -#: advice.c:101 builtin/merge.c:1226

99 +#: advice.c:101 builtin/merge.c:1238

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

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

102

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

140 msgid "archive format"

141 msgstr "format d'archive"

142

143 -#: archive.c:430 builtin/log.c:1232

143 +#: archive.c:430 builtin/log.c:1395

144 msgid "prefix"

145 msgstr "préfixe"

146

@@ -148,9 +148,9 @@ msgstr "préfixe"

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

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

150

151 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 builtin/blame.c:2548

151 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549

152 #: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989

153 -#: builtin/grep.c:720 builtin/hash-object.c:100 builtin/ls-files.c:459

153 +#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459

154 #: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561

155 #: builtin/read-tree.c:109 parse-options.h:153

156 msgid "file"

@@ -184,7 +184,8 @@ msgstr "compression efficace"

184 msgid "list supported archive formats"

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

186

187 -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78

187 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82

188 +#: builtin/submodule--helper.c:776

189 msgid "repo"

190 msgstr "dépôt"

191

@@ -343,11 +344,16 @@ msgstr "Nom d'objet ambigu : '%s'."

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

345 msgstr "Point d'embranchement invalide : '%s'."

346

346 -#: branch.c:344

347 +#: branch.c:345

348 #, c-format

349 msgid "'%s' is already checked out at '%s'"

350 msgstr "'%s' est déjà extrait dans '%s'"

351

352 +#: branch.c:364

353 +#, c-format

354 +msgid "HEAD of working tree %s is not updated"

355 +msgstr "la HEAD de la copie de travail %s n'est pas mise à jour"

356 +

357 #: bundle.c:34

358 #, c-format

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

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

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

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

366

361 -#: bundle.c:87 builtin/commit.c:766

367 +#: bundle.c:87 builtin/commit.c:777

368 #, c-format

369 msgid "could not open '%s'"

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

@@ -367,10 +373,10 @@ msgstr "impossible d'ouvrir '%s'"

373 msgid "Repository lacks these prerequisite commits:"

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

375

370 -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074

371 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334

372 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358

373 -#: builtin/shortlog.c:170

376 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073

377 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340

378 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875

379 +#: builtin/merge.c:361 builtin/shortlog.c:170

380 msgid "revision walk setup failed"

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

382

@@ -409,21 +415,21 @@ msgstr "rev-list a disparu"

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

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

417

412 -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273

418 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273

419 #, c-format

420 msgid "unrecognized argument: %s"

421 msgstr "argument non reconnu : %s"

422

417 -#: bundle.c:449

423 +#: bundle.c:451

424 msgid "Refusing to create empty bundle."

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

426

421 -#: bundle.c:459

427 +#: bundle.c:463

428 #, c-format

429 msgid "cannot create '%s'"

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

431

426 -#: bundle.c:480

432 +#: bundle.c:491

433 msgid "index-pack died"

434 msgstr "l'index de groupe a disparu"

435

@@ -432,8 +438,8 @@ msgstr "l'index de groupe a disparu"

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

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

440

435 -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505

436 -#: builtin/am.c:2135

441 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504

442 +#: builtin/am.c:2134

443 #, c-format

444 msgid "could not parse %s"

445 msgstr "impossible d'analyser %s"

@@ -468,21 +474,21 @@ msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"

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

475 msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"

476

471 -#: config.c:758 config.c:769

477 +#: config.c:761 config.c:772

478 #, c-format

479 msgid "bad zlib compression level %d"

480 msgstr "niveau de compression zlib incorrect %d"

481

476 -#: config.c:891

482 +#: config.c:890

483 #, c-format

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

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

486

481 -#: config.c:1220

487 +#: config.c:1228

488 msgid "unable to parse command-line config"

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

490

485 -#: config.c:1281

491 +#: config.c:1284

492 msgid "unknown error occured while reading the configuration files"

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

494

@@ -503,24 +509,27 @@ msgstr ""

509 msgid "%s has multiple values"

510 msgstr "%s a des valeurs multiples"

511

512 +#: config.c:2224

513 +#, c-format

514 +msgid "could not set '%s' to '%s'"

515 +msgstr "impossible de régler '%s' à '%s'"

516 +

517 #: config.c:2226

518 #, c-format

508 -msgid "Could not set '%s' to '%s'"

509 -msgstr "Impossible de régler '%s' à '%s'"

519 +msgid "could not unset '%s'"

520 +msgstr "impossible de désinitialiser '%s'"

521

522 #: connected.c:69

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

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

525

526 #: connected.c:89

516 -#, c-format

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

518 -msgstr "impossible d'écrire dans la rev-list : %s"

527 +msgid "failed write to rev-list"

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

529

520 -#: connected.c:97

521 -#, c-format

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

523 -msgstr "impossible de fermer l'entrée standard du rev-list : %s"

530 +#: connected.c:96

531 +msgid "failed to close rev-list's stdin"

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

533

534 #: date.c:95

535 msgid "in the future"

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

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

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

606

598 -#: diffcore-rename.c:536

607 +#: diffcore-rename.c:538

608 msgid "Performing inexact rename detection"

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

610

602 -#: diff.c:115

611 +#: diff.c:116

612 #, c-format

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

614 msgstr ""

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

616

608 -#: diff.c:120

617 +#: diff.c:121

618 #, c-format

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

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

621

613 -#: diff.c:215

622 +#: diff.c:225

623 #, c-format

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

625 msgstr ""

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

627

619 -#: diff.c:267

628 +#: diff.c:277

629 #, c-format

630 msgid ""

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

@@ -625,16 +634,16 @@ msgstr ""

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

635 "%s"

636

628 -#: diff.c:2997

637 +#: diff.c:3007

638 #, c-format

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

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

641

633 -#: diff.c:3393

642 +#: diff.c:3405

643 msgid "--follow requires exactly one pathspec"

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

645

637 -#: diff.c:3556

646 +#: diff.c:3568

647 #, c-format

648 msgid ""

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

@@ -643,20 +652,20 @@ msgstr ""

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

653 "%s"

654

646 -#: diff.c:3570

655 +#: diff.c:3582

656 #, c-format

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

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

659

651 -#: dir.c:2004

660 +#: dir.c:1823

661 msgid "failed to get kernel name and information"

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

663

655 -#: dir.c:2123

664 +#: dir.c:1942

665 msgid "Untracked cache is disabled on this system or location."

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

667

659 -#: gpg-interface.c:166 gpg-interface.c:237

668 +#: gpg-interface.c:166 gpg-interface.c:235

669 msgid "could not run gpg."

670 msgstr "impossible de lancer gpg."

671

@@ -670,28 +679,28 @@ msgstr "gpg n'a pas pu signer les données"

679

680 #: gpg-interface.c:222

681 #, c-format

673 -msgid "could not create temporary file '%s': %s"

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

682 +msgid "could not create temporary file '%s'"

683 +msgstr "impossible de créer un fichier temporaire '%s'"

684

676 -#: gpg-interface.c:225

685 +#: gpg-interface.c:224

686 #, c-format

678 -msgid "failed writing detached signature to '%s': %s"

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

687 +msgid "failed writing detached signature to '%s'"

688 +msgstr "impossible d'écrire la signature détachée dans '%s'"

689

690 #: grep.c:1718

691 #, c-format

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

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

694

686 -#: grep.c:1735

695 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155

696 #, c-format

688 -msgid "'%s': %s"

689 -msgstr "'%s' : %s"

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

698 +msgstr "échec du stat de '%s'"

699

700 #: grep.c:1746

701 #, c-format

693 -msgid "'%s': short read %s"

694 -msgstr "'%s' : lecture tronquée %s"

702 +msgid "'%s': short read"

703 +msgstr "'%s' : lecture tronquée"

704

705 #: help.c:205

706 #, c-format

@@ -758,12 +767,36 @@ msgstr[1] ""

767 msgid "%s: %s - %s"

768 msgstr "%s: %s - %s"

769

770 +#: lockfile.c:152

771 +#, c-format

772 +msgid ""

773 +"Unable to create '%s.lock': %s.\n"

774 +"\n"

775 +"Another git process seems to be running in this repository, e.g.\n"

776 +"an editor opened by 'git commit'. Please make sure all processes\n"

777 +"are terminated then try again. If it still fails, a git process\n"

778 +"may have crashed in this repository earlier:\n"

779 +"remove the file manually to continue."

780 +msgstr ""

781 +"Impossible de créer '%s.lock' : %s.\n"

782 +"\n"

783 +"Il semble qu'un autre processus git est déjà lancé dans ce dépôt,\n"

784 +"par exemple un éditeur ouvert par 'git commit'. Veuillez vous assurer\n"

785 +"que tous les processus sont terminés et réessayez. Si l'echec persiste,\n"

786 +"un processus git peut avoir planté :\n"

787 +"supprimez le fichier manuellement pour poursuivre."

788 +

789 +#: lockfile.c:160

790 +#, c-format

791 +msgid "Unable to create '%s.lock': %s"

792 +msgstr "Impossible de créer '%s.lock' : %s"

793 +

794 #: merge.c:41

795 msgid "failed to read the cache"

796 msgstr "impossible de lire le cache"

797

765 -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376

766 -#: builtin/checkout.c:587 builtin/clone.c:730

798 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375

799 +#: builtin/checkout.c:586 builtin/clone.c:732

800 msgid "unable to write new index file"

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

802

@@ -810,7 +843,7 @@ msgstr "impossible de lire l'objet %s '%s'"

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

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

845

813 -#: merge-recursive.c:790 builtin/clone.c:374

846 +#: merge-recursive.c:790 builtin/clone.c:376

847 #, c-format

848 msgid "failed to open '%s'"

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

@@ -946,7 +979,7 @@ msgstr "%s sauté (fusion identique à l'existant)"

979 msgid "Auto-merging %s"

980 msgstr "Fusion automatique de %s"

981

949 -#: merge-recursive.c:1650 git-submodule.sh:1048

982 +#: merge-recursive.c:1650 git-submodule.sh:941

983 msgid "submodule"

984 msgstr "sous-module"

985

@@ -974,50 +1007,50 @@ msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

1007 msgstr ""

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

1009

977 -#: merge-recursive.c:1783

1010 +#: merge-recursive.c:1781

1011 #, c-format

1012 msgid "Adding %s"

1013 msgstr "Ajout de %s"

1014

982 -#: merge-recursive.c:1800

1015 +#: merge-recursive.c:1798

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

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

1018

986 -#: merge-recursive.c:1819

1019 +#: merge-recursive.c:1817

1020 msgid "Already up-to-date!"

1021 msgstr "Déjà à jour !"

1022

990 -#: merge-recursive.c:1828

1023 +#: merge-recursive.c:1826

1024 #, c-format

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

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

1027

995 -#: merge-recursive.c:1858

1028 +#: merge-recursive.c:1856

1029 #, c-format

1030 msgid "Unprocessed path??? %s"

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

1032

1000 -#: merge-recursive.c:1906

1033 +#: merge-recursive.c:1904

1034 msgid "Merging:"

1035 msgstr "Fusion :"

1036

1004 -#: merge-recursive.c:1919

1037 +#: merge-recursive.c:1917

1038 #, c-format

1039 msgid "found %u common ancestor:"

1040 msgid_plural "found %u common ancestors:"

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

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

1043

1011 -#: merge-recursive.c:1956

1044 +#: merge-recursive.c:1954

1045 msgid "merge returned no commit"

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

1047

1015 -#: merge-recursive.c:2013

1048 +#: merge-recursive.c:2011

1049 #, c-format

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

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

1052

1020 -#: merge-recursive.c:2024 builtin/merge.c:646

1053 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831

1054 msgid "Unable to write index."

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

1056

@@ -1047,28 +1080,28 @@ msgstr "Mauvaise valeur de %s : '%s'"

1080 msgid "unable to parse object: %s"

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

1082

1050 -#: parse-options.c:570

1083 +#: parse-options.c:572

1084 msgid "..."

1085 msgstr "..."

1086

1054 -#: parse-options.c:588

1087 +#: parse-options.c:590

1088 #, c-format

1089 msgid "usage: %s"

1090 msgstr "usage : %s"

1091

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

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

1061 -#: parse-options.c:592

1094 +#: parse-options.c:594

1095 #, c-format

1096 msgid " or: %s"

1097 msgstr " ou : %s"

1098

1066 -#: parse-options.c:595

1099 +#: parse-options.c:597

1100 #, c-format

1101 msgid " %s"

1102 msgstr " %s"

1103

1071 -#: parse-options.c:629

1104 +#: parse-options.c:631

1105 msgid "-NUM"

1106 msgstr "-NUM"

1107

@@ -1077,7 +1110,7 @@ msgstr "-NUM"

1110 msgid "malformed object name '%s'"

1111 msgstr "nom d'objet malformé '%s'"

1112

1080 -#: path.c:752

1113 +#: path.c:796

1114 #, c-format

1115 msgid "Could not make %s writable by group"

1116 msgstr "Impossible de rendre %s inscriptible pour le groupe"

@@ -1150,7 +1183,7 @@ msgstr ""

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

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

1185

1153 -#: pretty.c:969

1186 +#: pretty.c:971

1187 msgid "unable to parse --pretty format"

1188 msgstr "impossible d'analyser le format --pretty"

1189

@@ -1176,23 +1209,23 @@ msgstr ""

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

1210 "Utilisation de la version %i"

1211

1179 -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974

1180 -#: builtin/merge.c:984

1212 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985

1213 +#: builtin/merge.c:995

1214 #, c-format

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

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

1217

1185 -#: refs/files-backend.c:2374

1218 +#: refs/files-backend.c:2243

1219 #, c-format

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

1221 msgstr "Impossible de supprimer la référence %s : %s"

1222

1190 -#: refs/files-backend.c:2377

1223 +#: refs/files-backend.c:2246

1224 #, c-format

1225 msgid "could not delete references: %s"

1226 msgstr "impossible de supprimer les références : %s"

1227

1195 -#: refs/files-backend.c:2386

1228 +#: refs/files-backend.c:2255

1229 #, c-format

1230 msgid "could not remove reference %s"

1231 msgstr "impossible de supprimer la référence %s"

@@ -1331,96 +1364,96 @@ msgstr "format: atome %%(end) manquant"

1364 msgid "malformed object name %s"

1365 msgstr "nom d'objet malformé %s"

1366

1334 -#: remote.c:745

1367 +#: remote.c:746

1368 #, c-format

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

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

1371

1339 -#: remote.c:749

1372 +#: remote.c:750

1373 #, c-format

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

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

1376

1344 -#: remote.c:753

1377 +#: remote.c:754

1378 #, c-format

1379 msgid "%s tracks both %s and %s"

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

1381

1349 -#: remote.c:761

1382 +#: remote.c:762

1383 msgid "Internal error"

1384 msgstr "Erreur interne"

1385

1353 -#: remote.c:1677 remote.c:1720

1386 +#: remote.c:1678 remote.c:1721

1387 msgid "HEAD does not point to a branch"

1388 msgstr "HEAD ne pointe pas sur une branche"

1389

1357 -#: remote.c:1686

1390 +#: remote.c:1687

1391 #, c-format

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

1393 msgstr "pas de branche '%s'"

1394

1362 -#: remote.c:1689

1395 +#: remote.c:1690

1396 #, c-format

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

1398 msgstr "aucune branche amont configurée pour la branche '%s'"

1399

1367 -#: remote.c:1695

1400 +#: remote.c:1696

1401 #, c-format

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

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

1404

1372 -#: remote.c:1710

1405 +#: remote.c:1711

1406 #, c-format

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

1408 msgstr ""

1409 "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "

1410 "branche locale de suivi"

1411

1379 -#: remote.c:1725

1412 +#: remote.c:1726

1413 #, c-format

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

1415 msgstr "la branche '%s' n'a aucune branche distante de poussée"

1416

1384 -#: remote.c:1736

1417 +#: remote.c:1737

1418 #, c-format

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

1420 msgstr "les références de spec pour '%s' n'incluent pas '%s'"

1421

1389 -#: remote.c:1749

1422 +#: remote.c:1750

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

1424 msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"

1425

1393 -#: remote.c:1771

1426 +#: remote.c:1772

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

1428 msgstr ""

1429 "impossible de résoudre une poussée 'simple' pour une destination unique"

1430

1398 -#: remote.c:2073

1431 +#: remote.c:2074

1432 #, c-format

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

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

1435

1403 -#: remote.c:2077

1436 +#: remote.c:2078

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

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

1439

1407 -#: remote.c:2080

1440 +#: remote.c:2081

1441 #, c-format

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

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

1444

1412 -#: remote.c:2084

1445 +#: remote.c:2085

1446 #, c-format

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

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

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

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

1451

1419 -#: remote.c:2090

1452 +#: remote.c:2091

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

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

1455

1423 -#: remote.c:2093

1456 +#: remote.c:2094

1457 #, c-format

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

1459 msgid_plural ""

@@ -1432,11 +1465,11 @@ msgstr[1] ""

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

1466 "en avance rapide.\n"

1467

1435 -#: remote.c:2101

1468 +#: remote.c:2102

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

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

1471

1439 -#: remote.c:2104

1472 +#: remote.c:2105

1473 #, c-format

1474 msgid ""

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

@@ -1451,21 +1484,21 @@ msgstr[1] ""

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

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

1486

1454 -#: remote.c:2114

1487 +#: remote.c:2115

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

1489 msgstr ""

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

1491

1459 -#: revision.c:2131

1492 +#: revision.c:2142

1493 msgid "your current branch appears to be broken"

1494 msgstr "votre branche actuelle semble cassée"

1495

1463 -#: revision.c:2134

1496 +#: revision.c:2145

1497 #, c-format

1498 msgid "your current branch '%s' does not have any commits yet"

1499 msgstr "votre branche actuelle '%s' ne contient encore aucun commit"

1500

1468 -#: revision.c:2328

1501 +#: revision.c:2339

1502 msgid "--first-parent is incompatible with --bisect"

1503 msgstr "--first-parent est incompatible avec --bisect"

1504

@@ -1516,7 +1549,7 @@ msgstr ""

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

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

1551

1519 -#: sequencer.c:190 sequencer.c:833 sequencer.c:913

1552 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912

1553 #, c-format

1554 msgid "Could not write to %s"

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

@@ -1676,12 +1709,12 @@ msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""

1709 msgid "Could not create sequencer directory %s"

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

1711

1679 -#: sequencer.c:835 sequencer.c:917

1712 +#: sequencer.c:835 sequencer.c:916

1713 #, c-format

1714 msgid "Error wrapping up %s."

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

1716

1684 -#: sequencer.c:854 sequencer.c:987

1717 +#: sequencer.c:854 sequencer.c:986

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

1719 msgstr "aucun picorage ou retour en cours"

1720

@@ -1693,63 +1726,72 @@ msgstr "impossible de résoudre HEAD"

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

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

1728

1696 -#: sequencer.c:878 builtin/apply.c:4287

1729 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851

1730 #, c-format

1698 -msgid "cannot open %s: %s"

1699 -msgstr "impossible d'ouvrir %s : %s"

1731 +msgid "cannot open %s"

1732 +msgstr "impossible d'ouvrir %s"

1733

1701 -#: sequencer.c:881

1734 +#: sequencer.c:880

1735 #, c-format

1736 msgid "cannot read %s: %s"

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

1738

1706 -#: sequencer.c:882

1739 +#: sequencer.c:881

1740 msgid "unexpected end of file"

1741 msgstr "fin de fichier inattendue"

1742

1710 -#: sequencer.c:888

1743 +#: sequencer.c:887

1744 #, c-format

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

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

1747

1715 -#: sequencer.c:910

1748 +#: sequencer.c:909

1749 #, c-format

1750 msgid "Could not format %s."

1751 msgstr "Impossible de formater %s."

1752

1720 -#: sequencer.c:1055

1753 +#: sequencer.c:1054

1754 #, c-format

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

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

1757

1725 -#: sequencer.c:1058

1758 +#: sequencer.c:1057

1759 #, c-format

1760 msgid "%s: bad revision"

1761 msgstr "%s : mauvaise révision"

1762

1730 -#: sequencer.c:1092

1763 +#: sequencer.c:1091

1764 msgid "Can't revert as initial commit"

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

1766

1734 -#: sequencer.c:1093

1767 +#: sequencer.c:1092

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

1769 msgstr "Impossible de picorer vers une HEAD vide"

1770

1738 -#: setup.c:246

1771 +#: setup.c:248

1772 #, c-format

1773 msgid "failed to read %s"

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

1775

1776 +#: setup.c:468

1777 +#, c-format

1778 +msgid "Expected git repo version <= %d, found %d"

1779 +msgstr "Version attendue du dépôt git <= %d, %d trouvée"

1780 +

1781 +#: setup.c:476

1782 +msgid "unknown repository extensions found:"

1783 +msgstr "extensions de dépôt inconnues trouvées :"

1784 +

1785 #: sha1_file.c:1080

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

1787 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"

1788

1747 -#: sha1_file.c:2459

1789 +#: sha1_file.c:2458

1790 #, c-format

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

1792 msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"

1793

1752 -#: sha1_file.c:2463

1794 +#: sha1_file.c:2462

1795 #, c-format

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

1797 msgstr ""

@@ -1780,32 +1822,41 @@ msgstr ""

1822 "message\n"

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

1824

1783 -#: submodule.c:62 submodule.c:96

1825 +#: submodule.c:64 submodule.c:98

1826 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

1827 msgstr ""

1828 "Modification impossible de .gitmodules non fusionné, résolvez les conflits "

1829 "d'abord"

1830

1789 -#: submodule.c:66 submodule.c:100

1831 +#: submodule.c:68 submodule.c:102

1832 #, c-format

1833 msgid "Could not find section in .gitmodules where path=%s"

1834 msgstr "Impossible de trouver une section où path=%s dans .gitmodules"

1835

1794 -#: submodule.c:74

1836 +#: submodule.c:76

1837 #, c-format

1838 msgid "Could not update .gitmodules entry %s"

1839 msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"

1840

1841 # ici %s est un chemin

1800 -#: submodule.c:107

1842 +#: submodule.c:109

1843 #, c-format

1844 msgid "Could not remove .gitmodules entry for %s"

1845 msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"

1846

1805 -#: submodule.c:118

1847 +#: submodule.c:120

1848 msgid "staging updated .gitmodules failed"

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

1850

1851 +#: submodule.c:177

1852 +msgid "negative values not allowed for submodule.fetchJobs"

1853 +msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"

1854 +

1855 +#: submodule-config.c:355

1856 +#, c-format

1857 +msgid "invalid value for %s"

1858 +msgstr "Valeur invalide pour %s"

1859 +

1860 #: trailer.c:237

1861 #, c-format

1862 msgid "running trailer command '%s' failed"

@@ -1865,7 +1916,219 @@ msgstr "impossible de renommer un fichier temporaire en %s"

1916 msgid "Could not read ref %s"

1917 msgstr "impossible de lire la réf %s"

1918

1868 -#: unpack-trees.c:203

1919 +#: unpack-trees.c:64

1920 +#, c-format

1921 +msgid ""

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

1923 +"%%sPlease commit your changes or stash them before you can switch branches."

1924 +msgstr ""

1925 +"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n"

1926 +"%%sVeuillez valider ou remiser vos modifications avant de basculer de branche."

1927 +

1928 +#: unpack-trees.c:66

1929 +#, c-format

1930 +msgid ""

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

1932 +"%%s"

1933 +msgstr ""

1934 +"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n"

1935 +"%%s"

1936 +

1937 +#: unpack-trees.c:69

1938 +#, c-format

1939 +msgid ""

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

1941 +"%%sPlease commit your changes or stash them before you can merge."

1942 +msgstr ""

1943 +"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n"

1944 +"%%sVeuillez valider ou remiser vos modifications avant la fusion."

1945 +

1946 +#: unpack-trees.c:71

1947 +#, c-format

1948 +msgid ""

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

1950 +"%%s"

1951 +msgstr ""

1952 +"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n"

1953 +"%%s"

1954 +

1955 +#: unpack-trees.c:74

1956 +#, c-format

1957 +msgid ""

1958 +"Your local changes to the following files would be overwritten by %s:\n"

1959 +"%%sPlease commit your changes or stash them before you can %s."

1960 +msgstr ""

1961 +"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

1962 +"%%sVeuillez valider ou remiser vos modifications avant %s."

1963 +

1964 +#: unpack-trees.c:76

1965 +#, c-format

1966 +msgid ""

1967 +"Your local changes to the following files would be overwritten by %s:\n"

1968 +"%%s"

1969 +msgstr ""

1970 +"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"

1971 +"%%s"

1972 +

1973 +#: unpack-trees.c:81

1974 +#, c-format

1975 +msgid ""

1976 +"Updating the following directories would lose untracked files in it:\n"

1977 +"%s"

1978 +msgstr ""

1979 +"La mise à jour des répertoires suivants effacerait les fichiers non suivis contenus :\n"

1980 +"%s"

1981 +

1982 +#: unpack-trees.c:85

1983 +#, c-format

1984 +msgid ""

1985 +"The following untracked working tree files would be removed by checkout:\n"

1986 +"%%sPlease move or remove them before you can switch branches."

1987 +msgstr ""

1988 +"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"

1989 +"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

1990 +

1991 +#: unpack-trees.c:87

1992 +#, c-format

1993 +msgid ""

1994 +"The following untracked working tree files would be removed by checkout:\n"

1995 +"%%s"

1996 +msgstr ""

1997 +"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"

1998 +"%%s"

1999 +

2000 +#: unpack-trees.c:90

2001 +#, c-format

2002 +msgid ""

2003 +"The following untracked working tree files would be removed by merge:\n"

2004 +"%%sPlease move or remove them before you can merge."

2005 +msgstr ""

2006 +"Les fichiers suivants non suivis seraient effacés par la fusion :\n"

2007 +"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

2008 +

2009 +#: unpack-trees.c:92

2010 +#, c-format

2011 +msgid ""

2012 +"The following untracked working tree files would be removed by merge:\n"

2013 +"%%s"

2014 +msgstr ""

2015 +"Les fichiers suivants non suivis seraient effacés par la fusion :\n"

2016 +"%%s"

2017 +

2018 +#: unpack-trees.c:95

2019 +#, c-format

2020 +msgid ""

2021 +"The following untracked working tree files would be removed by %s:\n"

2022 +"%%sPlease move or remove them before you can %s."

2023 +msgstr ""

2024 +"Les fichiers suivants non suivis seraient effacés par %s :\n"

2025 +"%%sVeuillez renommer ou effacer ces fichiers avant %s."

2026 +

2027 +#: unpack-trees.c:97

2028 +#, c-format

2029 +msgid ""

2030 +"The following untracked working tree files would be removed by %s:\n"

2031 +"%%s"

2032 +msgstr ""

2033 +"Les fichiers suivants non suivis seraient effacés par %s :\n"

2034 +"%%s"

2035 +

2036 +#: unpack-trees.c:102

2037 +#, c-format

2038 +msgid ""

2039 +"The following untracked working tree files would be overwritten by "

2040 +"checkout:\n"

2041 +"%%sPlease move or remove them before you can switch branches."

2042 +msgstr ""

2043 +"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"

2044 +"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."

2045 +

2046 +#: unpack-trees.c:104

2047 +#, c-format

2048 +msgid ""

2049 +"The following untracked working tree files would be overwritten by "

2050 +"checkout:\n"

2051 +"%%s"

2052 +msgstr ""

2053 +"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"

2054 +"%%s"

2055 +

2056 +#: unpack-trees.c:107

2057 +#, c-format

2058 +msgid ""

2059 +"The following untracked working tree files would be overwritten by merge:\n"

2060 +"%%sPlease move or remove them before you can merge."

2061 +msgstr ""

2062 +"Les fichiers suivants non suivis seraient effacés par la fusion :\n"

2063 +"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."

2064 +

2065 +#: unpack-trees.c:109

2066 +#, c-format

2067 +msgid ""

2068 +"The following untracked working tree files would be overwritten by merge:\n"

2069 +"%%s"

2070 +msgstr ""

2071 +"Les fichiers suivants non suivis seraient écrasés par la fusion :\n"

2072 +"%%s"

2073 +

2074 +#: unpack-trees.c:112

2075 +#, c-format

2076 +msgid ""

2077 +"The following untracked working tree files would be overwritten by %s:\n"

2078 +"%%sPlease move or remove them before you can %s."

2079 +msgstr ""

2080 +"Les fichiers suivants non suivis seraient écrasés par %s :\n"

2081 +"%%sVeuillez renommer ou effacer ces fichiers avant %s."

2082 +

2083 +#: unpack-trees.c:114

2084 +#, c-format

2085 +msgid ""

2086 +"The following untracked working tree files would be overwritten by %s:\n"

2087 +"%%s"

2088 +msgstr ""

2089 +"Les fichiers suivants non suivis seraient écrasés par %s :\n"

2090 +"%%s"

2091 +

2092 +#: unpack-trees.c:121

2093 +#, c-format

2094 +msgid "Entry '%s' overlaps with '%s'. Cannot bind."

2095 +msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."

2096 +

2097 +#: unpack-trees.c:124

2098 +#, c-format

2099 +msgid ""

2100 +"Cannot update sparse checkout: the following entries are not up-to-date:\n"

2101 +"%s"

2102 +msgstr ""

2103 +"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont pas à jour :\n"

2104 +"%s"

2105 +

2106 +#: unpack-trees.c:126

2107 +#, c-format

2108 +msgid ""

2109 +"The following Working tree files would be overwritten by sparse checkout "

2110 +"update:\n"

2111 +"%s"

2112 +msgstr ""

2113 +"Les fichiers suivants de la copie de travail seraient écrasés par la mise à jour par extraction creuse :\n"

2114 +"%s"

2115 +

2116 +#: unpack-trees.c:128

2117 +#, c-format

2118 +msgid ""

2119 +"The following Working tree files would be removed by sparse checkout "

2120 +"update:\n"

2121 +"%s"

2122 +msgstr ""

2123 +"Les fichiers suivants de la copie de travail seraient supprimés par la mise à jour par extraction creuse :\n"

2124 +"%s"

2125 +

2126 +#: unpack-trees.c:205

2127 +#, c-format

2128 +msgid "Aborting\n"

2129 +msgstr "Abandon\n"

2130 +

2131 +#: unpack-trees.c:237

2132 msgid "Checking out files"

2133 msgstr "Extraction des fichiers"

2134

@@ -1903,201 +2166,197 @@ msgstr "segment de chemin '..' invalide"

2166 msgid "could not open '%s' for reading and writing"

2167 msgstr "impossible d'ouvrir '%s' en lecture/écriture"

2168

1906 -#: wrapper.c:224 wrapper.c:383

2169 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779

2170 #, c-format

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

2172 msgstr "impossible d'ouvrir '%s' en écriture"

2173

1911 -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691

1912 -#: builtin/merge.c:1075 builtin/pull.c:387

2174 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772

2175 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086

2176 +#: builtin/pull.c:407

2177 #, c-format

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

2179 msgstr "impossible d'ouvrir '%s' en lecture"

2180

1917 -#: wrapper.c:611

1918 -#, c-format

1919 -msgid "unable to access '%s': %s"

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

1921 -

1922 -#: wrapper.c:632

2181 +#: wrapper.c:594 wrapper.c:615

2182 #, c-format

2183 msgid "unable to access '%s'"

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

2185

1927 -#: wrapper.c:640

2186 +#: wrapper.c:623

2187 msgid "unable to get current working directory"

2188 msgstr "impossible d'accéder au répertoire de travail courant"

2189

1931 -#: wrapper.c:667

2190 +#: wrapper.c:650

2191 #, c-format

2192 msgid "could not open %s for writing"

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

2194

1936 -#: wrapper.c:678 builtin/am.c:410

2195 +#: wrapper.c:661 builtin/am.c:410

2196 #, c-format

2197 msgid "could not write to %s"

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

2199

1941 -#: wrapper.c:684

2200 +#: wrapper.c:667

2201 #, c-format

2202 msgid "could not close %s"

2203 msgstr "impossible de fermer %s"

2204

1946 -#: wt-status.c:149

2205 +#: wt-status.c:150

2206 msgid "Unmerged paths:"

2207 msgstr "Chemins non fusionnés :"

2208

1950 -#: wt-status.c:176 wt-status.c:203

2209 +#: wt-status.c:177 wt-status.c:204

2210 #, c-format

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

2212 msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"

2213

1955 -#: wt-status.c:178 wt-status.c:205

2214 +#: wt-status.c:179 wt-status.c:206

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

2216 msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"

2217

1959 -#: wt-status.c:182

2218 +#: wt-status.c:183

2219 msgid " (use \"git add <file>...\" to mark resolution)"

2220 msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"

2221

1963 -#: wt-status.c:184 wt-status.c:188

2222 +#: wt-status.c:185 wt-status.c:189

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

2224 msgstr ""

2225 " (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "

2226 "résolu)"

2227

1969 -#: wt-status.c:186

2228 +#: wt-status.c:187

2229 msgid " (use \"git rm <file>...\" to mark resolution)"

2230 msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"

2231

1973 -#: wt-status.c:197 wt-status.c:880

2232 +#: wt-status.c:198 wt-status.c:881

2233 msgid "Changes to be committed:"

2234 msgstr "Modifications qui seront validées :"

2235

1977 -#: wt-status.c:215 wt-status.c:889

2236 +#: wt-status.c:216 wt-status.c:890

2237 msgid "Changes not staged for commit:"

2238 msgstr "Modifications qui ne seront pas validées :"

2239

1981 -#: wt-status.c:219

2240 +#: wt-status.c:220

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

2242 msgstr ""

2243 " (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"

2244

1986 -#: wt-status.c:221

2245 +#: wt-status.c:222

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

2247 msgstr ""

2248 " (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "

2249 "validé)"

2250

1992 -#: wt-status.c:222

2251 +#: wt-status.c:223

2252 msgid ""

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

2254 msgstr ""

2255 " (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "

2256 "dans la copie de travail)"

2257

1999 -#: wt-status.c:224

2258 +#: wt-status.c:225

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

2260 msgstr ""

2261 " (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"

2262

2004 -#: wt-status.c:236

2263 +#: wt-status.c:237

2264 #, c-format

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

2266 msgstr ""

2267 " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"

2268

2010 -#: wt-status.c:251

2269 +#: wt-status.c:252

2270 msgid "both deleted:"

2271 msgstr "supprimé des deux côtés :"

2272

2014 -#: wt-status.c:253

2273 +#: wt-status.c:254

2274 msgid "added by us:"

2275 msgstr "ajouté par nous :"

2276

2018 -#: wt-status.c:255

2277 +#: wt-status.c:256

2278 msgid "deleted by them:"

2279 msgstr "supprimé par eux :"

2280

2022 -#: wt-status.c:257

2281 +#: wt-status.c:258

2282 msgid "added by them:"

2283 msgstr "ajouté par eux :"

2284

2026 -#: wt-status.c:259

2285 +#: wt-status.c:260

2286 msgid "deleted by us:"

2287 msgstr "supprimé par nous :"

2288

2030 -#: wt-status.c:261

2289 +#: wt-status.c:262

2290 msgid "both added:"

2291 msgstr "ajouté de deux côtés :"

2292

2034 -#: wt-status.c:263

2293 +#: wt-status.c:264

2294 msgid "both modified:"

2295 msgstr "modifié des deux côtés :"

2296

2038 -#: wt-status.c:265

2297 +#: wt-status.c:266

2298 #, c-format

2299 msgid "bug: unhandled unmerged status %x"

2300 msgstr "bogue : état de non-fusion non géré %x"

2301

2043 -#: wt-status.c:273

2302 +#: wt-status.c:274

2303 msgid "new file:"

2304 msgstr "nouveau fichier :"

2305

2047 -#: wt-status.c:275

2306 +#: wt-status.c:276

2307 msgid "copied:"

2308 msgstr "copié :"

2309

2051 -#: wt-status.c:277

2310 +#: wt-status.c:278

2311 msgid "deleted:"

2312 msgstr "supprimé :"

2313

2055 -#: wt-status.c:279

2314 +#: wt-status.c:280

2315 msgid "modified:"

2316 msgstr "modifié :"

2317

2059 -#: wt-status.c:281

2318 +#: wt-status.c:282

2319 msgid "renamed:"

2320 msgstr "renommé :"

2321

2063 -#: wt-status.c:283

2322 +#: wt-status.c:284

2323 msgid "typechange:"

2324 msgstr "modif. type :"

2325

2067 -#: wt-status.c:285

2326 +#: wt-status.c:286

2327 msgid "unknown:"

2328 msgstr "inconnu :"

2329

2071 -#: wt-status.c:287

2330 +#: wt-status.c:288

2331 msgid "unmerged:"

2332 msgstr "non fusionné :"

2333

2075 -#: wt-status.c:369

2334 +#: wt-status.c:370

2335 msgid "new commits, "

2336 msgstr "nouveaux commits, "

2337

2079 -#: wt-status.c:371

2338 +#: wt-status.c:372

2339 msgid "modified content, "

2340 msgstr "contenu modifié, "

2341

2083 -#: wt-status.c:373

2342 +#: wt-status.c:374

2343 msgid "untracked content, "

2344 msgstr "contenu non suivi, "

2345

2087 -#: wt-status.c:390

2346 +#: wt-status.c:391

2347 #, c-format

2348 msgid "bug: unhandled diff status %c"

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

2350

2092 -#: wt-status.c:754

2351 +#: wt-status.c:755

2352 msgid "Submodules changed but not updated:"

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

2354

2096 -#: wt-status.c:756

2355 +#: wt-status.c:757

2356 msgid "Submodule changes to be committed:"

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

2358

2100 -#: wt-status.c:837

2359 +#: wt-status.c:838

2360 msgid ""

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

2362 "Everything below will be removed."

@@ -2105,39 +2364,39 @@ msgstr ""

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

2365 "Tout ce qui suit sera éliminé."

2366

2108 -#: wt-status.c:948

2367 +#: wt-status.c:949

2368 msgid "You have unmerged paths."

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

2370

2112 -#: wt-status.c:951

2371 +#: wt-status.c:952

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

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

2374

2116 -#: wt-status.c:954

2375 +#: wt-status.c:956

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

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

2378

2120 -#: wt-status.c:957

2379 +#: wt-status.c:959

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

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

2382

2124 -#: wt-status.c:967

2383 +#: wt-status.c:969

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

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

2386

2128 -#: wt-status.c:970

2387 +#: wt-status.c:972

2388 msgid "The current patch is empty."

2389 msgstr "Le patch actuel est vide."

2390

2132 -#: wt-status.c:974

2391 +#: wt-status.c:976

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

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

2394

2136 -#: wt-status.c:976

2395 +#: wt-status.c:978

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

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

2398

2140 -#: wt-status.c:978

2399 +#: wt-status.c:980

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

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

2402

@@ -2286,43 +2545,43 @@ msgstr "Vous êtes en cours de bissection."

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

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

2547

2289 -#: wt-status.c:1438

2548 +#: wt-status.c:1460

2549 msgid "On branch "

2550 msgstr "Sur la branche "

2551

2293 -#: wt-status.c:1444

2552 +#: wt-status.c:1466

2553 msgid "interactive rebase in progress; onto "

2554 msgstr "rebasage interactif en cours ; sur "

2555

2297 -#: wt-status.c:1446

2556 +#: wt-status.c:1468

2557 msgid "rebase in progress; onto "

2558 msgstr "rebasage en cours ; sur "

2559

2301 -#: wt-status.c:1451

2560 +#: wt-status.c:1473

2561 msgid "HEAD detached at "

2562 msgstr "HEAD détachée sur "

2563

2305 -#: wt-status.c:1453

2564 +#: wt-status.c:1475

2565 msgid "HEAD detached from "

2566 msgstr "HEAD détachée depuis "

2567

2309 -#: wt-status.c:1456

2568 +#: wt-status.c:1478

2569 msgid "Not currently on any branch."

2570 msgstr "Actuellement sur aucun branche."

2571

2313 -#: wt-status.c:1474

2572 +#: wt-status.c:1496

2573 msgid "Initial commit"

2574 msgstr "Validation initiale"

2575

2317 -#: wt-status.c:1488

2576 +#: wt-status.c:1510

2577 msgid "Untracked files"

2578 msgstr "Fichiers non suivis"

2579

2321 -#: wt-status.c:1490

2580 +#: wt-status.c:1512

2581 msgid "Ignored files"

2582 msgstr "Fichiers ignorés"

2583

2325 -#: wt-status.c:1494

2584 +#: wt-status.c:1516

2585 #, c-format

2586 msgid ""

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

@@ -2334,32 +2593,32 @@ msgstr ""

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

2594 "status')."

2595

2337 -#: wt-status.c:1500

2596 +#: wt-status.c:1522

2597 #, c-format

2598 msgid "Untracked files not listed%s"

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

2600

2342 -#: wt-status.c:1502

2601 +#: wt-status.c:1524

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

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

2604

2346 -#: wt-status.c:1508

2605 +#: wt-status.c:1530

2606 msgid "No changes"

2607 msgstr "Aucune modification"

2608

2350 -#: wt-status.c:1513

2609 +#: wt-status.c:1535

2610 #, c-format

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

2612 msgstr ""

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

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

2615

2357 -#: wt-status.c:1516

2616 +#: wt-status.c:1538

2617 #, c-format

2618 msgid "no changes added to commit\n"

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

2620

2362 -#: wt-status.c:1519

2621 +#: wt-status.c:1541

2622 #, c-format

2623 msgid ""

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

@@ -2368,57 +2627,57 @@ msgstr ""

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

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

2629

2371 -#: wt-status.c:1522

2630 +#: wt-status.c:1544

2631 #, c-format

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

2633 msgstr ""

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

2635 "sont présents\n"

2636

2378 -#: wt-status.c:1525

2637 +#: wt-status.c:1547

2638 #, c-format

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

2640 msgstr ""

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

2642 "suivre)\n"

2643

2385 -#: wt-status.c:1528 wt-status.c:1533

2644 +#: wt-status.c:1550 wt-status.c:1555

2645 #, c-format

2646 msgid "nothing to commit\n"

2647 msgstr "rien à valider\n"

2648

2390 -#: wt-status.c:1531

2649 +#: wt-status.c:1553

2650 #, c-format

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

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

2653

2395 -#: wt-status.c:1535

2654 +#: wt-status.c:1557

2655 #, c-format

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

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

2658

2400 -#: wt-status.c:1642

2659 +#: wt-status.c:1664

2660 msgid "Initial commit on "

2661 msgstr "Validation initiale sur "

2662

2404 -#: wt-status.c:1646

2663 +#: wt-status.c:1668

2664 msgid "HEAD (no branch)"

2665 msgstr "HEAD (aucune branche)"

2666

2667 # à priori on parle d'une branche ici

2409 -#: wt-status.c:1675

2668 +#: wt-status.c:1697

2669 msgid "gone"

2670 msgstr "disparue"

2671

2413 -#: wt-status.c:1677 wt-status.c:1685

2672 +#: wt-status.c:1699 wt-status.c:1707

2673 msgid "behind "

2674 msgstr "derrière "

2675

2417 -#: wt-status.c:1680 wt-status.c:1683

2676 +#: wt-status.c:1702 wt-status.c:1705

2677 msgid "ahead "

2678 msgstr "devant "

2679

2421 -#: compat/precompose_utf8.c:57 builtin/clone.c:413

2680 +#: compat/precompose_utf8.c:57 builtin/clone.c:415

2681 #, c-format

2682 msgid "failed to unlink '%s'"

2683 msgstr "échec lors de l'unlink de '%s'"

@@ -2432,7 +2691,7 @@ msgstr "git add [<options>] [--] <chemin>..."

2691 msgid "unexpected diff status %c"

2692 msgstr "status de diff inattendu %c"

2693

2435 -#: builtin/add.c:70 builtin/commit.c:278

2694 +#: builtin/add.c:70 builtin/commit.c:280

2695 msgid "updating files failed"

2696 msgstr "échec de la mise à jour des fichiers"

2697

@@ -2445,7 +2704,7 @@ msgstr "suppression de '%s'\n"

2704 msgid "Unstaged changes after refreshing the index:"

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

2706

2448 -#: builtin/add.c:194 builtin/rev-parse.c:797

2707 +#: builtin/add.c:194 builtin/rev-parse.c:811

2708 msgid "Could not read the index"

2709 msgstr "Impossible de lire l'index"

2710

@@ -2482,14 +2741,14 @@ msgstr ""

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

2742

2743 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111

2485 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511

2486 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162

2744 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511

2745 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162

2746 msgid "dry run"

2747 msgstr "simuler l'action"

2748

2490 -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19

2491 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558

2492 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114

2749 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19

2750 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557

2751 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114

2752 msgid "be verbose"

2753 msgstr "mode verbeux"

2754

@@ -2497,7 +2756,7 @@ msgstr "mode verbeux"

2756 msgid "interactive picking"

2757 msgstr "sélection interactive"

2758

2500 -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286

2759 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286

2760 msgid "select hunks interactively"

2761 msgstr "sélection interactive des sections"

2762

@@ -2569,16 +2828,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"

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

2829

2830 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914

2572 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2573 -#: builtin/submodule--helper.c:35

2831 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2832 +#: builtin/submodule--helper.c:240

2833 msgid "index file corrupt"

2834 msgstr "fichier d'index corrompu"

2835

2577 -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430

2836 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430

2837 msgid "Unable to write new index file"

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

2839

2581 -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078

2840 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089

2841 #, c-format

2842 msgid "could not read '%s'"

2843 msgstr "impossible de lire '%s'"

@@ -2606,16 +2865,6 @@ msgstr "Impossible de copier les notes de '%s' vers '%s'"

2865 msgid "fseek failed"

2866 msgstr "échec de fseek"

2867

2609 -#: builtin/am.c:772 builtin/am.c:860

2610 -#, c-format

2611 -msgid "could not open '%s' for reading: %s"

2612 -msgstr "impossible d'ouvrir '%s' en lecture : %s"

2613 -

2614 -#: builtin/am.c:779

2615 -#, c-format

2616 -msgid "could not open '%s' for writing: %s"

2617 -msgstr "impossible d'ouvrir '%s' en écriture : %s"

2618 -

2868 #: builtin/am.c:788

2869 #, c-format

2870 msgid "could not parse patch '%s'"

@@ -2625,78 +2874,78 @@ msgstr "impossible d'analyser le patch '%s'"

2874 msgid "Only one StGIT patch series can be applied at once"

2875 msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois"

2876

2628 -#: builtin/am.c:901

2877 +#: builtin/am.c:900

2878 msgid "invalid timestamp"

2879 msgstr "horodatage invalide"

2880

2632 -#: builtin/am.c:904 builtin/am.c:912

2881 +#: builtin/am.c:903 builtin/am.c:911

2882 msgid "invalid Date line"

2883 msgstr "ligne de Date invalide"

2884

2636 -#: builtin/am.c:909

2885 +#: builtin/am.c:908

2886 msgid "invalid timezone offset"

2887 msgstr "décalage horaire invalide"

2888

2640 -#: builtin/am.c:996

2889 +#: builtin/am.c:995

2890 msgid "Patch format detection failed."

2891 msgstr "Échec de détection du format du patch."

2892

2644 -#: builtin/am.c:1001 builtin/clone.c:378

2893 +#: builtin/am.c:1000 builtin/clone.c:380

2894 #, c-format

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

2896 msgstr "échec de la création du répertoire '%s'"

2897

2649 -#: builtin/am.c:1005

2898 +#: builtin/am.c:1004

2899 msgid "Failed to split patches."

2900 msgstr "Échec de découpage des patchs."

2901

2653 -#: builtin/am.c:1137 builtin/commit.c:363

2902 +#: builtin/am.c:1136 builtin/commit.c:365

2903 msgid "unable to write index file"

2904 msgstr "impossible d'écrire le fichier d'index"

2905

2657 -#: builtin/am.c:1188

2906 +#: builtin/am.c:1187

2907 #, c-format

2908 msgid "When you have resolved this problem, run \"%s --continue\"."

2909 msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"."

2910

2662 -#: builtin/am.c:1189

2911 +#: builtin/am.c:1188

2912 #, c-format

2913 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

2914 msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"."

2915

2667 -#: builtin/am.c:1190

2916 +#: builtin/am.c:1189

2917 #, c-format

2918 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2919 msgstr ""

2920 "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"

2921 "abort\"."

2922

2674 -#: builtin/am.c:1328

2923 +#: builtin/am.c:1327

2924 msgid "Patch is empty. Was it split wrong?"

2925 msgstr "Le patch est vide. Le découpage était-il bon ?"

2926

2678 -#: builtin/am.c:1402 builtin/log.c:1350

2927 +#: builtin/am.c:1401 builtin/log.c:1516

2928 #, c-format

2929 msgid "invalid ident line: %s"

2930 msgstr "ligne d'identification invalide : %s"

2931

2683 -#: builtin/am.c:1429

2932 +#: builtin/am.c:1428

2933 #, c-format

2934 msgid "unable to parse commit %s"

2935 msgstr "impossible d'analyser le commit %s"

2936

2688 -#: builtin/am.c:1631

2937 +#: builtin/am.c:1630

2938 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2939 msgstr ""

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

2941 "points."

2942

2694 -#: builtin/am.c:1633

2943 +#: builtin/am.c:1632

2944 msgid "Using index info to reconstruct a base tree..."

2945 msgstr ""

2946 "Utilisation de l'information de l'index pour reconstruire un arbre de base..."

2947

2699 -#: builtin/am.c:1652

2948 +#: builtin/am.c:1651

2949 msgid ""

2950 "Did you hand edit your patch?\n"

2951 "It does not apply to blobs recorded in its index."

@@ -2704,38 +2953,38 @@ msgstr ""

2953 "Avez-vous édité le patch à la main ?\n"

2954 "Il ne s'applique pas aux blobs enregistrés dans son index."

2955

2707 -#: builtin/am.c:1658

2956 +#: builtin/am.c:1657

2957 msgid "Falling back to patching base and 3-way merge..."

2958 msgstr "Retour à un patch de la base et fusion à 3 points..."

2959

2711 -#: builtin/am.c:1673

2960 +#: builtin/am.c:1672

2961 msgid "Failed to merge in the changes."

2962 msgstr "Échec d'intégration des modifications."

2963

2715 -#: builtin/am.c:1697 builtin/merge.c:633

2964 +#: builtin/am.c:1696 builtin/merge.c:636

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

2966 msgstr "git write-tree a échoué à écrire un arbre"

2967

2719 -#: builtin/am.c:1704

2968 +#: builtin/am.c:1703

2969 msgid "applying to an empty history"

2970 msgstr "application à un historique vide"

2971

2723 -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830

2724 -#: builtin/merge.c:855

2972 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841

2973 +#: builtin/merge.c:866

2974 msgid "failed to write commit object"

2975 msgstr "échec de l'écriture de l'objet commit"

2976

2728 -#: builtin/am.c:1749 builtin/am.c:1753

2977 +#: builtin/am.c:1748 builtin/am.c:1752

2978 #, c-format

2979 msgid "cannot resume: %s does not exist."

2980 msgstr "impossible de continuer : %s n'existe pas."

2981

2733 -#: builtin/am.c:1769

2982 +#: builtin/am.c:1768

2983 msgid "cannot be interactive without stdin connected to a terminal."

2984 msgstr ""

2985 "impossible d'être interactif sans entrée standard connectée à un terminal."

2986

2738 -#: builtin/am.c:1774

2987 +#: builtin/am.c:1773

2988 msgid "Commit Body is:"

2989 msgstr "Le corps de la validation est :"

2990

@@ -2743,35 +2992,35 @@ msgstr "Le corps de la validation est :"

2992 #. in your translation. The program will only accept English

2993 #. input at this point.

2994 #.

2746 -#: builtin/am.c:1784

2995 +#: builtin/am.c:1783

2996 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

2997 msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "

2998

2750 -#: builtin/am.c:1834

2999 +#: builtin/am.c:1833

3000 #, c-format

3001 msgid "Dirty index: cannot apply patches (dirty: %s)"

3002 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"

3003

2755 -#: builtin/am.c:1869 builtin/am.c:1941

3004 +#: builtin/am.c:1868 builtin/am.c:1940

3005 #, c-format

3006 msgid "Applying: %.*s"

3007 msgstr "Application de %.*s"

3008

2760 -#: builtin/am.c:1885

3009 +#: builtin/am.c:1884

3010 msgid "No changes -- Patch already applied."

3011 msgstr "Pas de changement -- Patch déjà appliqué."

3012

2764 -#: builtin/am.c:1893

3013 +#: builtin/am.c:1892

3014 #, c-format

3015 msgid "Patch failed at %s %.*s"

3016 msgstr "le patch a échoué à %s %.*s"

3017

2769 -#: builtin/am.c:1899

3018 +#: builtin/am.c:1898

3019 #, c-format

3020 msgid "The copy of the patch that failed is found in: %s"

3021 msgstr "La copie du patch qui a échoué se trouve dans : %s"

3022

2774 -#: builtin/am.c:1944

3023 +#: builtin/am.c:1943

3024 msgid ""

3025 "No changes - did you forget to use 'git add'?\n"

3026 "If there is nothing left to stage, chances are that something else\n"

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

3031 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "

3032 "patch."

3033

2785 -#: builtin/am.c:1951

3034 +#: builtin/am.c:1950

3035 msgid ""

3036 "You still have unmerged paths in your index.\n"

3037 "Did you forget to use 'git add'?"

@@ -2790,17 +3039,17 @@ msgstr ""

3039 "Vous avez toujours des chemins non fusionnés dans votre index\n"

3040 "Auriez-vous oublié de faire 'git add' ?"

3041

2793 -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308

3042 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308

3043 #: builtin/reset.c:316

3044 #, c-format

3045 msgid "Could not parse object '%s'."

3046 msgstr "Impossible d'analyser l'objet '%s'."

3047

2799 -#: builtin/am.c:2111

3048 +#: builtin/am.c:2110

3049 msgid "failed to clean index"

3050 msgstr "échec du nettoyage de l'index"

3051

2803 -#: builtin/am.c:2145

3052 +#: builtin/am.c:2144

3053 msgid ""

3054 "You seem to have moved HEAD since the last 'am' failure.\n"

3055 "Not rewinding to ORIG_HEAD"

@@ -2808,154 +3057,156 @@ msgstr ""

3057 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"

3058 "Pas de retour à ORIG_HEAD"

3059

2811 -#: builtin/am.c:2206

3060 +#: builtin/am.c:2205

3061 #, c-format

3062 msgid "Invalid value for --patch-format: %s"

3063 msgstr "Valeur invalide pour --patch-format : %s"

3064

2816 -#: builtin/am.c:2239

3065 +#: builtin/am.c:2238

3066 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"

3067 msgstr "git am [<options>] [(<mbox>|<Maildir>)...]"

3068

2820 -#: builtin/am.c:2240

3069 +#: builtin/am.c:2239

3070 msgid "git am [<options>] (--continue | --skip | --abort)"

3071 msgstr "git am [<options>] (--continue | --quit | --abort)"

3072

2824 -#: builtin/am.c:2246

3073 +#: builtin/am.c:2245

3074 msgid "run interactively"

3075 msgstr "exécution interactive"

3076

2828 -#: builtin/am.c:2248

3077 +#: builtin/am.c:2247

3078 msgid "historical option -- no-op"

3079 msgstr "option historique -- no-op"

3080

2832 -#: builtin/am.c:2250

3081 +#: builtin/am.c:2249

3082 msgid "allow fall back on 3way merging if needed"

3083 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"

3084

2836 -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57

3085 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57

3086 #: builtin/repack.c:171

3087 msgid "be quiet"

3088 msgstr "être silencieux"

3089

2841 -#: builtin/am.c:2253

3090 +#: builtin/am.c:2252

3091 msgid "add a Signed-off-by line to the commit message"

3092 msgstr "ajouter une ligne Signed-off-by au message de validation"

3093

2845 -#: builtin/am.c:2256

3094 +#: builtin/am.c:2255

3095 msgid "recode into utf8 (default)"

3096 msgstr "recoder en utf-8 (par défaut)"

3097

2849 -#: builtin/am.c:2258

3098 +#: builtin/am.c:2257

3099 msgid "pass -k flag to git-mailinfo"

3100 msgstr "passer l'option -k à git-mailinfo"

3101

2853 -#: builtin/am.c:2260

3102 +#: builtin/am.c:2259

3103 msgid "pass -b flag to git-mailinfo"

3104 msgstr "passer l'option -b à git-mailinfo"

3105

2857 -#: builtin/am.c:2262

3106 +#: builtin/am.c:2261

3107 msgid "pass -m flag to git-mailinfo"

3108 msgstr "passer l'option -m à git-mailinfo"

3109

2861 -#: builtin/am.c:2264

3110 +#: builtin/am.c:2263

3111 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

3112 msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"

3113

2865 -#: builtin/am.c:2267

3114 +#: builtin/am.c:2266

3115 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

3116 msgstr ""

3117 "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"

3118

2870 -#: builtin/am.c:2270

3119 +#: builtin/am.c:2269

3120 msgid "strip everything before a scissors line"

3121 msgstr "retirer tout le contenu avant la ligne des ciseaux"

3122

2874 -#: builtin/am.c:2271 builtin/apply.c:4544

3123 +#: builtin/am.c:2270 builtin/apply.c:4546

3124 msgid "action"

3125 msgstr "action"

3126

2878 -#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281

2879 -#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293

2880 -#: builtin/am.c:2299

3127 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280

3128 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292

3129 +#: builtin/am.c:2298

3130 msgid "pass it through git-apply"

3131 msgstr "le passer jusqu'à git-apply"

3132

2884 -#: builtin/am.c:2280 builtin/apply.c:4568

3133 +#: builtin/am.c:2279 builtin/apply.c:4570

3134 msgid "root"

3135 msgstr "racine"

3136

2888 -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506

2889 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95

2890 -#: builtin/pull.c:171 builtin/submodule--helper.c:72

2891 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163

3137 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508

3138 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95

3139 +#: builtin/pull.c:179 builtin/submodule--helper.c:277

3140 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485

3141 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767

3142 +#: builtin/submodule--helper.c:770

3143 msgid "path"

3144 msgstr "chemin"

3145

2895 -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2896 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 builtin/pull.c:185

3146 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

3147 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193

3148 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645

3149 #: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132

3150 #: parse-options.h:134 parse-options.h:244

3151 msgid "n"

3152 msgstr "n"

3153

2903 -#: builtin/am.c:2292 builtin/apply.c:4512

3154 +#: builtin/am.c:2291 builtin/apply.c:4514

3155 msgid "num"

3156 msgstr "num"

3157

2907 -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438

3158 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438

3159 #: builtin/tag.c:372

3160 msgid "format"

3161 msgstr "format"

3162

2912 -#: builtin/am.c:2296

3163 +#: builtin/am.c:2295

3164 msgid "format the patch(es) are in"

3165 msgstr "format de présentation des patchs"

3166

2916 -#: builtin/am.c:2302

3167 +#: builtin/am.c:2301

3168 msgid "override error message when patch failure occurs"

3169 msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"

3170

2920 -#: builtin/am.c:2304

3171 +#: builtin/am.c:2303

3172 msgid "continue applying patches after resolving a conflict"

3173 msgstr "continuer à appliquer les patchs après résolution d'un conflit"

3174

2924 -#: builtin/am.c:2307

3175 +#: builtin/am.c:2306

3176 msgid "synonyms for --continue"

3177 msgstr "synonymes de --continue"

3178

2928 -#: builtin/am.c:2310

3179 +#: builtin/am.c:2309

3180 msgid "skip the current patch"

3181 msgstr "sauter le patch courant"

3182

2932 -#: builtin/am.c:2313

3183 +#: builtin/am.c:2312

3184 msgid "restore the original branch and abort the patching operation."

3185 msgstr ""

3186 "restaurer la branche originale et abandonner les applications de patch."

3187

2937 -#: builtin/am.c:2317

3188 +#: builtin/am.c:2316

3189 msgid "lie about committer date"

3190 msgstr "mentir sur la date de validation"

3191

2941 -#: builtin/am.c:2319

3192 +#: builtin/am.c:2318

3193 msgid "use current timestamp for author date"

3194 msgstr "utiliser l'horodatage actuel pour la date d'auteur"

3195

2945 -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225

2946 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355

3196 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228

3197 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355

3198 msgid "key-id"

3199 msgstr "id-clé"

3200

2950 -#: builtin/am.c:2322

3201 +#: builtin/am.c:2321

3202 msgid "GPG-sign commits"

3203 msgstr "signer les commits avec GPG"

3204

2954 -#: builtin/am.c:2325

3205 +#: builtin/am.c:2324

3206 msgid "(internal use for git-rebase)"

3207 msgstr "(utilisation interne pour git-rebase)"

3208

2958 -#: builtin/am.c:2340

3209 +#: builtin/am.c:2339

3210 msgid ""

3211 "The -b/--binary option has been a no-op for long time, and\n"

3212 "it will be removed. Please do not use it anymore."

@@ -2963,17 +3214,17 @@ msgstr ""

3214 "L'option -b/--binary ne fait plus rien depuis longtemps,\n"

3215 "et elle sera supprimée. Veuillez ne plus l'utiliser."

3216

2966 -#: builtin/am.c:2347

3217 +#: builtin/am.c:2346

3218 msgid "failed to read the index"

3219 msgstr "échec à la lecture de l'index"

3220

2970 -#: builtin/am.c:2362

3221 +#: builtin/am.c:2361

3222 #, c-format

3223 msgid "previous rebase directory %s still exists but mbox given."

3224 msgstr ""

3225 "le répertoire précédent de rebasage %s existe toujours mais mbox donnée."

3226

2976 -#: builtin/am.c:2386

3227 +#: builtin/am.c:2385

3228 #, c-format

3229 msgid ""

3230 "Stray %s directory found.\n"

@@ -2982,7 +3233,7 @@ msgstr ""

3233 "Répertoire abandonné %s trouvé.\n"

3234 "Utilisez \"git am --abort\" pour le supprimer."

3235

2985 -#: builtin/am.c:2392

3236 +#: builtin/am.c:2391

3237 msgid "Resolve operation not in progress, we are not resuming."

3238 msgstr ""

3239 "Pas de résolution de l'opération en cours, nous ne sommes pas dans une "

@@ -3017,44 +3268,44 @@ msgstr "regexec a retourné %d pour l'entrée : %s"

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

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

3270

3020 -#: builtin/apply.c:940

3271 +#: builtin/apply.c:937

3272 #, c-format

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

3274 msgstr ""

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

3276 "ligne %d"

3277

3027 -#: builtin/apply.c:944

3278 +#: builtin/apply.c:942

3279 #, c-format

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

3281 msgstr ""

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

3283 "à la ligne %d"

3284

3034 -#: builtin/apply.c:945

3285 +#: builtin/apply.c:943

3286 #, c-format

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

3288 msgstr ""

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

3290 "à la ligne %d"

3291

3041 -#: builtin/apply.c:952

3292 +#: builtin/apply.c:949

3293 #, c-format

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

3295 msgstr ""

3296 "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d"

3297

3047 -#: builtin/apply.c:1415

3298 +#: builtin/apply.c:1406

3299 #, c-format

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

3301 msgstr "recomptage : ligne inattendue : %.*s"

3302

3052 -#: builtin/apply.c:1472

3303 +#: builtin/apply.c:1463

3304 #, c-format

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

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

3307

3057 -#: builtin/apply.c:1489

3308 +#: builtin/apply.c:1480

3309 #, c-format

3310 msgid ""

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

@@ -3069,77 +3320,77 @@ msgstr[1] ""

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

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

3322

3072 -#: builtin/apply.c:1655

3323 +#: builtin/apply.c:1646

3324 msgid "new file depends on old contents"

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

3326

3076 -#: builtin/apply.c:1657

3327 +#: builtin/apply.c:1648

3328 msgid "deleted file still has contents"

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

3330

3080 -#: builtin/apply.c:1683

3331 +#: builtin/apply.c:1674

3332 #, c-format

3333 msgid "corrupt patch at line %d"

3334 msgstr "patch corrompu à la ligne %d"

3335

3085 -#: builtin/apply.c:1719

3336 +#: builtin/apply.c:1710

3337 #, c-format

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

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

3340

3090 -#: builtin/apply.c:1721

3341 +#: builtin/apply.c:1712

3342 #, c-format

3343 msgid "deleted file %s still has contents"

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

3345

3095 -#: builtin/apply.c:1724

3346 +#: builtin/apply.c:1715

3347 #, c-format

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

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

3350

3100 -#: builtin/apply.c:1870

3351 +#: builtin/apply.c:1861

3352 #, c-format

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

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

3355

3105 -#: builtin/apply.c:1899

3356 +#: builtin/apply.c:1895

3357 #, c-format

3358 msgid "unrecognized binary patch at line %d"

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

3360

3110 -#: builtin/apply.c:2050

3361 +#: builtin/apply.c:2048

3362 #, c-format

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

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

3365

3115 -#: builtin/apply.c:2140

3366 +#: builtin/apply.c:2138

3367 #, c-format

3368 msgid "unable to read symlink %s"

3369 msgstr "lecture du lien symbolique %s impossible"

3370

3120 -#: builtin/apply.c:2144

3371 +#: builtin/apply.c:2142

3372 #, c-format

3373 msgid "unable to open or read %s"

3374 msgstr "ouverture ou lecture de %s impossible"

3375

3125 -#: builtin/apply.c:2777

3376 +#: builtin/apply.c:2775

3377 #, c-format

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

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

3380

3130 -#: builtin/apply.c:2896

3381 +#: builtin/apply.c:2894

3382 #, c-format

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

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

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

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

3387

3137 -#: builtin/apply.c:2908

3388 +#: builtin/apply.c:2906

3389 #, c-format

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

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

3392

3142 -#: builtin/apply.c:2914

3393 +#: builtin/apply.c:2912

3394 #, c-format

3395 msgid ""

3396 "while searching for:\n"

@@ -3148,330 +3399,340 @@ msgstr ""

3399 "pendant la recherche de :\n"

3400 "%.*s"

3401

3151 -#: builtin/apply.c:2934

3402 +#: builtin/apply.c:2932

3403 #, c-format

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

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

3406

3156 -#: builtin/apply.c:3035

3407 +#: builtin/apply.c:3033

3408 #, c-format

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

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

3411

3161 -#: builtin/apply.c:3041

3412 +#: builtin/apply.c:3039

3413 #, c-format

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

3415 msgstr ""

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

3417 "trouvé)"

3418

3168 -#: builtin/apply.c:3062

3419 +#: builtin/apply.c:3060

3420 #, c-format

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

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

3423

3173 -#: builtin/apply.c:3186

3424 +#: builtin/apply.c:3184

3425 #, c-format

3426 msgid "cannot checkout %s"

3427 msgstr "extraction de %s impossible"

3428

3178 -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287

3429 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285

3430 #, c-format

3431 msgid "read of %s failed"

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

3433

3183 -#: builtin/apply.c:3239

3434 +#: builtin/apply.c:3237

3435 #, c-format

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

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

3438

3188 -#: builtin/apply.c:3267 builtin/apply.c:3489

3439 +#: builtin/apply.c:3265 builtin/apply.c:3487

3440 #, c-format

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

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

3443

3193 -#: builtin/apply.c:3348 builtin/apply.c:3503

3444 +#: builtin/apply.c:3346 builtin/apply.c:3501

3445 #, c-format

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

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

3448

3198 -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517

3449 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515

3450 #, c-format

3451 msgid "%s: %s"

3452 msgstr "%s : %s"

3453

3203 -#: builtin/apply.c:3357 builtin/apply.c:3511

3454 +#: builtin/apply.c:3355 builtin/apply.c:3509

3455 #, c-format

3456 msgid "%s: does not match index"

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

3458

3208 -#: builtin/apply.c:3459

3459 +#: builtin/apply.c:3457

3460 msgid "removal patch leaves file contents"

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

3462

3212 -#: builtin/apply.c:3528

3463 +#: builtin/apply.c:3526

3464 #, c-format

3465 msgid "%s: wrong type"

3466 msgstr "%s : type erroné"

3467

3217 -#: builtin/apply.c:3530

3468 +#: builtin/apply.c:3528

3469 #, c-format

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

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

3472

3222 -#: builtin/apply.c:3689 builtin/apply.c:3691

3473 +#: builtin/apply.c:3687 builtin/apply.c:3689

3474 #, c-format

3475 msgid "invalid path '%s'"

3476 msgstr "chemin invalide '%s'"

3477

3227 -#: builtin/apply.c:3746

3478 +#: builtin/apply.c:3744

3479 #, c-format

3480 msgid "%s: already exists in index"

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

3482

3232 -#: builtin/apply.c:3749

3483 +#: builtin/apply.c:3747

3484 #, c-format

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

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

3487

3237 -#: builtin/apply.c:3769

3488 +#: builtin/apply.c:3767

3489 #, c-format

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

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

3492

3242 -#: builtin/apply.c:3774

3493 +#: builtin/apply.c:3772

3494 #, c-format

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

3496 msgstr ""

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

3498

3248 -#: builtin/apply.c:3794

3499 +#: builtin/apply.c:3792

3500 #, c-format

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

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

3503

3253 -#: builtin/apply.c:3798

3504 +#: builtin/apply.c:3796

3505 #, c-format

3506 msgid "%s: patch does not apply"

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

3508

3258 -#: builtin/apply.c:3812

3509 +#: builtin/apply.c:3810

3510 #, c-format

3511 msgid "Checking patch %s..."

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

3513

3263 -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135

3514 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135

3515 #, c-format

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

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

3518

3268 -#: builtin/apply.c:4048

3519 +#: builtin/apply.c:4046

3520 #, c-format

3521 msgid "unable to remove %s from index"

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

3523

3273 -#: builtin/apply.c:4077

3524 +#: builtin/apply.c:4075

3525 #, c-format

3526 msgid "corrupt patch for submodule %s"

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

3528

3278 -#: builtin/apply.c:4081

3529 +#: builtin/apply.c:4079

3530 #, c-format

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

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

3533

3283 -#: builtin/apply.c:4086

3534 +#: builtin/apply.c:4084

3535 #, c-format

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

3537 msgstr ""

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

3539 "impossible"

3540

3290 -#: builtin/apply.c:4089 builtin/apply.c:4197

3541 +#: builtin/apply.c:4087 builtin/apply.c:4195

3542 #, c-format

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

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

3545

3295 -#: builtin/apply.c:4122

3546 +#: builtin/apply.c:4120

3547 #, c-format

3548 msgid "closing file '%s'"

3549 msgstr "fermeture du fichier '%s'"

3550

3300 -#: builtin/apply.c:4171

3551 +#: builtin/apply.c:4169

3552 #, c-format

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

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

3555

3305 -#: builtin/apply.c:4258

3556 +#: builtin/apply.c:4256

3557 #, c-format

3558 msgid "Applied patch %s cleanly."

3559 msgstr "Patch %s appliqué proprement."

3560

3310 -#: builtin/apply.c:4266

3561 +#: builtin/apply.c:4264

3562 msgid "internal error"

3563 msgstr "erreur interne"

3564

3314 -#: builtin/apply.c:4269

3565 +#: builtin/apply.c:4267

3566 #, c-format

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

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

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

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

3571

3321 -#: builtin/apply.c:4279

3572 +#: builtin/apply.c:4277

3573 #, c-format

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

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

3576

3326 -#: builtin/apply.c:4300

3577 +#: builtin/apply.c:4285

3578 +#, c-format

3579 +msgid "cannot open %s: %s"

3580 +msgstr "impossible d'ouvrir %s : %s"

3581 +

3582 +#: builtin/apply.c:4298

3583 #, c-format

3584 msgid "Hunk #%d applied cleanly."

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

3586

3331 -#: builtin/apply.c:4303

3587 +#: builtin/apply.c:4301

3588 #, c-format

3589 msgid "Rejected hunk #%d."

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

3591

3336 -#: builtin/apply.c:4393

3592 +#: builtin/apply.c:4387

3593 +#, c-format

3594 +msgid "Skipped patch '%s'."

3595 +msgstr "Chemin '%s' non traité."

3596 +

3597 +#: builtin/apply.c:4395

3598 msgid "unrecognized input"

3599 msgstr "entrée non reconnue"

3600

3340 -#: builtin/apply.c:4404

3601 +#: builtin/apply.c:4406

3602 msgid "unable to read index file"

3603 msgstr "lecture du fichier d'index impossible"

3604

3344 -#: builtin/apply.c:4507

3605 +#: builtin/apply.c:4509

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

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

3608

3348 -#: builtin/apply.c:4510

3609 +#: builtin/apply.c:4512

3610 msgid "apply changes matching the given path"

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

3612

3352 -#: builtin/apply.c:4513

3613 +#: builtin/apply.c:4515

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

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

3616

3356 -#: builtin/apply.c:4516

3617 +#: builtin/apply.c:4518

3618 msgid "ignore additions made by the patch"

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

3620

3360 -#: builtin/apply.c:4518

3621 +#: builtin/apply.c:4520

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

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

3624

3364 -#: builtin/apply.c:4522

3625 +#: builtin/apply.c:4524

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

3627 msgstr ""

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

3629

3369 -#: builtin/apply.c:4524

3630 +#: builtin/apply.c:4526

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

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

3633

3373 -#: builtin/apply.c:4526

3634 +#: builtin/apply.c:4528

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

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

3637

3377 -#: builtin/apply.c:4528

3638 +#: builtin/apply.c:4530

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

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

3641

3381 -#: builtin/apply.c:4530

3642 +#: builtin/apply.c:4532

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

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

3645

3385 -#: builtin/apply.c:4532

3646 +#: builtin/apply.c:4534

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

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

3649

3389 -#: builtin/apply.c:4534

3650 +#: builtin/apply.c:4536

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

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

3653

3393 -#: builtin/apply.c:4536

3654 +#: builtin/apply.c:4538

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

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

3657

3397 -#: builtin/apply.c:4538

3658 +#: builtin/apply.c:4540

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

3660 msgstr ""

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

3662

3402 -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425

3663 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425

3664 msgid "paths are separated with NUL character"

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

3666

3406 -#: builtin/apply.c:4543

3667 +#: builtin/apply.c:4545

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

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

3670

3410 -#: builtin/apply.c:4545

3671 +#: builtin/apply.c:4547

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

3673 msgstr ""

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

3675 "d'espace"

3676

3416 -#: builtin/apply.c:4548 builtin/apply.c:4551

3677 +#: builtin/apply.c:4550 builtin/apply.c:4553

3678 msgid "ignore changes in whitespace when finding context"

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

3680

3420 -#: builtin/apply.c:4554

3681 +#: builtin/apply.c:4556

3682 msgid "apply the patch in reverse"

3683 msgstr "appliquer le patch en sens inverse"

3684

3424 -#: builtin/apply.c:4556

3685 +#: builtin/apply.c:4558

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

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

3688

3428 -#: builtin/apply.c:4558

3689 +#: builtin/apply.c:4560

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

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

3692

3432 -#: builtin/apply.c:4560

3693 +#: builtin/apply.c:4562

3694 msgid "allow overlapping hunks"

3695 msgstr "accepter les recouvrements de sections"

3696

3436 -#: builtin/apply.c:4563

3697 +#: builtin/apply.c:4565

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

3699 msgstr ""

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

3701 "fichier"

3702

3442 -#: builtin/apply.c:4566

3703 +#: builtin/apply.c:4568

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

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

3706

3446 -#: builtin/apply.c:4569

3707 +#: builtin/apply.c:4571

3708 msgid "prepend <root> to all filenames"

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

3710

3450 -#: builtin/apply.c:4591

3711 +#: builtin/apply.c:4593

3712 msgid "--3way outside a repository"

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

3714

3454 -#: builtin/apply.c:4599

3715 +#: builtin/apply.c:4601

3716 msgid "--index outside a repository"

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

3718

3458 -#: builtin/apply.c:4602

3719 +#: builtin/apply.c:4604

3720 msgid "--cached outside a repository"

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

3722

3462 -#: builtin/apply.c:4621

3723 +#: builtin/apply.c:4623

3724 #, c-format

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

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

3727

3467 -#: builtin/apply.c:4635

3728 +#: builtin/apply.c:4637

3729 #, c-format

3730 msgid "squelched %d whitespace error"

3731 msgid_plural "squelched %d whitespace errors"

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

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

3734

3474 -#: builtin/apply.c:4641 builtin/apply.c:4651

3735 +#: builtin/apply.c:4643 builtin/apply.c:4653

3736 #, c-format

3737 msgid "%d line adds whitespace errors."

3738 msgid_plural "%d lines add whitespace errors."

@@ -3537,104 +3798,104 @@ msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"

3798 msgid "Blaming lines"

3799 msgstr "Assignation de blâme au lignes"

3800

3540 -#: builtin/blame.c:2530

3801 +#: builtin/blame.c:2531

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

3803 msgstr ""

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

3805 "manière incrémentale"

3806

3546 -#: builtin/blame.c:2531

3807 +#: builtin/blame.c:2532

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

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

3810

3550 -#: builtin/blame.c:2532

3811 +#: builtin/blame.c:2533

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

3813 msgstr ""

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

3815

3555 -#: builtin/blame.c:2533

3816 +#: builtin/blame.c:2534

3817 msgid "Show work cost statistics"

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

3819

3559 -#: builtin/blame.c:2534

3820 +#: builtin/blame.c:2535

3821 msgid "Force progress reporting"

3822 msgstr "Forcer l'affichage de l'état d'avancement"

3823

3563 -#: builtin/blame.c:2535

3824 +#: builtin/blame.c:2536

3825 msgid "Show output score for blame entries"

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

3827

3567 -#: builtin/blame.c:2536

3828 +#: builtin/blame.c:2537

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

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

3831

3571 -#: builtin/blame.c:2537

3832 +#: builtin/blame.c:2538

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

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

3835

3575 -#: builtin/blame.c:2538

3836 +#: builtin/blame.c:2539

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

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

3839

3579 -#: builtin/blame.c:2539

3840 +#: builtin/blame.c:2540

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

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

3843

3583 -#: builtin/blame.c:2540

3844 +#: builtin/blame.c:2541

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

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

3847

3587 -#: builtin/blame.c:2541

3848 +#: builtin/blame.c:2542

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

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

3851

3591 -#: builtin/blame.c:2542

3852 +#: builtin/blame.c:2543

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

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

3855

3595 -#: builtin/blame.c:2543

3856 +#: builtin/blame.c:2544

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

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

3859

3599 -#: builtin/blame.c:2544

3860 +#: builtin/blame.c:2545

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

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

3863

3603 -#: builtin/blame.c:2545

3864 +#: builtin/blame.c:2546

3865 msgid "Ignore whitespace differences"

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

3867

3607 -#: builtin/blame.c:2546

3868 +#: builtin/blame.c:2547

3869 msgid "Spend extra cycles to find better match"

3870 msgstr ""

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

3872

3612 -#: builtin/blame.c:2547

3873 +#: builtin/blame.c:2548

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

3875 msgstr ""

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

3877

3617 -#: builtin/blame.c:2548

3878 +#: builtin/blame.c:2549

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

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

3881

3621 -#: builtin/blame.c:2549 builtin/blame.c:2550

3882 +#: builtin/blame.c:2550 builtin/blame.c:2551

3883 msgid "score"

3884 msgstr "score"

3885

3625 -#: builtin/blame.c:2549

3886 +#: builtin/blame.c:2550

3887 msgid "Find line copies within and across files"

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

3889

3629 -#: builtin/blame.c:2550

3890 +#: builtin/blame.c:2551

3891 msgid "Find line movements within and across files"

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

3893

3633 -#: builtin/blame.c:2551

3894 +#: builtin/blame.c:2552

3895 msgid "n,m"

3896 msgstr "n,m"

3897

3637 -#: builtin/blame.c:2551

3898 +#: builtin/blame.c:2552

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

3900 msgstr ""

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

@@ -3645,32 +3906,32 @@ msgstr ""

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

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

3908 #. fewer display columns.

3648 -#: builtin/blame.c:2640

3909 +#: builtin/blame.c:2641

3910 msgid "4 years, 11 months ago"

3911 msgstr "il y a 10 ans et 11 mois"

3912

3652 -#: builtin/branch.c:25

3913 +#: builtin/branch.c:26

3914 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"

3915 msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"

3916

3656 -#: builtin/branch.c:26

3917 +#: builtin/branch.c:27

3918 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"

3919 msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]"

3920

3660 -#: builtin/branch.c:27

3921 +#: builtin/branch.c:28

3922 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."

3923 msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..."

3924

3664 -#: builtin/branch.c:28

3925 +#: builtin/branch.c:29

3926 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

3927 msgstr ""

3928 "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"

3929

3669 -#: builtin/branch.c:29

3930 +#: builtin/branch.c:30

3931 msgid "git branch [<options>] [-r | -a] [--points-at]"

3932 msgstr "git branch [<options>] [-r | -a] [--points-at]"

3933

3673 -#: builtin/branch.c:142

3934 +#: builtin/branch.c:143

3935 #, c-format

3936 msgid ""

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

@@ -3679,7 +3940,7 @@ msgstr ""

3940 "suppression de la branche '%s' qui a été fusionnée dans\n"

3941 " '%s', mais pas dans HEAD."

3942

3682 -#: builtin/branch.c:146

3943 +#: builtin/branch.c:147

3944 #, c-format

3945 msgid ""

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

@@ -3688,12 +3949,12 @@ msgstr ""

3949 "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n"

3950 " '%s', même si elle est fusionnée dans HEAD."

3951

3691 -#: builtin/branch.c:160

3952 +#: builtin/branch.c:161

3953 #, c-format

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

3955 msgstr "Impossible de rechercher l'objet commit pour '%s'"

3956

3696 -#: builtin/branch.c:164

3957 +#: builtin/branch.c:165

3958 #, c-format

3959 msgid ""

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

@@ -3702,301 +3963,322 @@ msgstr ""

3963 "La branche '%s' n'est pas totalement fusionnée.\n"

3964 "Si vous êtes sur que vous voulez la supprimer, lancez 'git branch -D %s'."

3965

3705 -#: builtin/branch.c:177

3966 +#: builtin/branch.c:178

3967 msgid "Update of config-file failed"

3968 msgstr "Échec de la mise à jour du fichier de configuration"

3969

3709 -#: builtin/branch.c:205

3970 +#: builtin/branch.c:206

3971 msgid "cannot use -a with -d"

3972 msgstr "impossible d'utiliser -a avec -d"

3973

3713 -#: builtin/branch.c:211

3974 +#: builtin/branch.c:212

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

3976 msgstr "Impossible de rechercher l'objet commit pour HEAD"

3977

3717 -#: builtin/branch.c:219

3978 +#: builtin/branch.c:226

3979 #, c-format

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

3720 -msgstr "Impossible de supprimer la branche '%s' sur laquelle vous êtes."

3980 +msgid "Cannot delete branch '%s' checked out at '%s'"

3981 +msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"

3982

3722 -#: builtin/branch.c:235

3983 +#: builtin/branch.c:241

3984 #, c-format

3985 msgid "remote-tracking branch '%s' not found."

3986 msgstr "branche de suivi '%s' non trouvée."

3987

3727 -#: builtin/branch.c:236

3988 +#: builtin/branch.c:242

3989 #, c-format

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

3991 msgstr "branche '%s' non trouvée."

3992

3732 -#: builtin/branch.c:251

3993 +#: builtin/branch.c:257

3994 #, c-format

3995 msgid "Error deleting remote-tracking branch '%s'"

3996 msgstr "Erreur lors de la suppression de la branche de suivi '%s'"

3997

3737 -#: builtin/branch.c:252

3998 +#: builtin/branch.c:258

3999 #, c-format

4000 msgid "Error deleting branch '%s'"

4001 msgstr "Erreur lors de la suppression de la branche '%s'"

4002

3742 -#: builtin/branch.c:259

4003 +#: builtin/branch.c:265

4004 #, c-format

4005 msgid "Deleted remote-tracking branch %s (was %s).\n"

4006 msgstr "Branche de suivi %s supprimée (précédemment %s).\n"

4007

3747 -#: builtin/branch.c:260

4008 +#: builtin/branch.c:266

4009 #, c-format

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

4011 msgstr "Branche %s supprimée (précédemment %s).\n"

4012

4013 # féminin pour une branche

3753 -#: builtin/branch.c:303

4014 +#: builtin/branch.c:309

4015 #, c-format

4016 msgid "[%s: gone]"

4017 msgstr "[%s: disparue]"

4018

3758 -#: builtin/branch.c:308

4019 +#: builtin/branch.c:314

4020 #, c-format

4021 msgid "[%s]"

4022 msgstr "[%s]"

4023

3763 -#: builtin/branch.c:313

4024 +#: builtin/branch.c:319

4025 #, c-format

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

4027 msgstr "[%s: en retard de %d]"

4028

3768 -#: builtin/branch.c:315

4029 +#: builtin/branch.c:321

4030 #, c-format

4031 msgid "[behind %d]"

4032 msgstr "[en retard de %d]"

4033

3773 -#: builtin/branch.c:319

4034 +#: builtin/branch.c:325

4035 #, c-format

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

4037 msgstr "[%s : en avance de %d]"

4038

3778 -#: builtin/branch.c:321

4039 +#: builtin/branch.c:327

4040 #, c-format

4041 msgid "[ahead %d]"

4042 msgstr "[en avance de %d]"

4043

3783 -#: builtin/branch.c:324

4044 +#: builtin/branch.c:330

4045 #, c-format

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

4047 msgstr "[%s : en avance de %d, en retard de %d]"

4048

3788 -#: builtin/branch.c:327

4049 +#: builtin/branch.c:333

4050 #, c-format

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

4052 msgstr "[en avance de %d, en retard de %d]"

4053

3793 -#: builtin/branch.c:340

4054 +#: builtin/branch.c:346

4055 msgid " **** invalid ref ****"

4056 msgstr " **** référence invalide ****"

4057

3797 -#: builtin/branch.c:366

4058 +#: builtin/branch.c:372

4059 #, c-format

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

4061 msgstr "(aucune branche, rebasage de %s)"

4062

3802 -#: builtin/branch.c:369

4063 +#: builtin/branch.c:375

4064 #, c-format

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

4066 msgstr "(aucune branche, bisect a démarré sur %s)"

4067

3807 -#: builtin/branch.c:375

4068 +#. TRANSLATORS: make sure this matches

4069 +#. "HEAD detached at " in wt-status.c

4070 +#: builtin/branch.c:381

4071 #, c-format

4072 msgid "(HEAD detached at %s)"

4073 msgstr "(HEAD détachée sur %s)"

4074

3812 -#: builtin/branch.c:378

4075 +#. TRANSLATORS: make sure this matches

4076 +#. "HEAD detached from " in wt-status.c

4077 +#: builtin/branch.c:386

4078 #, c-format

4079 msgid "(HEAD detached from %s)"

4080 msgstr "(HEAD détachée depuis %s)"

4081

3817 -#: builtin/branch.c:382

4082 +#: builtin/branch.c:390

4083 msgid "(no branch)"

4084 msgstr "(aucune branche)"

4085

3821 -#: builtin/branch.c:524

4086 +#: builtin/branch.c:541

4087 +#, c-format

4088 +msgid "Branch %s is being rebased at %s"

4089 +msgstr "La branche %s est en cours de rebasage sur %s"

4090 +

4091 +#: builtin/branch.c:545

4092 +#, c-format

4093 +msgid "Branch %s is being bisected at %s"

4094 +msgstr "La branche %s est en cours de bissection sur %s"

4095 +

4096 +#: builtin/branch.c:560

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

4098 msgstr "impossible de renommer la branche actuelle, il n'y en a pas."

4099

3825 -#: builtin/branch.c:534

4100 +#: builtin/branch.c:570

4101 #, c-format

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

4103 msgstr "Nom de branche invalide : '%s'"

4104

3830 -#: builtin/branch.c:549

4105 +#: builtin/branch.c:587

4106 msgid "Branch rename failed"

4107 msgstr "Échec de renommage de la branche"

4108

3834 -#: builtin/branch.c:553

4109 +#: builtin/branch.c:591

4110 #, c-format

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

4112 msgstr "Renommage d'un branche mal nommée '%s'"

4113

3839 -#: builtin/branch.c:557

4114 +#: builtin/branch.c:594

4115 #, c-format

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

4117 msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"

4118

3844 -#: builtin/branch.c:564

4119 +#: builtin/branch.c:601

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

4121 msgstr ""

4122 "La branche est renommée, mais la mise à jour du fichier de configuration a "

4123 "échoué"

4124

3850 -#: builtin/branch.c:586

3851 -#, c-format

3852 -msgid "could not write branch description template: %s"

3853 -msgstr "impossible d'écrire le modèle de description de branche : %s"

4125 +#: builtin/branch.c:623

4126 +msgid "could not write branch description template"

4127 +msgstr "impossible d'écrire le modèle de description de branche"

4128

3855 -#: builtin/branch.c:615

4129 +#: builtin/branch.c:651

4130 msgid "Generic options"

4131 msgstr "Options génériques"

4132

3859 -#: builtin/branch.c:617

4133 +#: builtin/branch.c:653

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

4135 msgstr "afficher le hachage et le sujet, doublé pour la branche amont"

4136

3863 -#: builtin/branch.c:618

4137 +#: builtin/branch.c:654

4138 msgid "suppress informational messages"

4139 msgstr "supprimer les messages d'information"

4140

3867 -#: builtin/branch.c:619

4141 +#: builtin/branch.c:655

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

4143 msgstr "régler le mode de suivi (voir git-pull(1))"

4144

3871 -#: builtin/branch.c:621

4145 +#: builtin/branch.c:657

4146 msgid "change upstream info"

4147 msgstr "modifier l'information amont"

4148

3875 -#: builtin/branch.c:625

4149 +#: builtin/branch.c:659

4150 +msgid "upstream"

4151 +msgstr "amont"

4152 +

4153 +#: builtin/branch.c:659

4154 +msgid "change the upstream info"

4155 +msgstr "modifier l'information amont"

4156 +

4157 +#: builtin/branch.c:661

4158 msgid "use colored output"

4159 msgstr "utiliser la coloration dans la sortie"

4160

3879 -#: builtin/branch.c:626

4161 +#: builtin/branch.c:662

4162 msgid "act on remote-tracking branches"

4163 msgstr "agir sur les branches de suivi distantes"

4164

3883 -#: builtin/branch.c:628 builtin/branch.c:629

4165 +#: builtin/branch.c:664 builtin/branch.c:665

4166 msgid "print only branches that contain the commit"

4167 msgstr "afficher seulement les branches qui contiennent le commit"

4168

3887 -#: builtin/branch.c:632

4169 +#: builtin/branch.c:668

4170 msgid "Specific git-branch actions:"

4171 msgstr "Actions spécifiques à git-branch :"

4172

3891 -#: builtin/branch.c:633

4173 +#: builtin/branch.c:669

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

4175 msgstr "afficher à la fois les branches de suivi et les branches locales"

4176

3895 -#: builtin/branch.c:635

4177 +#: builtin/branch.c:671

4178 msgid "delete fully merged branch"

4179 msgstr "supprimer une branche totalement fusionnée"

4180

3899 -#: builtin/branch.c:636

4181 +#: builtin/branch.c:672

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

4183 msgstr "supprimer une branche (même non fusionnée)"

4184

3903 -#: builtin/branch.c:637

4185 +#: builtin/branch.c:673

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

4187 msgstr "déplacer/renommer une branche et son reflog"

4188

3907 -#: builtin/branch.c:638

4189 +#: builtin/branch.c:674

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

4191 msgstr "déplacer/renommer une branche, même si la cible existe"

4192

3911 -#: builtin/branch.c:639

4193 +#: builtin/branch.c:675

4194 msgid "list branch names"

4195 msgstr "afficher les noms des branches"

4196

3915 -#: builtin/branch.c:640

4197 +#: builtin/branch.c:676

4198 msgid "create the branch's reflog"

4199 msgstr "créer le reflog de la branche"

4200

3919 -#: builtin/branch.c:642

4201 +#: builtin/branch.c:678

4202 msgid "edit the description for the branch"

4203 msgstr "éditer la description de la branche"

4204

3923 -#: builtin/branch.c:643

4205 +#: builtin/branch.c:679

4206 msgid "force creation, move/rename, deletion"

4207 msgstr "forcer la création, le déplacement/renommage, ou la suppression"

4208

3927 -#: builtin/branch.c:644

4209 +#: builtin/branch.c:680

4210 msgid "print only branches that are merged"

4211 msgstr "afficher seulement les branches qui sont fusionnées"

4212

3931 -#: builtin/branch.c:645

4213 +#: builtin/branch.c:681

4214 msgid "print only branches that are not merged"

4215 msgstr "afficher seulement les branches qui ne sont pas fusionnées"

4216

3935 -#: builtin/branch.c:646

4217 +#: builtin/branch.c:682

4218 msgid "list branches in columns"

4219 msgstr "afficher les branches en colonnes"

4220

3939 -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366

4221 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366

4222 msgid "key"

4223 msgstr "clé"

4224

3943 -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367

4225 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367

4226 msgid "field name to sort on"

4227 msgstr "nom du champ servant à trier"

4228

3947 -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401

4229 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401

4230 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567

4231 #: builtin/tag.c:369

4232 msgid "object"

4233 msgstr "objet"

4234

3953 -#: builtin/branch.c:651

4235 +#: builtin/branch.c:687

4236 msgid "print only branches of the object"

4237 msgstr "afficher seulement les branches de l'objet"

4238

3957 -#: builtin/branch.c:669

4239 +#: builtin/branch.c:705

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

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

4242

3961 -#: builtin/branch.c:673 builtin/clone.c:705

4243 +#: builtin/branch.c:709 builtin/clone.c:707

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

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

4246

3965 -#: builtin/branch.c:693

4247 +#: builtin/branch.c:729

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

4249 msgstr "--column et --verbose sont incompatibles"

4250

3969 -#: builtin/branch.c:704 builtin/branch.c:746

4251 +#: builtin/branch.c:740 builtin/branch.c:782

4252 msgid "branch name required"

4253 msgstr "le nom de branche est requis"

4254

3973 -#: builtin/branch.c:722

4255 +#: builtin/branch.c:758

4256 msgid "Cannot give description to detached HEAD"

4257 msgstr "Impossible de décrire une HEAD détachée"

4258

3977 -#: builtin/branch.c:727

4259 +#: builtin/branch.c:763

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

4261 msgstr "impossible d'éditer la description de plus d'une branche"

4262

3981 -#: builtin/branch.c:734

4263 +#: builtin/branch.c:770

4264 #, c-format

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

4266 msgstr "Aucun commit sur la branche '%s'."

4267

3986 -#: builtin/branch.c:737

4268 +#: builtin/branch.c:773

4269 #, c-format

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

4271 msgstr "Aucune branche nommée '%s'."

4272

3991 -#: builtin/branch.c:752

4273 +#: builtin/branch.c:788

4274 msgid "too many branches for a rename operation"

4275 msgstr "trop de branches pour une opération de renommage"

4276

3995 -#: builtin/branch.c:757

4277 +#: builtin/branch.c:793

4278 msgid "too many branches to set new upstream"

4279 msgstr "trop de branches pour spécifier une branche amont"

4280

3999 -#: builtin/branch.c:761

4281 +#: builtin/branch.c:797

4282 #, c-format

4283 msgid ""

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

@@ -4004,41 +4286,41 @@ msgstr ""

4286 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "

4287 "aucune branche."

4288

4007 -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807

4289 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843

4290 #, c-format

4291 msgid "no such branch '%s'"

4292 msgstr "pas de branche '%s'"

4293

4012 -#: builtin/branch.c:768

4294 +#: builtin/branch.c:804

4295 #, c-format

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

4297 msgstr "la branche '%s' n'existe pas"

4298

4017 -#: builtin/branch.c:780

4299 +#: builtin/branch.c:816

4300 msgid "too many branches to unset upstream"

4301 msgstr "trop de branches pour désactiver un amont"

4302

4021 -#: builtin/branch.c:784

4303 +#: builtin/branch.c:820

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

4305 msgstr ""

4306 "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "

4307 "aucune branche."

4308

4027 -#: builtin/branch.c:790

4309 +#: builtin/branch.c:826

4310 #, c-format

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

4312 msgstr "La branche '%s' n'a aucune information de branche amont"

4313

4032 -#: builtin/branch.c:804

4314 +#: builtin/branch.c:840

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

4316 msgstr "créer manuellement 'HEAD' n'a pas de sens"

4317

4036 -#: builtin/branch.c:810

4318 +#: builtin/branch.c:846

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

4320 msgstr ""

4321 "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"

4322

4041 -#: builtin/branch.c:813

4323 +#: builtin/branch.c:849

4324 #, c-format

4325 msgid ""

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

@@ -4047,7 +4329,7 @@ msgstr ""

4329 "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"

4330 "track ou --set-upstream-to\n"

4331

4050 -#: builtin/branch.c:830

4332 +#: builtin/branch.c:866

4333 #, c-format

4334 msgid ""

4335 "\n"

@@ -4058,16 +4340,6 @@ msgstr ""

4340 "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n"

4341 "\n"

4342

4061 -#: builtin/branch.c:831

4062 -#, c-format

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

4064 -msgstr " git branch -d %s\n"

4065 -

4066 -#: builtin/branch.c:832

4067 -#, c-format

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

4069 -msgstr " git branch --set-upstream-to %s\n"

4070 -

4343 #: builtin/bundle.c:51

4344 #, c-format

4345 msgid "%s is okay\n"

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

4441 msgstr ""

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

4443

4172 -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325

4444 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325

4445 msgid "suppress progress reporting"

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

4447

@@ -4261,8 +4533,9 @@ msgid "write the content to temporary files"

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

4534

4535 #: builtin/checkout-index.c:174 builtin/column.c:30

4264 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

4265 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175

4536 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494

4537 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500

4538 +#: builtin/submodule--helper.c:774

4539 msgid "string"

4540 msgstr "chaîne"

4541

@@ -4312,81 +4585,81 @@ msgstr "chemin '%s' : impossible de fusionner"

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

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

4587

4315 -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

4316 -#: builtin/checkout.c:260

4588 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

4589 +#: builtin/checkout.c:259

4590 #, c-format

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

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

4593

4321 -#: builtin/checkout.c:263 builtin/checkout.c:266

4594 +#: builtin/checkout.c:262 builtin/checkout.c:265

4595 #, c-format

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

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

4598

4326 -#: builtin/checkout.c:269

4599 +#: builtin/checkout.c:268

4600 #, c-format

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

4602 msgstr ""

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

4604 "même temps."

4605

4333 -#: builtin/checkout.c:280 builtin/checkout.c:474

4606 +#: builtin/checkout.c:279 builtin/checkout.c:473

4607 msgid "corrupt index file"

4608 msgstr "fichier d'index corrompu"

4609

4337 -#: builtin/checkout.c:340 builtin/checkout.c:347

4610 +#: builtin/checkout.c:339 builtin/checkout.c:346

4611 #, c-format

4612 msgid "path '%s' is unmerged"

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

4614

4342 -#: builtin/checkout.c:496

4615 +#: builtin/checkout.c:495

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

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

4618

4346 -#: builtin/checkout.c:623

4619 +#: builtin/checkout.c:622

4620 #, c-format

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

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

4623

4351 -#: builtin/checkout.c:661

4624 +#: builtin/checkout.c:660

4625 msgid "HEAD is now at"

4626 msgstr "HEAD est maintenant sur"

4627

4355 -#: builtin/checkout.c:665 builtin/clone.c:659

4628 +#: builtin/checkout.c:664 builtin/clone.c:661

4629 msgid "unable to update HEAD"

4630 msgstr "impossible de mettre à jour HEAD"

4631

4359 -#: builtin/checkout.c:669

4632 +#: builtin/checkout.c:668

4633 #, c-format

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

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

4636

4364 -#: builtin/checkout.c:672

4637 +#: builtin/checkout.c:671

4638 #, c-format

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

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

4641

4369 -#: builtin/checkout.c:676

4642 +#: builtin/checkout.c:675

4643 #, c-format

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

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

4646

4374 -#: builtin/checkout.c:678 builtin/checkout.c:1068

4647 +#: builtin/checkout.c:677 builtin/checkout.c:1067

4648 #, c-format

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

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

4651

4379 -#: builtin/checkout.c:680

4652 +#: builtin/checkout.c:679

4653 #, c-format

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

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

4656

4384 -#: builtin/checkout.c:732

4657 +#: builtin/checkout.c:731

4658 #, c-format

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

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

4661

4389 -#: builtin/checkout.c:738

4662 +#: builtin/checkout.c:737

4663 #, c-format

4664 msgid ""

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

@@ -4409,7 +4682,7 @@ msgstr[1] ""

4682 "\n"

4683 "%s\n"

4684

4412 -#: builtin/checkout.c:757

4685 +#: builtin/checkout.c:756

4686 #, c-format

4687 msgid ""

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

@@ -4438,151 +4711,151 @@ msgstr[1] ""

4711 "git branch <nouvelle-branche> %s\n"

4712 "\n"

4713

4441 -#: builtin/checkout.c:793

4714 +#: builtin/checkout.c:792

4715 msgid "internal error in revision walk"

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

4717

4445 -#: builtin/checkout.c:797

4718 +#: builtin/checkout.c:796

4719 msgid "Previous HEAD position was"

4720 msgstr "La position précédente de HEAD était sur"

4721

4449 -#: builtin/checkout.c:824 builtin/checkout.c:1063

4722 +#: builtin/checkout.c:823 builtin/checkout.c:1062

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

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

4725

4453 -#: builtin/checkout.c:969

4726 +#: builtin/checkout.c:968

4727 #, c-format

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

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

4730

4458 -#: builtin/checkout.c:1009 builtin/worktree.c:211

4731 +#: builtin/checkout.c:1008 builtin/worktree.c:212

4732 #, c-format

4733 msgid "invalid reference: %s"

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

4735

4463 -#: builtin/checkout.c:1038

4736 +#: builtin/checkout.c:1037

4737 #, c-format

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

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

4740

4468 -#: builtin/checkout.c:1077

4741 +#: builtin/checkout.c:1076

4742 msgid "paths cannot be used with switching branches"

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

4744

4472 -#: builtin/checkout.c:1080 builtin/checkout.c:1084

4745 +#: builtin/checkout.c:1079 builtin/checkout.c:1083

4746 #, c-format

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

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

4749

4477 -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096

4478 -#: builtin/checkout.c:1099

4750 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095

4751 +#: builtin/checkout.c:1098

4752 #, c-format

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

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

4755

4483 -#: builtin/checkout.c:1104

4756 +#: builtin/checkout.c:1103

4757 #, c-format

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

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

4760

4488 -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84

4489 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318

4490 -#: builtin/worktree.c:320

4761 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88

4762 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323

4763 +#: builtin/worktree.c:325

4764 msgid "branch"

4765 msgstr "branche"

4766

4494 -#: builtin/checkout.c:1138

4767 +#: builtin/checkout.c:1137

4768 msgid "create and checkout a new branch"

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

4770

4498 -#: builtin/checkout.c:1140

4771 +#: builtin/checkout.c:1139

4772 msgid "create/reset and checkout a branch"

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

4774

4502 -#: builtin/checkout.c:1141

4775 +#: builtin/checkout.c:1140

4776 msgid "create reflog for new branch"

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

4778

4506 -#: builtin/checkout.c:1142

4779 +#: builtin/checkout.c:1141

4780 msgid "detach the HEAD at named commit"

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

4782

4510 -#: builtin/checkout.c:1143

4783 +#: builtin/checkout.c:1142

4784 msgid "set upstream info for new branch"

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

4786

4514 -#: builtin/checkout.c:1145

4787 +#: builtin/checkout.c:1144

4788 msgid "new-branch"

4789 msgstr "nouvelle branche"

4790

4518 -#: builtin/checkout.c:1145

4791 +#: builtin/checkout.c:1144

4792 msgid "new unparented branch"

4793 msgstr "nouvelle branche sans parent"

4794

4522 -#: builtin/checkout.c:1146

4795 +#: builtin/checkout.c:1145

4796 msgid "checkout our version for unmerged files"

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

4798

4526 -#: builtin/checkout.c:1148

4799 +#: builtin/checkout.c:1147

4800 msgid "checkout their version for unmerged files"

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

4802

4530 -#: builtin/checkout.c:1150

4803 +#: builtin/checkout.c:1149

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

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

4806

4534 -#: builtin/checkout.c:1151

4807 +#: builtin/checkout.c:1150

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

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

4810

4538 -#: builtin/checkout.c:1152 builtin/merge.c:227

4811 +#: builtin/checkout.c:1151 builtin/merge.c:230

4812 msgid "update ignored files (default)"

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

4814

4542 -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250

4815 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250

4816 msgid "style"

4817 msgstr "style"

4818

4546 -#: builtin/checkout.c:1154

4819 +#: builtin/checkout.c:1153

4820 msgid "conflict style (merge or diff3)"

4821 msgstr "style de conflit (merge (fusion) ou diff3)"

4822

4550 -#: builtin/checkout.c:1157

4823 +#: builtin/checkout.c:1156

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

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

4826

4554 -#: builtin/checkout.c:1159

4827 +#: builtin/checkout.c:1158

4828 msgid "second guess 'git checkout <no-such-branch>'"

4829 msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"

4830

4558 -#: builtin/checkout.c:1161

4831 +#: builtin/checkout.c:1160

4832 msgid "do not check if another worktree is holding the given ref"

4833 msgstr ""

4834 "ne pas vérifier si une autre copie de travail contient le référence fournie"

4835

4563 -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116

4564 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526

4836 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116

4837 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526

4838 #: builtin/send-pack.c:168

4839 msgid "force progress reporting"

4840 msgstr "forcer l'affichage de l'état d'avancement"

4841

4569 -#: builtin/checkout.c:1193

4842 +#: builtin/checkout.c:1192

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

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

4845

4573 -#: builtin/checkout.c:1210

4846 +#: builtin/checkout.c:1209

4847 msgid "--track needs a branch name"

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

4849

4577 -#: builtin/checkout.c:1215

4850 +#: builtin/checkout.c:1214

4851 msgid "Missing branch name; try -b"

4852 msgstr "Nom de branche manquant ; essayez -b"

4853

4581 -#: builtin/checkout.c:1251

4854 +#: builtin/checkout.c:1250

4855 msgid "invalid path specification"

4856 msgstr "spécification de chemin invalide"

4857

4585 -#: builtin/checkout.c:1258

4858 +#: builtin/checkout.c:1257

4859 #, c-format

4860 msgid ""

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

@@ -4592,12 +4865,12 @@ msgstr ""

4865 "en même temps.\n"

4866 "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?"

4867

4595 -#: builtin/checkout.c:1263

4868 +#: builtin/checkout.c:1262

4869 #, c-format

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

4871 msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"

4872

4600 -#: builtin/checkout.c:1267

4873 +#: builtin/checkout.c:1266

4874 msgid ""

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

4876 "checking out of the index."

@@ -4749,8 +5022,8 @@ msgstr "nettoyage interactif"

5022 msgid "remove whole directories"

5023 msgstr "supprimer les répertoires entiers"

5024

4752 -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722

4753 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182

5025 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724

5026 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182

5027 msgid "pattern"

5028 msgstr "motif"

5029

@@ -4790,103 +5063,112 @@ msgstr ""

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

5064 msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"

5065

4793 -#: builtin/clone.c:60

5066 +#: builtin/clone.c:62

5067 msgid "don't create a checkout"

5068 msgstr "ne pas créer d'extraction"

5069

4797 -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469

5070 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473

5071 msgid "create a bare repository"

5072 msgstr "créer un dépôt nu"

5073

4801 -#: builtin/clone.c:65

5074 +#: builtin/clone.c:67

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

5076 msgstr "créer un dépôt miroir (implique dépôt nu)"

5077

4805 -#: builtin/clone.c:67

5078 +#: builtin/clone.c:69

5079 msgid "to clone from a local repository"

5080 msgstr "pour cloner depuis un dépôt local"

5081

4809 -#: builtin/clone.c:69

5082 +#: builtin/clone.c:71

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

5084 msgstr "ne pas utiliser de liens durs locaux, toujours copier"

5085

4813 -#: builtin/clone.c:71

5086 +#: builtin/clone.c:73

5087 msgid "setup as shared repository"

5088 msgstr "régler comme dépôt partagé"

5089

4817 -#: builtin/clone.c:73 builtin/clone.c:75

5090 +#: builtin/clone.c:75 builtin/clone.c:77

5091 msgid "initialize submodules in the clone"

5092 msgstr "initialiser les sous-modules dans le clone"

5093

4821 -#: builtin/clone.c:76 builtin/init-db.c:466

5094 +#: builtin/clone.c:79

5095 +msgid "number of submodules cloned in parallel"

5096 +msgstr "nombre de sous-modules clonés en parallèle"

5097 +

5098 +#: builtin/clone.c:80 builtin/init-db.c:470

5099 msgid "template-directory"

5100 msgstr "répertoire-modèle"

5101

4825 -#: builtin/clone.c:77 builtin/init-db.c:467

5102 +#: builtin/clone.c:81 builtin/init-db.c:471

5103 msgid "directory from which templates will be used"

5104 msgstr "répertoire depuis lequel les modèles vont être utilisés"

5105

4829 -#: builtin/clone.c:79 builtin/submodule--helper.c:173

5106 +#: builtin/clone.c:83 builtin/submodule--helper.c:498

5107 +#: builtin/submodule--helper.c:777

5108 msgid "reference repository"

5109 msgstr "dépôt de référence"

5110

4833 -#: builtin/clone.c:81

5111 +#: builtin/clone.c:85

5112 msgid "use --reference only while cloning"

5113 msgstr "utiliser seulement --reference pour cloner"

5114

4837 -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44

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

5116 msgid "name"

5117 msgstr "nom"

5118

4841 -#: builtin/clone.c:83

5119 +#: builtin/clone.c:87

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

5121 msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"

5122

4845 -#: builtin/clone.c:85

5123 +#: builtin/clone.c:89

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

5125 msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"

5126

4849 -#: builtin/clone.c:87

5127 +#: builtin/clone.c:91

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

5129 msgstr "chemin vers git-upload-pack sur le serveur distant"

5130

4853 -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 builtin/pull.c:193

5131 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201

5132 msgid "depth"

5133 msgstr "profondeur"

5134

4857 -#: builtin/clone.c:89

5135 +#: builtin/clone.c:93

5136 msgid "create a shallow clone of that depth"

5137 msgstr "créer un clone superficiel de cette profondeur"

5138

4861 -#: builtin/clone.c:91

5139 +#: builtin/clone.c:95

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

5141 msgstr "cloner seulement une branche, HEAD ou --branch"

5142

4865 -#: builtin/clone.c:92 builtin/init-db.c:475

5143 +#: builtin/clone.c:97

5144 +msgid "any cloned submodules will be shallow"

5145 +msgstr "tous les sous-modules clonés seront superficiels"

5146 +

5147 +#: builtin/clone.c:98 builtin/init-db.c:479

5148 msgid "gitdir"

5149 msgstr "gitdir"

5150

4869 -#: builtin/clone.c:93 builtin/init-db.c:476

5151 +#: builtin/clone.c:99 builtin/init-db.c:480

5152 msgid "separate git dir from working tree"

5153 msgstr "séparer le répertoire git de la copie de travail"

5154

4873 -#: builtin/clone.c:94

5155 +#: builtin/clone.c:100

5156 msgid "key=value"

5157 msgstr "clé=valeur"

5158

4877 -#: builtin/clone.c:95

5159 +#: builtin/clone.c:101

5160 msgid "set config inside the new repository"

5161 msgstr "régler la configuration dans le nouveau dépôt"

5162

4881 -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536

5163 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536

5164 msgid "use IPv4 addresses only"

5165 msgstr "n'utiliser que des adresses IPv4"

5166

4885 -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538

5167 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538

5168 msgid "use IPv6 addresses only"

5169 msgstr "n'utiliser que des adresses IPv6"

5170

4889 -#: builtin/clone.c:239

5171 +#: builtin/clone.c:241

5172 msgid ""

5173 "No directory name could be guessed.\n"

5174 "Please specify a directory on the command line"

@@ -4894,59 +5176,54 @@ msgstr ""

5176 "Aucun nom de répertoire n'a pu être deviné\n"

5177 "Veuillez spécifier un répertoire dans la ligne de commande"

5178

4897 -#: builtin/clone.c:305

5179 +#: builtin/clone.c:307

5180 #, c-format

5181 msgid "reference repository '%s' as a linked checkout is not supported yet."

5182 msgstr ""

5183 "extraire le dépôt de référence '%s' comme une extraction liée n'est pas "

5184 "encore supporté."

5185

4904 -#: builtin/clone.c:307

5186 +#: builtin/clone.c:309

5187 #, c-format

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

5189 msgstr "le dépôt de référence '%s' n'est pas un dépôt local."

5190

4909 -#: builtin/clone.c:312

5191 +#: builtin/clone.c:314

5192 #, c-format

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

5194 msgstr "le dépôt de référence '%s' est superficiel"

5195

4914 -#: builtin/clone.c:315

5196 +#: builtin/clone.c:317

5197 #, c-format

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

5199 msgstr "le dépôt de référence '%s' est greffé"

5200

4919 -#: builtin/clone.c:380 builtin/diff.c:84

4920 -#, c-format

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

4922 -msgstr "échec du stat de '%s'"

4923 -

4924 -#: builtin/clone.c:382

5201 +#: builtin/clone.c:384

5202 #, c-format

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

5204 msgstr "%s existe et n'est pas un répertoire"

5205

4929 -#: builtin/clone.c:396

5206 +#: builtin/clone.c:398

5207 #, c-format

5208 msgid "failed to stat %s\n"

5209 msgstr "échec du stat de %s\n"

5210

4934 -#: builtin/clone.c:418

5211 +#: builtin/clone.c:420

5212 #, c-format

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

5214 msgstr "échec de la création du lien '%s'"

5215

4939 -#: builtin/clone.c:422

5216 +#: builtin/clone.c:424

5217 #, c-format

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

5219 msgstr "échec de la copie vers '%s'"

5220

4944 -#: builtin/clone.c:447 builtin/clone.c:631

5221 +#: builtin/clone.c:449 builtin/clone.c:633

5222 #, c-format

5223 msgid "done.\n"

5224 msgstr "fait.\n"

5225

4949 -#: builtin/clone.c:459

5226 +#: builtin/clone.c:461

5227 msgid ""

5228 "Clone succeeded, but checkout failed.\n"

5229 "You can inspect what was checked out with 'git status'\n"

@@ -4956,130 +5233,130 @@ msgstr ""

5233 "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"

5234 "et réessayer l'extraction avec 'git checkout -f HEAD'\n"

5235

4959 -#: builtin/clone.c:536

5236 +#: builtin/clone.c:538

5237 #, c-format

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

5239 msgstr "Impossible de trouver la branche distante '%s' à cloner."

5240

4964 -#: builtin/clone.c:626

5241 +#: builtin/clone.c:628

5242 #, c-format

5243 msgid "Checking connectivity... "

5244 msgstr "Vérification de la connectivité... "

5245

4969 -#: builtin/clone.c:629

5246 +#: builtin/clone.c:631

5247 msgid "remote did not send all necessary objects"

5248 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"

5249

4973 -#: builtin/clone.c:647

5250 +#: builtin/clone.c:649

5251 #, c-format

5252 msgid "unable to update %s"

5253 msgstr "impossible de mettre à jour %s"

5254

4978 -#: builtin/clone.c:696

5255 +#: builtin/clone.c:698

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

5257 msgstr ""

5258 "la HEAD distante réfère à une référence non existante, impossible de "

5259 "l'extraire.\n"

5260

4984 -#: builtin/clone.c:727

5261 +#: builtin/clone.c:729

5262 msgid "unable to checkout working tree"

5263 msgstr "impossible d'extraire la copie de travail"

5264

4988 -#: builtin/clone.c:753

5265 +#: builtin/clone.c:767

5266 msgid "unable to write parameters to config file"

5267 msgstr "impossible d'écrire les paramètres dans le fichier de configuration"

5268

4992 -#: builtin/clone.c:816

5269 +#: builtin/clone.c:830

5270 msgid "cannot repack to clean up"

5271 msgstr "impossible de remballer pour nettoyer"

5272

4996 -#: builtin/clone.c:818

5273 +#: builtin/clone.c:832

5274 msgid "cannot unlink temporary alternates file"

5275 msgstr "impossible de unlinker le fichier temporaire alternates"

5276

5000 -#: builtin/clone.c:850

5277 +#: builtin/clone.c:864 builtin/receive-pack.c:1731

5278 msgid "Too many arguments."

5279 msgstr "Trop d'arguments."

5280

5004 -#: builtin/clone.c:854

5281 +#: builtin/clone.c:868

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

5283 msgstr "Vous devez spécifier un dépôt à cloner."

5284

5008 -#: builtin/clone.c:865

5285 +#: builtin/clone.c:879

5286 #, c-format

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

5288 msgstr "les options --bare et --origin %s sont incompatibles."

5289

5013 -#: builtin/clone.c:868

5290 +#: builtin/clone.c:882

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

5292 msgstr "--bare et --separate-git-dir sont incompatibles."

5293

5017 -#: builtin/clone.c:881

5294 +#: builtin/clone.c:895

5295 #, c-format

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

5297 msgstr "le dépôt '%s' n'existe pas"

5298

5022 -#: builtin/clone.c:887 builtin/fetch.c:1174

5299 +#: builtin/clone.c:901 builtin/fetch.c:1174

5300 #, c-format

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

5302 msgstr "la profondeur %s n'est pas un entier positif"

5303

5027 -#: builtin/clone.c:897

5304 +#: builtin/clone.c:911

5305 #, c-format

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

5307 msgstr ""

5308 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."

5309

5033 -#: builtin/clone.c:907

5310 +#: builtin/clone.c:921

5311 #, c-format

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

5313 msgstr "la copie de travail '%s' existe déjà."

5314

5038 -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218

5039 -#: builtin/worktree.c:219 builtin/worktree.c:246

5315 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547

5316 +#: builtin/worktree.c:220 builtin/worktree.c:247

5317 #, c-format

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

5319 msgstr "impossible de créer les répertoires de premier niveau dans '%s'"

5320

5044 -#: builtin/clone.c:925

5321 +#: builtin/clone.c:939

5322 #, c-format

5323 msgid "could not create work tree dir '%s'"

5324 msgstr "impossible de créer le répertoire de la copie de travail '%s'"

5325

5049 -#: builtin/clone.c:943

5326 +#: builtin/clone.c:957

5327 #, c-format

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

5329 msgstr "Clonage dans le dépôt nu '%s'\n"

5330

5054 -#: builtin/clone.c:945

5331 +#: builtin/clone.c:959

5332 #, c-format

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

5334 msgstr "Clonage dans '%s'...\n"

5335

5059 -#: builtin/clone.c:984

5336 +#: builtin/clone.c:998

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

5338 msgstr ""

5339 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."

5340

5064 -#: builtin/clone.c:987

5341 +#: builtin/clone.c:1001

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

5343 msgstr "le dépôt source est superficiel, option --local ignorée"

5344

5068 -#: builtin/clone.c:992

5345 +#: builtin/clone.c:1006

5346 msgid "--local is ignored"

5347 msgstr "--local est ignoré"

5348

5072 -#: builtin/clone.c:996

5349 +#: builtin/clone.c:1010

5350 #, c-format

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

5352 msgstr "Je ne sais pas cloner %s"

5353

5077 -#: builtin/clone.c:1045 builtin/clone.c:1053

5354 +#: builtin/clone.c:1059 builtin/clone.c:1067

5355 #, c-format

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

5357 msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"

5358

5082 -#: builtin/clone.c:1056

5359 +#: builtin/clone.c:1070

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

5361 msgstr "Vous semblez avoir cloné un dépôt vide."

5362

@@ -5222,66 +5499,66 @@ msgstr ""

5499 "Puis \"git cherry-pick --continue\" continuera le picorage \n"

5500 "des commits restants.\n"

5501

5225 -#: builtin/commit.c:305

5502 +#: builtin/commit.c:307

5503 msgid "failed to unpack HEAD tree object"

5504 msgstr "échec du dépaquetage de l'objet arbre HEAD"

5505

5229 -#: builtin/commit.c:346

5506 +#: builtin/commit.c:348

5507 msgid "unable to create temporary index"

5508 msgstr "impossible de créer l'index temporaire"

5509

5233 -#: builtin/commit.c:352

5510 +#: builtin/commit.c:354

5511 msgid "interactive add failed"

5512 msgstr "échec de l'ajout interactif"

5513

5237 -#: builtin/commit.c:365

5514 +#: builtin/commit.c:367

5515 msgid "unable to update temporary index"

5516 msgstr "impossible de mettre à jour l'index temporaire"

5517

5241 -#: builtin/commit.c:367

5518 +#: builtin/commit.c:369

5519 msgid "Failed to update main cache tree"

5520 msgstr "Impossible de mettre à jour l'arbre de cache principal"

5521

5245 -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463

5522 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465

5523 msgid "unable to write new_index file"

5524 msgstr "impossible d'écrire le fichier new_index"

5525

5249 -#: builtin/commit.c:445

5526 +#: builtin/commit.c:447

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

5528 msgstr "impossible de faire une validation partielle pendant une fusion."

5529

5253 -#: builtin/commit.c:447

5530 +#: builtin/commit.c:449

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

5532 msgstr "impossible de faire une validation partielle pendant un picorage."

5533

5257 -#: builtin/commit.c:456

5534 +#: builtin/commit.c:458

5535 msgid "cannot read the index"

5536 msgstr "impossible de lire l'index"

5537

5261 -#: builtin/commit.c:475

5538 +#: builtin/commit.c:477

5539 msgid "unable to write temporary index file"

5540 msgstr "impossible d'écrire le fichier d'index temporaire"

5541

5265 -#: builtin/commit.c:580

5542 +#: builtin/commit.c:582

5543 #, c-format

5544 msgid "commit '%s' lacks author header"

5545 msgstr "entête d'auteur manquant dans le commit '%s'"

5546

5270 -#: builtin/commit.c:582

5547 +#: builtin/commit.c:584

5548 #, c-format

5549 msgid "commit '%s' has malformed author line"

5550 msgstr "le commit '%s' a une ligne d'auteur malformée"

5551

5275 -#: builtin/commit.c:601

5552 +#: builtin/commit.c:603

5553 msgid "malformed --author parameter"

5554 msgstr "paramètre --author mal formé"

5555

5279 -#: builtin/commit.c:609

5556 +#: builtin/commit.c:611

5557 #, c-format

5558 msgid "invalid date format: %s"

5559 msgstr "format de date invalide : %s"

5560

5284 -#: builtin/commit.c:653

5561 +#: builtin/commit.c:655

5562 msgid ""

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

5564 "in the current commit message"

@@ -5289,38 +5566,38 @@ msgstr ""

5566 "impossible de sélectionner un caractère de commentaire\n"

5567 "qui n'est pas utilisé dans le message de validation actuel"

5568

5292 -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080

5569 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091

5570 #, c-format

5571 msgid "could not lookup commit %s"

5572 msgstr "impossible de rechercher le commit %s"

5573

5297 -#: builtin/commit.c:702 builtin/shortlog.c:285

5574 +#: builtin/commit.c:704 builtin/shortlog.c:285

5575 #, c-format

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

5577 msgstr "(lecture du message de journal depuis l'entrée standard)\n"

5578

5302 -#: builtin/commit.c:704

5579 +#: builtin/commit.c:706

5580 msgid "could not read log from standard input"

5581 msgstr "impossible de lire le journal depuis l'entrée standard"

5582

5306 -#: builtin/commit.c:708

5583 +#: builtin/commit.c:710

5584 #, c-format

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

5586 msgstr "impossible de lire le fichier de journal '%s'"

5587

5311 -#: builtin/commit.c:730

5312 -msgid "could not read MERGE_MSG"

5313 -msgstr "impossible de lire MERGE_MSG"

5314 -

5315 -#: builtin/commit.c:734

5588 +#: builtin/commit.c:737 builtin/commit.c:745

5589 msgid "could not read SQUASH_MSG"

5590 msgstr "impossible de lire SQUASH_MSG"

5591

5319 -#: builtin/commit.c:785

5592 +#: builtin/commit.c:742

5593 +msgid "could not read MERGE_MSG"

5594 +msgstr "impossible de lire MERGE_MSG"

5595 +

5596 +#: builtin/commit.c:796

5597 msgid "could not write commit template"

5598 msgstr "impossible d'écrire le modèle de commit"

5599

5323 -#: builtin/commit.c:803

5600 +#: builtin/commit.c:814

5601 #, c-format

5602 msgid ""

5603 "\n"

@@ -5335,7 +5612,7 @@ msgstr ""

5612 "\t%s\n"

5613 "et essayez à nouveau.\n"

5614

5338 -#: builtin/commit.c:808

5615 +#: builtin/commit.c:819

5616 #, c-format

5617 msgid ""

5618 "\n"

@@ -5350,7 +5627,7 @@ msgstr ""

5627 "\t%s\n"

5628 "et essayez à nouveau.\n"

5629

5353 -#: builtin/commit.c:821

5630 +#: builtin/commit.c:832

5631 #, c-format

5632 msgid ""

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

@@ -5360,7 +5637,7 @@ msgstr ""

5637 "commençant par '%c' seront ignorées, et un message vide abandonne la "

5638 "validation.\n"

5639

5363 -#: builtin/commit.c:828

5640 +#: builtin/commit.c:839

5641 #, c-format

5642 msgid ""

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

@@ -5371,150 +5648,150 @@ msgstr ""

5648 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"

5649 "si vous le souhaitez. Un message vide abandonne la validation.\n"

5650

5374 -#: builtin/commit.c:848

5651 +#: builtin/commit.c:859

5652 #, c-format

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

5654 msgstr "%sAuteur : %.*s <%.*s>"

5655

5379 -#: builtin/commit.c:856

5656 +#: builtin/commit.c:867

5657 #, c-format

5658 msgid "%sDate: %s"

5659 msgstr "%sDate : %s"

5660

5384 -#: builtin/commit.c:863

5661 +#: builtin/commit.c:874

5662 #, c-format

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

5664 msgstr "%sValidateur : %.*s <%.*s>"

5665

5389 -#: builtin/commit.c:881

5666 +#: builtin/commit.c:892

5667 msgid "Cannot read index"

5668 msgstr "Impossible de lire l'index"

5669

5393 -#: builtin/commit.c:938

5670 +#: builtin/commit.c:949

5671 msgid "Error building trees"

5672 msgstr "Erreur lors de la construction des arbres"

5673

5397 -#: builtin/commit.c:953 builtin/tag.c:266

5674 +#: builtin/commit.c:964 builtin/tag.c:266

5675 #, c-format

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

5677 msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n"

5678

5402 -#: builtin/commit.c:1055

5679 +#: builtin/commit.c:1066

5680 #, c-format

5681 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

5682 msgstr ""

5683 "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "

5684 "auteur existant"

5685

5409 -#: builtin/commit.c:1070 builtin/commit.c:1310

5686 +#: builtin/commit.c:1081 builtin/commit.c:1321

5687 #, c-format

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

5689 msgstr "Mode de fichier non suivi invalide '%s'"

5690

5414 -#: builtin/commit.c:1107

5691 +#: builtin/commit.c:1118

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

5693 msgstr "--long et -z sont incompatibles"

5694

5418 -#: builtin/commit.c:1137

5695 +#: builtin/commit.c:1148

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

5697 msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens"

5698

5422 -#: builtin/commit.c:1146

5699 +#: builtin/commit.c:1157

5700 msgid "You have nothing to amend."

5701 msgstr "Il n'y a rien à corriger."

5702

5426 -#: builtin/commit.c:1149

5703 +#: builtin/commit.c:1160

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

5705 msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."

5706

5430 -#: builtin/commit.c:1151

5707 +#: builtin/commit.c:1162

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

5709 msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."

5710

5434 -#: builtin/commit.c:1154

5711 +#: builtin/commit.c:1165

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

5713 msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble"

5714

5438 -#: builtin/commit.c:1164

5715 +#: builtin/commit.c:1175

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

5717 msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée."

5718

5442 -#: builtin/commit.c:1166

5719 +#: builtin/commit.c:1177

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

5721 msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."

5722

5446 -#: builtin/commit.c:1174

5723 +#: builtin/commit.c:1185

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

5725 msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend."

5726

5450 -#: builtin/commit.c:1191

5727 +#: builtin/commit.c:1202

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

5729 msgstr ""

5730 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "

5731 "être utilisée."

5732

5456 -#: builtin/commit.c:1193

5733 +#: builtin/commit.c:1204

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

5735 msgstr "Aucun chemin avec les options --include/--only n'a pas de sens."

5736

5460 -#: builtin/commit.c:1195

5737 +#: builtin/commit.c:1206

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

5739 msgstr "Malin... correction du dernier avec un index sale."

5740

5464 -#: builtin/commit.c:1197

5741 +#: builtin/commit.c:1208

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

5743 msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..."

5744

5468 -#: builtin/commit.c:1209 builtin/tag.c:475

5745 +#: builtin/commit.c:1220 builtin/tag.c:474

5746 #, c-format

5747 msgid "Invalid cleanup mode %s"

5748 msgstr "Mode de nettoyage invalide %s"

5749

5473 -#: builtin/commit.c:1214

5750 +#: builtin/commit.c:1225

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

5752 msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."

5753

5477 -#: builtin/commit.c:1324 builtin/commit.c:1605

5754 +#: builtin/commit.c:1335 builtin/commit.c:1621

5755 msgid "show status concisely"

5756 msgstr "afficher le statut avec concision"

5757

5481 -#: builtin/commit.c:1326 builtin/commit.c:1607

5758 +#: builtin/commit.c:1337 builtin/commit.c:1623

5759 msgid "show branch information"

5760 msgstr "afficher l'information de branche"

5761

5485 -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512

5486 -#: builtin/worktree.c:430

5762 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512

5763 +#: builtin/worktree.c:437

5764 msgid "machine-readable output"

5765 msgstr "sortie pour traitement automatique"

5766

5490 -#: builtin/commit.c:1331 builtin/commit.c:1611

5767 +#: builtin/commit.c:1342 builtin/commit.c:1627

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

5769 msgstr "afficher le statut en format long (par défaut)"

5770

5494 -#: builtin/commit.c:1334 builtin/commit.c:1614

5771 +#: builtin/commit.c:1345 builtin/commit.c:1630

5772 msgid "terminate entries with NUL"

5773 msgstr "terminer les éléments par NUL"

5774

5498 -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981

5775 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981

5776 #: builtin/fast-export.c:984 builtin/tag.c:353

5777 msgid "mode"

5778 msgstr "mode"

5779

5503 -#: builtin/commit.c:1337 builtin/commit.c:1617

5780 +#: builtin/commit.c:1348 builtin/commit.c:1633

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

5782 msgstr ""

5783 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "

5784 "no. (Défaut : all)"

5785

5509 -#: builtin/commit.c:1340

5786 +#: builtin/commit.c:1351

5787 msgid "show ignored files"

5788 msgstr "afficher les fichiers ignorés"

5789

5513 -#: builtin/commit.c:1341 parse-options.h:155

5790 +#: builtin/commit.c:1352 parse-options.h:155

5791 msgid "when"

5792 msgstr "quand"

5793

5517 -#: builtin/commit.c:1342

5794 +#: builtin/commit.c:1353

5795 msgid ""

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

5797 "(Default: all)"

@@ -5522,201 +5799,201 @@ msgstr ""

5799 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "

5800 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"

5801

5525 -#: builtin/commit.c:1344

5802 +#: builtin/commit.c:1355

5803 msgid "list untracked files in columns"

5804 msgstr "afficher les fichiers non suivis en colonnes"

5805

5529 -#: builtin/commit.c:1430

5806 +#: builtin/commit.c:1441

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

5808 msgstr "impossible de retrouver le commit nouvellement créé"

5809

5533 -#: builtin/commit.c:1432

5810 +#: builtin/commit.c:1443

5811 msgid "could not parse newly created commit"

5812 msgstr "impossible d'analyser le commit nouvellement créé"

5813

5537 -#: builtin/commit.c:1477

5814 +#: builtin/commit.c:1488

5815 msgid "detached HEAD"

5816 msgstr "HEAD détachée"

5817

5541 -#: builtin/commit.c:1480

5818 +#: builtin/commit.c:1491

5819 msgid " (root-commit)"

5820 msgstr " (commit racine)"

5821

5545 -#: builtin/commit.c:1575

5822 +#: builtin/commit.c:1591

5823 msgid "suppress summary after successful commit"

5824 msgstr "supprimer le résumé après une validation réussie"

5825

5549 -#: builtin/commit.c:1576

5826 +#: builtin/commit.c:1592

5827 msgid "show diff in commit message template"

5828 msgstr "afficher les diff dans le modèle de message de validation"

5829

5553 -#: builtin/commit.c:1578

5830 +#: builtin/commit.c:1594

5831 msgid "Commit message options"

5832 msgstr "Options du message de validation"

5833

5557 -#: builtin/commit.c:1579 builtin/tag.c:351

5834 +#: builtin/commit.c:1595 builtin/tag.c:351

5835 msgid "read message from file"

5836 msgstr "lire le message depuis un fichier"

5837

5561 -#: builtin/commit.c:1580

5838 +#: builtin/commit.c:1596

5839 msgid "author"

5840 msgstr "auteur"

5841

5565 -#: builtin/commit.c:1580

5842 +#: builtin/commit.c:1596

5843 msgid "override author for commit"

5844 msgstr "remplacer l'auteur pour la validation"

5845

5569 -#: builtin/commit.c:1581 builtin/gc.c:326

5846 +#: builtin/commit.c:1597 builtin/gc.c:326

5847 msgid "date"

5848 msgstr "date"

5849

5573 -#: builtin/commit.c:1581

5850 +#: builtin/commit.c:1597

5851 msgid "override date for commit"

5852 msgstr "remplacer la date pour la validation"

5853

5577 -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395

5854 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395

5855 #: builtin/notes.c:558 builtin/tag.c:349

5856 msgid "message"

5857 msgstr "message"

5858

5582 -#: builtin/commit.c:1582

5859 +#: builtin/commit.c:1598

5860 msgid "commit message"

5861 msgstr "message de validation"

5862

5586 -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585

5587 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79

5863 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601

5864 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79

5865 msgid "commit"

5866 msgstr "commit"

5867

5591 -#: builtin/commit.c:1583

5868 +#: builtin/commit.c:1599

5869 msgid "reuse and edit message from specified commit"

5870 msgstr "réutiliser et éditer le message du commit spécifié"

5871

5595 -#: builtin/commit.c:1584

5872 +#: builtin/commit.c:1600

5873 msgid "reuse message from specified commit"

5874 msgstr "réutiliser le message du commit spécifié"

5875

5599 -#: builtin/commit.c:1585

5876 +#: builtin/commit.c:1601

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

5878 msgstr ""

5879 "utiliser un message au format autosquash pour corriger le commit spécifié"

5880

5604 -#: builtin/commit.c:1586

5881 +#: builtin/commit.c:1602

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

5883 msgstr ""

5884 "utiliser un message au format autosquash pour compresser le commit spécifié"

5885

5609 -#: builtin/commit.c:1587

5886 +#: builtin/commit.c:1603

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

5888 msgstr ""

5889 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"

5890

5614 -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86

5891 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86

5892 msgid "add Signed-off-by:"

5893 msgstr "ajouter une entrée Signed-off-by :"

5894

5618 -#: builtin/commit.c:1589

5895 +#: builtin/commit.c:1605

5896 msgid "use specified template file"

5897 msgstr "utiliser le fichier de modèle spécifié"

5898

5622 -#: builtin/commit.c:1590

5899 +#: builtin/commit.c:1606

5900 msgid "force edit of commit"

5901 msgstr "forcer l'édition du commit"

5902

5626 -#: builtin/commit.c:1591

5903 +#: builtin/commit.c:1607

5904 msgid "default"

5905 msgstr "défaut"

5906

5630 -#: builtin/commit.c:1591 builtin/tag.c:354

5907 +#: builtin/commit.c:1607 builtin/tag.c:354

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

5909 msgstr "comment éliminer les espaces et les commentaires # du message"

5910

5634 -#: builtin/commit.c:1592

5911 +#: builtin/commit.c:1608

5912 msgid "include status in commit message template"

5913 msgstr "inclure le statut dans le modèle de message de validation"

5914

5638 -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160

5915 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165

5916 #: builtin/revert.c:93

5917 msgid "GPG sign commit"

5918 msgstr "signer la validation avec GPG"

5919

5643 -#: builtin/commit.c:1597

5920 +#: builtin/commit.c:1613

5921 msgid "Commit contents options"

5922 msgstr "Valider les options des contenus"

5923

5647 -#: builtin/commit.c:1598

5924 +#: builtin/commit.c:1614

5925 msgid "commit all changed files"

5926 msgstr "valider tous les fichiers modifiés"

5927

5651 -#: builtin/commit.c:1599

5928 +#: builtin/commit.c:1615

5929 msgid "add specified files to index for commit"

5930 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"

5931

5655 -#: builtin/commit.c:1600

5932 +#: builtin/commit.c:1616

5933 msgid "interactively add files"

5934 msgstr "ajouter des fichiers en mode interactif"

5935

5659 -#: builtin/commit.c:1601

5936 +#: builtin/commit.c:1617

5937 msgid "interactively add changes"

5938 msgstr "ajouter les modifications en mode interactif"

5939

5663 -#: builtin/commit.c:1602

5940 +#: builtin/commit.c:1618

5941 msgid "commit only specified files"

5942 msgstr "valider seulement les fichiers spécifiés"

5943

5667 -#: builtin/commit.c:1603

5944 +#: builtin/commit.c:1619

5945 msgid "bypass pre-commit hook"

5946 msgstr "éviter d'utiliser le crochet pre-commit"

5947

5671 -#: builtin/commit.c:1604

5948 +#: builtin/commit.c:1620

5949 msgid "show what would be committed"

5950 msgstr "afficher ce qui serait validé"

5951

5675 -#: builtin/commit.c:1615

5952 +#: builtin/commit.c:1631

5953 msgid "amend previous commit"

5954 msgstr "corriger la validation précédente"

5955

5679 -#: builtin/commit.c:1616

5956 +#: builtin/commit.c:1632

5957 msgid "bypass post-rewrite hook"

5958 msgstr "éviter d'utiliser le crochet post-rewrite"

5959

5683 -#: builtin/commit.c:1621

5960 +#: builtin/commit.c:1637

5961 msgid "ok to record an empty change"

5962 msgstr "accepter d'enregistrer une modification vide"

5963

5687 -#: builtin/commit.c:1623

5964 +#: builtin/commit.c:1639

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

5966 msgstr "accepter d'enregistrer une modification avec un message vide"

5967

5691 -#: builtin/commit.c:1652

5968 +#: builtin/commit.c:1668

5969 msgid "could not parse HEAD commit"

5970 msgstr "impossible d'analyser le commit HEAD"

5971

5695 -#: builtin/commit.c:1698

5972 +#: builtin/commit.c:1718

5973 #, c-format

5974 msgid "Corrupt MERGE_HEAD file (%s)"

5975 msgstr "Fichier MERGE_HEAD corrompu (%s)"

5976

5700 -#: builtin/commit.c:1705

5977 +#: builtin/commit.c:1725

5978 msgid "could not read MERGE_MODE"

5979 msgstr "impossible de lire MERGE_MODE"

5980

5704 -#: builtin/commit.c:1724

5981 +#: builtin/commit.c:1744

5982 #, c-format

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

5984 msgstr "impossible de lire le message de validation : %s"

5985

5709 -#: builtin/commit.c:1735

5986 +#: builtin/commit.c:1755

5987 #, c-format

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

5989 msgstr "Abandon de la validation ; vous n'avez pas édité le message\n"

5990

5714 -#: builtin/commit.c:1740

5991 +#: builtin/commit.c:1760

5992 #, c-format

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

5994 msgstr "Abandon de la validation du à un message de validation vide\n"

5995

5719 -#: builtin/commit.c:1788

5996 +#: builtin/commit.c:1808

5997 msgid ""

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

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

@@ -5865,7 +6142,7 @@ msgstr ""

6142 msgid "unable to parse default color value"

6143 msgstr "impossible de lire la valeur de couleur par défaut"

6144

5868 -#: builtin/config.c:469

6145 +#: builtin/config.c:472

6146 #, c-format

6147 msgid ""

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

@@ -5880,7 +6157,7 @@ msgstr ""

6157 "#\tname = %s\n"

6158 "#\temail = %s\n"

6159

5883 -#: builtin/config.c:611

6160 +#: builtin/config.c:614

6161 #, c-format

6162 msgid "cannot create configuration file %s"

6163 msgstr "création impossible du fichier de configuration '%s'"

@@ -5916,7 +6193,7 @@ msgstr "l'étiquette annotée %s n'a pas de nom embarqué"

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

6194 msgstr "l'étiquette '%s' est en fait '%s'"

6195

5919 -#: builtin/describe.c:250 builtin/log.c:459

6196 +#: builtin/describe.c:250 builtin/log.c:465

6197 #, c-format

6198 msgid "Not a valid object name %s"

6199 msgstr "%s n'est pas un nom d'objet valide"

@@ -6011,7 +6288,7 @@ msgstr ""

6288 msgid "only consider tags matching <pattern>"

6289 msgstr "ne considérer que les étiquettes correspondant à <motif>"

6290

6014 -#: builtin/describe.c:410 builtin/name-rev.c:314

6291 +#: builtin/describe.c:410 builtin/name-rev.c:321

6292 msgid "show abbreviated commit object as fallback"

6293 msgstr "afficher les objets commits abrégés en dernier recours"

6294

@@ -6045,21 +6322,21 @@ msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique"

6322 msgid "invalid option: %s"

6323 msgstr "option invalide : %s"

6324

6048 -#: builtin/diff.c:358

6325 +#: builtin/diff.c:360

6326 msgid "Not a git repository"

6327 msgstr "Ce n'est pas un dépôt git !"

6328

6052 -#: builtin/diff.c:401

6329 +#: builtin/diff.c:403

6330 #, c-format

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

6332 msgstr "objet spécifié '%s' invalide."

6333

6057 -#: builtin/diff.c:410

6334 +#: builtin/diff.c:412

6335 #, c-format

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

6337 msgstr "plus de deux blobs spécifiés : '%s'"

6338

6062 -#: builtin/diff.c:417

6339 +#: builtin/diff.c:419

6340 #, c-format

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

6342 msgstr "objet non géré '%s' spécifié."

@@ -6133,19 +6410,19 @@ msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"

6410 msgid "git fetch --all [<options>]"

6411 msgstr "git fetch --all [<options>]"

6412

6136 -#: builtin/fetch.c:92 builtin/pull.c:166

6413 +#: builtin/fetch.c:92 builtin/pull.c:174

6414 msgid "fetch from all remotes"

6415 msgstr "récupérer depuis tous les dépôts distants"

6416

6140 -#: builtin/fetch.c:94 builtin/pull.c:169

6417 +#: builtin/fetch.c:94 builtin/pull.c:177

6418 msgid "append to .git/FETCH_HEAD instead of overwriting"

6419 msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"

6420

6144 -#: builtin/fetch.c:96 builtin/pull.c:172

6421 +#: builtin/fetch.c:96 builtin/pull.c:180

6422 msgid "path to upload pack on remote end"

6423 msgstr "chemin vers lequel télécharger le paquet sur le poste distant"

6424

6148 -#: builtin/fetch.c:97 builtin/pull.c:174

6425 +#: builtin/fetch.c:97 builtin/pull.c:182

6426 msgid "force overwrite of local branch"

6427 msgstr "forcer l'écrasement de la branche locale"

6428

@@ -6153,7 +6430,7 @@ msgstr "forcer l'écrasement de la branche locale"

6430 msgid "fetch from multiple remotes"

6431 msgstr "récupérer depuis plusieurs dépôts distants"

6432

6156 -#: builtin/fetch.c:101 builtin/pull.c:176

6433 +#: builtin/fetch.c:101 builtin/pull.c:184

6434 msgid "fetch all tags and associated objects"

6435 msgstr "récupérer toutes les étiquettes et leurs objets associés"

6436

@@ -6165,21 +6442,21 @@ msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"

6442 msgid "number of submodules fetched in parallel"

6443 msgstr "nombre de sous-modules récupérés en parallèle"

6444

6168 -#: builtin/fetch.c:107 builtin/pull.c:179

6445 +#: builtin/fetch.c:107 builtin/pull.c:187

6446 msgid "prune remote-tracking branches no longer on remote"

6447 msgstr ""

6448 "éliminer les branches de suivi distant si la branche n'existe plus dans le "

6449 "dépôt distant"

6450

6174 -#: builtin/fetch.c:108 builtin/pull.c:182

6451 +#: builtin/fetch.c:108 builtin/pull.c:190

6452 msgid "on-demand"

6453 msgstr "à la demande"

6454

6178 -#: builtin/fetch.c:109 builtin/pull.c:183

6455 +#: builtin/fetch.c:109 builtin/pull.c:191

6456 msgid "control recursive fetching of submodules"

6457 msgstr "contrôler la récupération récursive dans les sous-modules"

6458

6182 -#: builtin/fetch.c:113 builtin/pull.c:191

6459 +#: builtin/fetch.c:113 builtin/pull.c:199

6460 msgid "keep downloaded pack"

6461 msgstr "conserver le paquet téléchargé"

6462

@@ -6187,15 +6464,15 @@ msgstr "conserver le paquet téléchargé"

6464 msgid "allow updating of HEAD ref"

6465 msgstr "permettre la mise à jour de la référence HEAD"

6466

6190 -#: builtin/fetch.c:118 builtin/pull.c:194

6467 +#: builtin/fetch.c:118 builtin/pull.c:202

6468 msgid "deepen history of shallow clone"

6469 msgstr "approfondir l'historique d'un clone superficiel"

6470

6194 -#: builtin/fetch.c:120 builtin/pull.c:197

6471 +#: builtin/fetch.c:120 builtin/pull.c:205

6472 msgid "convert to a complete repository"

6473 msgstr "convertir en un dépôt complet"

6474

6198 -#: builtin/fetch.c:122 builtin/log.c:1236

6475 +#: builtin/fetch.c:122 builtin/log.c:1399

6476 msgid "dir"

6477 msgstr "répertoire"

6478

@@ -6207,15 +6484,15 @@ msgstr "préfixer ceci à la sortie du chemin du sous-module"

6484 msgid "default mode for recursion"

6485 msgstr "mode par défaut pour la récursion"

6486

6210 -#: builtin/fetch.c:128 builtin/pull.c:200

6487 +#: builtin/fetch.c:128 builtin/pull.c:208

6488 msgid "accept refs that update .git/shallow"

6489 msgstr "accepter les références qui mettent à jour .git/shallow"

6490

6214 -#: builtin/fetch.c:129 builtin/pull.c:202

6491 +#: builtin/fetch.c:129 builtin/pull.c:210

6492 msgid "refmap"

6493 msgstr "correspondance de référence"

6494

6218 -#: builtin/fetch.c:130 builtin/pull.c:203

6495 +#: builtin/fetch.c:130 builtin/pull.c:211

6496 msgid "specify fetch refmap"

6497 msgstr "spécifier une correspondance de référence pour la récupération"

6498

@@ -6273,11 +6550,6 @@ msgstr "mise à jour forcée"

6550 msgid "(non-fast-forward)"

6551 msgstr "(pas d'avance rapide)"

6552

6276 -#: builtin/fetch.c:610 builtin/fetch.c:851

6277 -#, c-format

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

6279 -msgstr "impossible d'ouvrir %s : %s\n"

6280 -

6553 #: builtin/fetch.c:619

6554 #, c-format

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

@@ -6480,56 +6752,56 @@ msgstr "Vérification de la connectivité"

6752 msgid "Checking object directories"

6753 msgstr "Vérification des répertoires d'objet"

6754

6483 -#: builtin/fsck.c:553

6755 +#: builtin/fsck.c:552

6756 msgid "git fsck [<options>] [<object>...]"

6757 msgstr "git fsck [<options>] [<objet>...]"

6758

6487 -#: builtin/fsck.c:559

6759 +#: builtin/fsck.c:558

6760 msgid "show unreachable objects"

6761 msgstr "afficher les objets inaccessibles"

6762

6491 -#: builtin/fsck.c:560

6763 +#: builtin/fsck.c:559

6764 msgid "show dangling objects"

6765 msgstr "afficher les objets en suspens"

6766

6495 -#: builtin/fsck.c:561

6767 +#: builtin/fsck.c:560

6768 msgid "report tags"

6769 msgstr "afficher les étiquettes"

6770

6499 -#: builtin/fsck.c:562

6771 +#: builtin/fsck.c:561

6772 msgid "report root nodes"

6773 msgstr "signaler les nœuds racines"

6774

6503 -#: builtin/fsck.c:563

6775 +#: builtin/fsck.c:562

6776 msgid "make index objects head nodes"

6777 msgstr "considérer les objets de l'index comme nœuds tête"

6778

6779 # translated from man page

6508 -#: builtin/fsck.c:564

6780 +#: builtin/fsck.c:563

6781 msgid "make reflogs head nodes (default)"

6782 msgstr "considérer les reflogs comme nœuds tête (par défaut)"

6783

6512 -#: builtin/fsck.c:565

6784 +#: builtin/fsck.c:564

6785 msgid "also consider packs and alternate objects"

6786 msgstr "inspecter aussi les objets pack et alternatifs"

6787

6516 -#: builtin/fsck.c:566

6788 +#: builtin/fsck.c:565

6789 msgid "check only connectivity"

6790 msgstr "ne vérifier que la connectivité"

6791

6520 -#: builtin/fsck.c:567

6792 +#: builtin/fsck.c:566

6793 msgid "enable more strict checking"

6794 msgstr "activer une vérification plus strict"

6795

6524 -#: builtin/fsck.c:569

6796 +#: builtin/fsck.c:568

6797 msgid "write dangling objects in .git/lost-found"

6798 msgstr "écrire les objets en suspens dans .git/lost-found"

6799

6528 -#: builtin/fsck.c:570 builtin/prune.c:107

6800 +#: builtin/fsck.c:569 builtin/prune.c:107

6801 msgid "show progress"

6802 msgstr "afficher la progression"

6803

6532 -#: builtin/fsck.c:631

6804 +#: builtin/fsck.c:630

6805 msgid "Checking objects"

6806 msgstr "Vérification des objets"

6807

@@ -6637,223 +6909,223 @@ msgstr "impossible de lire l'arbre (%s)"

6909 msgid "unable to grep from object of type %s"

6910 msgstr "impossible de faire un grep sur un objet de type %s"

6911

6640 -#: builtin/grep.c:558

6912 +#: builtin/grep.c:560

6913 #, c-format

6914 msgid "switch `%c' expects a numerical value"

6915 msgstr "l'option '%c' attend un valeur numérique"

6916

6645 -#: builtin/grep.c:575

6917 +#: builtin/grep.c:577

6918 #, c-format

6919 msgid "cannot open '%s'"

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

6921

6650 -#: builtin/grep.c:644

6922 +#: builtin/grep.c:646

6923 msgid "search in index instead of in the work tree"

6924 msgstr "rechercher dans l'index plutôt que dans la copie de travail"

6925

6654 -#: builtin/grep.c:646

6926 +#: builtin/grep.c:648

6927 msgid "find in contents not managed by git"

6928 msgstr "rechercher dans les contenus non gérés par git"

6929

6658 -#: builtin/grep.c:648

6930 +#: builtin/grep.c:650

6931 msgid "search in both tracked and untracked files"

6932 msgstr "rechercher dans les fichiers suivis et non-suivis"

6933

6662 -#: builtin/grep.c:650

6934 +#: builtin/grep.c:652

6935 msgid "ignore files specified via '.gitignore'"

6936 msgstr "ignorer les fichiers spécifiés via '.gitignore'"

6937

6666 -#: builtin/grep.c:653

6938 +#: builtin/grep.c:655

6939 msgid "show non-matching lines"

6940 msgstr "afficher les lignes qui ne correspondent pas"

6941

6670 -#: builtin/grep.c:655

6942 +#: builtin/grep.c:657

6943 msgid "case insensitive matching"

6944 msgstr "correspondance insensible à la casse"

6945

6674 -#: builtin/grep.c:657

6946 +#: builtin/grep.c:659

6947 msgid "match patterns only at word boundaries"

6948 msgstr "rechercher les motifs aux séparateurs de mots"

6949

6678 -#: builtin/grep.c:659

6950 +#: builtin/grep.c:661

6951 msgid "process binary files as text"

6952 msgstr "traiter les fichiers binaires comme texte"

6953

6682 -#: builtin/grep.c:661

6954 +#: builtin/grep.c:663

6955 msgid "don't match patterns in binary files"

6956 msgstr "ne pas chercher les motifs dans les fichiers binaires"

6957

6686 -#: builtin/grep.c:664

6958 +#: builtin/grep.c:666

6959 msgid "process binary files with textconv filters"

6960 msgstr "traiter les fichiers binaires avec les filtres textconv"

6961

6690 -#: builtin/grep.c:666

6962 +#: builtin/grep.c:668

6963 msgid "descend at most <depth> levels"

6964 msgstr "descendre au plus de <profondeur> dans l'arborescence"

6965

6694 -#: builtin/grep.c:670

6966 +#: builtin/grep.c:672

6967 msgid "use extended POSIX regular expressions"

6968 msgstr "utiliser des expressions régulières étendues POSIX"

6969

6698 -#: builtin/grep.c:673

6970 +#: builtin/grep.c:675

6971 msgid "use basic POSIX regular expressions (default)"

6972 msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"

6973

6702 -#: builtin/grep.c:676

6974 +#: builtin/grep.c:678

6975 msgid "interpret patterns as fixed strings"

6976 msgstr "interpréter les motifs comme de chaînes fixes"

6977

6706 -#: builtin/grep.c:679

6978 +#: builtin/grep.c:681

6979 msgid "use Perl-compatible regular expressions"

6980 msgstr "utiliser des expressions régulières compatibles avec Perl"

6981

6710 -#: builtin/grep.c:682

6982 +#: builtin/grep.c:684

6983 msgid "show line numbers"

6984 msgstr "afficher les numéros de ligne"

6985

6714 -#: builtin/grep.c:683

6986 +#: builtin/grep.c:685

6987 msgid "don't show filenames"

6988 msgstr "ne pas pas afficher les noms de fichier"

6989

6718 -#: builtin/grep.c:684

6990 +#: builtin/grep.c:686

6991 msgid "show filenames"

6992 msgstr "afficher les noms de fichier"

6993

6722 -#: builtin/grep.c:686

6994 +#: builtin/grep.c:688

6995 msgid "show filenames relative to top directory"

6996 msgstr "afficher les noms de fichiers relativement au répertoire de base"

6997

6726 -#: builtin/grep.c:688

6998 +#: builtin/grep.c:690

6999 msgid "show only filenames instead of matching lines"

7000 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"

7001

6730 -#: builtin/grep.c:690

7002 +#: builtin/grep.c:692

7003 msgid "synonym for --files-with-matches"

7004 msgstr "synonyme pour --files-with-matches"

7005

6734 -#: builtin/grep.c:693

7006 +#: builtin/grep.c:695

7007 msgid "show only the names of files without match"

7008 msgstr "n'afficher que les noms des fichiers sans correspondance"

7009

6738 -#: builtin/grep.c:695

7010 +#: builtin/grep.c:697

7011 msgid "print NUL after filenames"

7012 msgstr "imprimer une caractère NUL après le noms de fichier"

7013

6742 -#: builtin/grep.c:697

7014 +#: builtin/grep.c:699

7015 msgid "show the number of matches instead of matching lines"

7016 msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"

7017

6746 -#: builtin/grep.c:698

7018 +#: builtin/grep.c:700

7019 msgid "highlight matches"

7020 msgstr "mettre en évidence les correspondances"

7021

6750 -#: builtin/grep.c:700

7022 +#: builtin/grep.c:702

7023 msgid "print empty line between matches from different files"

7024 msgstr ""

7025 "imprimer une ligne vide entre les correspondances de fichiers différents"

7026

6755 -#: builtin/grep.c:702

7027 +#: builtin/grep.c:704

7028 msgid "show filename only once above matches from same file"

7029 msgstr ""

7030 "afficher le nom de fichier une fois au dessus des correspondances du même "

7031 "fichier"

7032

6761 -#: builtin/grep.c:705

7033 +#: builtin/grep.c:707

7034 msgid "show <n> context lines before and after matches"

7035 msgstr "afficher <n> lignes de contexte avant et après les correspondances"

7036

6765 -#: builtin/grep.c:708

7037 +#: builtin/grep.c:710

7038 msgid "show <n> context lines before matches"

7039 msgstr "afficher <n> lignes de contexte avant les correspondances"

7040

6769 -#: builtin/grep.c:710

7041 +#: builtin/grep.c:712

7042 msgid "show <n> context lines after matches"

7043 msgstr "afficher <n> lignes de contexte après les correspondances"

7044

6773 -#: builtin/grep.c:712

7045 +#: builtin/grep.c:714

7046 msgid "use <n> worker threads"

7047 msgstr "utiliser <n> fils de travail"

7048

6777 -#: builtin/grep.c:713

7049 +#: builtin/grep.c:715

7050 msgid "shortcut for -C NUM"

7051 msgstr "raccourci pour -C NUM"

7052

6781 -#: builtin/grep.c:716

7053 +#: builtin/grep.c:718

7054 msgid "show a line with the function name before matches"

7055 msgstr ""

7056 "afficher une ligne avec le nom de la fonction avant les correspondances"

7057

6786 -#: builtin/grep.c:718

7058 +#: builtin/grep.c:720

7059 msgid "show the surrounding function"

7060 msgstr "afficher la fonction contenante"

7061

6790 -#: builtin/grep.c:721

7062 +#: builtin/grep.c:723

7063 msgid "read patterns from file"

7064 msgstr "lire les motifs depuis fichier"

7065

6794 -#: builtin/grep.c:723

7066 +#: builtin/grep.c:725

7067 msgid "match <pattern>"

7068 msgstr "rechercher <motif>"

7069

6798 -#: builtin/grep.c:725

7070 +#: builtin/grep.c:727

l10n: fr.po v2.9.0rnd1