From 6b822f7359e073efd76ff5c5e1b35877e6a60c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Date: Wed, 28 Nov 2018 22:16:56 +0100 Subject: [PATCH] l10n: fr.po v2.20 rnd 1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-Noël Avila --- po/fr.po | 7219 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 4178 insertions(+), 3041 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2d47dd46de..76abde37c4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -74,8 +74,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2018-09-04 08:50+0800\n" -"PO-Revision-Date: 2018-09-05 22:18+0200\n" +"POT-Creation-Date: 2018-11-20 10:05+0800\n" +"PO-Revision-Date: 2018-11-28 20:44+0100\n" "Last-Translator: Jean-Noël Avila \n" "Language-Team: Jean-Noël Avila \n" "Language: fr\n" @@ -84,37 +84,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" -#: advice.c:97 +#: advice.c:99 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sastuce: %.*s%s\n" -#: advice.c:150 +#: advice.c:152 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Impossible de picorer car vous avez des fichiers non fusionnés." -#: advice.c:152 +#: advice.c:154 msgid "Committing is not possible because you have unmerged files." msgstr "Impossible de valider car vous avez des fichiers non fusionnés." -#: advice.c:154 +#: advice.c:156 msgid "Merging is not possible because you have unmerged files." msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés." -#: advice.c:156 +#: advice.c:158 msgid "Pulling is not possible because you have unmerged files." msgstr "Impossible de tirer car vous avez des fichiers non fusionnés." -#: advice.c:158 +#: advice.c:160 msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés." -#: advice.c:160 +#: advice.c:162 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés." -#: advice.c:168 +#: advice.c:170 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -122,23 +122,23 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm '\n" "si nécessaire pour marquer la résolution et valider." -#: advice.c:176 +#: advice.c:178 msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:181 builtin/merge.c:1286 +#: advice.c:183 builtin/merge.c:1289 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: advice.c:183 +#: advice.c:185 msgid "Please, commit your changes before merging." msgstr "Veuillez valider vos changements avant de fusionner." -#: advice.c:184 +#: advice.c:186 msgid "Exiting because of unfinished merge." msgstr "Abandon à cause d'une fusion non terminée." -#: advice.c:190 +#: advice.c:192 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -247,22 +247,22 @@ msgstr "" msgid "invalid mode on line %d: %s" msgstr "mode invalide dans la ligne %d : %s" -#: apply.c:1306 +#: apply.c:1307 #, c-format msgid "inconsistent header lines %d and %d" msgstr "lignes d'entête inconsistantes %d et %d" -#: apply.c:1478 +#: apply.c:1479 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" -#: apply.c:1547 +#: apply.c:1548 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" -#: apply.c:1567 +#: apply.c:1568 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -277,83 +277,83 @@ msgstr[1] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composants de préfixe de chemin (ligne %d)" -#: apply.c:1580 +#: apply.c:1581 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)" -#: apply.c:1768 +#: apply.c:1769 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: apply.c:1770 +#: apply.c:1771 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: apply.c:1804 +#: apply.c:1805 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: apply.c:1841 +#: apply.c:1842 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: apply.c:1843 +#: apply.c:1844 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: apply.c:1846 +#: apply.c:1847 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" -#: apply.c:1993 +#: apply.c:1994 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: apply.c:2030 +#: apply.c:2031 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: apply.c:2190 +#: apply.c:2193 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: apply.c:2276 +#: apply.c:2279 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: apply.c:2280 +#: apply.c:2283 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: apply.c:2939 +#: apply.c:2942 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: apply.c:3060 +#: apply.c:3063 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)." msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)." -#: apply.c:3072 +#: apply.c:3075 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d" -#: apply.c:3078 +#: apply.c:3081 #, c-format msgid "" "while searching for:\n" @@ -362,462 +362,463 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: apply.c:3100 +#: apply.c:3103 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: apply.c:3108 +#: apply.c:3111 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section " "inverse" -#: apply.c:3154 +#: apply.c:3158 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index" -#: apply.c:3164 +#: apply.c:3168 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" "le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel." -#: apply.c:3172 +#: apply.c:3176 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide" -#: apply.c:3190 +#: apply.c:3194 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue" -#: apply.c:3203 +#: apply.c:3207 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: apply.c:3209 +#: apply.c:3213 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s " "trouvé)" -#: apply.c:3230 +#: apply.c:3234 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: apply.c:3352 +#: apply.c:3356 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278 +#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" -#: apply.c:3412 +#: apply.c:3416 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" -#: apply.c:3441 apply.c:3681 +#: apply.c:3445 apply.c:3688 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: apply.c:3524 apply.c:3696 +#: apply.c:3531 apply.c:3703 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: apply.c:3533 apply.c:3704 +#: apply.c:3540 apply.c:3711 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: apply.c:3568 +#: apply.c:3575 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " "points." -#: apply.c:3571 +#: apply.c:3578 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retour à une fusion à 3 points…\n" -#: apply.c:3587 apply.c:3591 +#: apply.c:3594 apply.c:3598 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossible de lire le contenu actuel de '%s'" -#: apply.c:3603 +#: apply.c:3610 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Echec du retour à une fusion à 3 points…\n" -#: apply.c:3617 +#: apply.c:3624 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch %s appliqué avec des conflits.\n" -#: apply.c:3622 +#: apply.c:3629 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch %s appliqué proprement.\n" -#: apply.c:3648 +#: apply.c:3655 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: apply.c:3721 +#: apply.c:3728 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: apply.c:3723 +#: apply.c:3730 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: apply.c:3874 apply.c:3876 +#: apply.c:3881 apply.c:3883 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: apply.c:3932 +#: apply.c:3939 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: apply.c:3935 +#: apply.c:3942 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: apply.c:3955 +#: apply.c:3962 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" -#: apply.c:3960 +#: apply.c:3967 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" -#: apply.c:3980 +#: apply.c:3987 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique" -#: apply.c:3984 +#: apply.c:3991 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: apply.c:3999 +#: apply.c:4006 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: apply.c:4091 +#: apply.c:4098 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "l'information sha1 est manquante ou inutilisable pour le sous-module %s" -#: apply.c:4098 +#: apply.c:4105 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle" -#: apply.c:4101 +#: apply.c:4108 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "l'information de sha1 est manquante ou inutilisable (%s)." -#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140 +#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" -#: apply.c:4110 +#: apply.c:4117 #, c-format msgid "could not add %s to temporary index" msgstr "impossible d'ajouter %s à l'index temporaire" -#: apply.c:4120 +#: apply.c:4127 #, c-format msgid "could not write temporary index to %s" msgstr "impossible d'écrire l'index temporaire dans %s" -#: apply.c:4258 +#: apply.c:4265 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: apply.c:4292 +#: apply.c:4299 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: apply.c:4298 +#: apply.c:4305 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: apply.c:4306 +#: apply.c:4313 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "création du magasin de stockage pour le fichier nouvellement créé %s " "impossible" -#: apply.c:4312 apply.c:4457 +#: apply.c:4319 apply.c:4464 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4355 +#: apply.c:4362 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" -#: apply.c:4359 +#: apply.c:4366 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: apply.c:4429 +#: apply.c:4436 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: apply.c:4527 +#: apply.c:4534 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: apply.c:4535 +#: apply.c:4542 msgid "internal error" msgstr "erreur interne" -#: apply.c:4538 +#: apply.c:4545 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." -#: apply.c:4549 +#: apply.c:4556 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048 +#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" -#: apply.c:4571 +#: apply.c:4578 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: apply.c:4575 +#: apply.c:4582 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: apply.c:4685 +#: apply.c:4692 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traité." -#: apply.c:4693 +#: apply.c:4700 msgid "unrecognized input" msgstr "entrée non reconnue" -#: apply.c:4712 +#: apply.c:4719 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: apply.c:4849 +#: apply.c:4874 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s' :%s" -#: apply.c:4876 +#: apply.c:4901 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erreur d'espace ignorée" msgstr[1] "%d erreurs d'espace ignorées" -#: apply.c:4882 apply.c:4897 +#: apply.c:4907 apply.c:4922 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ligne a ajouté des erreurs d'espace." msgstr[1] "%d lignes ont ajouté des erreurs d'espace." -#: apply.c:4890 +#: apply.c:4915 #, c-format msgid "%d line applied after fixing whitespace errors." 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:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389 +#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257 -#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260 -#: builtin/pull.c:198 builtin/submodule--helper.c:406 -#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358 -#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 -#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197 +#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212 +#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262 +#: builtin/pull.c:199 builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365 +#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849 +#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197 msgid "path" msgstr "chemin" -#: apply.c:4934 +#: apply.c:4959 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4937 +#: apply.c:4962 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4939 builtin/am.c:2263 +#: apply.c:4964 builtin/am.c:2218 msgid "num" msgstr "num" -#: apply.c:4940 +#: apply.c:4965 msgid "remove leading slashes from traditional diff paths" msgstr "supprimer barres obliques des chemins traditionnels de diff" -#: apply.c:4943 +#: apply.c:4968 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: apply.c:4945 +#: apply.c:4970 msgid "instead of applying the patch, output diffstat for the input" msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" -#: apply.c:4949 +#: apply.c:4974 msgid "show number of added and deleted lines in decimal notation" msgstr "" "afficher le nombre de lignes ajoutées et supprimées en notation décimale" -#: apply.c:4951 +#: apply.c:4976 msgid "instead of applying the patch, output a summary for the input" msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée" -#: apply.c:4953 +#: apply.c:4978 msgid "instead of applying the patch, see if the patch is applicable" msgstr "au lieu d'appliquer le patch, voir si le patch est applicable" -#: apply.c:4955 +#: apply.c:4980 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" -#: apply.c:4957 +#: apply.c:4982 msgid "mark new files with `git add --intent-to-add`" msgstr "marquer les nouveaux fichiers `git add --intent-to-add`" -#: apply.c:4959 +#: apply.c:4984 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: apply.c:4961 +#: apply.c:4986 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: apply.c:4964 +#: apply.c:4989 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" -#: apply.c:4966 +#: apply.c:4991 msgid "attempt three-way merge if a patch does not apply" msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement" -#: apply.c:4968 +#: apply.c:4993 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:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516 +#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: apply.c:4973 +#: apply.c:4998 msgid "ensure at least lines of context match" msgstr "s'assurer d'au moins lignes de correspondance de contexte" -#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95 -#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 -#: builtin/pack-objects.c:3202 +#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97 +#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 +#: builtin/pack-objects.c:3310 builtin/rebase.c:839 msgid "action" msgstr "action" -#: apply.c:4975 +#: apply.c:5000 msgid "detect new or modified lines that have whitespace errors" msgstr "" "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs " "d'espace" -#: apply.c:4978 apply.c:4981 +#: apply.c:5003 apply.c:5006 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: apply.c:4984 +#: apply.c:5009 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: apply.c:4986 +#: apply.c:5011 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: apply.c:4988 +#: apply.c:5013 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: apply.c:4990 +#: apply.c:5015 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671 -#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124 +#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21 +#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698 +#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127 +#: builtin/rebase--interactive.c:157 msgid "be verbose" msgstr "mode verbeux" -#: apply.c:4993 +#: apply.c:5018 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolérer des erreurs de détection de retours chariot manquants en fin de " "fichier" -#: apply.c:4996 +#: apply.c:5021 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au compte de lignes dans les en-têtes de section" -#: apply.c:4998 builtin/am.c:2251 +#: apply.c:5023 builtin/am.c:2206 msgid "root" msgstr "racine" -#: apply.c:4999 +#: apply.c:5024 msgid "prepend to all filenames" msgstr "préfixer tous les noms de fichier avec " @@ -840,114 +841,114 @@ msgstr "" msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote [--exec ] --list" -#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298 +#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" -#: archive.c:446 +#: archive.c:453 msgid "fmt" msgstr "fmt" -#: archive.c:446 +#: archive.c:453 msgid "archive format" msgstr "format d'archive" -#: archive.c:447 builtin/log.c:1473 +#: archive.c:454 builtin/log.c:1536 msgid "prefix" msgstr "préfixe" -#: archive.c:448 +#: archive.c:455 msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126 -#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873 -#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555 -#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119 -#: parse-options.h:165 +#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884 +#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562 +#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122 +#: parse-options.h:162 msgid "file" msgstr "fichier" -#: archive.c:450 builtin/archive.c:89 +#: archive.c:457 builtin/archive.c:89 msgid "write the archive to this file" msgstr "écrire l'archive dans ce fichier" -#: archive.c:452 +#: archive.c:459 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le répertoire de travail" -#: archive.c:453 +#: archive.c:460 msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" -#: archive.c:454 +#: archive.c:461 msgid "store only" msgstr "stockage seulement" -#: archive.c:455 +#: archive.c:462 msgid "compress faster" msgstr "compression rapide" -#: archive.c:463 +#: archive.c:470 msgid "compress better" msgstr "compression efficace" -#: archive.c:466 +#: archive.c:473 msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738 +#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 +#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855 msgid "repo" msgstr "dépôt" -#: archive.c:469 builtin/archive.c:91 +#: archive.c:476 builtin/archive.c:91 msgid "retrieve the archive from remote repository " msgstr "récupérer l'archive depuis le dépôt distant " -#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714 -#: builtin/notes.c:491 +#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714 +#: builtin/notes.c:496 msgid "command" msgstr "commande" -#: archive.c:471 builtin/archive.c:93 +#: archive.c:478 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" -#: archive.c:478 +#: archive.c:485 msgid "Unexpected option --remote" msgstr "Option --remote inattendue" -#: archive.c:480 +#: archive.c:487 msgid "Option --exec can only be used together with --remote" msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote" -#: archive.c:482 +#: archive.c:489 msgid "Unexpected option --output" msgstr "Option --output inattendue" -#: archive.c:504 +#: archive.c:511 #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'archive inconnu '%s'" -#: archive.c:511 +#: archive.c:518 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argument non supporté pour le format '%s' : -%d" -#: archive-tar.c:125 archive-zip.c:344 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "impossible de transmettre le blob %s en flux" -#: archive-tar.c:260 archive-zip.c:361 +#: archive-tar.c:260 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "mode de fichier non supporté :0%o (SHA1: %s)" -#: archive-tar.c:287 archive-zip.c:352 +#: archive-tar.c:287 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "impossible de lire %s" @@ -966,32 +967,32 @@ msgstr "impossible de rediriger un descripteur" msgid "'%s' filter reported error" msgstr "le filtre '%s' a retourné une erreur" -#: archive-zip.c:313 +#: archive-zip.c:314 #, c-format msgid "path is not valid UTF-8: %s" msgstr "le chemin n'est pas codé en UTF-8 valide : %s" -#: archive-zip.c:317 +#: archive-zip.c:318 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s" -#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219 +#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: archive-zip.c:605 +#: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %" msgstr "l'horodatage est trop grand pour ce système : %" -#: attr.c:218 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s n'est pas un nom valide d'attribut" -#: attr.c:415 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -999,22 +1000,22 @@ msgstr "" "Les motifs de négation sont ignorés dans les attributs git\n" "Utilisez '\\!' pour un point d'exclamation littéral." -#: bisect.c:467 +#: bisect.c:468 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Contenu mal cité dans le fichier '%s' : %s" -#: bisect.c:675 +#: bisect.c:676 #, c-format msgid "We cannot bisect more!\n" msgstr "Impossible de pousser la bissection plus loin !\n" -#: bisect.c:729 +#: bisect.c:730 #, c-format msgid "Not a valid commit name %s" msgstr "%s n'est pas un nom de commit valide" -#: bisect.c:753 +#: bisect.c:754 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1023,7 +1024,7 @@ msgstr "" "La base de fusion %s est mauvaise.\n" "Cela signifie que le bogue été corrigé entre %s et [%s].\n" -#: bisect.c:758 +#: bisect.c:759 #, c-format msgid "" "The merge base %s is new.\n" @@ -1032,7 +1033,7 @@ msgstr "" "La base de fusion %s est nouvelle.\n" "La propriété a changé entre %s et [%s].\n" -#: bisect.c:763 +#: bisect.c:764 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1041,7 +1042,7 @@ msgstr "" "La base de fusion %s est %s.\n" "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n" -#: bisect.c:771 +#: bisect.c:772 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1052,7 +1053,7 @@ msgstr "" "git bisect ne peut pas fonctionner correctement dans ce cas.\n" "Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n" -#: bisect.c:784 +#: bisect.c:785 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1064,36 +1065,36 @@ msgstr "" "et %s.\n" "On continue tout de même." -#: bisect.c:817 +#: bisect.c:818 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bissection : une base de fusion doit être testée\n" -#: bisect.c:857 +#: bisect.c:858 #, c-format msgid "a %s revision is needed" msgstr "une révision %s est nécessaire" -#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237 +#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" -#: bisect.c:927 builtin/merge.c:137 +#: bisect.c:928 builtin/merge.c:138 #, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" -#: bisect.c:957 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "impossible de lire les références de bissection" -#: bisect.c:976 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s était à la fois %s et %s\n" -#: bisect.c:984 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -1102,7 +1103,7 @@ msgstr "" "Aucun commit testable n'a été trouvé\n" "Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n" -#: bisect.c:1003 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1112,48 +1113,48 @@ msgstr[1] "(à peu près %d étapes)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1009 +#: bisect.c:1010 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bissection : %d révision à tester après ceci %s\n" msgstr[1] "Bissection : %d révisions à tester après ceci %s\n" -#: blame.c:1784 +#: blame.c:1787 msgid "--contents and --reverse do not blend well." msgstr "--contents et --reverse ne font pas bon ménage." -#: blame.c:1798 +#: blame.c:1801 msgid "cannot use --contents with final commit object name" msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final" -#: blame.c:1819 +#: blame.c:1822 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse et --first-parent ensemble nécessitent la spécification d'un " "dernier commit" -#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874 -#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926 -#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404 -#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044 +#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963 +#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932 +#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406 +#: builtin/pack-objects.c:3135 builtin/pack-objects.c:3150 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" -#: blame.c:1846 +#: blame.c:1849 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de " "premier parent" -#: blame.c:1857 +#: blame.c:1860 #, c-format msgid "no such path %s in %s" msgstr "pas de chemin %s dans %s" -#: blame.c:1868 +#: blame.c:1871 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossible de lire le blob %s pour le chemin %s" @@ -1316,7 +1317,8 @@ msgstr "'%s' ne semble pas être un fichier bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722 +#: builtin/commit.c:774 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -1343,38 +1345,42 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "Le colis exige cette référence :" msgstr[1] "Le colis exige ces %d références :" -#: bundle.c:260 +#: bundle.c:267 +msgid "unable to dup bundle descriptor" +msgstr "impossible de dupliquer le descripteur de liasse" + +#: bundle.c:274 msgid "Could not spawn pack-objects" msgstr "Impossible de créer des objets groupés" -#: bundle.c:271 +#: bundle.c:285 msgid "pack-objects died" msgstr "les objets groupés ont disparu" -#: bundle.c:313 +#: bundle.c:327 msgid "rev-list died" msgstr "rev-list a disparu" -#: bundle.c:362 +#: bundle.c:376 #, 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:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304 +#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:461 +#: bundle.c:464 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:473 +#: bundle.c:474 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:501 +#: bundle.c:498 msgid "index-pack died" msgstr "l'index de groupe a disparu" @@ -1383,19 +1389,19 @@ msgstr "l'index de groupe a disparu" msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466 -#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376 +#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414 +#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376 #: builtin/replace.c:448 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" -#: commit.c:50 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s n'est pas un commit !" -#: commit.c:191 +#: commit.c:193 msgid "" "Support for /info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1415,7 +1421,27 @@ msgstr "" "Supprimez ce message en lançant\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1629 +#: commit.c:1115 +#, 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:1118 +#, 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:1121 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "La validation %s n'a pas de signature GPG." + +#: commit.c:1124 +#, 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:1378 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" @@ -1427,76 +1453,92 @@ msgstr "" "variable de configuration i18n.commitencoding à l'encodage utilisé par votre " "projet.\n" -#: commit-graph.c:83 +#: commit-graph.c:108 #, c-format msgid "graph file %s is too small" msgstr "le fichier de graphe %s est trop petit" -#: commit-graph.c:90 +#: commit-graph.c:115 #, c-format msgid "graph signature %X does not match signature %X" msgstr "la signature de graphe %X ne correspond pas à la signature %X" -#: commit-graph.c:97 +#: commit-graph.c:122 #, c-format msgid "graph version %X does not match version %X" msgstr "la version %X du graphe ne correspond pas à la version %X" -#: commit-graph.c:104 +#: commit-graph.c:129 #, c-format msgid "hash version %X does not match version %X" msgstr "la version %X du condensé ne correspond pas à la version %X" -#: commit-graph.c:128 +#: commit-graph.c:153 #, c-format msgid "improper chunk offset %08x%08x" msgstr "décalage de bloc %08x%08x inadéquat" -#: commit-graph.c:164 +#: commit-graph.c:189 #, c-format msgid "chunk id %08x appears multiple times" msgstr "l'id de bloc %08x apparaît des multiples fois" -#: commit-graph.c:261 +#: commit-graph.c:308 #, c-format msgid "could not find commit %s" msgstr "impossible de trouver le commit %s" -#: commit-graph.c:565 builtin/pack-objects.c:2568 +#: commit-graph.c:617 builtin/pack-objects.c:2652 #, c-format msgid "unable to get type of object %s" msgstr "impossible d'obtenir le type de l'objet %s" -#: commit-graph.c:730 +#: commit-graph.c:651 +msgid "Annotating commits in commit graph" +msgstr "Annotation des commits dans un graphe de commit" + +#: commit-graph.c:691 +msgid "Computing commit graph generation numbers" +msgstr "Calcul des chiffres de génération du graphe de commits" + +#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852 +msgid "Finding commits for commit graph" +msgstr "Recherche de commits pour un graphe de commits" + +#: commit-graph.c:812 #, c-format msgid "error adding pack %s" msgstr "erreur à l'ajout du packet %s" -#: commit-graph.c:732 +#: commit-graph.c:814 #, c-format msgid "error opening index for %s" msgstr "erreur à l'ouverture de l'index pour %s" -#: commit-graph.c:773 +#: commit-graph.c:868 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "le graphe de commits ne peut pas écrire %d commits" -#: commit-graph.c:800 +#: commit-graph.c:895 msgid "too many commits to write graph" msgstr "trop de commits pour écrire un graphe" -#: commit-graph.c:806 +#: commit-graph.c:902 midx.c:769 #, 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:904 +#: commit-graph.c:1002 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:1046 +msgid "Verifying commits in commit graph" +msgstr "Verification des commits dans le graphe de commits" + #: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "plus de mémoire" @@ -1541,7 +1583,7 @@ msgstr "la clé ne contient pas de section: %s" msgid "key does not contain variable name: %s" msgstr "la clé ne contient pas de nom de variable : %s" -#: config.c:378 sequencer.c:2206 +#: config.c:378 sequencer.c:2296 #, c-format msgid "invalid key: %s" msgstr "clé invalide : %s" @@ -1674,155 +1716,155 @@ msgstr "core.commentChar ne devrait être qu'un unique caractère" msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1403 +#: config.c:1395 #, c-format msgid "malformed value for %s" msgstr "valeur mal formée pour %s" -#: config.c:1429 +#: config.c:1421 #, c-format msgid "malformed value for %s: %s" msgstr "valeur mal formée pour %s : %s" -#: config.c:1430 +#: config.c:1422 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "doit être parmi nothing, matching, simple, upstream ou current" -#: config.c:1489 builtin/pack-objects.c:3279 +#: config.c:1481 builtin/pack-objects.c:3389 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" -#: config.c:1610 +#: config.c:1602 #, c-format msgid "unable to load config blob object '%s'" msgstr "impossible de charger l'objet blob de config '%s'" -#: config.c:1613 +#: config.c:1605 #, 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:1630 +#: config.c:1622 #, c-format msgid "unable to resolve config blob '%s'" msgstr "impossible de résoudre le blob de config '%s'" -#: config.c:1660 +#: config.c:1652 #, c-format msgid "failed to parse %s" msgstr "échec de l'analyse de %s" -#: config.c:1700 +#: config.c:1705 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:2032 +#: config.c:2037 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:2202 +#: config.c:2207 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: config.c:2245 +#: config.c:2250 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par " "défaut" -#: config.c:2271 +#: config.c:2276 #, 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:2296 +#: config.c:2319 #, 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:2298 +#: config.c:2321 #, 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:2379 +#: config.c:2402 #, c-format msgid "invalid section name '%s'" msgstr "nom de section invalide '%s'" -#: config.c:2411 +#: config.c:2434 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2440 +#: config.c:2463 #, c-format msgid "failed to write new configuration file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2691 config.c:3015 +#: config.c:2714 config.c:3038 #, c-format msgid "could not lock config file %s" msgstr "impossible de verrouiller le fichier de configuration %s" -#: config.c:2702 +#: config.c:2725 #, c-format msgid "opening %s" msgstr "ouverture de %s" -#: config.c:2737 builtin/config.c:324 +#: config.c:2760 builtin/config.c:327 #, c-format msgid "invalid pattern: %s" msgstr "motif invalide : %s" -#: config.c:2762 +#: config.c:2785 #, c-format msgid "invalid config file %s" msgstr "fichier de configuration invalide %s" -#: config.c:2775 config.c:3028 +#: config.c:2798 config.c:3051 #, c-format msgid "fstat on %s failed" msgstr "échec de fstat sur %s" -#: config.c:2786 +#: config.c:2809 #, c-format msgid "unable to mmap '%s'" msgstr "impossible d réaliser un map de '%s'" -#: config.c:2795 config.c:3033 +#: config.c:2818 config.c:3056 #, c-format msgid "chmod on %s failed" msgstr "échec de chmod sur %s" -#: config.c:2880 config.c:3130 +#: config.c:2903 config.c:3153 #, c-format msgid "could not write config file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2914 +#: config.c:2937 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:2916 builtin/remote.c:781 +#: config.c:2939 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" -#: config.c:3006 +#: config.c:3029 #, c-format msgid "invalid section name: %s" msgstr "nom de section invalide : %s" -#: config.c:3173 +#: config.c:3196 #, c-format msgid "missing value for '%s'" msgstr "valeur manquante pour '%s'" @@ -1875,7 +1917,7 @@ msgstr "erreur de protocole : shallow sha-1 attendu, '%s' trouvé" msgid "repository on the other end cannot be shallow" msgstr "le dépôt distant ne peut pas être superficiel" -#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63 +#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "erreur distante : %s" @@ -1993,7 +2035,7 @@ msgstr "chemin étrange '%s' bloqué" msgid "unable to fork" msgstr "fork impossible" -#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146 +#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147 msgid "Checking connectivity" msgstr "Vérification de la connectivité" @@ -2129,12 +2171,12 @@ msgstr "" msgid "true/false are no valid working-tree-encodings" msgstr "true/false ne sont pas des encodages d'arbre de travail valides" -#: convert.c:1402 convert.c:1436 +#: convert.c:1398 convert.c:1432 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s : le filtre clean '%s' a échoué" -#: convert.c:1480 +#: convert.c:1476 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s : le filtre smudge '%s' a échoué" @@ -2207,12 +2249,36 @@ msgid_plural "% years ago" msgstr[0] "il y a % an" msgstr[1] "il y a % ans" +#: delta-islands.c:268 +msgid "Propagating island marks" +msgstr "Propagation des marques d'îlots" + +#: delta-islands.c:286 +#, c-format +msgid "bad tree object %s" +msgstr "objet arbre invalide %s" + +#: delta-islands.c:330 +#, c-format +msgid "failed to load island regex for '%s': %s" +msgstr "impossible de charger la regex île pour '%s' : %s" + +#: delta-islands.c:386 +#, c-format +msgid "island regex from config has too many capture groups (max=%d)" +msgstr "l'expression rationnelle depuis la configuration a trop de groupes de capture (max=%d)" + +#: delta-islands.c:462 +#, c-format +msgid "Marked %d islands, done.\n" +msgstr "Marquage de %d îlots, fait.\n" + #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:536 +#: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" @@ -2268,24 +2334,24 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:4096 +#: diff.c:4140 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:4427 +#: diff.c:4482 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:4430 +#: diff.c:4485 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S et --find-object sont mutuellement exclusifs" -#: diff.c:4508 +#: diff.c:4563 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:4674 +#: diff.c:4729 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2294,24 +2360,24 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4688 +#: diff.c:4743 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" -#: diff.c:5766 +#: diff.c:5823 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:5769 +#: diff.c:5826 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:5772 +#: diff.c:5829 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -2319,46 +2385,46 @@ msgstr "" "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le " "commande." -#: dir.c:569 +#: dir.c:576 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git" -#: dir.c:958 +#: dir.c:965 #, c-format msgid "cannot use %s as an exclude file" msgstr "impossible d'utiliser %s comme fichier d'exclusion" -#: dir.c:1873 +#: dir.c:1880 #, c-format msgid "could not open directory '%s'" msgstr "impossible d'ouvrir le répertoire '%s'" -#: dir.c:2115 +#: dir.c:2122 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2239 +#: dir.c:2246 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:3037 +#: dir.c:3047 #, c-format msgid "index file corrupt in repo %s" msgstr "fichier d'index corrompu dans le dépôt %s" -#: dir.c:3082 dir.c:3087 +#: dir.c:3092 dir.c:3097 #, c-format msgid "could not create directories for %s" msgstr "impossible de créer les répertoires pour %s" -#: dir.c:3116 +#: dir.c:3126 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" -#: editor.c:61 +#: editor.c:73 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" @@ -2369,7 +2435,7 @@ msgstr "" msgid "Filtering content" msgstr "Filtrage du contenu" -#: entry.c:437 +#: entry.c:465 #, c-format msgid "could not stat file '%s'" msgstr "impossible de stat le fichier '%s'" @@ -2393,77 +2459,77 @@ msgstr "trop d'arguments pour lancer %s" msgid "Remote with no URL" msgstr "Dépôt distant sans URL" -#: fetch-pack.c:152 +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack : list courte attendue" -#: fetch-pack.c:164 +#: fetch-pack.c:163 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu" -#: fetch-pack.c:184 +#: fetch-pack.c:183 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu" -#: fetch-pack.c:254 +#: fetch-pack.c:253 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc nécessite multi_ack_detailed" -#: fetch-pack.c:342 fetch-pack.c:1257 +#: fetch-pack.c:347 fetch-pack.c:1277 #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalide : %s" -#: fetch-pack.c:348 fetch-pack.c:1263 +#: fetch-pack.c:353 fetch-pack.c:1283 #, c-format msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" -#: fetch-pack.c:350 fetch-pack.c:1265 +#: fetch-pack.c:355 fetch-pack.c:1285 #, c-format msgid "object not found: %s" msgstr "objet non trouvé : %s" -#: fetch-pack.c:353 fetch-pack.c:1268 +#: fetch-pack.c:358 fetch-pack.c:1288 #, c-format msgid "error in object: %s" msgstr "Erreur dans l'objet : %s" -#: fetch-pack.c:355 fetch-pack.c:1270 +#: fetch-pack.c:360 fetch-pack.c:1290 #, c-format msgid "no shallow found: %s" msgstr "Pas de superficiel trouvé : %s" -#: fetch-pack.c:358 fetch-pack.c:1273 +#: fetch-pack.c:363 fetch-pack.c:1293 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "superficiel/non superficiel attendu, %s trouvé" -#: fetch-pack.c:399 +#: fetch-pack.c:404 #, c-format msgid "got %s %d %s" msgstr "réponse %s %d %s" -#: fetch-pack.c:416 +#: fetch-pack.c:421 #, c-format msgid "invalid commit %s" msgstr "commit invalide %s" -#: fetch-pack.c:447 +#: fetch-pack.c:452 msgid "giving up" msgstr "abandon" -#: fetch-pack.c:459 progress.c:229 +#: fetch-pack.c:464 progress.c:229 msgid "done" msgstr "fait" -#: fetch-pack.c:471 +#: fetch-pack.c:476 #, c-format msgid "got %s (%d) %s" msgstr "%s trouvé (%d) %s" -#: fetch-pack.c:517 +#: fetch-pack.c:522 #, c-format msgid "Marking %s as complete" msgstr "Marquage de %s comme terminé" @@ -2531,7 +2597,7 @@ msgstr "Le serveur supporte allow-reachable-sha1-in-want" msgid "Server supports ofs-delta" msgstr "Le serveur supporte ofs-delta" -#: fetch-pack.c:971 fetch-pack.c:1150 +#: fetch-pack.c:971 fetch-pack.c:1158 msgid "Server supports filter" msgstr "Le serveur supporte filter" @@ -2552,85 +2618,93 @@ msgstr "Le receveur ne gère pas --shallow-exclude" msgid "Server does not support --deepen" msgstr "Le receveur ne gère pas --deepen" -#: fetch-pack.c:1004 +#: fetch-pack.c:1008 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:1016 fetch-pack.c:1393 +#: fetch-pack.c:1020 fetch-pack.c:1418 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." -#: fetch-pack.c:1145 +#: fetch-pack.c:1153 msgid "Server does not support shallow requests" msgstr "Le serveur ne supporte les requêtes superficielles" -#: fetch-pack.c:1191 +#: fetch-pack.c:1199 #, c-format msgid "error reading section header '%s'" msgstr "erreur à la lecture de l'entête de section '%s'" -#: fetch-pack.c:1197 +#: fetch-pack.c:1205 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' attendu, '%s' reçu" -#: fetch-pack.c:1236 +#: fetch-pack.c:1244 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "ligne d'acquittement inattendue : '%s'" -#: fetch-pack.c:1241 +#: fetch-pack.c:1249 #, c-format msgid "error processing acks: %d" msgstr "erreur lors du traitement des acquittements : %d" -#: fetch-pack.c:1278 +#: fetch-pack.c:1259 +msgid "expected packfile to be sent after 'ready'" +msgstr "fichier paquet attendu à envoyer après 'ready'" + +#: fetch-pack.c:1261 +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:1298 #, c-format msgid "error processing shallow info: %d" msgstr "erreur lors du traitement de l'information de superficialité : %d" -#: fetch-pack.c:1294 +#: fetch-pack.c:1314 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref attendu, '%s' trouvé" -#: fetch-pack.c:1304 +#: fetch-pack.c:1324 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inattendu : '%s'" -#: fetch-pack.c:1308 +#: fetch-pack.c:1328 #, c-format msgid "error processing wanted refs: %d" msgstr "erreur lors du traitement des références voulues : %d" -#: fetch-pack.c:1603 +#: fetch-pack.c:1642 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1621 builtin/clone.c:664 +#: fetch-pack.c:1660 builtin/clone.c:664 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: fetch-pack.c:1647 +#: fetch-pack.c:1686 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:1650 +#: fetch-pack.c:1689 #, 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:253 +#: gpg-interface.c:318 msgid "gpg failed to sign the data" msgstr "gpg n'a pas pu signer les données" -#: gpg-interface.c:279 +#: gpg-interface.c:344 msgid "could not create temporary file" msgstr "impossible de créer un fichier temporaire" -#: gpg-interface.c:282 +#: gpg-interface.c:347 #, c-format msgid "failed writing detached signature to '%s'" msgstr "impossible d'écrire la signature détachée dans '%s'" @@ -2640,18 +2714,18 @@ msgstr "impossible d'écrire la signature détachée dans '%s'" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "couleur invalide '%.*s' ignorée dans log.graphColors" -#: grep.c:2115 +#: grep.c:2113 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 +#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 #: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: grep.c:2143 +#: grep.c:2141 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquée" @@ -2709,29 +2783,41 @@ msgstr "Commandes bas niveau / Synchronisation de dépôts" msgid "Low-level Commands / Internal Helpers" msgstr "Commandes bas niveau / Assistants internes" -#: help.c:293 +#: help.c:296 #, c-format msgid "available git commands in '%s'" msgstr "commandes git disponibles dans '%s'" -#: help.c:300 +#: help.c:303 msgid "git commands available from elsewhere on your $PATH" msgstr "commandes git disponibles depuis un autre endroit de votre $PATH" -#: help.c:309 +#: help.c:312 msgid "These are common Git commands used in various situations:" msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :" -#: help.c:358 git.c:90 +#: help.c:361 git.c:90 #, c-format msgid "unsupported command listing type '%s'" msgstr "type de liste de commandes non supporté '%s'" -#: help.c:405 +#: help.c:408 msgid "The common Git guides are:" msgstr "Les guides Git populaires sont :" -#: help.c:552 +#: help.c:517 +msgid "See 'git help ' to read about a specific subcommand" +msgstr "Référez-vous à 'git help ' pour des informations sur une sous-commande spécifique" + +#: help.c:522 +msgid "External commands" +msgstr "Commandes externes" + +#: help.c:530 +msgid "Command aliases" +msgstr "Alias de commande" + +#: help.c:594 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -2740,33 +2826,33 @@ msgstr "" "'%s' semble être une commande git, mais elle n'a pas pu\n" "être exécutée. Peut-être git-%s est-elle cassée ?" -#: help.c:611 +#: help.c:653 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ahem. Votre système n'indique aucune commande Git." -#: help.c:633 +#: help.c:675 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" "ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas." -#: help.c:638 +#: help.c:680 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Continuons en supposant que vous avez voulu dire '%s'." -#: help.c:643 +#: help.c:685 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" "Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'." -#: help.c:651 +#: help.c:693 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'." -#: help.c:655 +#: help.c:697 msgid "" "\n" "The most similar command is" @@ -2780,16 +2866,16 @@ msgstr[1] "" "\n" "Les commandes les plus ressemblantes sont" -#: help.c:670 +#: help.c:712 msgid "git version []" msgstr "git version []" -#: help.c:738 +#: help.c:780 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:742 +#: help.c:784 msgid "" "\n" "Did you mean this?" @@ -2803,7 +2889,7 @@ msgstr[1] "" "\n" "Vouliez-vous dire un de ceux-là ?" -#: ident.c:342 +#: ident.c:345 msgid "" "\n" "*** Please tell me who you are.\n" @@ -2829,44 +2915,48 @@ msgstr "" "Éliminez --global pour ne faire les réglages que dans ce dépôt.\n" "\n" -#: ident.c:366 +#: ident.c:369 msgid "no email was given and auto-detection is disabled" msgstr "aucun courriel fourni et l'auto-détection est désactivée" -#: ident.c:371 +#: ident.c:374 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "impossible de détecter automatiquement l'adresse ('%s' trouvé)" -#: ident.c:381 +#: ident.c:384 msgid "no name was given and auto-detection is disabled" msgstr "aucun nom fourni et l'auto-détection est désactivée" -#: ident.c:387 +#: ident.c:390 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "impossible de détecter automatiquement le nom ('%s' trouvé)" -#: ident.c:395 +#: ident.c:398 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "nom d'identifiant vide (pour <%s>) non permis" -#: ident.c:401 +#: ident.c:404 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "le nom n'est constitué que de caractères interdits : %s" -#: ident.c:416 builtin/commit.c:600 +#: ident.c:419 builtin/commit.c:606 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" -#: list-objects-filter-options.c:36 +#: list-objects-filter-options.c:35 msgid "multiple filter-specs cannot be combined" msgstr "impossible de combiner des spécificateurs multiples de filtre" -#: list-objects-filter-options.c:126 +#: list-objects-filter-options.c:58 +msgid "only 'tree:0' is supported" +msgstr "seul 'tree:0' est supporté" + +#: list-objects-filter-options.c:137 msgid "cannot change partial clone promisor remote" msgstr "impossible de modifier le prometteur distant de clone partiel" @@ -2894,120 +2984,120 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Impossible de créer '%s.lock' : %s" -#: merge.c:40 +#: merge.c:41 msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380 -#: builtin/checkout.c:608 builtin/clone.c:763 +#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933 +#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" -#: merge-recursive.c:303 +#: merge-recursive.c:323 msgid "(bad commit)\n" msgstr "(mauvais commit)\n" -#: merge-recursive.c:325 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion." -#: merge-recursive.c:333 +#: merge-recursive.c:353 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion." -#: merge-recursive.c:415 +#: merge-recursive.c:435 msgid "error building trees" msgstr "erreur de construction des arbres" -#: merge-recursive.c:886 +#: merge-recursive.c:906 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:897 +#: merge-recursive.c:917 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n" -#: merge-recursive.c:911 merge-recursive.c:930 +#: merge-recursive.c:931 merge-recursive.c:950 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:920 +#: merge-recursive.c:940 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:962 builtin/cat-file.c:39 +#: merge-recursive.c:982 builtin/cat-file.c:39 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:964 +#: merge-recursive.c:984 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:988 +#: merge-recursive.c:1008 #, c-format msgid "failed to open '%s': %s" msgstr "échec à l'ouverture de '%s' : %s" -#: merge-recursive.c:999 +#: merge-recursive.c:1019 #, c-format msgid "failed to symlink '%s': %s" msgstr "échec à la création du lien symbolique '%s' : %s" -#: merge-recursive.c:1004 +#: merge-recursive.c:1024 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:1191 +#: merge-recursive.c:1212 #, 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 +#: merge-recursive.c:1219 #, 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 +#: merge-recursive.c:1226 #, 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 +#: merge-recursive.c:1234 merge-recursive.c:1246 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Avance rapide du sous-module %s au commit suivant :" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1237 merge-recursive.c:1249 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rapide du sous-module %s" -#: merge-recursive.c:1250 +#: merge-recursive.c:1271 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)" -#: merge-recursive.c:1254 +#: merge-recursive.c:1275 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Échec de fusion du sous-module %s (pas en avance rapide)" -#: merge-recursive.c:1255 +#: merge-recursive.c:1276 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:1258 +#: merge-recursive.c:1279 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3024,33 +3114,33 @@ msgstr "" "\n" "qui acceptera cette suggestion.\n" -#: merge-recursive.c:1267 +#: merge-recursive.c:1288 #, 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:1326 +#: merge-recursive.c:1358 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-recursive.c:1331 +#: merge-recursive.c:1363 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-recursive.c:1363 +#: merge-recursive.c:1395 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1434 +#: merge-recursive.c:1416 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la " "place." -#: merge-recursive.c:1501 +#: merge-recursive.c:1483 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3059,7 +3149,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre." -#: merge-recursive.c:1506 +#: merge-recursive.c:1488 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3068,7 +3158,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " "%s de %s laissée dans l'arbre." -#: merge-recursive.c:1513 +#: merge-recursive.c:1495 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3077,7 +3167,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1518 +#: merge-recursive.c:1500 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3086,31 +3176,31 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " "%s de %s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1552 +#: merge-recursive.c:1534 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1552 +#: merge-recursive.c:1534 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394 -#: merge-recursive.c:3129 +#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369 +#: merge-recursive.c:3124 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Refus de perdre le fichier modifié %s" -#: merge-recursive.c:1620 +#: merge-recursive.c:1602 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s est un répertoire dans %s ajouté plutôt comme %s" -#: merge-recursive.c:1625 +#: merge-recursive.c:1607 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place" -#: merge-recursive.c:1651 +#: merge-recursive.c:1633 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3119,28 +3209,28 @@ msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1656 +#: merge-recursive.c:1638 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1720 +#: merge-recursive.c:1699 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-" ">'%s' dans %s" -#: merge-recursive.c:1759 +#: merge-recursive.c:1734 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Renommage de %s en %s et de %s en %s à la place" -#: merge-recursive.c:1771 +#: merge-recursive.c:1746 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne." -#: merge-recursive.c:1977 +#: merge-recursive.c:1952 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3151,7 +3241,7 @@ 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:2009 +#: merge-recursive.c:1984 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3160,7 +3250,7 @@ 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:2019 +#: merge-recursive.c:1994 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3169,7 +3259,7 @@ msgstr "" "CONFLIT (renommage implicite de répertoire) : impossible de transformer " "plusieurs chemins sur %s ; les chemins concernés sont : %s" -#: merge-recursive.c:2111 +#: merge-recursive.c:2086 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3178,7 +3268,7 @@ msgstr "" "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. " "Renommage de répertoire %s->%s dans %s" -#: merge-recursive.c:2356 +#: merge-recursive.c:2331 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3187,87 +3277,87 @@ msgstr "" "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été " "renommé." -#: merge-recursive.c:2762 +#: merge-recursive.c:2737 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s" -#: merge-recursive.c:2777 +#: merge-recursive.c:2763 #, c-format msgid "Adding merged %s" msgstr "Ajout de %s fusionné" -#: merge-recursive.c:2784 merge-recursive.c:3132 +#: merge-recursive.c:2770 merge-recursive.c:3127 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:2941 +#: merge-recursive.c:2934 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-recursive.c:2944 +#: merge-recursive.c:2937 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-recursive.c:3013 +#: merge-recursive.c:3006 msgid "modify" msgstr "modification" -#: merge-recursive.c:3013 +#: merge-recursive.c:3006 msgid "modified" msgstr "modifié" -#: merge-recursive.c:3024 +#: merge-recursive.c:3017 msgid "content" msgstr "contenu" -#: merge-recursive.c:3031 +#: merge-recursive.c:3024 msgid "add/add" msgstr "ajout/ajout" -#: merge-recursive.c:3076 +#: merge-recursive.c:3071 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:3098 git-submodule.sh:865 +#: merge-recursive.c:3093 git-submodule.sh:858 msgid "submodule" msgstr "sous-module" -#: merge-recursive.c:3099 +#: merge-recursive.c:3094 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-recursive.c:3221 +#: merge-recursive.c:3216 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:3247 +#: merge-recursive.c:3242 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:3253 +#: merge-recursive.c:3248 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:3260 +#: merge-recursive.c:3255 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s" -#: merge-recursive.c:3269 +#: merge-recursive.c:3264 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:3303 +#: merge-recursive.c:3300 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3277,40 +3367,167 @@ msgstr "" "fusion :\n" " %s" -#: merge-recursive.c:3314 +#: merge-recursive.c:3311 msgid "Already up to date!" msgstr "Déjà à jour !" -#: merge-recursive.c:3323 +#: merge-recursive.c:3320 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:3422 +#: merge-recursive.c:3419 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:3435 +#: merge-recursive.c:3432 #, 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:3474 +#: merge-recursive.c:3471 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:3540 +#: merge-recursive.c:3537 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846 +#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." -#: notes-merge.c:274 +#: midx.c:65 +#, c-format +msgid "multi-pack-index file %s is too small" +msgstr "le fichier d'index multi-paquet %s est trop petit" + +#: midx.c:81 +#, c-format +msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" +msgstr "la signature de d'index multi-paquet 0x%08x ne correspond pas à la signature 0x%08x" + +#: midx.c:86 +#, c-format +msgid "multi-pack-index version %d not recognized" +msgstr "la version d'index multi-paquet %d n'est pas reconnue" + +#: midx.c:91 +#, c-format +msgid "hash version %u does not match" +msgstr "la version %u du condensé ne correspond pas" + +#: midx.c:105 +msgid "invalid chunk offset (too large)" +msgstr "décalage de section invalide (trop grand)" + +#: midx.c:129 +msgid "terminating multi-pack-index chunk id appears earlier than expected" +msgstr "identifiant de terminaison de tronçon d'index multi-paquet terminant apparaît plus tôt qu'attendu" + +#: midx.c:142 +msgid "multi-pack-index missing required pack-name chunk" +msgstr "index multi-paquet manque de tronçon de nom de paquet" + +#: midx.c:144 +msgid "multi-pack-index missing required OID fanout chunk" +msgstr "index multi-paquet manque de tronçon de d'étalement OID requis" + +#: midx.c:146 +msgid "multi-pack-index missing required OID lookup chunk" +msgstr "index multi-paquet manque de tronçon de recherche OID" + +#: midx.c:148 +msgid "multi-pack-index missing required object offsets chunk" +msgstr "index multi-paquet manque de tronçon de décalage d'objet" + +#: midx.c:162 +#, c-format +msgid "multi-pack-index pack names out of order: '%s' before '%s'" +msgstr "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'" + +#: midx.c:205 +#, c-format +msgid "bad pack-int-id: %u (%u total packs" +msgstr "mauvais pack-int-id : %u (%u paquets au total)" + +#: midx.c:246 +msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" +msgstr "multi-pack-index stock un décalage en 64-bit, mais off_t est trop petit" + +#: midx.c:271 +msgid "error preparing packfile from multi-pack-index" +msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet" + +#: midx.c:407 +#, c-format +msgid "failed to add packfile '%s'" +msgstr "échec de l'ajout du fichier paquet '%s'" + +#: midx.c:413 +#, c-format +msgid "failed to open pack-index '%s'" +msgstr "échec à l'ouverture du fichier paquet '%s'" + +#: midx.c:507 +#, c-format +msgid "failed to locate object %d in packfile" +msgstr "échec de localisation de l'objet %d dans le fichier paquet" + +#: midx.c:943 +#, c-format +msgid "failed to clear multi-pack-index at %s" +msgstr "échec du nettoyage de l'index de multi-paquet à %s" + +#: midx.c:981 +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = % > % = fanout[%d]" +msgstr "étalement oid en désordre : étalement[%d] = % > % = étalement[%d]" + +#: midx.c:992 +#, c-format +msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" +msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]" + +#: midx.c:996 +msgid "Verifying object offsets" +msgstr "Vérification des décalages des objets" + +#: midx.c:1004 +#, c-format +msgid "failed to load pack entry for oid[%d] = %s" +msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s" + +#: midx.c:1010 +#, c-format +msgid "failed to load pack-index for packfile %s" +msgstr "impossible de lire le fichier paquet %s" + +#: midx.c:1019 +#, c-format +msgid "incorrect object offset for oid[%d] = %s: % != %" +msgstr "décalage d'objet incorrecte pour oid[%d] = %s : % != %" + +#: name-hash.c:532 +#, c-format +msgid "unable to create lazy_dir thread: %s" +msgstr "impossible de créer le fil lazy_dir : %s" + +#: name-hash.c:554 +#, c-format +msgid "unable to create lazy_name thread: %s" +msgstr "impossible de créer le fil lazy_name : %s" + +#: name-hash.c:560 +#, c-format +msgid "unable to join lazy_name thread: %s" +msgstr "impossible de joindre le fil lazy_name : %s" + +#: notes-merge.c:275 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -3321,7 +3538,7 @@ msgstr "" "Veuillez utiliser 'git notes merge --commit' ou 'git notes merge --abort' " "pour valider/abandonner la fusion en cours avant d'en démarrer une nouvelle." -#: notes-merge.c:281 +#: notes-merge.c:282 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)." @@ -3374,16 +3591,16 @@ msgstr "impossible d'analyser l'objet : %s" msgid "sha1 mismatch %s" msgstr "incohérence de sha1 %s" -#: packfile.c:563 +#: packfile.c:607 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" -#: packfile.c:1745 +#: packfile.c:1864 #, 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:1749 +#: packfile.c:1868 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -3415,17 +3632,17 @@ msgstr " %s" msgid "-NUM" msgstr "-NUM" -#: parse-options-cb.c:44 +#: parse-options-cb.c:37 #, c-format msgid "malformed expiration date '%s'" msgstr "date d'expiration malformée : '%s'" -#: parse-options-cb.c:112 +#: parse-options-cb.c:109 #, c-format msgid "malformed object name '%s'" msgstr "nom d'objet malformé '%s'" -#: path.c:892 +#: path.c:894 #, c-format msgid "Could not make %s writable by group" msgstr "Impossible de rendre %s inscriptible pour le groupe" @@ -3549,33 +3766,46 @@ msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s" msgid "protocol error: bad line length %d" msgstr "erreur de protocole : mauvaise longueur de ligne %d" +#: preload-index.c:118 +msgid "Refreshing index" +msgstr "Rafraîchissement de l'index" + +#: preload-index.c:137 +#, c-format +msgid "unable to create threaded lstat: %s" +msgstr "impossible de créer le lstat en fil : %s" + #: pretty.c:962 msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: range-diff.c:48 +#: range-diff.c:56 msgid "could not start `log`" msgstr "impossible de démarrer `log`" -#: range-diff.c:51 +#: range-diff.c:59 msgid "could not read `log` output" msgstr "impossible de lire la sortie de `log`" -#: range-diff.c:66 sequencer.c:4540 +#: range-diff.c:74 sequencer.c:4764 #, c-format msgid "could not parse commit '%s'" msgstr "impossible d'analyser le commit '%s'" -#: range-diff.c:196 +#: range-diff.c:224 msgid "failed to generate diff" msgstr "échec de la génération de diff" -#: range-diff.c:421 range-diff.c:423 +#: range-diff.c:455 range-diff.c:457 #, c-format msgid "could not parse log for '%s'" msgstr "impossible d'analyser le journal pour '%s'" -#: read-cache.c:1579 +#: read-cache.c:1490 +msgid "Refresh index" +msgstr "Rafraîchir l'index" + +#: read-cache.c:1604 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -3584,7 +3814,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1589 +#: read-cache.c:1614 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -3593,135 +3823,260 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083 +#: read-cache.c:1792 +#, c-format +msgid "malformed name field in the index, near path '%s'" +msgstr "champ de nom malformé dans l'index, près du chemin '%s'" + +#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458 +#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585 +#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343 +#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144 +#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329 +msgid "index file corrupt" +msgstr "fichier d'index corrompu" + +#: read-cache.c:2101 +#, c-format +msgid "unable to create load_cache_entries thread: %s" +msgstr "impossible de créer le fil load_cache_entries : %s" + +#: read-cache.c:2114 +#, c-format +msgid "unable to join load_cache_entries thread: %s" +msgstr "impossible de joindre le fil load_cach_entries : %s" + +#: read-cache.c:2200 +#, c-format +msgid "unable to create load_index_extensions thread: %s" +msgstr "impossible de créer le fil load_index_extensions : %s" + +#: read-cache.c:2227 +#, c-format +msgid "unable to join load_index_extensions thread: %s" +msgstr "impossible de joindre le fil load_index_extensions : %s" + +#: read-cache.c:2953 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374 +#: read-cache.c:3026 sequencer.c:2203 sequencer.c:3592 #, c-format msgid "could not stat '%s'" msgstr "stat impossible de '%s'" -#: read-cache.c:2666 +#: read-cache.c:3039 #, c-format msgid "unable to open git dir: %s" msgstr "impossible d'ouvrir le répertoire git : %s" -#: read-cache.c:2678 +#: read-cache.c:3051 #, c-format msgid "unable to unlink: %s" msgstr "échec lors de l'unlink : %s" +#: rebase-interactive.c:10 +msgid "" +"\n" +"Commands:\n" +"p, pick = use commit\n" +"r, reword = use commit, but edit the commit message\n" +"e, edit = use commit, but stop for amending\n" +"s, squash = use commit, but meld into previous commit\n" +"f, fixup = like \"squash\", but discard this commit's log message\n" +"x, exec = run command (the rest of the line) using shell\n" +"b, break = stop here (continue rebase later with 'git rebase --continue')\n" +"d, drop = remove commit\n" +"l, label