diff options
| author |  Jean-Noël Avila <jn.avila@free.fr> | 2021-02-27 15:47:45 +0100 |
|---|---|---|
| committer | Jean-Noël Avila <jn.avila@free.fr> | 2021-02-27 15:47:45 +0100 |
| commit | 5ff5a306521bab9c413500c0e4ff4b084511dfd6 (patch) | |
| tree | c1e2e7f36e549fa18712d97901e805b34401772c | |
| parent | l10n: git.pot: v2.31.0 round 1 (155 new, 89 removed) (diff) | |
| download | tgif-5ff5a306521bab9c413500c0e4ff4b084511dfd6.tar.xz | |
l10n: fr: v2.31.0 rnd 1
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
| -rw-r--r-- | po/fr.po | 6206 |
1 files changed, 3261 insertions, 2945 deletions
@@ -76,8 +76,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-12-21 07:10+0800\n" -"PO-Revision-Date: 2020-12-21 18:52+0100\n" +"POT-Creation-Date: 2021-02-26 22:09+0800\n" +"PO-Revision-Date: 2021-02-27 15:40+0100\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -92,9 +92,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "Hein (%s) ?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284 -#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 -#: builtin/rebase.c:1955 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 +#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 +#: builtin/rebase.c:1963 msgid "could not read index" msgstr "impossible de lire l'index" @@ -122,7 +122,7 @@ msgstr "Mise à jour" msgid "could not stage '%s'" msgstr "impossible d'indexer '%s'" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 msgid "could not write index" msgstr "impossible d'écrire l'index" @@ -283,7 +283,7 @@ msgstr "non-indexé" #: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 #: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 +#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 @@ -868,7 +868,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:281 builtin/merge.c:1369 +#: advice.c:281 builtin/merge.c:1370 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." @@ -1182,7 +1182,8 @@ msgstr "le patch a échoué : %s:%ld" msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 pack-revindex.c:213 +#: setup.c:308 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" @@ -1347,7 +1348,7 @@ msgstr "" msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4374 builtin/bisect--helper.c:524 +#: apply.c:4374 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" @@ -1383,7 +1384,7 @@ msgstr[1] "Application du patch %%s avec %d rejets..." msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228 +#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" @@ -1437,7 +1438,7 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace." msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace." -#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" @@ -1507,7 +1508,7 @@ msgid "build a temporary index based on embedded index information" msgstr "" "construire un index temporaire fondé sur l'information de l'index embarqué" -#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525 +#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" @@ -1517,7 +1518,7 @@ msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" #: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 +#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 msgid "action" msgstr "action" @@ -1547,9 +1548,9 @@ msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 +#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "mode verbeux" @@ -1639,14 +1640,14 @@ msgstr "git archive --remote <dépôt> [--exec <commande>] --list" msgid "cannot read %s" msgstr "impossible de lire %s" -#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886 -#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1138 +#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 +#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1139 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" -#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 +#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" @@ -1688,7 +1689,7 @@ msgstr "fmt" msgid "archive format" msgstr "format d'archive" -#: archive.c:556 builtin/log.c:1765 +#: archive.c:556 builtin/log.c:1764 msgid "prefix" msgstr "préfixe" @@ -1696,11 +1697,11 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 -#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 +#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105 -#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 +#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "fichier" @@ -1867,12 +1868,12 @@ msgstr "Bissection : une base de fusion doit être testée\n" msgid "a %s revision is needed" msgstr "une révision %s est nécessaire" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" -#: bisect.c:987 builtin/merge.c:152 +#: bisect.c:987 builtin/merge.c:153 #, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" @@ -1890,10 +1891,10 @@ msgstr "%s était à la fois %s et %s\n" #, c-format msgid "" "No testable commit found.\n" -"Maybe you started with bad path parameters?\n" +"Maybe you started with bad path arguments?\n" msgstr "" "Aucun commit testable n'a été trouvé\n" -"Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n" +"Peut-être avez-vous démarré avec un mauvais arguement de chemin ?\n" #: bisect.c:1095 #, c-format @@ -1926,11 +1927,11 @@ msgstr "" "--reverse et --first-parent ensemble nécessitent la spécification d'un " "dernier commit" -#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138 -#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 -#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 -#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 -#: builtin/shortlog.c:267 +#: blame.c:2821 bundle.c:213 ref-filter.c:2202 remote.c:2041 sequencer.c:2146 +#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 +#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 +#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 +#: builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" @@ -2119,7 +2120,7 @@ msgstr "'%s' ne semble pas être un fichier colis v2 our v3" msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" @@ -2163,40 +2164,36 @@ msgstr "Impossible de créer des objets groupés" msgid "pack-objects died" msgstr "les objets groupés ont disparu" -#: bundle.c:379 -msgid "rev-list died" -msgstr "rev-list a disparu" - -#: bundle.c:428 +#: bundle.c:386 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:498 +#: bundle.c:490 #, c-format msgid "unsupported bundle version %d" msgstr "version de colis non supportée %d" -#: bundle.c:500 +#: bundle.c:492 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "impossible d'écrire une version de colis %d avec l'algorithme %s" -#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:530 +#: bundle.c:539 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:540 +#: bundle.c:549 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:565 +#: bundle.c:574 msgid "index-pack died" msgstr "l'index de groupe a disparu" @@ -2205,249 +2202,269 @@ msgstr "l'index de groupe a disparu" msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit-graph.c:188 midx.c:47 +#: commit-graph.c:198 midx.c:47 msgid "invalid hash version" msgstr "version d'empreinte invalide" -#: commit-graph.c:246 +#: commit-graph.c:219 +msgid "repository contains replace objects; skipping commit-graph" +msgstr "le dépôt contient des object de remplacement ; saut du graphe de commits" + +#: commit-graph.c:228 +msgid "repository contains (deprecated) grafts; skipping commit-graph" +msgstr "le dépôt contient des greffes (déconseillées) ; saut du graphe de commits" + +#: commit-graph.c:233 +msgid "repository is shallow; skipping commit-graph" +msgstr "le dépôt est superficiel ; saut du graphe de commit" + +#: commit-graph.c:264 msgid "commit-graph file is too small" msgstr "le graphe de commit est trop petit" -#: commit-graph.c:311 +#: commit-graph.c:329 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" "la signature du graphe de commit %X ne correspond pas à la signature %X" -#: commit-graph.c:318 +#: commit-graph.c:336 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "la version %X du graphe de commit ne correspond pas à la version %X" -#: commit-graph.c:325 +#: commit-graph.c:343 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" "l'empreinte de la version %X du graphe de commit ne correspond pas à la " "version %X" -#: commit-graph.c:342 +#: commit-graph.c:360 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "le graphe de commit est trop petit pour contenir %u sections" -#: commit-graph.c:361 +#: commit-graph.c:379 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "décalage de bloc %08x%08x du graphe de commit inadéquat" -#: commit-graph.c:433 +#: commit-graph.c:465 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "l'id de bloc de graphe de commit %08x apparaît des multiples fois" -#: commit-graph.c:499 +#: commit-graph.c:531 msgid "commit-graph has no base graphs chunk" msgstr "le graphe de commit n'a pas de section de graphes de base" -#: commit-graph.c:509 +#: commit-graph.c:541 msgid "commit-graph chain does not match" msgstr "la chaîne de graphe de commit ne correspond pas" -#: commit-graph.c:557 +#: commit-graph.c:589 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" "chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte" -#: commit-graph.c:581 +#: commit-graph.c:613 msgid "unable to find all commit-graph files" msgstr "impossible de trouver tous les fichiers du graphe de commit" -#: commit-graph.c:721 commit-graph.c:785 +#: commit-graph.c:794 commit-graph.c:831 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "position de commit invalide. Le graphe de commit est vraisemblablement " "corrompu" -#: commit-graph.c:742 +#: commit-graph.c:815 #, c-format msgid "could not find commit %s" msgstr "impossible de trouver le commit %s" -#: commit-graph.c:1036 builtin/am.c:1292 +#: commit-graph.c:848 +msgid "commit-graph requires overflow generation data but has none" +msgstr "le graphe de commits requiert des données de génération de débordement mais n'en contient pas" + +#: commit-graph.c:1121 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" -#: commit-graph.c:1252 builtin/pack-objects.c:2864 +#: commit-graph.c:1378 builtin/pack-objects.c:2872 #, c-format msgid "unable to get type of object %s" msgstr "impossible d'obtenir le type de l'objet %s" -#: commit-graph.c:1283 +#: commit-graph.c:1409 msgid "Loading known commits in commit graph" msgstr "Lecture des commits connus dans un graphe de commit" -#: commit-graph.c:1300 +#: commit-graph.c:1426 msgid "Expanding reachable commits in commit graph" msgstr "Expansion des commits joignables dans un graphe de commit" -#: commit-graph.c:1320 +#: commit-graph.c:1446 msgid "Clearing commit marks in commit graph" msgstr "Suppression les marques de commit dans le graphe de commits" -#: commit-graph.c:1339 +#: commit-graph.c:1465 +msgid "Computing commit graph topological levels" +msgstr "Calcul des niveaux topologiques du graphe de commits" + +#: commit-graph.c:1518 msgid "Computing commit graph generation numbers" msgstr "Calcul des chiffres de génération du graphe de commits" -#: commit-graph.c:1406 +#: commit-graph.c:1599 msgid "Computing commit changed paths Bloom filters" msgstr "Calcul des filtres Bloom des chemins modifiés du commit" -#: commit-graph.c:1483 +#: commit-graph.c:1676 msgid "Collecting referenced commits" msgstr "Collecte des commits référencés" -#: commit-graph.c:1508 +#: commit-graph.c:1701 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet" msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets" -#: commit-graph.c:1521 +#: commit-graph.c:1714 #, c-format msgid "error adding pack %s" msgstr "erreur à l'ajout du packet %s" -#: commit-graph.c:1525 +#: commit-graph.c:1718 #, c-format msgid "error opening index for %s" msgstr "erreur à l'ouverture de l'index pour %s" -#: commit-graph.c:1562 +#: commit-graph.c:1755 msgid "Finding commits for commit graph among packed objects" msgstr "" "Recherche de commits pour un graphe de commits parmi les objets empaquetés" -#: commit-graph.c:1580 +#: commit-graph.c:1773 msgid "Finding extra edges in commit graph" msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits" -#: commit-graph.c:1628 +#: commit-graph.c:1821 msgid "failed to write correct number of base graph ids" msgstr "échec à l'écriture le nombre correct d'id de base de fusion" -#: commit-graph.c:1670 midx.c:819 +#: commit-graph.c:1863 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "impossible de créer les répertoires de premier niveau de %s" -#: commit-graph.c:1683 +#: commit-graph.c:1876 msgid "unable to create temporary graph layer" msgstr "impossible de créer une couche de graphe temporaire" -#: commit-graph.c:1688 +#: commit-graph.c:1881 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "impossible de régler les droits partagés pour '%s'" -#: commit-graph.c:1758 +#: commit-graph.c:1966 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Écriture le graphe de commits en %d passe" msgstr[1] "Écriture le graphe de commits en %d passes" -#: commit-graph.c:1803 +#: commit-graph.c:2011 msgid "unable to open commit-graph chain file" msgstr "impossible d'ouvrir le fichier de graphe de commit" -#: commit-graph.c:1819 +#: commit-graph.c:2027 msgid "failed to rename base commit-graph file" msgstr "échec du renommage du fichier de graphe de commits" -#: commit-graph.c:1839 +#: commit-graph.c:2047 msgid "failed to rename temporary commit-graph file" msgstr "impossible de renommer le fichier temporaire de graphe de commits" -#: commit-graph.c:1965 +#: commit-graph.c:2180 msgid "Scanning merged commits" msgstr "Analyse des commits de fusion" -#: commit-graph.c:2009 +#: commit-graph.c:2224 msgid "Merging commit-graph" msgstr "fusion du graphe de commits" -#: commit-graph.c:2115 +#: commit-graph.c:2331 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé" -#: commit-graph.c:2214 +#: commit-graph.c:2438 msgid "too many commits to write graph" msgstr "trop de commits pour écrire un graphe" -#: commit-graph.c:2307 +#: commit-graph.c:2536 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "le graphe de commit a une somme de contrôle incorrecte et est " "vraisemblablement corrompu" -#: commit-graph.c:2317 +#: commit-graph.c:2546 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s" -#: commit-graph.c:2327 commit-graph.c:2342 +#: commit-graph.c:2556 commit-graph.c:2571 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = " "%u != %u" -#: commit-graph.c:2334 +#: commit-graph.c:2563 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "échec de l'analyse le commit %s depuis le graphe de commits" -#: commit-graph.c:2352 +#: commit-graph.c:2581 msgid "Verifying commits in commit graph" msgstr "Verification des commits dans le graphe de commits" -#: commit-graph.c:2367 +#: commit-graph.c:2596 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "échec de l'analyse du commit %s depuis la base de données d'objets pour le " "graphe de commit" -#: commit-graph.c:2374 +#: commit-graph.c:2603 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != " "%s" -#: commit-graph.c:2384 +#: commit-graph.c:2613 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" "la liste des parents du graphe de commit pour le commit %s est trop longue" -#: commit-graph.c:2393 +#: commit-graph.c:2622 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "le parent du graphe de commit pour %s est %s != %s" -#: commit-graph.c:2407 +#: commit-graph.c:2636 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "la liste de parents du graphe de commit pour le commit %s se termine trop tôt" -#: commit-graph.c:2412 +#: commit-graph.c:2641 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2455,7 +2472,7 @@ msgstr "" "le graphe de commit a un numéro de génération nul pour le commit %s, mais " "non-nul ailleurs" -#: commit-graph.c:2416 +#: commit-graph.c:2645 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2463,19 +2480,19 @@ msgstr "" "le graphe de commit a un numéro de génération non-nul pour le commit %s, " "mais nul ailleurs" -#: commit-graph.c:2432 +#: commit-graph.c:2662 #, c-format -msgid "commit-graph generation for commit %s is %u != %u" -msgstr "la génération du graphe de commit pour le commit %s est %u != %u" +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" +msgstr "la génération du graphe de commit pour le commit %s est %<PRIuMAX> < %<PRIuMAX>" -#: commit-graph.c:2438 +#: commit-graph.c:2668 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "la date de validation pour le commit %s dans le graphe de commit est " "%<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403 +#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 #: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 #, c-format msgid "could not parse %s" @@ -2506,27 +2523,27 @@ msgstr "" "Supprimez ce message en lançant\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1172 +#: commit.c:1223 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La validation %s a une signature GPG non fiable, prétendument par %s." -#: commit.c:1176 +#: commit.c:1227 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La validation %s a une mauvaise signature GPG prétendument par %s." -#: commit.c:1179 +#: commit.c:1230 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: commit.c:1182 +#: commit.c:1233 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La validation %s a une signature GPG correcte par %s\n" -#: commit.c:1436 +#: commit.c:1487 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2542,7 +2559,7 @@ msgstr "" msgid "memory exhausted" msgstr "plus de mémoire" -#: config.c:125 +#: config.c:126 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2557,306 +2574,350 @@ msgstr "" "\t%s\n" "possibilité d'inclusions multiples." -#: config.c:141 +#: config.c:142 #, c-format msgid "could not expand include path '%s'" msgstr "expansion impossible du chemin d'inclusion '%s'" -#: config.c:152 +#: config.c:153 msgid "relative config includes must come from files" msgstr "les inclusions de configuration relatives doivent venir de fichiers" -#: config.c:198 +#: config.c:199 msgid "relative config include conditionals must come from files" msgstr "" "les conditions d'inclusion de configuration relative doivent venir de " "fichiers" -#: config.c:378 +#: config.c:396 +#, c-format +msgid "invalid config format: %s" +msgstr "format de config invalide : %s" + +#: config.c:400 +#, c-format +msgid "missing environment variable name for configuration '%.*s'" +msgstr "nom de variable d'environnement manquant pour le configuration '%.*s'" + +#: config.c:405 +#, c-format +msgid "missing environment variable '%s' for configuration '%.*s'" +msgstr "variable d'environnement '%s' manquante pour le configuration '%.*s'" + +#: config.c:442 #, c-format msgid "key does not contain a section: %s" msgstr "la clé ne contient pas de section: %s" -#: config.c:384 +#: config.c:448 #, c-format msgid "key does not contain variable name: %s" msgstr "la clé ne contient pas de nom de variable : %s" -#: config.c:408 sequencer.c:2580 +#: config.c:472 sequencer.c:2588 #, c-format msgid "invalid key: %s" msgstr "clé invalide : %s" -#: config.c:414 +#: config.c:478 #, c-format msgid "invalid key (newline): %s" msgstr "clé invalide (retour chariot) : %s" -#: config.c:450 config.c:462 +#: config.c:511 +msgid "empty config key" +msgstr "clé de configuration vide" + +#: config.c:529 config.c:541 #, c-format msgid "bogus config parameter: %s" msgstr "paramètre de configuration mal formé: %s" -#: config.c:497 +#: config.c:555 config.c:572 config.c:579 config.c:588 #, c-format msgid "bogus format in %s" msgstr "formatage mal formé dans %s" -#: config.c:836 +#: config.c:622 +#, c-format +msgid "bogus count in %s" +msgstr "compte faux dans %s" + +#: config.c:626 +#, c-format +msgid "too many entries in %s" +msgstr "trop d'entrées dans %s" + +#: config.c:636 +#, c-format +msgid "missing config key %s" +msgstr "clé de configuration %s manquante" + +#: config.c:644 +#, c-format +msgid "missing config value %s" +msgstr "valeur de config manquante %s" + +#: config.c:995 #, c-format msgid "bad config line %d in blob %s" msgstr "ligne %d de config incorrecte dans le blob %s" -#: config.c:840 +#: config.c:999 #, c-format msgid "bad config line %d in file %s" msgstr "ligne %d de config incorrecte dans le fichier %s" -#: config.c:844 +#: config.c:1003 #, c-format msgid "bad config line %d in standard input" msgstr "ligne %d de config incorrecte dans l'entrée standard" -#: config.c:848 +#: config.c:1007 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ligne %d de config incorrecte dans le blob de sous-module %s" -#: config.c:852 +#: config.c:1011 #, c-format msgid "bad config line %d in command line %s" msgstr "ligne %d de config incorrecte dans la ligne de commande %s" -#: config.c:856 +#: config.c:1015 #, c-format msgid "bad config line %d in %s" msgstr "ligne %d de config incorrecte dans %s" -#: config.c:993 +#: config.c:1152 msgid "out of range" msgstr "hors plage" -#: config.c:993 +#: config.c:1152 msgid "invalid unit" msgstr "unité invalide" -#: config.c:994 +#: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" -#: config.c:1013 +#: config.c:1163 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob " "%s : %s" -#: config.c:1016 +#: config.c:1166 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier " "%s : %s" -#: config.c:1019 +#: config.c:1169 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée " "standard : %s" -#: config.c:1022 +#: config.c:1172 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de " "sous-module %s : %s" -#: config.c:1025 +#: config.c:1175 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de " "commande %s : %s" -#: config.c:1028 +#: config.c:1178 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" -#: config.c:1123 +#: config.c:1194 +#, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "valeur booléenne de configuration invalide '%s' pour '%s'" + +#: config.c:1289 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" -#: config.c:1132 +#: config.c:1298 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' pour '%s' n'est pas un horodatage valide" -#: config.c:1223 +#: config.c:1391 #, c-format msgid "abbrev length out of range: %d" msgstr "longueur d'abbrev hors plage : %d" -#: config.c:1237 config.c:1248 +#: config.c:1405 config.c:1416 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:1340 +#: config.c:1508 msgid "core.commentChar should only be one character" msgstr "core.commentChar ne devrait être qu'un unique caractère" -#: config.c:1373 +#: config.c:1541 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1445 +#: config.c:1613 #, c-format msgid "malformed value for %s" msgstr "valeur mal formée pour %s" -#: config.c:1471 +#: config.c:1639 #, c-format msgid "malformed value for %s: %s" msgstr "valeur mal formée pour %s : %s" -#: config.c:1472 +#: config.c:1640 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "doit être parmi nothing, matching, simple, upstream ou current" -#: config.c:1533 builtin/pack-objects.c:3649 +#: config.c:1701 builtin/pack-objects.c:3666 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" -#: config.c:1655 +#: config.c:1823 #, c-format msgid "unable to load config blob object '%s'" msgstr "impossible de charger l'objet blob de config '%s'" -#: config.c:1658 +#: config.c:1826 #, c-format msgid "reference '%s' does not point to a blob" msgstr "la référence '%s' ne pointe pas sur un blob" -#: config.c:1675 +#: config.c:1843 #, c-format msgid "unable to resolve config blob '%s'" msgstr "impossible de résoudre le blob de config '%s'" -#: config.c:1705 +#: config.c:1873 #, c-format msgid "failed to parse %s" msgstr "échec de l'analyse de %s" -#: config.c:1759 +#: config.c:1927 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:2122 +#: config.c:2290 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:2296 +#: config.c:2464 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: config.c:2341 +#: config.c:2509 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et " "100" -#: config.c:2387 +#: config.c:2555 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "impossible d'analyser '%s' depuis le configuration en ligne de commande" -#: config.c:2389 +#: config.c:2557 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" -#: config.c:2473 +#: config.c:2641 #, c-format msgid "invalid section name '%s'" msgstr "nom de section invalide '%s'" -#: config.c:2505 +#: config.c:2673 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2534 +#: config.c:2702 #, c-format msgid "failed to write new configuration file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2786 config.c:3112 +#: config.c:2954 config.c:3280 #, c-format msgid "could not lock config file %s" msgstr "impossible de verrouiller le fichier de configuration %s" -#: config.c:2797 +#: config.c:2965 #, c-format msgid "opening %s" msgstr "ouverture de %s" -#: config.c:2834 builtin/config.c:361 +#: config.c:3002 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "motif invalide : %s" -#: config.c:2859 +#: config.c:3027 #, c-format msgid "invalid config file %s" msgstr "fichier de configuration invalide %s" -#: config.c:2872 config.c:3125 +#: config.c:3040 config.c:3293 #, c-format msgid "fstat on %s failed" msgstr "échec de fstat sur %s" -#: config.c:2883 +#: config.c:3051 #, c-format msgid "unable to mmap '%s'" msgstr "impossible de réaliser un map de '%s'" -#: config.c:2892 config.c:3130 +#: config.c:3060 config.c:3298 #, c-format msgid "chmod on %s failed" msgstr "échec de chmod sur %s" -#: config.c:2977 config.c:3227 +#: config.c:3145 config.c:3395 #, c-format msgid "could not write config file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:3011 +#: config.c:3179 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" -#: config.c:3103 +#: config.c:3271 #, c-format msgid "invalid section name: %s" msgstr "nom de section invalide : %s" -#: config.c:3270 +#: config.c:3438 #, c-format msgid "missing value for '%s'" msgstr "valeur manquante pour '%s'" @@ -2918,45 +2979,45 @@ msgstr "paquet invalide" msgid "protocol error: unexpected '%s'" msgstr "erreur de protocole : '%s' attendu" -#: connect.c:473 +#: connect.c:497 #, c-format msgid "unknown object format '%s' specified by server" msgstr "format d'objet spécifié par le serveur inconnu '%s'" -#: connect.c:500 +#: connect.c:526 #, c-format msgid "invalid ls-refs response: %s" msgstr "réponse à ls-ref invalide : %s" -#: connect.c:504 +#: connect.c:530 msgid "expected flush after ref listing" msgstr "vidage attendu après le listage de références" -#: connect.c:507 +#: connect.c:533 msgid "expected response end packet after ref listing" msgstr "paquet de fin de réponse attendu après le listage de références" -#: connect.c:640 +#: connect.c:666 #, c-format msgid "protocol '%s' is not supported" msgstr "le protocole '%s' n'est pas supporté" -#: connect.c:691 +#: connect.c:717 msgid "unable to set SO_KEEPALIVE on socket" msgstr "impossible de positionner SO_KEEPALIVE sur la socket" -#: connect.c:731 connect.c:794 +#: connect.c:757 connect.c:820 #, c-format msgid "Looking up %s ... " msgstr "Recherche de %s… " -#: connect.c:735 +#: connect.c:761 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "impossible de rechercher %s (port %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:739 connect.c:810 +#: connect.c:765 connect.c:836 #, c-format msgid "" "done.\n" @@ -2965,7 +3026,7 @@ msgstr "" "fait.\n" "Connexion à %s (port %s)… " -#: connect.c:761 connect.c:838 +#: connect.c:787 connect.c:864 #, c-format msgid "" "unable to connect to %s:\n" @@ -2975,63 +3036,67 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:767 connect.c:844 +#: connect.c:793 connect.c:870 msgid "done." msgstr "fait." -#: connect.c:798 +#: connect.c:824 #, c-format msgid "unable to look up %s (%s)" msgstr "impossible de rechercher %s (%s)" -#: connect.c:804 +#: connect.c:830 #, c-format msgid "unknown port %s" msgstr "port inconnu %s" -#: connect.c:941 connect.c:1271 +#: connect.c:967 connect.c:1299 #, c-format msgid "strange hostname '%s' blocked" msgstr "nom d'hôte étrange '%s' bloqué" -#: connect.c:943 +#: connect.c:969 #, c-format msgid "strange port '%s' blocked" msgstr "port étrange '%s' bloqué" -#: connect.c:953 +#: connect.c:979 #, c-format msgid "cannot start proxy %s" msgstr "impossible de démarrer un proxy %s" -#: connect.c:1024 +#: connect.c:1050 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe " "d'URL valide" -#: connect.c:1219 +#: connect.c:1190 +msgid "newline is forbidden in git:// hosts and repo paths" +msgstr "le retour chariot est interdit dans les hôtes git:// et les chemins de dépôt" + +#: connect.c:1247 msgid "ssh variant 'simple' does not support -4" msgstr "la variante ssh 'simple' ne supporte pas -4" -#: connect.c:1231 +#: connect.c:1259 msgid "ssh variant 'simple' does not support -6" msgstr "la variante ssh 'simple' ne supporte pas -6" -#: connect.c:1248 +#: connect.c:1276 msgid "ssh variant 'simple' does not support setting port" msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port" -#: connect.c:1360 +#: connect.c:1388 #, c-format msgid "strange pathname '%s' blocked" msgstr "chemin étrange '%s' bloqué" -#: connect.c:1408 +#: connect.c:1436 msgid "unable to fork" msgstr "fork impossible" -#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Vérification de la connectivité" @@ -3302,6 +3367,11 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "Marquage de %d îlots, fait.\n" +#: diff-merges.c:70 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "valeur inconnue pour --diff-merges : %s" + #: diff-lib.c:534 msgid "--merge-base does not work with ranges" msgstr "--merge-base ne fonctionne pas avec des plages" @@ -3391,30 +3461,30 @@ msgstr "" msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:4625 +#: diff.c:4628 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:4628 +#: diff.c:4631 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S et --find-object sont mutuellement exclusifs" -#: diff.c:4707 +#: diff.c:4710 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:4755 +#: diff.c:4758 #, c-format msgid "invalid --stat value: %s" msgstr "valeur invalide de --stat : %s" -#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303 +#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s attend une valeur numérique" -#: diff.c:4792 +#: diff.c:4795 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3423,42 +3493,42 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4877 +#: diff.c:4880 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s" -#: diff.c:4901 +#: diff.c:4904 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valeur inconnue après ws-error-highlight=%.*s" -#: diff.c:4915 +#: diff.c:4918 #, c-format msgid "unable to resolve '%s'" msgstr "impossible de résoudre '%s'" -#: diff.c:4965 diff.c:4971 +#: diff.c:4968 diff.c:4974 #, c-format msgid "%s expects <n>/<m> form" msgstr "forme <n>/<m> attendue par %s" -#: diff.c:4983 +#: diff.c:4986 #, c-format msgid "%s expects a character, got '%s'" msgstr "caractère attendu par %s, '%s' trouvé" -#: diff.c:5004 +#: diff.c:5007 #, c-format msgid "bad --color-moved argument: %s" msgstr "mauvais argument --color-moved : %s" -#: diff.c:5023 +#: diff.c:5026 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode invalide '%s' dans --color-moved-ws" -#: diff.c:5063 +#: diff.c:5066 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3466,160 +3536,160 @@ msgstr "" "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " "\"histogram\"" -#: diff.c:5099 diff.c:5119 +#: diff.c:5102 diff.c:5122 #, c-format msgid "invalid argument to %s" msgstr "argument invalide pour %s" -#: diff.c:5223 +#: diff.c:5226 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "regex invalide fournie à -I : '%s'" -#: diff.c:5272 +#: diff.c:5275 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'" -#: diff.c:5328 +#: diff.c:5331 #, c-format msgid "bad --word-diff argument: %s" msgstr "mauvais argument pour --word-diff : %s" -#: diff.c:5351 +#: diff.c:5367 msgid "Diff output format options" msgstr "Options de format de sortie de diff" -#: diff.c:5353 diff.c:5359 +#: diff.c:5369 diff.c:5375 msgid "generate patch" msgstr "générer la rustine" -#: diff.c:5356 builtin/log.c:178 +#: diff.c:5372 builtin/log.c:179 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: diff.c:5361 diff.c:5475 diff.c:5482 +#: diff.c:5377 diff.c:5491 diff.c:5498 msgid "<n>" msgstr "<n>" -#: diff.c:5362 diff.c:5365 +#: diff.c:5378 diff.c:5381 msgid "generate diffs with <n> lines context" msgstr "générer les diffs avec <n> lignes de contexte" -#: diff.c:5367 +#: diff.c:5383 msgid "generate the diff in raw format" msgstr "générer le diff en format brut" -#: diff.c:5370 +#: diff.c:5386 msgid "synonym for '-p --raw'" msgstr "synonyme de '-p --raw'" -#: diff.c:5374 +#: diff.c:5390 msgid "synonym for '-p --stat'" msgstr "synonyme de '-p --stat'" -#: diff.c:5378 +#: diff.c:5394 msgid "machine friendly --stat" msgstr "--stat pour traitement automatique" -#: diff.c:5381 +#: diff.c:5397 msgid "output only the last line of --stat" msgstr "afficher seulement la dernière ligne de --stat" -#: diff.c:5383 diff.c:5391 +#: diff.c:5399 diff.c:5407 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5384 +#: diff.c:5400 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "afficher la distribution des quantités de modifications relatives pour " "chaque sous-répertoire" -#: diff.c:5388 +#: diff.c:5404 msgid "synonym for --dirstat=cumulative" msgstr "synonyme pour --dirstat=cumulative" -#: diff.c:5392 +#: diff.c:5408 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonyme pour --dirstat=files,param1,param2..." -#: diff.c:5396 +#: diff.c:5412 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "avertir si les modifications introduisent des marqueurs de conflit ou des " "erreurs d'espace" -#: diff.c:5399 +#: diff.c:5415 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "résumé succinct tel que les créations, les renommages et les modifications " "de mode" -#: diff.c:5402 +#: diff.c:5418 msgid "show only names of changed files" msgstr "n'afficher que les noms de fichiers modifiés" -#: diff.c:5405 +#: diff.c:5421 msgid "show only names and status of changed files" msgstr "n'afficher que les noms et les status des fichiers modifiés" -#: diff.c:5407 +#: diff.c:5423 msgid "<width>[,<name-width>[,<count>]]" msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]" -#: diff.c:5408 +#: diff.c:5424 msgid "generate diffstat" msgstr "générer un diffstat" -#: diff.c:5410 diff.c:5413 diff.c:5416 +#: diff.c:5426 diff.c:5429 diff.c:5432 msgid "<width>" msgstr "<largeur>" -#: diff.c:5411 +#: diff.c:5427 msgid "generate diffstat with a given width" msgstr "générer un diffstat avec la largeur indiquée" -#: diff.c:5414 +#: diff.c:5430 msgid "generate diffstat with a given name width" msgstr "génerer un diffstat avec la largeur de nom indiquée" -#: diff.c:5417 +#: diff.c:5433 msgid "generate diffstat with a given graph width" msgstr "génerer un diffstat avec la largeur de graphe indiquée" -#: diff.c:5419 +#: diff.c:5435 msgid "<count>" msgstr "<compte>" -#: diff.c:5420 +#: diff.c:5436 msgid "generate diffstat with limited lines" msgstr "générer un diffstat avec des lignes limitées" -#: diff.c:5423 +#: diff.c:5439 msgid "generate compact summary in diffstat" msgstr "générer une résumé compact dans le diffstat" -#: diff.c:5426 +#: diff.c:5442 msgid "output a binary diff that can be applied" msgstr "produire un diff binaire qui peut être appliqué" -#: diff.c:5429 +#: diff.c:5445 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "afficher les noms complets des objets pre- et post-image sur les lignes " "\"index\"" -#: diff.c:5431 +#: diff.c:5447 msgid "show colored diff" msgstr "afficher un diff coloré" -#: diff.c:5432 +#: diff.c:5448 msgid "<kind>" msgstr "<sorte>" -#: diff.c:5433 +#: diff.c:5449 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3627,7 +3697,7 @@ msgstr "" "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', " "'nouveau' dans le diff" -#: diff.c:5436 +#: diff.c:5452 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3635,93 +3705,93 @@ msgstr "" "ne pas compresser les chemins et utiliser des NULs comme terminateurs de " "champs dans --raw ou --numstat" -#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554 +#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 msgid "<prefix>" msgstr "<préfixe>" -#: diff.c:5440 +#: diff.c:5456 msgid "show the given source prefix instead of \"a/\"" msgstr "afficher le préfixe de source indiqué au lieu de \"a/\"" -#: diff.c:5443 +#: diff.c:5459 msgid "show the given destination prefix instead of \"b/\"" msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\"" -#: diff.c:5446 +#: diff.c:5462 msgid "prepend an additional prefix to every line of output" msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée" -#: diff.c:5449 +#: diff.c:5465 msgid "do not show any source or destination prefix" msgstr "n'afficher aucun préfixe, ni de source, ni de destination" -#: diff.c:5452 +#: diff.c:5468 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "afficher le contexte entre les sections à concurrence du nombre de ligne " "indiqué" -#: diff.c:5456 diff.c:5461 diff.c:5466 +#: diff.c:5472 diff.c:5477 diff.c:5482 msgid "<char>" msgstr "<caractère>" -#: diff.c:5457 +#: diff.c:5473 msgid "specify the character to indicate a new line instead of '+'" msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'" -#: diff.c:5462 +#: diff.c:5478 msgid "specify the character to indicate an old line instead of '-'" msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'" -#: diff.c:5467 +#: diff.c:5483 msgid "specify the character to indicate a context instead of ' '" msgstr "" "spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '" -#: diff.c:5470 +#: diff.c:5486 msgid "Diff rename options" msgstr "Options de renommage de diff" -#: diff.c:5471 +#: diff.c:5487 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5472 +#: diff.c:5488 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "casser les modifications d'une réécrire complète en paires de suppression et " "création" -#: diff.c:5476 +#: diff.c:5492 msgid "detect renames" msgstr "détecter les renommages" -#: diff.c:5480 +#: diff.c:5496 msgid "omit the preimage for deletes" msgstr "supprimer la pré-image pour les suppressions" -#: diff.c:5483 +#: diff.c:5499 msgid "detect copies" msgstr "détecter les copies" -#: diff.c:5487 +#: diff.c:5503 msgid "use unmodified files as source to find copies" msgstr "" "utiliser les fichiers non-modifiés comme sources pour trouver des copies" -#: diff.c:5489 +#: diff.c:5505 msgid "disable rename detection" msgstr "désactiver la détection de renommage" -#: diff.c:5492 +#: diff.c:5508 msgid "use empty blobs as rename source" msgstr "utiliser des blobs vides comme source de renommage" -#: diff.c:5494 +#: diff.c:5510 msgid "continue listing the history of a file beyond renames" msgstr "continuer à afficher l'historique d'un fichier au delà des renommages" -#: diff.c:5497 +#: diff.c:5513 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3729,165 +3799,165 @@ msgstr "" "empêcher la détection de renommage/copie si le nombre de cibles de renommage/" "copie excède la limite indiquée" -#: diff.c:5499 +#: diff.c:5515 msgid "Diff algorithm options" msgstr "Options de l'algorithme de diff" -#: diff.c:5501 +#: diff.c:5517 msgid "produce the smallest possible diff" msgstr "produire le diff le plus petit possible" -#: diff.c:5504 +#: diff.c:5520 msgid "ignore whitespace when comparing lines" msgstr "ignorer les espaces lors de la comparaison de ligne" -#: diff.c:5507 +#: diff.c:5523 msgid "ignore changes in amount of whitespace" msgstr "ignorer des modifications du nombre d'espaces" -#: diff.c:5510 +#: diff.c:5526 msgid "ignore changes in whitespace at EOL" msgstr "ignorer des modifications d'espace en fin de ligne" -#: diff.c:5513 +#: diff.c:5529 msgid "ignore carrier-return at the end of line" msgstr "ignore le retour chariot en fin de ligne" -#: diff.c:5516 +#: diff.c:5532 msgid "ignore changes whose lines are all blank" msgstr "ignorer les modifications dont les lignes sont vides" -#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588 +#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 msgid "<regex>" msgstr "<regex>" -#: diff.c:5519 +#: diff.c:5535 msgid "ignore changes whose all lines match <regex>" msgstr "ignorer les modifications dont les lignes correspondent à <regex>" -#: diff.c:5522 +#: diff.c:5538 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "heuristique qui déplace les limites de sections de diff pour faciliter la " "lecture" -#: diff.c:5525 +#: diff.c:5541 msgid "generate diff using the \"patience diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"patience\"" -#: diff.c:5529 +#: diff.c:5545 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" "générer un diff en utilisant l'algorithme de différence \"histogramme\"" -#: diff.c:5531 +#: diff.c:5547 msgid "<algorithm>" msgstr "<algorithme>" -#: diff.c:5532 +#: diff.c:5548 msgid "choose a diff algorithm" msgstr "choisir un algorithme de différence" -#: diff.c:5534 +#: diff.c:5550 msgid "<text>" msgstr "<texte>" -#: diff.c:5535 +#: diff.c:5551 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\"" -#: diff.c:5537 diff.c:5546 diff.c:5549 +#: diff.c:5553 diff.c:5562 diff.c:5565 msgid "<mode>" msgstr "<mode>" -#: diff.c:5538 +#: diff.c:5554 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "afficher des différences par mot, en utilisant <mode> pour délimiter les " "mots modifiés" -#: diff.c:5541 +#: diff.c:5557 msgid "use <regex> to decide what a word is" msgstr "utiliser <regex> pour décider ce qu'est un mot" -#: diff.c:5544 +#: diff.c:5560 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5547 +#: diff.c:5563 msgid "moved lines of code are colored differently" msgstr "les lignes déplacées sont colorées différemment" -#: diff.c:5550 +#: diff.c:5566 msgid "how white spaces are ignored in --color-moved" msgstr "comment les espaces sont ignorés dans --color-moved" -#: diff.c:5553 +#: diff.c:5569 msgid "Other diff options" msgstr "Autres options diff" -#: diff.c:5555 +#: diff.c:5571 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "lancé depuis un sous-répertoire, exclure les modifications en dehors et " "afficher les chemins relatifs" -#: diff.c:5559 +#: diff.c:5575 msgid "treat all files as text" msgstr "traiter les fichiers comme texte" -#: diff.c:5561 +#: diff.c:5577 msgid "swap two inputs, reverse the diff" msgstr "échanger les entrées, inverser le diff" -#: diff.c:5563 +#: diff.c:5579 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon" -#: diff.c:5565 +#: diff.c:5581 msgid "disable all output of the program" msgstr "désactiver tous les affichages du programme" -#: diff.c:5567 +#: diff.c:5583 msgid "allow an external diff helper to be executed" msgstr "autoriser l'exécution d'un assistant externe de diff" -#: diff.c:5569 +#: diff.c:5585 msgid "run external text conversion filters when comparing binary files" msgstr "" "lancer les filtres externes de conversion en texte lors de la comparaison de " "fichiers binaires" -#: diff.c:5571 +#: diff.c:5587 msgid "<when>" msgstr "<quand>" -#: diff.c:5572 +#: diff.c:5588 msgid "ignore changes to submodules in the diff generation" msgstr "" "ignorer les modifications dans les sous-modules lors de la génération de diff" -#: diff.c:5575 +#: diff.c:5591 msgid "<format>" msgstr "<format>" -#: diff.c:5576 +#: diff.c:5592 msgid "specify how differences in submodules are shown" msgstr "spécifier comment les différences dans les sous-modules sont affichées" -#: diff.c:5580 +#: diff.c:5596 msgid "hide 'git add -N' entries from the index" msgstr "masquer les entrées 'git add -N' de l'index" -#: diff.c:5583 +#: diff.c:5599 msgid "treat 'git add -N' entries as real in the index" msgstr "traiter les entrées 'git add -N' comme réelles dans l'index" -#: diff.c:5585 +#: diff.c:5601 msgid "<string>" msgstr "<chaîne>" -#: diff.c:5586 +#: diff.c:5602 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3895,7 +3965,7 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la " "chaîne spécifiée" -#: diff.c:5589 +#: diff.c:5605 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3903,26 +3973,38 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la regex " "spécifiée" -#: diff.c:5592 +#: diff.c:5608 msgid "show all changes in the changeset with -S or -G" msgstr "" "afficher toutes les modifications dans l'ensemble de modifications avec -S " "ou -G" -#: diff.c:5595 +#: diff.c:5611 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue" -#: diff.c:5598 +#: diff.c:5614 msgid "control the order in which files appear in the output" msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie" -#: diff.c:5599 +#: diff.c:5615 diff.c:5618 +msgid "<path>" +msgstr "<chemin>" + +#: diff.c:5616 +msgid "show the change in the specified path first" +msgstr "afficher la modification dans les fichier spécifié en premier" + +#: diff.c:5619 +msgid "skip the output to the specified path" +msgstr "sauter la sortie pour le chemin spécifié" + +#: diff.c:5621 msgid "<object-id>" msgstr "<id-objet>" -#: diff.c:5600 +#: diff.c:5622 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3930,35 +4012,35 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de l'objet " "indiqué" -#: diff.c:5602 +#: diff.c:5624 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5603 +#: diff.c:5625 msgid "select files by diff type" msgstr "sélectionner les fichiers par types de diff" -#: diff.c:5605 +#: diff.c:5627 msgid "<file>" msgstr "<fichier>" -#: diff.c:5606 +#: diff.c:5628 msgid "Output to a specific file" msgstr "Sortie vers un fichier spécifié" -#: diff.c:6263 +#: diff.c:6285 msgid "inexact rename detection was skipped due to too many files." msgstr "" "détection de renommage inexact annulée à cause d'un trop grand nombre de " "fichiers." -#: diff.c:6266 +#: diff.c:6288 msgid "only found copies from modified paths due to too many files." msgstr "" "recherche uniquement des copies par modification de chemin à cause d'un trop " "grand nombre de fichiers." -#: diff.c:6269 +#: diff.c:6291 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3971,10 +4053,15 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:592 +#: diffcore-rename.c:555 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" +#: diffcore-rotate.c:29 +#, c-format +msgid "No such path '%s' in the diff" +msgstr "pas de chemin '%s' dans la diff" + #: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" @@ -4020,17 +4107,17 @@ msgstr "echec de l'obtention d'information de kernel" msgid "untracked cache is disabled on this system or location" msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit" -#: dir.c:3520 +#: dir.c:3537 #, c-format msgid "index file corrupt in repo %s" msgstr "fichier d'index corrompu dans le dépôt %s" -#: dir.c:3565 dir.c:3570 +#: dir.c:3582 dir.c:3587 #, c-format msgid "could not create directories for %s" msgstr "impossible de créer les répertoires pour %s" -#: dir.c:3599 +#: dir.c:3616 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" @@ -4051,12 +4138,12 @@ msgstr "Filtrage du contenu" msgid "could not stat file '%s'" msgstr "impossible de stat le fichier '%s'" -#: environment.c:150 +#: environment.c:152 #, c-format msgid "bad git namespace path \"%s\"" msgstr "Espaces de nom de Git \"%s\"" -#: environment.c:337 +#: environment.c:335 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "impossible de régler GIT_DIR à '%s'" @@ -4092,32 +4179,32 @@ msgstr "impossible d'écrire sur un distant" msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc nécessite multi_ack_detailed" -#: fetch-pack.c:378 fetch-pack.c:1406 +#: fetch-pack.c:378 fetch-pack.c:1400 #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalide : %s" -#: fetch-pack.c:384 fetch-pack.c:1412 +#: fetch-pack.c:384 fetch-pack.c:1406 #, c-format msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" -#: fetch-pack.c:386 fetch-pack.c:1414 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "object not found: %s" msgstr "objet non trouvé : %s" -#: fetch-pack.c:389 fetch-pack.c:1417 +#: fetch-pack.c:389 fetch-pack.c:1411 #, c-format msgid "error in object: %s" msgstr "Erreur dans l'objet : %s" -#: fetch-pack.c:391 fetch-pack.c:1419 +#: fetch-pack.c:391 fetch-pack.c:1413 #, c-format msgid "no shallow found: %s" msgstr "Pas de superficiel trouvé : %s" -#: fetch-pack.c:394 fetch-pack.c:1423 +#: fetch-pack.c:394 fetch-pack.c:1417 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "superficiel/non superficiel attendu, %s trouvé" @@ -4155,171 +4242,171 @@ msgstr "Marquage de %s comme terminé" msgid "already have %s (%s)" msgstr "%s déjà possédé (%s)" -#: fetch-pack.c:827 +#: fetch-pack.c:821 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral" -#: fetch-pack.c:835 +#: fetch-pack.c:829 msgid "protocol error: bad pack header" msgstr "erreur de protocole : mauvais entête de paquet" -#: fetch-pack.c:919 +#: fetch-pack.c:913 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack : impossible de dupliquer %s" -#: fetch-pack.c:937 +#: fetch-pack.c:931 #, c-format msgid "%s failed" msgstr "échec de %s" -#: fetch-pack.c:939 +#: fetch-pack.c:933 msgid "error in sideband demultiplexer" msgstr "erreur dans le démultiplexer latéral" -#: fetch-pack.c:982 +#: fetch-pack.c:976 #, c-format msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005 -#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021 -#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037 -#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059 +#: fetch-pack.c:984 fetch-pack.c:990 fetch-pack.c:993 fetch-pack.c:999 +#: fetch-pack.c:1003 fetch-pack.c:1007 fetch-pack.c:1011 fetch-pack.c:1015 +#: fetch-pack.c:1019 fetch-pack.c:1023 fetch-pack.c:1027 fetch-pack.c:1031 +#: fetch-pack.c:1037 fetch-pack.c:1043 fetch-pack.c:1048 fetch-pack.c:1053 #, c-format msgid "Server supports %s" msgstr "Le serveur supporte %s" -#: fetch-pack.c:992 +#: fetch-pack.c:986 msgid "Server does not support shallow clients" msgstr "Le serveur ne supporte les clients superficiels" -#: fetch-pack.c:1052 +#: fetch-pack.c:1046 msgid "Server does not support --shallow-since" msgstr "Le receveur ne gère pas --shallow-since" -#: fetch-pack.c:1057 +#: fetch-pack.c:1051 msgid "Server does not support --shallow-exclude" msgstr "Le receveur ne gère pas --shallow-exclude" -#: fetch-pack.c:1061 +#: fetch-pack.c:1055 msgid "Server does not support --deepen" msgstr "Le receveur ne gère pas --deepen" -#: fetch-pack.c:1063 +#: fetch-pack.c:1057 msgid "Server does not support this repository's object format" msgstr "Le serveur ne supporte pas ce format d'objets de ce dépôt" -#: fetch-pack.c:1076 +#: fetch-pack.c:1070 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:1088 fetch-pack.c:1628 +#: fetch-pack.c:1082 fetch-pack.c:1622 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." -#: fetch-pack.c:1214 +#: fetch-pack.c:1208 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "non-correspondance des algorithmes : client %s ; serveur %s" -#: fetch-pack.c:1218 +#: fetch-pack.c:1212 #, c-format msgid "the server does not support algorithm '%s'" msgstr "Le serveur ne supporte pas l'algorithme '%s'" -#: fetch-pack.c:1238 +#: fetch-pack.c:1232 msgid "Server does not support shallow requests" msgstr "Le serveur ne supporte pas les requêtes superficielles" -#: fetch-pack.c:1245 +#: fetch-pack.c:1239 msgid "Server supports filter" msgstr "Le serveur supporte filter" -#: fetch-pack.c:1284 +#: fetch-pack.c:1278 msgid "unable to write request to remote" msgstr "impossible d'écrire la requête sur le distant" -#: fetch-pack.c:1302 +#: fetch-pack.c:1296 #, c-format msgid "error reading section header '%s'" msgstr "erreur à la lecture de l'entête de section '%s'" -#: fetch-pack.c:1308 +#: fetch-pack.c:1302 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' attendu, '%s' reçu" -#: fetch-pack.c:1369 +#: fetch-pack.c:1363 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "ligne d'acquittement inattendue : '%s'" -#: fetch-pack.c:1374 +#: fetch-pack.c:1368 #, c-format msgid "error processing acks: %d" msgstr "erreur lors du traitement des acquittements : %d" -#: fetch-pack.c:1384 +#: fetch-pack.c:1378 msgid "expected packfile to be sent after 'ready'" msgstr "fichier paquet attendu à envoyer après 'ready'" -#: fetch-pack.c:1386 +#: fetch-pack.c:1380 msgid "expected no other sections to be sent after no 'ready'" msgstr "aucune autre section attendue à envoyer après absence de 'ready'" -#: fetch-pack.c:1428 +#: fetch-pack.c:1422 #, c-format msgid "error processing shallow info: %d" msgstr "erreur lors du traitement de l'information de superficialité : %d" -#: fetch-pack.c:1475 +#: fetch-pack.c:1469 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref attendu, '%s' trouvé" -#: fetch-pack.c:1480 +#: fetch-pack.c:1474 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inattendu : '%s'" -#: fetch-pack.c:1485 +#: fetch-pack.c:1479 #, c-format msgid "error processing wanted refs: %d" msgstr "erreur lors du traitement des références voulues : %d" -#: fetch-pack.c:1515 +#: fetch-pack.c:1509 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack : paquet de fin de réponse attendu" -#: fetch-pack.c:1897 +#: fetch-pack.c:1891 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1920 builtin/clone.c:693 +#: fetch-pack.c:1914 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: fetch-pack.c:1947 +#: fetch-pack.c:1941 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:1950 +#: fetch-pack.c:1944 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé" -#: gpg-interface.c:272 +#: gpg-interface.c:273 msgid "could not create temporary file" msgstr "impossible de créer un fichier temporaire" -#: gpg-interface.c:275 +#: gpg-interface.c:276 #, c-format msgid "failed writing detached signature to '%s'" msgstr "impossible d'écrire la signature détachée dans '%s'" -#: gpg-interface.c:457 +#: gpg-interface.c:470 msgid "gpg failed to sign the data" msgstr "gpg n'a pas pu signer les données" @@ -4328,7 +4415,7 @@ msgstr "gpg n'a pas pu signer les données" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "couleur invalide '%.*s' ignorée dans log.graphColors" -#: grep.c:640 +#: grep.c:543 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4336,18 +4423,18 @@ msgstr "" "le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est " "supporté qu'avec -P avec PCRE v2" -#: grep.c:2100 +#: grep.c:1906 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89 +#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: grep.c:2128 +#: grep.c:1934 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquée" @@ -4418,7 +4505,7 @@ msgstr "commandes git disponibles depuis un autre endroit de votre $PATH" msgid "These are common Git commands used in various situations:" msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :" -#: help.c:365 git.c:99 +#: help.c:365 git.c:100 #, c-format msgid "unsupported command listing type '%s'" msgstr "type de liste de commandes non supporté '%s'" @@ -4664,11 +4751,237 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Impossible de créer '%s.lock' : %s" -#: ls-refs.c:109 +#: ls-refs.c:37 +#, c-format +msgid "invalid value '%s' for lsrefs.unborn" +msgstr "valeur invalide '%s' pour lsrefs.unborn" + +#: ls-refs.c:167 msgid "expected flush after ls-refs arguments" msgstr "vidage attendu après les arguments ls-refs" -#: merge-ort-wrappers.c:13 merge-recursive.c:3672 +#: merge-ort.c:855 merge-recursive.c:1191 +#, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "Échec de la fusion du sous-module %s (non extrait)" + +#: merge-ort.c:864 merge-recursive.c:1198 +#, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "Échec de fusion du sous-module %s (commits non présents)" + +#: merge-ort.c:873 merge-recursive.c:1205 +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "" +"Échec de la fusion du sous-module %s (les commits ne descendent pas de la " +"base de fusion)" + +#: merge-ort.c:883 merge-ort.c:890 +#, c-format +msgid "Note: Fast-forwarding submodule %s to %s" +msgstr "Note : Avance rapide du sous-module %s à %s" + +#: merge-ort.c:911 +#, c-format +msgid "Failed to merge submodule %s" +msgstr "Échec de la fusion du sous-module %s" + +#: merge-ort.c:918 +#, c-format +msgid "" +"Failed to merge submodule %s, but a possible merge resolution exists:\n" +"%s\n" +msgstr "" +"Échec de fusion du sous-module %s mais une résolution possible de fusion existe :\n" +"%s\n" + +#: merge-ort.c:922 merge-recursive.c:1259 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Si c'est correct, ajoutez le simplement à l'index\n" +"en utilisant par exemple :\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"qui acceptera cette suggestion.\n" + +#: merge-ort.c:935 +#, c-format +msgid "" +"Failed to merge submodule %s, but multiple possible merges exist:\n" +"%s" +msgstr "" +"Échec de fusion du sous-module %s mais de multiples solutions de fusion existent :\n" +"%s" + +#: merge-ort.c:1094 merge-recursive.c:1341 +msgid "Failed to execute internal merge" +msgstr "Échec à l'exécution de la fusion interne" + +#: merge-ort.c:1099 merge-recursive.c:1346 +#, c-format +msgid "Unable to add %s to database" +msgstr "Impossible d'ajouter %s à la base de données" + +#: merge-ort.c:1106 merge-recursive.c:1378 +#, c-format +msgid "Auto-merging %s" +msgstr "Fusion automatique de %s" + +#: merge-ort.c:1245 merge-recursive.c:2100 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" +"CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne " +"des renommages implicites de répertoire déplaçant les chemins suivants : %s." + +#: merge-ort.c:1255 merge-recursive.c:2110 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" +"CONFLIT (renommage implicite de répertoire) : impossible de transformer " +"plusieurs chemins sur %s ; les chemins concernés sont : %s" + +#: merge-ort.c:1438 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to rename %s to; it was " +"renamed to multiple other directories, with no destination getting a " +"majority of the files." +msgstr "CONFLIT (renommage de répertoire coupé) : le renommage de %s n'est pas clair parce que le répertoire a été renommé en plusieurs autres répertoires, sans aucune destination récupérant la majorité des fichiers." + +#: merge-ort.c:1604 merge-recursive.c:2447 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" +"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été " +"renommé." + +#: merge-ort.c:1748 merge-recursive.c:3215 +#, c-format +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" +"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé " +"en %s ; déplacé dans %s." + +#: merge-ort.c:1755 merge-recursive.c:3222 +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" +"Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été " +"renommé en %s ; déplacé dans %s." + +#: merge-ort.c:1768 merge-recursive.c:3218 +#, c-format +msgid "" +"CONFLICT (file location): %s added in %s inside a directory that was renamed " +"in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"CONFLIT (localisation de fichier) : %s ajouté dans %s dans un répertoire qui " +"a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé " +"vers %s." + +#: merge-ort.c:1776 merge-recursive.c:3225 +#, c-format +msgid "" +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " +"was renamed in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"CONFLIT (localisation de fichier) : %s renommé en %s dans %s, dans un " +"répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être " +"être déplacé vers %s." + +#: merge-ort.c:1919 +#, c-format +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." +msgstr "CONFLIT (renommage/renommage) : %s renommé en %s dans %s et en %s dans %s." + +#: merge-ort.c:2014 +#, c-format +msgid "" +"CONFLICT (rename involved in collision): rename of %s -> %s has content " +"conflicts AND collides with another path; this may result in nested conflict " +"markers." +msgstr "CONFLIT (renommage au sein d'une collision) : lre renommage de %s -> %s a des conflits de contenu ET entre en collision avec un autre chemin ; ceci peut resulter en des marqueurs de conflit imbriqués." + +#: merge-ort.c:2033 merge-ort.c:2057 +#, c-format +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." +msgstr "CONFLIT (renommage/suppression) : Renommage de %s en %s dans %s mais supprimé dans %s." + +#: merge-ort.c:2683 +#, c-format +msgid "" +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " +"%s instead." +msgstr "CONFLIT (fichier/répertoire) : répertoire au milieu de %s depuis %s ; déplacement dans %s à la place." + +#: merge-ort.c:2756 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed %s " +"of them so each can be recorded somewhere." +msgstr "CONFLIT (types différents) : %s a des types différents des deux côtés ; renommé la version %s de manière à pouvoir enregistrer les deux quelque part." + +#: merge-ort.c:2760 +msgid "both" +msgstr "les deux" + +#: merge-ort.c:2760 +msgid "one" +msgstr "un" + +#: merge-ort.c:2855 merge-recursive.c:3052 +msgid "content" +msgstr "contenu" + +#: merge-ort.c:2857 merge-recursive.c:3056 +msgid "add/add" +msgstr "ajout/ajout" + +#: merge-ort.c:2859 merge-recursive.c:3101 +msgid "submodule" +msgstr "sous-module" + +#: merge-ort.c:2861 merge-recursive.c:3102 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "CONFLIT (%s) : Conflit de fusion dans %s" + +#: merge-ort.c:2886 +#, c-format +msgid "" +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " +"of %s left in tree." +msgstr "CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. Version %s de %s laissée dans l'arbre." + +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge +#. base, and 2-3) the trees for the two trees we're merging. +#. +#: merge-ort.c:3354 +#, c-format +msgid "collecting merge info failed for trees %s, %s, %s" +msgstr "échec de collecte l'information de fusion pour les arbres %s, %s, %s" + +#: merge-ort-wrappers.c:13 merge-recursive.c:3661 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4741,23 +5054,6 @@ msgstr "échec à la création du lien symbolique '%s' : %s" msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:1191 -#, c-format -msgid "Failed to merge submodule %s (not checked out)" -msgstr "Échec de la fusion du sous-module %s (non extrait)" - -#: merge-recursive.c:1198 -#, c-format -msgid "Failed to merge submodule %s (commits not present)" -msgstr "Échec de fusion du sous-module %s (commits non présents)" - -#: merge-recursive.c:1205 -#, c-format -msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "" -"Échec de la fusion du sous-module %s (les commits ne descendent pas de la " -"base de fusion)" - #: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" @@ -4783,42 +5079,11 @@ msgstr "Échec de fusion du sous-module %s (pas en avance rapide)" msgid "Found a possible merge resolution for the submodule:\n" msgstr "Résolution possible de fusion trouvée pour le sous-module :\n" -#: merge-recursive.c:1259 -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"Si c'est correct, ajoutez le simplement à l'index\n" -"en utilisant par exemple :\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"qui acceptera cette suggestion.\n" - #: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)" -#: merge-recursive.c:1341 -msgid "Failed to execute internal merge" -msgstr "Échec à l'exécution de la fusion interne" - -#: merge-recursive.c:1346 -#, c-format -msgid "Unable to add %s to database" -msgstr "Impossible d'ajouter %s à la base de données" - -#: merge-recursive.c:1378 -#, c-format -msgid "Auto-merging %s" -msgstr "Fusion automatique de %s" - #: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." @@ -4927,24 +5192,6 @@ msgstr "" "parce que le répertoire %s a été renommé en plusieurs autres répertoires, " "sans aucune destination récupérant la majorité des fichiers." -#: merge-recursive.c:2100 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " -"implicit directory rename(s) putting the following path(s) there: %s." -msgstr "" -"CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne " -"des renommages implicites de répertoire déplaçant les chemins suivants : %s." - -#: merge-recursive.c:2110 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " -"implicit directory renames tried to put these paths there: %s" -msgstr "" -"CONFLIT (renommage implicite de répertoire) : impossible de transformer " -"plusieurs chemins sur %s ; les chemins concernés sont : %s" - #: merge-recursive.c:2202 #, c-format msgid "" @@ -4954,15 +5201,6 @@ msgstr "" "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. " "Renommage de répertoire %s->%s dans %s" -#: merge-recursive.c:2447 -#, c-format -msgid "" -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " -"renamed." -msgstr "" -"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été " -"renommé." - #: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" @@ -4981,71 +5219,16 @@ msgstr "modification" msgid "modified" msgstr "modifié" -#: merge-recursive.c:3052 -msgid "content" -msgstr "contenu" - -#: merge-recursive.c:3056 -msgid "add/add" -msgstr "ajout/ajout" - #: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:3101 -msgid "submodule" -msgstr "sous-module" - -#: merge-recursive.c:3102 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "CONFLIT (%s) : Conflit de fusion dans %s" - #: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:3215 -#, c-format -msgid "" -"Path updated: %s added in %s inside a directory that was renamed in %s; " -"moving it to %s." -msgstr "" -"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé " -"en %s ; déplacé dans %s." - -#: merge-recursive.c:3218 -#, c-format -msgid "" -"CONFLICT (file location): %s added in %s inside a directory that was renamed " -"in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"CONFLIT (localisation de fichier) : %s ajouté dans %s dans un répertoire qui " -"a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé " -"vers %s." - -#: merge-recursive.c:3222 -#, c-format -msgid "" -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " -"%s; moving it to %s." -msgstr "" -"Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été " -"renommé en %s ; déplacé dans %s." - -#: merge-recursive.c:3225 -#, c-format -msgid "" -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " -"was renamed in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"CONFLIT (localisation de fichier) : %s renommé en %s dans %s, dans un " -"répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être " -"être déplacé vers %s." - #: merge-recursive.c:3339 #, c-format msgid "Removing %s" @@ -5080,27 +5263,28 @@ msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s" msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:3550 +#: merge-recursive.c:3539 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:3563 +#: merge-recursive.c:3552 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ancêtre commun trouvé :" msgstr[1] "%u ancêtres communs trouvés :" -#: merge-recursive.c:3613 +#: merge-recursive.c:3602 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:3769 +#: merge-recursive.c:3758 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 +#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 +#: builtin/stash.c:471 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -5108,8 +5292,8 @@ msgstr "Impossible d'écrire l'index." msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817 +#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" @@ -5285,17 +5469,17 @@ msgstr "Impossible de démarrer le groupement d'objets" msgid "could not finish pack-objects" msgstr "Impossible de finir le groupement d'objets" -#: name-hash.c:537 +#: name-hash.c:538 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "impossible de créer le fil lazy_dir : %s" -#: name-hash.c:559 +#: name-hash.c:560 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "impossible de créer le fil lazy_name : %s" -#: name-hash.c:565 +#: name-hash.c:566 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "impossible de joindre le fil lazy_name : %s" @@ -5339,6 +5523,365 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Mauvaise valeur de %s : '%s'" +#: object-file.c:480 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "" +"le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates" + +#: object-file.c:531 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "impossible de normaliser le chemin d'objet alternatif : %s" + +#: object-file.c:603 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde" + +#: object-file.c:610 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "impossible de normaliser le répertoire d'objet : %s" + +#: object-file.c:653 +msgid "unable to fdopen alternates lockfile" +msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives" + +#: object-file.c:671 +msgid "unable to read alternates file" +msgstr "lecture du fichier d'alternatives impossible" + +#: object-file.c:678 +msgid "unable to move new alternates file into place" +msgstr "impossible de déplacer le nouveau fichier d'alternative" + +#: object-file.c:713 +#, c-format +msgid "path '%s' does not exist" +msgstr "le chemin '%s' n'existe pas" + +#: object-file.c:734 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "" +"extraire le dépôt de référence '%s' comme une extraction liée n'est pas " +"encore supporté." + +#: object-file.c:740 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "le dépôt de référence '%s' n'est pas un dépôt local." + +#: object-file.c:746 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "le dépôt de référence '%s' est superficiel" + +#: object-file.c:754 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "le dépôt de référence '%s' est greffé" + +#: object-file.c:814 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "ligne invalide pendant l'analyse des refs alternatives : %s" + +#: object-file.c:964 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>" + +#: object-file.c:985 +msgid "mmap failed" +msgstr "échec de mmap" + +#: object-file.c:1149 +#, c-format +msgid "object file %s is empty" +msgstr "le fichier objet %s est vide" + +#: object-file.c:1284 object-file.c:2477 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "objet libre corrompu '%s'" + +#: object-file.c:1286 object-file.c:2481 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "données incorrectes à la fin de l'objet libre '%s'" + +#: object-file.c:1328 +msgid "invalid object type" +msgstr "type d'objet invalide" + +#: object-file.c:1412 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type" + +#: object-file.c:1415 +#, c-format +msgid "unable to unpack %s header" +msgstr "impossible de dépaqueter l'entête %s" + +#: object-file.c:1421 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type" + +#: object-file.c:1424 +#, c-format +msgid "unable to parse %s header" +msgstr "impossible d'analyser l'entête %s" + +#: object-file.c:1651 +#, c-format +msgid "failed to read object %s" +msgstr "impossible de lire l'objet %s" + +#: object-file.c:1655 +#, c-format +msgid "replacement %s not found for %s" +msgstr "remplacement %s non trouvé pour %s" + +#: object-file.c:1659 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "l'objet libre %s (stocké dans %s) est corrompu" + +#: object-file.c:1663 +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu" + +#: object-file.c:1768 +#, c-format +msgid "unable to write file %s" +msgstr "impossible d'écrire le fichier %s" + +#: object-file.c:1775 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "impossible de régler les droits de '%s'" + +#: object-file.c:1782 +msgid "file write error" +msgstr "erreur d'écriture d'un fichier" + +#: object-file.c:1802 +msgid "error when closing loose object file" +msgstr "erreur en fermeture du fichier d'objet esseulé" + +#: object-file.c:1867 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "" +"droits insuffisants pour ajouter un objet à la base de données %s du dépôt" + +#: object-file.c:1869 +msgid "unable to create temporary file" +msgstr "impossible de créer un fichier temporaire" + +#: object-file.c:1893 +msgid "unable to write loose object file" +msgstr "impossible d'écrire le fichier d'objet esseulé" + +#: object-file.c:1899 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "impossible de compresser le nouvel objet %s (%d)" + +#: object-file.c:1903 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "échec de deflateEnd sur l'objet %s (%d)" + +#: object-file.c:1907 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "données de source d'objet instable pour %s" + +#: object-file.c:1917 builtin/pack-objects.c:1097 +#, c-format +msgid "failed utime() on %s" +msgstr "échec de utime() sur %s" + +#: object-file.c:1994 +#, c-format +msgid "cannot read object for %s" +msgstr "impossible de lire l'objet pour %s" + +#: object-file.c:2045 +msgid "corrupt commit" +msgstr "commit corrompu" + +#: object-file.c:2053 +msgid "corrupt tag" +msgstr "étiquette corrompue" + +#: object-file.c:2153 +#, c-format +msgid "read error while indexing %s" +msgstr "erreur de lecture à l'indexation de %s" + +#: object-file.c:2156 +#, c-format +msgid "short read while indexing %s" +msgstr "lecture tronquée pendant l'indexation de %s" + +#: object-file.c:2229 object-file.c:2239 +#, c-format +msgid "%s: failed to insert into database" +msgstr "%s : échec de l'insertion dans la base de données" + +#: object-file.c:2245 +#, c-format +msgid "%s: unsupported file type" +msgstr "%s : type de fichier non supporté" + +#: object-file.c:2269 +#, c-format +msgid "%s is not a valid object" +msgstr "%s n'est pas un objet valide" + +#: object-file.c:2271 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s n'est pas un objet '%s' valide" + +#: object-file.c:2298 builtin/index-pack.c:192 +#, c-format +msgid "unable to open %s" +msgstr "impossible d'ouvrir %s" + +#: object-file.c:2488 object-file.c:2541 +#, c-format +msgid "hash mismatch for %s (expected %s)" +msgstr "incohérence de hachage pour %s (%s attendu)" + +#: object-file.c:2512 +#, c-format +msgid "unable to mmap %s" +msgstr "impossible de mmap %s" + +#: object-file.c:2517 +#, c-format +msgid "unable to unpack header of %s" +msgstr "impossible de dépaqueter l'entête de %s" + +#: object-file.c:2523 +#, c-format +msgid "unable to parse header of %s" +msgstr "impossible d'analyser l'entête de %s" + +#: object-file.c:2534 +#, c-format +msgid "unable to unpack contents of %s" +msgstr "impossible de dépaqueter le contenu de %s" + +#: object-name.c:486 +#, c-format +msgid "short object ID %s is ambiguous" +msgstr "l'id court d'objet %s est ambigu" + +#: object-name.c:497 +msgid "The candidates are:" +msgstr "Les candidats sont :" + +#: object-name.c:796 +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "" +"Git ne crée normalement jamais de référence qui se termine par 40\n" +"caractères hexa car elle serait ignorée si vous spécifiez juste\n" +"40-hexa. Ces références peuvent être créées par erreur. Par exemple,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa " +"est créée.\n" +"Veuillez examiner ces références et peut-être les supprimer. Désactivez ce " +"message\n" +"en lançant \"git config advice.objectNameWarning false\"" + +#: object-name.c:916 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "le journal de '%.*s' ne remonte qu'à %s" + +#: object-name.c:924 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "le journal de '%.*s' n'a que %d entrées" + +#: object-name.c:1702 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "le chemin '%s' existe sur le disque, mais pas dans '%.*s'" + +#: object-name.c:1708 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" +"le chemin '%s' existe, mais pas '%s'\n" +"conseil : peut-être vouliez-vous dire '%.*s:%s', soit '%.*s:./%s'" + +#: object-name.c:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "le chemin '%s' n'existe pas dans '%.*s'" + +#: object-name.c:1745 +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" +"le chemin '%s' est dans l'index, mais pas à l'étape %d\n" +"conseil : vous vouliez peut-être dire ':%d:%s' ?" + +#: object-name.c:1761 +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" +"le chemin '%s' est dans l'index, mais pas '%s'\n" +"conseil : peut-être vouliez-vous dire ':%d:%s', soit '%d:./%s'" + +#: object-name.c:1769 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "le chemin '%s' existe sur le disque, mais pas dans l'index" + +#: object-name.c:1771 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "le chemin '%s' n'existe pas (ni sur le disque, ni dans l'index)" + +#: object-name.c:1784 +msgid "relative path syntax can't be used outside working tree" +msgstr "" +"la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de " +"travail" + +#: object-name.c:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "nom d'objet invalide : '%.*s'." + #: object.c:53 #, c-format msgid "invalid object type \"%s\"" @@ -5364,21 +5907,70 @@ msgstr "impossible d'analyser l'objet : %s" msgid "hash mismatch %s" msgstr "incohérence de hachage %s" -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 #, c-format msgid "unable to get size of %s" msgstr "impossible de récupérer la taille de %s" -#: packfile.c:615 +#: pack-bitmap.c:1489 builtin/rev-list.c:92 +#, c-format +msgid "unable to get disk usage of %s" +msgstr "impossible de récupérer l'utilisation du disque de %s" + +#: pack-revindex.c:220 +#, c-format +msgid "reverse-index file %s is too small" +msgstr "le fichier d'index inversé %s est trop petit" + +#: pack-revindex.c:225 +#, c-format +msgid "reverse-index file %s is corrupt" +msgstr "le fichier d'index inversé %s est corrompu" + +#: pack-revindex.c:233 +#, c-format +msgid "reverse-index file %s has unknown signature" +msgstr "le fichier d'index inversé %s a une signature inconnue" + +#: pack-revindex.c:237 +#, c-format +msgid "reverse-index file %s has unsupported version %<PRIu32>" +msgstr "le fichier d'index inverse %s a une version non gérée %<PRIu32>" + +#: pack-revindex.c:242 +#, c-format +msgid "reverse-index file %s has unsupported hash id %<PRIu32>" +msgstr "le fichier d'index inverse %s a un id d'empreinte non géré %<PRIu32>" + +#: pack-write.c:236 +msgid "cannot both write and verify reverse index" +msgstr "impossible de lire et vérifier à la fois l'index inverse" + +#: pack-write.c:257 +#, c-format +msgid "could not stat: %s" +msgstr "stat impossible de %s" + +#: pack-write.c:269 +#, c-format +msgid "failed to make %s readable" +msgstr "échec de rendre %s lisible" + +#: pack-write.c:502 +#, c-format +msgid "could not write '%s' promisor file" +msgstr "impossible d'écrire le fichier de prometteur '%s'" + +#: packfile.c:625 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" -#: packfile.c:1907 +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)" -#: packfile.c:1911 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -5645,7 +6237,7 @@ msgstr "Rafraîchissement de l'index" msgid "unable to create threaded lstat: %s" msgstr "impossible de créer le lstat en fil : %s" -#: pretty.c:983 +#: pretty.c:984 msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" @@ -5674,20 +6266,20 @@ msgstr "un nom de prometteur distant ne peut pas commencer par '/' : %s" msgid "Removing duplicate objects" msgstr "Suppression des objets dupliqués" -#: range-diff.c:77 +#: range-diff.c:78 msgid "could not start `log`" msgstr "impossible de démarrer `log`" -#: range-diff.c:79 +#: range-diff.c:80 msgid "could not read `log` output" msgstr "impossible de lire la sortie de `log`" -#: range-diff.c:98 sequencer.c:5310 +#: range-diff.c:101 sequencer.c:5318 #, c-format msgid "could not parse commit '%s'" msgstr "impossible d'analyser le commit '%s'" -#: range-diff.c:112 +#: range-diff.c:115 #, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " @@ -5696,16 +6288,20 @@ msgstr "" "impossible d'analyser la première ligne de la sortie de `log` : ne commence " "pas par 'commit' : '%s'" -#: range-diff.c:137 +#: range-diff.c:140 #, c-format msgid "could not parse git header '%.*s'" msgstr "impossible d'analyser l'entête git '%.*s'" -#: range-diff.c:299 +#: range-diff.c:306 msgid "failed to generate diff" msgstr "échec de la génération de diff" -#: range-diff.c:532 range-diff.c:534 +#: range-diff.c:558 +msgid "--left-only and --right-only are mutually exclusive" +msgstr "--left-only et --right-only sont mutuellement exclusifs" + +#: range-diff.c:561 range-diff.c:563 #, c-format msgid "could not parse log for '%s'" msgstr "impossible d'analyser le journal pour '%s'" @@ -5821,10 +6417,10 @@ msgstr "entrées multiples de préparation pour le fichier fusionné '%s'" msgid "unordered stage entries for '%s'" msgstr "entrées de préparation non ordonnées pour '%s'" -#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 -#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 +#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" @@ -5880,12 +6476,12 @@ msgstr "impossible de rafraîchir l'index partagé '%s'" msgid "broken index, expect %s in %s, got %s" msgstr "index cassé, %s attendu dans %s, %s obtenu" -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 +#: read-cache.c:3120 sequencer.c:2487 sequencer.c:4239 #, c-format msgid "could not stat '%s'" msgstr "stat impossible de '%s'" @@ -6018,14 +6614,14 @@ msgstr "" "Cependant, si vous effacez tout, le rebasage sera annulé.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607 -#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270 +#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615 +#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272 #, c-format msgid "could not write '%s'" msgstr "impossible d'écrire '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228 -#: builtin/rebase.c:252 +#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230 +#: builtin/rebase.c:254 #, c-format msgid "could not write '%s'." msgstr "impossible d'écrire '%s'." @@ -6057,15 +6653,15 @@ msgstr "" "Les comportements disponibles sont : ignore, warn, error.\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394 -#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239 -#: builtin/rebase.c:264 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402 +#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241 +#: builtin/rebase.c:266 #, c-format msgid "could not read '%s'." msgstr "impossible de lire '%s'." # à priori on parle d'une branche ici -#: ref-filter.c:42 wt-status.c:1973 +#: ref-filter.c:42 wt-status.c:1975 msgid "gone" msgstr "disparue" @@ -6256,24 +6852,34 @@ msgstr "format : atome %%(end) utilisé sans atome correspondant" msgid "malformed format string %s" msgstr "Chaîne de formatage mal formée %s" -#: ref-filter.c:1549 +#: ref-filter.c:1551 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "(aucune branche, rebasage de %s)" + +#: ref-filter.c:1554 +#, c-format +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "(aucune branche, rebasage de la HEAD détachée %s)" + +#: ref-filter.c:1557 #, c-format -msgid "no branch, rebasing %s" -msgstr "aucune branche, rebasage de %s" +msgid "(no branch, bisect started on %s)" +msgstr "(aucune branche, bisect a démarré sur %s)" -#: ref-filter.c:1552 +#: ref-filter.c:1561 #, c-format -msgid "no branch, rebasing detached HEAD %s" -msgstr "aucune branche, rebasage de la HEAD détachée %s" +msgid "(HEAD detached at %s)" +msgstr "(HEAD détachée sur %s)" -#: ref-filter.c:1555 +#: ref-filter.c:1564 #, c-format -msgid "no branch, bisect started on %s" -msgstr "aucune branche, bisect a démarré sur %s" +msgid "(HEAD detached from %s)" +msgstr "(HEAD détachée depuis %s)" -#: ref-filter.c:1565 -msgid "no branch" -msgstr "aucune branche" +#: ref-filter.c:1567 +msgid "(no branch)" +msgstr "(aucune branche)" #: ref-filter.c:1599 ref-filter.c:1808 #, c-format @@ -6285,32 +6891,32 @@ msgstr "objet manquant %s pour %s" msgid "parse_object_buffer failed on %s for %s" msgstr "échec de parse_object_buffer sur %s pour %s" -#: ref-filter.c:2062 +#: ref-filter.c:1992 #, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" -#: ref-filter.c:2151 +#: ref-filter.c:2081 #, c-format msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:2156 refs.c:676 +#: ref-filter.c:2086 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" -#: ref-filter.c:2472 +#: ref-filter.c:2426 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:2571 +#: ref-filter.c:2525 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: ref-filter.c:2576 +#: ref-filter.c:2530 #, c-format msgid "option `%s' must point to a commit" msgstr "l'option '%s' doit pointer sur un commit" @@ -6360,50 +6966,50 @@ msgstr "Nom de branche invalide : %s = %s" msgid "ignoring dangling symref %s" msgstr "symref pendant %s ignoré" -#: refs.c:911 +#: refs.c:922 #, c-format msgid "log for ref %s has gap after %s" msgstr "le journal pour la réf %s contient un trou après %s" -#: refs.c:917 +#: refs.c:929 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s" -#: refs.c:976 +#: refs.c:994 #, c-format msgid "log for %s is empty" msgstr "le journal pour la réf %s est vide" -#: refs.c:1068 +#: refs.c:1086 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "refus de mettre à jour une réf avec un nom cassé '%s'" -#: refs.c:1139 +#: refs.c:1157 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "échec de update_ref pour la réf '%s' : %s" -#: refs.c:1963 +#: refs.c:2051 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "mises à jour multiples pour la réf '%s' non permises" -#: refs.c:2043 +#: refs.c:2131 msgid "ref updates forbidden inside quarantine environment" msgstr "mises à jour des références interdites en environnement de quarantaine" -#: refs.c:2054 +#: refs.c:2142 msgid "ref updates aborted by hook" msgstr "mises à jour des références annulées par le crochet" -#: refs.c:2154 refs.c:2184 +#: refs.c:2242 refs.c:2272 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe ; impossible de créer '%s'" -#: refs.c:2160 refs.c:2195 +#: refs.c:2248 refs.c:2283 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "impossible de traiter '%s' et '%s' en même temps" @@ -6468,13 +7074,13 @@ msgstr "la clé '%s' du modèle n'a pas de '*'" msgid "value '%s' of pattern has no '*'" msgstr "la valeur '%s' du modèle n'a pas de '*'" -#: remote.c:1073 +#: remote.c:1083 #, c-format msgid "src refspec %s does not match any" msgstr "" "le spécificateur de référence source %s ne correspond à aucune référence" -#: remote.c:1078 +#: remote.c:1088 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -6484,7 +7090,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1093 +#: remote.c:1103 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6508,7 +7114,7 @@ msgstr "" "Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence " "totalement qualifiée." -#: remote.c:1113 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6519,7 +7125,7 @@ msgstr "" "Souhaitiez-vous créer une nouvelle branche en poussant sur\n" "'%s:refs/heads/%s' ?" -#: remote.c:1118 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6530,7 +7136,7 @@ msgstr "" "Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1123 +#: remote.c:1133 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6541,7 +7147,7 @@ msgstr "" "Souhaitiez-vous créer un nouvel arbre en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1128 +#: remote.c:1138 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6552,119 +7158,119 @@ msgstr "" "Souhaitiez-vous créer un nouveau blob en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1164 +#: remote.c:1174 #, c-format msgid "%s cannot be resolved to branch" msgstr "'%s' ne peut pas être résolue comme une branche" -#: remote.c:1175 +#: remote.c:1185 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "suppression de '%s' impossible : la référence distante n'existe pas" -#: remote.c:1187 +#: remote.c:1197 #, c-format msgid "dst refspec %s matches more than one" msgstr "" "le spécificateur de référence dst %s correspond à plus d'un spécificateur de " "références" -#: remote.c:1194 +#: remote.c:1204 #, c-format msgid "dst ref %s receives from more than one src" msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source" -#: remote.c:1714 remote.c:1815 +#: remote.c:1724 remote.c:1825 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1723 +#: remote.c:1733 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1726 +#: remote.c:1736 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurée pour la branche '%s'" -#: remote.c:1732 +#: remote.c:1742 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi" -#: remote.c:1747 +#: remote.c:1757 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de " "branche locale de suivi" -#: remote.c:1759 +#: remote.c:1769 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branche '%s' n'a aucune branche distante de poussée" -#: remote.c:1769 +#: remote.c:1779 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les références de spec pour '%s' n'incluent pas '%s'" -#: remote.c:1782 +#: remote.c:1792 msgid "push has no destination (push.default is 'nothing')" msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')" -#: remote.c:1804 +#: remote.c:1814 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de résoudre une poussée 'simple' pour une destination unique" -#: remote.c:1933 +#: remote.c:1943 #, c-format msgid "couldn't find remote ref %s" msgstr "impossible de trouver la référence distante %s" -#: remote.c:1946 +#: remote.c:1956 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Référence bizarre '%s' ignorée localement" -#: remote.c:2109 +#: remote.c:2119 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n" -#: remote.c:2113 +#: remote.c:2123 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2116 +#: remote.c:2126 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:2120 +#: remote.c:2130 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Votre branche et '%s' font référence à des commits différents.\n" -#: remote.c:2123 +#: remote.c:2133 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (utilisez \"%s\" pour plus de détails)\n" -#: remote.c:2127 +#: remote.c:2137 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n" msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n" -#: remote.c:2133 +#: remote.c:2143 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2136 +#: remote.c:2146 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6676,11 +7282,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:2144 +#: remote.c:2154 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:2147 +#: remote.c:2157 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6695,12 +7301,12 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:2157 +#: remote.c:2167 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" -#: remote.c:2349 +#: remote.c:2359 #, c-format msgid "cannot parse expected object name '%s'" msgstr "impossible d'analyser le nom attendu d'objet '%s'" @@ -6720,96 +7326,96 @@ msgstr "référence de remplacement dupliquée : %s" msgid "replace depth too high for object %s" msgstr "profondeur de remplacement trop grande pour l'objet %s" -#: rerere.c:217 rerere.c:226 rerere.c:229 +#: rerere.c:201 rerere.c:210 rerere.c:213 msgid "corrupt MERGE_RR" msgstr "MERGE_RR corrompu" -#: rerere.c:264 rerere.c:269 +#: rerere.c:248 rerere.c:253 msgid "unable to write rerere record" msgstr "impossible d'écrire l'enregistrement rerere" -#: rerere.c:495 +#: rerere.c:479 #, c-format msgid "there were errors while writing '%s' (%s)" msgstr "il y a eu des erreurs à l'écriture de '%s' (%s)" -#: rerere.c:498 +#: rerere.c:482 #, c-format msgid "failed to flush '%s'" msgstr "échec du flush de '%s'" -#: rerere.c:503 rerere.c:1039 +#: rerere.c:487 rerere.c:1023 #, c-format msgid "could not parse conflict hunks in '%s'" msgstr "impossible d'analyser la section en conflit dans '%s'" -#: rerere.c:684 +#: rerere.c:668 #, c-format msgid "failed utime() on '%s'" msgstr "échec de utime() sur '%s'" -#: rerere.c:694 +#: rerere.c:678 #, c-format msgid "writing '%s' failed" msgstr "échec de l'écriture de '%s'" -#: rerere.c:714 +#: rerere.c:698 #, c-format msgid "Staged '%s' using previous resolution." msgstr "'%s' indexé en utilisant la résolution pré-existante." -#: rerere.c:753 +#: rerere.c:737 #, c-format msgid "Recorded resolution for '%s'." msgstr "Résolution enregistrée pour '%s'." -#: rerere.c:788 +#: rerere.c:772 #, c-format msgid "Resolved '%s' using previous resolution." msgstr "'%s' résolu en utilisant la résolution pré-existante." -#: rerere.c:803 +#: rerere.c:787 #, c-format msgid "cannot unlink stray '%s'" msgstr "impossible de délier '%s' qui est errant" -#: rerere.c:807 +#: rerere.c:791 #, c-format msgid "Recorded preimage for '%s'" msgstr "Pré-image enregistrée pour '%s'" -#: rerere.c:881 submodule.c:2082 builtin/log.c:1992 +#: rerere.c:865 submodule.c:2088 builtin/log.c:1991 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le répertoire '%s'" -#: rerere.c:1057 +#: rerere.c:1041 #, c-format msgid "failed to update conflicted state in '%s'" msgstr "échec de la mise à jour de l'état en conflit dans '%s'" -#: rerere.c:1068 rerere.c:1075 +#: rerere.c:1052 rerere.c:1059 #, c-format msgid "no remembered resolution for '%s'" msgstr "Aucune résolution enregistrée pour '%s'" -#: rerere.c:1077 +#: rerere.c:1061 #, c-format msgid "cannot unlink '%s'" msgstr "impossible de délier '%s'" -#: rerere.c:1087 +#: rerere.c:1071 #, c-format msgid "Updated preimage for '%s'" msgstr "Pré-image mise à jour pour '%s'" -#: rerere.c:1096 +#: rerere.c:1080 #, c-format msgid "Forgot resolution for '%s'\n" msgstr "Résolution pour '%s' oubliée\n" -#: rerere.c:1199 +#: rerere.c:1191 msgid "unable to open rr-cache directory" msgstr "impossible d'ouvrir le répertoire rr-cache" @@ -6817,43 +7423,38 @@ msgstr "impossible d'ouvrir le répertoire rr-cache" msgid "could not determine HEAD revision" msgstr "impossible de déterminer la révision HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3460 +#: reset.c:70 reset.c:76 sequencer.c:3468 #, c-format msgid "failed to find tree of %s" msgstr "impossible de trouver l'arbre de %s" -#: revision.c:2336 +#: revision.c:2338 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<fichier-paquet> n'est plus géré" -#: revision.c:2356 -#, c-format -msgid "unknown value for --diff-merges: %s" -msgstr "valeur inconnue pour --diff-merges : %s" - -#: revision.c:2694 +#: revision.c:2668 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2697 +#: revision.c:2671 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "votre branche actuelle '%s' ne contient encore aucun commit" -#: revision.c:2907 +#: revision.c:2877 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s" -#: run-command.c:764 +#: run-command.c:767 msgid "open /dev/null failed" msgstr "échec de l'ouverture de /dev/null" -#: run-command.c:1271 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "impossible de créer un fil asynchrone : %s" -#: run-command.c:1335 +#: run-command.c:1338 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6917,7 +7518,7 @@ msgstr "mode de nettoyage invalide de message de validation '%s'" msgid "could not delete '%s'" msgstr "Impossible de supprimer '%s'" -#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385 +#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "impossible de supprimer '%s'" @@ -6957,13 +7558,13 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:434 sequencer.c:3062 +#: sequencer.c:434 sequencer.c:3070 #, c-format msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" -#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080 -#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088 +#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "impossible d'écrire dans '%s'" @@ -6973,8 +7574,8 @@ msgstr "impossible d'écrire dans '%s'" msgid "could not write eol to '%s'" msgstr "impossible d'écrire la fin de ligne dans '%s'" -#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082 -#: sequencer.c:3345 +#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090 +#: sequencer.c:3353 #, c-format msgid "failed to finalize '%s'" msgstr "échec lors de la finalisation de '%s'" @@ -6993,7 +7594,7 @@ msgstr "validez vos modifications ou les remiser pour continuer." msgid "%s: fast-forward" msgstr "%s : avance rapide" -#: sequencer.c:560 builtin/tag.c:566 +#: sequencer.c:560 builtin/tag.c:598 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" @@ -7006,60 +7607,60 @@ msgstr "Mode de nettoyage invalide %s" msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:687 +#: sequencer.c:684 msgid "unable to update cache tree" msgstr "impossible de mettre à jour l'arbre de cache" -#: sequencer.c:701 +#: sequencer.c:698 msgid "could not resolve HEAD commit" msgstr "impossible de résoudre le commit HEAD" -#: sequencer.c:781 +#: sequencer.c:778 #, c-format msgid "no key present in '%.*s'" msgstr "aucune clé présente dans '%.*s'" -#: sequencer.c:792 +#: sequencer.c:789 #, c-format msgid "unable to dequote value of '%s'" msgstr "Impossible de décoter la valeur de '%s'" -#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908 +#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: sequencer.c:839 +#: sequencer.c:836 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' déjà fourni" -#: sequencer.c:844 +#: sequencer.c:841 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' déjà fourni" -#: sequencer.c:849 +#: sequencer.c:846 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' déjà fourni" -#: sequencer.c:853 +#: sequencer.c:850 #, c-format msgid "unknown variable '%s'" msgstr "variable inconnue '%s'" -#: sequencer.c:858 +#: sequencer.c:855 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' manquant" -#: sequencer.c:860 +#: sequencer.c:857 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' manquant" -#: sequencer.c:862 +#: sequencer.c:859 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' manquant" -#: sequencer.c:927 +#: sequencer.c:924 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -7088,11 +7689,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1208 +#: sequencer.c:1211 msgid "'prepare-commit-msg' hook failed" msgstr "échec du crochet 'prepare-commit-msg'" -#: sequencer.c:1214 +#: sequencer.c:1217 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7121,7 +7722,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1227 +#: sequencer.c:1230 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7147,339 +7748,339 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1269 +#: sequencer.c:1272 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: sequencer.c:1271 +#: sequencer.c:1274 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: sequencer.c:1317 +#: sequencer.c:1320 msgid "unable to resolve HEAD after creating commit" msgstr "impossible de résoudre HEAD après création du commit" -#: sequencer.c:1319 +#: sequencer.c:1322 msgid "detached HEAD" msgstr "HEAD détachée" -#: sequencer.c:1323 +#: sequencer.c:1326 msgid " (root-commit)" msgstr " (commit racine)" -#: sequencer.c:1344 +#: sequencer.c:1347 msgid "could not parse HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:1346 +#: sequencer.c:1349 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s n'est pas un commit !" -#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577 +#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: sequencer.c:1403 sequencer.c:2100 +#: sequencer.c:1409 sequencer.c:2108 msgid "unable to parse commit author" msgstr "impossible d'analyser l'auteur du commit" -#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701 +#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: sequencer.c:1447 sequencer.c:1565 +#: sequencer.c:1453 sequencer.c:1573 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:1476 sequencer.c:1508 +#: sequencer.c:1484 sequencer.c:1516 #, c-format msgid "invalid author identity '%s'" msgstr "identité d'auteur invalide '%s'" -#: sequencer.c:1482 +#: sequencer.c:1490 msgid "corrupt author: missing date information" msgstr "auteur corrompu : information de date manquante" -#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904 -#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905 +#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "impossible de mettre à jour %s" -#: sequencer.c:1597 +#: sequencer.c:1605 #, c-format msgid "could not parse commit %s" msgstr "impossible d'analyser le commit %s" -#: sequencer.c:1602 +#: sequencer.c:1610 #, c-format msgid "could not parse parent commit %s" msgstr "impossible d'analyser le commit parent %s" -#: sequencer.c:1685 sequencer.c:1796 +#: sequencer.c:1693 sequencer.c:1804 #, c-format msgid "unknown command: %d" msgstr "commande inconnue : %d" -#: sequencer.c:1743 sequencer.c:1768 +#: sequencer.c:1751 sequencer.c:1776 #, c-format msgid "This is a combination of %d commits." msgstr "Ceci est la combinaison de %d commits." -#: sequencer.c:1753 +#: sequencer.c:1761 msgid "need a HEAD to fixup" msgstr "une HEAD est nécessaire à la correction" -#: sequencer.c:1755 sequencer.c:3372 +#: sequencer.c:1763 sequencer.c:3380 msgid "could not read HEAD" msgstr "Impossible de lire HEAD" -#: sequencer.c:1757 +#: sequencer.c:1765 msgid "could not read HEAD's commit message" msgstr "impossible de lire le message de validation de HEAD" -#: sequencer.c:1763 +#: sequencer.c:1771 #, c-format msgid "cannot write '%s'" msgstr "impossible d'écrire '%s'" -#: sequencer.c:1770 git-rebase--preserve-merges.sh:486 +#: sequencer.c:1778 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Ceci est le premier message de validation :" -#: sequencer.c:1778 +#: sequencer.c:1786 #, c-format msgid "could not read commit message of %s" msgstr "impossible de lire le message de validation de %s" -#: sequencer.c:1785 +#: sequencer.c:1793 #, c-format msgid "This is the commit message #%d:" msgstr "Ceci est le message de validation numéro %d :" -#: sequencer.c:1791 +#: sequencer.c:1799 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Le message de validation %d sera ignoré :" -#: sequencer.c:1879 +#: sequencer.c:1887 msgid "your index file is unmerged." msgstr "votre fichier d'index n'est pas fusionné." -#: sequencer.c:1886 +#: sequencer.c:1894 msgid "cannot fixup root commit" msgstr "impossible de réparer le commit racine" -#: sequencer.c:1905 +#: sequencer.c:1913 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée." -#: sequencer.c:1913 sequencer.c:1921 +#: sequencer.c:1921 sequencer.c:1929 #, c-format msgid "commit %s does not have parent %d" msgstr "le commit %s n'a pas de parent %d" -#: sequencer.c:1927 +#: sequencer.c:1935 #, c-format msgid "cannot get commit message for %s" msgstr "impossible d'obtenir un message de validation pour %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1946 +#: sequencer.c:1954 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:2011 +#: sequencer.c:2019 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossible de renommer '%s' en '%s'" -#: sequencer.c:2071 +#: sequencer.c:2079 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:2072 +#: sequencer.c:2080 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:2092 +#: sequencer.c:2100 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "abandon de %s %s -- le contenu de la rustine déjà en amont\n" -#: sequencer.c:2150 +#: sequencer.c:2158 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:2157 +#: sequencer.c:2165 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:2234 +#: sequencer.c:2242 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s n'accepte pas d'argument : '%s'" -#: sequencer.c:2243 +#: sequencer.c:2251 #, c-format msgid "missing arguments for %s" msgstr "argument manquant pour %s" -#: sequencer.c:2274 +#: sequencer.c:2282 #, c-format msgid "could not parse '%s'" msgstr "impossible d'analyser '%s'" -#: sequencer.c:2335 +#: sequencer.c:2343 #, c-format msgid "invalid line %d: %.*s" msgstr "ligne %d invalide : %.*s" -#: sequencer.c:2346 +#: sequencer.c:2354 #, c-format msgid "cannot '%s' without a previous commit" msgstr "'%s' impossible avec le commit précédent" -#: sequencer.c:2432 +#: sequencer.c:2440 msgid "cancelling a cherry picking in progress" msgstr "annulation d'un picorage en cours" -#: sequencer.c:2441 +#: sequencer.c:2449 msgid "cancelling a revert in progress" msgstr "annulation d'un retour en cours" -#: sequencer.c:2485 +#: sequencer.c:2493 msgid "please fix this using 'git rebase --edit-todo'." msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: sequencer.c:2487 +#: sequencer.c:2495 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "feuille d'instruction inutilisable : '%s'" -#: sequencer.c:2492 +#: sequencer.c:2500 msgid "no commits parsed." msgstr "aucun commit analysé." -#: sequencer.c:2503 +#: sequencer.c:2511 msgid "cannot cherry-pick during a revert." msgstr "impossible de picorer pendant l'annulation d'un commit." -#: sequencer.c:2505 +#: sequencer.c:2513 msgid "cannot revert during a cherry-pick." msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:2583 +#: sequencer.c:2591 #, c-format msgid "invalid value for %s: %s" msgstr "valeur invalide pour %s : %s" -#: sequencer.c:2690 +#: sequencer.c:2698 msgid "unusable squash-onto" msgstr "\"écrase-sur\" inutilisable" -#: sequencer.c:2710 +#: sequencer.c:2718 #, c-format msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformée : %s" -#: sequencer.c:2803 sequencer.c:4636 +#: sequencer.c:2811 sequencer.c:4644 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:2820 +#: sequencer.c:2828 msgid "revert is already in progress" msgstr "un retour est déjà en cours" -#: sequencer.c:2822 +#: sequencer.c:2830 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "essayez \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2825 +#: sequencer.c:2833 msgid "cherry-pick is already in progress" msgstr "un picorage est déjà en cours" -#: sequencer.c:2827 +#: sequencer.c:2835 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2841 +#: sequencer.c:2849 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossible de créer le répertoire de séquenceur '%s'" -#: sequencer.c:2856 +#: sequencer.c:2864 msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:2916 sequencer.c:4371 +#: sequencer.c:2924 sequencer.c:4379 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:2918 sequencer.c:2929 +#: sequencer.c:2926 sequencer.c:2937 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:2920 sequencer.c:2964 +#: sequencer.c:2928 sequencer.c:2972 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:2950 builtin/grep.c:756 +#: sequencer.c:2958 builtin/grep.c:757 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:2952 +#: sequencer.c:2960 #, c-format msgid "cannot read '%s': %s" msgstr "impossible de lire '%s' : %s" -#: sequencer.c:2953 +#: sequencer.c:2961 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:2959 +#: sequencer.c:2967 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu" -#: sequencer.c:2970 +#: sequencer.c:2978 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !" -#: sequencer.c:3011 +#: sequencer.c:3019 msgid "no revert in progress" msgstr "Pas de retour en cours ?" -#: sequencer.c:3020 +#: sequencer.c:3028 msgid "no cherry-pick in progress" msgstr "aucun picorage en cours" -#: sequencer.c:3030 +#: sequencer.c:3038 msgid "failed to skip the commit" msgstr "échec du saut de commit" -#: sequencer.c:3037 +#: sequencer.c:3045 msgid "there is nothing to skip" msgstr "il n'y a rien à sauter" -#: sequencer.c:3040 +#: sequencer.c:3048 #, c-format msgid "" "have you committed already?\n" @@ -7488,16 +8089,16 @@ msgstr "" "Avez-vous déjà validé ?\n" "essayez \"git %s -continue\"" -#: sequencer.c:3202 sequencer.c:4263 +#: sequencer.c:3210 sequencer.c:4271 msgid "cannot read HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:3219 +#: sequencer.c:3227 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3227 +#: sequencer.c:3235 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7516,27 +8117,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3237 +#: sequencer.c:3245 #, c-format msgid "Could not apply %s... %.*s" msgstr "impossible d'appliquer %s... %.*s" -#: sequencer.c:3244 +#: sequencer.c:3252 #, c-format msgid "Could not merge %.*s" msgstr "Impossible de fusionner %.*s" -#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640 +#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3274 +#: sequencer.c:3282 #, c-format msgid "Executing: %s\n" msgstr "Exécution : %s\n" -#: sequencer.c:3289 +#: sequencer.c:3297 #, c-format msgid "" "execution failed: %s\n" @@ -7551,11 +8152,11 @@ msgstr "" "git rebase --continue\n" "\n" -#: sequencer.c:3295 +#: sequencer.c:3303 msgid "and made changes to the index and/or the working tree\n" msgstr "et a mis à jour l'index ou l'arbre de travail\n" -#: sequencer.c:3301 +#: sequencer.c:3309 #, c-format msgid "" "execution succeeded: %s\n" @@ -7572,91 +8173,91 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3362 +#: sequencer.c:3370 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom de label illégal '%.*s'" -#: sequencer.c:3416 +#: sequencer.c:3424 msgid "writing fake root commit" msgstr "écriture d'un commit racine bidon" -#: sequencer.c:3421 +#: sequencer.c:3429 msgid "writing squash-onto" msgstr "écriture de 'écraser-sur'" -#: sequencer.c:3505 +#: sequencer.c:3513 #, c-format msgid "could not resolve '%s'" msgstr "impossible de résoudre '%s'" -#: sequencer.c:3538 +#: sequencer.c:3546 msgid "cannot merge without a current revision" msgstr "impossible de fusionner avec une révision courante" -#: sequencer.c:3560 +#: sequencer.c:3568 #, c-format msgid "unable to parse '%.*s'" msgstr "impossible d'analyser '%.*s'" -#: sequencer.c:3569 +#: sequencer.c:3577 #, c-format msgid "nothing to merge: '%.*s'" msgstr "rien à fusionner : '%.*s'" -#: sequencer.c:3581 +#: sequencer.c:3589 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine" -#: sequencer.c:3597 +#: sequencer.c:3605 #, c-format msgid "could not get commit message of '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:3780 +#: sequencer.c:3788 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "impossible de seulement essayer de fusionner '%.*s'" -#: sequencer.c:3796 +#: sequencer.c:3804 msgid "merge: Unable to write new index file" msgstr "fusion : Impossible d'écrire le nouveau fichier index" -#: sequencer.c:3870 +#: sequencer.c:3878 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: sequencer.c:3873 +#: sequencer.c:3881 #, c-format msgid "Unexpected stash response: '%s'" msgstr "réponse de remisage inattendue : '%s'" -#: sequencer.c:3879 +#: sequencer.c:3887 #, c-format msgid "Could not create directory for '%s'" msgstr "Impossible de créer le répertoire pour '%s'" -#: sequencer.c:3882 +#: sequencer.c:3890 #, c-format msgid "Created autostash: %s\n" msgstr "Autoremisage créé : %s\n" -#: sequencer.c:3886 +#: sequencer.c:3894 msgid "could not reset --hard" msgstr "impossible de réinitialiser --hard" -#: sequencer.c:3911 +#: sequencer.c:3919 #, c-format msgid "Applied autostash.\n" msgstr "Autoremisage appliqué.\n" -#: sequencer.c:3923 +#: sequencer.c:3931 #, c-format msgid "cannot store %s" msgstr "impossible de stocker %s" -#: sequencer.c:3926 +#: sequencer.c:3934 #, c-format msgid "" "%s\n" @@ -7667,30 +8268,30 @@ msgstr "" "Vos modifications sont à l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" -#: sequencer.c:3931 +#: sequencer.c:3939 msgid "Applying autostash resulted in conflicts." msgstr "L'application du remisage automatique a créé des conflits." -#: sequencer.c:3932 +#: sequencer.c:3940 msgid "Autostash exists; creating a new stash entry." msgstr "" "Un remisage automatique existe ; création d'une nouvelle entrée de remisage." -#: sequencer.c:4025 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4033 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: sequencer.c:4040 +#: sequencer.c:4048 #, c-format msgid "Stopped at HEAD\n" msgstr "arrêt à HEAD\n" -#: sequencer.c:4042 +#: sequencer.c:4050 #, c-format msgid "Stopped at %s\n" msgstr "Arrêté à %s\n" -#: sequencer.c:4050 +#: sequencer.c:4058 #, c-format msgid "" "Could not execute the todo command\n" @@ -7711,58 +8312,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4096 +#: sequencer.c:4104 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Rebasage (%d/%d)%s" -#: sequencer.c:4141 +#: sequencer.c:4149 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "arrêt à %s... %.*s\n" -#: sequencer.c:4212 +#: sequencer.c:4220 #, c-format msgid "unknown command %d" msgstr "commande inconnue %d" -#: sequencer.c:4271 +#: sequencer.c:4279 msgid "could not read orig-head" msgstr "impossible de lire orig-head" -#: sequencer.c:4276 +#: sequencer.c:4284 msgid "could not read 'onto'" msgstr "impossible de lire 'onto'" -#: sequencer.c:4290 +#: sequencer.c:4298 #, c-format msgid "could not update HEAD to %s" msgstr "impossible de mettre à jour HEAD sur %s" -#: sequencer.c:4350 +#: sequencer.c:4358 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Rebasage et mise à jour de %s avec succès.\n" -#: sequencer.c:4383 +#: sequencer.c:4391 msgid "cannot rebase: You have unstaged changes." msgstr "impossible de rebaser : vous avez des modifications non indexées." -#: sequencer.c:4392 +#: sequencer.c:4400 msgid "cannot amend non-existing commit" msgstr "impossible de corriger un commit non-existant" -#: sequencer.c:4394 +#: sequencer.c:4402 #, c-format msgid "invalid file: '%s'" msgstr "fichier invalide : '%s'" -#: sequencer.c:4396 +#: sequencer.c:4404 #, c-format msgid "invalid contents: '%s'" msgstr "contenu invalide : '%s'" -#: sequencer.c:4399 +#: sequencer.c:4407 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7772,50 +8373,50 @@ msgstr "" "Vous avez des modifications non validées dans votre copie de travail.\n" "Veuillez les valider d'abord, puis relancer 'git rebase --continue'." -#: sequencer.c:4435 sequencer.c:4474 +#: sequencer.c:4443 sequencer.c:4482 #, c-format msgid "could not write file: '%s'" msgstr "impossible d'écrire le fichier : '%s'" -#: sequencer.c:4490 +#: sequencer.c:4498 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossible de supprimer CHERRY_PICK_HEAD" -#: sequencer.c:4497 +#: sequencer.c:4505 msgid "could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: sequencer.c:4613 +#: sequencer.c:4621 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:4617 +#: sequencer.c:4625 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:4652 +#: sequencer.c:4660 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" -#: sequencer.c:5129 +#: sequencer.c:5137 msgid "make_script: unhandled options" msgstr "make_script : options non gérées" -#: sequencer.c:5132 +#: sequencer.c:5140 msgid "make_script: error preparing revisions" msgstr "make_script : erreur lors de la préparation des révisions" -#: sequencer.c:5374 sequencer.c:5391 +#: sequencer.c:5382 sequencer.c:5399 msgid "nothing to do" msgstr "rien à faire" -#: sequencer.c:5410 +#: sequencer.c:5418 msgid "could not skip unnecessary pick commands" msgstr "impossible d'éviter les commandes de picorage non nécessaires" -#: sequencer.c:5504 +#: sequencer.c:5512 msgid "the script was already rearranged." msgstr "le script a déjà été réarrangé." @@ -7988,365 +8589,6 @@ msgstr "échec de la bifurcation" msgid "setsid failed" msgstr "échec du setsid" -#: sha1-file.c:480 -#, c-format -msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "" -"le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates" - -#: sha1-file.c:531 -#, c-format -msgid "unable to normalize alternate object path: %s" -msgstr "impossible de normaliser le chemin d'objet alternatif : %s" - -#: sha1-file.c:603 -#, c-format -msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde" - -#: sha1-file.c:610 -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "impossible de normaliser le répertoire d'objet : %s" - -#: sha1-file.c:653 -msgid "unable to fdopen alternates lockfile" -msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives" - -#: sha1-file.c:671 -msgid "unable to read alternates file" -msgstr "lecture du fichier d'alternatives impossible" - -#: sha1-file.c:678 -msgid "unable to move new alternates file into place" -msgstr "impossible de déplacer le nouveau fichier d'alternative" - -#: sha1-file.c:713 -#, c-format -msgid "path '%s' does not exist" -msgstr "le chemin '%s' n'existe pas" - -#: sha1-file.c:734 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "" -"extraire le dépôt de référence '%s' comme une extraction liée n'est pas " -"encore supporté." - -#: sha1-file.c:740 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "le dépôt de référence '%s' n'est pas un dépôt local." - -#: sha1-file.c:746 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "le dépôt de référence '%s' est superficiel" - -#: sha1-file.c:754 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "le dépôt de référence '%s' est greffé" - -#: sha1-file.c:814 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "ligne invalide pendant l'analyse des refs alternatives : %s" - -#: sha1-file.c:964 -#, c-format -msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" -msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>" - -#: sha1-file.c:985 -msgid "mmap failed" -msgstr "échec de mmap" - -#: sha1-file.c:1149 -#, c-format -msgid "object file %s is empty" -msgstr "le fichier objet %s est vide" - -#: sha1-file.c:1284 sha1-file.c:2477 -#, c-format -msgid "corrupt loose object '%s'" -msgstr "objet libre corrompu '%s'" - -#: sha1-file.c:1286 sha1-file.c:2481 -#, c-format -msgid "garbage at end of loose object '%s'" -msgstr "données incorrectes à la fin de l'objet libre '%s'" - -#: sha1-file.c:1328 -msgid "invalid object type" -msgstr "type d'objet invalide" - -#: sha1-file.c:1412 -#, c-format -msgid "unable to unpack %s header with --allow-unknown-type" -msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type" - -#: sha1-file.c:1415 -#, c-format -msgid "unable to unpack %s header" -msgstr "impossible de dépaqueter l'entête %s" - -#: sha1-file.c:1421 -#, c-format -msgid "unable to parse %s header with --allow-unknown-type" -msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type" - -#: sha1-file.c:1424 -#, c-format -msgid "unable to parse %s header" -msgstr "impossible d'analyser l'entête %s" - -#: sha1-file.c:1651 -#, c-format -msgid "failed to read object %s" -msgstr "impossible de lire l'objet %s" - -#: sha1-file.c:1655 -#, c-format -msgid "replacement %s not found for %s" -msgstr "remplacement %s non trouvé pour %s" - -#: sha1-file.c:1659 -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "l'objet libre %s (stocké dans %s) est corrompu" - -#: sha1-file.c:1663 -#, c-format -msgid "packed object %s (stored in %s) is corrupt" -msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu" - -#: sha1-file.c:1768 -#, c-format -msgid "unable to write file %s" -msgstr "impossible d'écrire le fichier %s" - -#: sha1-file.c:1775 -#, c-format -msgid "unable to set permission to '%s'" -msgstr "impossible de régler les droits de '%s'" - -#: sha1-file.c:1782 -msgid "file write error" -msgstr "erreur d'écriture d'un fichier" - -#: sha1-file.c:1802 -msgid "error when closing loose object file" -msgstr "erreur en fermeture du fichier d'objet esseulé" - -#: sha1-file.c:1867 -#, c-format -msgid "insufficient permission for adding an object to repository database %s" -msgstr "" -"droits insuffisants pour ajouter un objet à la base de données %s du dépôt" - -#: sha1-file.c:1869 -msgid "unable to create temporary file" -msgstr "impossible de créer un fichier temporaire" - -#: sha1-file.c:1893 -msgid "unable to write loose object file" -msgstr "impossible d'écrire le fichier d'objet esseulé" - -#: sha1-file.c:1899 -#, c-format -msgid "unable to deflate new object %s (%d)" -msgstr "impossible de compresser le nouvel objet %s (%d)" - -#: sha1-file.c:1903 -#, c-format -msgid "deflateEnd on object %s failed (%d)" -msgstr "échec de deflateEnd sur l'objet %s (%d)" - -#: sha1-file.c:1907 -#, c-format -msgid "confused by unstable object source data for %s" -msgstr "données de source d'objet instable pour %s" - -#: sha1-file.c:1917 builtin/pack-objects.c:1086 -#, c-format -msgid "failed utime() on %s" -msgstr "échec de utime() sur %s" - -#: sha1-file.c:1994 -#, c-format -msgid "cannot read object for %s" -msgstr "impossible de lire l'objet pour %s" - -#: sha1-file.c:2045 -msgid "corrupt commit" -msgstr "commit corrompu" - -#: sha1-file.c:2053 -msgid "corrupt tag" -msgstr "étiquette corrompue" - -#: sha1-file.c:2153 -#, c-format -msgid "read error while indexing %s" -msgstr "erreur de lecture à l'indexation de %s" - -#: sha1-file.c:2156 -#, c-format -msgid "short read while indexing %s" -msgstr "lecture tronquée pendant l'indexation de %s" - -#: sha1-file.c:2229 sha1-file.c:2239 -#, c-format -msgid "%s: failed to insert into database" -msgstr "%s : échec de l'insertion dans la base de données" - -#: sha1-file.c:2245 -#, c-format -msgid "%s: unsupported file type" -msgstr "%s : type de fichier non supporté" - -#: sha1-file.c:2269 -#, c-format -msgid "%s is not a valid object" -msgstr "%s n'est pas un objet valide" - -#: sha1-file.c:2271 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s n'est pas un objet '%s' valide" - -#: sha1-file.c:2298 builtin/index-pack.c:192 -#, c-format -msgid "unable to open %s" -msgstr "impossible d'ouvrir %s" - -#: sha1-file.c:2488 sha1-file.c:2541 -#, c-format -msgid "hash mismatch for %s (expected %s)" -msgstr "incohérence de hachage pour %s (%s attendu)" - -#: sha1-file.c:2512 -#, c-format -msgid "unable to mmap %s" -msgstr "impossible de mmap %s" - -#: sha1-file.c:2517 -#, c-format -msgid "unable to unpack header of %s" -msgstr "impossible de dépaqueter l'entête de %s" - -#: sha1-file.c:2523 -#, c-format -msgid "unable to parse header of %s" -msgstr "impossible d'analyser l'entête de %s" - -#: sha1-file.c:2534 -#, c-format -msgid "unable to unpack contents of %s" -msgstr "impossible de dépaqueter le contenu de %s" - -#: sha1-name.c:486 -#, c-format -msgid "short SHA1 %s is ambiguous" -msgstr "le SHA1 court %s est ambigu" - -#: sha1-name.c:497 -msgid "The candidates are:" -msgstr "Les candidats sont :" - -#: sha1-name.c:796 -msgid "" -"Git normally never creates a ref that ends with 40 hex characters\n" -"because it will be ignored when you just specify 40-hex. These refs\n" -"may be created by mistake. For example,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" -"examine these refs and maybe delete them. Turn this message off by\n" -"running \"git config advice.objectNameWarning false\"" -msgstr "" -"Git ne crée normalement jamais de référence qui se termine par 40\n" -"caractères hexa car elle serait ignorée si vous spécifiez juste\n" -"40-hexa. Ces références peuvent être créées par erreur. Par exemple,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa " -"est créée.\n" -"Veuillez examiner ces références et peut-être les supprimer. Désactivez ce " -"message\n" -"en lançant \"git config advice.objectNameWarning false\"" - -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "le journal de '%.*s' ne remonte qu'à %s" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "le journal de '%.*s' n'a que %d entrées" - -#: sha1-name.c:1702 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "le chemin '%s' existe sur le disque, mais pas dans '%.*s'" - -#: sha1-name.c:1708 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"le chemin '%s' existe, mais pas '%s'\n" -"conseil : peut-être vouliez-vous dire '%.*s:%s', soit '%.*s:./%s'" - -#: sha1-name.c:1717 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "le chemin '%s' n'existe pas dans '%.*s'" - -#: sha1-name.c:1745 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"le chemin '%s' est dans l'index, mais pas à l'étape %d\n" -"conseil : vous vouliez peut-être dire ':%d:%s' ?" - -#: sha1-name.c:1761 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"le chemin '%s' est dans l'index, mais pas '%s'\n" -"conseil : peut-être vouliez-vous dire ':%d:%s', soit '%d:./%s'" - -#: sha1-name.c:1769 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "le chemin '%s' existe sur le disque, mais pas dans l'index" - -#: sha1-name.c:1771 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "le chemin '%s' n'existe pas (ni sur le disque, ni dans l'index)" - -#: sha1-name.c:1784 -msgid "relative path syntax can't be used outside working tree" -msgstr "" -"la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de " -"travail" - -#: sha1-name.c:1922 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "nom d'objet invalide : '%.*s'." - #. TRANSLATORS: IEC 80000-13:2008 gibibyte #: strbuf.c:848 #, c-format @@ -8400,7 +8642,7 @@ msgstr[0] "%u octet/s" msgstr[1] "%u octets/s" #: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 -#: builtin/rebase.c:864 +#: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" @@ -8467,12 +8709,12 @@ msgstr "dans le sous-module '%s' non populé" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Le chemin '%s' est dans le sous-module '%.*s'" -#: submodule.c:434 +#: submodule.c:435 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "mauvais argument --ignore-submodules : %s" -#: submodule.c:816 +#: submodule.c:817 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8481,12 +8723,12 @@ msgstr "" "Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un " "sous-module du même nom. Ignoré." -#: submodule.c:919 +#: submodule.c:920 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit" -#: submodule.c:1004 +#: submodule.c:1005 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8495,36 +8737,36 @@ msgstr "" "Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n " "1' dans le sous-module %s" -#: submodule.c:1127 +#: submodule.c:1128 #, c-format msgid "process for submodule '%s' failed" msgstr "le processus pour le sous-module '%s' a échoué" -#: submodule.c:1156 builtin/branch.c:680 builtin/submodule--helper.c:2469 +#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: submodule.c:1167 +#: submodule.c:1168 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Poussée du sous-module '%s'\n" -#: submodule.c:1170 +#: submodule.c:1171 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "Impossible de pousser le sous-module '%s'\n" -#: submodule.c:1462 +#: submodule.c:1463 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Récupération du sous-module %s%s\n" -#: submodule.c:1492 +#: submodule.c:1497 #, c-format msgid "Could not access submodule '%s'\n" msgstr "Impossible d'accéder au sous-module '%s'\n" -#: submodule.c:1646 +#: submodule.c:1652 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8533,63 +8775,63 @@ msgstr "" "Erreurs pendant la récupération du sous-module :\n" "%s" -#: submodule.c:1671 +#: submodule.c:1677 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' n'est pas reconnu comme dépôt git" -#: submodule.c:1688 +#: submodule.c:1694 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "impossible de lancer 'git status --porcelain=2' dans le sous-module %s" -#: submodule.c:1729 +#: submodule.c:1735 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "'git status --porcelain=2' a échoué dans le sous-module %s" -#: submodule.c:1804 +#: submodule.c:1810 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "impossible de démarrer 'git status' dans le sous-module '%s'" -#: submodule.c:1817 +#: submodule.c:1823 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "impossible de lancer 'git status' dans le sous-module '%s'" -#: submodule.c:1832 +#: submodule.c:1838 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Impossible de désactiver core.worktree dans le sous-module '%s'" -#: submodule.c:1859 submodule.c:2169 +#: submodule.c:1865 submodule.c:2175 #, c-format msgid "could not recurse into submodule '%s'" msgstr "récursion impossible dans le sous-module '%s'" -#: submodule.c:1880 +#: submodule.c:1886 msgid "could not reset submodule index" msgstr "impossible de réinitialiser l'index du sous-module" -#: submodule.c:1922 +#: submodule.c:1928 #, c-format msgid "submodule '%s' has dirty index" msgstr "le sous-module '%s' a un index sale" -#: submodule.c:1974 +#: submodule.c:1980 #, c-format msgid "Submodule '%s' could not be updated." msgstr "le sous-module '%s' n'a pas pu être mis à jour." -#: submodule.c:2042 +#: submodule.c:2048 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "" "le répertoire git du sous-module '%s' est à l'intérieur du répertoire git " "'%.*s'" -#: submodule.c:2063 +#: submodule.c:2069 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8597,17 +8839,17 @@ msgstr "" "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail " "n'est pas supporté" -#: submodule.c:2075 submodule.c:2134 +#: submodule.c:2081 submodule.c:2140 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "impossible de trouve le nom pour le sous-module '%s'" -#: submodule.c:2079 +#: submodule.c:2085 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "refus de déplacer '%s' dans une répertoire git existant" -#: submodule.c:2086 +#: submodule.c:2092 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8618,11 +8860,11 @@ msgstr "" "'%s' sur\n" "'%s'\n" -#: submodule.c:2214 +#: submodule.c:2220 msgid "could not start ls-files in .." msgstr "impossible de démarrer ls-files dans .." -#: submodule.c:2254 +#: submodule.c:2260 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree a renvoyé un code de retour inattendu %d" @@ -8653,7 +8895,7 @@ msgstr "symbole vide dans la ligne de fin '%.*s'" msgid "could not read input file '%s'" msgstr "impossible de lire le fichier d'entrée '%s'" -#: trailer.c:751 +#: trailer.c:751 builtin/mktag.c:91 msgid "could not read from stdin" msgstr "Impossible de lire depuis l'entrée standard" @@ -8726,7 +8968,7 @@ msgstr "impossible de lancer fast-import" msgid "error while running fast-import" msgstr "erreur au lancement de fast-import" -#: transport-helper.c:549 transport-helper.c:1236 +#: transport-helper.c:549 transport-helper.c:1237 #, c-format msgid "could not read ref %s" msgstr "impossible de lire la réf %s" @@ -8746,7 +8988,7 @@ msgstr "" msgid "invalid remote service path" msgstr "chemin de service distant invalide" -#: transport-helper.c:661 transport.c:1446 +#: transport-helper.c:661 transport.c:1447 msgid "operation not supported by protocol" msgstr "option non supportée par le protocole" @@ -8827,52 +9069,52 @@ msgstr "" "Aucune référence en commun et aucune spécfiée ; rien à faire.\n" "Vous devriez peut-être spécifier une branche.\n" -#: transport-helper.c:1213 +#: transport-helper.c:1214 #, c-format msgid "unsupported object format '%s'" msgstr "format d'objet non géré '%s'" -#: transport-helper.c:1222 +#: transport-helper.c:1223 #, c-format msgid "malformed response in ref list: %s" msgstr "réponse malformée dans le liste de réfs : %s" -#: transport-helper.c:1374 +#: transport-helper.c:1375 #, c-format msgid "read(%s) failed" msgstr "échec de read(%s)" -#: transport-helper.c:1401 +#: transport-helper.c:1402 #, c-format msgid "write(%s) failed" msgstr "échec de write(%s)" -#: transport-helper.c:1450 +#: transport-helper.c:1451 #, c-format msgid "%s thread failed" msgstr "échec du fil d'exécution %s" -#: transport-helper.c:1454 +#: transport-helper.c:1455 #, c-format msgid "%s thread failed to join: %s" msgstr "échec de jonction du fil d'exécution %s : %s" -#: transport-helper.c:1473 transport-helper.c:1477 +#: transport-helper.c:1474 transport-helper.c:1478 #, c-format msgid "can't start thread for copying data: %s" msgstr "impossible de démarrer le fil d'exécution pour copier les données : %s" -#: transport-helper.c:1514 +#: transport-helper.c:1515 #, c-format msgid "%s process failed to wait" msgstr "échec du processus %s pour l'attente" -#: transport-helper.c:1518 +#: transport-helper.c:1519 #, c-format msgid "%s process failed" msgstr "échec du processus %s" -#: transport-helper.c:1536 transport-helper.c:1545 +#: transport-helper.c:1537 transport-helper.c:1546 msgid "can't start thread for copying data" msgstr "impossible de démarrer le fil d'exécution pour copier les données" @@ -8961,23 +9203,23 @@ msgstr "" msgid "Aborting." msgstr "Abandon." -#: transport.c:1315 +#: transport.c:1316 msgid "failed to push all needed submodules" msgstr "échec de la poussée de tous les sous-modules nécessaires" -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "objet arbre trop court" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "mode invalide dans l'entrée d'arbre" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "nom de fichier vide dans une entrée de l'arbre" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "fichier arbre trop court" @@ -9244,7 +9486,7 @@ msgstr "" msgid "Updating index flags" msgstr "Mise à jour des drapeaux de l'index" -#: upload-pack.c:1550 +#: upload-pack.c:1543 msgid "expected flush after fetch arguments" msgstr "vidage attendu après les arguments de récupération" @@ -9281,75 +9523,106 @@ msgstr "segment de chemin '..' invalide" msgid "Fetching objects" msgstr "Récupération des objets" -#: worktree.c:236 builtin/am.c:2103 +#: worktree.c:238 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "échec de la lecture de '%s'" -#: worktree.c:283 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" "'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt" -#: worktree.c:294 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre " "de travail" -#: worktree.c:306 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "'%s' n'existe pas" -#: worktree.c:312 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' n'est pas un fichier .git, code d'erreur %d" -#: worktree.c:321 +#: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' ne pointe pas en retour sur '%s'" -#: worktree.c:587 +#: worktree.c:608 msgid "not a directory" msgstr "pas un répertoire" -#: worktree.c:596 +#: worktree.c:617 msgid ".git is not a file" msgstr ".git n'est pas un fichier" -#: worktree.c:598 +#: worktree.c:619 msgid ".git file broken" msgstr "fichier .git cassé" -#: worktree.c:600 +#: worktree.c:621 msgid ".git file incorrect" msgstr "fichier .git incorrect" -#: worktree.c:670 +#: worktree.c:727 msgid "not a valid path" msgstr "pas un chemin valide" -#: worktree.c:676 +#: worktree.c:733 msgid "unable to locate repository; .git is not a file" msgstr "impossible de localiser le dépôt ; .git n'est pas un fichier" -#: worktree.c:679 +#: worktree.c:737 +msgid "unable to locate repository; .git file does not reference a repository" +msgstr "impossible de localiser le dépôt ; .git ne fait pas référence à un dépôt" + +#: worktree.c:741 msgid "unable to locate repository; .git file broken" msgstr "impossible de localiser le dépôt ; fichier .git cassé" -#: worktree.c:685 +#: worktree.c:747 msgid "gitdir unreadable" msgstr "gitdir non lisible" -#: worktree.c:689 +#: worktree.c:751 msgid "gitdir incorrect" msgstr "gitdir incorrect" +#: worktree.c:776 +msgid "not a valid directory" +msgstr "pas un répertoire valide" + +#: worktree.c:782 +msgid "gitdir file does not exist" +msgstr "le fichier gitdir n'existe pas" + +#: worktree.c:787 worktree.c:796 +#, c-format +msgid "unable to read gitdir file (%s)" +msgstr "impossible de lire le fichier gitdir (%s)" + +#: worktree.c:806 +#, c-format +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "" +"lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)" + +#: worktree.c:814 +msgid "invalid gitdir file" +msgstr "fichier gitdir invalide" + +#: worktree.c:822 +msgid "gitdir file points to non-existent location" +msgstr "le fichier gitdir pointe sur un endroit inexistant" + #: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" @@ -9397,11 +9670,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:211 wt-status.c:1070 +#: wt-status.c:211 wt-status.c:1072 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:234 wt-status.c:1079 +#: wt-status.c:234 wt-status.c:1081 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" @@ -9506,22 +9779,22 @@ msgstr "contenu modifié, " msgid "untracked content, " msgstr "contenu non suivi, " -#: wt-status.c:903 +#: wt-status.c:905 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Votre remisage contient actuellement %d entrée" msgstr[1] "Votre remisage contient actuellement %d entrées" -#: wt-status.c:934 +#: wt-status.c:936 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:936 +#: wt-status.c:938 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:1018 +#: wt-status.c:1020 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9529,7 +9802,7 @@ msgstr "" "Ne touchez pas à la ligne ci-dessus.\n" "Tout ce qui suit sera éliminé." -#: wt-status.c:1110 +#: wt-status.c:1112 #, c-format msgid "" "\n" @@ -9541,107 +9814,107 @@ msgstr "" "de la branche.\n" "Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n" -#: wt-status.c:1140 +#: wt-status.c:1142 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:1143 +#: wt-status.c:1145 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:1145 +#: wt-status.c:1147 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)" -#: wt-status.c:1149 +#: wt-status.c:1151 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée." -#: wt-status.c:1152 +#: wt-status.c:1154 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:1161 +#: wt-status.c:1163 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:1164 +#: wt-status.c:1166 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:1168 +#: wt-status.c:1170 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:1170 +#: wt-status.c:1172 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:1172 +#: wt-status.c:1174 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1305 +#: wt-status.c:1307 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo est manquant." -#: wt-status.c:1307 +#: wt-status.c:1309 msgid "No commands done." msgstr "Aucune commande réalisée." -#: wt-status.c:1310 +#: wt-status.c:1312 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Dernière commande effectuée (%d commande effectuée) :" msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :" -#: wt-status.c:1321 +#: wt-status.c:1323 #, c-format msgid " (see more in file %s)" msgstr " (voir plus dans le fichier %s)" -#: wt-status.c:1326 +#: wt-status.c:1328 msgid "No commands remaining." msgstr "Aucune commande restante." -#: wt-status.c:1329 +#: wt-status.c:1331 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Prochaine commande à effectuer (%d commande restante) :" msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :" -#: wt-status.c:1337 +#: wt-status.c:1339 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)" -#: wt-status.c:1349 +#: wt-status.c:1351 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:1354 +#: wt-status.c:1356 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1367 +#: wt-status.c:1369 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1369 +#: wt-status.c:1371 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1371 +#: wt-status.c:1373 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" -#: wt-status.c:1378 +#: wt-status.c:1380 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1382 +#: wt-status.c:1384 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -9649,151 +9922,159 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1387 +#: wt-status.c:1389 msgid "You are currently splitting a commit during a rebase." msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:1390 +#: wt-status.c:1392 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" -#: wt-status.c:1394 +#: wt-status.c:1396 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la " "branche '%s' sur '%s'." -#: wt-status.c:1399 +#: wt-status.c:1401 msgid "You are currently editing a commit during a rebase." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." -#: wt-status.c:1402 +#: wt-status.c:1404 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1404 +#: wt-status.c:1406 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos " "modifications)" -#: wt-status.c:1415 +#: wt-status.c:1417 msgid "Cherry-pick currently in progress." msgstr "Picorage en cours." -#: wt-status.c:1418 +#: wt-status.c:1420 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1425 +#: wt-status.c:1427 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1428 +#: wt-status.c:1430 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (lancez \"git cherry-pick --continue\" pour continuer)" -#: wt-status.c:1431 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" -#: wt-status.c:1433 +#: wt-status.c:1435 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (utilisez \"git cherry-pick --skip\" pour sauter ce patch)" -#: wt-status.c:1435 +#: wt-status.c:1437 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" -#: wt-status.c:1445 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "Rétablissement en cours." -#: wt-status.c:1448 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1454 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1457 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " (lancez \"git revert --continue\" pour continuer)" -#: wt-status.c:1460 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1462 +#: wt-status.c:1464 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (utilisez \"git revert --skip\" pour sauter ce patch)" -#: wt-status.c:1464 +#: wt-status.c:1466 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1474 +#: wt-status.c:1476 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1478 +#: wt-status.c:1480 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1481 +#: wt-status.c:1483 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)" -#: wt-status.c:1492 +#: wt-status.c:1494 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "" "Vous êtes dans une extraction partielle avec %d %% de fichiers suivis " "présents." -#: wt-status.c:1731 +#: wt-status.c:1733 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1738 +#: wt-status.c:1740 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1740 +#: wt-status.c:1742 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1750 +#: wt-status.c:1747 +msgid "HEAD detached at " +msgstr "HEAD détachée sur " + +#: wt-status.c:1749 +msgid "HEAD detached from " +msgstr "HEAD détachée depuis " + +#: wt-status.c:1752 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1767 +#: wt-status.c:1769 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1768 +#: wt-status.c:1770 msgid "No commits yet" msgstr "Aucun commit" -#: wt-status.c:1782 +#: wt-status.c:1784 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1784 +#: wt-status.c:1786 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1788 +#: wt-status.c:1790 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9805,32 +10086,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1794 +#: wt-status.c:1796 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1796 +#: wt-status.c:1798 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1802 +#: wt-status.c:1804 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1807 +#: wt-status.c:1809 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " "\"git commit -a\")\n" -#: wt-status.c:1811 +#: wt-status.c:1813 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1815 +#: wt-status.c:1817 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9839,66 +10120,66 @@ msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents (utilisez \"git add\" pour les suivre)\n" -#: wt-status.c:1819 +#: wt-status.c:1821 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents\n" -#: wt-status.c:1823 +#: wt-status.c:1825 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les " "suivre)\n" -#: wt-status.c:1827 wt-status.c:1833 +#: wt-status.c:1829 wt-status.c:1835 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1830 +#: wt-status.c:1832 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n" -#: wt-status.c:1835 +#: wt-status.c:1837 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1940 +#: wt-status.c:1942 msgid "No commits yet on " msgstr "Encore aucun commit sur " -#: wt-status.c:1944 +#: wt-status.c:1946 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1975 +#: wt-status.c:1977 msgid "different" msgstr "différent" -#: wt-status.c:1977 wt-status.c:1985 +#: wt-status.c:1979 wt-status.c:1987 msgid "behind " msgstr "derrière " -#: wt-status.c:1980 wt-status.c:1983 +#: wt-status.c:1982 wt-status.c:1985 msgid "ahead " msgstr "devant " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2505 +#: wt-status.c:2507 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "Impossible de %s : vous avez des modifications non indexées." -#: wt-status.c:2511 +#: wt-status.c:2513 msgid "additionally, your index contains uncommitted changes." msgstr "de plus, votre index contient des modifications non validées." -#: wt-status.c:2513 +#: wt-status.c:2515 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossible : votre index contient des modifications non validées." @@ -9912,131 +10193,136 @@ msgstr "échec pour délier '%s'" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<options>] [--] <chemin>..." -#: builtin/add.c:88 +#: builtin/add.c:58 +#, c-format +msgid "cannot chmod %cx '%s'" +msgstr "impossible de chmod %cx '%s'" + +#: builtin/add.c:96 #, c-format msgid "unexpected diff status %c" msgstr "état de diff inattendu %c" -#: builtin/add.c:93 builtin/commit.c:285 +#: builtin/add.c:101 builtin/commit.c:285 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" -#: builtin/add.c:103 +#: builtin/add.c:111 #, c-format msgid "remove '%s'\n" msgstr "suppression de '%s'\n" -#: builtin/add.c:178 +#: builtin/add.c:186 msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:272 builtin/rev-parse.c:908 +#: builtin/add.c:280 builtin/rev-parse.c:991 msgid "Could not read the index" msgstr "Impossible de lire l'index" -#: builtin/add.c:283 +#: builtin/add.c:291 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossible d'ouvrir '%s' en écriture." -#: builtin/add.c:287 +#: builtin/add.c:295 msgid "Could not write patch" msgstr "Impossible d'écrire le patch" -#: builtin/add.c:290 +#: builtin/add.c:298 msgid "editing patch failed" msgstr "échec de l'édition du patch" -#: builtin/add.c:293 +#: builtin/add.c:301 #, c-format msgid "Could not stat '%s'" msgstr "Stat de '%s' impossible" -#: builtin/add.c:295 +#: builtin/add.c:303 msgid "Empty patch. Aborted." msgstr "Patch vide. Abandon." -#: builtin/add.c:300 +#: builtin/add.c:308 #, c-format msgid "Could not apply '%s'" msgstr "Impossible d'appliquer '%s'" -#: builtin/add.c:308 +#: builtin/add.c:316 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124 #: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 #: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:331 +#: builtin/add.c:339 msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308 +#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308 msgid "select hunks interactively" msgstr "sélection interactive des sections" -#: builtin/add.c:333 +#: builtin/add.c:341 msgid "edit current diff and apply" msgstr "édition du diff actuel et application" -#: builtin/add.c:334 +#: builtin/add.c:342 msgid "allow adding otherwise ignored files" msgstr "permettre l'ajout de fichiers ignorés" -#: builtin/add.c:335 +#: builtin/add.c:343 msgid "update tracked files" msgstr "mettre à jour les fichiers suivis" -#: builtin/add.c:336 +#: builtin/add.c:344 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)" -#: builtin/add.c:337 +#: builtin/add.c:345 msgid "record only the fact that the path will be added later" msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard" -#: builtin/add.c:338 +#: builtin/add.c:346 msgid "add changes from all tracked and untracked files" msgstr "ajouter les modifications de tous les fichiers suivis et non suivis" -#: builtin/add.c:341 +#: builtin/add.c:349 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignorer les chemins effacés dans la copie de travail (identique à --no-all)" -#: builtin/add.c:343 +#: builtin/add.c:351 msgid "don't add, only refresh the index" msgstr "ne pas ajouter, juste rafraîchir l'index" -#: builtin/add.c:344 +#: builtin/add.c:352 msgid "just skip files which cannot be added because of errors" msgstr "" "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait " "d'erreurs" -#: builtin/add.c:345 +#: builtin/add.c:353 msgid "check if - even missing - files are ignored in dry run" msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide" -#: builtin/add.c:347 builtin/update-index.c:1004 +#: builtin/add.c:355 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exécutable pour les fichiers listés" -#: builtin/add.c:349 +#: builtin/add.c:357 msgid "warn when adding an embedded repository" msgstr "avertir lors de l'ajout d'un dépôt embarqué" -#: builtin/add.c:351 +#: builtin/add.c:359 msgid "backend for `git stash -p`" msgstr "backend pour `git stash -p`" -#: builtin/add.c:369 +#: builtin/add.c:377 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10067,12 +10353,12 @@ msgstr "" "\n" "Référez-vous à \"git help submodule\" pour plus d'information." -#: builtin/add.c:397 +#: builtin/add.c:405 #, c-format msgid "adding embedded git repository: %s" msgstr "dépôt git embarqué ajouté : %s" -#: builtin/add.c:416 +#: builtin/add.c:424 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10082,48 +10368,48 @@ msgstr "" "Éliminez ce message en lançant\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:425 +#: builtin/add.c:433 msgid "adding files failed" msgstr "échec de l'ajout de fichiers" -#: builtin/add.c:453 builtin/commit.c:345 +#: builtin/add.c:461 builtin/commit.c:345 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file est incompatible avec --interactive/--patch" -#: builtin/add.c:470 +#: builtin/add.c:478 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file est incompatible avec --edit" -#: builtin/add.c:482 +#: builtin/add.c:490 msgid "-A and -u are mutually incompatible" msgstr "-A et -u sont mutuellement incompatibles" -#: builtin/add.c:485 +#: builtin/add.c:493 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run" -#: builtin/add.c:489 +#: builtin/add.c:497 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x" -#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502 +#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file est incompatible avec pathspec arguments" -#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508 +#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul nécessite --pathspec-from-file" -#: builtin/add.c:518 +#: builtin/add.c:526 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Rien de spécifié, rien n'a été ajouté.\n" -#: builtin/add.c:520 +#: builtin/add.c:528 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10382,7 +10668,7 @@ msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" #: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 -#: builtin/repack.c:335 builtin/stash.c:815 +#: builtin/repack.c:334 builtin/stash.c:882 msgid "be quiet" msgstr "être silencieux" @@ -10426,17 +10712,17 @@ msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" #: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350 -#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349 +#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175 #: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2269 builtin/branch.c:661 builtin/bugreport.c:136 -#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470 #: builtin/verify-tag.c:38 msgid "format" msgstr "format" @@ -10462,13 +10748,12 @@ msgid "skip the current patch" msgstr "sauter le patch courant" #: builtin/am.c:2287 -msgid "restore the original branch and abort the patching operation." -msgstr "" -"restaurer la branche originale et abandonner les applications de patch." +msgid "restore the original branch and abort the patching operation" +msgstr "restaurer la branche originale et abandonner les applications de patch" #: builtin/am.c:2290 -msgid "abort the patching operation but keep HEAD where it is." -msgstr "abandonne l'opération de patch mais garde HEAD où il est." +msgid "abort the patching operation but keep HEAD where it is" +msgstr "abandonne l'opération de patch mais garde HEAD où il est" #: builtin/am.c:2294 msgid "show the patch being applied" @@ -10483,12 +10768,12 @@ msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" #: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536 -#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419 +#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538 +#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451 msgid "key-id" msgstr "id-clé" -#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395 +#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" @@ -10572,28 +10857,12 @@ msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<commit>]" #: builtin/bisect--helper.c:24 -msgid "" -"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " -"<bad_term>" -msgstr "" -"git bisect--helper --bisect-write [--no-log] <état> <révision> <terme-pour-" -"bon> <terme-pour-mauvais>" - -#: builtin/bisect--helper.c:25 -msgid "" -"git bisect--helper --bisect-check-and-set-terms <command> <good_term> " -"<bad_term>" -msgstr "" -"git bisect--helper --bisect-check-and-set-terms <commande> <terme-pour-bon> " -"<terme-pour-mauvais>" - -#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" "git bisect--helper --bisect-next-check <terme-pour-bon> <terme-pour-mauvais> " "[<term>]" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -10601,7 +10870,7 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:26 msgid "" "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " @@ -10611,62 +10880,66 @@ msgstr "" "=<terme>][--no-checkout] [--first-parent] [<mauvais> [<bon>...]] [--] " "[<chemins>...]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:28 msgid "git bisect--helper --bisect-next" msgstr "git bisect--helper --bisect-next" -#: builtin/bisect--helper.c:31 -msgid "git bisect--helper --bisect-auto-next" -msgstr "git bisect--helper --bisect-auto-next" - -#: builtin/bisect--helper.c:32 +#: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" msgstr "git bisect--helper --bisect-reset (bad|new) [<rév>]" -#: builtin/bisect--helper.c:33 +#: builtin/bisect--helper.c:30 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" msgstr "git bisect--helper --bisect-reset (good|old) [<rév>...]" -#: builtin/bisect--helper.c:108 +#: builtin/bisect--helper.c:31 +msgid "git bisect--helper --bisect-replay <filename>" +msgstr "git bisect--helper --bisect-next <nom-de-fichier>" + +#: builtin/bisect--helper.c:32 +msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" +msgstr "git bisect--helper --bisect-skip [(<rév>|<plage>)...]" + +#: builtin/bisect--helper.c:107 #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "impossible d'ouvrir le fichier '%s' en mode '%s'" -#: builtin/bisect--helper.c:115 +#: builtin/bisect--helper.c:114 #, c-format msgid "could not write to file '%s'" msgstr "impossible d'écrire le fichier '%s'" -#: builtin/bisect--helper.c:154 +#: builtin/bisect--helper.c:153 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' n'est pas un terme valide" -#: builtin/bisect--helper.c:158 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "impossible d'utiliser la commande incluse '%s' comme terme" -#: builtin/bisect--helper.c:168 +#: builtin/bisect--helper.c:167 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "impossible de modifier la signification du terme '%s'" -#: builtin/bisect--helper.c:178 +#: builtin/bisect--helper.c:177 msgid "please use two different terms" msgstr "veuillez utiliser deux termes différents" -#: builtin/bisect--helper.c:194 +#: builtin/bisect--helper.c:193 #, c-format msgid "We are not bisecting.\n" msgstr "Pas de bissection en cours.\n" -#: builtin/bisect--helper.c:202 +#: builtin/bisect--helper.c:201 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' n'est pas un commit valide" -#: builtin/bisect--helper.c:211 +#: builtin/bisect--helper.c:210 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10674,27 +10947,27 @@ msgstr "" "Échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset " "<commit>'." -#: builtin/bisect--helper.c:255 +#: builtin/bisect--helper.c:254 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Mauvais argument pour bisect_write : %s" -#: builtin/bisect--helper.c:260 +#: builtin/bisect--helper.c:259 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "impossible d'obtenir l'oid de la révision '%s'" -#: builtin/bisect--helper.c:272 +#: builtin/bisect--helper.c:271 #, c-format msgid "couldn't open the file '%s'" msgstr "impossible d'ouvrir le fichier '%s'" -#: builtin/bisect--helper.c:298 +#: builtin/bisect--helper.c:297 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Commande invalide : vous êtes actuellement dans une bissection %s/%s" -#: builtin/bisect--helper.c:325 +#: builtin/bisect--helper.c:324 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10703,7 +10976,7 @@ msgstr "" "Vous devez me donner au moins une révision %s et une révision %s.\n" "Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela." -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:328 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10714,7 +10987,7 @@ msgstr "" "Puis vous devez me donner au moins une révision %s et une révision %s.\n" "Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela." -#: builtin/bisect--helper.c:349 +#: builtin/bisect--helper.c:348 #, c-format msgid "bisecting only with a %s commit" msgstr "Attention : bissection avec seulement une validation %s" @@ -10723,15 +10996,15 @@ msgstr "Attention : bissection avec seulement une validation %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:357 +#: builtin/bisect--helper.c:356 msgid "Are you sure [Y/n]? " msgstr "Confirmez-vous [Y/n] ? " -#: builtin/bisect--helper.c:418 +#: builtin/bisect--helper.c:417 msgid "no terms defined" msgstr "aucun terme défini" -#: builtin/bisect--helper.c:421 +#: builtin/bisect--helper.c:420 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10740,7 +11013,7 @@ msgstr "" "Vos termes actuels sont %s pour l'état ancien\n" "et %s pour le nouvel état.\n" -#: builtin/bisect--helper.c:431 +#: builtin/bisect--helper.c:430 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10750,53 +11023,53 @@ msgstr "" "Les options supportées sont : --term-good|--term-old et --term-bad|--term-" "new." -#: builtin/bisect--helper.c:498 +#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014 msgid "revision walk setup failed\n" msgstr "échec de la préparation du parcours des révisions\n" -#: builtin/bisect--helper.c:520 +#: builtin/bisect--helper.c:519 #, c-format msgid "could not open '%s' for appending" msgstr "impossible d'ouvrir '%s' en ajout" -#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 msgid "'' is not a valid term" msgstr "'' n'est pas un terme valide" -#: builtin/bisect--helper.c:662 +#: builtin/bisect--helper.c:661 #, c-format msgid "unrecognized option: '%s'" msgstr "option non reconnue : '%s'" -#: builtin/bisect--helper.c:666 +#: builtin/bisect--helper.c:665 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' ne semble être une révision valide" -#: builtin/bisect--helper.c:697 +#: builtin/bisect--helper.c:696 msgid "bad HEAD - I need a HEAD" msgstr "mauvaise HEAD - j'ai besoin d'une HEAD" -#: builtin/bisect--helper.c:712 +#: builtin/bisect--helper.c:711 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "L'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'." -#: builtin/bisect--helper.c:733 +#: builtin/bisect--helper.c:732 msgid "won't bisect on cg-seek'ed tree" msgstr "refus de bissecter sur un arbre 'cg-seeked'" -#: builtin/bisect--helper.c:736 +#: builtin/bisect--helper.c:735 msgid "bad HEAD - strange symbolic ref" msgstr "mauvaise HEAD - référence symbolique douteuse" -#: builtin/bisect--helper.c:756 +#: builtin/bisect--helper.c:755 #, c-format msgid "invalid ref: '%s'" msgstr "réference invalide : '%s'" -#: builtin/bisect--helper.c:814 +#: builtin/bisect--helper.c:813 msgid "You need to start by \"git bisect start\"\n" msgstr "Vous devez démarrer avec \"git bisect start\"\n" @@ -10804,93 +11077,101 @@ msgstr "Vous devez démarrer avec \"git bisect start\"\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:825 +#: builtin/bisect--helper.c:824 msgid "Do you want me to do it for you [Y/n]? " msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? " -#: builtin/bisect--helper.c:843 +#: builtin/bisect--helper.c:842 msgid "Please call `--bisect-state` with at least one argument" msgstr "Veuillez appeler `--bisect-state` avec au moins un argument" -#: builtin/bisect--helper.c:856 +#: builtin/bisect--helper.c:855 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' n'accepte qu'un seul argument." -#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879 +#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878 #, c-format msgid "Bad rev input: %s" msgstr "Mauvaise révision en entrée : %s" -#: builtin/bisect--helper.c:924 -msgid "reset the bisection state" -msgstr "réinitialiser l'état de la bissection" +#: builtin/bisect--helper.c:912 +msgid "We are not bisecting." +msgstr "Pas de bissection en cours." -#: builtin/bisect--helper.c:926 -msgid "write out the bisection state in BISECT_LOG" -msgstr "écrire l'état de la bissection dans BISECT_LOG" +#: builtin/bisect--helper.c:962 +#, c-format +msgid "'%s'?? what are you talking about?" +msgstr "'%s' ?? de quoi parlez-vous ?" + +#: builtin/bisect--helper.c:974 +#, c-format +msgid "cannot read file '%s' for replaying" +msgstr "impossible de lire le fichier '%s' pour rejouer" -#: builtin/bisect--helper.c:928 -msgid "check and set terms in a bisection state" -msgstr "vérifier et régler les termes dans un état de la bissection" +#: builtin/bisect--helper.c:1047 +msgid "reset the bisection state" +msgstr "réinitialiser l'état de la bissection" -#: builtin/bisect--helper.c:930 +#: builtin/bisect--helper.c:1049 msgid "check whether bad or good terms exist" msgstr "vérifier si les termes bons ou mauvais existent" -#: builtin/bisect--helper.c:932 +#: builtin/bisect--helper.c:1051 msgid "print out the bisect terms" msgstr "afficher les termes de bissection" -#: builtin/bisect--helper.c:934 +#: builtin/bisect--helper.c:1053 msgid "start the bisect session" msgstr "démarrer une session de bissection" -#: builtin/bisect--helper.c:936 +#: builtin/bisect--helper.c:1055 msgid "find the next bisection commit" msgstr "trouver le prochain commit de bissection" -#: builtin/bisect--helper.c:938 -msgid "verify the next bisection state then checkout the next bisection commit" -msgstr "" -"vérifier le prochain état de bissection puis extraire le prochain commit de " -"bissection" - -#: builtin/bisect--helper.c:940 +#: builtin/bisect--helper.c:1057 msgid "mark the state of ref (or refs)" msgstr "marquer l'état d'une références (ou plusieurs)" -#: builtin/bisect--helper.c:942 +#: builtin/bisect--helper.c:1059 +msgid "list the bisection steps so far" +msgstr "lister les étapes de bissection jusqu'ici" + +#: builtin/bisect--helper.c:1061 +msgid "replay the bisection process from the given file" +msgstr "rejouer le processus de bissection depuis le fichier fourni" + +#: builtin/bisect--helper.c:1063 +msgid "skip some commits for checkout" +msgstr "sauter certains commits pour l'extraction" + +#: builtin/bisect--helper.c:1065 msgid "no log for BISECT_WRITE" msgstr "pas de journal pour BISECT_WRITE" -#: builtin/bisect--helper.c:957 +#: builtin/bisect--helper.c:1080 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset supporte soit aucun argument, soit un commit" -#: builtin/bisect--helper.c:961 -msgid "--bisect-write requires either 4 or 5 arguments" -msgstr "--bisect-write supporte soit 4 arguments, soit 5 arguments" - -#: builtin/bisect--helper.c:967 -msgid "--check-and-set-terms requires 3 arguments" -msgstr "--check-and-set-terms exige 3 arguments" - -#: builtin/bisect--helper.c:973 +#: builtin/bisect--helper.c:1085 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check exige 2 ou 3 arguments" -#: builtin/bisect--helper.c:979 +#: builtin/bisect--helper.c:1091 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms exige 0 ou 1 argument" -#: builtin/bisect--helper.c:988 +#: builtin/bisect--helper.c:1100 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next exige 0 argument" -#: builtin/bisect--helper.c:994 -msgid "--bisect-auto-next requires 0 arguments" -msgstr "--bisect-auto-next exige 0 argument" +#: builtin/bisect--helper.c:1111 +msgid "--bisect-log requires 0 arguments" +msgstr "--bisect-log exige 0 argument" + +#: builtin/bisect--helper.c:1116 +msgid "no logfile given" +msgstr "pas de fichier de log donné" #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" @@ -10909,147 +11190,141 @@ msgstr "couleur attendue : %s" msgid "must end with a color" msgstr "doit finir avec une couleur" -#: builtin/blame.c:730 +#: builtin/blame.c:728 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "couleur invalide '%s' dans color.blame.repeatedlines" -#: builtin/blame.c:748 +#: builtin/blame.c:746 msgid "invalid value for blame.coloring" msgstr "valeur invalide pour blame.coloring" -#: builtin/blame.c:847 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" msgstr "référence à ignorer %s introuvable" +#: builtin/blame.c:867 +msgid "show blame entries as we find them, incrementally" +msgstr "montrer les éléments de blâme au fur et à mesure de leur découverte, de manière incrémentale" + +#: builtin/blame.c:868 +msgid "do not show object names of boundary commits (Default: off)" +msgstr "ne pas montrer les noms des objets pour les commits de limite (Défaut : désactivé)" + #: builtin/blame.c:869 -msgid "Show blame entries as we find them, incrementally" -msgstr "" -"Montrer les éléments de blâme au fur et à mesure de leur découverte, de " -"manière incrémentale" +msgid "do not treat root commits as boundaries (Default: off)" +msgstr "ne pas traiter les commits racine comme des limites (Défaut : désactivé)" #: builtin/blame.c:870 -msgid "Do not show object names of boundary commits (Default: off)" -msgstr "" -"Ne pas montrer les noms des objets pour les commits de limite (Défaut : " -"désactivé)" +msgid "show work cost statistics" +msgstr "montrer les statistiques de coût d'activité" -#: builtin/blame.c:871 -msgid "Do not treat root commits as boundaries (Default: off)" -msgstr "" -"Ne pas traiter les commits racine comme des limites (Défaut : désactivé)" +#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175 +#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119 +#: builtin/push.c:575 builtin/send-pack.c:198 +msgid "force progress reporting" +msgstr "forcer l'affichage de l'état d'avancement" #: builtin/blame.c:872 -msgid "Show work cost statistics" -msgstr "Montrer les statistiques de coût d'activité" +msgid "show output score for blame entries" +msgstr "montrer le score de sortie pour les éléments de blâme" #: builtin/blame.c:873 -msgid "Force progress reporting" -msgstr "Forcer l'affichage de l'état d'avancement" +msgid "show original filename (Default: auto)" +msgstr "montrer les noms de fichier originaux (Défaut : auto)" #: builtin/blame.c:874 -msgid "Show output score for blame entries" -msgstr "Montrer le score de sortie pour les éléments de blâme" +msgid "show original linenumber (Default: off)" +msgstr "montrer les numéros de lignes originaux (Défaut : désactivé)" #: builtin/blame.c:875 -msgid "Show original filename (Default: auto)" -msgstr "Montrer les noms de fichier originaux (Défaut : auto)" +msgid "show in a format designed for machine consumption" +msgstr "afficher dans un format propice à la consommation par machine" #: builtin/blame.c:876 -msgid "Show original linenumber (Default: off)" -msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" +msgid "show porcelain format with per-line commit information" +msgstr "afficher en format porcelaine avec l'information de commit par ligne" #: builtin/blame.c:877 -msgid "Show in a format designed for machine consumption" -msgstr "Afficher dans un format propice à la consommation par machine" +msgid "use the same output mode as git-annotate (Default: off)" +msgstr "utiliser le même mode de sortie que git-annotate (Défaut : désactivé)" #: builtin/blame.c:878 -msgid "Show porcelain format with per-line commit information" -msgstr "Afficher en format porcelaine avec l'information de commit par ligne" +msgid "show raw timestamp (Default: off)" +msgstr "afficher les horodatages bruts (Défaut : désactivé)" #: builtin/blame.c:879 -msgid "Use the same output mode as git-annotate (Default: off)" -msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)" +msgid "show long commit SHA1 (Default: off)" +msgstr "afficher les longs SHA1 de commits (Défaut : désactivé)" #: builtin/blame.c:880 -msgid "Show raw timestamp (Default: off)" -msgstr "Afficher les horodatages bruts (Défaut : désactivé)" +msgid "suppress author name and timestamp (Default: off)" +msgstr "supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)" #: builtin/blame.c:881 -msgid "Show long commit SHA1 (Default: off)" -msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" +msgid "show author email instead of name (Default: off)" +msgstr "afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)" #: builtin/blame.c:882 -msgid "Suppress author name and timestamp (Default: off)" -msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)" - -#: builtin/blame.c:883 -msgid "Show author email instead of name (Default: off)" -msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)" +msgid "ignore whitespace differences" +msgstr "ignorer les différences d'espace" -#: builtin/blame.c:884 -msgid "Ignore whitespace differences" -msgstr "Ignorer les différences d'espace" - -#: builtin/blame.c:885 builtin/log.c:1813 +#: builtin/blame.c:883 builtin/log.c:1812 msgid "rev" msgstr "rév" -#: builtin/blame.c:885 -msgid "Ignore <rev> when blaming" -msgstr "ignore <rev> pendant le blâme" +#: builtin/blame.c:883 +msgid "ignore <rev> when blaming" +msgstr "ignorer <rev> pendant le blâme" -#: builtin/blame.c:886 -msgid "Ignore revisions from <file>" +#: builtin/blame.c:884 +msgid "ignore revisions from <file>" msgstr "ignorer les révisions listées dans <fichier>" -#: builtin/blame.c:887 +#: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" msgstr "" "colorer différemment les métadonnées redondantes avec la ligne précédente" -#: builtin/blame.c:888 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "colorier les lignes par âge" -#: builtin/blame.c:889 -msgid "Spend extra cycles to find better match" -msgstr "" -"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" +#: builtin/blame.c:887 +msgid "spend extra cycles to find better match" +msgstr "dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:890 -msgid "Use revisions from <file> instead of calling git-rev-list" -msgstr "" -"Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list" +#: builtin/blame.c:888 +msgid "use revisions from <file> instead of calling git-rev-list" +msgstr "utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list" -#: builtin/blame.c:891 -msgid "Use <file>'s contents as the final image" -msgstr "Utiliser le contenu de <fichier> comme image finale" +#: builtin/blame.c:889 +msgid "use <file>'s contents as the final image" +msgstr "utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:892 builtin/blame.c:893 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "score" -#: builtin/blame.c:892 -msgid "Find line copies within and across files" -msgstr "Trouver les copies de ligne dans et entre les fichiers" +#: builtin/blame.c:890 +msgid "find line copies within and across files" +msgstr "trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:893 -msgid "Find line movements within and across files" -msgstr "Trouver les mouvements de ligne dans et entre les fichiers" +#: builtin/blame.c:891 +msgid "find line movements within and across files" +msgstr "trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:894 +#: builtin/blame.c:892 msgid "range" msgstr "plage" -#: builtin/blame.c:895 -msgid "Process only line range <start>,<end> or function :<funcname>" -msgstr "" -"Traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-" -"de-fonction>" +#: builtin/blame.c:893 +msgid "process only line range <start>,<end> or function :<funcname>" +msgstr "traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-de-fonction>" -#: builtin/blame.c:947 +#: builtin/blame.c:945 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress ne peut pas être utilisé avec --incremental ou les formats " @@ -11063,18 +11338,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:998 +#: builtin/blame.c:996 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" -#: builtin/blame.c:1114 +#: builtin/blame.c:1112 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "le fichier %s n'a qu'%lu ligne" msgstr[1] "le fichier %s n'a que %lu lignes" -#: builtin/blame.c:1159 +#: builtin/blame.c:1157 msgid "Blaming lines" msgstr "Assignation de blâme aux lignes" @@ -11144,121 +11419,111 @@ msgstr "" msgid "Update of config-file failed" msgstr "Échec de la mise à jour du fichier de configuration" -#: builtin/branch.c:220 +#: builtin/branch.c:223 msgid "cannot use -a with -d" msgstr "impossible d'utiliser -a avec -d" -#: builtin/branch.c:226 +#: builtin/branch.c:230 msgid "Couldn't look up commit object for HEAD" msgstr "Impossible de rechercher l'objet commit pour HEAD" -#: builtin/branch.c:240 +#: builtin/branch.c:244 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'" -#: builtin/branch.c:255 +#: builtin/branch.c:259 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "branche de suivi '%s' non trouvée." -#: builtin/branch.c:256 +#: builtin/branch.c:260 #, c-format msgid "branch '%s' not found." msgstr "branche '%s' non trouvée." -#: builtin/branch.c:271 -#, c-format -msgid "Error deleting remote-tracking branch '%s'" -msgstr "Erreur lors de la suppression de la branche de suivi '%s'" - -#: builtin/branch.c:272 -#, c-format -msgid "Error deleting branch '%s'" -msgstr "Erreur lors de la suppression de la branche '%s'" - -#: builtin/branch.c:279 +#: builtin/branch.c:291 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Branche de suivi %s supprimée (précédemment %s).\n" -#: builtin/branch.c:280 +#: builtin/branch.c:292 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branche %s supprimée (précédemment %s).\n" -#: builtin/branch.c:429 builtin/tag.c:61 +#: builtin/branch.c:438 builtin/tag.c:61 msgid "unable to parse format string" msgstr "impossible d'analyser la chaîne de format" -#: builtin/branch.c:460 +#: builtin/branch.c:469 msgid "could not resolve HEAD" msgstr "impossible de résoudre HEAD" -#: builtin/branch.c:466 +#: builtin/branch.c:475 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) pointe hors de refs/heads/" -#: builtin/branch.c:481 +#: builtin/branch.c:490 #, c-format msgid "Branch %s is being rebased at %s" msgstr "La branche %s est en cours de rebasage sur %s" -#: builtin/branch.c:485 +#: builtin/branch.c:494 #, c-format msgid "Branch %s is being bisected at %s" msgstr "La branche %s est en cours de bissection sur %s" -#: builtin/branch.c:502 +#: builtin/branch.c:511 msgid "cannot copy the current branch while not on any." msgstr "impossible de copier la branche actuelle, il n'y en a pas." -#: builtin/branch.c:504 +#: builtin/branch.c:513 msgid "cannot rename the current branch while not on any." msgstr "impossible de renommer la branche actuelle, il n'y en a pas." -#: builtin/branch.c:515 +#: builtin/branch.c:524 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:544 +#: builtin/branch.c:553 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:546 +#: builtin/branch.c:555 msgid "Branch copy failed" msgstr "Échec de copie de la branche" -#: builtin/branch.c:550 +#: builtin/branch.c:559 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Création d'une copie d'une branche mal nommée '%s'" -#: builtin/branch.c:553 +#: builtin/branch.c:562 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'une branche mal nommée '%s'" -#: builtin/branch.c:559 +#: builtin/branch.c:568 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !" -#: builtin/branch.c:568 +#: builtin/branch.c:577 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branche est renommée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:570 +#: builtin/branch.c:579 msgid "Branch is copied, but update of config-file failed" msgstr "" "La branche est copiée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:586 +#: builtin/branch.c:595 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11269,180 +11534,180 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/branch.c:620 +#: builtin/branch.c:629 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:622 +#: builtin/branch.c:631 msgid "show hash and subject, give twice for upstream branch" msgstr "afficher le hachage et le sujet, doublé pour la branche amont" -#: builtin/branch.c:623 +#: builtin/branch.c:632 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:624 +#: builtin/branch.c:633 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:626 +#: builtin/branch.c:635 msgid "do not use" msgstr "ne pas utiliser" -#: builtin/branch.c:628 builtin/rebase.c:532 +#: builtin/branch.c:637 builtin/rebase.c:534 msgid "upstream" msgstr "amont" -#: builtin/branch.c:628 +#: builtin/branch.c:637 msgid "change the upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:629 +#: builtin/branch.c:638 msgid "unset the upstream info" msgstr "désactiver l'information amont" -#: builtin/branch.c:630 +#: builtin/branch.c:639 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:631 +#: builtin/branch.c:640 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:633 builtin/branch.c:635 +#: builtin/branch.c:642 builtin/branch.c:644 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:634 builtin/branch.c:636 +#: builtin/branch.c:643 builtin/branch.c:645 msgid "print only branches that don't contain the commit" msgstr "afficher seulement les branches qui ne contiennent pas le commit" -#: builtin/branch.c:639 +#: builtin/branch.c:648 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:640 +#: builtin/branch.c:649 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:642 +#: builtin/branch.c:651 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:643 +#: builtin/branch.c:652 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:644 +#: builtin/branch.c:653 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:645 +#: builtin/branch.c:654 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:646 +#: builtin/branch.c:655 msgid "copy a branch and its reflog" msgstr "copier une branche et son reflog" -#: builtin/branch.c:647 +#: builtin/branch.c:656 msgid "copy a branch, even if target exists" msgstr "copier une branche, même si la cible existe" -#: builtin/branch.c:648 +#: builtin/branch.c:657 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:649 +#: builtin/branch.c:658 msgid "show current branch name" msgstr "afficher le nom de la branche courante" -#: builtin/branch.c:650 +#: builtin/branch.c:659 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:652 +#: builtin/branch.c:661 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:653 +#: builtin/branch.c:662 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:654 +#: builtin/branch.c:663 msgid "print only branches that are merged" msgstr "afficher seulement les branches qui sont fusionnées" -#: builtin/branch.c:655 +#: builtin/branch.c:664 msgid "print only branches that are not merged" msgstr "afficher seulement les branches qui ne sont pas fusionnées" -#: builtin/branch.c:656 +#: builtin/branch.c:665 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:658 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:434 +#: builtin/tag.c:466 msgid "object" msgstr "objet" -#: builtin/branch.c:659 +#: builtin/branch.c:668 msgid "print only branches of the object" msgstr "afficher seulement les branches de l'objet" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441 +#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473 msgid "sorting and filtering are case insensitive" msgstr "le tri et le filtrage sont non-sensibles à la casse" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/branch.c:684 builtin/clone.c:790 +#: builtin/branch.c:693 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:708 +#: builtin/branch.c:717 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:753 +#: builtin/branch.c:764 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:758 +#: builtin/branch.c:769 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:765 +#: builtin/branch.c:776 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:768 +#: builtin/branch.c:779 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:783 +#: builtin/branch.c:794 msgid "too many branches for a copy operation" msgstr "trop de branches pour une opération de copie" -#: builtin/branch.c:792 +#: builtin/branch.c:803 msgid "too many arguments for a rename operation" msgstr "trop d'arguments pour une opération de renommage" -#: builtin/branch.c:797 +#: builtin/branch.c:808 msgid "too many arguments to set new upstream" msgstr "trop d'arguments pour spécifier une branche amont" -#: builtin/branch.c:801 +#: builtin/branch.c:812 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -11450,32 +11715,32 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:815 builtin/branch.c:838 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:808 +#: builtin/branch.c:819 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:821 +#: builtin/branch.c:832 msgid "too many arguments to unset upstream" msgstr "trop d'arguments pour désactiver un amont" -#: builtin/branch.c:825 +#: builtin/branch.c:836 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur " "aucune branche." -#: builtin/branch.c:831 +#: builtin/branch.c:842 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:841 +#: builtin/branch.c:852 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11484,7 +11749,7 @@ msgstr "" "branche.\n" "Vouliez-vous plutôt dire -a|-r --list <motif> ?" -#: builtin/branch.c:845 +#: builtin/branch.c:856 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11606,19 +11871,19 @@ msgstr "git bundle list-heads <fichier> [<nom-de-ref>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <fichier> [<nom-de-ref>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3480 +#: builtin/bundle.c:67 builtin/pack-objects.c:3495 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +#: builtin/bundle.c:69 builtin/pack-objects.c:3497 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +#: builtin/bundle.c:71 builtin/pack-objects.c:3499 msgid "show progress meter during object writing phase" msgstr "afficher la barre de progression durant la phase d'écrite des objets" -#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +#: builtin/bundle.c:74 builtin/pack-objects.c:3502 msgid "similar to --all-progress when progress meter is shown" msgstr "similaire à --all-progress quand la barre de progression est affichée" @@ -11764,8 +12029,8 @@ msgid "terminate input and output records by a NUL character" msgstr "" "terminer les enregistrements en entrée et en sortie par un caractère NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541 -#: builtin/worktree.c:561 +#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549 +#: builtin/worktree.c:489 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -11818,56 +12083,56 @@ msgstr "impossible d'analyser le contact : %s" msgid "no contacts specified" msgstr "aucun contact spécifié" -#: builtin/checkout-index.c:139 +#: builtin/checkout-index.c:152 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<options>] [--] [<fichier>...]" -#: builtin/checkout-index.c:156 +#: builtin/checkout-index.c:169 msgid "stage should be between 1 and 3 or all" msgstr "stage doit valoir entre 1 et 3, ou all" -#: builtin/checkout-index.c:173 +#: builtin/checkout-index.c:186 msgid "check out all files in the index" msgstr "extraire tous les fichiers présents dans l'index" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:187 msgid "force overwrite of existing files" msgstr "forcer l'écrasement des fichiers existants" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:189 msgid "no warning for existing files and files not in index" msgstr "" "pas d'avertissement pour les fichiers existants et les fichiers absents de " "l'index" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:191 msgid "don't checkout new files" msgstr "ne pas extraire les nouveaux fichiers" -#: builtin/checkout-index.c:180 +#: builtin/checkout-index.c:193 msgid "update stat information in the index file" msgstr "mettre à jour l'information de stat dans le fichier d'index" -#: builtin/checkout-index.c:184 +#: builtin/checkout-index.c:197 msgid "read list of paths from the standard input" msgstr "lire la liste des chemins depuis l'entrée standard" -#: builtin/checkout-index.c:186 +#: builtin/checkout-index.c:199 msgid "write the content to temporary files" msgstr "écrire le contenu dans des fichiers temporaires" -#: builtin/checkout-index.c:187 builtin/column.c:31 +#: builtin/checkout-index.c:200 builtin/column.c:31 #: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 #: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:757 +#: builtin/worktree.c:717 msgid "string" msgstr "chaîne" -#: builtin/checkout-index.c:188 +#: builtin/checkout-index.c:201 msgid "when creating files, prepend <string>" msgstr "lors de la création de fichiers, préfixer par <chaîne>" -#: builtin/checkout-index.c:190 +#: builtin/checkout-index.c:203 msgid "copy out the files from named stage" msgstr "copier les fichiers depuis l'index nommé" @@ -11971,16 +12236,16 @@ msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié" msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:541 builtin/checkout.c:548 +#: builtin/checkout.c:543 builtin/checkout.c:550 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:716 +#: builtin/checkout.c:718 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:770 +#: builtin/checkout.c:772 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11990,50 +12255,50 @@ msgstr "" "suivants :\n" "%s" -#: builtin/checkout.c:866 +#: builtin/checkout.c:865 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:908 +#: builtin/checkout.c:907 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" -#: builtin/checkout.c:916 +#: builtin/checkout.c:915 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:919 +#: builtin/checkout.c:918 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:923 +#: builtin/checkout.c:922 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:925 builtin/checkout.c:1356 +#: builtin/checkout.c:924 builtin/checkout.c:1355 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:927 +#: builtin/checkout.c:926 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:978 +#: builtin/checkout.c:977 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:984 +#: builtin/checkout.c:983 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12056,7 +12321,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1003 +#: builtin/checkout.c:1002 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12085,19 +12350,19 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:1042 +#: builtin/checkout.c:1041 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:1082 builtin/checkout.c:1351 +#: builtin/checkout.c:1081 builtin/checkout.c:1350 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:1164 +#: builtin/checkout.c:1163 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12106,7 +12371,7 @@ msgstr "" "'%s' pourrait être un fichier local ou un branche de suivi.\n" "Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer" -#: builtin/checkout.c:1171 +#: builtin/checkout.c:1170 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12126,51 +12391,51 @@ msgstr "" "ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n" "votre config." -#: builtin/checkout.c:1181 +#: builtin/checkout.c:1180 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance" -#: builtin/checkout.c:1247 +#: builtin/checkout.c:1246 msgid "only one reference expected" msgstr "une seule référence attendue" -#: builtin/checkout.c:1264 +#: builtin/checkout.c:1263 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510 +#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1323 builtin/checkout.c:1689 +#: builtin/checkout.c:1322 builtin/checkout.c:1688 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1370 +#: builtin/checkout.c:1369 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "branche attendue, mais étiquette '%s' reçue" -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1371 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "une branche est attendue, mais une branche distante '%s' a été reçue" -#: builtin/checkout.c:1373 builtin/checkout.c:1381 +#: builtin/checkout.c:1372 builtin/checkout.c:1380 #, c-format msgid "a branch is expected, got '%s'" msgstr "une branche est attendue, mais '%s' a été reçue" -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1375 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "une branche est attendue, mais un commit '%s' a été reçu" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1391 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12178,7 +12443,7 @@ msgstr "" "impossible de basculer de branche pendant une fusion\n" "Envisagez \"git merge --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1395 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12186,7 +12451,7 @@ msgstr "" "impossible de basculer de branche pendant une session am\n" "Envisagez \"git am --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1400 +#: builtin/checkout.c:1399 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12194,7 +12459,7 @@ msgstr "" "impossible de basculer de branche pendant un rebasage\n" "Envisagez \"git rebase --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1404 +#: builtin/checkout.c:1403 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12202,7 +12467,7 @@ msgstr "" "impossible de basculer de branche pendant un picorage\n" "Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1408 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12210,146 +12475,139 @@ msgstr "" "impossible de basculer de branche pendant un retour\n" "Envisagez \"git revert --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1411 msgid "you are switching branch while bisecting" msgstr "Vous basculez de branche en cours de bissection" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1418 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430 +#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ne peut pas être utilisé avec un basculement de branches" -#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440 -#: builtin/checkout.c:1445 builtin/checkout.c:1450 +#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439 +#: builtin/checkout.c:1444 builtin/checkout.c:1449 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1447 +#: builtin/checkout.c:1446 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' n'accepte pas <point-de-départ>" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1454 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1461 msgid "missing branch or commit argument" msgstr "argument de branche ou de commit manquant" -#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84 -#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575 -#: builtin/send-pack.c:198 -msgid "force progress reporting" -msgstr "forcer l'affichage de l'état d'avancement" - -#: builtin/checkout.c:1505 +#: builtin/checkout.c:1504 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322 +#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322 msgid "style" msgstr "style" -#: builtin/checkout.c:1507 +#: builtin/checkout.c:1506 msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1519 builtin/worktree.c:558 +#: builtin/checkout.c:1518 builtin/worktree.c:486 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" -#: builtin/checkout.c:1520 +#: builtin/checkout.c:1519 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1522 +#: builtin/checkout.c:1521 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1524 +#: builtin/checkout.c:1523 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1524 +#: builtin/checkout.c:1523 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1526 builtin/merge.c:300 +#: builtin/checkout.c:1525 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1529 +#: builtin/checkout.c:1528 msgid "do not check if another worktree is holding the given ref" msgstr "" "ne pas vérifier si une autre copie de travail contient le référence fournie" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1541 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1545 +#: builtin/checkout.c:1544 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1548 msgid "do not limit pathspecs to sparse entries only" msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux" -#: builtin/checkout.c:1604 +#: builtin/checkout.c:1603 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1608 +#: builtin/checkout.c:1607 msgid "-p and --overlay are mutually exclusive" msgstr "-p et --overlay sont mutuellement exclusifs" -#: builtin/checkout.c:1645 +#: builtin/checkout.c:1644 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1650 +#: builtin/checkout.c:1649 #, c-format msgid "missing branch name; try -%c" msgstr "nom de branche manquant ; essayez -%c" -#: builtin/checkout.c:1682 +#: builtin/checkout.c:1681 #, c-format msgid "could not resolve %s" msgstr "impossible de résoudre %s" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1697 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1705 +#: builtin/checkout.c:1704 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis" -#: builtin/checkout.c:1709 +#: builtin/checkout.c:1708 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1717 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file est incompatible avec --detach" -#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499 +#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file est incompatible avec --patch" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1733 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12357,71 +12615,71 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." -#: builtin/checkout.c:1739 +#: builtin/checkout.c:1738 msgid "you must specify path(s) to restore" msgstr "Vous devez spécifier un ou des chemins à restaurer" -#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816 -#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 -#: builtin/worktree.c:556 +#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815 +#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482 +#: builtin/worktree.c:484 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1766 +#: builtin/checkout.c:1765 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1767 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1769 +#: builtin/checkout.c:1768 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1771 +#: builtin/checkout.c:1770 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" "essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1771 msgid "use overlay mode (default)" msgstr "utiliser le mode de superposition (défaut)" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1816 msgid "create and switch to a new branch" msgstr "créer et basculer sur une nouvelle branche" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1818 msgid "create/reset and switch to a branch" msgstr "créer/réinitialiser et basculer sur une branche" -#: builtin/checkout.c:1821 +#: builtin/checkout.c:1820 msgid "second guess 'git switch <no-such-branch>'" msgstr "interpréter 'git switch <branche-inexistante>'" -#: builtin/checkout.c:1823 +#: builtin/checkout.c:1822 msgid "throw away local modifications" msgstr "laisser tomber les modifications locales" -#: builtin/checkout.c:1857 +#: builtin/checkout.c:1856 msgid "which tree-ish to checkout from" msgstr "de quel <arbre-esque> faire l'extraction" -#: builtin/checkout.c:1859 +#: builtin/checkout.c:1858 msgid "restore the index" msgstr "restaurer l'index" -#: builtin/checkout.c:1861 +#: builtin/checkout.c:1860 msgid "restore the working tree (default)" msgstr "restaurer l'arbre de travail (par défaut)" -#: builtin/checkout.c:1863 +#: builtin/checkout.c:1862 msgid "ignore unmerged entries" msgstr "ignorer les entrées non-fusionnées" -#: builtin/checkout.c:1864 +#: builtin/checkout.c:1863 msgid "use overlay mode" msgstr "utiliser le mode de superposition" @@ -12566,8 +12824,8 @@ msgid "remove whole directories" msgstr "supprimer les répertoires entiers" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185 -#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "motif" @@ -12663,7 +12921,7 @@ msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" #: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357 msgid "name" msgstr "nom" @@ -12679,7 +12937,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860 +#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861 #: builtin/pull.c:208 msgid "depth" msgstr "profondeur" @@ -12688,7 +12946,7 @@ msgstr "profondeur" msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550 #: builtin/pull.c:211 msgid "time" msgstr "heure" @@ -12697,12 +12955,12 @@ msgstr "heure" msgid "create a shallow clone since a specific time" msgstr "créer un clone superficiel depuis une date spécifique" -#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323 msgid "revision" msgstr "révision" -#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215 +#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "" "approfondir l'historique d'un clone superficiel en excluant une révision" @@ -12738,22 +12996,22 @@ msgstr "clé=valeur" msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 #: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "spécifique au serveur" -#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 #: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "option à transmettre" -#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234 #: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237 #: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" @@ -12858,71 +13116,71 @@ msgstr "impossible de remballer pour nettoyer" msgid "cannot unlink temporary alternates file" msgstr "impossible de délier le fichier temporaire alternates" -#: builtin/clone.c:992 builtin/receive-pack.c:2493 +#: builtin/clone.c:993 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:996 +#: builtin/clone.c:997 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:1009 +#: builtin/clone.c:1010 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:1012 +#: builtin/clone.c:1013 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:1025 +#: builtin/clone.c:1026 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:1029 builtin/fetch.c:1841 +#: builtin/clone.c:1030 builtin/fetch.c:1951 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:1039 +#: builtin/clone.c:1040 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide." -#: builtin/clone.c:1045 +#: builtin/clone.c:1046 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "le chemin du dépôt '%s' existe déjà et n'est pas un répertoire vide." -#: builtin/clone.c:1059 +#: builtin/clone.c:1060 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271 -#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386 +#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271 +#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" -#: builtin/clone.c:1079 +#: builtin/clone.c:1080 #, c-format msgid "could not create work tree dir '%s'" msgstr "impossible de créer le répertoire de la copie de travail '%s'" -#: builtin/clone.c:1099 +#: builtin/clone.c:1100 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:1101 +#: builtin/clone.c:1102 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:1125 +#: builtin/clone.c:1126 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12930,46 +13188,46 @@ msgstr "" "clone --recursive n'est pas compatible avec à la fois --reference et --" "reference-if-able" -#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705 +#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' n'est pas un nom valide de distante" -#: builtin/clone.c:1210 +#: builtin/clone.c:1211 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." -#: builtin/clone.c:1212 +#: builtin/clone.c:1213 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://" "\"." -#: builtin/clone.c:1214 +#: builtin/clone.c:1215 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt " "\"file://\"." -#: builtin/clone.c:1216 +#: builtin/clone.c:1217 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter est ignoré dans les clones locaux ; utilisez plutôt file:// ." -#: builtin/clone.c:1219 +#: builtin/clone.c:1220 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:1224 +#: builtin/clone.c:1225 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:1311 builtin/clone.c:1319 +#: builtin/clone.c:1315 builtin/clone.c:1323 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" -#: builtin/clone.c:1322 +#: builtin/clone.c:1326 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -13027,14 +13285,14 @@ msgid "could not find object directory matching %s" msgstr "impossible de trouver le répertoire objet correspondant à %s" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769 +#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768 msgid "dir" msgstr "répertoire" #: builtin/commit-graph.c:81 builtin/commit-graph.c:211 #: builtin/commit-graph.c:317 -msgid "The object directory to store the graph" -msgstr "Le répertoire d'objet où stocker le graphe" +msgid "the object directory to store the graph" +msgstr "le répertoire d'objet où stocker le graphe" #: builtin/commit-graph.c:83 msgid "if the commit-graph is split, only verify the tip file" @@ -13124,7 +13382,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "le parent dupliqué %s est ignoré" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557 #, c-format msgid "not a valid object name %s" msgstr "nom d'objet invalide %s" @@ -13152,9 +13410,9 @@ msgstr "parent" msgid "id of a parent commit object" msgstr "id d'un objet commit parent" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470 -#: builtin/tag.c:413 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537 +#: builtin/tag.c:445 msgid "message" msgstr "message" @@ -13166,7 +13424,7 @@ msgstr "message de validation" msgid "read commit log message from file" msgstr "lire le message de validation depuis un fichier" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signer la validation avec GPG" @@ -13322,7 +13580,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:729 builtin/shortlog.c:425 +#: builtin/commit.c:729 builtin/shortlog.c:413 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" @@ -13420,7 +13678,7 @@ msgstr "Impossible de lire l'index" msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:1011 builtin/tag.c:276 +#: builtin/commit.c:1011 builtin/tag.c:308 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" @@ -13514,7 +13772,7 @@ msgid "version" msgstr "version" #: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 -#: builtin/worktree.c:725 +#: builtin/worktree.c:679 msgid "machine-readable output" msgstr "sortie pour traitement automatique" @@ -13528,7 +13786,7 @@ msgstr "terminer les éléments par NUL" #: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 -#: builtin/fast-export.c:1204 builtin/rebase.c:1406 parse-options.h:336 +#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336 msgid "mode" msgstr "mode" @@ -13589,7 +13847,7 @@ msgstr "afficher les diff dans le modèle de message de validation" msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415 +#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447 msgid "read message from file" msgstr "lire le message depuis un fichier" @@ -13601,7 +13859,7 @@ msgstr "auteur" msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1503 builtin/gc.c:542 +#: builtin/commit.c:1503 builtin/gc.c:550 msgid "date" msgstr "date" @@ -13610,7 +13868,7 @@ msgid "override date for commit" msgstr "remplacer la date pour la validation" #: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 -#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90 msgid "commit" msgstr "commit" @@ -13637,7 +13895,7 @@ msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)" -#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301 +#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "ajouter une ligne terminale Signed-off-by" @@ -14282,41 +14540,41 @@ msgstr "--stdin et --merge-base sont mutuellement exclusifs" msgid "--merge-base only works with two commits" msgstr "--merge-base ne fonctionne qu'avec deux commits" -#: builtin/diff.c:91 +#: builtin/diff.c:92 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique" -#: builtin/diff.c:258 +#: builtin/diff.c:259 #, c-format msgid "invalid option: %s" msgstr "option invalide : %s" -#: builtin/diff.c:375 +#: builtin/diff.c:376 #, c-format msgid "%s...%s: no merge base" msgstr "%s..%s: pas de base de fusion" -#: builtin/diff.c:485 +#: builtin/diff.c:486 msgid "Not a git repository" msgstr "Ce n'est pas un dépôt git !" -#: builtin/diff.c:530 builtin/grep.c:681 +#: builtin/diff.c:532 builtin/grep.c:682 #, c-format msgid "invalid object '%s' given." msgstr "objet spécifié '%s' invalide." -#: builtin/diff.c:541 +#: builtin/diff.c:543 #, c-format msgid "more than two blobs given: '%s'" msgstr "plus de deux blobs spécifiés : '%s'" -#: builtin/diff.c:546 +#: builtin/diff.c:548 #, c-format msgid "unhandled object '%s' given." msgstr "objet non géré '%s' spécifié." -#: builtin/diff.c:580 +#: builtin/diff.c:582 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "\"%s...%s\" : bases multiples de fusion, utilisation de %s" @@ -14502,40 +14760,40 @@ msgstr "" "alternatif" #: builtin/fast-export.c:1208 -msgid "Dump marks to this file" -msgstr "Enregistrer les marques dans ce fichier" +msgid "dump marks to this file" +msgstr "enregistrer les marques dans ce fichier" #: builtin/fast-export.c:1210 -msgid "Import marks from this file" +msgid "import marks from this file" msgstr "importer les marques depuis ce fichier" #: builtin/fast-export.c:1214 -msgid "Import marks from this file if it exists" +msgid "import marks from this file if it exists" msgstr "importer les marques depuis ce fichier s'il existe" #: builtin/fast-export.c:1216 -msgid "Fake a tagger when tags lack one" +msgid "fake a tagger when tags lack one" msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas" #: builtin/fast-export.c:1218 -msgid "Output full tree for each commit" -msgstr "Afficher l'arbre complet pour chaque commit" +msgid "output full tree for each commit" +msgstr "afficher l'arbre complet pour chaque commit" #: builtin/fast-export.c:1220 -msgid "Use the done feature to terminate the stream" -msgstr "Utiliser la fonction \"done\" pour terminer le flux" +msgid "use the done feature to terminate the stream" +msgstr "utiliser la fonction \"done\" pour terminer le flux" #: builtin/fast-export.c:1221 -msgid "Skip output of blob data" -msgstr "Sauter l'affichage de données de blob" +msgid "skip output of blob data" +msgstr "sauter l'affichage de données de blob" -#: builtin/fast-export.c:1222 builtin/log.c:1816 +#: builtin/fast-export.c:1222 builtin/log.c:1815 msgid "refspec" msgstr "spécificateur de référence" #: builtin/fast-export.c:1223 -msgid "Apply refspec to exported refs" -msgstr "Appliquer le spécificateur de référence aux références exportées" +msgid "apply refspec to exported refs" +msgstr "appliquer le spécificateur de référence aux références exportées" #: builtin/fast-export.c:1224 msgid "anonymize output" @@ -14550,18 +14808,16 @@ msgid "convert <from> to <to> in anonymized output" msgstr "convertit <depuis> en <vers> dans la sortie anonymisée" #: builtin/fast-export.c:1229 -msgid "Reference parents which are not in fast-export stream by object id" -msgstr "" -"les parents références qui ne sont pas dans le flux d'export rapide par id " -"d'objet" +msgid "reference parents which are not in fast-export stream by object id" +msgstr "référencer les parents qui ne sont pas dans le flux d'export rapide par id d'objet" #: builtin/fast-export.c:1231 -msgid "Show original object ids of blobs/commits" -msgstr "Afficher les ids d'objet originaux des blobs/commits" +msgid "show original object ids of blobs/commits" +msgstr "afficher les ids d'objet originaux des blobs/commits" #: builtin/fast-export.c:1233 -msgid "Label tags with mark ids" -msgstr "Marquer les étiquettes avec des ids de marque" +msgid "label tags with mark ids" +msgstr "marquer les étiquettes avec des ids de marque" #: builtin/fast-export.c:1256 msgid "--anonymize-map without --anonymize does not make sense" @@ -14604,7 +14860,7 @@ msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "" "la fonctionnalité '%s' est interdite en entrée sans --allow-unsafe-features" -#: builtin/fetch-pack.c:241 +#: builtin/fetch-pack.c:242 #, c-format msgid "Lockfile created but not reported: %s" msgstr "Fichier verrou créé mais non reporté : %s" @@ -14625,96 +14881,100 @@ msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:119 +#: builtin/fetch.c:120 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel ne peut pas être négatif" -#: builtin/fetch.c:142 builtin/pull.c:185 +#: builtin/fetch.c:143 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "récupérer depuis tous les dépôts distants" -#: builtin/fetch.c:144 builtin/pull.c:245 +#: builtin/fetch.c:145 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "définir la branche amont pour git pull/fetch" -#: builtin/fetch.c:146 builtin/pull.c:188 +#: builtin/fetch.c:147 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:148 builtin/pull.c:191 +#: builtin/fetch.c:149 +msgid "use atomic transaction to update references" +msgstr "utiliser une transaction atomique pour mettre à jour les références" + +#: builtin/fetch.c:151 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:149 +#: builtin/fetch.c:152 msgid "force overwrite of local reference" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:151 +#: builtin/fetch.c:154 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:153 builtin/pull.c:195 +#: builtin/fetch.c:156 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:155 +#: builtin/fetch.c:158 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:157 +#: builtin/fetch.c:160 msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules récupérés en parallèle" -#: builtin/fetch.c:159 builtin/pull.c:198 +#: builtin/fetch.c:162 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "" "éliminer les branches de suivi distant si la branche n'existe plus dans le " "dépôt distant" -#: builtin/fetch.c:161 +#: builtin/fetch.c:164 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "éliminer les étiquettes locales qui ont disparu du dépôt distant et qui " "encombrent les étiquettes modifiées" -#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 +#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:163 +#: builtin/fetch.c:166 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:168 +#: builtin/fetch.c:171 msgid "write fetched references to the FETCH_HEAD file" msgstr "écrire les références récupérées dans le fichier FETCH_HEAD" -#: builtin/fetch.c:169 builtin/pull.c:206 +#: builtin/fetch.c:172 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:171 +#: builtin/fetch.c:174 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:176 builtin/pull.c:212 +#: builtin/fetch.c:179 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date" -#: builtin/fetch.c:182 builtin/pull.c:221 +#: builtin/fetch.c:185 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:185 +#: builtin/fetch.c:188 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:188 +#: builtin/fetch.c:191 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14722,99 +14982,99 @@ msgstr "" "par défaut pour la récupération récursive de sous-modules (priorité plus " "basse que les fichiers de config)" -#: builtin/fetch.c:192 builtin/pull.c:224 +#: builtin/fetch.c:195 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:193 builtin/pull.c:226 +#: builtin/fetch.c:196 builtin/pull.c:226 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:194 builtin/pull.c:227 +#: builtin/fetch.c:197 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:201 builtin/pull.c:240 +#: builtin/fetch.c:204 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet" -#: builtin/fetch.c:204 builtin/fetch.c:206 +#: builtin/fetch.c:207 builtin/fetch.c:209 msgid "run 'maintenance --auto' after fetching" msgstr "lancer 'maintenance --auto' après la récupération" -#: builtin/fetch.c:208 builtin/pull.c:243 +#: builtin/fetch.c:211 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "vérifier les mises à jour forcées sur toutes les branches mises à jour" -#: builtin/fetch.c:210 +#: builtin/fetch.c:213 msgid "write the commit-graph after fetching" msgstr "écrire le graphe de commits après le rapatriement" -#: builtin/fetch.c:212 +#: builtin/fetch.c:215 msgid "accept refspecs from stdin" msgstr "lire les spécificateurs de référence depuis l'entrée standard" -#: builtin/fetch.c:523 +#: builtin/fetch.c:526 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:677 +#: builtin/fetch.c:697 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" "le paramètre de configuration fetch.output contient une valeur invalide %s" -#: builtin/fetch.c:775 +#: builtin/fetch.c:796 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:779 +#: builtin/fetch.c:800 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 +#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:793 +#: builtin/fetch.c:814 msgid "can't fetch in current branch" msgstr "impossible de récupérer dans la branche actuelle" -#: builtin/fetch.c:803 +#: builtin/fetch.c:824 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 -#: builtin/fetch.c:875 +#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884 +#: builtin/fetch.c:896 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:808 +#: builtin/fetch.c:829 msgid "would clobber existing tag" msgstr "écraserait l'étiquette existante" -#: builtin/fetch.c:830 +#: builtin/fetch.c:851 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:833 +#: builtin/fetch.c:854 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:836 +#: builtin/fetch.c:857 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:875 +#: builtin/fetch.c:896 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:880 +#: builtin/fetch.c:901 msgid "non-fast-forward" msgstr "pas en avance rapide" -#: builtin/fetch.c:901 +#: builtin/fetch.c:1005 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14824,7 +15084,7 @@ msgstr "" "mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n" "'--show-forced-update' ou lancez 'git config fetch.showForcedUpdates true'." -#: builtin/fetch.c:905 +#: builtin/fetch.c:1009 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14836,23 +15096,23 @@ msgstr "" "Vous pouvez utiliser '--no-show-forced-update' ou lancer\n" "'git config fetch.showForcedUpdates false' pour éviter ceci.\n" -#: builtin/fetch.c:939 +#: builtin/fetch.c:1041 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n" -#: builtin/fetch.c:960 +#: builtin/fetch.c:1069 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "%s rejeté parce que les racines superficielles ne sont pas mises à jour" -#: builtin/fetch.c:1053 builtin/fetch.c:1191 +#: builtin/fetch.c:1146 builtin/fetch.c:1297 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:1064 +#: builtin/fetch.c:1168 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14861,56 +15121,56 @@ msgstr "" "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n" " 'git remote prune %s' pour supprimer des branches anciennes en conflit" -#: builtin/fetch.c:1161 +#: builtin/fetch.c:1267 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:1162 +#: builtin/fetch.c:1268 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:1194 +#: builtin/fetch.c:1300 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:1195 builtin/remote.c:1118 +#: builtin/fetch.c:1301 builtin/remote.c:1118 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:1218 +#: builtin/fetch.c:1324 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu" -#: builtin/fetch.c:1237 +#: builtin/fetch.c:1343 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" -#: builtin/fetch.c:1240 +#: builtin/fetch.c:1346 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:1448 +#: builtin/fetch.c:1558 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "branches multiples détectées, imcompatible avec --set-upstream" -#: builtin/fetch.c:1463 +#: builtin/fetch.c:1573 msgid "not setting upstream for a remote remote-tracking branch" msgstr "dépôt amont non défini pour la branche de suivi à distance" -#: builtin/fetch.c:1465 +#: builtin/fetch.c:1575 msgid "not setting upstream for a remote tag" msgstr "dépôt amont non défini pour l'étiquette distante" -#: builtin/fetch.c:1467 +#: builtin/fetch.c:1577 msgid "unknown branch type" msgstr "type de branche inconnu" -#: builtin/fetch.c:1469 +#: builtin/fetch.c:1579 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14918,22 +15178,22 @@ msgstr "" "Aucune branche source trouvée.\n" "Vous devez spécifier exactement une branche avec l'option --set-upstream." -#: builtin/fetch.c:1598 builtin/fetch.c:1661 +#: builtin/fetch.c:1708 builtin/fetch.c:1771 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 +#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1620 +#: builtin/fetch.c:1730 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "impossible de récupérer '%s' (code de sortie : %d)\n" -#: builtin/fetch.c:1724 +#: builtin/fetch.c:1834 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14941,46 +15201,46 @@ msgstr "" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" "distant depuis lesquels les nouvelles révisions devraient être récupérées." -#: builtin/fetch.c:1760 +#: builtin/fetch.c:1870 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1825 +#: builtin/fetch.c:1935 msgid "Negative depth in --deepen is not supported" msgstr "Une profondeur négative dans --deepen n'est pas supportée" -#: builtin/fetch.c:1827 +#: builtin/fetch.c:1937 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen et --depth sont mutuellement exclusifs" -#: builtin/fetch.c:1832 +#: builtin/fetch.c:1942 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1834 +#: builtin/fetch.c:1944 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow sur un dépôt complet n'a pas de sens" -#: builtin/fetch.c:1851 +#: builtin/fetch.c:1961 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1853 +#: builtin/fetch.c:1963 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all n'a pas de sens avec des spécifications de référence" -#: builtin/fetch.c:1862 +#: builtin/fetch.c:1972 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1869 +#: builtin/fetch.c:1979 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "La récupération d'un groupe et les spécifications de référence n'ont pas de " "sens" -#: builtin/fetch.c:1887 +#: builtin/fetch.c:1997 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14988,7 +15248,11 @@ msgstr "" "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans " "extensions.partialClone" -#: builtin/fetch.c:1891 +#: builtin/fetch.c:2001 +msgid "--atomic can only be used when fetching from one remote" +msgstr "--atomic ne peut être utilisée qu'en récupérant depuis un seul distant" + +#: builtin/fetch.c:2005 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin ne peut être utilisée qu'en récupérant depuis un seul distant" @@ -15054,7 +15318,7 @@ msgstr "échapper les champs réservés pour compatibilité avec Tcl" msgid "show only <n> matched refs" msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:39 builtin/tag.c:440 +#: builtin/for-each-ref.c:39 builtin/tag.c:472 msgid "respect format colors" msgstr "respecter les couleurs de formatage" @@ -15094,32 +15358,32 @@ msgstr "clé de config qui stocke la liste des chemins de dépôts" msgid "missing --config=<config>" msgstr "--config=<config> manquant" -#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 +#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131 msgid "unknown" msgstr "inconnu" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:101 builtin/fsck.c:121 +#: builtin/fsck.c:83 builtin/fsck.c:103 #, c-format msgid "error in %s %s: %s" msgstr "erreur dans l'objet %s %s : %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:115 +#: builtin/fsck.c:97 #, c-format msgid "warning in %s %s: %s" msgstr "avertissement dans l'objet %s %s : %s" -#: builtin/fsck.c:144 builtin/fsck.c:147 +#: builtin/fsck.c:126 builtin/fsck.c:129 #, c-format msgid "broken link from %7s %s" msgstr "lien cassé dans l'objet %7s %s" -#: builtin/fsck.c:156 +#: builtin/fsck.c:138 msgid "wrong object type in link" msgstr "type d'objet inconnu dans le lien" -#: builtin/fsck.c:172 +#: builtin/fsck.c:154 #, c-format msgid "" "broken link from %7s %s\n" @@ -15128,212 +15392,212 @@ msgstr "" "lien cassé depuis %7s %s\n" " vers %7s %s" -#: builtin/fsck.c:283 +#: builtin/fsck.c:265 #, c-format msgid "missing %s %s" msgstr "objet %s manquant %s" -#: builtin/fsck.c:310 +#: builtin/fsck.c:292 #, c-format msgid "unreachable %s %s" msgstr "objet %s inatteignable %s" -#: builtin/fsck.c:330 +#: builtin/fsck.c:312 #, c-format msgid "dangling %s %s" msgstr "objet %s fantôme %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:322 msgid "could not create lost-found" msgstr "impossible de créer le fichier lost-found" -#: builtin/fsck.c:351 +#: builtin/fsck.c:333 #, c-format msgid "could not finish '%s'" msgstr "impossible de finir '%s'" -#: builtin/fsck.c:368 +#: builtin/fsck.c:350 #, c-format msgid "Checking %s" msgstr "Vérification de l'objet %s" -#: builtin/fsck.c:406 +#: builtin/fsck.c:388 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Vérification de la connectivité (%d objets)" -#: builtin/fsck.c:425 +#: builtin/fsck.c:407 #, c-format msgid "Checking %s %s" msgstr "Vérification de l'objet %s %s" -#: builtin/fsck.c:430 +#: builtin/fsck.c:412 msgid "broken links" msgstr "liens cassés" -#: builtin/fsck.c:439 +#: builtin/fsck.c:421 #, c-format msgid "root %s" msgstr "racine %s" -#: builtin/fsck.c:447 +#: builtin/fsck.c:429 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "étiquetage de l'objet %s %s (%s) dans %s" -#: builtin/fsck.c:476 +#: builtin/fsck.c:458 #, c-format msgid "%s: object corrupt or missing" msgstr "%s : objet corrompu ou manquant" -#: builtin/fsck.c:501 +#: builtin/fsck.c:483 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s : entrée %s de journal de références invalide" -#: builtin/fsck.c:515 +#: builtin/fsck.c:497 #, c-format msgid "Checking reflog %s->%s" msgstr "Vérification du journal de réferences %s-> %s" -#: builtin/fsck.c:549 +#: builtin/fsck.c:531 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s : pointeur de sha1 invalide %s" -#: builtin/fsck.c:556 +#: builtin/fsck.c:538 #, c-format msgid "%s: not a commit" msgstr "l'objet %s n'est pas un commit" -#: builtin/fsck.c:610 +#: builtin/fsck.c:592 msgid "notice: No default references" msgstr "Note : pas de référence par défaut" -#: builtin/fsck.c:625 +#: builtin/fsck.c:607 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s : objet corrompu ou manquant : %s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:620 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s : impossible d'analyser : %s" -#: builtin/fsck.c:658 +#: builtin/fsck.c:640 #, c-format msgid "bad sha1 file: %s" msgstr "mauvais fichier de sha1 : %s" -#: builtin/fsck.c:673 +#: builtin/fsck.c:655 msgid "Checking object directory" msgstr "Vérification du répertoire d'objet" -#: builtin/fsck.c:676 +#: builtin/fsck.c:658 msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" -#: builtin/fsck.c:691 +#: builtin/fsck.c:673 #, c-format msgid "Checking %s link" msgstr "Vérification du lien %s" -#: builtin/fsck.c:696 builtin/index-pack.c:865 +#: builtin/fsck.c:678 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "%s invalide" -#: builtin/fsck.c:703 +#: builtin/fsck.c:685 #, c-format msgid "%s points to something strange (%s)" msgstr "%s pointe sur quelque chose bizarre (%s)" -#: builtin/fsck.c:709 +#: builtin/fsck.c:691 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s : la HEAD détachée ne pointe sur rien" -#: builtin/fsck.c:713 +#: builtin/fsck.c:695 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "note : %s pointe sur une branche non-née (%s)" -#: builtin/fsck.c:725 +#: builtin/fsck.c:707 msgid "Checking cache tree" msgstr "Vérification de l'arbre cache" -#: builtin/fsck.c:730 +#: builtin/fsck.c:712 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s : pointer sha1 invalide dans l'arbre de cache" -#: builtin/fsck.c:739 +#: builtin/fsck.c:721 msgid "non-tree in cache-tree" msgstr "non-arbre dans l'arbre de cache" -#: builtin/fsck.c:770 +#: builtin/fsck.c:752 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<options>] [<objet>...]" -#: builtin/fsck.c:776 +#: builtin/fsck.c:758 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:777 +#: builtin/fsck.c:759 msgid "show dangling objects" msgstr "afficher les objets en suspens" -#: builtin/fsck.c:778 +#: builtin/fsck.c:760 msgid "report tags" msgstr "afficher les étiquettes" -#: builtin/fsck.c:779 +#: builtin/fsck.c:761 msgid "report root nodes" msgstr "signaler les nœuds racines" -#: builtin/fsck.c:780 +#: builtin/fsck.c:762 msgid "make index objects head nodes" msgstr "considérer les objets de l'index comme nœuds tête" # translated from man page -#: builtin/fsck.c:781 +#: builtin/fsck.c:763 msgid "make reflogs head nodes (default)" msgstr "considérer les reflogs comme nœuds tête (par défaut)" -#: builtin/fsck.c:782 +#: builtin/fsck.c:764 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:783 +#: builtin/fsck.c:765 msgid "check only connectivity" msgstr "ne vérifier que la connectivité" -#: builtin/fsck.c:784 +#: builtin/fsck.c:766 builtin/mktag.c:78 msgid "enable more strict checking" msgstr "activer une vérification plus strict" -#: builtin/fsck.c:786 +#: builtin/fsck.c:768 msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:787 builtin/prune.c:134 +#: builtin/fsck.c:769 builtin/prune.c:134 msgid "show progress" msgstr "afficher la progression" -#: builtin/fsck.c:788 +#: builtin/fsck.c:770 msgid "show verbose names for reachable objects" msgstr "afficher les noms étendus pour les objets inaccessibles" -#: builtin/fsck.c:847 builtin/index-pack.c:261 +#: builtin/fsck.c:829 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Vérification des objets" -#: builtin/fsck.c:875 +#: builtin/fsck.c:857 #, c-format msgid "%s: object missing" msgstr "%s : objet manquant" -#: builtin/fsck.c:886 +#: builtin/fsck.c:868 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé" @@ -15342,27 +15606,27 @@ msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé" msgid "git gc [<options>]" msgstr "git gc [<options>]" -#: builtin/gc.c:94 +#: builtin/gc.c:93 #, c-format msgid "Failed to fstat %s: %s" msgstr "Échec du stat de %s : %s" -#: builtin/gc.c:130 +#: builtin/gc.c:129 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "échec de l'analyse de '%s' valeur '%s'" -#: builtin/gc.c:479 builtin/init-db.c:58 +#: builtin/gc.c:487 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "impossible de faire un stat de '%s'" -#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530 +#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: builtin/gc.c:495 +#: builtin/gc.c:503 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -15378,56 +15642,56 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:543 +#: builtin/gc.c:551 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:545 +#: builtin/gc.c:553 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:546 +#: builtin/gc.c:554 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:549 +#: builtin/gc.c:557 msgid "force running gc even if there may be another gc running" msgstr "" "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes " "tourne déjà" -#: builtin/gc.c:552 +#: builtin/gc.c:560 msgid "repack all other packs except the largest pack" msgstr "recompacter tous les autres paquets excepté le plus gros paquet" -#: builtin/gc.c:569 +#: builtin/gc.c:576 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "impossible d'analyser gc.logexpiry %s" -#: builtin/gc.c:580 +#: builtin/gc.c:587 #, c-format msgid "failed to parse prune expiry value %s" msgstr "impossible d'analyser la valeur d'expiration d'élagage %s" -#: builtin/gc.c:600 +#: builtin/gc.c:607 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Compression automatique du dépôt en tâche de fond pour optimiser les " "performances.\n" -#: builtin/gc.c:602 +#: builtin/gc.c:609 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Compression du dépôt pour optimiser les performances.\n" -#: builtin/gc.c:603 +#: builtin/gc.c:610 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n" -#: builtin/gc.c:643 +#: builtin/gc.c:650 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -15435,149 +15699,176 @@ msgstr "" "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> " "(utilisez --force si ce n'est pas le cas)" -#: builtin/gc.c:698 +#: builtin/gc.c:705 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les " "supprimer." -#: builtin/gc.c:708 +#: builtin/gc.c:715 msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=<tâche>] [--schedule]" -#: builtin/gc.c:738 +#: builtin/gc.c:745 msgid "--no-schedule is not allowed" msgstr "--schedule n'est pas accepté" -#: builtin/gc.c:743 +#: builtin/gc.c:750 #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "argument de --schedule non reconnu, '%s'" -#: builtin/gc.c:862 +#: builtin/gc.c:869 msgid "failed to write commit-graph" msgstr "échec de l'écriture du graphe de commits" -#: builtin/gc.c:901 +#: builtin/gc.c:914 msgid "failed to fill remotes" msgstr "échec du remplissage des distants" -#: builtin/gc.c:1024 +#: builtin/gc.c:1037 msgid "failed to start 'git pack-objects' process" msgstr "Impossible de démarrer le processus 'git pack-objects'" -#: builtin/gc.c:1041 +#: builtin/gc.c:1054 msgid "failed to finish 'git pack-objects' process" msgstr "Impossible de finir le processus 'git pack-objects'" -#: builtin/gc.c:1093 +#: builtin/gc.c:1106 msgid "failed to write multi-pack-index" msgstr "échec de l'écriture de l'index de multi-paquet" -#: builtin/gc.c:1111 +#: builtin/gc.c:1124 msgid "'git multi-pack-index expire' failed" msgstr "échec de 'git multi-pack-index expire'" -#: builtin/gc.c:1172 +#: builtin/gc.c:1185 msgid "'git multi-pack-index repack' failed" msgstr "échec de 'git multi-pack-index repack'" -#: builtin/gc.c:1181 +#: builtin/gc.c:1194 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" "tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé" -#: builtin/gc.c:1279 +#: builtin/gc.c:1298 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "le fichier verrou '%s' existe, pas de maintenance" -#: builtin/gc.c:1309 +#: builtin/gc.c:1328 #, c-format msgid "task '%s' failed" msgstr "échec de la tâche '%s'" -#: builtin/gc.c:1389 +#: builtin/gc.c:1410 #, c-format msgid "'%s' is not a valid task" msgstr "'%s' n'est pas une tâche valide" -#: builtin/gc.c:1394 +#: builtin/gc.c:1415 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "la tâche '%s' ne peut pas être sélectionnée plusieurs fois" -#: builtin/gc.c:1409 +#: builtin/gc.c:1430 msgid "run tasks based on the state of the repository" msgstr "lancer les tâches selon l'état du dépôt" -#: builtin/gc.c:1410 +#: builtin/gc.c:1431 msgid "frequency" msgstr "fréquence" -#: builtin/gc.c:1411 +#: builtin/gc.c:1432 msgid "run tasks based on frequency" msgstr "lancer les tâches selon une fréquence" -#: builtin/gc.c:1414 +#: builtin/gc.c:1435 msgid "do not report progress or other information over stderr" msgstr "ne pas afficher le progrès ou d'autres informations sur stderr" -#: builtin/gc.c:1415 +#: builtin/gc.c:1436 msgid "task" msgstr "tâche" -#: builtin/gc.c:1416 +#: builtin/gc.c:1437 msgid "run a specific task" msgstr "lancer une tâche spécifique" -#: builtin/gc.c:1433 +#: builtin/gc.c:1454 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "--auto et --schedule=<fréquence> sont mutuellement exclusifs" -#: builtin/gc.c:1467 +#: builtin/gc.c:1497 msgid "failed to run 'git config'" msgstr "échec du lancement de 'git config'" -#: builtin/gc.c:1512 -msgid "another process is scheduling background maintenance" -msgstr "" -"un autre processus est en train de programmer une maintenance en tâche de " -"fond" +#: builtin/gc.c:1562 +#, c-format +msgid "failed to expand path '%s'" +msgstr "impossible d'étendre le chemin '%s'" + +#: builtin/gc.c:1591 +msgid "failed to start launchctl" +msgstr "échec de démarrage de launchctl" + +#: builtin/gc.c:1628 +#, c-format +msgid "failed to create directories for '%s'" +msgstr "échec de la création des répertoires pour '%s'" + +#: builtin/gc.c:1689 +#, c-format +msgid "failed to bootstrap service %s" +msgstr "échec de l'amorçage du service %s" -#: builtin/gc.c:1525 +#: builtin/gc.c:1760 +msgid "failed to create temp xml file" +msgstr "échec de création du fichier temporaire xml" + +#: builtin/gc.c:1850 +msgid "failed to start schtasks" +msgstr "échec du démarrage de schtasks" + +#: builtin/gc.c:1894 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" "echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir " "'cron'" -#: builtin/gc.c:1544 +#: builtin/gc.c:1911 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" "echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir " "'cron'" -#: builtin/gc.c:1550 +#: builtin/gc.c:1915 msgid "failed to open stdin of 'crontab'" msgstr "échec à l'ouverture de stdin de 'crontab'" -#: builtin/gc.c:1592 +#: builtin/gc.c:1956 msgid "'crontab' died" msgstr "'crontab' est mort" -#: builtin/gc.c:1605 +#: builtin/gc.c:1990 +msgid "another process is scheduling background maintenance" +msgstr "" +"un autre processus est en train de programmer une maintenance en tâche de " +"fond" + +#: builtin/gc.c:2009 msgid "failed to add repo to global config" msgstr "échec de l'ajout du dépôt à la config globale" -#: builtin/gc.c:1615 +#: builtin/gc.c:2019 msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <subcommand> [<options>]" -#: builtin/gc.c:1634 +#: builtin/gc.c:2038 #, c-format msgid "invalid subcommand: %s" msgstr "sous-commande invalide : %s" @@ -15586,12 +15877,12 @@ msgstr "sous-commande invalide : %s" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]" -#: builtin/grep.c:225 +#: builtin/grep.c:223 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep : échec de création du fil: %s" -#: builtin/grep.c:279 +#: builtin/grep.c:277 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "nombre de fils spécifié invalide (%d) pour %s" @@ -15600,266 +15891,266 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 -#: builtin/pack-objects.c:2936 +#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1792 +#: builtin/pack-objects.c:2944 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 +#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" -#: builtin/grep.c:655 +#: builtin/grep.c:656 #, c-format msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" -#: builtin/grep.c:736 +#: builtin/grep.c:737 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend une valeur numérique" -#: builtin/grep.c:835 +#: builtin/grep.c:836 msgid "search in index instead of in the work tree" msgstr "rechercher dans l'index plutôt que dans la copie de travail" -#: builtin/grep.c:837 +#: builtin/grep.c:838 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:839 +#: builtin/grep.c:840 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:841 +#: builtin/grep.c:842 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" -#: builtin/grep.c:843 +#: builtin/grep.c:844 msgid "recursively search in each submodule" msgstr "rechercher récursivement dans chaque sous-module" -#: builtin/grep.c:846 +#: builtin/grep.c:847 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:848 +#: builtin/grep.c:849 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" -#: builtin/grep.c:850 +#: builtin/grep.c:851 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:852 +#: builtin/grep.c:853 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:854 +#: builtin/grep.c:855 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:857 +#: builtin/grep.c:858 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:859 +#: builtin/grep.c:860 msgid "search in subdirectories (default)" msgstr "rechercher dans les sous-répertoires (défaut)" -#: builtin/grep.c:861 +#: builtin/grep.c:862 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:865 +#: builtin/grep.c:866 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:868 +#: builtin/grep.c:869 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:871 +#: builtin/grep.c:872 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:874 +#: builtin/grep.c:875 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:877 +#: builtin/grep.c:878 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:878 +#: builtin/grep.c:879 msgid "show column number of first match" msgstr "afficher le numéro de colonne de la première correspondance" -#: builtin/grep.c:879 +#: builtin/grep.c:880 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:880 +#: builtin/grep.c:881 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:882 +#: builtin/grep.c:883 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:884 +#: builtin/grep.c:885 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:886 +#: builtin/grep.c:887 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:889 +#: builtin/grep.c:890 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:891 +#: builtin/grep.c:892 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:894 +#: builtin/grep.c:895 msgid "show only matching parts of a line" msgstr "n'afficher que les parties correspondantes d'une ligne" -#: builtin/grep.c:896 +#: builtin/grep.c:897 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:897 +#: builtin/grep.c:898 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:899 +#: builtin/grep.c:900 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:901 +#: builtin/grep.c:902 msgid "show filename only once above matches from same file" msgstr "" "afficher le nom de fichier une fois au dessus des correspondances du même " "fichier" -#: builtin/grep.c:904 +#: builtin/grep.c:905 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:907 +#: builtin/grep.c:908 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:909 +#: builtin/grep.c:910 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:911 +#: builtin/grep.c:912 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:912 +#: builtin/grep.c:913 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:915 +#: builtin/grep.c:916 msgid "show a line with the function name before matches" msgstr "" "afficher une ligne avec le nom de la fonction avant les correspondances" -#: builtin/grep.c:917 +#: builtin/grep.c:918 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:920 +#: builtin/grep.c:921 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:922 +#: builtin/grep.c:923 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:924 +#: builtin/grep.c:925 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:936 +#: builtin/grep.c:937 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:938 +#: builtin/grep.c:939 msgid "show only matches from files that match all patterns" msgstr "" "n'afficher que les correspondances de fichiers qui correspondent à tous les " "motifs" -#: builtin/grep.c:940 -msgid "show parse tree for grep expression" -msgstr "afficher l'arbre d'analyse pour le motif grep" - -#: builtin/grep.c:944 +#: builtin/grep.c:942 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:944 +#: builtin/grep.c:942 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:948 +#: builtin/grep.c:946 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:1014 +#: builtin/grep.c:1012 msgid "no pattern given" msgstr "aucun motif fourni" -#: builtin/grep.c:1050 +#: builtin/grep.c:1048 msgid "--no-index or --untracked cannot be used with revs" msgstr "" "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions" -#: builtin/grep.c:1058 +#: builtin/grep.c:1056 #, c-format msgid "unable to resolve revision: %s" msgstr "impossible de résoudre la révision : %s" -#: builtin/grep.c:1088 +#: builtin/grep.c:1086 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked non supportée avec --recurse-submodules" -#: builtin/grep.c:1092 +#: builtin/grep.c:1090 msgid "invalid option combination, ignoring --threads" msgstr "option de combinaison invalide, ignore --threads" -#: builtin/grep.c:1095 builtin/pack-objects.c:3655 +#: builtin/grep.c:1093 builtin/pack-objects.c:3672 msgid "no threads support, ignoring --threads" msgstr "pas de support des fils, ignore --threads" -#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 +#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/grep.c:1132 +#: builtin/grep.c:1130 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail" -#: builtin/grep.c:1158 +#: builtin/grep.c:1156 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index" -#: builtin/grep.c:1164 +#: builtin/grep.c:1159 +msgid "--untracked cannot be used with --cached" +msgstr "--untracked ne peut pas être utilisé avec --cached" + +#: builtin/grep.c:1165 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi" -#: builtin/grep.c:1172 +#: builtin/grep.c:1173 msgid "both --cached and trees are given" msgstr "--cached et des arbres sont fournis en même temps" @@ -15992,12 +16283,12 @@ msgstr "aucun visualiseur de manuel n'a pris en charge la demande" msgid "no info viewer handled the request" msgstr "aucun visualiseur de 'info' n'a pris en charge la demande" -#: builtin/help.c:520 builtin/help.c:531 git.c:337 +#: builtin/help.c:520 builtin/help.c:531 git.c:340 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' est un alias de '%s'" -#: builtin/help.c:534 git.c:369 +#: builtin/help.c:534 git.c:372 #, c-format msgid "bad alias.%s string: %s" msgstr "Mauvais chaîne alias.%s : %s" @@ -16045,7 +16336,7 @@ msgstr "erreur de lecture sur l'entrée" msgid "used more bytes than were available" msgstr "plus d'octets utilisés que disponibles" -#: builtin/index-pack.c:324 builtin/pack-objects.c:619 +#: builtin/index-pack.c:324 builtin/pack-objects.c:624 msgid "pack too large for current definition of off_t" msgstr "le paquet est trop grand pour la définition actuelle de off_t" @@ -16053,7 +16344,7 @@ msgstr "le paquet est trop grand pour la définition actuelle de off_t" msgid "pack exceeds maximum allowed size" msgstr "le paquet dépasse la taille maximale permise" -#: builtin/index-pack.c:342 builtin/repack.c:286 +#: builtin/index-pack.c:342 #, c-format msgid "unable to create '%s'" msgstr "impossible de créer '%s'" @@ -16178,7 +16469,7 @@ msgstr "confusion extrême dans parse_pack_objects()" msgid "Resolving deltas" msgstr "Résolution des deltas" -#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" @@ -16217,10 +16508,10 @@ msgstr "impossible de compresser l'objet ajouté (%d)" msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1444 +#: builtin/index-pack.c:1445 #, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'" +msgid "packfile name '%s' does not end with '.%s'" +msgstr "le nom de fichier paquet '%s' ne se termine pas par '.%s'" #: builtin/index-pack.c:1469 #, c-format @@ -16232,79 +16523,83 @@ msgstr "impossible d'écrire le fichier %s '%s'" msgid "cannot close written %s file '%s'" msgstr "impossible de fermer le fichier %s écrit '%s'" -#: builtin/index-pack.c:1501 +#: builtin/index-pack.c:1503 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1515 +#: builtin/index-pack.c:1517 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1523 +#: builtin/index-pack.c:1525 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 +#: builtin/index-pack.c:1534 +msgid "cannot store reverse index file" +msgstr "impossible de stocker le fichier d'index inversé" + +#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1631 +#: builtin/index-pack.c:1650 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1633 +#: builtin/index-pack.c:1652 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'" -#: builtin/index-pack.c:1681 +#: builtin/index-pack.c:1700 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "pas un delta : %d objet" msgstr[1] "pas un delta : %d objets" -#: builtin/index-pack.c:1688 +#: builtin/index-pack.c:1707 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longueur chaînée = %d : %lu objet" msgstr[1] "longueur chaînée = %d : %lu objets" -#: builtin/index-pack.c:1728 +#: builtin/index-pack.c:1749 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 -#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 +#: builtin/index-pack.c:1803 builtin/index-pack.c:1806 +#: builtin/index-pack.c:1822 builtin/index-pack.c:1826 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625 +#: builtin/index-pack.c:1832 builtin/init-db.c:392 builtin/init-db.c:625 #, c-format msgid "unknown hash algorithm '%s'" msgstr "algorithme d'empreinte inconnu '%s'" -#: builtin/index-pack.c:1821 +#: builtin/index-pack.c:1851 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1823 +#: builtin/index-pack.c:1853 msgid "--stdin requires a git repository" msgstr "--stdin requiert un dépôt git" -#: builtin/index-pack.c:1825 +#: builtin/index-pack.c:1855 msgid "--object-format cannot be used with --stdin" msgstr "--object-format ne peut pas être utilisé avec --stdin" -#: builtin/index-pack.c:1831 +#: builtin/index-pack.c:1870 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" -#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1936 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "erreur de fsck dans les objets paquets" @@ -16521,131 +16816,131 @@ msgstr "--trailer n'a aucune signification avec --only-input" msgid "no input file given for in-place editing" msgstr "aucun fichier en entrée pour l'éditon sur place" -#: builtin/log.c:58 +#: builtin/log.c:59 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]" -#: builtin/log.c:59 +#: builtin/log.c:60 msgid "git show [<options>] <object>..." msgstr "git show [<options>] <objet>..." -#: builtin/log.c:112 +#: builtin/log.c:113 #, c-format msgid "invalid --decorate option: %s" msgstr "option --decorate invalide : %s" -#: builtin/log.c:179 +#: builtin/log.c:180 msgid "show source" msgstr "afficher la source" -#: builtin/log.c:180 -msgid "Use mail map file" -msgstr "Utiliser le fichier de correspondance de mail" +#: builtin/log.c:181 +msgid "use mail map file" +msgstr "utiliser le fichier de correspondance de mail" -#: builtin/log.c:183 +#: builtin/log.c:184 msgid "only decorate refs that match <pattern>" msgstr "décorer seulement les références correspondant à <motif>" -#: builtin/log.c:185 +#: builtin/log.c:186 msgid "do not decorate refs that match <pattern>" msgstr "ne pas décorer les références correspondant à <motif>" -#: builtin/log.c:186 +#: builtin/log.c:187 msgid "decorate options" msgstr "décorer les options" -#: builtin/log.c:189 +#: builtin/log.c:190 msgid "" -"Trace the evolution of line range <start>,<end> or function :<funcname> in " +"trace the evolution of line range <start>,<end> or function :<funcname> in " "<file>" msgstr "" "tracer l'évolution d'une plage <début>,<fin> ou d'une fonction <nom-de-" "fonction> dans <fichier>" -#: builtin/log.c:212 +#: builtin/log.c:213 msgid "-L<range>:<file> cannot be used with pathspec" msgstr "" "-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin" -#: builtin/log.c:302 +#: builtin/log.c:303 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:564 +#: builtin/log.c:566 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:579 builtin/log.c:674 +#: builtin/log.c:581 builtin/log.c:671 #, c-format msgid "could not read object %s" msgstr "impossible de lire l'objet %s" -#: builtin/log.c:699 +#: builtin/log.c:696 #, c-format msgid "unknown type: %d" msgstr "type inconnu : %d" -#: builtin/log.c:848 +#: builtin/log.c:841 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s : couverture invalide pour le mode de description" -#: builtin/log.c:855 +#: builtin/log.c:848 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:984 +#: builtin/log.c:977 #, c-format msgid "cannot open patch file %s" msgstr "impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:1001 +#: builtin/log.c:994 msgid "need exactly one range" msgstr "exactement une plage nécessaire" -#: builtin/log.c:1011 +#: builtin/log.c:1004 msgid "not a range" msgstr "ceci n'est pas une plage" -#: builtin/log.c:1175 +#: builtin/log.c:1168 msgid "cover letter needs email format" msgstr "la lettre de motivation doit être au format courriel" -#: builtin/log.c:1181 +#: builtin/log.c:1174 msgid "failed to create cover-letter file" msgstr "échec de création du fichier de lettre de motivation" -#: builtin/log.c:1262 +#: builtin/log.c:1261 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1289 +#: builtin/log.c:1288 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1347 +#: builtin/log.c:1346 msgid "two output directories?" msgstr "deux répertoires de sortie ?" -#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332 +#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331 #, c-format msgid "unknown commit %s" msgstr "commit inconnu %s" -#: builtin/log.c:1509 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "échec à résoudre '%s' comme une référence valide" -#: builtin/log.c:1518 +#: builtin/log.c:1517 msgid "could not find exact merge base" msgstr "impossible de trouver la base de fusion exacte" -#: builtin/log.c:1528 +#: builtin/log.c:1527 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -16658,297 +16953,297 @@ msgstr "" "Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> " "manuellement" -#: builtin/log.c:1551 +#: builtin/log.c:1550 msgid "failed to find exact merge base" msgstr "échec à trouver la base de fusion exacte" -#: builtin/log.c:1568 +#: builtin/log.c:1567 msgid "base commit should be the ancestor of revision list" msgstr "le commit de base devrait être l'ancêtre de la liste de révisions" -#: builtin/log.c:1578 +#: builtin/log.c:1577 msgid "base commit shouldn't be in revision list" msgstr "le commit de base ne devrait pas faire partie de la liste de révisions" -#: builtin/log.c:1636 +#: builtin/log.c:1635 msgid "cannot get patch id" msgstr "impossible d'obtenir l'id du patch" -#: builtin/log.c:1693 +#: builtin/log.c:1692 msgid "failed to infer range-diff origin of current series" msgstr "" "échec d'inférence de l'origine de différence d'intervalles de la série " "actuelle" -#: builtin/log.c:1695 +#: builtin/log.c:1694 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "" "utilisation de '%s' comme une différence d'intervalle pour la série actuelle" -#: builtin/log.c:1739 +#: builtin/log.c:1738 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1742 +#: builtin/log.c:1741 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1746 +#: builtin/log.c:1745 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1748 +#: builtin/log.c:1747 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1750 +#: builtin/log.c:1749 msgid "use simple number sequence for output file names" msgstr "" "utiliser une séquence simple de nombres pour les nom des fichiers de sortie" -#: builtin/log.c:1751 +#: builtin/log.c:1750 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1752 +#: builtin/log.c:1751 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1754 +#: builtin/log.c:1753 msgid "start numbering patches at <n> instead of 1" msgstr "démarrer la numérotation des patchs à <n> au lieu de 1" -#: builtin/log.c:1756 +#: builtin/log.c:1755 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1758 +#: builtin/log.c:1757 msgid "max length of output filename" msgstr "taille maximum du nom du fichier de sortie" -#: builtin/log.c:1760 -msgid "Use [RFC PATCH] instead of [PATCH]" +#: builtin/log.c:1759 +msgid "use [RFC PATCH] instead of [PATCH]" msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" -#: builtin/log.c:1763 +#: builtin/log.c:1762 msgid "cover-from-description-mode" msgstr "cover-from-description-mode" -#: builtin/log.c:1764 +#: builtin/log.c:1763 msgid "generate parts of a cover letter based on a branch's description" msgstr "" "générer des parties de la lettre d'introduction à partir de la description " "de la branche" -#: builtin/log.c:1766 -msgid "Use [<prefix>] instead of [PATCH]" +#: builtin/log.c:1765 +msgid "use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1769 +#: builtin/log.c:1768 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1772 +#: builtin/log.c:1771 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1775 +#: builtin/log.c:1774 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1777 +#: builtin/log.c:1776 msgid "output all-zero hash in From header" msgstr "écrire une empreinte à zéro dans l'entête From" -#: builtin/log.c:1779 +#: builtin/log.c:1778 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1781 +#: builtin/log.c:1780 msgid "show patch format instead of default (patch + stat)" msgstr "afficher le format du patch au lieu du défaut (patch + stat)" -#: builtin/log.c:1783 +#: builtin/log.c:1782 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1784 +#: builtin/log.c:1783 msgid "header" msgstr "en-tête" -#: builtin/log.c:1785 +#: builtin/log.c:1784 msgid "add email header" msgstr "ajouter l'en-tête de courriel" -#: builtin/log.c:1786 builtin/log.c:1787 +#: builtin/log.c:1785 builtin/log.c:1786 msgid "email" msgstr "courriel" -#: builtin/log.c:1786 +#: builtin/log.c:1785 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1787 +#: builtin/log.c:1786 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1788 +#: builtin/log.c:1787 msgid "ident" msgstr "ident" -#: builtin/log.c:1789 +#: builtin/log.c:1788 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" -#: builtin/log.c:1791 +#: builtin/log.c:1790 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1792 +#: builtin/log.c:1791 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1793 builtin/log.c:1796 +#: builtin/log.c:1792 builtin/log.c:1795 msgid "boundary" msgstr "limite" -#: builtin/log.c:1794 +#: builtin/log.c:1793 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1797 +#: builtin/log.c:1796 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1801 +#: builtin/log.c:1800 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1803 +#: builtin/log.c:1802 msgid "signature" msgstr "signature" -#: builtin/log.c:1804 +#: builtin/log.c:1803 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1805 +#: builtin/log.c:1804 msgid "base-commit" msgstr "commit-de-base" -#: builtin/log.c:1806 +#: builtin/log.c:1805 msgid "add prerequisite tree info to the patch series" msgstr "Ajouter un arbre prérequis à la série de patchs" -#: builtin/log.c:1809 +#: builtin/log.c:1808 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1810 +#: builtin/log.c:1809 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1812 +#: builtin/log.c:1811 msgid "show progress while generating patches" msgstr "" "afficher la barre de progression durant la phase de génération des patchs" -#: builtin/log.c:1814 +#: builtin/log.c:1813 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "afficher les modifications par rapport à <rév> dans la première page ou une " "rustine" -#: builtin/log.c:1817 +#: builtin/log.c:1816 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "afficher les modifications par rapport à <refspec> dans la première page ou " "une rustine" -#: builtin/log.c:1819 +#: builtin/log.c:1818 msgid "percentage by which creation is weighted" msgstr "pourcentage par lequel la création est pondérée" -#: builtin/log.c:1905 +#: builtin/log.c:1904 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/log.c:1920 +#: builtin/log.c:1919 msgid "-n and -k are mutually exclusive" msgstr "-n et -k sont mutuellement exclusifs" -#: builtin/log.c:1922 +#: builtin/log.c:1921 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs" -#: builtin/log.c:1930 +#: builtin/log.c:1929 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1932 +#: builtin/log.c:1931 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1934 +#: builtin/log.c:1933 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1956 +#: builtin/log.c:1955 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "--stdout, --output, et --output-directory sont mutuellement exclusifs" -#: builtin/log.c:2079 +#: builtin/log.c:2078 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:2083 +#: builtin/log.c:2082 msgid "Interdiff:" msgstr "Interdiff :" -#: builtin/log.c:2084 +#: builtin/log.c:2083 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contre v%d :" -#: builtin/log.c:2090 +#: builtin/log.c:2089 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiert --range-diff" -#: builtin/log.c:2094 +#: builtin/log.c:2093 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:2102 +#: builtin/log.c:2101 msgid "Range-diff:" msgstr "Diff-intervalle :" -#: builtin/log.c:2103 +#: builtin/log.c:2102 #, c-format msgid "Range-diff against v%d:" msgstr "Diff-intervalle contre v%d :" -#: builtin/log.c:2114 +#: builtin/log.c:2113 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:2150 +#: builtin/log.c:2149 msgid "Generating patches" msgstr "Génération des patchs" -#: builtin/log.c:2194 +#: builtin/log.c:2193 msgid "failed to create output files" msgstr "échec de création des fichiers en sortie" -#: builtin/log.c:2253 +#: builtin/log.c:2252 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:2307 +#: builtin/log.c:2306 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16956,113 +17251,117 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spécifier " "<branche_amont> manuellement.\n" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:486 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<options>] [<fichier>...]" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:542 msgid "identify the file status with tags" msgstr "identifier l'état de fichier avec les étiquettes" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:544 msgid "use lowercase letters for 'assume unchanged' files" msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:546 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'" -#: builtin/ls-files.c:533 +#: builtin/ls-files.c:548 msgid "show cached files in the output (default)" msgstr "afficher les fichiers mis en cache dans la sortie (défaut)" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:550 msgid "show deleted files in the output" msgstr "afficher les fichiers supprimés dans la sortie" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:552 msgid "show modified files in the output" msgstr "afficher les fichiers modifiés dans la sortie" -#: builtin/ls-files.c:539 +#: builtin/ls-files.c:554 msgid "show other files in the output" msgstr "afficher les autres fichiers dans la sortie" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:556 msgid "show ignored files in the output" msgstr "afficher les fichiers ignorés dans la sortie" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:559 msgid "show staged contents' object name in the output" msgstr "afficher les nom des objets indexés dans la sortie" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:561 msgid "show files on the filesystem that need to be removed" msgstr "" "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:563 msgid "show 'other' directories' names only" msgstr "afficher seulement les noms des répertoires 'other'" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:565 msgid "show line endings of files" msgstr "afficher les fins de lignes des fichiers" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:567 msgid "don't show empty directories" msgstr "ne pas afficher les répertoires vides" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:570 msgid "show unmerged files in the output" msgstr "afficher les fichiers non fusionnés dans la sortie" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:572 msgid "show resolve-undo information" msgstr "afficher l'information resolv-undo" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:574 msgid "skip files matching pattern" msgstr "sauter les fichiers correspondant au motif" -#: builtin/ls-files.c:562 +#: builtin/ls-files.c:577 msgid "exclude patterns are read from <file>" msgstr "les motifs d'exclusion sont lus depuis <fichier>" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:580 msgid "read additional per-directory exclude patterns in <file>" msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:582 msgid "add the standard git exclusions" msgstr "ajouter les exclusions git standard" -#: builtin/ls-files.c:571 +#: builtin/ls-files.c:586 msgid "make the output relative to the project top directory" msgstr "afficher en relatif par rapport au répertoire racine du projet" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:589 msgid "recurse through submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:591 msgid "if any <file> is not in the index, treat this as an error" msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:592 msgid "tree-ish" msgstr "arbre ou apparenté" -#: builtin/ls-files.c:578 +#: builtin/ls-files.c:593 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "considérer que les chemins supprimés depuis <arbre ou apparenté> sont " "toujours présents" -#: builtin/ls-files.c:580 +#: builtin/ls-files.c:595 msgid "show debugging data" msgstr "afficher les données de débogage" +#: builtin/ls-files.c:597 +msgid "suppress duplicate entries" +msgstr "supprimer les entrées dupliquées" + #: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -17073,41 +17372,41 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<dépôt> [<références>...]]" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:60 msgid "do not print remote URL" msgstr "ne pas afficher les URL distantes" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404 msgid "exec" msgstr "exécutable" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 +#: builtin/ls-remote.c:62 builtin/ls-remote.c:64 msgid "path of git-upload-pack on the remote host" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/ls-remote.c:65 +#: builtin/ls-remote.c:66 msgid "limit to tags" msgstr "limiter aux étiquettes" -#: builtin/ls-remote.c:66 +#: builtin/ls-remote.c:67 msgid "limit to heads" msgstr "limiter aux heads" -#: builtin/ls-remote.c:67 +#: builtin/ls-remote.c:68 msgid "do not show peeled tags" msgstr "ne pas afficher les étiquettes pelées" -#: builtin/ls-remote.c:69 +#: builtin/ls-remote.c:70 msgid "take url.<base>.insteadOf into account" msgstr "prendre en compte url.<base>.insteadOf" -#: builtin/ls-remote.c:72 +#: builtin/ls-remote.c:73 msgid "exit with exit code 2 if no matching refs are found" msgstr "" "sortir avec un code d'erreur 2 si aucune correspondance de référence n'est " "trouvée" -#: builtin/ls-remote.c:75 +#: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle" @@ -17265,194 +17564,194 @@ msgstr "impossible de résoudre la référence '%s'" msgid "Merging %s with %s\n" msgstr "Fusion de %s avec %s\n" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<options>] [<commit>...]" -#: builtin/merge.c:58 +#: builtin/merge.c:59 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:59 +#: builtin/merge.c:60 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:122 +#: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:145 +#: builtin/merge.c:146 #, c-format msgid "option `%s' requires a value" msgstr "le commutateur '%s' a besoin d'une valeur" -#: builtin/merge.c:198 +#: builtin/merge.c:199 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" -#: builtin/merge.c:199 +#: builtin/merge.c:200 #, c-format msgid "Available strategies are:" msgstr "Les stratégies disponibles sont :" -#: builtin/merge.c:204 +#: builtin/merge.c:205 #, c-format msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:255 builtin/pull.c:133 +#: builtin/merge.c:256 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "ne pas afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:258 builtin/pull.c:136 +#: builtin/merge.c:259 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:259 builtin/pull.c:139 +#: builtin/merge.c:260 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:261 builtin/pull.c:142 +#: builtin/merge.c:262 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "ajouter (au plus <n>) éléments du journal court au message de validation de " "la fusion" -#: builtin/merge.c:264 builtin/pull.c:148 +#: builtin/merge.c:265 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "créer une validation unique au lieu de faire une fusion" -#: builtin/merge.c:266 builtin/pull.c:151 +#: builtin/merge.c:267 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:268 builtin/pull.c:154 +#: builtin/merge.c:269 builtin/pull.c:154 msgid "edit message before committing" msgstr "éditer le message avant la validation" -#: builtin/merge.c:270 +#: builtin/merge.c:271 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:272 builtin/pull.c:161 +#: builtin/merge.c:273 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:276 builtin/pull.c:164 +#: builtin/merge.c:277 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "vérifier que le commit nommé a une signature GPG valide" -#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114 +#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:278 builtin/pull.c:169 +#: builtin/merge.c:279 builtin/pull.c:169 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:279 builtin/pull.c:172 +#: builtin/merge.c:280 builtin/pull.c:172 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:280 builtin/pull.c:173 +#: builtin/merge.c:281 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:282 +#: builtin/merge.c:283 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "message de validation de la fusion (pour une fusion sans avance rapide)" -#: builtin/merge.c:289 +#: builtin/merge.c:290 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:291 +#: builtin/merge.c:292 msgid "--abort but leave index and working tree alone" msgstr "--abort mais laisser l'index et l'arbre de travail inchangés" -#: builtin/merge.c:293 +#: builtin/merge.c:294 msgid "continue the current in-progress merge" msgstr "continuer la fusion en cours" -#: builtin/merge.c:295 builtin/pull.c:180 +#: builtin/merge.c:296 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" -#: builtin/merge.c:302 +#: builtin/merge.c:303 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg" -#: builtin/merge.c:319 +#: builtin/merge.c:320 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:324 +#: builtin/merge.c:325 msgid "stash failed" msgstr "échec du remisage" -#: builtin/merge.c:329 +#: builtin/merge.c:330 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:351 builtin/merge.c:368 +#: builtin/merge.c:352 builtin/merge.c:369 msgid "read-tree failed" msgstr "read-tree a échoué" -#: builtin/merge.c:398 +#: builtin/merge.c:399 msgid " (nothing to squash)" msgstr " (rien à compresser)" -#: builtin/merge.c:409 +#: builtin/merge.c:410 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressée -- HEAD non mise à jour\n" -#: builtin/merge.c:459 +#: builtin/merge.c:460 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n" -#: builtin/merge.c:510 +#: builtin/merge.c:511 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:597 +#: builtin/merge.c:598 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:723 +#: builtin/merge.c:724 msgid "Not handling anything other than two heads merge." msgstr "Impossible de gérer autre chose que la fusion de deux têtes." -#: builtin/merge.c:736 +#: builtin/merge.c:737 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:807 +#: builtin/merge.c:808 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:816 +#: builtin/merge.c:817 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la " "fusion.\n" -#: builtin/merge.c:822 +#: builtin/merge.c:823 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -17464,11 +17763,11 @@ msgstr "" "branche de sujet.\n" "\n" -#: builtin/merge.c:827 +#: builtin/merge.c:828 msgid "An empty message aborts the commit.\n" msgstr "Un message vide abandonne la validation.\n" -#: builtin/merge.c:830 +#: builtin/merge.c:831 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17477,74 +17776,74 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:883 +#: builtin/merge.c:884 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:898 +#: builtin/merge.c:899 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:959 +#: builtin/merge.c:960 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "La fusion automatique a échoué ; réglez les conflits et validez le " "résultat.\n" -#: builtin/merge.c:998 +#: builtin/merge.c:999 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:1000 +#: builtin/merge.c:1001 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:1002 +#: builtin/merge.c:1003 msgid "No default upstream defined for the current branch." msgstr "Pas de branche amont par défaut définie pour la branche courante." -#: builtin/merge.c:1007 +#: builtin/merge.c:1008 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1064 +#: builtin/merge.c:1065 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1167 +#: builtin/merge.c:1168 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" -#: builtin/merge.c:1201 +#: builtin/merge.c:1202 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" -#: builtin/merge.c:1311 +#: builtin/merge.c:1312 msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" -#: builtin/merge.c:1315 +#: builtin/merge.c:1316 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)." -#: builtin/merge.c:1333 +#: builtin/merge.c:1334 msgid "--quit expects no arguments" msgstr "--quit n'accepte pas d'argument" -#: builtin/merge.c:1346 +#: builtin/merge.c:1347 msgid "--continue expects no arguments" msgstr "--continue ne supporte aucun argument" -#: builtin/merge.c:1350 +#: builtin/merge.c:1351 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)." -#: builtin/merge.c:1366 +#: builtin/merge.c:1367 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17552,7 +17851,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1373 +#: builtin/merge.c:1374 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17560,103 +17859,144 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1376 +#: builtin/merge.c:1377 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)." -#: builtin/merge.c:1390 +#: builtin/merge.c:1391 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1392 +#: builtin/merge.c:1393 msgid "You cannot combine --squash with --commit." msgstr "Vous ne pouvez pas combiner --squash avec --commit." -#: builtin/merge.c:1408 +#: builtin/merge.c:1409 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini." -#: builtin/merge.c:1425 +#: builtin/merge.c:1426 msgid "Squash commit into empty head not supported yet" msgstr "La validation compressée vers une tête vide n'est pas encore supportée" -#: builtin/merge.c:1427 +#: builtin/merge.c:1428 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide" -#: builtin/merge.c:1432 +#: builtin/merge.c:1433 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1434 +#: builtin/merge.c:1435 msgid "Can merge only exactly one commit into empty head" msgstr "" "Possible de fusionner exactement une seule validation dans une tête vide" -#: builtin/merge.c:1515 +#: builtin/merge.c:1516 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1524 +#: builtin/merge.c:1525 msgid "Already up to date." msgstr "Déjà à jour." -#: builtin/merge.c:1534 +#: builtin/merge.c:1535 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1580 +#: builtin/merge.c:1581 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1587 +#: builtin/merge.c:1588 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1612 +#: builtin/merge.c:1613 msgid "Already up to date. Yeeah!" msgstr "Déjà à jour. Ouais !" -#: builtin/merge.c:1618 +#: builtin/merge.c:1619 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1646 builtin/merge.c:1711 +#: builtin/merge.c:1647 builtin/merge.c:1712 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1650 +#: builtin/merge.c:1651 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1702 +#: builtin/merge.c:1703 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n" -#: builtin/merge.c:1704 +#: builtin/merge.c:1705 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1713 +#: builtin/merge.c:1714 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Utilisation de %s pour préparer la résolution à la main.\n" -#: builtin/merge.c:1727 +#: builtin/merge.c:1728 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "La fusion automatique a réussi ; stoppée avant la validation comme demandé\n" +#: builtin/mktag.c:10 +msgid "git mktag" +msgstr "git mktag" + +#: builtin/mktag.c:30 +#, c-format +msgid "warning: tag input does not pass fsck: %s" +msgstr "attention : l'entrée d'étiquette ne passe pas fsck : %s" + +#: builtin/mktag.c:41 +#, c-format +msgid "error: tag input does not pass fsck: %s" +msgstr "erreur : l'entrée d'étiquette ne passe pas fsck : %s" + +#: builtin/mktag.c:44 +#, c-format +msgid "%d (FSCK_IGNORE?) should never trigger this callback" +msgstr "%d (FSCK_IGNORE?) ne devrait jamais rappeler cette fonction" + +#: builtin/mktag.c:59 +#, c-format +msgid "could not read tagged object '%s'" +msgstr "impossible de lire l'objet étiqueté '%s'" + +#: builtin/mktag.c:62 +#, c-format +msgid "object '%s' tagged as '%s', but is a '%s' type" +msgstr "l'objet '%s' étiqueté comme '%s', mais est de type '%s'" + +#: builtin/mktag.c:99 +msgid "tag on stdin did not pass our strict fsck check" +msgstr "l'étiquette sur stdin n'a pas passé le test strict fsck" + +#: builtin/mktag.c:102 +msgid "tag on stdin did not refer to a valid object" +msgstr "l'étiquette sur stdin ne pointe pas sur un objet valide" + +#: builtin/mktag.c:105 builtin/tag.c:232 +msgid "unable to write tag file" +msgstr "impossible d'écrire le fichier d'étiquettes" + #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -17695,7 +18035,10 @@ msgstr "" "pendant le repaquetage, collecter les fichiers paquet de plus petite taille " "dans un lot plus grand que cette taille" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 +#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431 +#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598 +#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963 +#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575 msgid "too many arguments" msgstr "trop d'arguments" @@ -17801,7 +18144,7 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" @@ -17995,7 +18338,7 @@ msgstr "impossible d'écrire l'objet note" msgid "the note contents have been left in %s" msgstr "le contenu de la note a été laissé dans %s" -#: builtin/notes.c:242 builtin/tag.c:533 +#: builtin/notes.c:242 builtin/tag.c:565 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" @@ -18035,12 +18378,6 @@ msgstr "impossible de copier les notes de '%s' vers '%s'" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "Refus de faire %s sur des notes dans %s (hors de refs/notes/)" -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 -#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 -#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 -msgid "too many parameters" -msgstr "trop de paramètres" - #: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." @@ -18099,8 +18436,8 @@ msgstr "" "charger la configuration de réécriture pour <commande> (implique --stdin)" #: builtin/notes.c:517 -msgid "too few parameters" -msgstr "pas assez de paramètres" +msgid "too few arguments" +msgstr "trop peu d'arguments" #: builtin/notes.c:538 #, c-format @@ -18229,7 +18566,7 @@ msgstr "" "validez le résultat avec 'git notes merges --commit', ou abandonnez la " "fusion avec 'git notes merge --abort'.\n" -#: builtin/notes.c:897 builtin/tag.c:546 +#: builtin/notes.c:897 builtin/tag.c:578 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Impossible de résoudre '%s' comme une référence valide." @@ -18248,7 +18585,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" @@ -18264,7 +18601,7 @@ msgstr "références-notes" msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" -#: builtin/notes.c:1034 builtin/stash.c:1604 +#: builtin/notes.c:1034 builtin/stash.c:1671 #, c-format msgid "unknown subcommand: %s" msgstr "sous-commande inconnue : %s" @@ -18283,106 +18620,118 @@ msgstr "" "git pack-objects [options...] base-name [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:443 +#: builtin/pack-objects.c:440 +#, c-format +msgid "" +"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " +"pack %s" +msgstr "write_reuse_object : impossible de localiser %s, attendu à l'offset %<PRIuMAX> dans le paquet %s" + +#: builtin/pack-objects.c:448 #, c-format msgid "bad packed object CRC for %s" msgstr "mauvais CRC d'objet empaqueté pour %s" -#: builtin/pack-objects.c:454 +#: builtin/pack-objects.c:459 #, c-format msgid "corrupt packed object for %s" msgstr "objet empaqueté corrompu pour %s" -#: builtin/pack-objects.c:585 +#: builtin/pack-objects.c:590 #, c-format msgid "recursive delta detected for object %s" msgstr "delta récursif détecté pour l'objet %s" -#: builtin/pack-objects.c:796 +#: builtin/pack-objects.c:801 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objets commandés, %<PRIu32> attendus" -#: builtin/pack-objects.c:1004 +#: builtin/pack-objects.c:896 +#, c-format +msgid "expected object at offset %<PRIuMAX> in pack %s" +msgstr "objet attendu à l'offset %<PRIuMAX> dans le paquet %s" + +#: builtin/pack-objects.c:1015 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à " "cause de pack.packSizeLimit" -#: builtin/pack-objects.c:1017 +#: builtin/pack-objects.c:1028 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1078 builtin/update-index.c:90 +#: builtin/pack-objects.c:1089 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "échec du stat de %s" -#: builtin/pack-objects.c:1131 +#: builtin/pack-objects.c:1141 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus" -#: builtin/pack-objects.c:1348 +#: builtin/pack-objects.c:1358 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "désactivation de l'écriture en bitmap car certains objets ne sont pas " "compressés" -#: builtin/pack-objects.c:1796 +#: builtin/pack-objects.c:1806 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "dépassement de décalage de base de delta pour %s" -#: builtin/pack-objects.c:1805 +#: builtin/pack-objects.c:1815 #, c-format msgid "delta base offset out of bound for %s" msgstr "décalage de base de delta est hors limite pour %s" -#: builtin/pack-objects.c:2086 +#: builtin/pack-objects.c:2096 msgid "Counting objects" msgstr "Décompte des objets" -#: builtin/pack-objects.c:2231 +#: builtin/pack-objects.c:2241 #, c-format msgid "unable to parse object header of %s" msgstr "impossible d'analyser l'entête d'objet de %s" -#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 -#: builtin/pack-objects.c:2327 +#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327 +#: builtin/pack-objects.c:2337 #, c-format msgid "object %s cannot be read" msgstr "l'objet %s ne peut être lu" -#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 +#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)" -#: builtin/pack-objects.c:2341 +#: builtin/pack-objects.c:2351 msgid "suboptimal pack - out of memory" msgstr "paquet sous-optimal - mémoire insuffisante" -#: builtin/pack-objects.c:2656 +#: builtin/pack-objects.c:2666 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compression par delta en utilisant jusqu'à %d fils d'exécution" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2805 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "impossible d'empaqueter les objets joignables depuis l'étiquette %s" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2891 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2897 msgid "inconsistency with delta count" msgstr "inconsistance dans le compte de delta" -#: builtin/pack-objects.c:2961 +#: builtin/pack-objects.c:2976 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18391,7 +18740,7 @@ msgstr "" "la valeur de uploadpack.blobpackfileuri doit être de la forme '<empreinte-d-" "objet> <empreinte-de-pack> <uri>' ('%s' reçu)" -#: builtin/pack-objects.c:2964 +#: builtin/pack-objects.c:2979 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" @@ -18399,7 +18748,7 @@ msgstr "" "l'objet est déjà configuré dans un autre uploadpack.blobpackfileuri ('%s' " "reçu)" -#: builtin/pack-objects.c:2993 +#: builtin/pack-objects.c:3008 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18408,7 +18757,7 @@ msgstr "" "ID d'objet de bord attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:2999 +#: builtin/pack-objects.c:3014 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18417,244 +18766,244 @@ msgstr "" "ID d'objet attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:3097 +#: builtin/pack-objects.c:3112 msgid "invalid value for --missing" msgstr "valeur invalide pour --missing" -#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279 msgid "cannot open pack index" msgstr "impossible d'ouvrir l'index de paquet" -#: builtin/pack-objects.c:3187 +#: builtin/pack-objects.c:3202 #, c-format msgid "loose object at %s could not be examined" msgstr "l'objet libre à %s n'a pas pu être examiné" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3287 msgid "unable to force loose object" msgstr "impossible de forcer l'objet libre" -#: builtin/pack-objects.c:3365 +#: builtin/pack-objects.c:3380 #, c-format msgid "not a rev '%s'" msgstr "'%s' n'est pas une révision" -#: builtin/pack-objects.c:3368 +#: builtin/pack-objects.c:3383 #, c-format msgid "bad revision '%s'" msgstr "mauvaise révision '%s'" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3408 msgid "unable to add recent objects" msgstr "impossible d'ajouter les objets récents" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3461 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3465 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:3488 +#: builtin/pack-objects.c:3503 msgid "<version>[,<offset>]" msgstr "<version>[,<décalage>]" -#: builtin/pack-objects.c:3489 +#: builtin/pack-objects.c:3504 msgid "write the pack index file in the specified idx format version" msgstr "" "écrire le fichier d'index du paquet dans le format d'index de version " "spécifié" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3507 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:3494 +#: builtin/pack-objects.c:3509 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:3496 +#: builtin/pack-objects.c:3511 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3513 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:3500 +#: builtin/pack-objects.c:3515 msgid "limit pack window by memory in addition to object limit" msgstr "" "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets" -#: builtin/pack-objects.c:3502 +#: builtin/pack-objects.c:3517 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "longueur maximum de la chaîne de delta autorisée dans le paquet résultant" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3519 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:3506 +#: builtin/pack-objects.c:3521 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:3508 +#: builtin/pack-objects.c:3523 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:3510 +#: builtin/pack-objects.c:3525 msgid "use threads when searching for best delta matches" msgstr "" "utiliser des fils lors de la recherche pour une meilleure correspondance des " "deltas" -#: builtin/pack-objects.c:3512 +#: builtin/pack-objects.c:3527 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:3514 +#: builtin/pack-objects.c:3529 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:3516 +#: builtin/pack-objects.c:3531 msgid "limit the objects to those that are not yet packed" msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3534 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:3522 +#: builtin/pack-objects.c:3537 msgid "include objects referred by reflog entries" msgstr "inclure les objets référencés par les éléments de reflog" -#: builtin/pack-objects.c:3525 +#: builtin/pack-objects.c:3540 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:3528 +#: builtin/pack-objects.c:3543 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:3530 +#: builtin/pack-objects.c:3545 msgid "include tag objects that refer to objects to be packed" msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter" -#: builtin/pack-objects.c:3532 +#: builtin/pack-objects.c:3547 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3549 msgid "pack loose unreachable objects" msgstr "empaqueter les objets inaccessibles détachés" -#: builtin/pack-objects.c:3536 +#: builtin/pack-objects.c:3551 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:3539 +#: builtin/pack-objects.c:3554 msgid "use the sparse reachability algorithm" msgstr "utiliser l'algorithme de joignabilité creuse" -#: builtin/pack-objects.c:3541 +#: builtin/pack-objects.c:3556 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:3543 +#: builtin/pack-objects.c:3558 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:3545 +#: builtin/pack-objects.c:3560 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:3547 +#: builtin/pack-objects.c:3562 msgid "ignore this pack" msgstr "ignorer ce paquet" -#: builtin/pack-objects.c:3549 +#: builtin/pack-objects.c:3564 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3566 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3568 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "utiliser un index en bitmap si disponible pour accélerer le décompte des " "objets" -#: builtin/pack-objects.c:3555 +#: builtin/pack-objects.c:3570 msgid "write a bitmap index together with the pack index" msgstr "écrire un index en bitmap associé à l'index de paquet" -#: builtin/pack-objects.c:3559 +#: builtin/pack-objects.c:3574 msgid "write a bitmap index if possible" msgstr "écrire un index de bitmap si possible" -#: builtin/pack-objects.c:3563 +#: builtin/pack-objects.c:3578 msgid "handling for missing objects" msgstr "gestion des objets manquants" -#: builtin/pack-objects.c:3566 +#: builtin/pack-objects.c:3581 msgid "do not pack objects in promisor packfiles" msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3583 msgid "respect islands during delta compression" msgstr "respecter les îlots pendant la compression des deltas" -#: builtin/pack-objects.c:3570 +#: builtin/pack-objects.c:3585 msgid "protocol" msgstr "protocole" -#: builtin/pack-objects.c:3571 +#: builtin/pack-objects.c:3586 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "exclure tout uploadpack.blobpackfileuri configuré avec ce protocole" -#: builtin/pack-objects.c:3600 +#: builtin/pack-objects.c:3617 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "la profondeur %d de chaîne de delta est trop grande, forcée à %d" -#: builtin/pack-objects.c:3605 +#: builtin/pack-objects.c:3622 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit est trop grand, forcé à %d" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:3676 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size ne peut pas être utilisé pour construire un paquet à " "transférer" -#: builtin/pack-objects.c:3661 +#: builtin/pack-objects.c:3678 msgid "minimum pack size limit is 1 MiB" msgstr "la taille limite minimale d'un paquet est 1 MiB" -#: builtin/pack-objects.c:3666 +#: builtin/pack-objects.c:3683 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin ne peut pas être utilisé pour construire un paquet indexable" -#: builtin/pack-objects.c:3669 +#: builtin/pack-objects.c:3686 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles" -#: builtin/pack-objects.c:3675 +#: builtin/pack-objects.c:3692 msgid "cannot use --filter without --stdout" msgstr "impossible d'utiliser --filter sans --stdout" -#: builtin/pack-objects.c:3735 +#: builtin/pack-objects.c:3752 msgid "Enumerating objects" msgstr "Énumération des objets" -#: builtin/pack-objects.c:3766 +#: builtin/pack-objects.c:3783 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18663,6 +19012,20 @@ msgstr "" "Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>), " "réutilisés du pack %<PRIu32>" +#: builtin/pack-redundant.c:601 +msgid "" +"'git pack-redundant' is nominated for removal.\n" +"If you still use this command, please add an extra\n" +"option, '--i-still-use-this', on the command line\n" +"and let us know you still use it by sending an e-mail\n" +"to <git@vger.kernel.org>. Thanks.\n" +msgstr "" +"La suppression de 'git pack-redundant' est prévue.\n" +"Si vous utilisez cette commande, veuillez ajouter\n" +"une option supplémentaire, '--i-still-use-this',\n" +"sur la ligne de commande pour nous avertir par\n" +"un courriel à <git@vger.kernel.org>. Merci.\n" + #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<options>]" @@ -18720,7 +19083,7 @@ msgstr "Options relatives à la fusion" msgid "incorporate changes by rebasing rather than merging" msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" -#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" @@ -18745,36 +19108,7 @@ msgstr "nombre de sous-modules tirés en parallèle" msgid "Invalid value for pull.ff: %s" msgstr "Valeur invalide pour pull.ff : %s" -#: builtin/pull.c:348 -msgid "" -"Pulling without specifying how to reconcile divergent branches is\n" -"discouraged. You can squelch this message by running one of the following\n" -"commands sometime before your next pull:\n" -"\n" -" git config pull.rebase false # merge (the default strategy)\n" -" git config pull.rebase true # rebase\n" -" git config pull.ff only # fast-forward only\n" -"\n" -"You can replace \"git config\" with \"git config --global\" to set a " -"default\n" -"preference for all repositories. You can also pass --rebase, --no-rebase,\n" -"or --ff-only on the command line to override the configured default per\n" -"invocation.\n" -msgstr "" -"Tirer sans spécifier comment réconcilier les branches divergentes\n" -"est découragé. Vous pouvez éliminer ce message en lançant une des\n" -"commandes suivantes avant votre prochain tirage :\n" -"\n" -" git config pull.rebase false # fusion (stratégie par défaut)\n" -" git config pull.rebase true # rebasage\n" -" git config pull.ff only # avance rapide seulement\n" -"\n" -"Vous pouvez remplacer \"git config\" par \"git config --global\" pour que\n" -"ce soit l'option par défaut pour tous les dépôts. Vous pouvez aussi\n" -"passer --rebase, --no-rebase ou --ff-only sur la ligne de commande pour\n" -"remplacer à l'invocation la valeur par défaut configurée.\n" - -#: builtin/pull.c:458 +#: builtin/pull.c:445 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -18782,14 +19116,14 @@ msgstr "" "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous " "venez de récupérer." -#: builtin/pull.c:460 +#: builtin/pull.c:447 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Il n'y a pas de candidate avec laquelle fusionner parmi les références que " "vous venez de récupérer." -#: builtin/pull.c:461 +#: builtin/pull.c:448 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -18797,7 +19131,7 @@ msgstr "" "Généralement, cela signifie que vous avez indiqué un spécificateur\n" "de référence joker qui n'a pas eu de correspondance sur le serveur distant." -#: builtin/pull.c:464 +#: builtin/pull.c:451 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -18809,43 +19143,43 @@ msgstr "" "configuration\n" "pour la branche actuelle, vous devez spécifier la branche avec la commande." -#: builtin/pull.c:469 builtin/rebase.c:1246 +#: builtin/pull.c:456 builtin/rebase.c:1253 msgid "You are not currently on a branch." msgstr "Vous n'êtes actuellement sur aucune branche." -#: builtin/pull.c:471 builtin/pull.c:486 +#: builtin/pull.c:458 builtin/pull.c:473 msgid "Please specify which branch you want to rebase against." msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser." -#: builtin/pull.c:473 builtin/pull.c:488 +#: builtin/pull.c:460 builtin/pull.c:475 msgid "Please specify which branch you want to merge with." msgstr "Veuillez spécifier une branche avec laquelle fusionner." -#: builtin/pull.c:474 builtin/pull.c:489 +#: builtin/pull.c:461 builtin/pull.c:476 msgid "See git-pull(1) for details." msgstr "Référez-vous à git-pull(1) pour de plus amples détails." -#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 -#: builtin/rebase.c:1252 +#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 +#: builtin/rebase.c:1259 msgid "<remote>" msgstr "<distant>" -#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 +#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483 msgid "<branch>" msgstr "<branche>" -#: builtin/pull.c:484 builtin/rebase.c:1244 +#: builtin/pull.c:471 builtin/rebase.c:1251 msgid "There is no tracking information for the current branch." msgstr "Pas d'information de suivi distant pour la branche actuelle." -#: builtin/pull.c:493 +#: builtin/pull.c:480 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si vous souhaitez indiquer l'information de suivi distant pour cette " "branche, vous pouvez le faire avec :" -#: builtin/pull.c:498 +#: builtin/pull.c:485 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -18855,30 +19189,59 @@ msgstr "" "'%s'\n" "du serveur distant, mais cette référence n'a pas été récupérée." -#: builtin/pull.c:609 +#: builtin/pull.c:596 #, c-format msgid "unable to access commit %s" msgstr "impossible d'accéder le commit %s" -#: builtin/pull.c:915 +#: builtin/pull.c:902 msgid "ignoring --verify-signatures for rebase" msgstr "--verify-signatures est ignoré pour un rebasage" -#: builtin/pull.c:972 +#: builtin/pull.c:930 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"Tirer sans spécifier comment réconcilier les branches divergentes\n" +"est découragé. Vous pouvez éliminer ce message en lançant une des\n" +"commandes suivantes avant votre prochain tirage :\n" +"\n" +" git config pull.rebase false # fusion (stratégie par défaut)\n" +" git config pull.rebase true # rebasage\n" +" git config pull.ff only # avance rapide seulement\n" +"\n" +"Vous pouvez remplacer \"git config\" par \"git config --global\" pour que\n" +"ce soit l'option par défaut pour tous les dépôts. Vous pouvez aussi\n" +"passer --rebase, --no-rebase ou --ff-only sur la ligne de commande pour\n" +"remplacer à l'invocation la valeur par défaut configurée.\n" + +#: builtin/pull.c:991 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Mise à jour d'une branche non encore créée avec les changements ajoutés dans " "l'index." -#: builtin/pull.c:976 +#: builtin/pull.c:995 msgid "pull with rebase" msgstr "tirer avec un rebasage" -#: builtin/pull.c:977 +#: builtin/pull.c:996 msgid "please commit or stash them." msgstr "veuillez les valider ou les remiser." -#: builtin/pull.c:1002 +#: builtin/pull.c:1021 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18889,7 +19252,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:1008 +#: builtin/pull.c:1027 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18906,15 +19269,15 @@ msgstr "" "$ git reset --hard\n" "pour régénérer." -#: builtin/pull.c:1023 +#: builtin/pull.c:1042 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tête vide." -#: builtin/pull.c:1027 +#: builtin/pull.c:1046 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." -#: builtin/pull.c:1041 +#: builtin/pull.c:1067 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossible de rebaser avec des modifications de sous-modules enregistrées " @@ -19242,46 +19605,54 @@ msgstr "" "les options de poussée ne peuvent pas contenir de caractères de nouvelle " "ligne" -#: builtin/range-diff.c:8 +#: builtin/range-diff.c:9 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "" "git range-diff [<options>] <ancienne-base>..<ancien-sommet> <nouvelle-base>.." "<nouveau-sommet>" -#: builtin/range-diff.c:9 +#: builtin/range-diff.c:10 msgid "git range-diff [<options>] <old-tip>...<new-tip>" msgstr "git range-diff [<options>] <ancien-sommet>...<nouveau-sommet>" -#: builtin/range-diff.c:10 +#: builtin/range-diff.c:11 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<options>] <base> <ancien-sommet> <nouveau-sommet>" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:28 msgid "Percentage by which creation is weighted" msgstr "Pourcentage par lequel la création est pondérée" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:30 msgid "use simple diff colors" msgstr "utiliser des couleurs de diff simples" -#: builtin/range-diff.c:26 +#: builtin/range-diff.c:32 msgid "notes" msgstr "notes" -#: builtin/range-diff.c:26 +#: builtin/range-diff.c:32 msgid "passed to 'git log'" msgstr "passé à 'git log'" -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:35 +msgid "only emit output related to the first range" +msgstr "afficher seulement les sorties liées à la première plage" + +#: builtin/range-diff.c:37 +msgid "only emit output related to the second range" +msgstr "afficher seulement les sorties liées à la deuxième plage" + +#: builtin/range-diff.c:60 builtin/range-diff.c:64 #, c-format -msgid "no .. in range: '%s'" -msgstr "pas de .. dans la plage : '%s'" +msgid "not a commit range: '%s'" +msgstr "pas une plage de commit : '%s'" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:74 msgid "single arg format must be symmetric range" msgstr "un format d'argument unique doit être une plage symétrique" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:89 msgid "need two commit ranges" msgstr "plage entre deux commits requise" @@ -19387,193 +19758,193 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244 +#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246 #, c-format msgid "unusable todo list: '%s'" msgstr "liste à faire inutilisable : '%s'" -#: builtin/rebase.c:310 +#: builtin/rebase.c:312 #, c-format msgid "could not create temporary %s" msgstr "impossible de créer un fichier temporaire %s" -#: builtin/rebase.c:316 +#: builtin/rebase.c:318 msgid "could not mark as interactive" msgstr "impossible de marquer comme interactif" -#: builtin/rebase.c:369 +#: builtin/rebase.c:371 msgid "could not generate todo list" msgstr "impossible de générer la liste à-faire" -#: builtin/rebase.c:411 +#: builtin/rebase.c:413 msgid "a base commit must be provided with --upstream or --onto" msgstr "un commit de base doit être fourni avec --upstream ou --onto" -#: builtin/rebase.c:480 +#: builtin/rebase.c:482 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<options>]" -#: builtin/rebase.c:493 builtin/rebase.c:1388 +#: builtin/rebase.c:495 builtin/rebase.c:1394 msgid "keep commits which start empty" msgstr "conserver les commits qui commencent vides" -#: builtin/rebase.c:497 builtin/revert.c:128 +#: builtin/rebase.c:499 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "autoriser les validations avec des messages vides" -#: builtin/rebase.c:499 +#: builtin/rebase.c:501 msgid "rebase merge commits" msgstr "rebaser les commits de fusion" -#: builtin/rebase.c:501 +#: builtin/rebase.c:503 msgid "keep original branch points of cousins" msgstr "conserver les points de branchement de cousins originaux" -#: builtin/rebase.c:503 +#: builtin/rebase.c:505 msgid "move commits that begin with squash!/fixup!" msgstr "déplacer les commits qui commencent par squash!/fixup!" -#: builtin/rebase.c:504 +#: builtin/rebase.c:506 msgid "sign commits" msgstr "signer les commits" -#: builtin/rebase.c:506 builtin/rebase.c:1327 +#: builtin/rebase.c:508 builtin/rebase.c:1333 msgid "display a diffstat of what changed upstream" msgstr "afficher un diffstat de ce qui a changé en amont" -#: builtin/rebase.c:508 +#: builtin/rebase.c:510 msgid "continue rebase" msgstr "continuer le rebasage" -#: builtin/rebase.c:510 +#: builtin/rebase.c:512 msgid "skip commit" msgstr "sauter le commit" -#: builtin/rebase.c:511 +#: builtin/rebase.c:513 msgid "edit the todo list" msgstr "éditer la liste à-faire" -#: builtin/rebase.c:513 +#: builtin/rebase.c:515 msgid "show the current patch" msgstr "afficher le patch courant" -#: builtin/rebase.c:516 +#: builtin/rebase.c:518 msgid "shorten commit ids in the todo list" msgstr "raccourcir les identifiants de commits dans la liste à-faire" -#: builtin/rebase.c:518 +#: builtin/rebase.c:520 msgid "expand commit ids in the todo list" msgstr "étendre les identifiants de commit dans la liste à-faire" -#: builtin/rebase.c:520 +#: builtin/rebase.c:522 msgid "check the todo list" msgstr "vérifier la liste à-faire" -#: builtin/rebase.c:522 +#: builtin/rebase.c:524 msgid "rearrange fixup/squash lines" msgstr "réarranger les lignes fixup/squash" -#: builtin/rebase.c:524 +#: builtin/rebase.c:526 msgid "insert exec commands in todo list" msgstr "insérer les commandes exec dans la liste à-faire" -#: builtin/rebase.c:525 +#: builtin/rebase.c:527 msgid "onto" msgstr "sur" -#: builtin/rebase.c:528 +#: builtin/rebase.c:530 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:528 +#: builtin/rebase.c:530 msgid "restrict revision" msgstr "restreindre la révision" -#: builtin/rebase.c:530 +#: builtin/rebase.c:532 msgid "squash-onto" msgstr "écraser-sur" -#: builtin/rebase.c:531 +#: builtin/rebase.c:533 msgid "squash onto" msgstr "écraser sur" -#: builtin/rebase.c:533 +#: builtin/rebase.c:535 msgid "the upstream commit" msgstr "le commit amont" -#: builtin/rebase.c:535 +#: builtin/rebase.c:537 msgid "head-name" msgstr "nom du head" -#: builtin/rebase.c:535 +#: builtin/rebase.c:537 msgid "head name" msgstr "nom du head" -#: builtin/rebase.c:540 +#: builtin/rebase.c:542 msgid "rebase strategy" msgstr "stratégie de rebasage" -#: builtin/rebase.c:541 +#: builtin/rebase.c:543 msgid "strategy-opts" msgstr "options de stratégie" -#: builtin/rebase.c:542 +#: builtin/rebase.c:544 msgid "strategy options" msgstr "options de stratégie" -#: builtin/rebase.c:543 +#: builtin/rebase.c:545 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:544 +#: builtin/rebase.c:546 msgid "the branch or commit to checkout" msgstr "la branche ou le commit à extraire" -#: builtin/rebase.c:545 +#: builtin/rebase.c:547 msgid "onto-name" msgstr "sur-le-nom" -#: builtin/rebase.c:545 +#: builtin/rebase.c:547 msgid "onto name" msgstr "sur le nom" -#: builtin/rebase.c:546 +#: builtin/rebase.c:548 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:546 +#: builtin/rebase.c:548 msgid "the command to run" msgstr "la commande à lancer" -#: builtin/rebase.c:549 builtin/rebase.c:1421 +#: builtin/rebase.c:551 builtin/rebase.c:1427 msgid "automatically re-schedule any `exec` that fails" msgstr "re-planifier automatiquement tout `exec` qui échoue" -#: builtin/rebase.c:565 +#: builtin/rebase.c:567 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges" -#: builtin/rebase.c:581 +#: builtin/rebase.c:583 #, c-format msgid "%s requires the merge backend" msgstr "%s requiert un moteur de fusion" -#: builtin/rebase.c:624 +#: builtin/rebase.c:626 #, c-format msgid "could not get 'onto': '%s'" msgstr "impossible d'accéder 'onto' : '%s'" -#: builtin/rebase.c:641 +#: builtin/rebase.c:643 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head invalide : '%s'" -#: builtin/rebase.c:666 +#: builtin/rebase.c:668 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "allow_rerere_autoupdate invalide ignoré : '%s'" -#: builtin/rebase.c:811 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -19587,7 +19958,7 @@ msgstr "" "arrêter\n" "et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"." -#: builtin/rebase.c:894 +#: builtin/rebase.c:896 #, c-format msgid "" "\n" @@ -19606,7 +19977,7 @@ msgstr "" "\n" "Résultat, git ne peut pas les rebaser." -#: builtin/rebase.c:1220 +#: builtin/rebase.c:1227 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -19615,7 +19986,7 @@ msgstr "" "type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), " "\"keep\" (garder) et \"ask\" (demander)." -#: builtin/rebase.c:1238 +#: builtin/rebase.c:1245 #, c-format msgid "" "%s\n" @@ -19632,7 +20003,7 @@ msgstr "" " git rebase '<branche>'\n" "\n" -#: builtin/rebase.c:1254 +#: builtin/rebase.c:1261 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19646,149 +20017,149 @@ msgstr "" " git branch --set-upstream-to=%s/<branche> %s\n" "\n" -#: builtin/rebase.c:1284 +#: builtin/rebase.c:1291 msgid "exec commands cannot contain newlines" msgstr "les commandes exec ne peut pas contenir de retour à la ligne" -#: builtin/rebase.c:1288 +#: builtin/rebase.c:1295 msgid "empty exec command" msgstr "commande exec vide" -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1324 msgid "rebase onto given branch instead of upstream" msgstr "rebaser sur la branche %s au lieu de la branche amont" -#: builtin/rebase.c:1320 +#: builtin/rebase.c:1326 msgid "use the merge-base of upstream and branch as the current base" msgstr "" "utiliser la base de fusion de l'amont et la branche comme base actuelle" -#: builtin/rebase.c:1322 +#: builtin/rebase.c:1328 msgid "allow pre-rebase hook to run" msgstr "permettre le lancement du crochet pre-rebase" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1330 msgid "be quiet. implies --no-stat" msgstr "être silencieux. implique --no-stat" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1336 msgid "do not show diffstat of what changed upstream" msgstr "ne pas afficher un diffstat de ce qui a changé en amont" -#: builtin/rebase.c:1333 +#: builtin/rebase.c:1339 msgid "add a Signed-off-by trailer to each commit" msgstr "ajouter une ligne Signed-off-by à chaque message de validation" -#: builtin/rebase.c:1336 +#: builtin/rebase.c:1342 msgid "make committer date match author date" msgstr "mettre la date de validateur à la date auteur" -#: builtin/rebase.c:1338 +#: builtin/rebase.c:1344 msgid "ignore author date and use current date" msgstr "ignorer la date d'auteur et utilise la date actuelle" -#: builtin/rebase.c:1340 +#: builtin/rebase.c:1346 msgid "synonym of --reset-author-date" msgstr "synonyme pour --reset-author-date" -#: builtin/rebase.c:1342 builtin/rebase.c:1346 +#: builtin/rebase.c:1348 builtin/rebase.c:1352 msgid "passed to 'git apply'" msgstr "passé jusqu'à git-apply" -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1350 msgid "ignore changes in whitespace" msgstr "ignorer des modifications d'espaces" -#: builtin/rebase.c:1348 builtin/rebase.c:1351 +#: builtin/rebase.c:1354 builtin/rebase.c:1357 msgid "cherry-pick all commits, even if unchanged" msgstr "picorer tous les commits, même sans modifiant" -#: builtin/rebase.c:1353 +#: builtin/rebase.c:1359 msgid "continue" msgstr "continuer" -#: builtin/rebase.c:1356 +#: builtin/rebase.c:1362 msgid "skip current patch and continue" msgstr "sauter le patch courant et continuer" -#: builtin/rebase.c:1358 +#: builtin/rebase.c:1364 msgid "abort and check out the original branch" msgstr "abandonner et extraire la branche d'origine" -#: builtin/rebase.c:1361 +#: builtin/rebase.c:1367 msgid "abort but keep HEAD where it is" msgstr "abandonne mais garde HEAD où il est" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1368 msgid "edit the todo list during an interactive rebase" msgstr "éditer la liste à faire lors d'un rebasage interactif" -#: builtin/rebase.c:1365 +#: builtin/rebase.c:1371 msgid "show the patch file being applied or merged" msgstr "afficher le patch en cours d'application ou de fusion" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1374 msgid "use apply strategies to rebase" msgstr "utiliser des stratégies d'application pour rebaser" -#: builtin/rebase.c:1372 +#: builtin/rebase.c:1378 msgid "use merging strategies to rebase" msgstr "utiliser des stratégies de fusion pour rebaser" -#: builtin/rebase.c:1376 +#: builtin/rebase.c:1382 msgid "let the user edit the list of commits to rebase" msgstr "laisser l'utilisateur éditer la liste des commits à rebaser" -#: builtin/rebase.c:1380 +#: builtin/rebase.c:1386 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer" -#: builtin/rebase.c:1385 +#: builtin/rebase.c:1391 msgid "how to handle commits that become empty" msgstr "comment gérer les commits qui deviennent vides" -#: builtin/rebase.c:1392 +#: builtin/rebase.c:1398 msgid "move commits that begin with squash!/fixup! under -i" msgstr "déplace les commits qui commencent par squash!/fixup! sous -i" -#: builtin/rebase.c:1399 +#: builtin/rebase.c:1405 msgid "add exec lines after each commit of the editable list" msgstr "ajouter les lignes exec après chaque commit de la liste éditable" -#: builtin/rebase.c:1403 +#: builtin/rebase.c:1409 msgid "allow rebasing commits with empty messages" msgstr "autoriser les commits de rebasage avec des messages vides" -#: builtin/rebase.c:1407 +#: builtin/rebase.c:1413 msgid "try to rebase merges instead of skipping them" msgstr "essayer de rebaser les fusions au lieu de les garder" -#: builtin/rebase.c:1410 +#: builtin/rebase.c:1416 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont" -#: builtin/rebase.c:1412 +#: builtin/rebase.c:1418 msgid "use the given merge strategy" msgstr "utiliser la stratégie de fusion indiquée" -#: builtin/rebase.c:1414 builtin/revert.c:115 +#: builtin/rebase.c:1420 builtin/revert.c:115 msgid "option" msgstr "option" -#: builtin/rebase.c:1415 +#: builtin/rebase.c:1421 msgid "pass the argument through to the merge strategy" msgstr "passer les arguments jusqu'à la stratégie de fusion" -#: builtin/rebase.c:1418 +#: builtin/rebase.c:1424 msgid "rebase all reachable commits up to the root(s)" msgstr "rebaser tous les objets inatteignables depuis les racines" -#: builtin/rebase.c:1423 +#: builtin/rebase.c:1429 msgid "apply all changes, even those already present upstream" msgstr "" "appliquer toutes les modifications, même celles déjà présentes en amont" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1446 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -19796,44 +20167,44 @@ msgstr "" "les support de rebase.useBuiltin a été supprimé !\n" "Voir son entrée dans 'git help config' pour plus de détails." -#: builtin/rebase.c:1446 +#: builtin/rebase.c:1452 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser." -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1493 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges est déconseillé. Utilisez --rebase-merges à la " "place." -#: builtin/rebase.c:1492 +#: builtin/rebase.c:1498 msgid "cannot combine '--keep-base' with '--onto'" msgstr "impossible de combiner '--keep-base' avec '--onto'" -#: builtin/rebase.c:1494 +#: builtin/rebase.c:1500 msgid "cannot combine '--keep-base' with '--root'" msgstr "impossible de combiner '--keep-base' avec '--root'" -#: builtin/rebase.c:1498 +#: builtin/rebase.c:1504 msgid "cannot combine '--root' with '--fork-point'" msgstr "impossible de combiner '--root' avec '--fork-point'" -#: builtin/rebase.c:1501 +#: builtin/rebase.c:1507 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: builtin/rebase.c:1505 +#: builtin/rebase.c:1511 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'action --edit-todo peut seulement être utilisée lors d'un rebasage " "interactif." -#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: builtin/rebase.c:1540 +#: builtin/rebase.c:1546 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19841,16 +20212,16 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: builtin/rebase.c:1559 +#: builtin/rebase.c:1565 msgid "could not discard worktree changes" msgstr "Impossible de supprimer les changements de l'arbre de travail" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1584 #, c-format msgid "could not move back to %s" msgstr "Impossible de revenir à %s" -#: builtin/rebase.c:1624 +#: builtin/rebase.c:1630 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19872,136 +20243,136 @@ msgstr "" "chose\n" "d'important ici.\n" -#: builtin/rebase.c:1652 +#: builtin/rebase.c:1658 msgid "switch `C' expects a numerical value" msgstr "l'option `C' attend un valeur numérique" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1700 #, c-format msgid "Unknown mode: %s" msgstr "mode inconnu : %s" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1739 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiert --merge ou --interactive" -#: builtin/rebase.c:1763 +#: builtin/rebase.c:1769 msgid "cannot combine apply options with merge options" msgstr "" "impossible de combiner les options d'application avec les options de fusion" -#: builtin/rebase.c:1776 +#: builtin/rebase.c:1782 #, c-format msgid "Unknown rebase backend: %s" msgstr "backend de rebasage inconnu : %s" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1812 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec requiert --exec ou --interactive" -#: builtin/rebase.c:1826 +#: builtin/rebase.c:1832 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'" -#: builtin/rebase.c:1830 +#: builtin/rebase.c:1836 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "erreur : impossible de combiner '--preserve-merges' avec '--reschedule-" "failed-exec'" -#: builtin/rebase.c:1854 +#: builtin/rebase.c:1860 #, c-format msgid "invalid upstream '%s'" msgstr "amont invalide '%s'" -#: builtin/rebase.c:1860 +#: builtin/rebase.c:1866 msgid "Could not create new root commit" msgstr "Impossible de créer un nouveau commit racine" -#: builtin/rebase.c:1886 +#: builtin/rebase.c:1892 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s': exactement une base de fusion nécessaire avec une branche" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1895 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': exactement une base de fusion nécessaire" -#: builtin/rebase.c:1897 +#: builtin/rebase.c:1903 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "ne pointe pas sur une validation valide : '%s'" -#: builtin/rebase.c:1923 +#: builtin/rebase.c:1931 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal : pas de branche ou commit '%s'" -#: builtin/rebase.c:1931 builtin/submodule--helper.c:40 +#: builtin/rebase.c:1939 builtin/submodule--helper.c:40 #: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" -#: builtin/rebase.c:1942 +#: builtin/rebase.c:1950 msgid "Could not resolve HEAD to a revision" msgstr "Impossible de résoudre le commit HEAD vers un révision" -#: builtin/rebase.c:1963 +#: builtin/rebase.c:1971 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: builtin/rebase.c:1999 +#: builtin/rebase.c:2007 #, c-format msgid "could not switch to %s" msgstr "Impossible de basculer vers %s" -#: builtin/rebase.c:2010 +#: builtin/rebase.c:2018 msgid "HEAD is up to date." msgstr "HEAD est à jour." -#: builtin/rebase.c:2012 +#: builtin/rebase.c:2020 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La branche courante %s est à jour.\n" -#: builtin/rebase.c:2020 +#: builtin/rebase.c:2028 msgid "HEAD is up to date, rebase forced." msgstr "HEAD est à jour, rebasage forcé." -#: builtin/rebase.c:2022 +#: builtin/rebase.c:2030 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "La branche courante %s est à jour, rebasage forcé.\n" -#: builtin/rebase.c:2030 +#: builtin/rebase.c:2038 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: builtin/rebase.c:2037 +#: builtin/rebase.c:2045 #, c-format msgid "Changes to %s:\n" msgstr "Changements vers %s :\n" -#: builtin/rebase.c:2040 +#: builtin/rebase.c:2048 #, c-format msgid "Changes from %s to %s:\n" msgstr "Changements de %s sur %s :\n" -#: builtin/rebase.c:2065 +#: builtin/rebase.c:2073 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Rembobinage préalable de head pour pouvoir rejouer votre travail par-" "dessus...\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2082 msgid "Could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: builtin/rebase.c:2083 +#: builtin/rebase.c:2091 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rapide de %s sur %s.\n" @@ -20095,36 +20466,36 @@ msgstr "git reflog exists <référence>" msgid "'%s' is not a valid timestamp" msgstr "'%s' n'est pas un horodatage valide" -#: builtin/reflog.c:606 +#: builtin/reflog.c:609 #, c-format msgid "Marking reachable objects..." msgstr "Marquage des objets inaccessibles..." -#: builtin/reflog.c:644 +#: builtin/reflog.c:647 #, c-format msgid "%s points nowhere!" msgstr "%s ne pointe nulle part !" -#: builtin/reflog.c:696 +#: builtin/reflog.c:699 msgid "no reflog specified to delete" msgstr "pas de journal de références à supprimer spécifié" -#: builtin/reflog.c:705 +#: builtin/reflog.c:708 #, c-format msgid "not a reflog: %s" msgstr "'%s' n'est pas un journal de références" -#: builtin/reflog.c:710 +#: builtin/reflog.c:713 #, c-format msgid "no reflog for '%s'" msgstr "pas de journal de références pour '%s'" -#: builtin/reflog.c:756 +#: builtin/reflog.c:759 #, c-format msgid "invalid ref format: %s" msgstr "format de référence invalide : %s" -#: builtin/reflog.c:765 +#: builtin/reflog.c:768 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" @@ -20648,11 +21019,11 @@ msgstr "Pas d'URL trouvée : %s" msgid "Will not delete all non-push URLs" msgstr "Pas de suppression de toutes les URLs non-push" -#: builtin/repack.c:25 +#: builtin/repack.c:26 msgid "git repack [<options>]" msgstr "git repack [<options>]" -#: builtin/repack.c:30 +#: builtin/repack.c:31 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -20661,122 +21032,122 @@ msgstr "" "Utilisez\n" "--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps." -#: builtin/repack.c:197 +#: builtin/repack.c:198 msgid "could not start pack-objects to repack promisor objects" msgstr "" "ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur" -#: builtin/repack.c:268 builtin/repack.c:447 +#: builtin/repack.c:270 builtin/repack.c:446 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack : attente de lignes d'Id d'objets en hexa complet seulement depuis " "les objects de paquet." -#: builtin/repack.c:295 +#: builtin/repack.c:294 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "impossible de terminer pack-objects pour ré-empaqueter les objets de " "prometteur" -#: builtin/repack.c:323 +#: builtin/repack.c:322 msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" -#: builtin/repack.c:325 +#: builtin/repack.c:324 msgid "same as -a, and turn unreachable objects loose" msgstr "identique à -a et transformer les objets inaccessibles en suspens" -#: builtin/repack.c:328 +#: builtin/repack.c:327 msgid "remove redundant packs, and run git-prune-packed" msgstr "supprimer les paquets redondants et lancer git-prune-packed" -#: builtin/repack.c:330 +#: builtin/repack.c:329 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passer --no-reuse-delta à git-pack-objects" -#: builtin/repack.c:332 +#: builtin/repack.c:331 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passer --no-reuse-object à git-pack-objects" -#: builtin/repack.c:334 +#: builtin/repack.c:333 msgid "do not run git-update-server-info" msgstr "ne pas lancer git update-server-info" -#: builtin/repack.c:337 +#: builtin/repack.c:336 msgid "pass --local to git-pack-objects" msgstr "passer --local à git-pack-objects" -#: builtin/repack.c:339 +#: builtin/repack.c:338 msgid "write bitmap index" msgstr "écrire un index en bitmap" -#: builtin/repack.c:341 +#: builtin/repack.c:340 msgid "pass --delta-islands to git-pack-objects" msgstr "passer --delta-islands à git-pack-objects" -#: builtin/repack.c:342 +#: builtin/repack.c:341 msgid "approxidate" msgstr "date approximative" -#: builtin/repack.c:343 +#: builtin/repack.c:342 msgid "with -A, do not loosen objects older than this" msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci" -#: builtin/repack.c:345 +#: builtin/repack.c:344 msgid "with -a, repack unreachable objects" msgstr "avec -a, repaquétiser les objets inaccessibles" -#: builtin/repack.c:347 +#: builtin/repack.c:346 msgid "size of the window used for delta compression" msgstr "taille de la fenêtre utilisée pour la compression des deltas" -#: builtin/repack.c:348 builtin/repack.c:354 +#: builtin/repack.c:347 builtin/repack.c:353 msgid "bytes" msgstr "octets" -#: builtin/repack.c:349 +#: builtin/repack.c:348 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments" -#: builtin/repack.c:351 +#: builtin/repack.c:350 msgid "limits the maximum delta depth" msgstr "limite la profondeur maximale des deltas" -#: builtin/repack.c:353 +#: builtin/repack.c:352 msgid "limits the maximum number of threads" msgstr "limite le nombre maximal de fils" -#: builtin/repack.c:355 +#: builtin/repack.c:354 msgid "maximum size of each packfile" msgstr "taille maximum de chaque fichier paquet" -#: builtin/repack.c:357 +#: builtin/repack.c:356 msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:359 +#: builtin/repack.c:358 msgid "do not repack this pack" msgstr "ne pas rempaqueter ce paquet" -#: builtin/repack.c:369 +#: builtin/repack.c:368 msgid "cannot delete packs in a precious-objects repo" msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux" -#: builtin/repack.c:373 +#: builtin/repack.c:372 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable et -A sont incompatibles" -#: builtin/repack.c:456 +#: builtin/repack.c:455 msgid "Nothing new to pack." msgstr "Rien de neuf à empaqueter." -#: builtin/repack.c:486 +#: builtin/repack.c:485 #, c-format msgid "missing required file: %s" msgstr "fichier nécessaire manquant : %s" -#: builtin/repack.c:488 +#: builtin/repack.c:487 #, c-format msgid "could not unlink: %s" msgstr "impossible de délier : '%s'" @@ -21111,8 +21482,8 @@ msgstr "HEAD est maintenant à %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion." -#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594 -#: builtin/stash.c:618 +#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661 +#: builtin/stash.c:685 msgid "be quiet, only report errors" msgstr "être silencieux, afficher seulement les erreurs" @@ -21200,19 +21571,19 @@ msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'." msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:534 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "impossible de combiner --exclude-promisor-objects et --missing" -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:595 msgid "object filtering requires --objects" msgstr "le filtrage d'objet exige --objects" -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:651 msgid "rev-list does not support display of notes" msgstr "rev-list ne supporte l'affichage des notes" -#: builtin/rev-list.c:615 +#: builtin/rev-list.c:656 msgid "marked counting is incompatible with --objects" msgstr "le comptage marqué est incompatible avec --objects" @@ -21457,55 +21828,53 @@ msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] <chemin>...]" msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<options>]" -#: builtin/shortlog.c:135 +#: builtin/shortlog.c:123 msgid "using multiple --group options with stdin is not supported" msgstr "" "l'utilisation de plusieurs options --group avec stdin n'est pas supportée" -#: builtin/shortlog.c:145 +#: builtin/shortlog.c:133 msgid "using --group=trailer with stdin is not supported" msgstr "l'utilisation de --group=trailer avec stdin n'est pas supportée" -#: builtin/shortlog.c:335 +#: builtin/shortlog.c:323 #, c-format msgid "unknown group type: %s" msgstr "type de groupe inconnu : %s" -#: builtin/shortlog.c:363 -msgid "Group by committer rather than author" -msgstr "Grouper par validateur plutôt que par auteur" +#: builtin/shortlog.c:351 +msgid "group by committer rather than author" +msgstr "grouper par validateur plutôt que par auteur" -#: builtin/shortlog.c:366 +#: builtin/shortlog.c:354 msgid "sort output according to the number of commits per author" msgstr "trier la sortie sur le nombre de validations par auteur" -#: builtin/shortlog.c:368 -msgid "Suppress commit descriptions, only provides commit count" -msgstr "" -"Supprimer les descriptions de validation, fournit seulement le nombre de " -"validations" +#: builtin/shortlog.c:356 +msgid "suppress commit descriptions, only provides commit count" +msgstr "supprimer les descriptions de validation, fournit seulement le nombre de validations" -#: builtin/shortlog.c:370 -msgid "Show the email address of each author" -msgstr "Afficher l'adresse courriel de chaque auteur" +#: builtin/shortlog.c:358 +msgid "show the email address of each author" +msgstr "afficher l'adresse courriel de chaque auteur" -#: builtin/shortlog.c:371 +#: builtin/shortlog.c:359 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:372 -msgid "Linewrap output" -msgstr "Couper les lignes" +#: builtin/shortlog.c:360 +msgid "linewrap output" +msgstr "couper les lignes" -#: builtin/shortlog.c:374 +#: builtin/shortlog.c:362 msgid "field" msgstr "champ" -#: builtin/shortlog.c:375 -msgid "Group by field" -msgstr "Grouper par champ" +#: builtin/shortlog.c:363 +msgid "group by field" +msgstr "grouper par champ" -#: builtin/shortlog.c:403 +#: builtin/shortlog.c:391 msgid "too many arguments given outside repository" msgstr "trop d'arguments fournis hors d'un dépôt" @@ -21708,74 +22077,74 @@ msgstr "" msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <options>" -#: builtin/sparse-checkout.c:50 +#: builtin/sparse-checkout.c:45 msgid "git sparse-checkout list" msgstr "git sparse-checkout list" -#: builtin/sparse-checkout.c:76 +#: builtin/sparse-checkout.c:71 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" "cet arbre de travail n'est pas partiel (le fichier sparse-checkout pourrait " "ne pas exister)" -#: builtin/sparse-checkout.c:228 +#: builtin/sparse-checkout.c:223 msgid "failed to create directory for sparse-checkout file" msgstr "" "échec de la création du répertoire pour le fichier d'extraction partielle" -#: builtin/sparse-checkout.c:269 +#: builtin/sparse-checkout.c:264 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "" "impossible de mettre à jour le format de dépôt pour activer worktreeConfig" -#: builtin/sparse-checkout.c:271 +#: builtin/sparse-checkout.c:266 msgid "failed to set extensions.worktreeConfig setting" msgstr "échec de paramétrage extensions.worktreeConfig" -#: builtin/sparse-checkout.c:288 +#: builtin/sparse-checkout.c:283 msgid "git sparse-checkout init [--cone]" msgstr "git sparse-checkout init [--cone]" -#: builtin/sparse-checkout.c:307 +#: builtin/sparse-checkout.c:302 msgid "initialize the sparse-checkout in cone mode" msgstr "initialiser l'extraction partielle en mode cone" -#: builtin/sparse-checkout.c:344 +#: builtin/sparse-checkout.c:339 #, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" -#: builtin/sparse-checkout.c:401 +#: builtin/sparse-checkout.c:396 #, c-format msgid "could not normalize path %s" msgstr "impossible de normaliser le chemin '%s'" -#: builtin/sparse-checkout.c:413 +#: builtin/sparse-checkout.c:408 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)" -#: builtin/sparse-checkout.c:438 +#: builtin/sparse-checkout.c:433 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "Impossible de décoter la chaîne en style C '%s'" -#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 +#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511 msgid "unable to load existing sparse-checkout patterns" msgstr "impossible de charger les motifs de l'extraction partielle existants" -#: builtin/sparse-checkout.c:561 +#: builtin/sparse-checkout.c:556 msgid "read patterns from standard in" msgstr "lire les motifs depuis l'entrée standard" -#: builtin/sparse-checkout.c:576 +#: builtin/sparse-checkout.c:571 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:595 +#: builtin/sparse-checkout.c:590 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:623 +#: builtin/sparse-checkout.c:618 msgid "error while refreshing working directory" msgstr "erreur lors du rafraîchissement du répertoire de travail" @@ -21865,155 +22234,166 @@ msgid "%s is not a valid reference" msgstr "%s n'est pas une référence valide" #: builtin/stash.c:225 -msgid "git stash clear with parameters is unimplemented" -msgstr "git stash clear avec des paramètres n'est pas implémenté" +msgid "git stash clear with arguments is unimplemented" +msgstr "git stash clear avec des arguments n'est pas implémenté" + +#: builtin/stash.c:429 +#, c-format +msgid "" +"WARNING: Untracked file in way of tracked file! Renaming\n" +" %s -> %s\n" +" to make room.\n" +msgstr "" +"AVERTISSEMENT : un fichier non-suivi en travers d'un fichier suivi ! Renommage\n" +" %s -> %s\n" +" pour faire de la place.\n" -#: builtin/stash.c:404 +#: builtin/stash.c:490 msgid "cannot apply a stash in the middle of a merge" msgstr "impossible d'appliquer un remisage en cours de fusion" -#: builtin/stash.c:415 +#: builtin/stash.c:501 #, c-format msgid "could not generate diff %s^!." msgstr "impossible de générer %s^!." -#: builtin/stash.c:422 +#: builtin/stash.c:508 msgid "conflicts in index. Try without --index." msgstr "conflits dans l'index. Essayez sans --index." -#: builtin/stash.c:428 +#: builtin/stash.c:514 msgid "could not save index tree" msgstr "impossible de sauvegarder l'arbre d'index" -#: builtin/stash.c:437 +#: builtin/stash.c:523 msgid "could not restore untracked files from stash" msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage" -#: builtin/stash.c:451 +#: builtin/stash.c:537 #, c-format msgid "Merging %s with %s" msgstr "Fusion de %s avec %s" -#: builtin/stash.c:461 +#: builtin/stash.c:547 msgid "Index was not unstashed." msgstr "L'index n'a pas été sorti de remise." -#: builtin/stash.c:522 builtin/stash.c:620 +#: builtin/stash.c:589 builtin/stash.c:687 msgid "attempt to recreate the index" msgstr "tentative de recréer l'index" -#: builtin/stash.c:566 +#: builtin/stash.c:633 #, c-format msgid "Dropped %s (%s)" msgstr "%s supprimé (%s)" -#: builtin/stash.c:569 +#: builtin/stash.c:636 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s : Impossible de supprimer l'élément de stash" -#: builtin/stash.c:582 +#: builtin/stash.c:649 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' n'est pas une référence de remisage" -#: builtin/stash.c:632 +#: builtin/stash.c:699 msgid "The stash entry is kept in case you need it again." msgstr "" "L'entrée de remisage est conservée au cas où vous en auriez encore besoin." -#: builtin/stash.c:655 +#: builtin/stash.c:722 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: builtin/stash.c:799 builtin/stash.c:836 +#: builtin/stash.c:866 builtin/stash.c:903 #, c-format msgid "Cannot update %s with %s" msgstr "Impossible de mettre à jour %s avec %s" -#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603 msgid "stash message" msgstr "message pour le remisage" -#: builtin/stash.c:827 +#: builtin/stash.c:894 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" exige un argument <commit>" -#: builtin/stash.c:1042 +#: builtin/stash.c:1109 msgid "No changes selected" msgstr "Aucun changement sélectionné" -#: builtin/stash.c:1142 +#: builtin/stash.c:1209 msgid "You do not have the initial commit yet" msgstr "Vous n'avez pas encore la validation initiale" -#: builtin/stash.c:1169 +#: builtin/stash.c:1236 msgid "Cannot save the current index state" msgstr "Impossible de sauver l'état courant de l'index" -#: builtin/stash.c:1178 +#: builtin/stash.c:1245 msgid "Cannot save the untracked files" msgstr "Impossible de sauver les fichiers non-suivis" -#: builtin/stash.c:1189 builtin/stash.c:1198 +#: builtin/stash.c:1256 builtin/stash.c:1265 msgid "Cannot save the current worktree state" msgstr "Impossible de sauver l'état courant de la copie de travail" -#: builtin/stash.c:1226 +#: builtin/stash.c:1293 msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'état de la copie de travail" -#: builtin/stash.c:1275 +#: builtin/stash.c:1342 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Impossible d'utiliser --patch et --include-untracked ou --all en même temps" -#: builtin/stash.c:1291 +#: builtin/stash.c:1358 msgid "Did you forget to 'git add'?" msgstr "Vous avez sûrement oublié 'git add' ?" -#: builtin/stash.c:1306 +#: builtin/stash.c:1373 msgid "No local changes to save" msgstr "Pas de modifications locales à sauver" -#: builtin/stash.c:1313 +#: builtin/stash.c:1380 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: builtin/stash.c:1328 +#: builtin/stash.c:1395 msgid "Cannot save the current status" msgstr "Impossible de sauver l'état courant" -#: builtin/stash.c:1333 +#: builtin/stash.c:1400 #, c-format msgid "Saved working directory and index state %s" msgstr "Arbre de travail et état de l'index sauvegardés dans %s" -#: builtin/stash.c:1423 +#: builtin/stash.c:1490 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: builtin/stash.c:1462 builtin/stash.c:1527 +#: builtin/stash.c:1529 builtin/stash.c:1594 msgid "keep index" msgstr "conserver l'index" -#: builtin/stash.c:1464 builtin/stash.c:1529 +#: builtin/stash.c:1531 builtin/stash.c:1596 msgid "stash in patch mode" msgstr "remiser une mode rustine" -#: builtin/stash.c:1465 builtin/stash.c:1530 +#: builtin/stash.c:1532 builtin/stash.c:1597 msgid "quiet mode" msgstr "mode silencieux" -#: builtin/stash.c:1467 builtin/stash.c:1532 +#: builtin/stash.c:1534 builtin/stash.c:1599 msgid "include untracked files in stash" msgstr "inclure les fichiers non suivis dans la remise" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1536 builtin/stash.c:1601 msgid "include ignore files" msgstr "inclure les fichiers ignorés" -#: builtin/stash.c:1569 +#: builtin/stash.c:1636 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22093,13 +22473,13 @@ msgstr "" "." #: builtin/submodule--helper.c:565 -msgid "Suppress output of entering each submodule command" -msgstr "" -"Supprimer la sortie lors de l'entrée dans chaque commande de sous-module" +msgid "suppress output of entering each submodule command" +msgstr "supprimer la sortie lors de l'entrée dans chaque commande de sous-module" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 -msgid "Recurse into nested submodules" -msgstr "Parcourir récursivement les sous-modules" +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:1487 +msgid "recurse into nested submodules" +msgstr "parcourir récursivement les sous-modules" #: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" @@ -22139,8 +22519,8 @@ msgstr "" "'%s'" #: builtin/submodule--helper.c:709 -msgid "Suppress output for initializing a submodule" -msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module" +msgid "suppress output for initializing a submodule" +msgstr "supprimer la sortie lors de l'initialisation d'un sous-module" #: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" @@ -22164,20 +22544,14 @@ msgid "failed to recurse into submodule '%s'" msgstr "récursion impossible dans le sous-module '%s'" #: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 -msgid "Suppress submodule status output" +msgid "suppress submodule status output" msgstr "supprimer la sortie d'état du sous-module" #: builtin/submodule--helper.c:887 msgid "" -"Use commit stored in the index instead of the one stored in the submodule " +"use commit stored in the index instead of the one stored in the submodule " "HEAD" -msgstr "" -"Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD " -"du sous-module" - -#: builtin/submodule--helper.c:888 -msgid "recurse into nested submodules" -msgstr "parcourir récursivement les sous-modules" +msgstr "utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD du sous-module" #: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" @@ -22264,9 +22638,8 @@ msgid "failed to update remote for submodule '%s'" msgstr "échec de mise à jour du dépôt distant pour le sous-module '%s'" #: builtin/submodule--helper.c:1485 -msgid "Suppress output of synchronizing submodule url" -msgstr "" -"Supprimer la sortie lors de la synchronisation de l'URL d'un sous-module" +msgid "suppress output of synchronizing submodule url" +msgstr "supprimer la sortie lors de la synchronisation de l'URL d'un sous-module" #: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" @@ -22312,14 +22685,12 @@ msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Sous-module '%s' (%s) non enregistré pour le chemin '%s'\n" #: builtin/submodule--helper.c:1624 -msgid "Remove submodule working trees even if they contain local changes" -msgstr "" -"Éliminer les arbres de travail des sous-modules même s'ils contiennent des " -"modifications locales" +msgid "remove submodule working trees even if they contain local changes" +msgstr "éliminer les arbres de travail des sous-modules même s'ils contiennent des modifications locales" #: builtin/submodule--helper.c:1625 -msgid "Unregister all submodules" -msgstr "Désenregistrer tous les sous-modules" +msgid "unregister all submodules" +msgstr "désenregistrer tous les sous-modules" #: builtin/submodule--helper.c:1630 msgid "" @@ -22469,8 +22840,8 @@ msgid "rebase, merge, checkout or none" msgstr "valeurs possibles : rebase, merge, checkout ou none" #: builtin/submodule--helper.c:2340 -msgid "Create a shallow clone truncated to the specified number of revisions" -msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié" +msgid "create a shallow clone truncated to the specified number of revisions" +msgstr "créer un clone superficiel tronqué au nombre de révisions spécifié" #: builtin/submodule--helper.c:2343 msgid "parallel jobs" @@ -22541,8 +22912,8 @@ msgstr "" "veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail" #: builtin/submodule--helper.c:2681 -msgid "Suppress output for setting url of a submodule" -msgstr "Supprimer la sortie lors du paramétrage de l'url d'un sous-module" +msgid "suppress output for setting url of a submodule" +msgstr "supprimer la sortie lors du paramétrage de l'url d'un sous-module" #: builtin/submodule--helper.c:2685 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" @@ -22575,7 +22946,7 @@ msgstr "--branch ou --default requis" msgid "--branch and --default are mutually exclusive" msgstr "--branch et --default sont mutuellement exclusifs" -#: builtin/submodule--helper.c:2792 git.c:438 git.c:711 +#: builtin/submodule--helper.c:2792 git.c:441 git.c:714 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ne gère pas --super-prefix" @@ -22647,12 +23018,12 @@ msgstr "git tag -v [--format=<format>] <nométiquette>..." msgid "tag '%s' not found." msgstr "étiquette '%s' non trouvée." -#: builtin/tag.c:105 +#: builtin/tag.c:124 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Étiquette '%s' supprimée (elle était sur %s)\n" -#: builtin/tag.c:135 +#: builtin/tag.c:159 #, c-format msgid "" "\n" @@ -22665,7 +23036,7 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/tag.c:139 +#: builtin/tag.c:163 #, c-format msgid "" "\n" @@ -22680,15 +23051,11 @@ msgstr "" "Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-" "même si vous le souhaitez.\n" -#: builtin/tag.c:198 +#: builtin/tag.c:230 msgid "unable to sign the tag" msgstr "impossible de signer l'étiquette" -#: builtin/tag.c:200 -msgid "unable to write tag file" -msgstr "impossible d'écrire le fichier d'étiquettes" - -#: builtin/tag.c:216 +#: builtin/tag.c:248 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -22703,139 +23070,135 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:232 +#: builtin/tag.c:264 msgid "bad object type." msgstr "mauvais type d'objet." -#: builtin/tag.c:285 +#: builtin/tag.c:317 msgid "no tag message?" msgstr "pas de message pour l'étiquette ?" -#: builtin/tag.c:292 +#: builtin/tag.c:324 #, c-format msgid "The tag message has been left in %s\n" msgstr "Le message pour l'étiquette a été laissé dans %s\n" -#: builtin/tag.c:403 +#: builtin/tag.c:435 msgid "list tag names" msgstr "afficher les noms des étiquettes" -#: builtin/tag.c:405 +#: builtin/tag.c:437 msgid "print <n> lines of each tag message" msgstr "affiche <n> lignes de chaque message d'étiquette" -#: builtin/tag.c:407 +#: builtin/tag.c:439 msgid "delete tags" msgstr "supprimer des étiquettes" -#: builtin/tag.c:408 +#: builtin/tag.c:440 msgid "verify tags" msgstr "vérifier des étiquettes" -#: builtin/tag.c:410 +#: builtin/tag.c:442 msgid "Tag creation options" msgstr "Options de création de l'étiquette" -#: builtin/tag.c:412 +#: builtin/tag.c:444 msgid "annotated tag, needs a message" msgstr "étiquette annotée, nécessite un message" -#: builtin/tag.c:414 +#: builtin/tag.c:446 msgid "tag message" msgstr "message pour l'étiquette" -#: builtin/tag.c:416 +#: builtin/tag.c:448 msgid "force edit of tag message" msgstr "forcer l'édition du message d'étiquetage" -#: builtin/tag.c:417 +#: builtin/tag.c:449 msgid "annotated and GPG-signed tag" msgstr "étiquette annotée et signée avec GPG" -#: builtin/tag.c:420 +#: builtin/tag.c:452 msgid "use another key to sign the tag" msgstr "utiliser une autre clé pour signer l'étiquette" -#: builtin/tag.c:421 +#: builtin/tag.c:453 msgid "replace the tag if exists" msgstr "remplacer l'étiquette si elle existe" -#: builtin/tag.c:422 builtin/update-ref.c:505 +#: builtin/tag.c:454 builtin/update-ref.c:505 msgid "create a reflog" msgstr "créer un reflog" -#: builtin/tag.c:424 +#: builtin/tag.c:456 msgid "Tag listing options" msgstr "Options d'affichage des étiquettes" -#: builtin/tag.c:425 +#: builtin/tag.c:457 msgid "show tag list in columns" msgstr "afficher la liste des étiquettes sous forme de colonnes" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:458 builtin/tag.c:460 msgid "print only tags that contain the commit" msgstr "afficher seulement les étiquettes qui contiennent la validation" -#: builtin/tag.c:427 builtin/tag.c:429 +#: builtin/tag.c:459 builtin/tag.c:461 msgid "print only tags that don't contain the commit" msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation" -#: builtin/tag.c:430 +#: builtin/tag.c:462 msgid "print only tags that are merged" msgstr "afficher seulement les étiquettes qui sont fusionnées" -#: builtin/tag.c:431 +#: builtin/tag.c:463 msgid "print only tags that are not merged" msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées" -#: builtin/tag.c:435 +#: builtin/tag.c:467 msgid "print only tags of the object" msgstr "afficher seulement les étiquettes de l'objet" -#: builtin/tag.c:483 +#: builtin/tag.c:515 msgid "--column and -n are incompatible" msgstr "--column et -n sont incompatibles" -#: builtin/tag.c:505 +#: builtin/tag.c:537 msgid "-n option is only allowed in list mode" msgstr "l'option -n est autorisée seulement en mode de liste" -#: builtin/tag.c:507 +#: builtin/tag.c:539 msgid "--contains option is only allowed in list mode" msgstr "l'option --contains est autorisée seulement en mode de liste" -#: builtin/tag.c:509 +#: builtin/tag.c:541 msgid "--no-contains option is only allowed in list mode" msgstr "l'option --contains est autorisée seulement en mode liste" -#: builtin/tag.c:511 +#: builtin/tag.c:543 msgid "--points-at option is only allowed in list mode" msgstr "l'option --points-at est autorisée seulement en mode liste" -#: builtin/tag.c:513 +#: builtin/tag.c:545 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" "les options --merged et --no-merged ne sont autorisées qu'en mode liste" -#: builtin/tag.c:524 +#: builtin/tag.c:556 msgid "only one -F or -m option is allowed." msgstr "une seule option -F ou -m est autorisée." -#: builtin/tag.c:543 -msgid "too many params" -msgstr "trop de paramètres" - -#: builtin/tag.c:549 +#: builtin/tag.c:581 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' n'est pas un nom d'étiquette valide." -#: builtin/tag.c:554 +#: builtin/tag.c:586 #, c-format msgid "tag '%s' already exists" msgstr "l'étiquette '%s' existe déjà" -#: builtin/tag.c:585 +#: builtin/tag.c:617 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" @@ -23204,90 +23567,63 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..." msgid "print tag contents" msgstr "afficher le contenu de l'étiquette" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<options>] <chemin> [<commit>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<options>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<options>] <chemin>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<options>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<options>] <arbre-de-travail>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock <chemin>" -#: builtin/worktree.c:60 builtin/worktree.c:973 +#: builtin/worktree.c:61 builtin/worktree.c:933 #, c-format msgid "failed to delete '%s'" msgstr "échec de la suppression de '%s'" -#: builtin/worktree.c:85 -msgid "not a valid directory" -msgstr "pas un répertoire valide" - -#: builtin/worktree.c:91 -msgid "gitdir file does not exist" -msgstr "le fichier gitdir n'existe pas" - -#: builtin/worktree.c:96 builtin/worktree.c:105 -#, c-format -msgid "unable to read gitdir file (%s)" -msgstr "impossible de lire le fichier gitdir (%s)" - -#: builtin/worktree.c:115 -#, c-format -msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" -msgstr "" -"lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)" - -#: builtin/worktree.c:123 -msgid "invalid gitdir file" -msgstr "fichier gitdir invalide" - -#: builtin/worktree.c:131 -msgid "gitdir file points to non-existent location" -msgstr "le fichier gitdir pointe sur un endroit inexistant" - -#: builtin/worktree.c:146 +#: builtin/worktree.c:74 #, c-format msgid "Removing %s/%s: %s" msgstr "Suppression de %s/%s : %s" -#: builtin/worktree.c:221 +#: builtin/worktree.c:149 msgid "report pruned working trees" msgstr "afficher les arbres de travail éliminés" -#: builtin/worktree.c:223 +#: builtin/worktree.c:151 msgid "expire working trees older than <time>" msgstr "faire expirer les arbres de travail plus vieux que <temps>" -#: builtin/worktree.c:293 +#: builtin/worktree.c:221 #, c-format msgid "'%s' already exists" msgstr "'%s' existe déjà" -#: builtin/worktree.c:302 +#: builtin/worktree.c:230 #, c-format msgid "unusable worktree destination '%s'" msgstr "arbre de travail destination '%s' inutilisable" -#: builtin/worktree.c:307 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -23297,7 +23633,7 @@ msgstr "" "utilisez '%s -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' " "pour corriger" -#: builtin/worktree.c:309 +#: builtin/worktree.c:237 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -23306,124 +23642,136 @@ msgstr "" "'%s' est un arbre de travail manquant mais déjà enregistré ;\n" "utilisez '%s -f' pour passer outre, ou 'prune' ou 'remove' pour corriger" -#: builtin/worktree.c:360 +#: builtin/worktree.c:288 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:494 builtin/worktree.c:500 +#: builtin/worktree.c:422 builtin/worktree.c:428 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')" -#: builtin/worktree.c:496 +#: builtin/worktree.c:424 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" "Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; " "précédemment sur %s)" -#: builtin/worktree.c:505 +#: builtin/worktree.c:433 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Préparation de l'arbre de travail (extraction de '%s')" -#: builtin/worktree.c:511 +#: builtin/worktree.c:439 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Préparation de l'arbre de travail (HEAD détachée %s)" -#: builtin/worktree.c:552 +#: builtin/worktree.c:480 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "extraire la <branche> même si elle est déjà extraite dans une autre copie de " "travail" -#: builtin/worktree.c:555 +#: builtin/worktree.c:483 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:557 +#: builtin/worktree.c:485 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:559 +#: builtin/worktree.c:487 msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" -#: builtin/worktree.c:560 +#: builtin/worktree.c:488 msgid "keep the new working tree locked" msgstr "conserver le verrou sur le nouvel arbre de travail" -#: builtin/worktree.c:563 +#: builtin/worktree.c:491 msgid "set up tracking mode (see git-branch(1))" msgstr "régler le mode de suivi (voir git-branch(1))" -#: builtin/worktree.c:566 +#: builtin/worktree.c:494 msgid "try to match the new branch name with a remote-tracking branch" msgstr "essayer de nommer la nouvelle branche comme la branche amont" -#: builtin/worktree.c:574 +#: builtin/worktree.c:502 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/worktree.c:635 +#: builtin/worktree.c:563 msgid "--[no-]track can only be used if a new branch is created" msgstr "" "--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche" -#: builtin/worktree.c:758 +#: builtin/worktree.c:680 +msgid "show extended annotations and reasons, if available" +msgstr "afficher les annotations étendues et les raisons, si disponible" + +#: builtin/worktree.c:682 +msgid "add 'prunable' annotation to worktrees older than <time>" +msgstr "ajouter l'annotation 'prunable' aux arbres de travail plus vieux que <temps>" + +#: builtin/worktree.c:691 +msgid "--verbose and --porcelain are mutually exclusive" +msgstr "--verbose et --porcelain sont mutuellement exclusifs" + +#: builtin/worktree.c:718 msgid "reason for locking" msgstr "raison du verrouillage" -#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877 -#: builtin/worktree.c:1001 +#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837 +#: builtin/worktree.c:961 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:772 builtin/worktree.c:805 +#: builtin/worktree.c:732 builtin/worktree.c:765 msgid "The main working tree cannot be locked or unlocked" msgstr "" "La copie de travail principale ne peut pas être verrouillée ou déverrouillée" -#: builtin/worktree.c:777 +#: builtin/worktree.c:737 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:779 +#: builtin/worktree.c:739 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:807 +#: builtin/worktree.c:767 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" -#: builtin/worktree.c:848 +#: builtin/worktree.c:808 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "les arbres de travail contenant des sous-modules ne peuvent pas être " "déplacés ou supprimés" -#: builtin/worktree.c:856 +#: builtin/worktree.c:816 msgid "force move even if worktree is dirty or locked" msgstr "" "forcer le déplacement même si l'arbre de travail est sale ou verrouillé" -#: builtin/worktree.c:879 builtin/worktree.c:1003 +#: builtin/worktree.c:839 builtin/worktree.c:963 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' est un arbre de travail principal" -#: builtin/worktree.c:884 +#: builtin/worktree.c:844 #, c-format msgid "could not figure out destination name from '%s'" msgstr "impossible de trouver le nom de la destination à partir de '%s'" -#: builtin/worktree.c:897 +#: builtin/worktree.c:857 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23433,7 +23781,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:899 +#: builtin/worktree.c:859 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23441,39 +23789,39 @@ msgstr "" "impossible de déplacer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:902 +#: builtin/worktree.c:862 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "la validation a échoué, impossible de déplacer l'arbre de travail : %s" -#: builtin/worktree.c:907 +#: builtin/worktree.c:867 #, c-format msgid "failed to move '%s' to '%s'" msgstr "échec au déplacement de '%s' vers '%s'" -#: builtin/worktree.c:953 +#: builtin/worktree.c:913 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "échec du lancement de 'git status' sur '%s'" -#: builtin/worktree.c:957 +#: builtin/worktree.c:917 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "'%s' contient des fichiers modifiés ou non-suivis, utilisez --force pour le " "supprimer" -#: builtin/worktree.c:962 +#: builtin/worktree.c:922 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "impossible de lancer 'git status' sur '%s', code %d" -#: builtin/worktree.c:985 +#: builtin/worktree.c:945 msgid "force removal even if worktree is dirty or locked" msgstr "" "forcer la suppression même si l'arbre de travail est sale ou verrouillé" -#: builtin/worktree.c:1008 +#: builtin/worktree.c:968 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23483,7 +23831,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:1010 +#: builtin/worktree.c:970 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23491,18 +23839,18 @@ msgstr "" "impossible de supprimer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:1013 +#: builtin/worktree.c:973 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" "la validation a échoué, impossible de supprimer l'arbre de travail : %s" -#: builtin/worktree.c:1037 +#: builtin/worktree.c:997 #, c-format msgid "repair: %s: %s" msgstr "réparation : %s : '%s'" -#: builtin/worktree.c:1040 +#: builtin/worktree.c:1000 #, c-format msgid "error: %s: %s" msgstr "erreur : %s : %s" @@ -23564,17 +23912,17 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" " <command> [<args>]" msgstr "" "git [--version] [--help] [-C <chemin>] [-c <nom>=<valeur>]\n" -" [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-" -"path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" +" [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n" " [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n" +" [--super-prefix=<chemin>] [--config-env=<nom>=<variable-d-environnement>]\n" " <commande> [<args>]" -#: git.c:35 +#: git.c:36 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -23586,47 +23934,47 @@ msgstr "" "pour en lire plus à propos d'une commande spécifique ou d'un concept.\n" "Voir 'git help git' pour un survol du système." -#: git.c:187 +#: git.c:188 #, c-format msgid "no directory given for --git-dir\n" msgstr "aucun répertoire fourni pour --git-dir\n" -#: git.c:201 +#: git.c:202 #, c-format msgid "no namespace given for --namespace\n" msgstr "aucun espace de nom fournit pour --namespace\n" -#: git.c:215 +#: git.c:216 #, c-format msgid "no directory given for --work-tree\n" msgstr "aucun répertoire fourni pour --work-tree\n" -#: git.c:229 +#: git.c:230 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "aucun préfixe fourni pour --super-prefix\n" -#: git.c:251 +#: git.c:252 #, c-format msgid "-c expects a configuration string\n" msgstr "-c requiert une chaîne de configuration\n" -#: git.c:289 +#: git.c:292 #, c-format msgid "no directory given for -C\n" msgstr "aucun répertoire fourni pour -C\n" -#: git.c:315 +#: git.c:318 #, c-format msgid "unknown option: %s\n" msgstr "option inconnue : %s\n" -#: git.c:364 +#: git.c:367 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "lors de l'expansion de l'alias '%s' : '%s'" -#: git.c:373 +#: git.c:376 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -23635,39 +23983,39 @@ msgstr "" "l'alias '%s' modifie les variables d'environnement.\n" "Vous pouvez utiliser '!git' dans l'alias pour le faire" -#: git.c:380 +#: git.c:383 #, c-format msgid "empty alias for %s" msgstr "alias vide pour %s" -#: git.c:383 +#: git.c:386 #, c-format msgid "recursive alias: %s" msgstr "alias recursif : %s" -#: git.c:465 +#: git.c:468 msgid "write failure on standard output" msgstr "échec d'écriture sur la sortie standard" -#: git.c:467 +#: git.c:470 msgid "unknown write failure on standard output" msgstr "échec inconnu d'écriture sur la sortie standard" -#: git.c:469 +#: git.c:472 msgid "close failed on standard output" msgstr "échec de fermeture de la sortie standard" -#: git.c:820 +#: git.c:823 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "boucle d'alias détectée : l'expansion de '%s' ne finit jamais : %s" -#: git.c:870 +#: git.c:873 #, c-format msgid "cannot handle %s as a builtin" msgstr "impossible d'utiliser %s comme une fonction intégrée" -#: git.c:883 +#: git.c:886 #, c-format msgid "" "usage: %s\n" @@ -23676,13 +24024,13 @@ msgstr "" "usage : %s\n" "\n" -#: git.c:903 +#: git.c:906 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n" -#: git.c:915 +#: git.c:918 #, c-format msgid "failed to run command '%s': %s\n" msgstr "échec au lancement de la commande '%s' : %s\n" @@ -23922,11 +24270,11 @@ msgstr "" "avec --pathspec-from-file, les spécificateurs de chemin sont séparés par un " "caractère NUL" -#: ref-filter.h:96 +#: ref-filter.h:99 msgid "key" msgstr "clé" -#: ref-filter.h:96 +#: ref-filter.h:99 msgid "field name to sort on" msgstr "nom du champ servant à trier" @@ -23935,14 +24283,6 @@ msgid "update the index with reused conflict resolution if possible" msgstr "" "met à jour l'index avec les résolutions de conflit réutilisées si possible" -#: wt-status.h:80 -msgid "HEAD detached at " -msgstr "HEAD détachée sur " - -#: wt-status.h:81 -msgid "HEAD detached from " -msgstr "HEAD détachée depuis " - #: command-list.h:50 msgid "Add file contents to the index" msgstr "Ajouter le contenu de fichiers dans l'index" @@ -24292,8 +24632,8 @@ msgid "Write and verify multi-pack-indexes" msgstr "Écrire et vérifier les index multi-paquet" #: command-list.h:132 -msgid "Creates a tag object" -msgstr "Créer un objet étiquette" +msgid "Creates a tag object with extra validation" +msgstr "Créer un objet étiquette avec validation supplémentaire" #: command-list.h:133 msgid "Build a tree-object from ls-tree formatted text" @@ -24606,69 +24946,55 @@ msgid "Specifies intentionally untracked files to ignore" msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement" #: command-list.h:209 +msgid "Map author/committer names and/or E-Mail addresses" +msgstr "Fait correspondre les noms d'auteur/validateur avec les adresses de courriel" + +#: command-list.h:210 msgid "Defining submodule properties" msgstr "Définition des propriétés de sous-module" -#: command-list.h:210 +#: command-list.h:211 msgid "Git namespaces" msgstr "Espaces de nom de Git" -#: command-list.h:211 +#: command-list.h:212 msgid "Helper programs to interact with remote repositories" msgstr "Programmes assistants pour interagir avec des dépôts distants" -#: command-list.h:212 +#: command-list.h:213 msgid "Git Repository Layout" msgstr "Disposition d'un dépôt Git" -#: command-list.h:213 +#: command-list.h:214 msgid "Specifying revisions and ranges for Git" msgstr "Spécification des révisions et portées pour Git" -#: command-list.h:214 +#: command-list.h:215 msgid "Mounting one repository inside another" msgstr "Montage d'un dépôt dans un autre dépôt" -#: command-list.h:215 +#: command-list.h:216 msgid "A tutorial introduction to Git: part two" msgstr "Une introduction pratique à Git : deuxième partie" -#: command-list.h:216 +#: command-list.h:217 msgid "A tutorial introduction to Git" msgstr "Une introduction pratique à Git" -#: command-list.h:217 +#: command-list.h:218 msgid "An overview of recommended workflows with Git" msgstr "Un aperçu des flux de travail recommandés avec Git" -#: git-bisect.sh:48 -#, sh-format -msgid "Bad rev input: $arg" -msgstr "Mauvaise révision en entrée : $arg" - -#: git-bisect.sh:82 -msgid "No logfile given" -msgstr "Pas de fichier de log donné" - -#: git-bisect.sh:83 -#, sh-format -msgid "cannot read $file for replaying" -msgstr "impossible de lire $file pour rejouer" - -#: git-bisect.sh:105 -msgid "?? what are you talking about?" -msgstr "?? de quoi parlez-vous ?" - -#: git-bisect.sh:115 +#: git-bisect.sh:68 msgid "bisect run failed: no command provided." msgstr "la bissection a échoué : aucune commande fournie." -#: git-bisect.sh:120 +#: git-bisect.sh:73 #, sh-format msgid "running $command" msgstr "lancement de $command" -#: git-bisect.sh:127 +#: git-bisect.sh:80 #, sh-format msgid "" "bisect run failed:\n" @@ -24677,11 +25003,11 @@ msgstr "" "la bissection a échoué :\n" "le code retour $res de '$command' est < 0 ou >= 128" -#: git-bisect.sh:152 +#: git-bisect.sh:105 msgid "bisect run cannot continue any more" msgstr "la bissection ne peut plus continuer" -#: git-bisect.sh:158 +#: git-bisect.sh:111 #, sh-format msgid "" "bisect run failed:\n" @@ -24690,14 +25016,10 @@ msgstr "" "la bissection a échoué :\n" "'bisect-state $state' a retourné le code erreur $res" -#: git-bisect.sh:165 +#: git-bisect.sh:118 msgid "bisect run success" msgstr "succès de la bissection" -#: git-bisect.sh:173 -msgid "We are not bisecting." -msgstr "Pas de bissection en cours." - #: git-merge-octopus.sh:46 msgid "" "Error: Your local changes to the following files would be overwritten by " @@ -26012,9 +26334,3 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " - -#~ msgid "Counting distinct commits in commit graph" -#~ msgstr "Comptage des commits distincts dans un graphe de commit" - -#~ msgid "the commit graph format cannot write %d commits" -#~ msgstr "le graphe de commits ne peut pas écrire %d commits" |