diff options
Diffstat (limited to 'po/fr.po')
| -rw-r--r-- | po/fr.po | 16248 |
1 files changed, 12088 insertions, 4160 deletions
@@ -1,7 +1,7 @@ # French translations for Git. -# Copyright (C) 2015 Jean-Noël Avila <jn.avila@free.fr> +# Copyright (C) 2018 Jean-Noël Avila <jn.avila@free.fr> # This file is distributed under the same license as the Git package. -# Jean-Noël Avila <jn.avila@free.fr>, 2015. +# Jean-Noël Avila <jn.avila@free.fr>, 2018. # Sébastien Helleu <flashcode@flashtux.org>, 2013. # # French translations of common Git words used in this file: @@ -28,7 +28,7 @@ # to debug | déboguer # debugging | débogage # to deflate | compresser -# email | e-mail +# email | courriel # entry | élément # fast-forward | avance rapide # fast-forwarded | mis à jour en avance rapide @@ -50,6 +50,7 @@ # to prune | éliminer # to push | pousser # to rebase | rebaser +# trailers | lignes terminales # repository | dépôt # remote | distante (ou serveur distant) # revision | révision @@ -73,8 +74,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-05-24 23:42+0800\n" -"PO-Revision-Date: 2016-05-26 22:46+0200\n" +"POT-Creation-Date: 2018-09-04 08:50+0800\n" +"PO-Revision-Date: 2018-09-05 22:18+0200\n" "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -83,12 +84,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" -#: advice.c:55 +#: advice.c:97 #, c-format -msgid "hint: %.*s\n" -msgstr "astuce: %.*s\n" +msgid "%shint: %.*s%s\n" +msgstr "%sastuce: %.*s%s\n" -#: advice.c:88 +#: advice.c:150 +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 +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 +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 +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 +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 +#, 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 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -96,112 +122,876 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nécessaire pour marquer la résolution et valider." -#: advice.c:101 builtin/merge.c:1238 +#: advice.c:176 +msgid "Exiting because of an unresolved conflict." +msgstr "Abandon à cause de conflit non résolu." + +#: advice.c:181 builtin/merge.c:1286 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: advice.c:103 +#: advice.c:183 msgid "Please, commit your changes before merging." msgstr "Veuillez valider vos changements avant de fusionner." -#: advice.c:104 +#: advice.c:184 msgid "Exiting because of unfinished merge." msgstr "Abandon à cause d'une fusion non terminée." -#: archive.c:12 +#: advice.c:190 +#, c-format +msgid "" +"Note: checking out '%s'.\n" +"\n" +"You are in 'detached HEAD' state. You can look around, make experimental\n" +"changes and commit them, and you can discard any commits you make in this\n" +"state without impacting any branches by performing another checkout.\n" +"\n" +"If you want to create a new branch to retain commits you create, you may\n" +"do so (now or later) by using -b with the checkout command again. Example:\n" +"\n" +" git checkout -b <new-branch-name>\n" +"\n" +msgstr "" +"Note : extraction de '%s'.\n" +"\n" +"Vous êtes dans l'état « HEAD détachée ». Vous pouvez visiter, faire des " +"modifications\n" +"expérimentales et les valider. Il vous suffit de faire une autre extraction " +"pour\n" +"abandonner les commits que vous faites dans cet état sans impacter les " +"autres branches\n" +"\n" +"Si vous voulez créer une nouvelle branche pour conserver les commits que " +"vous créez,\n" +"il vous suffit d'utiliser « checkout -b » (maintenant ou plus tard) comme " +"ceci :\n" +"\n" +" git checkout -b <nom-de-la-nouvelle-branche>\n" +"\n" + +#: apply.c:59 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "option d'espace non reconnue '%s'" + +#: apply.c:75 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "option d'ignorance d'espace non reconnue '%s'" + +#: apply.c:125 +msgid "--reject and --3way cannot be used together." +msgstr "--reject et --3way ne peuvent pas être utilisés ensemble." + +#: apply.c:127 +msgid "--cached and --3way cannot be used together." +msgstr "--cached et --3way ne peuvent pas être utilisés ensemble." + +#: apply.c:130 +msgid "--3way outside a repository" +msgstr "--3way hors d'un dépôt" + +#: apply.c:141 +msgid "--index outside a repository" +msgstr "--index hors d'un dépôt" + +#: apply.c:144 +msgid "--cached outside a repository" +msgstr "--cached hors d'un dépôt" + +#: apply.c:826 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "Impossible de préparer la regexp d'horodatage %s" + +#: apply.c:835 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec a retourné %d pour l'entrée : %s" + +#: apply.c:909 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "nom de fichier du patch introuvable à la ligne %d" + +#: apply.c:947 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "" +"git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " +"ligne %d" + +#: apply.c:953 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "" +"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " +"à la ligne %d" + +#: apply.c:954 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "" +"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " +"à la ligne %d" + +#: apply.c:959 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "" +"git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" + +#: apply.c:988 +#, c-format +msgid "invalid mode on line %d: %s" +msgstr "mode invalide dans la ligne %d : %s" + +#: apply.c:1306 +#, c-format +msgid "inconsistent header lines %d and %d" +msgstr "lignes d'entête inconsistantes %d et %d" + +#: apply.c:1478 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recomptage : ligne inattendue : %.*s" + +#: apply.c:1547 +#, 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 +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname " +"component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" +msgstr[0] "" +"information de nom de fichier manquante dans l'en-tête de git diff lors de " +"la suppression de %d composant de préfixe de chemin (ligne %d)" +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 +#, 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 +msgid "new file depends on old contents" +msgstr "le nouveau fichier dépend de contenus anciens" + +#: apply.c:1770 +msgid "deleted file still has contents" +msgstr "le fichier supprimé a encore du contenu" + +#: apply.c:1804 +#, c-format +msgid "corrupt patch at line %d" +msgstr "patch corrompu à la ligne %d" + +#: apply.c:1841 +#, c-format +msgid "new file %s depends on old contents" +msgstr "le nouveau fichier %s dépend de contenus anciens" + +#: apply.c:1843 +#, c-format +msgid "deleted file %s still has contents" +msgstr "le fichier supprimé %s a encore du contenu" + +#: apply.c:1846 +#, 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 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "patch binaire corrompu à la ligne %d : %.*s" + +#: apply.c:2030 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "patch binaire non reconnu à la ligne %d" + +#: apply.c:2190 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "patch totalement incompréhensible à la ligne %d" + +#: apply.c:2276 +#, c-format +msgid "unable to read symlink %s" +msgstr "lecture du lien symbolique %s impossible" + +#: apply.c:2280 +#, c-format +msgid "unable to open or read %s" +msgstr "ouverture ou lecture de %s impossible" + +#: apply.c:2939 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "début de ligne invalide : '%c'" + +#: apply.c:3060 +#, 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 +#, 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 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"pendant la recherche de :\n" +"%.*s" + +#: apply.c:3100 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "données de patch binaire manquantes pour '%s'" + +#: apply.c:3108 +#, 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 +#, 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 +#, 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 +#, 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 +#, 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 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "le patch binaire ne s'applique par correctement à '%s'" + +#: apply.c:3209 +#, 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 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "le patch a échoué : %s:%ld" + +#: apply.c:3352 +#, c-format +msgid "cannot checkout %s" +msgstr "extraction de %s impossible" + +#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278 +#, c-format +msgid "failed to read %s" +msgstr "échec de la lecture de %s" + +#: apply.c:3412 +#, 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 +#, c-format +msgid "path %s has been renamed/deleted" +msgstr "le chemin %s a été renommé/supprimé" + +#: apply.c:3524 apply.c:3696 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s : n'existe pas dans l'index" + +#: apply.c:3533 apply.c:3704 +#, c-format +msgid "%s: does not match index" +msgstr "%s : ne correspond pas à l'index" + +#: apply.c:3568 +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 +#, c-format +msgid "Falling back to three-way merge...\n" +msgstr "Retour à une fusion à 3 points…\n" + +#: apply.c:3587 apply.c:3591 +#, c-format +msgid "cannot read the current contents of '%s'" +msgstr "impossible de lire le contenu actuel de '%s'" + +#: apply.c:3603 +#, c-format +msgid "Failed to fall back on three-way merge...\n" +msgstr "Echec du retour à une fusion à 3 points…\n" + +#: apply.c:3617 +#, c-format +msgid "Applied patch to '%s' with conflicts.\n" +msgstr "Patch %s appliqué avec des conflits.\n" + +#: apply.c:3622 +#, c-format +msgid "Applied patch to '%s' cleanly.\n" +msgstr "Patch %s appliqué proprement.\n" + +#: apply.c:3648 +msgid "removal patch leaves file contents" +msgstr "le patch de suppression laisse un contenu dans le fichier" + +#: apply.c:3721 +#, c-format +msgid "%s: wrong type" +msgstr "%s : type erroné" + +#: apply.c:3723 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s est de type %o, mais %o attendu" + +#: apply.c:3874 apply.c:3876 +#, c-format +msgid "invalid path '%s'" +msgstr "chemin invalide '%s'" + +#: apply.c:3932 +#, c-format +msgid "%s: already exists in index" +msgstr "%s : existe déjà dans l'index" + +#: apply.c:3935 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s : existe déjà dans la copie de travail" + +#: apply.c:3955 +#, 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 +#, 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 +#, 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 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s : le patch ne s'applique pas" + +#: apply.c:3999 +#, c-format +msgid "Checking patch %s..." +msgstr "Vérification du patch %s..." + +#: apply.c:4091 +#, 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 +#, 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 +#, 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 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "échec de make_cache_entry pour le chemin '%s'" + +#: apply.c:4110 +#, c-format +msgid "could not add %s to temporary index" +msgstr "impossible d'ajouter %s à l'index temporaire" + +#: apply.c:4120 +#, c-format +msgid "could not write temporary index to %s" +msgstr "impossible d'écrire l'index temporaire dans %s" + +#: apply.c:4258 +#, c-format +msgid "unable to remove %s from index" +msgstr "suppression de %s dans l'index impossible" + +#: apply.c:4292 +#, c-format +msgid "corrupt patch for submodule %s" +msgstr "patch corrompu pour le sous-module %s" + +#: apply.c:4298 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "stat du fichier nouvellement créé '%s' impossible" + +#: apply.c:4306 +#, 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 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "ajout de l'élément de cache %s impossible" + +#: apply.c:4355 +#, c-format +msgid "failed to write to '%s'" +msgstr "échec de l'écriture dans '%s'" + +#: apply.c:4359 +#, c-format +msgid "closing file '%s'" +msgstr "fermeture du fichier '%s'" + +#: apply.c:4429 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "écriture du fichier '%s' mode %o impossible" + +#: apply.c:4527 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Patch %s appliqué proprement." + +#: apply.c:4535 +msgid "internal error" +msgstr "erreur interne" + +#: apply.c:4538 +#, 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 +#, 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 +#, c-format +msgid "cannot open %s" +msgstr "impossible d'ouvrir %s" + +#: apply.c:4571 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Section n°%d appliquée proprement." + +#: apply.c:4575 +#, c-format +msgid "Rejected hunk #%d." +msgstr "Section n°%d rejetée." + +#: apply.c:4685 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Chemin '%s' non traité." + +#: apply.c:4693 +msgid "unrecognized input" +msgstr "entrée non reconnue" + +#: apply.c:4712 +msgid "unable to read index file" +msgstr "lecture du fichier d'index impossible" + +#: apply.c:4849 +#, c-format +msgid "can't open patch '%s': %s" +msgstr "ouverture impossible du patch '%s' :%s" + +#: apply.c:4876 +#, 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 +#, 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 +#, 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 +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 +msgid "path" +msgstr "chemin" + +#: apply.c:4934 +msgid "don't apply changes matching the given path" +msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" + +#: apply.c:4937 +msgid "apply changes matching the given path" +msgstr "appliquer les modifications qui correspondent au chemin donné" + +#: apply.c:4939 builtin/am.c:2263 +msgid "num" +msgstr "num" + +#: apply.c:4940 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" + +#: apply.c:4943 +msgid "ignore additions made by the patch" +msgstr "ignorer les additions réalisées par le patch" + +#: apply.c:4945 +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 +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 +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 +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 +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 +msgid "mark new files with `git add --intent-to-add`" +msgstr "marquer les nouveaux fichiers `git add --intent-to-add`" + +#: apply.c:4959 +msgid "apply a patch without touching the working tree" +msgstr "appliquer les patch sans toucher à la copie de travail" + +#: apply.c:4961 +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 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" + +#: apply.c:4966 +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 +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 +msgid "paths are separated with NUL character" +msgstr "les chemins sont séparés par un caractère NUL" + +#: apply.c:4973 +msgid "ensure at least <n> lines of context match" +msgstr "s'assurer d'au moins <n> 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 +msgid "action" +msgstr "action" + +#: apply.c:4975 +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 +msgid "ignore changes in whitespace when finding context" +msgstr "ignorer des modifications d'espace lors de la recherche de contexte" + +#: apply.c:4984 +msgid "apply the patch in reverse" +msgstr "appliquer le patch en sens inverse" + +#: apply.c:4986 +msgid "don't expect at least one line of context" +msgstr "ne pas s'attendre à au moins une ligne de contexte" + +#: apply.c:4988 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" + +#: apply.c:4990 +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 +msgid "be verbose" +msgstr "mode verbeux" + +#: apply.c:4993 +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 +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 +msgid "root" +msgstr "racine" + +#: apply.c:4999 +msgid "prepend <root> to all filenames" +msgstr "préfixer tous les noms de fichier avec <root>" + +#: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]" -#: archive.c:13 +#: archive.c:15 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:14 +#: archive.c:16 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou " "apparenté> [<chemin>...]" -#: archive.c:15 +#: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327 +#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" -#: archive.c:429 +#: archive.c:446 msgid "fmt" msgstr "fmt" -#: archive.c:429 +#: archive.c:446 msgid "archive format" msgstr "format d'archive" -#: archive.c:430 builtin/log.c:1395 +#: archive.c:447 builtin/log.c:1473 msgid "prefix" msgstr "préfixe" -#: archive.c:431 +#: archive.c:448 msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549 -#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989 -#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459 -#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561 -#: builtin/read-tree.c:109 parse-options.h:153 +#: 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 msgid "file" msgstr "fichier" -#: archive.c:433 builtin/archive.c:89 +#: archive.c:450 builtin/archive.c:89 msgid "write the archive to this file" msgstr "écrire l'archive dans ce fichier" -#: archive.c:435 +#: archive.c:452 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le répertoire de travail" -#: archive.c:436 +#: archive.c:453 msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" -#: archive.c:437 +#: archive.c:454 msgid "store only" msgstr "stockage seulement" -#: archive.c:438 +#: archive.c:455 msgid "compress faster" msgstr "compression rapide" -#: archive.c:446 +#: archive.c:463 msgid "compress better" msgstr "compression efficace" -#: archive.c:449 +#: archive.c:466 msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 -#: builtin/submodule--helper.c:776 +#: 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 msgid "repo" msgstr "dépôt" -#: archive.c:452 builtin/archive.c:91 +#: archive.c:469 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "récupérer l'archive depuis le dépôt distant <dépôt>" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482 +#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714 +#: builtin/notes.c:491 msgid "command" msgstr "commande" -#: archive.c:454 builtin/archive.c:93 +#: archive.c:471 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" -#: attr.c:263 +#: archive.c:478 +msgid "Unexpected option --remote" +msgstr "Option --remote inattendue" + +#: archive.c:480 +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 +msgid "Unexpected option --output" +msgstr "Option --output inattendue" + +#: archive.c:504 +#, c-format +msgid "Unknown archive format '%s'" +msgstr "Format d'archive inconnu '%s'" + +#: archive.c:511 +#, 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 +#, c-format +msgid "cannot stream blob %s" +msgstr "impossible de transmettre le blob %s en flux" + +#: archive-tar.c:260 archive-zip.c:361 +#, 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 +#, c-format +msgid "cannot read %s" +msgstr "impossible de lire %s" + +#: archive-tar.c:458 +#, c-format +msgid "unable to start '%s' filter" +msgstr "impossible de démarrer le filtre '%s'" + +#: archive-tar.c:461 +msgid "unable to redirect descriptor" +msgstr "impossible de rediriger un descripteur" + +#: archive-tar.c:468 +#, c-format +msgid "'%s' filter reported error" +msgstr "le filtre '%s' a retourné une erreur" + +#: archive-zip.c:313 +#, 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 +#, 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 +#, c-format +msgid "deflate error (%d)" +msgstr "erreur de compression (%d)" + +#: archive-zip.c:605 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>" + +#: attr.c:218 +#, c-format +msgid "%.*s is not a valid attribute name" +msgstr "%.*s n'est pas un nom valide d'attribut" + +#: attr.c:415 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -209,7 +999,166 @@ msgstr "" "Les motifs de négation sont ignorés dans les attributs git\n" "Utilisez '\\!' pour un point d'exclamation littéral." -#: branch.c:53 +#: bisect.c:467 +#, c-format +msgid "Badly quoted content in file '%s': %s" +msgstr "Contenu mal cité dans le fichier '%s' : %s" + +#: bisect.c:675 +#, c-format +msgid "We cannot bisect more!\n" +msgstr "Impossible de pousser la bissection plus loin !\n" + +#: bisect.c:729 +#, c-format +msgid "Not a valid commit name %s" +msgstr "%s n'est pas un nom de commit valide" + +#: bisect.c:753 +#, c-format +msgid "" +"The merge base %s is bad.\n" +"This means the bug has been fixed between %s and [%s].\n" +msgstr "" +"La base de fusion %s est mauvaise.\n" +"Cela signifie que le bogue été corrigé entre %s et [%s].\n" + +#: bisect.c:758 +#, c-format +msgid "" +"The merge base %s is new.\n" +"The property has changed between %s and [%s].\n" +msgstr "" +"La base de fusion %s est nouvelle.\n" +"La propriété a changé entre %s et [%s].\n" + +#: bisect.c:763 +#, c-format +msgid "" +"The merge base %s is %s.\n" +"This means the first '%s' commit is between %s and [%s].\n" +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 +#, c-format +msgid "" +"Some %s revs are not ancestors of the %s rev.\n" +"git bisect cannot work properly in this case.\n" +"Maybe you mistook %s and %s revs?\n" +msgstr "" +"Certaines révision %s ne sont pas ancêtres de la révision %s.\n" +"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 +#, c-format +msgid "" +"the merge base between %s and [%s] must be skipped.\n" +"So we cannot be sure the first %s commit is between %s and %s.\n" +"We continue anyway." +msgstr "" +"La base de fusion entre %s et [%s] doit être évitée.\n" +"On ne peut donc pas être certain que le premier commit %s se trouve entre %s " +"et %s.\n" +"On continue tout de même." + +#: bisect.c:817 +#, 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 +#, 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 +#, c-format +msgid "could not create file '%s'" +msgstr "impossible de créer le fichier '%s'" + +#: bisect.c:927 builtin/merge.c:137 +#, c-format +msgid "could not read file '%s'" +msgstr "impossible de lire le fichier '%s'" + +#: bisect.c:957 +msgid "reading bisect refs failed" +msgstr "impossible de lire les références de bissection" + +#: bisect.c:976 +#, c-format +msgid "%s was both %s and %s\n" +msgstr "%s était à la fois %s et %s\n" + +#: bisect.c:984 +#, c-format +msgid "" +"No testable commit found.\n" +"Maybe you started with bad path parameters?\n" +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 +#, c-format +msgid "(roughly %d step)" +msgid_plural "(roughly %d steps)" +msgstr[0] "(à peu près %d étape)" +msgstr[1] "(à peu près %d étapes)" + +#. TRANSLATORS: the last %s will be replaced with "(roughly %d +#. steps)" translation. +#. +#: bisect.c:1009 +#, 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 +msgid "--contents and --reverse do not blend well." +msgstr "--contents et --reverse ne font pas bon ménage." + +#: blame.c:1798 +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 +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 +#: builtin/shortlog.c:192 +msgid "revision walk setup failed" +msgstr "échec de la préparation du parcours des révisions" + +#: blame.c:1846 +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 +#, c-format +msgid "no such path %s in %s" +msgstr "pas de chemin %s dans %s" + +#: blame.c:1868 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "impossible de lire le blob %s pour le chemin %s" + +#: branch.c:52 #, c-format msgid "" "\n" @@ -222,94 +1171,97 @@ msgstr "" "l'information de suivi distant en invoquant\n" "\"git branch --setup-upstream-to=%s%s%s\"." -#: branch.c:67 +#: branch.c:66 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "La branche %s ne peut pas être sa propre branche amont." -#: branch.c:93 +#: branch.c:92 #, c-format -msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" -"La branche %s est paramétrée pour suivre la branche distante %s de %s en " -"rebasant." +"La branche '%s' est paramétrée pour suivre la branche distante '%s' de '%s' " +"en rebasant." -#: branch.c:94 +#: branch.c:93 #, c-format -msgid "Branch %s set up to track remote branch %s from %s." +msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "" -"La branche %s est paramétrée pour suivre la branche distante %s depuis %s." +"La branche '%s' est paramétrée pour suivre la branche distante '%s' depuis " +"'%s'." -#: branch.c:98 +#: branch.c:97 #, c-format -msgid "Branch %s set up to track local branch %s by rebasing." +msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "" -"La branche %s est paramétrée pour suivre la branche locale %s en rebasant." +"La branche '%s' est paramétrée pour suivre la branche locale '%'s en " +"rebasant." -#: branch.c:99 +#: branch.c:98 #, c-format -msgid "Branch %s set up to track local branch %s." -msgstr "La branche %s est paramétrée pour suivre la branche locale %s." +msgid "Branch '%s' set up to track local branch '%s'." +msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'." -#: branch.c:104 +#: branch.c:103 #, c-format -msgid "Branch %s set up to track remote ref %s by rebasing." +msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "" -"La branche %s est paramétrée pour suivre la référence distante %s en " +"La branche '%s' est paramétrée pour suivre la référence distante '%s' en " "rebasant." -#: branch.c:105 +#: branch.c:104 #, c-format -msgid "Branch %s set up to track remote ref %s." -msgstr "La branche %s est paramétrée pour suivre la référence distante %s." +msgid "Branch '%s' set up to track remote ref '%s'." +msgstr "La branche '%s' est paramétrée pour suivre la référence distante '%s'." -#: branch.c:109 +#: branch.c:108 #, c-format -msgid "Branch %s set up to track local ref %s by rebasing." +msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" -"La branche %s est paramétrée pour suivre la référence locale %s en rebasant." +"La branche '%s' est paramétrée pour suivre la référence locale '%s' en " +"rebasant." -#: branch.c:110 +#: branch.c:109 #, c-format -msgid "Branch %s set up to track local ref %s." -msgstr "La branche %s est paramétrée pour suivre la référence locale %s." +msgid "Branch '%s' set up to track local ref '%s'." +msgstr "La branche '%s' est paramétrée pour suivre la référence locale '%s'." -#: branch.c:119 +#: branch.c:118 msgid "Unable to write upstream branch configuration" msgstr "Échec de l'écriture de la configuration de branche amont" -#: branch.c:156 +#: branch.c:155 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "Pas de suivi : information ambiguë pour la référence %s" -#: branch.c:185 +#: branch.c:188 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' n'est pas un nom de branche valide." -#: branch.c:190 +#: branch.c:207 #, c-format msgid "A branch named '%s' already exists." msgstr "Une branche nommée '%s' existe déjà." -#: branch.c:198 +#: branch.c:212 msgid "Cannot force update the current branch." msgstr "Impossible de forcer la mise à jour de la branche courante." -#: branch.c:218 +#: branch.c:232 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est " "pas une branche." -#: branch.c:220 +#: branch.c:234 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la branche amont demandée '%s' n'existe pas" -#: branch.c:222 +#: branch.c:236 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -329,303 +1281,985 @@ msgstr "" "sa jumelle distante, vous pouvez utiliser \"git push -u\"\n" "pour paramétrer le suivi distant en même temps que vous poussez." -#: branch.c:266 +#: branch.c:279 #, c-format msgid "Not a valid object name: '%s'." msgstr "Nom d'objet invalide : '%s'." -#: branch.c:286 +#: branch.c:299 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nom d'objet ambigu : '%s'." -#: branch.c:291 +#: branch.c:304 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Point d'embranchement invalide : '%s'." -#: branch.c:345 +#: branch.c:358 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' est déjà extrait dans '%s'" -#: branch.c:364 +#: branch.c:381 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "la HEAD de la copie de travail %s n'est pas mise à jour" -#: bundle.c:34 +#: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ne semble pas être un fichier bundle v2" -#: bundle.c:61 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:87 builtin/commit.c:777 +#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" -#: bundle.c:139 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 -#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 -#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 -#: builtin/merge.c:361 builtin/shortlog.c:170 -msgid "revision walk setup failed" -msgstr "échec de la préparation du parcours des révisions" - -#: bundle.c:185 +#: bundle.c:192 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Le colis contient cette référence :" msgstr[1] "Le colis contient ces %d références :" -#: bundle.c:192 +#: bundle.c:199 msgid "The bundle records a complete history." msgstr "Le colis enregistre l'historique complet." -#: bundle.c:194 +#: bundle.c:201 #, c-format msgid "The bundle requires this ref:" 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:253 +#: bundle.c:260 msgid "Could not spawn pack-objects" msgstr "Impossible de créer des objets groupés" -#: bundle.c:264 +#: bundle.c:271 msgid "pack-objects died" msgstr "les objets groupés ont disparu" -#: bundle.c:304 +#: bundle.c:313 msgid "rev-list died" msgstr "rev-list a disparu" -#: bundle.c:353 +#: bundle.c:362 #, 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:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 +#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:451 +#: bundle.c:461 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:463 +#: bundle.c:473 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:491 +#: bundle.c:501 msgid "index-pack died" msgstr "l'index de groupe a disparu" -#: color.c:275 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 -#: builtin/am.c:2134 +#: 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 +#: builtin/replace.c:448 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" -#: commit.c:42 +#: commit.c:50 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s n'est pas un commit !" -#: compat/obstack.c:406 compat/obstack.c:408 +#: commit.c:191 +msgid "" +"Support for <GIT_DIR>/info/grafts is deprecated\n" +"and will be removed in a future Git version.\n" +"\n" +"Please use \"git replace --convert-graft-file\"\n" +"to convert the grafts into replace refs.\n" +"\n" +"Turn this message off by running\n" +"\"git config advice.graftFileDeprecated false\"" +msgstr "" +"Le support de <GIT_DIR>/info/grafts est déconseillé\n" +"et sera supprimé dans une version future de Git.\n" +"\n" +"Veuillez utiliser \"git replace --convert-graft-file\"\n" +"pour convertir les grafts en référence de remplacement.\n" +"\n" +"Supprimez ce message en lançant\n" +"\"git config advice.graftFileDeprecated false\"" + +#: commit.c:1629 +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" +"variable i18n.commitencoding to the encoding your project uses.\n" +msgstr "" +"Avertissement : le message de validation ne se conforme pas à UTF-8.\n" +"Vous souhaitez peut-être le modifier après correction du message ou régler " +"la\n" +"variable de configuration i18n.commitencoding à l'encodage utilisé par votre " +"projet.\n" + +#: commit-graph.c:83 +#, c-format +msgid "graph file %s is too small" +msgstr "le fichier de graphe %s est trop petit" + +#: commit-graph.c:90 +#, 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 +#, 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 +#, 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 +#, c-format +msgid "improper chunk offset %08x%08x" +msgstr "décalage de bloc %08x%08x inadéquat" + +#: commit-graph.c:164 +#, c-format +msgid "chunk id %08x appears multiple times" +msgstr "l'id de bloc %08x apparaît des multiples fois" + +#: commit-graph.c:261 +#, c-format +msgid "could not find commit %s" +msgstr "impossible de trouver le commit %s" + +#: commit-graph.c:565 builtin/pack-objects.c:2568 +#, c-format +msgid "unable to get type of object %s" +msgstr "impossible d'obtenir le type de l'objet %s" + +#: commit-graph.c:730 +#, c-format +msgid "error adding pack %s" +msgstr "erreur à l'ajout du packet %s" + +#: commit-graph.c:732 +#, c-format +msgid "error opening index for %s" +msgstr "erreur à l'ouverture de l'index pour %s" + +#: commit-graph.c:773 +#, 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 +msgid "too many commits to write graph" +msgstr "trop de commits pour écrire un graphe" + +#: commit-graph.c:806 +#, 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 +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" + +#: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "plus de mémoire" -#: config.c:475 config.c:477 +#: config.c:123 #, c-format -msgid "bad config line %d in %s %s" -msgstr "ligne %d de fichier de config incorrecte dans %s %s" +msgid "" +"exceeded maximum include depth (%d) while including\n" +"\t%s\n" +"from\n" +"\t%s\n" +"This might be due to circular includes." +msgstr "" +"profondeur d'inclusion maximum (%d) dépassée à l'inclusion de\n" +"\t%s\n" +"depuis\n" +"\t%s\n" +"possibilité d'inclusions multiples." -#: config.c:593 +#: config.c:139 #, c-format -msgid "bad numeric config value '%s' for '%s' in %s %s: %s" +msgid "could not expand include path '%s'" +msgstr "expansion impossible du chemin d'inclusion '%s'" + +#: config.c:150 +msgid "relative config includes must come from files" +msgstr "les inclusions de configuration relatives doivent venir de fichiers" + +#: config.c:190 +msgid "relative config include conditionals must come from files" msgstr "" -"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s %s : %s" +"les conditions d'inclusion de configuration relative doivent venir de " +"fichiers" + +#: config.c:348 +#, c-format +msgid "key does not contain a section: %s" +msgstr "la clé ne contient pas de section: %s" + +#: config.c:354 +#, c-format +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 +#, c-format +msgid "invalid key: %s" +msgstr "clé invalide : %s" + +#: config.c:384 +#, c-format +msgid "invalid key (newline): %s" +msgstr "clé invalide (retour chariot) : %s" + +#: config.c:420 config.c:432 +#, c-format +msgid "bogus config parameter: %s" +msgstr "paramètre de configuration mal formé: %s" + +#: config.c:467 +#, c-format +msgid "bogus format in %s" +msgstr "formatage mal formé dans %s" -#: config.c:595 +#: config.c:793 +#, c-format +msgid "bad config line %d in blob %s" +msgstr "ligne %d de config incorrecte dans le blob %s" + +#: config.c:797 +#, c-format +msgid "bad config line %d in file %s" +msgstr "ligne %d de config incorrecte dans le fichier %s" + +#: config.c:801 +#, c-format +msgid "bad config line %d in standard input" +msgstr "ligne %d de config incorrecte dans l'entrée standard" + +#: config.c:805 +#, 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:809 +#, 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:813 +#, c-format +msgid "bad config line %d in %s" +msgstr "ligne %d de config incorrecte dans %s" + +#: config.c:952 +msgid "out of range" +msgstr "hors plage" + +#: config.c:952 +msgid "invalid unit" +msgstr "unité invalide" + +#: config.c:958 #, c-format msgid "bad numeric config value '%s' for '%s': %s" -msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" +msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" + +#: config.c:963 +#, 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:966 +#, 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:969 +#, 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:680 +#: config.c:972 +#, 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:975 +#, 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:978 +#, 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:1073 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" -#: config.c:761 config.c:772 +#: config.c:1082 +#, c-format +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "'%s' pour '%s' n'est pas un horodatage valide" + +#: config.c:1173 +#, c-format +msgid "abbrev length out of range: %d" +msgstr "longueur d'abbrev hors plage : %d" + +#: config.c:1187 config.c:1198 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:890 +#: config.c:1290 +msgid "core.commentChar should only be one character" +msgstr "core.commentChar ne devrait être qu'un unique caractère" + +#: config.c:1323 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1228 +#: config.c:1403 +#, c-format +msgid "malformed value for %s" +msgstr "valeur mal formée pour %s" + +#: config.c:1429 +#, c-format +msgid "malformed value for %s: %s" +msgstr "valeur mal formée pour %s : %s" + +#: config.c:1430 +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 +#, c-format +msgid "bad pack compression level %d" +msgstr "niveau de compression du paquet %d" + +#: config.c:1610 +#, c-format +msgid "unable to load config blob object '%s'" +msgstr "impossible de charger l'objet blob de config '%s'" + +#: config.c:1613 +#, 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 +#, c-format +msgid "unable to resolve config blob '%s'" +msgstr "impossible de résoudre le blob de config '%s'" + +#: config.c:1660 +#, c-format +msgid "failed to parse %s" +msgstr "échec de l'analyse de %s" + +#: config.c:1700 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:1284 -msgid "unknown error occured while reading the configuration files" +#: config.c:2032 +msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:1629 +#: config.c:2202 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "%s invalide : '%s'" + +#: config.c:2245 +#, 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 +#, 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 #, 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:1631 +#: config.c:2298 #, 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:1690 +#: config.c:2379 +#, c-format +msgid "invalid section name '%s'" +msgstr "nom de section invalide '%s'" + +#: config.c:2411 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2224 +#: config.c:2440 +#, 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 +#, c-format +msgid "could not lock config file %s" +msgstr "impossible de verrouiller le fichier de configuration %s" + +#: config.c:2702 +#, c-format +msgid "opening %s" +msgstr "ouverture de %s" + +#: config.c:2737 builtin/config.c:324 +#, c-format +msgid "invalid pattern: %s" +msgstr "motif invalide : %s" + +#: config.c:2762 +#, c-format +msgid "invalid config file %s" +msgstr "fichier de configuration invalide %s" + +#: config.c:2775 config.c:3028 +#, c-format +msgid "fstat on %s failed" +msgstr "échec de fstat sur %s" + +#: config.c:2786 +#, c-format +msgid "unable to mmap '%s'" +msgstr "impossible d réaliser un map de '%s'" + +#: config.c:2795 config.c:3033 +#, c-format +msgid "chmod on %s failed" +msgstr "échec de chmod sur %s" + +#: config.c:2880 config.c:3130 +#, c-format +msgid "could not write config file %s" +msgstr "impossible d'écrire le fichier de configuration %s" + +#: config.c:2914 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:2226 +#: config.c:2916 builtin/remote.c:781 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" -#: connected.c:69 +#: config.c:3006 +#, c-format +msgid "invalid section name: %s" +msgstr "nom de section invalide : %s" + +#: config.c:3173 +#, c-format +msgid "missing value for '%s'" +msgstr "valeur manquante pour '%s'" + +#: connect.c:61 +msgid "the remote end hung up upon initial contact" +msgstr "l'hôte distant a fermé la connexion lors du contact initial" + +#: connect.c:63 +msgid "" +"Could not read from remote repository.\n" +"\n" +"Please make sure you have the correct access rights\n" +"and the repository exists." +msgstr "" +"Impossible de lire le dépôt distant.\n" +"\n" +"Veuillez vérifier que vous avez les droits d'accès\n" +"et que le dépôt existe." + +#: connect.c:81 +#, c-format +msgid "server doesn't support '%s'" +msgstr "Le serveur ne supporte pas '%s'" + +#: connect.c:103 +#, c-format +msgid "server doesn't support feature '%s'" +msgstr "Le serveur ne supporte pas la fonctionnalité '%s'" + +#: connect.c:114 +msgid "expected flush after capabilities" +msgstr "vidage attendu après les capacités" + +#: connect.c:233 +#, c-format +msgid "ignoring capabilities after first line '%s'" +msgstr "capacités ignorées après la première ligne '%s'" + +#: connect.c:252 +msgid "protocol error: unexpected capabilities^{}" +msgstr "erreur de protocole : capabilities^{} inattendu" + +#: connect.c:273 +#, c-format +msgid "protocol error: expected shallow sha-1, got '%s'" +msgstr "erreur de protocole : shallow sha-1 attendu, '%s' trouvé" + +#: connect.c:275 +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 +#, c-format +msgid "remote error: %s" +msgstr "erreur distante : %s" + +#: connect.c:316 +msgid "invalid packet" +msgstr "paquet invalide" + +#: connect.c:336 +#, c-format +msgid "protocol error: unexpected '%s'" +msgstr "erreur de protocole : '%s' attendu" + +#: connect.c:444 +#, c-format +msgid "invalid ls-refs response: %s" +msgstr "réponse à ls-ref invalide : %s" + +#: connect.c:448 +msgid "expected flush after ref listing" +msgstr "vidage attendu après le listage de références" + +#: connect.c:547 +#, c-format +msgid "protocol '%s' is not supported" +msgstr "le protocole '%s' n'est pas supporté" + +#: connect.c:598 +msgid "unable to set SO_KEEPALIVE on socket" +msgstr "impossible de positionner SO_KEEPALIVE sur la socket" + +#: connect.c:638 connect.c:701 +#, c-format +msgid "Looking up %s ... " +msgstr "Recherche de %s… " + +#: connect.c:642 +#, 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:646 connect.c:717 +#, c-format +msgid "" +"done.\n" +"Connecting to %s (port %s) ... " +msgstr "" +"fait.\n" +"Connexion à %s (port %s)… " + +#: connect.c:668 connect.c:745 +#, c-format +msgid "" +"unable to connect to %s:\n" +"%s" +msgstr "" +"impossible de se connecter à %s :\n" +"%s" + +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " +#: connect.c:674 connect.c:751 +msgid "done." +msgstr "fait." + +#: connect.c:705 +#, c-format +msgid "unable to look up %s (%s)" +msgstr "impossible de rechercher %s (%s)" + +#: connect.c:711 +#, c-format +msgid "unknown port %s" +msgstr "port inconnu %s" + +#: connect.c:848 connect.c:1174 +#, c-format +msgid "strange hostname '%s' blocked" +msgstr "nom d'hôte étrange '%s' bloqué" + +#: connect.c:850 +#, c-format +msgid "strange port '%s' blocked" +msgstr "port étrange '%s' bloqué" + +#: connect.c:860 +#, c-format +msgid "cannot start proxy %s" +msgstr "impossible de démarrer un proxy %s" + +#: connect.c:927 +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:1122 +msgid "ssh variant 'simple' does not support -4" +msgstr "la variante ssh 'simple' ne supporte pas -4" + +#: connect.c:1134 +msgid "ssh variant 'simple' does not support -6" +msgstr "la variante ssh 'simple' ne supporte pas -6" + +#: connect.c:1151 +msgid "ssh variant 'simple' does not support setting port" +msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port" + +#: connect.c:1262 +#, c-format +msgid "strange pathname '%s' blocked" +msgstr "chemin étrange '%s' bloqué" + +#: connect.c:1307 +msgid "unable to fork" +msgstr "fork impossible" + +#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146 +msgid "Checking connectivity" +msgstr "Vérification de la connectivité" + +#: connected.c:80 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" -#: connected.c:89 +#: connected.c:100 msgid "failed write to rev-list" msgstr "impossible d'écrire dans la rev-list" -#: connected.c:96 +#: connected.c:107 msgid "failed to close rev-list's stdin" msgstr "impossible de fermer l'entrée standard du rev-list" -#: date.c:95 +#: convert.c:194 +#, c-format +msgid "illegal crlf_action %d" +msgstr "crlf_action illégal %d" + +#: convert.c:207 +#, c-format +msgid "CRLF would be replaced by LF in %s" +msgstr "Les CRLF seraient remplacés par des LF dans %s" + +#: convert.c:209 +#, c-format +msgid "" +"CRLF will be replaced by LF in %s.\n" +"The file will have its original line endings in your working directory" +msgstr "" +"Les CRLF seront remplacés par des LF dans %s.\n" +"Le fichier conservera ses fins de ligne d'origine dans votre copie de travail" + +#: convert.c:217 +#, c-format +msgid "LF would be replaced by CRLF in %s" +msgstr "Les LF seraient remplacés par des CRLF dans %s" + +#: convert.c:219 +#, c-format +msgid "" +"LF will be replaced by CRLF in %s.\n" +"The file will have its original line endings in your working directory" +msgstr "" +"Les LF seront remplacés par des CRLF dans %s.\n" +"Le fichier conservera ses fins de ligne d'origine dans votre copie de travail" + +#: convert.c:280 +#, c-format +msgid "BOM is prohibited in '%s' if encoded as %s" +msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s" + +#: convert.c:287 +#, c-format +msgid "" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." +msgstr "" +"Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez " +"utiliser UTF-%s comme encodage d'arbre de travail." + +#: convert.c:305 +#, c-format +msgid "BOM is required in '%s' if encoded as %s" +msgstr "Un BOM est obligatoire dans '%s' s'il est encodé comme %s" + +#: convert.c:307 +#, c-format +msgid "" +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" +"%sLE (depending on the byte order) as working-tree-encoding." +msgstr "" +"Il manque un marqueur d'ordre d'octets (BOM) au fichier '%s'. Veuillez " +"utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre " +"de travail." + +#: convert.c:425 convert.c:496 +#, c-format +msgid "failed to encode '%s' from %s to %s" +msgstr "échec de l'encodage de '%s' de %s vers %s" + +#: convert.c:468 +#, c-format +msgid "encoding '%s' from %s to %s and back is not the same" +msgstr "" +"encoder '%s' depuis %s vers %s puis inversement ne produit pas le même " +"contenu" + +#: convert.c:674 +#, c-format +msgid "cannot fork to run external filter '%s'" +msgstr "impossible de forker pour lancer le filtre externe '%s'" + +#: convert.c:694 +#, c-format +msgid "cannot feed the input to external filter '%s'" +msgstr "impossible de fournir l'entrée au filtre externe '%s'" + +#: convert.c:701 +#, c-format +msgid "external filter '%s' failed %d" +msgstr "le filtre externe '%s' a échoué %d" + +#: convert.c:736 convert.c:739 +#, c-format +msgid "read from external filter '%s' failed" +msgstr "la lecture depuis le filtre externe '%s' a échoué" + +#: convert.c:742 convert.c:796 +#, c-format +msgid "external filter '%s' failed" +msgstr "le filtre externe '%s' a échoué" + +#: convert.c:844 +msgid "unexpected filter type" +msgstr "type de filtre inattendu" + +#: convert.c:855 +msgid "path name too long for external filter" +msgstr "nom de chemin trop long pour un filtre externe" + +#: convert.c:929 +#, c-format +msgid "" +"external filter '%s' is not available anymore although not all paths have " +"been filtered" +msgstr "" +"le filtre externe '%s' n'est plus disponible bien que tous les chemins " +"n'aient pas été filtrés" + +#: convert.c:1228 +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 +#, c-format +msgid "%s: clean filter '%s' failed" +msgstr "%s : le filtre clean '%s' a échoué" + +#: convert.c:1480 +#, c-format +msgid "%s: smudge filter %s failed" +msgstr "%s : le filtre smudge '%s' a échoué" + +#: date.c:116 msgid "in the future" msgstr "dans le futur" -#: date.c:101 +#: date.c:122 #, c-format -msgid "%lu second ago" -msgid_plural "%lu seconds ago" -msgstr[0] "il y a %lu seconde" -msgstr[1] "il y a %lu secondes" +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "il y a %<PRIuMAX> seconde" +msgstr[1] "il y a %<PRIuMAX> secondes" -#: date.c:108 +#: date.c:129 #, c-format -msgid "%lu minute ago" -msgid_plural "%lu minutes ago" -msgstr[0] "il y a %lu minute" -msgstr[1] "il y a %lu minutes" +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "il y a %<PRIuMAX> minute" +msgstr[1] "il y a %<PRIuMAX> minutes" -#: date.c:115 +#: date.c:136 #, c-format -msgid "%lu hour ago" -msgid_plural "%lu hours ago" -msgstr[0] "il y a %lu heure" -msgstr[1] "il y a %lu heures" +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "il y a %<PRIuMAX> heure" +msgstr[1] "il y a %<PRIuMAX> heures" -#: date.c:122 +#: date.c:143 #, c-format -msgid "%lu day ago" -msgid_plural "%lu days ago" -msgstr[0] "il y a %lu jour" -msgstr[1] "il y a %lu jours" +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "il y a %<PRIuMAX> jour" +msgstr[1] "il y a %<PRIuMAX> jours" -#: date.c:128 +#: date.c:149 #, c-format -msgid "%lu week ago" -msgid_plural "%lu weeks ago" -msgstr[0] "il y a %lu semaine" -msgstr[1] "il y a %lu semaines" +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "il y a %<PRIuMAX> semaine" +msgstr[1] "il y a %<PRIuMAX> semaines" -#: date.c:135 +#: date.c:156 #, c-format -msgid "%lu month ago" -msgid_plural "%lu months ago" -msgstr[0] "il y a %lu mois" -msgstr[1] "il y a %lu mois" +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "il y a %<PRIuMAX> mois" +msgstr[1] "il y a %<PRIuMAX> mois" -#: date.c:146 +#: date.c:167 #, c-format -msgid "%lu year" -msgid_plural "%lu years" -msgstr[0] "%lu an" -msgstr[1] "%lu ans" +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "%<PRIuMAX> an" +msgstr[1] "%<PRIuMAX> ans" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:149 +#: date.c:170 #, c-format -msgid "%s, %lu month ago" -msgid_plural "%s, %lu months ago" -msgstr[0] "il y a %s et %lu mois" -msgstr[1] "il y a %s et %lu mois" +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "il y a %s et %<PRIuMAX> mois" +msgstr[1] "il y a %s et %<PRIuMAX> mois" -#: date.c:154 date.c:159 +#: date.c:175 date.c:180 #, c-format -msgid "%lu year ago" -msgid_plural "%lu years ago" -msgstr[0] "il y a %lu an" -msgstr[1] "il y a %lu ans" +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "il y a %<PRIuMAX> an" +msgstr[1] "il y a %<PRIuMAX> ans" #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:538 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" -#: diff.c:116 +#: diff.c:108 +#, c-format +msgid "option '%s' requires a value" +msgstr "le commutateur '%s' a besoin d'une valeur" + +#: diff.c:158 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Impossible d'analyser le pourcentage de modification de dirstat '%s'\n" -#: diff.c:121 +#: diff.c:163 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Paramètre dirstat inconnu '%s'\n" -#: diff.c:225 +#: diff.c:291 +msgid "" +"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " +"'dimmed-zebra', 'plain'" +msgstr "" +"le paramètre de couleur de déplacement doit être parmi 'no', 'default', " +"'blocks', 'zebra', 'dimmed_zebra' ou 'plain'" + +#: diff.c:316 +#, c-format +msgid "ignoring unknown color-moved-ws mode '%s'" +msgstr "mode color-moved-ws inconnu '%s' ignoré" + +#: diff.c:323 +msgid "" +"color-moved-ws: allow-indentation-change cannot be combined with other white " +"space modes" +msgstr "" +"color-moved-ws : allow-indentation-change ne peut pas être combiné avec " +"d'autres modes d'espace" + +#: diff.c:394 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" -#: diff.c:277 +#: diff.c:454 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -634,16 +2268,24 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:3007 +#: diff.c:4096 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:3405 +#: diff.c:4427 +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 +msgid "-G, -S and --find-object are mutually exclusive" +msgstr "-G, -S et --find-object sont mutuellement exclusifs" + +#: diff.c:4508 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:3568 +#: diff.c:4674 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -652,70 +2294,444 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:3582 +#: diff.c:4688 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" -#: dir.c:1823 +#: diff.c:5766 +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 +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 +#, c-format +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "" +"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le " +"commande." + +#: dir.c:569 +#, 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 +#, c-format +msgid "cannot use %s as an exclude file" +msgstr "impossible d'utiliser %s comme fichier d'exclusion" + +#: dir.c:1873 +#, c-format +msgid "could not open directory '%s'" +msgstr "impossible d'ouvrir le répertoire '%s'" + +#: dir.c:2115 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:1942 -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:2239 +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" -#: gpg-interface.c:166 gpg-interface.c:235 -msgid "could not run gpg." -msgstr "impossible de lancer gpg." +#: dir.c:3037 +#, c-format +msgid "index file corrupt in repo %s" +msgstr "fichier d'index corrompu dans le dépôt %s" -#: gpg-interface.c:178 -msgid "gpg did not accept the data" -msgstr "gpg n'a pas accepté les données" +#: dir.c:3082 dir.c:3087 +#, c-format +msgid "could not create directories for %s" +msgstr "impossible de créer les répertoires pour %s" + +#: dir.c:3116 +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" -#: gpg-interface.c:189 +#: editor.c:61 +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "" +"suggestion : en attente de la fermeture du fichier par votre éditeur de " +"texte…%c" + +#: entry.c:178 +msgid "Filtering content" +msgstr "Filtrage du contenu" + +#: entry.c:437 +#, c-format +msgid "could not stat file '%s'" +msgstr "impossible de stat le fichier '%s'" + +#: environment.c:150 +#, c-format +msgid "bad git namespace path \"%s\"" +msgstr "Espaces de nom de Git \"%s\"" + +#: environment.c:332 +#, c-format +msgid "could not set GIT_DIR to '%s'" +msgstr "impossible de régler GIT_DIR à '%s'" + +#: exec-cmd.c:361 +#, c-format +msgid "too many args to run %s" +msgstr "trop d'arguments pour lancer %s" + +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "Dépôt distant sans URL" + +#: fetch-pack.c:152 +msgid "git fetch-pack: expected shallow list" +msgstr "git fetch-pack : list courte attendue" + +#: fetch-pack.c:164 +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 +#, 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 +msgid "--stateless-rpc requires multi_ack_detailed" +msgstr "--stateless-rpc nécessite multi_ack_detailed" + +#: fetch-pack.c:342 fetch-pack.c:1257 +#, c-format +msgid "invalid shallow line: %s" +msgstr "ligne de superficiel invalide : %s" + +#: fetch-pack.c:348 fetch-pack.c:1263 +#, c-format +msgid "invalid unshallow line: %s" +msgstr "ligne de fin de superficiel invalide : %s" + +#: fetch-pack.c:350 fetch-pack.c:1265 +#, c-format +msgid "object not found: %s" +msgstr "objet non trouvé : %s" + +#: fetch-pack.c:353 fetch-pack.c:1268 +#, c-format +msgid "error in object: %s" +msgstr "Erreur dans l'objet : %s" + +#: fetch-pack.c:355 fetch-pack.c:1270 +#, c-format +msgid "no shallow found: %s" +msgstr "Pas de superficiel trouvé : %s" + +#: fetch-pack.c:358 fetch-pack.c:1273 +#, c-format +msgid "expected shallow/unshallow, got %s" +msgstr "superficiel/non superficiel attendu, %s trouvé" + +#: fetch-pack.c:399 +#, c-format +msgid "got %s %d %s" +msgstr "réponse %s %d %s" + +#: fetch-pack.c:416 +#, c-format +msgid "invalid commit %s" +msgstr "commit invalide %s" + +#: fetch-pack.c:447 +msgid "giving up" +msgstr "abandon" + +#: fetch-pack.c:459 progress.c:229 +msgid "done" +msgstr "fait" + +#: fetch-pack.c:471 +#, c-format +msgid "got %s (%d) %s" +msgstr "%s trouvé (%d) %s" + +#: fetch-pack.c:517 +#, c-format +msgid "Marking %s as complete" +msgstr "Marquage de %s comme terminé" + +#: fetch-pack.c:764 +#, c-format +msgid "already have %s (%s)" +msgstr "%s déjà possédé (%s)" + +#: fetch-pack.c:803 +msgid "fetch-pack: unable to fork off sideband demultiplexer" +msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral" + +#: fetch-pack.c:811 +msgid "protocol error: bad pack header" +msgstr "erreur de protocole : mauvais entête de paquet" + +#: fetch-pack.c:879 +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "fetch-pack : impossible de dupliquer %s" + +#: fetch-pack.c:895 +#, c-format +msgid "%s failed" +msgstr "échec de %s" + +#: fetch-pack.c:897 +msgid "error in sideband demultiplexer" +msgstr "erreur dans le démultiplexer latéral" + +#: fetch-pack.c:926 +msgid "Server does not support shallow clients" +msgstr "Le serveur ne supporte les clients superficiels" + +#: fetch-pack.c:930 +msgid "Server supports multi_ack_detailed" +msgstr "Le serveur supporte multi_ack_detailed" + +#: fetch-pack.c:933 +msgid "Server supports no-done" +msgstr "Le serveur support no-done" + +#: fetch-pack.c:939 +msgid "Server supports multi_ack" +msgstr "Le serveur supporte multi_ack" + +#: fetch-pack.c:943 +msgid "Server supports side-band-64k" +msgstr "Le serveur supporte side-band-64k" + +#: fetch-pack.c:947 +msgid "Server supports side-band" +msgstr "Le serveru supporte side-band" + +#: fetch-pack.c:951 +msgid "Server supports allow-tip-sha1-in-want" +msgstr "Le serveur supporte allow-tip-sha1-in-want" + +#: fetch-pack.c:955 +msgid "Server supports allow-reachable-sha1-in-want" +msgstr "Le serveur supporte allow-reachable-sha1-in-want" + +#: fetch-pack.c:965 +msgid "Server supports ofs-delta" +msgstr "Le serveur supporte ofs-delta" + +#: fetch-pack.c:971 fetch-pack.c:1150 +msgid "Server supports filter" +msgstr "Le serveur supporte filter" + +#: fetch-pack.c:979 +#, c-format +msgid "Server version is %.*s" +msgstr "La version du serveur est %.*s" + +#: fetch-pack.c:985 +msgid "Server does not support --shallow-since" +msgstr "Le receveur ne gère pas --shallow-since" + +#: fetch-pack.c:989 +msgid "Server does not support --shallow-exclude" +msgstr "Le receveur ne gère pas --shallow-exclude" + +#: fetch-pack.c:991 +msgid "Server does not support --deepen" +msgstr "Le receveur ne gère pas --deepen" + +#: fetch-pack.c:1004 +msgid "no common commits" +msgstr "pas de commit commun" + +#: fetch-pack.c:1016 fetch-pack.c:1393 +msgid "git fetch-pack: fetch failed." +msgstr "git fetch-pack : échec de le récupération." + +#: fetch-pack.c:1145 +msgid "Server does not support shallow requests" +msgstr "Le serveur ne supporte les requêtes superficielles" + +#: fetch-pack.c:1191 +#, c-format +msgid "error reading section header '%s'" +msgstr "erreur à la lecture de l'entête de section '%s'" + +#: fetch-pack.c:1197 +#, c-format +msgid "expected '%s', received '%s'" +msgstr "'%s' attendu, '%s' reçu" + +#: fetch-pack.c:1236 +#, c-format +msgid "unexpected acknowledgment line: '%s'" +msgstr "ligne d'acquittement inattendue : '%s'" + +#: fetch-pack.c:1241 +#, c-format +msgid "error processing acks: %d" +msgstr "erreur lors du traitement des acquittements : %d" + +#: fetch-pack.c:1278 +#, c-format +msgid "error processing shallow info: %d" +msgstr "erreur lors du traitement de l'information de superficialité : %d" + +#: fetch-pack.c:1294 +#, c-format +msgid "expected wanted-ref, got '%s'" +msgstr "wanted-ref attendu, '%s' trouvé" + +#: fetch-pack.c:1304 +#, c-format +msgid "unexpected wanted-ref: '%s'" +msgstr "wanted-ref inattendu : '%s'" + +#: fetch-pack.c:1308 +#, c-format +msgid "error processing wanted refs: %d" +msgstr "erreur lors du traitement des références voulues : %d" + +#: fetch-pack.c:1603 +msgid "no matching remote head" +msgstr "pas de HEAD distante correspondante" + +#: fetch-pack.c:1621 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 +#, c-format +msgid "no such remote ref %s" +msgstr "référence distante inconnue %s" + +#: fetch-pack.c:1650 +#, 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 msgid "gpg failed to sign the data" msgstr "gpg n'a pas pu signer les données" -#: gpg-interface.c:222 -#, c-format -msgid "could not create temporary file '%s'" -msgstr "impossible de créer un fichier temporaire '%s'" +#: gpg-interface.c:279 +msgid "could not create temporary file" +msgstr "impossible de créer un fichier temporaire" -#: gpg-interface.c:224 +#: gpg-interface.c:282 #, c-format msgid "failed writing detached signature to '%s'" msgstr "impossible d'écrire la signature détachée dans '%s'" -#: grep.c:1718 +#: graph.c:97 +#, c-format +msgid "ignore invalid color '%.*s' in log.graphColors" +msgstr "couleur invalide '%.*s' ignorée dans log.graphColors" + +#: grep.c:2115 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:2132 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:1746 +#: grep.c:2143 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquée" -#: help.c:205 +#: help.c:23 +msgid "start a working area (see also: git help tutorial)" +msgstr "démarrer une zone de travail (voir aussi : git help tutorial)" + +#: help.c:24 +msgid "work on the current change (see also: git help everyday)" +msgstr "" +"travailler sur la modification actuelle (voir aussi : git help revisions)" + +#: help.c:25 +msgid "examine the history and state (see also: git help revisions)" +msgstr "examiner l'historique et l'état (voir aussi : git help revisions)" + +#: help.c:26 +msgid "grow, mark and tweak your common history" +msgstr "agrandir, marquer et modifier votre historique" + +#: help.c:27 +msgid "collaborate (see also: git help workflows)" +msgstr "collaborer (voir aussi : git help workflows)" + +#: help.c:31 +msgid "Main Porcelain Commands" +msgstr "Commandes Porcelaine Principales" + +#: help.c:32 +msgid "Ancillary Commands / Manipulators" +msgstr "Commandes Auxiliaires / Manipulateurs" + +#: help.c:33 +msgid "Ancillary Commands / Interrogators" +msgstr "Commandes Auxiliaires / Interrogateurs" + +#: help.c:34 +msgid "Interacting with Others" +msgstr "Interaction avec d'autres développeurs" + +#: help.c:35 +msgid "Low-level Commands / Manipulators" +msgstr "Commandes bas-niveau / Manipulateurs" + +#: help.c:36 +msgid "Low-level Commands / Interrogators" +msgstr "Commandes bas niveau / Interrogateurs" + +#: help.c:37 +msgid "Low-level Commands / Synching Repositories" +msgstr "Commandes bas niveau / Synchronisation de dépôts" + +#: help.c:38 +msgid "Low-level Commands / Internal Helpers" +msgstr "Commandes bas niveau / Assistants internes" + +#: help.c:293 #, c-format msgid "available git commands in '%s'" msgstr "commandes git disponibles dans '%s'" -#: help.c:212 +#: help.c:300 msgid "git commands available from elsewhere on your $PATH" msgstr "commandes git disponibles depuis un autre endroit de votre $PATH" -#: help.c:244 +#: help.c:309 msgid "These are common Git commands used in various situations:" msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :" -#: help.c:309 +#: help.c:358 git.c:90 +#, c-format +msgid "unsupported command listing type '%s'" +msgstr "type de liste de commandes non supporté '%s'" + +#: help.c:405 +msgid "The common Git guides are:" +msgstr "Les guides Git populaires sont :" + +#: help.c:552 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -724,31 +2740,56 @@ 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:366 +#: help.c:611 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ahem. Votre système n'indique aucune commande Git." -#: help.c:388 +#: help.c:633 #, c-format -msgid "" -"WARNING: You called a Git command named '%s', which does not exist.\n" -"Continuing under the assumption that you meant '%s'" +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.\n" -"Continuons en supposant que vous avez voulu dire '%s'" +"ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas." -#: help.c:393 +#: help.c:638 #, c-format -msgid "in %0.1f seconds automatically..." -msgstr "dans %0.1f secondes automatiquement..." +msgid "Continuing under the assumption that you meant '%s'." +msgstr "Continuons en supposant que vous avez voulu dire '%s'." -#: help.c:400 +#: help.c:643 +#, 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 #, 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:404 help.c:464 +#: help.c:655 +msgid "" +"\n" +"The most similar command is" +msgid_plural "" +"\n" +"The most similar commands are" +msgstr[0] "" +"\n" +"La commande la plus ressemblante est" +msgstr[1] "" +"\n" +"Les commandes les plus ressemblantes sont" + +#: help.c:670 +msgid "git version [<options>]" +msgstr "git version [<options>]" + +#: help.c:738 +#, c-format +msgid "%s: %s - %s" +msgstr "%s: %s - %s" + +#: help.c:742 msgid "" "\n" "Did you mean this?" @@ -762,12 +2803,74 @@ msgstr[1] "" "\n" "Vouliez-vous dire un de ceux-là ?" -#: help.c:460 +#: ident.c:342 +msgid "" +"\n" +"*** Please tell me who you are.\n" +"\n" +"Run\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"Your Name\"\n" +"\n" +"to set your account's default identity.\n" +"Omit --global to set the identity only in this repository.\n" +"\n" +msgstr "" +"\n" +"*** Veuillez me dire qui vous êtes.\n" +"\n" +"Lancez\n" +"\n" +" git config --global user.email \"Vous@exemple.com\"\n" +" git config --global user.name \"Votre Nom\"\n" +"\n" +"pour régler l'identité par défaut de votre compte.\n" +"Éliminez --global pour ne faire les réglages que dans ce dépôt.\n" +"\n" + +#: ident.c:366 +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 #, c-format -msgid "%s: %s - %s" -msgstr "%s: %s - %s" +msgid "unable to auto-detect email address (got '%s')" +msgstr "impossible de détecter automatiquement l'adresse ('%s' trouvé)" + +#: ident.c:381 +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 +#, c-format +msgid "unable to auto-detect name (got '%s')" +msgstr "impossible de détecter automatiquement le nom ('%s' trouvé)" + +#: ident.c:395 +#, c-format +msgid "empty ident name (for <%s>) not allowed" +msgstr "nom d'identifiant vide (pour <%s>) non permis" + +#: ident.c:401 +#, 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 +#, c-format +msgid "invalid date format: %s" +msgstr "format de date invalide : %s" + +#: list-objects-filter-options.c:36 +msgid "multiple filter-specs cannot be combined" +msgstr "impossible de combiner des spécificateurs multiples de filtre" -#: lockfile.c:152 +#: list-objects-filter-options.c:126 +msgid "cannot change partial clone promisor remote" +msgstr "impossible de modifier le prometteur distant de clone partiel" + +#: lockfile.c:151 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -786,92 +2889,168 @@ msgstr "" "un processus git peut avoir planté :\n" "supprimez le fichier manuellement pour poursuivre." -#: lockfile.c:160 +#: lockfile.c:159 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Impossible de créer '%s.lock' : %s" -#: merge.c:41 +#: merge.c:40 msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 -#: builtin/checkout.c:586 builtin/clone.c:732 +#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380 +#: builtin/checkout.c:608 builtin/clone.c:763 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" -#: merge-recursive.c:189 -#, c-format +#: merge-recursive.c:303 msgid "(bad commit)\n" msgstr "(mauvais commit)\n" -#: merge-recursive.c:209 +#: merge-recursive.c:325 #, c-format -msgid "addinfo_cache failed for path '%s'" -msgstr "échec de addinfo_cache pour le chemin '%s'" +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:270 +#: merge-recursive.c:333 +#, 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 msgid "error building trees" msgstr "erreur de construction des arbres" -#: merge-recursive.c:689 +#: merge-recursive.c:886 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:700 +#: merge-recursive.c:897 #, 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:714 merge-recursive.c:735 +#: merge-recursive.c:911 merge-recursive.c:930 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:725 +#: merge-recursive.c:920 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:765 +#: merge-recursive.c:962 builtin/cat-file.c:39 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:767 +#: merge-recursive.c:964 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:790 builtin/clone.c:376 +#: merge-recursive.c:988 #, c-format -msgid "failed to open '%s'" -msgstr "échec à l'ouverture de '%s'" +msgid "failed to open '%s': %s" +msgstr "échec à l'ouverture de '%s' : %s" -#: merge-recursive.c:798 +#: merge-recursive.c:999 #, c-format -msgid "failed to symlink '%s'" -msgstr "échec à la création du lien symbolique '%s'" +msgid "failed to symlink '%s': %s" +msgstr "échec à la création du lien symbolique '%s' : %s" -#: merge-recursive.c:801 +#: merge-recursive.c:1004 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:939 +#: 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:" +msgstr "Avance rapide du sous-module %s au commit suivant :" + +#: merge-recursive.c:1216 merge-recursive.c:1228 +#, c-format +msgid "Fast-forwarding submodule %s" +msgstr "Avance rapide du sous-module %s" + +#: merge-recursive.c:1250 +#, 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 +#, 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 +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 +#, 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:1267 +#, 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 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-recursive.c:943 +#: merge-recursive.c:1331 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-recursive.c:959 -msgid "unsupported object type in the tree" -msgstr "type d'objet non supporté dans l'arbre" +#: merge-recursive.c:1363 +#, c-format +msgid "Auto-merging %s" +msgstr "Fusion automatique de %s" + +#: merge-recursive.c:1434 +#, 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:1034 merge-recursive.c:1048 +#: merge-recursive.c:1501 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -880,7 +3059,16 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre." -#: merge-recursive.c:1040 merge-recursive.c:1053 +#: merge-recursive.c:1506 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree." +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 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -889,20 +3077,40 @@ 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:1094 +#: merge-recursive.c:1518 +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree at %s." +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 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1094 +#: merge-recursive.c:1552 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1150 +#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394 +#: merge-recursive.c:3129 +#, c-format +msgid "Refusing to lose dirty file at %s" +msgstr "Refus de perdre le fichier modifié %s" + +#: merge-recursive.c:1620 #, 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:1172 +#: merge-recursive.c:1625 +#, 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 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -911,217 +3119,343 @@ msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1177 +#: merge-recursive.c:1656 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1231 +#: merge-recursive.c:1720 #, 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:1261 +#: merge-recursive.c:1759 #, 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:1460 +#: merge-recursive.c:1771 +#, 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 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to place %s because " +"directory %s was renamed to multiple other directories, with no destination " +"getting a majority of the files." +msgstr "" +"CONFLIT (renommage de répertoire coupé) : la place de %s n'est pas claire " +"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 +#, 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:2019 +#, 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:2111 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" +">%s in %s" +msgstr "" +"CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. " +"Renommage de répertoire %s->%s dans %s" + +#: merge-recursive.c:2356 +#, 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:2762 #, 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:1470 +#: merge-recursive.c:2777 #, c-format msgid "Adding merged %s" msgstr "Ajout de %s fusionné" -#: merge-recursive.c:1475 merge-recursive.c:1677 +#: merge-recursive.c:2784 merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:1526 +#: merge-recursive.c:2941 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-recursive.c:1529 +#: merge-recursive.c:2944 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-recursive.c:1581 +#: merge-recursive.c:3013 msgid "modify" msgstr "modification" -#: merge-recursive.c:1581 +#: merge-recursive.c:3013 msgid "modified" msgstr "modifié" -#: merge-recursive.c:1591 +#: merge-recursive.c:3024 msgid "content" msgstr "contenu" -#: merge-recursive.c:1598 +#: merge-recursive.c:3031 msgid "add/add" msgstr "ajout/ajout" -#: merge-recursive.c:1632 +#: merge-recursive.c:3076 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:1646 -#, c-format -msgid "Auto-merging %s" -msgstr "Fusion automatique de %s" - -#: merge-recursive.c:1650 git-submodule.sh:941 +#: merge-recursive.c:3098 git-submodule.sh:865 msgid "submodule" msgstr "sous-module" -#: merge-recursive.c:1651 +#: merge-recursive.c:3099 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-recursive.c:1737 +#: merge-recursive.c:3221 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:1762 +#: merge-recursive.c:3247 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:1768 +#: merge-recursive.c:3253 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:1773 +#: merge-recursive.c:3260 #, 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:1781 +#: merge-recursive.c:3269 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:1798 -msgid "Fatal merge failure, shouldn't happen." -msgstr "Échec fatal de fusion, qui ne devrait jamais arriver." +#: merge-recursive.c:3303 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par la " +"fusion :\n" +" %s" -#: merge-recursive.c:1817 -msgid "Already up-to-date!" +#: merge-recursive.c:3314 +msgid "Already up to date!" msgstr "Déjà à jour !" -#: merge-recursive.c:1826 +#: merge-recursive.c:3323 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:1856 -#, c-format -msgid "Unprocessed path??? %s" -msgstr "Chemin non traité ??? %s" - -#: merge-recursive.c:1904 +#: merge-recursive.c:3422 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:1917 +#: merge-recursive.c:3435 #, 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:1954 +#: merge-recursive.c:3474 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:2011 +#: merge-recursive.c:3540 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 +#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." -#: notes-utils.c:41 +#: notes-merge.c:274 +#, c-format +msgid "" +"You have not concluded your previous notes merge (%s exists).\n" +"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " +"commit/abort the previous merge before you start a new notes merge." +msgstr "" +"Vous n'avez pas terminé votre précédente fusion de notes (%s existe).\n" +"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 +#, c-format +msgid "You have not concluded your notes merge (%s exists)." +msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)." + +#: notes-utils.c:45 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Impossible de valider un arbre de notes non initialisé/référencé" -#: notes-utils.c:100 +#: notes-utils.c:104 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Mauvaise valeur de notes.rewriteMode : '%s'" -#: notes-utils.c:110 +#: notes-utils.c:114 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)" -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: notes-utils.c:137 +#. TRANSLATORS: The first %s is the name of +#. the environment variable, the second %s is +#. its value. +#. +#: notes-utils.c:144 #, c-format msgid "Bad %s value: '%s'" msgstr "Mauvaise valeur de %s : '%s'" -#: object.c:242 +#: object.c:54 +#, c-format +msgid "invalid object type \"%s\"" +msgstr "type d'objet invalide \"%s\"" + +#: object.c:173 +#, c-format +msgid "object %s is a %s, not a %s" +msgstr "l'objet %s est de type %s, pas de type %s" + +#: object.c:233 +#, c-format +msgid "object %s has unknown type id %d" +msgstr "l'objet %s a un id de type inconnu %d" + +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" -#: parse-options.c:572 +#: object.c:266 object.c:277 +#, c-format +msgid "sha1 mismatch %s" +msgstr "incohérence de sha1 %s" + +#: packfile.c:563 +msgid "offset before end of packfile (broken .idx?)" +msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" + +#: packfile.c:1745 +#, 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 +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "" +"offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)" + +#: parse-options.c:672 msgid "..." msgstr "..." -#: parse-options.c:590 +#: parse-options.c:691 #, c-format msgid "usage: %s" msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation -#: parse-options.c:594 +#. one in "usage: %s" translation. +#. +#: parse-options.c:697 #, c-format msgid " or: %s" msgstr " ou : %s" -#: parse-options.c:597 +#: parse-options.c:700 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:631 +#: parse-options.c:739 msgid "-NUM" msgstr "-NUM" -#: parse-options-cb.c:108 +#: parse-options-cb.c:44 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "date d'expiration malformée : '%s'" + +#: parse-options-cb.c:112 #, c-format msgid "malformed object name '%s'" msgstr "nom d'objet malformé '%s'" -#: path.c:796 +#: path.c:892 #, c-format msgid "Could not make %s writable by group" msgstr "Impossible de rendre %s inscriptible pour le groupe" -#: pathspec.c:133 +#: pathspec.c:129 +msgid "Escape character '\\' not allowed as last character in attr value" +msgstr "" +"Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une " +"valeur d'attribut" + +#: pathspec.c:147 +msgid "Only one 'attr:' specification is allowed." +msgstr "Une seule spécification 'attr:' est autorisée." + +#: pathspec.c:150 +msgid "attr spec must not be empty" +msgstr "un spécificateur d'attribut ne peut pas être vide" + +#: pathspec.c:193 +#, c-format +msgid "invalid attribute name %s" +msgstr "nom d'attribut invalide %s" + +#: pathspec.c:258 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont " "incompatibles" -#: pathspec.c:143 +#: pathspec.c:265 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -1129,69 +3463,119 @@ msgstr "" "le réglage global de spécificateur de chemin 'literal' est incompatible avec " "tous les autres réglages globaux de spécificateur de chemin" -#: pathspec.c:177 +#: pathspec.c:305 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'" -#: pathspec.c:183 +#: pathspec.c:326 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'" -#: pathspec.c:187 +#: pathspec.c:331 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'" -#: pathspec.c:205 +#: pathspec.c:369 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Spécificateur magique '%c' non implémenté dans '%s'" -#: pathspec.c:230 +#: pathspec.c:428 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s : 'literal' et 'glob' sont incompatibles" -#: pathspec.c:241 +#: pathspec.c:441 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s : '%s' est hors du dépôt" -#: pathspec.c:291 +#: pathspec.c:515 #, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "Le chemin '%s' est dans le sous-module '%.*s'" +msgid "'%s' (mnemonic: '%c')" +msgstr "'%s' (mnémonique : '%c')" -#: pathspec.c:353 +#: pathspec.c:525 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s : le spécificateur magique de chemin n'est pas supporté par cette " "commande : %s" -#: pathspec.c:433 +#: pathspec.c:592 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "le chemin '%s' est au-delà d'un lien symbolique" -#: pathspec.c:442 -msgid "" -"There is nothing to exclude from by :(exclude) patterns.\n" -"Perhaps you forgot to add either ':/' or '.' ?" +#: pkt-line.c:104 +msgid "flush packet write failed" +msgstr "échec de l'écriture du vidage de paquet" + +#: pkt-line.c:142 pkt-line.c:228 +msgid "protocol error: impossibly long line" +msgstr "erreur de protocole : ligne impossiblement trop longue" + +#: pkt-line.c:158 pkt-line.c:160 +msgid "packet write with format failed" +msgstr "échec de l'écriture d'un paquet avec format" + +#: pkt-line.c:192 +msgid "packet write failed - data exceeds max packet size" msgstr "" -"Il n'y a rien dont il faut exclure par des motifs :(exclure).\n" -"Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?" +"échec de l'écriture d'un paquet ‑ les données dépassent la taille maximale " +"d'un paquet" + +#: pkt-line.c:199 pkt-line.c:206 +msgid "packet write failed" +msgstr "échec de l'écriture d'un paquet" + +#: pkt-line.c:291 +msgid "read error" +msgstr "erreur de lecture" + +#: pkt-line.c:299 +msgid "the remote end hung up unexpectedly" +msgstr "L'hôte distant a fermé la connexion de manière inattendue" + +#: pkt-line.c:327 +#, c-format +msgid "protocol error: bad line length character: %.4s" +msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s" + +#: pkt-line.c:337 pkt-line.c:342 +#, c-format +msgid "protocol error: bad line length %d" +msgstr "erreur de protocole : mauvaise longueur de ligne %d" -#: pretty.c:971 +#: pretty.c:962 msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: progress.c:235 -msgid "done" -msgstr "fait" +#: range-diff.c:48 +msgid "could not start `log`" +msgstr "impossible de démarrer `log`" -#: read-cache.c:1281 +#: range-diff.c:51 +msgid "could not read `log` output" +msgstr "impossible de lire la sortie de `log`" + +#: range-diff.c:66 sequencer.c:4540 +#, c-format +msgid "could not parse commit '%s'" +msgstr "impossible d'analyser le commit '%s'" + +#: range-diff.c:196 +msgid "failed to generate diff" +msgstr "échec de la génération de diff" + +#: range-diff.c:421 range-diff.c:423 +#, c-format +msgid "could not parse log for '%s'" +msgstr "impossible d'analyser le journal pour '%s'" + +#: read-cache.c:1579 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1200,7 +3584,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1291 +#: read-cache.c:1589 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1209,251 +3593,484 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 -#: builtin/merge.c:995 +#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083 +#, c-format +msgid "could not close '%s'" +msgstr "impossible de fermer '%s'" + +#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374 +#, c-format +msgid "could not stat '%s'" +msgstr "stat impossible de '%s'" + +#: read-cache.c:2666 +#, c-format +msgid "unable to open git dir: %s" +msgstr "impossible d'ouvrir le répertoire git : %s" + +#: read-cache.c:2678 +#, c-format +msgid "unable to unlink: %s" +msgstr "échec lors de l'unlink : %s" + +#: refs.c:192 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "%s ne pointe pas sur un objet valide!" + +#: refs.c:579 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "symref pendant %s ignoré" + +#: refs.c:581 ref-filter.c:2067 +#, c-format +msgid "ignoring broken ref %s" +msgstr "réf cassé %s ignoré" + +#: refs.c:685 +#, c-format +msgid "could not open '%s' for writing: %s" +msgstr "impossible d'ouvrir '%s' en écriture : %s" + +#: refs.c:695 refs.c:746 +#, c-format +msgid "could not read ref '%s'" +msgstr "impossible de lire la réf '%s'" + +#: refs.c:701 #, c-format -msgid "Could not open '%s' for writing" -msgstr "Impossible d'ouvrir '%s' en écriture" +msgid "ref '%s' already exists" +msgstr "la référence '%s' existe déjà" -#: refs/files-backend.c:2243 +#: refs.c:706 +#, c-format +msgid "unexpected object ID when writing '%s'" +msgstr "id d'objet inattendu pendant l'écriture de '%s'" + +#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492 +#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564 +#: wrapper.c:656 +#, c-format +msgid "could not write to '%s'" +msgstr "impossible d'écrire dans '%s'" + +#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:780 +#, c-format +msgid "could not open '%s' for writing" +msgstr "impossible d'ouvrir '%s' en écriture" + +#: refs.c:748 +#, c-format +msgid "unexpected object ID when deleting '%s'" +msgstr "id d'objet inattendu pendant la suppression de '%s'" + +#: refs.c:879 +#, 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:885 +#, 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:943 +#, c-format +msgid "log for %s is empty" +msgstr "le journal pour la réf %s est vide" + +#: refs.c:1035 +#, 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:1111 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "échec de update_ref pour la réf '%s' : %s" + +#: refs.c:1853 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "mises à jour multiples pour la réf '%s' non permises" + +#: refs.c:1885 +msgid "ref updates forbidden inside quarantine environment" +msgstr "mises à jour des références interdites en environnement de quarantaine" + +#: refs.c:1981 refs.c:2011 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "'%s' existe ; impossible de créer '%s'" + +#: refs.c:1987 refs.c:2022 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "impossible de traiter '%s' et '%s' en même temps" + +#: refs/files-backend.c:1191 +#, c-format +msgid "could not remove reference %s" +msgstr "impossible de supprimer la référence %s" + +#: refs/files-backend.c:1205 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "Impossible de supprimer la référence %s : %s" -#: refs/files-backend.c:2246 +#: refs/files-backend.c:1208 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "impossible de supprimer les références : %s" -#: refs/files-backend.c:2255 +#: refspec.c:137 #, c-format -msgid "could not remove reference %s" -msgstr "impossible de supprimer la référence %s" +msgid "invalid refspec '%s'" +msgstr "spécificateur de réference invalide : '%s'" + +# à priori on parle d'une branche ici +#: ref-filter.c:38 wt-status.c:1850 +msgid "gone" +msgstr "disparue" -#: ref-filter.c:55 +#: ref-filter.c:39 +#, c-format +msgid "ahead %d" +msgstr "en avance de %d" + +#: ref-filter.c:40 +#, c-format +msgid "behind %d" +msgstr "en retard de %d" + +#: ref-filter.c:41 +#, c-format +msgid "ahead %d, behind %d" +msgstr "en avance de %d, en retard de %d" + +#: ref-filter.c:137 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format attendu : %%(color:<couleur>)" -#: ref-filter.c:57 +#: ref-filter.c:139 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "couleur non reconnue : %%(color:%s)" -#: ref-filter.c:71 +#: ref-filter.c:161 #, c-format -msgid "unrecognized format: %%(%s)" -msgstr "format non reconnu %%(%s)" +msgid "Integer value expected refname:lstrip=%s" +msgstr "Valeur entière attendue refname:lstrip=%s" -#: ref-filter.c:77 +#: ref-filter.c:165 +#, c-format +msgid "Integer value expected refname:rstrip=%s" +msgstr "Valeur entière attendue refname:rstrip=%s" + +#: ref-filter.c:167 +#, c-format +msgid "unrecognized %%(%s) argument: %s" +msgstr "argument %%(%s) non reconnu : %s" + +#: ref-filter.c:222 +#, c-format +msgid "%%(objecttype) does not take arguments" +msgstr "%%(objecttype) n'accepte pas d'argument" + +#: ref-filter.c:234 +#, c-format +msgid "%%(objectsize) does not take arguments" +msgstr "%%(objectsize) n'accepte pas d'argument" + +#: ref-filter.c:246 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) n'accepte pas d'argument" -#: ref-filter.c:84 +#: ref-filter.c:255 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) n'accepte pas d'argument" -#: ref-filter.c:101 +#: ref-filter.c:275 +#, c-format +msgid "unknown %%(trailers) argument: %s" +msgstr "argument %%(trailers) inconnu : %s" + +#: ref-filter.c:304 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valeur positive attendue contents:lines=%s" -#: ref-filter.c:103 +#: ref-filter.c:306 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argument %%(contents) non reconnu : %s" -#: ref-filter.c:113 +#: ref-filter.c:321 +#, c-format +msgid "positive value expected objectname:short=%s" +msgstr "valeur positive attendue objectname:short=%s" + +#: ref-filter.c:325 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argument %%(objectname) non reconnu : %s" -#: ref-filter.c:135 +#: ref-filter.c:355 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format attendu : %%(align:<largeur>,<position>)" -#: ref-filter.c:147 +#: ref-filter.c:367 #, c-format msgid "unrecognized position:%s" msgstr "position non reconnue : %s" -#: ref-filter.c:151 +#: ref-filter.c:374 #, c-format msgid "unrecognized width:%s" msgstr "largeur non reconnue : %s" -#: ref-filter.c:157 +#: ref-filter.c:383 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argument %%(align) non reconnu : %s" -#: ref-filter.c:161 +#: ref-filter.c:391 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "valeur positive attendue avec l'atome %%(align)" -#: ref-filter.c:244 +#: ref-filter.c:409 +#, c-format +msgid "unrecognized %%(if) argument: %s" +msgstr "argument %%(if) non reconnu : %s" + +#: ref-filter.c:505 #, c-format msgid "malformed field name: %.*s" msgstr "nom de champ malformé %.*s" -#: ref-filter.c:270 +#: ref-filter.c:532 #, c-format msgid "unknown field name: %.*s" msgstr "nom de champ inconnu : %.*s" -#: ref-filter.c:372 +#: ref-filter.c:656 +#, c-format +msgid "format: %%(if) atom used without a %%(then) atom" +msgstr "format : atome %%(if) utilisé sans un atome %%(then)" + +#: ref-filter.c:719 +#, c-format +msgid "format: %%(then) atom used without an %%(if) atom" +msgstr "format : atome %%(then) utilisé sans un atome %%(if)" + +#: ref-filter.c:721 +#, c-format +msgid "format: %%(then) atom used more than once" +msgstr "format : atome %%(then) utilisé plus d'une fois" + +#: ref-filter.c:723 +#, c-format +msgid "format: %%(then) atom used after %%(else)" +msgstr "format: atome %%(then) utilisé après %%(else)" + +#: ref-filter.c:751 +#, c-format +msgid "format: %%(else) atom used without an %%(if) atom" +msgstr "format : atome %%(else) utilisé sans un atome %%(if)" + +#: ref-filter.c:753 +#, c-format +msgid "format: %%(else) atom used without a %%(then) atom" +msgstr "format : atome %%(else) utilisé sans un atome %%(then)" + +#: ref-filter.c:755 +#, c-format +msgid "format: %%(else) atom used more than once" +msgstr "format : atome %%(else) utilisé plus d'une fois" + +#: ref-filter.c:770 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format : atome %%(end) utilisé sans atome correspondant" -#: ref-filter.c:424 +#: ref-filter.c:827 #, c-format msgid "malformed format string %s" msgstr "Chaîne de formatage mal formée %s" -#: ref-filter.c:878 -msgid ":strip= requires a positive integer argument" -msgstr ":strip= requiert un argument entier positif" +#: ref-filter.c:1416 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "(aucune branche, rebasage de %s)" + +#: ref-filter.c:1419 +#, c-format +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "(aucune branche, rebasage de la HEAD détachée %s)" -#: ref-filter.c:883 +#: ref-filter.c:1422 #, c-format -msgid "ref '%s' does not have %ld components to :strip" -msgstr "la réf '%s' n'a pas %ld composants à :strip" +msgid "(no branch, bisect started on %s)" +msgstr "(aucune branche, bisect a démarré sur %s)" -#: ref-filter.c:1046 +#. TRANSLATORS: make sure this matches "HEAD +#. detached at " in wt-status.c +#. +#: ref-filter.c:1430 #, c-format -msgid "unknown %.*s format %s" -msgstr "format de %.*s inconnu %s" +msgid "(HEAD detached at %s)" +msgstr "(HEAD détachée sur %s)" -#: ref-filter.c:1066 ref-filter.c:1097 +#. TRANSLATORS: make sure this matches "HEAD +#. detached from " in wt-status.c +#. +#: ref-filter.c:1437 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD détachée depuis %s)" + +#: ref-filter.c:1441 +msgid "(no branch)" +msgstr "(aucune branche)" + +#: ref-filter.c:1475 ref-filter.c:1623 #, c-format msgid "missing object %s for %s" msgstr "objet manquant %s pour %s" -#: ref-filter.c:1069 ref-filter.c:1100 +#: ref-filter.c:1483 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "echec de parse_object_buffer sur %s pour %s" -#: ref-filter.c:1311 +#: ref-filter.c:1980 #, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" -#: ref-filter.c:1373 +#: ref-filter.c:2062 #, c-format msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:1378 -#, c-format -msgid "ignoring broken ref %s" -msgstr "réf cassé %s ignoré" - -#: ref-filter.c:1651 +#: ref-filter.c:2340 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:1705 +#: ref-filter.c:2444 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: remote.c:746 +#: remote.c:606 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Impossible de récupérer à la fois %s et %s pour %s" -#: remote.c:750 +#: remote.c:610 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:754 +#: remote.c:614 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#: remote.c:762 +#: remote.c:622 msgid "Internal error" msgstr "Erreur interne" -#: remote.c:1678 remote.c:1721 +#: remote.c:1536 remote.c:1637 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1687 +#: remote.c:1545 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1690 +#: remote.c:1548 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurée pour la branche '%s'" -#: remote.c:1696 +#: remote.c:1554 #, 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:1711 +#: remote.c:1569 #, 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:1726 +#: remote.c:1581 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branche '%s' n'a aucune branche distante de poussée" -#: remote.c:1737 +#: remote.c:1591 #, 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:1750 +#: remote.c:1604 msgid "push has no destination (push.default is 'nothing')" msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')" -#: remote.c:1772 +#: remote.c:1626 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de résoudre une poussée 'simple' pour une destination unique" -#: remote.c:2074 +#: remote.c:1951 #, 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:2078 +#: remote.c:1955 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2081 +#: remote.c:1958 #, c-format -msgid "Your branch is up-to-date with '%s'.\n" +msgid "Your branch is up to date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:2085 +#: remote.c:1962 +#, 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:1965 +#, c-format +msgid " (use \"%s\" for details)\n" +msgstr " (utilisez \"%s\" pour plus de détails)\n" + +#: remote.c:1969 #, 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:2091 +#: remote.c:1975 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2094 +#: remote.c:1978 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1465,11 +4082,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:2102 +#: remote.c:1986 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:2105 +#: remote.c:1989 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1484,42 +4101,78 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:2115 +#: remote.c:1999 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" -#: revision.c:2142 +#: replace-object.c:20 +#, c-format +msgid "bad replace ref name: %s" +msgstr "mauvaise références de remplacement : %s" + +#: replace-object.c:29 +#, c-format +msgid "duplicate replace ref: %s" +msgstr "référence de remplacement dupliquée : %s" + +#: replace-object.c:72 +#, c-format +msgid "replace depth too high for object %s" +msgstr "profondeur de remplacement trop grande pour l'objet %s" + +#: revision.c:2305 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2145 +#: revision.c:2308 #, 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:2339 +#: revision.c:2505 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" -#: run-command.c:92 +#: run-command.c:728 msgid "open /dev/null failed" msgstr "échec de l'ouverture de /dev/null" -#: run-command.c:94 +#: run-command.c:1271 #, c-format -msgid "dup2(%d,%d) failed" -msgstr "échec de dup2(%d,%d)" +msgid "" +"The '%s' hook was ignored because it's not set as executable.\n" +"You can disable this warning with `git config advice.ignoredHook false`." +msgstr "" +"Le crochet '%s' a été ignoré parce qu'il n'est pas marqué comme exécutable.\n" +"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook " +"false`." -#: send-pack.c:295 +#: send-pack.c:142 +msgid "unexpected flush packet while reading remote unpack status" +msgstr "" +"paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage " +"distant" + +#: send-pack.c:144 +#, c-format +msgid "unable to parse remote unpack status: %s" +msgstr "impossible d'analyser l'état de dépaquetage distant : %s" + +#: send-pack.c:146 +#, c-format +msgid "remote unpack failed: %s" +msgstr "le dépaquetage a échoué : %s" + +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "impossible de signer le certificat de poussée" -#: send-pack.c:404 +#: send-pack.c:422 msgid "the receiving end does not support --signed push" msgstr "Le receveur ne gère pas les poussées avec --signed" -#: send-pack.c:406 +#: send-pack.c:424 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -1527,11 +4180,42 @@ msgstr "" "pas d'envoi de certificat de poussée car le receveur ne gère pas les " "poussées avec --signed" -#: send-pack.c:418 +#: send-pack.c:436 msgid "the receiving end does not support --atomic push" msgstr "Le receveur ne gère pas les poussées avec --atomic" -#: sequencer.c:174 +#: send-pack.c:441 +msgid "the receiving end does not support push options" +msgstr "Le receveur ne gère pas les options de poussées" + +#: sequencer.c:177 +#, c-format +msgid "invalid commit message cleanup mode '%s'" +msgstr "mode de nettoyage invalide de message de validation '%s'" + +#: sequencer.c:278 +#, c-format +msgid "could not delete '%s'" +msgstr "Impossible de supprimer '%s'" + +#: sequencer.c:304 +msgid "revert" +msgstr "revert" + +#: sequencer.c:306 +msgid "cherry-pick" +msgstr "cherry-pick" + +#: sequencer.c:308 +msgid "rebase -i" +msgstr "rebase -i" + +#: sequencer.c:310 +#, c-format +msgid "unknown action: %d" +msgstr "action inconnue : %d" + +#: sequencer.c:367 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1539,7 +4223,7 @@ msgstr "" "après résolution des conflits, marquez les chemins corrigés\n" "avec 'git add <chemins>' ou 'git rm <chemins>'" -#: sequencer.c:177 +#: sequencer.c:370 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1549,255 +4233,1213 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:190 sequencer.c:833 sequencer.c:912 +#: sequencer.c:383 sequencer.c:2488 #, c-format -msgid "Could not write to %s" -msgstr "Impossible d'écrire dans %s" +msgid "could not lock '%s'" +msgstr "impossible de verrouiller '%s'" -#: sequencer.c:193 +#: sequencer.c:390 #, c-format -msgid "Error wrapping up %s" -msgstr "Erreur à l'emballage de %s" +msgid "could not write eol to '%s'" +msgstr "impossible d'écrire la fin de ligne dans '%s'" + +#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508 +#: sequencer.c:2741 +#, c-format +msgid "failed to finalize '%s'" +msgstr "échec lors de la finalisation de '%s'" + +#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391 +#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740 +#: builtin/merge.c:1081 +#, c-format +msgid "could not read '%s'" +msgstr "impossible de lire '%s'" -#: sequencer.c:208 -msgid "Your local changes would be overwritten by cherry-pick." -msgstr "Vos modifications locales seraient écrasées par cherry-pick." +#: sequencer.c:444 +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "vos modifications locales seraient écrasées par %s." -#: sequencer.c:210 -msgid "Your local changes would be overwritten by revert." -msgstr "Vos modifications locales seraient écrasées par revert." +#: sequencer.c:448 +msgid "commit your changes or stash them to proceed." +msgstr "validez vos modifications ou les remiser pour continuer." -#: sequencer.c:213 -msgid "Commit your changes or stash them to proceed." -msgstr "Validez vos modifications ou les remiser pour continuer." +#: sequencer.c:477 +#, c-format +msgid "%s: fast-forward" +msgstr "%s : avance rapide" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:300 +#. TRANSLATORS: %s will be "revert", "cherry-pick" or +#. "rebase -i". +#. +#: sequencer.c:566 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:318 -msgid "Could not resolve HEAD commit\n" -msgstr "Impossible de résoudre le commit HEAD\n" +#: sequencer.c:582 +msgid "unable to update cache tree" +msgstr "impossible de mettre à jour l'arbre de cache" -#: sequencer.c:338 -msgid "Unable to update cache tree\n" -msgstr "Impossible de mettre à jour l'arbre de cache\n" +#: sequencer.c:595 +msgid "could not resolve HEAD commit" +msgstr "impossible de résoudre le commit HEAD" -#: sequencer.c:390 +#: sequencer.c:723 sequencer.c:740 #, c-format -msgid "Could not parse commit %s\n" -msgstr "Impossible d'analyser le commit %s\n" +msgid "could not parse '%s' (looking for '%s')" +msgstr "impossible d'analyser '%s' (à la recherche de '%s')" -#: sequencer.c:395 +#: sequencer.c:731 #, c-format -msgid "Could not parse parent commit %s\n" -msgstr "Impossible d'analyser le commit parent %s\n" +msgid "bad quoting on %s value in '%s'" +msgstr "Mauvaise citation sur la valeur %s dans '%s'" -#: sequencer.c:460 -msgid "Your index file is unmerged." -msgstr "Votre fichier d'index n'est pas fusionné." +#: sequencer.c:747 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "format de date invalide '%s' dans '%s'" -#: sequencer.c:479 +#: sequencer.c:761 #, 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." +msgid "" +"you have staged changes in your working tree\n" +"If these changes are meant to be squashed into the previous commit, run:\n" +"\n" +" git commit --amend %s\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit %s\n" +"\n" +"In both cases, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" +msgstr "" +"Vous avez des modifications indexées dans votre copie de travail.\n" +"Si elles devaient être ajoutées dans le commit précédent, lancez :\n" +"\n" +" git commit --amend %s\n" +"\n" +"Si elles devaient aller dans un nouveau commit, lancez :\n" +"\n" +" git commit %s\n" +"\n" +"Dans les deux cas, une fois fini, continuez avec :\n" +"\n" +" git rebase --continue\n" -#: sequencer.c:487 +#: sequencer.c:830 +msgid "writing root commit" +msgstr "écriture du commit racine" + +#: sequencer.c:1055 +msgid "'prepare-commit-msg' hook failed" +msgstr "échec du crochet 'prepare-commit-msg'" + +#: sequencer.c:1062 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"Votre nom et votre adresse courriel ont été configurés automatiquement en " +"se\n" +"fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n" +"vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n" +"paramétrant explicitement. Lancez les commandes suivantes et suivez les\n" +"instruction dans votre éditeur pour éditer votre fichier de configuration :\n" +"\n" +" git config --global --edit\n" +"\n" +"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation " +"avec :\n" +"\n" +" git commit --amend --reset-author\n" + +#: sequencer.c:1075 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly:\n" +"\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"Votre nom et votre adresse courriel ont été configurés automatiquement en se " +"fondant\n" +"sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier " +"qu'ils sont corrects.\n" +"Vous pouvez supprimer ce message en les paramétrant explicitement :\n" +"\n" +" git config --global user.name \"Votre Nom\"\n" +" git config --global user.email vous@exemple.com\n" +"\n" +"Après ceci, vous pouvez corriger l'identité utilisée pour ce commit avec :\n" +"\n" +" git commit --amend --reset-author\n" + +#: sequencer.c:1115 +msgid "couldn't look up newly created commit" +msgstr "impossible de retrouver le commit nouvellement créé" + +#: sequencer.c:1117 +msgid "could not parse newly created commit" +msgstr "impossible d'analyser le commit nouvellement créé" + +#: sequencer.c:1163 +msgid "unable to resolve HEAD after creating commit" +msgstr "impossible de résoudre HEAD après création du commit" + +#: sequencer.c:1165 +msgid "detached HEAD" +msgstr "HEAD détachée" + +#: sequencer.c:1169 +msgid " (root-commit)" +msgstr " (commit racine)" + +#: sequencer.c:1190 +msgid "could not parse HEAD" +msgstr "impossible de lire HEAD" + +#: sequencer.c:1192 +#, c-format +msgid "HEAD %s is not a commit!" +msgstr "HEAD %s n'est pas un commit !" + +#: sequencer.c:1196 builtin/commit.c:1528 +msgid "could not parse HEAD commit" +msgstr "impossible d'analyser le commit HEAD" + +#: sequencer.c:1247 sequencer.c:1845 +msgid "unable to parse commit author" +msgstr "impossible d'analyser l'auteur du commit" + +#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree a échoué à écrire un arbre" + +#: sequencer.c:1274 sequencer.c:1329 #, c-format -msgid "Commit %s does not have parent %d" -msgstr "Le commit %s n'a pas le parent %d" +msgid "unable to read commit message from '%s'" +msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:491 +#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855 +#: builtin/merge.c:880 +msgid "failed to write commit object" +msgstr "échec de l'écriture de l'objet commit" + +#: sequencer.c:1356 +#, c-format +msgid "could not parse commit %s" +msgstr "impossible d'analyser le commit %s" + +#: sequencer.c:1361 +#, c-format +msgid "could not parse parent commit %s" +msgstr "impossible d'analyser le commit parent %s" + +#: sequencer.c:1457 sequencer.c:1565 +#, c-format +msgid "unknown command: %d" +msgstr "commande inconnue : %d" + +#: sequencer.c:1512 sequencer.c:1537 +#, c-format +msgid "This is a combination of %d commits." +msgstr "Ceci est la combinaison de %d commits." + +#: sequencer.c:1522 sequencer.c:4520 +msgid "need a HEAD to fixup" +msgstr "une HEAD est nécessaire à la correction" + +#: sequencer.c:1524 sequencer.c:2768 +msgid "could not read HEAD" +msgstr "Impossible de lire HEAD" + +#: sequencer.c:1526 +msgid "could not read HEAD's commit message" +msgstr "impossible de lire le message de validation de HEAD" + +#: sequencer.c:1532 +#, c-format +msgid "cannot write '%s'" +msgstr "impossible d'écrire '%s'" + +#: sequencer.c:1539 git-rebase--preserve-merges.sh:441 +msgid "This is the 1st commit message:" +msgstr "Ceci est le premier message de validation :" + +#: sequencer.c:1547 #, c-format -msgid "Mainline was specified but commit %s is not a merge." +msgid "could not read commit message of %s" +msgstr "impossible de lire le message de validation de %s" + +#: sequencer.c:1554 +#, c-format +msgid "This is the commit message #%d:" +msgstr "Ceci est le message de validation numéro %d :" + +#: sequencer.c:1560 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "Le message de validation %d sera ignoré :" + +#: sequencer.c:1643 +msgid "your index file is unmerged." +msgstr "votre fichier d'index n'est pas fusionné." + +#: sequencer.c:1650 +msgid "cannot fixup root commit" +msgstr "impossible de réparer le commit racine" + +#: sequencer.c:1669 +#, 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:1677 +#, c-format +msgid "commit %s does not have parent %d" +msgstr "le commit %s n'a pas de parent %d" + +#: sequencer.c:1681 +#, c-format +msgid "mainline was specified but commit %s is not a merge." msgstr "" -"Une branche principale a été spécifiée mais le commit %s n'est pas une " +"une branche principale a été spécifiée mais le commit %s n'est pas une " "fusion." -#. TRANSLATORS: The first %s will be "revert" or -#. "cherry-pick", the second %s a SHA1 -#: sequencer.c:504 +#: sequencer.c:1687 +#, 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:1706 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:508 +#: sequencer.c:1771 #, c-format -msgid "Cannot get commit message for %s" -msgstr "Impossible d'obtenir un message de validation pour %s" +msgid "could not rename '%s' to '%s'" +msgstr "impossible de renommer '%s' en '%s'" -#: sequencer.c:594 +#: sequencer.c:1826 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:595 +#: sequencer.c:1827 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:630 -msgid "empty commit set passed" -msgstr "l'ensemble de commits spécifié est vide" - -#: sequencer.c:638 +#: sequencer.c:1885 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:642 +#: sequencer.c:1892 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:702 +#: sequencer.c:1972 #, c-format -msgid "Cannot %s during a %s" -msgstr "Impossible de %s pendant un %s" +msgid "%s does not accept arguments: '%s'" +msgstr "%s n'accepte pas d'argument : '%s'" -#: sequencer.c:724 +#: sequencer.c:1981 #, c-format -msgid "Could not parse line %d." -msgstr "Impossible d'analyser la ligne %d." +msgid "missing arguments for %s" +msgstr "argument manquant pour %s" -#: sequencer.c:729 -msgid "No commits parsed." -msgstr "Aucun commit analysé." - -#: sequencer.c:741 +#: sequencer.c:2040 #, c-format -msgid "Could not open %s" -msgstr "Impossible d'ouvrir %s" +msgid "invalid line %d: %.*s" +msgstr "ligne %d invalide : %.*s" -#: sequencer.c:745 +#: sequencer.c:2048 #, c-format -msgid "Could not read %s." -msgstr "Impossible de lire %s." +msgid "cannot '%s' without a previous commit" +msgstr "'%s' impossible avec le commit précédent" -#: sequencer.c:752 +#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333 #, c-format -msgid "Unusable instruction sheet: %s" -msgstr "Feuille d'instruction inutilisable : %s" +msgid "could not read '%s'." +msgstr "impossible de lire '%s'." + +#: sequencer.c:2119 +msgid "please fix this using 'git rebase --edit-todo'." +msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: sequencer.c:782 +#: sequencer.c:2121 #, c-format -msgid "Invalid key: %s" -msgstr "Clé invalide: %s" +msgid "unusable instruction sheet: '%s'" +msgstr "feuille d'instruction inutilisable : '%s'" + +#: sequencer.c:2126 +msgid "no commits parsed." +msgstr "aucun commit analysé." + +#: sequencer.c:2137 +msgid "cannot cherry-pick during a revert." +msgstr "impossible de picorer pendant l'annulation d'un commit." + +#: sequencer.c:2139 +msgid "cannot revert during a cherry-pick." +msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52 +#: sequencer.c:2209 #, c-format -msgid "Invalid value for %s: %s" -msgstr "Valeur invalide pour %s : %s" +msgid "invalid value for %s: %s" +msgstr "valeur invalide pour %s : %s" + +#: sequencer.c:2285 +msgid "unusable squash-onto" +msgstr "\"écrase-sur\" inutilisable" -#: sequencer.c:795 +#: sequencer.c:2301 #, c-format -msgid "Malformed options sheet: %s" -msgstr "Feuille d'options malformée : %s" +msgid "malformed options sheet: '%s'" +msgstr "feuille d'options malformée : %s" -#: sequencer.c:814 +#: sequencer.c:2335 sequencer.c:3775 +msgid "empty commit set passed" +msgstr "l'ensemble de commits spécifié est vide" + +#: sequencer.c:2343 msgid "a cherry-pick or revert is already in progress" msgstr "un picorage ou un retour est déjà en cours" -#: sequencer.c:815 +#: sequencer.c:2344 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" -#: sequencer.c:819 +#: sequencer.c:2347 #, c-format -msgid "Could not create sequencer directory %s" -msgstr "Impossible de créer le répertoire de séquenceur %s" +msgid "could not create sequencer directory '%s'" +msgstr "impossible de créer le répertoire de séquenceur '%s'" -#: sequencer.c:835 sequencer.c:916 -#, c-format -msgid "Error wrapping up %s." -msgstr "Erreur lors de l'emballage de %s." +#: sequencer.c:2361 +msgid "could not lock HEAD" +msgstr "impossible de verrouiller HEAD" -#: sequencer.c:854 sequencer.c:986 +#: sequencer.c:2416 sequencer.c:3543 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:856 +#: sequencer.c:2418 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:858 +#: sequencer.c:2420 sequencer.c:2455 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 +#: sequencer.c:2441 builtin/grep.c:721 #, c-format -msgid "cannot open %s" -msgstr "impossible d'ouvrir %s" +msgid "cannot open '%s'" +msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:880 +#: sequencer.c:2443 #, c-format -msgid "cannot read %s: %s" -msgstr "impossible de lire %s : %s" +msgid "cannot read '%s': %s" +msgstr "impossible de lire '%s' : %s" -#: sequencer.c:881 +#: sequencer.c:2444 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:887 +#: sequencer.c:2450 #, 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:909 +#: sequencer.c:2461 +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:2565 sequencer.c:3461 +#, c-format +msgid "could not update %s" +msgstr "impossible de mettre à jour %s" + +#: sequencer.c:2603 sequencer.c:3441 +msgid "cannot read HEAD" +msgstr "impossible de lire HEAD" + +#: sequencer.c:2618 +#, c-format +msgid "unable to copy '%s' to '%s'" +msgstr "impossible de copier '%s' vers '%s'" + +#: sequencer.c:2626 #, c-format -msgid "Could not format %s." -msgstr "Impossible de formater %s." +msgid "" +"You can amend the commit now, with\n" +"\n" +" git commit --amend %s\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +" git rebase --continue\n" +msgstr "" +"Vous pouvez corriger le commit maintenant, avec\n" +"\n" +" git commit --amend %s\n" +"\n" +"après avoir réalisé vos modifications, lancez\n" +"\n" +" git rebase --continue\n" + +#: sequencer.c:2636 +#, c-format +msgid "Could not apply %s... %.*s" +msgstr "impossible d'appliquer %s... %.*s" + +#: sequencer.c:2643 +#, c-format +msgid "Could not merge %.*s" +msgstr "Impossible de fusionner %.*s" + +#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640 +#, c-format +msgid "could not copy '%s' to '%s'" +msgstr "impossible de copier '%s' vers '%s'" + +#: sequencer.c:2680 sequencer.c:3095 +msgid "could not read index" +msgstr "impossible de lire l'index" + +#: sequencer.c:2685 +#, c-format +msgid "" +"execution failed: %s\n" +"%sYou can fix the problem, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"échec d'exécution : %s\n" +"%sVous pouvez corriger le problème, puis lancer\n" +"\n" +"git rebase --continue\n" +"\n" + +#: sequencer.c:2691 +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:2697 +#, c-format +msgid "" +"execution succeeded: %s\n" +"but left changes to the index and/or the working tree\n" +"Commit or stash your changes, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"L'exécution a réussi : %s\n" +"mais a laissé des modifications dans l'index ou la copie de travail\n" +"Validez ou remisez vos modification, puis lancez\n" +"\n" +" git rebase --continue\n" +"\n" + +#: sequencer.c:2758 +#, c-format +msgid "illegal label name: '%.*s'" +msgstr "nom de label illégal '%.*s'" + +#: sequencer.c:2810 +msgid "writing fake root commit" +msgstr "écriture d'un commit racine bidon" + +#: sequencer.c:2815 +msgid "writing squash-onto" +msgstr "écriture de 'écraser-sur'" + +#: sequencer.c:2850 +#, c-format +msgid "failed to find tree of %s" +msgstr "impossible de trouver l'arbre de %s" + +#: sequencer.c:2868 +msgid "could not write index" +msgstr "impossible d'écrire l'index" + +#: sequencer.c:2895 +#, c-format +msgid "could not resolve '%s'" +msgstr "impossible de résoudre '%s'" + +#: sequencer.c:2921 +msgid "cannot merge without a current revision" +msgstr "impossible de fusionner avec une révision courante" + +#: sequencer.c:2943 +#, c-format +msgid "unable to parse '%.*s'" +msgstr "impossible d'analyser '%.*s'" + +#: sequencer.c:2952 +#, c-format +msgid "nothing to merge: '%.*s'" +msgstr "rien à fusionner : '%.*s'" + +#: sequencer.c:2964 +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:1054 +#: sequencer.c:2979 +#, c-format +msgid "could not get commit message of '%s'" +msgstr "impossible de lire le message de validation de '%s'" + +#: sequencer.c:2989 sequencer.c:3015 +#, c-format +msgid "could not write '%s'" +msgstr "impossible d'écrire '%s'" + +#: sequencer.c:3127 +#, c-format +msgid "could not even attempt to merge '%.*s'" +msgstr "impossible de seulement essayer de fusionner '%.*s'" + +#: sequencer.c:3143 +msgid "merge: Unable to write new index file" +msgstr "fusion : Impossible d'écrire le nouveau fichier index" + +#: sequencer.c:3211 +#, c-format +msgid "Applied autostash.\n" +msgstr "Autoremisage appliqué.\n" + +#: sequencer.c:3223 +#, c-format +msgid "cannot store %s" +msgstr "impossible de stocker %s" + +#: sequencer.c:3226 git-rebase.sh:188 +#, c-format +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" +"L'application de l'autoremisage a provoqué des conflits\n" +"Vos modifications sont à l'abri dans la remise.\n" +"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" + +#: sequencer.c:3257 +#, c-format +msgid "" +"Could not execute the todo command\n" +"\n" +" %.*s\n" +"It has been rescheduled; To edit the command before continuing, please\n" +"edit the todo list first:\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" +msgstr "" +"Impossible d'exécuter la commande\n" +"\n" +" %.*s\n" +"Elle a été reprogrammée ; pour éditer la commande avant de poursuivre,\n" +"veuillez éditer la liste de commandes en premier :\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" + +#: sequencer.c:3325 +#, c-format +msgid "Stopped at %s... %.*s\n" +msgstr "arrêt à %s... %.*s\n" + +#: sequencer.c:3404 +#, c-format +msgid "unknown command %d" +msgstr "commande inconnue %d" + +#: sequencer.c:3449 +msgid "could not read orig-head" +msgstr "impossible de lire orig-head" + +#: sequencer.c:3454 sequencer.c:4517 +msgid "could not read 'onto'" +msgstr "impossible de lire 'onto'" + +#: sequencer.c:3468 +#, c-format +msgid "could not update HEAD to %s" +msgstr "impossible de mettre à jour HEAD sur %s" + +#: sequencer.c:3554 +msgid "cannot rebase: You have unstaged changes." +msgstr "impossible de rebaser : vous avez des modifications non indexées." + +#: sequencer.c:3563 +msgid "cannot amend non-existing commit" +msgstr "impossible de corriger un commit non-existant" + +#: sequencer.c:3565 +#, c-format +msgid "invalid file: '%s'" +msgstr "fichier invalide : '%s'" + +#: sequencer.c:3567 +#, c-format +msgid "invalid contents: '%s'" +msgstr "contenu invalide : '%s'" + +#: sequencer.c:3570 +msgid "" +"\n" +"You have uncommitted changes in your working tree. Please, commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" +"\n" +"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:3595 sequencer.c:3633 +#, c-format +msgid "could not write file: '%s'" +msgstr "impossible d'écrire le fichier : '%s'" + +#: sequencer.c:3648 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "impossible de supprimer CHERRY_PICK_HEAD" + +#: sequencer.c:3655 +msgid "could not commit staged changes." +msgstr "impossible de valider les modifications indexées." + +#: sequencer.c:3752 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:1057 +#: sequencer.c:3756 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:1091 -msgid "Can't revert as initial commit" -msgstr "Impossible d'annuler en tant que commit initial" +#: sequencer.c:3791 +msgid "can't revert as initial commit" +msgstr "impossible d'annuler en tant que commit initial" -#: sequencer.c:1092 -msgid "Can't cherry-pick into empty head" -msgstr "Impossible de picorer vers une HEAD vide" +#: sequencer.c:4238 +msgid "make_script: unhandled options" +msgstr "make_script : options non gérées" -#: setup.c:248 +#: sequencer.c:4241 +msgid "make_script: error preparing revisions" +msgstr "make_script : erreur lors de la préparation des révisions" + +#: sequencer.c:4281 sequencer.c:4337 #, c-format -msgid "failed to read %s" -msgstr "échec de la lecture de %s" +msgid "unusable todo list: '%s'" +msgstr "liste à faire inutilisable : '%s'" + +#: sequencer.c:4396 +#, c-format +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "" +"paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré." + +#: sequencer.c:4466 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"Attention : certains commits ont pu être accidentellement supprimés.\n" +"Commits supprimés (du plus jeune au plus vieux) :\n" + +#: sequencer.c:4473 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un " +"commit.\n" +"\n" +"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau " +"d'avertissements.\n" +"Les comportements disponibles sont : ignore, warn, error.\n" +"\n" + +#: sequencer.c:4486 +#, c-format +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git " +"rebase --continue'.\n" +"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n" + +#: sequencer.c:4660 +msgid "the script was already rearranged." +msgstr "le script a déjà été réarrangé." + +#: setup.c:123 +#, c-format +msgid "'%s' is outside repository" +msgstr "'%s' est hors du dépôt" + +#: setup.c:172 +#, c-format +msgid "" +"%s: no such path in the working tree.\n" +"Use 'git <command> -- <path>...' to specify paths that do not exist locally." +msgstr "" +"%s : ce chemin n'existe pas dans la copie de travail.\n" +"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui " +"n'existent pas localement." + +#: setup.c:185 +#, c-format +msgid "" +"ambiguous argument '%s': unknown revision or path not in the working tree.\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "" +"argument '%s' ambigu : révision inconnue ou chemin inexistant.\n" +"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" +"'git <commande> [<révision>...] -- [<chemin>...]'" + +#: setup.c:234 +#, c-format +msgid "option '%s' must come before non-option arguments" +msgstr "" +"l'option '%s' doit être présente avant les arguments qui ne sont pas des " +"options" + +#: setup.c:253 +#, c-format +msgid "" +"ambiguous argument '%s': both revision and filename\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "" +"argument '%s' ambigu : révision et chemin spécifiés.\n" +"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" +"'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:468 +#: setup.c:389 +msgid "unable to set up work tree using invalid config" +msgstr "" +"impossible de mettre en place le répertoire de travail en utilisant une " +"configuration invalide" + +#: setup.c:393 +msgid "this operation must be run in a work tree" +msgstr "Cette opération doit être effectuée dans un arbre de travail" + +#: setup.c:503 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Version attendue du dépôt git <= %d, %d trouvée" -#: setup.c:476 +#: setup.c:511 msgid "unknown repository extensions found:" msgstr "extensions de dépôt inconnues trouvées :" -#: sha1_file.c:1080 -msgid "offset before end of packfile (broken .idx?)" -msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" +#: setup.c:530 +#, c-format +msgid "error opening '%s'" +msgstr "erreur à l'ouverture de '%s'" -#: sha1_file.c:2458 +#: setup.c:532 #, 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 ?)" +msgid "too large to be a .git file: '%s'" +msgstr "trop gros pour être une fichier .git : '%s'" -#: sha1_file.c:2462 +#: setup.c:534 #, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" +msgid "error reading %s" +msgstr "erreur à la lecture de %s" + +#: setup.c:536 +#, c-format +msgid "invalid gitfile format: %s" +msgstr "format de fichier git invalide : %s" + +#: setup.c:538 +#, c-format +msgid "no path in gitfile: %s" +msgstr "aucun chemin dans le fichier git : %s" + +#: setup.c:540 +#, c-format +msgid "not a git repository: %s" +msgstr "ce n'est pas un dépôt git : %s" + +#: setup.c:639 +#, c-format +msgid "'$%s' too big" +msgstr "'$%s' trop gros" + +#: setup.c:653 +#, c-format +msgid "not a git repository: '%s'" +msgstr "ce n'est pas un dépôt git : '%s'" + +#: setup.c:682 setup.c:684 setup.c:715 +#, c-format +msgid "cannot chdir to '%s'" +msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'" + +#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815 +msgid "cannot come back to cwd" +msgstr "impossible de revenir au répertoire de travail courant" + +#: setup.c:813 +#, c-format +msgid "not a git repository (or any of the parent directories): %s" +msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s" + +#: setup.c:824 +#, c-format +msgid "failed to stat '%*s%s%s'" +msgstr "échec du stat de '%*s%s%s'" + +#: setup.c:1054 +msgid "Unable to read current working directory" +msgstr "Impossible d'accéder au répertoire de travail courant" + +#: setup.c:1066 setup.c:1072 +#, c-format +msgid "cannot change to '%s'" +msgstr "impossible de modifier en '%s'" + +#: setup.c:1085 +#, c-format +msgid "" +"not a git repository (or any parent up to mount point %s)\n" +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -"offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)" +"ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) " +"n'est un dépôt git\n" +"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM " +"n'est pas défini)." -#: sha1_name.c:462 +#: setup.c:1168 +#, c-format +msgid "" +"problem with core.sharedRepository filemode value (0%.3o).\n" +"The owner of files must always have read and write permissions." +msgstr "" +"problème avec la valeur de core.sharedRepository (0%.3o).\n" +"Le propriétaire des fichiers doit toujours avoir les droits en lecture et " +"écriture." + +#: setup.c:1211 +msgid "open /dev/null or dup failed" +msgstr "échec de l'ouverture ou au dup de /dev/null" + +#: setup.c:1226 +msgid "fork failed" +msgstr "échec de la bifurcation" + +#: setup.c:1231 +msgid "setsid failed" +msgstr "échec du setsid" + +#: sha1-file.c:381 +#, 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:432 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "impossible de normaliser le chemin d'objet alternatif : %s" + +#: sha1-file.c:503 +#, 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:510 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "impossible de normaliser le répertoire d'objet : %s" + +#: sha1-file.c:565 +msgid "unable to fdopen alternates lockfile" +msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives" + +#: sha1-file.c:583 +msgid "unable to read alternates file" +msgstr "lecture du fichier d'alternatives impossible" + +#: sha1-file.c:590 +msgid "unable to move new alternates file into place" +msgstr "impossible de déplacer le nouveau fichier d'alternative" + +#: sha1-file.c:625 +#, c-format +msgid "path '%s' does not exist" +msgstr "le chemin '%s' n'existe pas" + +#: sha1-file.c:651 +#, 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:657 +#, 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:663 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "le dépôt de référence '%s' est superficiel" + +#: sha1-file.c:671 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "le dépôt de référence '%s' est greffé" + +#: sha1-file.c:781 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>" + +#: sha1-file.c:806 +msgid "mmap failed" +msgstr "échec de mmap" + +#: sha1-file.c:973 +#, c-format +msgid "object file %s is empty" +msgstr "le fichier objet %s est vide" + +#: sha1-file.c:1093 sha1-file.c:2206 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "objet libre corrompu '%s'" + +#: sha1-file.c:1095 sha1-file.c:2210 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "données incorrectes à la fin de l'objet libre '%s'" + +#: sha1-file.c:1137 +msgid "invalid object type" +msgstr "type d'objet invalide" + +#: sha1-file.c:1219 +#, 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:1222 +#, c-format +msgid "unable to unpack %s header" +msgstr "impossible de dépaqueter l'entête %s" + +#: sha1-file.c:1228 +#, 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:1231 +#, c-format +msgid "unable to parse %s header" +msgstr "impossible d'analyser l'entête %s" + +#: sha1-file.c:1422 +#, c-format +msgid "failed to read object %s" +msgstr "impossible de lire l'objet %s" + +#: sha1-file.c:1426 +#, c-format +msgid "replacement %s not found for %s" +msgstr "remplacement %s non trouvé pour %s" + +#: sha1-file.c:1430 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "l'objet libre %s (stocké dans %s) est corrompu" + +#: sha1-file.c:1434 +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu" + +#: sha1-file.c:1536 +#, c-format +msgid "unable to write sha1 filename %s" +msgstr "impossible d'écrire le fichier sha1 %s" + +#: sha1-file.c:1543 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "impossible de régler les droits de '%s'" + +#: sha1-file.c:1550 +msgid "file write error" +msgstr "erreur d'écriture d'un fichier" + +#: sha1-file.c:1569 +msgid "error when closing sha1 file" +msgstr "erreur en fermeture du fichier sha1" + +#: sha1-file.c:1635 +#, 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:1637 +msgid "unable to create temporary file" +msgstr "impossible de créer un fichier temporaire" + +#: sha1-file.c:1661 +msgid "unable to write sha1 file" +msgstr "impossible d'écrire le fichier sha1" + +#: sha1-file.c:1667 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "impossible de compresser le nouvel objet %s (%d)" + +#: sha1-file.c:1671 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "échec de deflateEnd sur l'objet %s (%d)" + +#: sha1-file.c:1675 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "données de source d'objet instable pour %s" + +#: sha1-file.c:1685 builtin/pack-objects.c:899 +#, c-format +msgid "failed utime() on %s" +msgstr "échec de utime() sur %s" + +#: sha1-file.c:1760 +#, c-format +msgid "cannot read sha1_file for %s" +msgstr "impossible de lire le fichier sha1 pour %s" + +#: sha1-file.c:1805 +msgid "corrupt commit" +msgstr "commit corrompu" + +#: sha1-file.c:1813 +msgid "corrupt tag" +msgstr "étiquette corrompue" + +#: sha1-file.c:1906 +#, c-format +msgid "read error while indexing %s" +msgstr "erreur de lecture à l'indexation de %s" + +#: sha1-file.c:1909 +#, c-format +msgid "short read while indexing %s" +msgstr "lecture tronquée pendant l'indexation de %s" + +#: sha1-file.c:1980 sha1-file.c:1989 +#, c-format +msgid "%s: failed to insert into database" +msgstr "%s : échec de l'insertion dans la base de données" + +#: sha1-file.c:1995 +#, c-format +msgid "%s: unsupported file type" +msgstr "%s : type de fichier non supporté" + +#: sha1-file.c:2019 +#, c-format +msgid "%s is not a valid object" +msgstr "%s n'est pas un objet valide" + +#: sha1-file.c:2021 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s n'est pas un objet '%s' valide" + +#: sha1-file.c:2048 builtin/index-pack.c:158 +#, c-format +msgid "unable to open %s" +msgstr "impossible d'ouvrir %s" + +#: sha1-file.c:2217 sha1-file.c:2269 +#, c-format +msgid "sha1 mismatch for %s (expected %s)" +msgstr "incohérence de sha1 pour %s (%s attendu)" + +#: sha1-file.c:2241 +#, c-format +msgid "unable to mmap %s" +msgstr "impossible de mmap %s" + +#: sha1-file.c:2246 +#, c-format +msgid "unable to unpack header of %s" +msgstr "impossible de dépaqueter l'entête de %s" + +#: sha1-file.c:2252 +#, c-format +msgid "unable to parse header of %s" +msgstr "impossible d'analyser l'entête de %s" + +#: sha1-file.c:2263 +#, c-format +msgid "unable to unpack contents of %s" +msgstr "impossible de dépaqueter le contenu de %s" + +#: sha1-name.c:444 +#, c-format +msgid "short SHA1 %s is ambiguous" +msgstr "le SHA1 court %s est ambigu" + +#: sha1-name.c:455 +msgid "The candidates are:" +msgstr "Les candidats sont :" + +#: sha1-name.c:699 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" @@ -1809,7 +5451,7 @@ msgid "" "examine these refs and maybe delete them. Turn this message off by\n" "running \"git config advice.objectNameWarning false\"" msgstr "" -"Git ne créé normalement jamais de référence qui se termine par 40 caractères " +"Git ne crée normalement jamais de référence qui se termine par 40 caractères " "hexa\n" "car elle serait ignorée si vous spécifiiez 40-hexa. Ces références\n" "peuvent être créées par erreur. Par exemple,\n" @@ -1822,146 +5464,522 @@ msgstr "" "message\n" "en lançant \"git config advice.objectNameWarning false\"" -#: submodule.c:64 submodule.c:98 +#: submodule.c:97 submodule.c:131 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Modification impossible de .gitmodules non fusionné, résolvez les conflits " "d'abord" -#: submodule.c:68 submodule.c:102 +#: submodule.c:101 submodule.c:135 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Impossible de trouver une section où path=%s dans .gitmodules" -#: submodule.c:76 +#: submodule.c:109 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Impossible de mettre à jour l'élément %s de .gitmodules" # ici %s est un chemin -#: submodule.c:109 +#: submodule.c:142 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Impossible de supprimer l'élément de .gitmodules pour %s" -#: submodule.c:120 +#: submodule.c:153 msgid "staging updated .gitmodules failed" msgstr "échec de la mise en index du .gitmodules mis à jour" -#: submodule.c:177 -msgid "negative values not allowed for submodule.fetchJobs" +#: submodule.c:315 +#, c-format +msgid "in unpopulated submodule '%s'" +msgstr "dans le sous-module '%s' non populé" + +#: submodule.c:346 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "Le chemin '%s' est dans le sous-module '%.*s'" + +#: submodule.c:839 +#, 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:1071 builtin/branch.c:670 builtin/submodule--helper.c:1888 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Échec de résolution de HEAD comme référence valide." + +#: submodule.c:1377 +#, c-format +msgid "'%s' not recognized as a git repository" +msgstr "'%s' n'est pas reconnu comme dépôt git" + +#: submodule.c:1515 +#, 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:1528 +#, c-format +msgid "could not run 'git status' in submodule '%s'" +msgstr "impossible de lancer 'git status' dans le sous-module '%s'" + +#: submodule.c:1543 +#, 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:1633 +#, c-format +msgid "submodule '%s' has dirty index" +msgstr "le sous-module '%s' a un index sale" + +#: submodule.c:1685 +#, c-format +msgid "Submodule '%s' could not be updated." +msgstr "le sous-module '%s' n'a pas pu être mis à jour." + +#: submodule.c:1734 +#, c-format +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "" +"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail " +"n'est pas supporté" + +#: submodule.c:1746 submodule.c:1802 +#, c-format +msgid "could not lookup name for submodule '%s'" +msgstr "impossible de trouve le nom pour le sous-module '%s'" + +#: submodule.c:1750 builtin/submodule--helper.c:1406 +#: builtin/submodule--helper.c:1416 +#, c-format +msgid "could not create directory '%s'" +msgstr "impossible de créer le répertoire '%s'" + +#: submodule.c:1753 +#, c-format +msgid "" +"Migrating git directory of '%s%s' from\n" +"'%s' to\n" +"'%s'\n" +msgstr "" +"Migration du répertoire git de '%s%s' depuis\n" +"'%s' sur\n" +"'%s'\n" + +#: submodule.c:1837 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "récursion impossible dans le sous-module '%s'" + +#: submodule.c:1881 +msgid "could not start ls-files in .." +msgstr "impossible de démarrer ls-files dans .." + +#: submodule.c:1920 +#, c-format +msgid "ls-tree returned unexpected return code %d" +msgstr "ls-tree a renvoyé un code de retour inattendu %d" + +#: submodule-config.c:231 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "nom de sous-module suspicieux %s ignoré" + +#: submodule-config.c:295 +msgid "negative values not allowed for submodule.fetchjobs" msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs" -#: submodule-config.c:355 +#: submodule-config.c:468 #, c-format msgid "invalid value for %s" msgstr "Valeur invalide pour %s" -#: trailer.c:237 +#: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "échec de la commande trailer '%s'" -#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 -#: trailer.c:562 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 +#: trailer.c:557 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valeur inconnue '%s' pour la clé '%s'" -#: trailer.c:544 trailer.c:549 builtin/remote.c:289 +#: trailer.c:539 trailer.c:544 builtin/remote.c:294 #, c-format msgid "more than one %s" msgstr "plus d'un %s" -#: trailer.c:582 +#: trailer.c:730 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "symbole vide dans la ligne de fin '%.*s'" -#: trailer.c:702 +#: trailer.c:750 #, c-format msgid "could not read input file '%s'" msgstr "impossible de lire le fichier d'entrée '%s'" -#: trailer.c:705 +#: trailer.c:753 msgid "could not read from stdin" msgstr "Impossible de lire depuis l'entrée standard" -#: trailer.c:857 builtin/am.c:42 +#: trailer.c:1008 builtin/am.c:47 #, c-format msgid "could not stat %s" msgstr "stat impossible de %s" -#: trailer.c:859 +#: trailer.c:1010 #, c-format msgid "file %s is not a regular file" msgstr "%s n'est pas un fichier régulier" -#: trailer.c:861 +#: trailer.c:1012 #, c-format msgid "file %s is not writable by user" msgstr "le fichier %s n'est pas inscriptible par l'utilisateur" -#: trailer.c:873 +#: trailer.c:1024 msgid "could not open temporary file" msgstr "impossible de créer un fichier temporaire" -#: trailer.c:912 +#: trailer.c:1064 #, c-format msgid "could not rename temporary file to %s" msgstr "impossible de renommer un fichier temporaire en %s" -#: transport-helper.c:1041 +#: transport.c:116 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n" + +#: transport.c:142 #, c-format -msgid "Could not read ref %s" +msgid "could not read bundle '%s'" +msgstr "impossible de lire la liasse '%s'" + +#: transport.c:208 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "transport : option de profondeur invalide '%s'" + +#: transport.c:586 +msgid "could not parse transport.color.* config" +msgstr "impossible d'analyser la configuration transport.color.*" + +#: transport.c:659 +msgid "support for protocol v2 not implemented yet" +msgstr "le support du protocole v2 n'est pas encore implanté" + +#: transport.c:785 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "valeur inconnue pour la config '%s' : %s" + +#: transport.c:851 +#, c-format +msgid "transport '%s' not allowed" +msgstr "transport '%s' non permis" + +#: transport.c:903 +msgid "git-over-rsync is no longer supported" +msgstr "git-over-rsync n'est plus supporté" + +#: transport.c:998 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" +"Les chemins suivant de sous-module contiennent des modifications\n" +"qui ne peuvent être trouvées sur aucun distant :\n" + +#: transport.c:1002 +#, c-format +msgid "" +"\n" +"Please try\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"or cd to the path and use\n" +"\n" +"\tgit push\n" +"\n" +"to push them to a remote.\n" +"\n" +msgstr "" +"\n" +"Veuillez essayer\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"ou bien changez de répertoire et utilisez\n" +"\n" +"\tgit push\n" +"\n" +"pour les pousser vers un serveur distant.\n" +"\n" + +#: transport.c:1010 +msgid "Aborting." +msgstr "Abandon." + +#: transport.c:1148 +msgid "failed to push all needed submodules" +msgstr "echec de la poussée de tout les sous-modules nécessaires" + +#: transport.c:1270 transport-helper.c:643 +msgid "operation not supported by protocol" +msgstr "option non supportée par le protocole" + +#: transport.c:1352 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "ligne invalide pendant l'analyse des refs alternatives : %s" + +#: transport-helper.c:51 transport-helper.c:80 +msgid "full write to remote helper failed" +msgstr "échec de l'écriture totale sur l'assistant distant" + +#: transport-helper.c:132 +#, c-format +msgid "unable to find remote helper for '%s'" +msgstr "Impossible de trouver un assistant distant pour '%s'" + +#: transport-helper.c:148 transport-helper.c:557 +msgid "can't dup helper output fd" +msgstr "" +"impossible de dupliquer le descripteur de flux de sortie de l'assistant" + +#: transport-helper.c:199 +#, c-format +msgid "" +"unknown mandatory capability %s; this remote helper probably needs newer " +"version of Git" +msgstr "" +"capacité obligatoire inconnue %s ; cet assistant distant requiert " +"probablement une une nouvelle version de Git" + +#: transport-helper.c:205 +msgid "this remote helper should implement refspec capability" +msgstr "cet assistant distant devrait supporter la capacité refspec" + +#: transport-helper.c:272 transport-helper.c:412 +#, c-format +msgid "%s unexpectedly said: '%s'" +msgstr "%s a dit de manière inattendue : '%s'" + +#: transport-helper.c:401 +#, c-format +msgid "%s also locked %s" +msgstr "%s a aussi verrouillé %s" + +#: transport-helper.c:479 +msgid "couldn't run fast-import" +msgstr "impossible de lancer fast-import" + +#: transport-helper.c:502 +msgid "error while running fast-import" +msgstr "erreur au lancement de fast-import" + +#: transport-helper.c:531 transport-helper.c:1091 +#, c-format +msgid "could not read ref %s" msgstr "impossible de lire la réf %s" -#: unpack-trees.c:64 +#: transport-helper.c:576 +#, c-format +msgid "unknown response to connect: %s" +msgstr "réponse inconnue à connect : %s" + +#: transport-helper.c:598 +msgid "setting remote service path not supported by protocol" +msgstr "" +"la spécification du chemin de service distant n'est pas supportée par le " +"protocole" + +#: transport-helper.c:600 +msgid "invalid remote service path" +msgstr "chemin de service distant invalide" + +#: transport-helper.c:646 +#, c-format +msgid "can't connect to subservice %s" +msgstr "impossible de se connecter as sous-service %s" + +#: transport-helper.c:713 +#, c-format +msgid "expected ok/error, helper said '%s'" +msgstr "ok/error attendu, l'assistant a dit '%s'" + +#: transport-helper.c:766 +#, c-format +msgid "helper reported unexpected status of %s" +msgstr "l'assistant a renvoyé un statut de retour inattendu %s" + +#: transport-helper.c:827 +#, c-format +msgid "helper %s does not support dry-run" +msgstr "l'assistant %s ne gère pas dry-run" + +#: transport-helper.c:830 +#, c-format +msgid "helper %s does not support --signed" +msgstr "l'assistant %s ne gère pas --signed" + +#: transport-helper.c:833 +#, c-format +msgid "helper %s does not support --signed=if-asked" +msgstr "l'assistant %s ne gère pas --signed=if-asked" + +#: transport-helper.c:840 +#, c-format +msgid "helper %s does not support 'push-option'" +msgstr "l'assistant %s ne gère pas 'push-option'" + +#: transport-helper.c:932 +msgid "remote-helper doesn't support push; refspec needed" +msgstr "" +"l'assistant %s ne gère pas push ; un spécificateur de référence est " +"nécessaire" + +#: transport-helper.c:937 +#, c-format +msgid "helper %s does not support 'force'" +msgstr "l'assistant %s ne gère pas 'force'" + +#: transport-helper.c:984 +msgid "couldn't run fast-export" +msgstr "impossible de lancer fast-export" + +#: transport-helper.c:989 +msgid "error while running fast-export" +msgstr "erreur au lancement de fast-export" + +#: transport-helper.c:1014 +#, c-format +msgid "" +"No refs in common and none specified; doing nothing.\n" +"Perhaps you should specify a branch such as 'master'.\n" +msgstr "" +"Aucune référence en commun et aucune spécfiée ; rien à faire.\n" +"Vous devriez peut-être spécifier une branche telle que 'master'.\n" + +#: transport-helper.c:1077 +#, c-format +msgid "malformed response in ref list: %s" +msgstr "réponse malformée dans le liste de réfs : %s" + +#: transport-helper.c:1230 +#, c-format +msgid "read(%s) failed" +msgstr "échec de read(%s)" + +#: transport-helper.c:1257 +#, c-format +msgid "write(%s) failed" +msgstr "échec de write(%s)" + +#: transport-helper.c:1306 +#, c-format +msgid "%s thread failed" +msgstr "échec du fil d'exécution %s" + +#: transport-helper.c:1310 +#, c-format +msgid "%s thread failed to join: %s" +msgstr "échec de jonction du fil d'exécution %s : %s" + +#: transport-helper.c:1329 transport-helper.c:1333 +#, 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:1370 +#, c-format +msgid "%s process failed to wait" +msgstr "échec du processus %s pour l'attente" + +#: transport-helper.c:1374 +#, c-format +msgid "%s process failed" +msgstr "échec du processus %s" + +#: transport-helper.c:1392 transport-helper.c:1401 +msgid "can't start thread for copying data" +msgstr "impossible de démarrer le fil d'exécution pour copier les données" + +#: tree-walk.c:33 +msgid "too-short tree object" +msgstr "objet arbre trop court" + +#: tree-walk.c:39 +msgid "malformed mode in tree entry" +msgstr "mode invalide dans l'entrée d'arbre" + +#: 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:115 +msgid "too-short tree file" +msgstr "fichier arbre trop court" + +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" -"%%sPlease commit your changes or stash them before you can switch branches." +"%%sPlease commit your changes or stash them before you switch branches." msgstr "" -"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n" -"%%sVeuillez valider ou remiser vos modifications avant de basculer de branche." +"Vos modifications locales aux fichiers suivants seraient écrasées par " +"l'extraction :\n" +"%%sVeuillez valider ou remiser vos modifications avant de basculer de " +"branche." -#: unpack-trees.c:66 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n" +"Vos modifications locales aux fichiers suivants seraient écrasées par " +"l'extraction :\n" "%%s" -#: unpack-trees.c:69 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" -"%%sPlease commit your changes or stash them before you can merge." +"%%sPlease commit your changes or stash them before you merge." msgstr "" -"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n" +"Vos modifications locales aux fichiers suivants seraient écrasées par la " +"fusion :\n" "%%sVeuillez valider ou remiser vos modifications avant la fusion." -#: unpack-trees.c:71 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n" +"Vos modifications locales aux fichiers suivants seraient écrasées par la " +"fusion :\n" "%%s" -#: unpack-trees.c:74 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" -"%%sPlease commit your changes or stash them before you can %s." +"%%sPlease commit your changes or stash them before you %s." msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%sVeuillez valider ou remiser vos modifications avant %s." -#: unpack-trees.c:76 +#: unpack-trees.c:124 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -1970,25 +5988,27 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%s" -#: unpack-trees.c:81 +#: unpack-trees.c:129 #, c-format msgid "" -"Updating the following directories would lose untracked files in it:\n" +"Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -"La mise à jour des répertoires suivants effacerait les fichiers non suivis contenus :\n" +"La mise à jour des répertoires suivants effacerait les fichiers non suivis " +"contenus :\n" "%s" -#: unpack-trees.c:85 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" -"%%sPlease move or remove them before you can switch branches." +"%%sPlease move or remove them before you switch branches." msgstr "" -"Les fichiers suivants non suivis seraient effacés par l'extraction :\n" +"Les fichiers suivants non suivis de la copie de travail seraient effacés par " +"l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:87 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -1997,16 +6017,17 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par l'extraction :\n" "%%s" -#: unpack-trees.c:90 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" -"%%sPlease move or remove them before you can merge." +"%%sPlease move or remove them before you merge." msgstr "" -"Les fichiers suivants non suivis seraient effacés par la fusion :\n" +"Les fichiers suivants non suivis de la copie de travail seraient effacés par " +"la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:92 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -2015,16 +6036,17 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par la fusion :\n" "%%s" -#: unpack-trees.c:95 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" -"%%sPlease move or remove them before you can %s." +"%%sPlease move or remove them before you %s." msgstr "" -"Les fichiers suivants non suivis seraient effacés par %s :\n" +"Les fichiers suivants non suivis de la copie de travail seraient effacés par " +"%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:97 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -2033,17 +6055,18 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par %s :\n" "%%s" -#: unpack-trees.c:102 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " "checkout:\n" -"%%sPlease move or remove them before you can switch branches." +"%%sPlease move or remove them before you switch branches." msgstr "" -"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" +"Les fichiers suivants non suivis de la copie de travail seraient écrasés par " +"l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:104 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -2053,16 +6076,17 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" "%%s" -#: unpack-trees.c:107 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" -"%%sPlease move or remove them before you can merge." +"%%sPlease move or remove them before you merge." msgstr "" -"Les fichiers suivants non suivis seraient effacés par la fusion :\n" +"Les fichiers suivants non suivis de la copie de travail seraient effacés par " +"la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:109 +#: unpack-trees.c:158 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -2071,16 +6095,17 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par la fusion :\n" "%%s" -#: unpack-trees.c:112 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" -"%%sPlease move or remove them before you can %s." +"%%sPlease move or remove them before you %s." msgstr "" -"Les fichiers suivants non suivis seraient écrasés par %s :\n" +"Les fichiers suivants non suivis de la copie de travail seraient écrasés par " +"%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:114 +#: unpack-trees.c:163 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -2089,374 +6114,403 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par %s :\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:171 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible." -#: unpack-trees.c:124 +#: unpack-trees.c:174 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont pas à jour :\n" +"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont " +"pas à jour :\n" "%s" -#: unpack-trees.c:126 +#: unpack-trees.c:176 #, c-format msgid "" -"The following Working tree files would be overwritten by sparse checkout " +"The following working tree files would be overwritten by sparse checkout " "update:\n" "%s" msgstr "" -"Les fichiers suivants de la copie de travail seraient écrasés par la mise à jour par extraction creuse :\n" +"Les fichiers suivants de la copie de travail seraient écrasés par la mise à " +"jour par l'extraction creuse :\n" "%s" -#: unpack-trees.c:128 +#: unpack-trees.c:178 #, c-format msgid "" -"The following Working tree files would be removed by sparse checkout " +"The following working tree files would be removed by sparse checkout " "update:\n" "%s" msgstr "" -"Les fichiers suivants de la copie de travail seraient supprimés par la mise à jour par extraction creuse :\n" +"Les fichiers suivants de la copie de travail seraient supprimés par la mise " +"à jour par extraction creuse :\n" +"%s" + +#: unpack-trees.c:180 +#, c-format +msgid "" +"Cannot update submodule:\n" +"%s" +msgstr "" +"Mise à jour impossible pour le sous-module :\n" "%s" -#: unpack-trees.c:205 +#: unpack-trees.c:254 #, c-format msgid "Aborting\n" msgstr "Abandon\n" -#: unpack-trees.c:237 +#: unpack-trees.c:336 msgid "Checking out files" msgstr "Extraction des fichiers" -#: urlmatch.c:120 +#: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant" -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 #, c-format msgid "invalid %XX escape sequence" msgstr "séquence d'échappement %XX invalide" -#: urlmatch.c:172 +#: urlmatch.c:215 msgid "missing host and scheme is not 'file:'" msgstr "hôte manquant et le schéma n'est pas 'file:'" -#: urlmatch.c:189 +#: urlmatch.c:232 msgid "a 'file:' URL may not have a port number" msgstr "une URL 'file:' ne peut pas contenir de numéro de port" -#: urlmatch.c:199 +#: urlmatch.c:247 msgid "invalid characters in host name" msgstr "caractères invalides dans le nom d'hôte" -#: urlmatch.c:244 urlmatch.c:255 +#: urlmatch.c:292 urlmatch.c:303 msgid "invalid port number" msgstr "numéro de port invalide" -#: urlmatch.c:322 +#: urlmatch.c:371 msgid "invalid '..' path segment" msgstr "segment de chemin '..' invalide" -#: wrapper.c:222 wrapper.c:381 +#: worktree.c:245 builtin/am.c:2147 #, c-format -msgid "could not open '%s' for reading and writing" -msgstr "impossible d'ouvrir '%s' en lecture/écriture" +msgid "failed to read '%s'" +msgstr "échec de la lecture de '%s'" -#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 +#: worktree.c:291 #, c-format -msgid "could not open '%s' for writing" -msgstr "impossible d'ouvrir '%s' en écriture" +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" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 -#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 -#: builtin/pull.c:407 +#: worktree.c:302 #, c-format -msgid "could not open '%s' for reading" -msgstr "impossible d'ouvrir '%s' en lecture" +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" -#: wrapper.c:594 wrapper.c:615 +#: worktree.c:314 #, c-format -msgid "unable to access '%s'" -msgstr "impossible d'accéder à '%s'" +msgid "'%s' does not exist" +msgstr "'%s' n'existe pas" -#: wrapper.c:623 -msgid "unable to get current working directory" -msgstr "impossible d'accéder au répertoire de travail courant" +#: worktree.c:320 +#, c-format +msgid "'%s' is not a .git file, error code %d" +msgstr "'%s' n'est pas un fichier .git, code d'erreur %d" -#: wrapper.c:650 +#: worktree.c:328 #, c-format -msgid "could not open %s for writing" -msgstr "Impossible d'ouvrir '%s' en écriture" +msgid "'%s' does not point back to '%s'" +msgstr "'%s' ne pointe pas en retour sur '%s'" -#: wrapper.c:661 builtin/am.c:410 +#: wrapper.c:223 wrapper.c:393 #, c-format -msgid "could not write to %s" -msgstr "Impossible d'écrire dans %s" +msgid "could not open '%s' for reading and writing" +msgstr "impossible d'ouvrir '%s' en lecture/écriture" -#: wrapper.c:667 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:321 builtin/am.c:771 +#: builtin/am.c:863 builtin/merge.c:1078 #, c-format -msgid "could not close %s" -msgstr "impossible de fermer %s" +msgid "could not open '%s' for reading" +msgstr "impossible d'ouvrir '%s' en lecture" + +#: wrapper.c:424 wrapper.c:624 +#, c-format +msgid "unable to access '%s'" +msgstr "impossible d'accéder à '%s'" -#: wt-status.c:150 +#: wrapper.c:632 +msgid "unable to get current working directory" +msgstr "impossible d'accéder au répertoire de travail courant" + +#: wt-status.c:154 msgid "Unmerged paths:" msgstr "Chemins non fusionnés :" -#: wt-status.c:177 wt-status.c:204 +#: wt-status.c:181 wt-status.c:208 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:183 wt-status.c:210 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)" -#: wt-status.c:183 +#: wt-status.c:187 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:185 wt-status.c:189 +#: wt-status.c:189 wt-status.c:193 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme " "résolu)" -#: wt-status.c:187 +#: wt-status.c:191 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:198 wt-status.c:881 +#: wt-status.c:202 wt-status.c:1015 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:216 wt-status.c:890 +#: wt-status.c:220 wt-status.c:1024 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" -#: wt-status.c:220 +#: wt-status.c:224 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)" -#: wt-status.c:222 +#: wt-status.c:226 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera " "validé)" -#: wt-status.c:223 +#: wt-status.c:227 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications " "dans la copie de travail)" -#: wt-status.c:225 +#: wt-status.c:229 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)" -#: wt-status.c:237 +#: wt-status.c:241 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)" -#: wt-status.c:252 +#: wt-status.c:256 msgid "both deleted:" msgstr "supprimé des deux côtés :" -#: wt-status.c:254 +#: wt-status.c:258 msgid "added by us:" msgstr "ajouté par nous :" -#: wt-status.c:256 +#: wt-status.c:260 msgid "deleted by them:" msgstr "supprimé par eux :" -#: wt-status.c:258 +#: wt-status.c:262 msgid "added by them:" msgstr "ajouté par eux :" -#: wt-status.c:260 +#: wt-status.c:264 msgid "deleted by us:" msgstr "supprimé par nous :" -#: wt-status.c:262 +#: wt-status.c:266 msgid "both added:" msgstr "ajouté de deux côtés :" -#: wt-status.c:264 +#: wt-status.c:268 msgid "both modified:" msgstr "modifié des deux côtés :" -#: wt-status.c:266 -#, c-format -msgid "bug: unhandled unmerged status %x" -msgstr "bogue : état de non-fusion non géré %x" - -#: wt-status.c:274 +#: wt-status.c:278 msgid "new file:" msgstr "nouveau fichier :" -#: wt-status.c:276 +#: wt-status.c:280 msgid "copied:" msgstr "copié :" -#: wt-status.c:278 +#: wt-status.c:282 msgid "deleted:" msgstr "supprimé :" -#: wt-status.c:280 +#: wt-status.c:284 msgid "modified:" msgstr "modifié :" -#: wt-status.c:282 +#: wt-status.c:286 msgid "renamed:" msgstr "renommé :" -#: wt-status.c:284 +#: wt-status.c:288 msgid "typechange:" msgstr "modif. type :" -#: wt-status.c:286 +#: wt-status.c:290 msgid "unknown:" msgstr "inconnu :" -#: wt-status.c:288 +#: wt-status.c:292 msgid "unmerged:" msgstr "non fusionné :" -#: wt-status.c:370 +#: wt-status.c:372 msgid "new commits, " msgstr "nouveaux commits, " -#: wt-status.c:372 +#: wt-status.c:374 msgid "modified content, " msgstr "contenu modifié, " -#: wt-status.c:374 +#: wt-status.c:376 msgid "untracked content, " msgstr "contenu non suivi, " -#: wt-status.c:391 +#: wt-status.c:853 #, c-format -msgid "bug: unhandled diff status %c" -msgstr "bogue : état de diff non géré %c" +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:755 +#: wt-status.c:885 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:757 +#: wt-status.c:887 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:838 +#: wt-status.c:969 msgid "" -"Do not touch the line above.\n" -"Everything below will be removed." +"Do not modify or remove the line above.\n" +"Everything below it will be ignored." msgstr "" -"Ne touchez pas à la ligne ci-dessus\n" +"Ne touchez pas à la ligne ci-dessus.\n" "Tout ce qui suit sera éliminé." -#: wt-status.c:949 +#: wt-status.c:1084 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:952 +#: wt-status.c:1087 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:956 +#: wt-status.c:1089 +msgid " (use \"git merge --abort\" to abort the merge)" +msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)" + +#: wt-status.c:1094 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:959 +#: wt-status.c:1097 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:969 +#: wt-status.c:1107 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:972 +#: wt-status.c:1110 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:976 +#: wt-status.c:1114 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:978 +#: wt-status.c:1116 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:980 +#: wt-status.c:1118 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1105 +#: wt-status.c:1250 +msgid "git-rebase-todo is missing." +msgstr "git-rebase-todo est manquant." + +#: wt-status.c:1252 msgid "No commands done." msgstr "Aucune commande réalisée." -#: wt-status.c:1108 +#: wt-status.c:1255 #, 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:1119 +#: wt-status.c:1266 #, c-format msgid " (see more in file %s)" msgstr " (voir plus dans le fichier %s)" -#: wt-status.c:1124 +#: wt-status.c:1271 msgid "No commands remaining." msgstr "Aucune commande restante." -#: wt-status.c:1127 +#: wt-status.c:1274 #, 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:1135 +#: wt-status.c:1282 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)" -#: wt-status.c:1148 +#: wt-status.c:1295 #, 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:1153 +#: wt-status.c:1300 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1167 +#: wt-status.c:1314 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1169 +#: wt-status.c:1316 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1171 +#: wt-status.c:1318 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:1177 +#: wt-status.c:1324 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1181 +#: wt-status.c:1328 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -2464,124 +6518,128 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1186 +#: wt-status.c:1333 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:1189 +#: wt-status.c:1336 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:1193 +#: wt-status.c:1340 #, 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:1198 +#: wt-status.c:1345 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:1201 +#: wt-status.c:1348 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1203 +#: wt-status.c:1350 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -" (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos " +" (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos " "modifications)" -#: wt-status.c:1213 +#: wt-status.c:1360 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1218 +#: wt-status.c:1365 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1221 +#: wt-status.c:1368 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:1223 +#: wt-status.c:1370 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:1232 +#: wt-status.c:1379 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1237 +#: wt-status.c:1384 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1240 +#: wt-status.c:1387 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1242 +#: wt-status.c:1389 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1253 +#: wt-status.c:1400 #, 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:1257 +#: wt-status.c:1404 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1260 +#: wt-status.c:1407 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:1460 +#: wt-status.c:1604 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1466 +#: wt-status.c:1610 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1468 +#: wt-status.c:1612 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1473 +#: wt-status.c:1617 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1475 +#: wt-status.c:1619 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1478 +#: wt-status.c:1622 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1496 +#: wt-status.c:1642 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1510 +#: wt-status.c:1643 +msgid "No commits yet" +msgstr "Aucun commit" + +#: wt-status.c:1657 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1512 +#: wt-status.c:1659 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1516 +#: wt-status.c:1663 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2593,32 +6651,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1522 +#: wt-status.c:1669 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1524 +#: wt-status.c:1671 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1530 +#: wt-status.c:1677 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1535 +#: wt-status.c:1682 #, 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:1538 +#: wt-status.c:1685 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1541 +#: wt-status.c:1688 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2627,325 +6685,379 @@ 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:1544 +#: wt-status.c:1691 #, 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:1547 +#: wt-status.c:1694 #, 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:1550 wt-status.c:1555 +#: wt-status.c:1697 wt-status.c:1702 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1553 +#: wt-status.c:1700 #, 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:1557 +#: wt-status.c:1704 #, c-format -msgid "nothing to commit, working directory clean\n" +msgid "nothing to commit, working tree clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1664 -msgid "Initial commit on " -msgstr "Validation initiale sur " +#: wt-status.c:1817 +msgid "No commits yet on " +msgstr "Encore aucun commit sur " -#: wt-status.c:1668 +#: wt-status.c:1821 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -# à priori on parle d'une branche ici -#: wt-status.c:1697 -msgid "gone" -msgstr "disparue" +#: wt-status.c:1852 +msgid "different" +msgstr "différent" -#: wt-status.c:1699 wt-status.c:1707 +#: wt-status.c:1854 wt-status.c:1862 msgid "behind " msgstr "derrière " -#: wt-status.c:1702 wt-status.c:1705 +#: wt-status.c:1857 wt-status.c:1860 msgid "ahead " msgstr "devant " -#: compat/precompose_utf8.c:57 builtin/clone.c:415 +#. TRANSLATORS: the action is e.g. "pull with rebase" +#: wt-status.c:2376 +#, c-format +msgid "cannot %s: You have unstaged changes." +msgstr "Impossible de %s : vous avez des modifications non indexées." + +#: wt-status.c:2382 +msgid "additionally, your index contains uncommitted changes." +msgstr "de plus, votre index contient des modifications non validées." + +#: wt-status.c:2384 +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "%s impossible : votre index contient des modifications non validées." + +#: compat/precompose_utf8.c:58 builtin/clone.c:443 #, c-format msgid "failed to unlink '%s'" msgstr "échec lors de l'unlink de '%s'" -#: builtin/add.c:22 +#: builtin/add.c:24 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<options>] [--] <chemin>..." -#: builtin/add.c:65 +#: builtin/add.c:83 #, c-format msgid "unexpected diff status %c" -msgstr "status de diff inattendu %c" +msgstr "état de diff inattendu %c" -#: builtin/add.c:70 builtin/commit.c:280 +#: builtin/add.c:88 builtin/commit.c:279 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" -#: builtin/add.c:80 +#: builtin/add.c:98 #, c-format msgid "remove '%s'\n" msgstr "suppression de '%s'\n" -#: builtin/add.c:134 +#: builtin/add.c:173 msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:194 builtin/rev-parse.c:811 +#: builtin/add.c:233 builtin/rev-parse.c:893 msgid "Could not read the index" msgstr "Impossible de lire l'index" -#: builtin/add.c:205 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossible d'ouvrir '%s' en écriture." -#: builtin/add.c:209 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "Impossible d'écrire le patch" -#: builtin/add.c:212 +#: builtin/add.c:251 msgid "editing patch failed" msgstr "échec de l'édition du patch" -#: builtin/add.c:215 +#: builtin/add.c:254 #, c-format msgid "Could not stat '%s'" msgstr "Stat de '%s' impossible" -#: builtin/add.c:217 +#: builtin/add.c:256 msgid "Empty patch. Aborted." msgstr "Patch vide. Abandon." -#: builtin/add.c:222 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "Impossible d'appliquer '%s'" -#: builtin/add.c:232 +#: builtin/add.c:269 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:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 -#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:289 builtin/clean.c:906 builtin/fetch.c:134 builtin/mv.c:123 +#: builtin/prune-packed.c:56 builtin/pull.c:212 builtin/push.c:557 +#: builtin/remote.c:1344 builtin/rm.c:240 builtin/send-pack.c:165 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 -#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 -#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 -msgid "be verbose" -msgstr "mode verbeux" - -#: builtin/add.c:252 +#: builtin/add.c:292 msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 +#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302 msgid "select hunks interactively" msgstr "sélection interactive des sections" -#: builtin/add.c:254 +#: builtin/add.c:294 msgid "edit current diff and apply" msgstr "édition du diff actuel et application" -#: builtin/add.c:255 +#: builtin/add.c:295 msgid "allow adding otherwise ignored files" msgstr "permettre l'ajout de fichiers ignorés" -#: builtin/add.c:256 +#: builtin/add.c:296 msgid "update tracked files" msgstr "mettre à jour les fichiers suivis" -#: builtin/add.c:257 +#: builtin/add.c:297 +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "" +"renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)" + +#: builtin/add.c:298 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:258 +#: builtin/add.c:299 msgid "add changes from all tracked and untracked files" msgstr "ajouter les modifications de tous les fichiers suivis et non suivis" -#: builtin/add.c:261 +#: builtin/add.c:302 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:263 +#: builtin/add.c:304 msgid "don't add, only refresh the index" msgstr "ne pas ajouter, juste rafraîchir l'index" -#: builtin/add.c:264 +#: builtin/add.c:305 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:265 +#: builtin/add.c:306 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:287 +#: builtin/add.c:308 builtin/update-index.c:973 +msgid "override the executable bit of the listed files" +msgstr "outrepasser le bit exécutable pour les fichiers listés" + +#: builtin/add.c:310 +msgid "warn when adding an embedded repository" +msgstr "avertir lors de l'ajout d'un dépôt embarqué" + +#: builtin/add.c:325 +#, c-format +msgid "" +"You've added another git repository inside your current repository.\n" +"Clones of the outer repository will not contain the contents of\n" +"the embedded repository and will not know how to obtain it.\n" +"If you meant to add a submodule, use:\n" +"\n" +"\tgit submodule add <url> %s\n" +"\n" +"If you added this path by mistake, you can remove it from the\n" +"index with:\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"See \"git help submodule\" for more information." +msgstr "" +"Vous avez ajouté un autre dépôt git dans votre dépôt actuel.\n" +"Les clones du dépôt conteneur ne contiendrons pas le contenu\n" +"du dépôt embarqué et ne sauront pas comment l'obtenir.\n" +"Si vous vouliez ajouter un sous-module, utilisez :\n" +"\n" +"\tgit submodule add <url> %s\n" +"\n" +"Si vous avez ajouté ce chemin par erreur, vous pouvez le\n" +"supprimer de l'index avec :\n" +"\n" +"\tgit rm --cached %s\n" +"\n" +"Référez-vous à \"git help submodule\" pour plus d'information." + +#: builtin/add.c:353 +#, c-format +msgid "adding embedded git repository: %s" +msgstr "dépôt git embarqué ajouté : %s" + +#: builtin/add.c:371 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Utilisez -f si vous voulez réellement les ajouter.\n" -#: builtin/add.c:294 +#: builtin/add.c:379 msgid "adding files failed" msgstr "échec de l'ajout de fichiers" -#: builtin/add.c:330 +#: builtin/add.c:417 msgid "-A and -u are mutually incompatible" msgstr "-A et -u sont mutuellement incompatibles" -#: builtin/add.c:337 +#: builtin/add.c:424 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:352 +#: builtin/add.c:428 +#, 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:443 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Rien de spécifié, rien n'a été ajouté.\n" -#: builtin/add.c:353 +#: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" -#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:240 +#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:282 +#: builtin/checkout.c:485 builtin/clean.c:953 builtin/commit.c:338 +#: builtin/diff-tree.c:115 builtin/grep.c:492 builtin/mv.c:144 +#: builtin/reset.c:241 builtin/rm.c:270 builtin/submodule--helper.c:329 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 -msgid "Unable to write new index file" -msgstr "Impossible d'écrire le nouveau fichier d'index" - -#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 -#, c-format -msgid "could not read '%s'" -msgstr "impossible de lire '%s'" - -#: builtin/am.c:430 +#: builtin/am.c:415 msgid "could not parse author script" msgstr "impossible d'analyser le script author" -#: builtin/am.c:507 +#: builtin/am.c:499 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' a été effacé par le crochet applypatch-msg" -#: builtin/am.c:548 builtin/notes.c:300 +#: builtin/am.c:540 #, c-format msgid "Malformed input line: '%s'." msgstr "Ligne en entrée malformée : '%s'." -#: builtin/am.c:585 builtin/notes.c:315 +#: builtin/am.c:577 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Impossible de copier les notes de '%s' vers '%s'" -#: builtin/am.c:611 +#: builtin/am.c:603 msgid "fseek failed" msgstr "échec de fseek" -#: builtin/am.c:788 +#: builtin/am.c:791 #, c-format msgid "could not parse patch '%s'" msgstr "impossible d'analyser le patch '%s'" -#: builtin/am.c:853 +#: builtin/am.c:856 msgid "Only one StGIT patch series can be applied at once" msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois" -#: builtin/am.c:900 +#: builtin/am.c:904 msgid "invalid timestamp" msgstr "horodatage invalide" -#: builtin/am.c:903 builtin/am.c:911 +#: builtin/am.c:909 builtin/am.c:921 msgid "invalid Date line" msgstr "ligne de Date invalide" -#: builtin/am.c:908 +#: builtin/am.c:916 msgid "invalid timezone offset" msgstr "décalage horaire invalide" -#: builtin/am.c:995 +#: builtin/am.c:1009 msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: builtin/am.c:1000 builtin/clone.c:380 +#: builtin/am.c:1014 builtin/clone.c:408 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/am.c:1004 +#: builtin/am.c:1019 msgid "Failed to split patches." msgstr "Échec de découpage des patchs." -#: builtin/am.c:1136 builtin/commit.c:365 +#: builtin/am.c:1149 builtin/commit.c:364 msgid "unable to write index file" msgstr "impossible d'écrire le fichier d'index" -#: builtin/am.c:1187 +#: builtin/am.c:1163 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"." -#: builtin/am.c:1188 +#: builtin/am.c:1164 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"." -#: builtin/am.c:1189 +#: builtin/am.c:1165 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --" "abort\"." -#: builtin/am.c:1327 -msgid "Patch is empty. Was it split wrong?" -msgstr "Le patch est vide. Le découpage était-il bon ?" +#: builtin/am.c:1272 +msgid "Patch is empty." +msgstr "Le patch actuel est vide." -#: builtin/am.c:1401 builtin/log.c:1516 +#: builtin/am.c:1338 #, c-format -msgid "invalid ident line: %s" -msgstr "ligne d'identification invalide : %s" +msgid "invalid ident line: %.*s" +msgstr "ligne d'identification invalide : %.*s" -#: builtin/am.c:1428 +#: builtin/am.c:1360 #, c-format msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" -#: builtin/am.c:1630 +#: builtin/am.c:1556 msgid "Repository lacks necessary blobs 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." -#: builtin/am.c:1632 +#: builtin/am.c:1558 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilisation de l'information de l'index pour reconstruire un arbre de base..." -#: builtin/am.c:1651 +#: builtin/am.c:1577 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2953,38 +7065,29 @@ msgstr "" "Avez-vous édité le patch à la main ?\n" "Il ne s'applique pas aux blobs enregistrés dans son index." -#: builtin/am.c:1657 +#: builtin/am.c:1583 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour à un patch de la base et fusion à 3 points..." -#: builtin/am.c:1672 +#: builtin/am.c:1608 msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." -#: builtin/am.c:1696 builtin/merge.c:636 -msgid "git write-tree failed to write a tree" -msgstr "git write-tree a échoué à écrire un arbre" - -#: builtin/am.c:1703 +#: builtin/am.c:1640 msgid "applying to an empty history" msgstr "application à un historique vide" -#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 -#: builtin/merge.c:866 -msgid "failed to write commit object" -msgstr "échec de l'écriture de l'objet commit" - -#: builtin/am.c:1748 builtin/am.c:1752 +#: builtin/am.c:1686 builtin/am.c:1690 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." -#: builtin/am.c:1768 +#: builtin/am.c:1706 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "impossible d'être interactif sans entrée standard connectée à un terminal." -#: builtin/am.c:1773 +#: builtin/am.c:1711 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -2992,35 +7095,35 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1783 +#: builtin/am.c:1721 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : " -#: builtin/am.c:1833 +#: builtin/am.c:1771 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1868 builtin/am.c:1940 +#: builtin/am.c:1811 builtin/am.c:1879 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1884 +#: builtin/am.c:1828 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: builtin/am.c:1892 +#: builtin/am.c:1834 #, c-format msgid "Patch failed at %s %.*s" msgstr "le patch a échoué à %s %.*s" -#: builtin/am.c:1898 -#, c-format -msgid "The copy of the patch that failed is found in: %s" -msgstr "La copie du patch qui a échoué se trouve dans : %s" +#: builtin/am.c:1838 +msgid "Use 'git am --show-current-patch' to see the failed patch" +msgstr "" +"Utilisez 'git am --show-current-patch' pour visualiser le patch en échec" -#: builtin/am.c:1943 +#: builtin/am.c:1882 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -3031,25 +7134,30 @@ msgstr "" "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: builtin/am.c:1950 +#: builtin/am.c:1889 msgid "" "You still have unmerged paths in your index.\n" -"Did you forget to use 'git add'?" +"You should 'git add' each file with resolved conflicts to mark them as " +"such.\n" +"You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -"Vous avez toujours des chemins non fusionnés dans votre index\n" -"Auriez-vous oublié de faire 'git add' ?" +"Vous avez encore des chemin non-fusionnés dans votre index.\n" +"Vous devriez lancer 'git add' sur chaque conflit résolu pour les marquer " +"comme tel.\n" +"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour " +"accepter son état." -#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 -#: builtin/reset.c:316 +#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324 +#: builtin/reset.c:332 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:2110 +#: builtin/am.c:2048 msgid "failed to clean index" msgstr "échec du nettoyage de l'index" -#: builtin/am.c:2144 +#: builtin/am.c:2083 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -3057,156 +7165,144 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: builtin/am.c:2205 +#: builtin/am.c:2174 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2238 -msgid "git am [<options>] [(<mbox>|<Maildir>)...]" -msgstr "git am [<options>] [(<mbox>|<Maildir>)...]" +#: builtin/am.c:2210 +msgid "git am [<options>] [(<mbox> | <Maildir>)...]" +msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2239 +#: builtin/am.c:2211 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --quit | --abort)" -#: builtin/am.c:2245 +#: builtin/am.c:2217 msgid "run interactively" msgstr "exécution interactive" -#: builtin/am.c:2247 +#: builtin/am.c:2219 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2249 +#: builtin/am.c:2221 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 -#: builtin/repack.c:171 +#: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58 +#: builtin/repack.c:299 msgid "be quiet" msgstr "être silencieux" -#: builtin/am.c:2252 +#: builtin/am.c:2224 msgid "add a Signed-off-by line to the commit message" msgstr "ajouter une ligne Signed-off-by au message de validation" -#: builtin/am.c:2255 +#: builtin/am.c:2227 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par défaut)" -#: builtin/am.c:2257 +#: builtin/am.c:2229 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k à git-mailinfo" -#: builtin/am.c:2259 +#: builtin/am.c:2231 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b à git-mailinfo" -#: builtin/am.c:2261 +#: builtin/am.c:2233 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m à git-mailinfo" -#: builtin/am.c:2263 +#: builtin/am.c:2235 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox" -#: builtin/am.c:2266 +#: builtin/am.c:2238 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr" -#: builtin/am.c:2269 +#: builtin/am.c:2241 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: builtin/am.c:2270 builtin/apply.c:4546 -msgid "action" -msgstr "action" - -#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 -#: builtin/am.c:2298 +#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 +#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 +#: builtin/am.c:2270 msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" -#: builtin/am.c:2279 builtin/apply.c:4570 -msgid "root" -msgstr "racine" - -#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 -#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 -#: builtin/pull.c:179 builtin/submodule--helper.c:277 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 -#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 -#: builtin/submodule--helper.c:770 -msgid "path" -msgstr "chemin" - -#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193 -#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645 -#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 -#: parse-options.h:134 parse-options.h:244 +#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 builtin/grep.c:857 builtin/merge.c:237 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:308 +#: builtin/repack.c:312 builtin/repack.c:314 builtin/show-branch.c:650 +#: builtin/show-ref.c:170 builtin/tag.c:384 parse-options.h:144 +#: parse-options.h:146 parse-options.h:258 msgid "n" msgstr "n" -#: builtin/am.c:2291 builtin/apply.c:4514 -msgid "num" -msgstr "num" - -#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:372 +#: builtin/am.c:2266 builtin/branch.c:651 builtin/for-each-ref.c:38 +#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39 msgid "format" msgstr "format" -#: builtin/am.c:2295 +#: builtin/am.c:2267 msgid "format the patch(es) are in" msgstr "format de présentation des patchs" -#: builtin/am.c:2301 +#: builtin/am.c:2273 msgid "override error message when patch failure occurs" msgstr "surcharger le message d'erreur lors d'un échec d'application de patch" -#: builtin/am.c:2303 +#: builtin/am.c:2275 msgid "continue applying patches after resolving a conflict" msgstr "continuer à appliquer les patchs après résolution d'un conflit" -#: builtin/am.c:2306 +#: builtin/am.c:2278 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2309 +#: builtin/am.c:2281 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2312 +#: builtin/am.c:2284 msgid "restore the original branch and abort the patching operation." msgstr "" "restaurer la branche originale et abandonner les applications de patch." -#: builtin/am.c:2316 +#: builtin/am.c:2287 +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:2290 +msgid "show the patch being applied." +msgstr "afficher le patch en cours d'application." + +#: builtin/am.c:2294 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2318 +#: builtin/am.c:2296 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 -#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:271 +#: builtin/pull.c:183 builtin/revert.c:113 builtin/tag.c:400 msgid "key-id" msgstr "id-clé" -#: builtin/am.c:2321 +#: builtin/am.c:2299 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2324 +#: builtin/am.c:2302 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2339 +#: builtin/am.c:2320 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -3214,17 +7310,17 @@ msgstr "" "L'option -b/--binary ne fait plus rien depuis longtemps,\n" "et elle sera supprimée. Veuillez ne plus l'utiliser." -#: builtin/am.c:2346 +#: builtin/am.c:2327 msgid "failed to read the index" msgstr "échec à la lecture de l'index" -#: builtin/am.c:2361 +#: builtin/am.c:2342 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "le répertoire précédent de rebasage %s existe toujours mais mbox donnée." -#: builtin/am.c:2385 +#: builtin/am.c:2366 #, c-format msgid "" "Stray %s directory found.\n" @@ -3233,512 +7329,16 @@ msgstr "" "Répertoire abandonné %s trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2391 +#: builtin/am.c:2372 msgid "Resolve operation not in progress, we are not resuming." msgstr "" "Pas de résolution de l'opération en cours, nous ne sommes pas dans une " "reprise." -#: builtin/apply.c:59 +#: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<options>] [<patch>...]" -#: builtin/apply.c:111 -#, c-format -msgid "unrecognized whitespace option '%s'" -msgstr "option d'espace non reconnue '%s'" - -#: builtin/apply.c:126 -#, c-format -msgid "unrecognized whitespace ignore option '%s'" -msgstr "option d'ignorance d'espace non reconnue '%s'" - -#: builtin/apply.c:818 -#, c-format -msgid "Cannot prepare timestamp regexp %s" -msgstr "Impossible de préparer la regexp d'horodatage %s" - -#: builtin/apply.c:827 -#, c-format -msgid "regexec returned %d for input: %s" -msgstr "regexec a retourné %d pour l'entrée : %s" - -#: builtin/apply.c:908 -#, c-format -msgid "unable to find filename in patch at line %d" -msgstr "nom de fichier du patch introuvable à la ligne %d" - -#: builtin/apply.c:937 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "" -"git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " -"ligne %d" - -#: builtin/apply.c:942 -#, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "" -"git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " -"à la ligne %d" - -#: builtin/apply.c:943 -#, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "" -"git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " -"à la ligne %d" - -#: builtin/apply.c:949 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "" -"git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" - -#: builtin/apply.c:1406 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recomptage : ligne inattendue : %.*s" - -#: builtin/apply.c:1463 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" - -#: builtin/apply.c:1480 -#, c-format -msgid "" -"git diff header lacks filename information when removing %d leading pathname " -"component (line %d)" -msgid_plural "" -"git diff header lacks filename information when removing %d leading pathname " -"components (line %d)" -msgstr[0] "" -"information de nom de fichier manquante dans l'en-tête de git diff lors de " -"la suppression de %d composant de préfixe de chemin (ligne %d)" -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)" - -#: builtin/apply.c:1646 -msgid "new file depends on old contents" -msgstr "le nouveau fichier dépend de contenus anciens" - -#: builtin/apply.c:1648 -msgid "deleted file still has contents" -msgstr "le fichier supprimé a encore du contenu" - -#: builtin/apply.c:1674 -#, c-format -msgid "corrupt patch at line %d" -msgstr "patch corrompu à la ligne %d" - -#: builtin/apply.c:1710 -#, c-format -msgid "new file %s depends on old contents" -msgstr "le nouveau fichier %s dépend de contenus anciens" - -#: builtin/apply.c:1712 -#, c-format -msgid "deleted file %s still has contents" -msgstr "le fichier supprimé %s a encore du contenu" - -#: builtin/apply.c:1715 -#, c-format -msgid "** warning: file %s becomes empty but is not deleted" -msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" - -#: builtin/apply.c:1861 -#, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "patch binaire corrompu à la ligne %d : %.*s" - -#: builtin/apply.c:1895 -#, c-format -msgid "unrecognized binary patch at line %d" -msgstr "patch binaire non reconnu à la ligne %d" - -#: builtin/apply.c:2048 -#, c-format -msgid "patch with only garbage at line %d" -msgstr "patch totalement incompréhensible à la ligne %d" - -#: builtin/apply.c:2138 -#, c-format -msgid "unable to read symlink %s" -msgstr "lecture du lien symbolique %s impossible" - -#: builtin/apply.c:2142 -#, c-format -msgid "unable to open or read %s" -msgstr "ouverture ou lecture de %s impossible" - -#: builtin/apply.c:2775 -#, c-format -msgid "invalid start of line: '%c'" -msgstr "début de ligne invalide : '%c'" - -#: builtin/apply.c:2894 -#, 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)." - -#: builtin/apply.c:2906 -#, 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" - -#: builtin/apply.c:2912 -#, c-format -msgid "" -"while searching for:\n" -"%.*s" -msgstr "" -"pendant la recherche de :\n" -"%.*s" - -#: builtin/apply.c:2932 -#, c-format -msgid "missing binary patch data for '%s'" -msgstr "données de patch binaire manquantes pour '%s'" - -#: builtin/apply.c:3033 -#, c-format -msgid "binary patch does not apply to '%s'" -msgstr "le patch binaire ne s'applique par correctement à '%s'" - -#: builtin/apply.c:3039 -#, 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é)" - -#: builtin/apply.c:3060 -#, c-format -msgid "patch failed: %s:%ld" -msgstr "le patch a échoué : %s:%ld" - -#: builtin/apply.c:3184 -#, c-format -msgid "cannot checkout %s" -msgstr "extraction de %s impossible" - -#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 -#, c-format -msgid "read of %s failed" -msgstr "échec de la lecture de %s" - -#: builtin/apply.c:3237 -#, c-format -msgid "reading from '%s' beyond a symbolic link" -msgstr "lecture depuis '%s' au-delà d'un lien symbolique" - -#: builtin/apply.c:3265 builtin/apply.c:3487 -#, c-format -msgid "path %s has been renamed/deleted" -msgstr "le chemin %s a été renommé/supprimé" - -#: builtin/apply.c:3346 builtin/apply.c:3501 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s : n'existe pas dans l'index" - -#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 -#, c-format -msgid "%s: %s" -msgstr "%s : %s" - -#: builtin/apply.c:3355 builtin/apply.c:3509 -#, c-format -msgid "%s: does not match index" -msgstr "%s : ne correspond pas à l'index" - -#: builtin/apply.c:3457 -msgid "removal patch leaves file contents" -msgstr "le patch de suppression laisse un contenu dans le fichier" - -#: builtin/apply.c:3526 -#, c-format -msgid "%s: wrong type" -msgstr "%s : type erroné" - -#: builtin/apply.c:3528 -#, c-format -msgid "%s has type %o, expected %o" -msgstr "%s est de type %o, mais %o attendu" - -#: builtin/apply.c:3687 builtin/apply.c:3689 -#, c-format -msgid "invalid path '%s'" -msgstr "chemin invalide '%s'" - -#: builtin/apply.c:3744 -#, c-format -msgid "%s: already exists in index" -msgstr "%s : existe déjà dans l'index" - -#: builtin/apply.c:3747 -#, c-format -msgid "%s: already exists in working directory" -msgstr "%s : existe déjà dans la copie de travail" - -#: builtin/apply.c:3767 -#, 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)" - -#: builtin/apply.c:3772 -#, 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" - -#: builtin/apply.c:3792 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" -msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique" - -#: builtin/apply.c:3796 -#, c-format -msgid "%s: patch does not apply" -msgstr "%s : le patch ne s'applique pas" - -#: builtin/apply.c:3810 -#, c-format -msgid "Checking patch %s..." -msgstr "Vérification du patch %s..." - -#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "échec de make_cache_entry pour le chemin '%s'" - -#: builtin/apply.c:4046 -#, c-format -msgid "unable to remove %s from index" -msgstr "suppression de %s dans l'index impossible" - -#: builtin/apply.c:4075 -#, c-format -msgid "corrupt patch for submodule %s" -msgstr "patch corrompu pour le sous-module %s" - -#: builtin/apply.c:4079 -#, c-format -msgid "unable to stat newly created file '%s'" -msgstr "stat du fichier nouvellement créé '%s' impossible" - -#: builtin/apply.c:4084 -#, 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" - -#: builtin/apply.c:4087 builtin/apply.c:4195 -#, c-format -msgid "unable to add cache entry for %s" -msgstr "ajout de l'élément de cache %s impossible" - -#: builtin/apply.c:4120 -#, c-format -msgid "closing file '%s'" -msgstr "fermeture du fichier '%s'" - -#: builtin/apply.c:4169 -#, c-format -msgid "unable to write file '%s' mode %o" -msgstr "écriture du fichier '%s' mode %o impossible" - -#: builtin/apply.c:4256 -#, c-format -msgid "Applied patch %s cleanly." -msgstr "Patch %s appliqué proprement." - -#: builtin/apply.c:4264 -msgid "internal error" -msgstr "erreur interne" - -#: builtin/apply.c:4267 -#, 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..." - -#: builtin/apply.c:4277 -#, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "troncature du nom de fichier .rej en %.*s.rej" - -#: builtin/apply.c:4285 -#, c-format -msgid "cannot open %s: %s" -msgstr "impossible d'ouvrir %s : %s" - -#: builtin/apply.c:4298 -#, c-format -msgid "Hunk #%d applied cleanly." -msgstr "Section n°%d appliquée proprement." - -#: builtin/apply.c:4301 -#, c-format -msgid "Rejected hunk #%d." -msgstr "Section n°%d rejetée." - -#: builtin/apply.c:4387 -#, c-format -msgid "Skipped patch '%s'." -msgstr "Chemin '%s' non traité." - -#: builtin/apply.c:4395 -msgid "unrecognized input" -msgstr "entrée non reconnue" - -#: builtin/apply.c:4406 -msgid "unable to read index file" -msgstr "lecture du fichier d'index impossible" - -#: builtin/apply.c:4509 -msgid "don't apply changes matching the given path" -msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" - -#: builtin/apply.c:4512 -msgid "apply changes matching the given path" -msgstr "appliquer les modifications qui correspondent au chemin donné" - -#: builtin/apply.c:4515 -msgid "remove <num> leading slashes from traditional diff paths" -msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" - -#: builtin/apply.c:4518 -msgid "ignore additions made by the patch" -msgstr "ignorer les additions réalisées par le patch" - -#: builtin/apply.c:4520 -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" - -#: builtin/apply.c:4524 -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" - -#: builtin/apply.c:4526 -msgid "instead of applying the patch, output a summary for the input" -msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée" - -#: builtin/apply.c:4528 -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" - -#: builtin/apply.c:4530 -msgid "make sure the patch is applicable to the current index" -msgstr "s'assurer que le patch est applicable sur l'index actuel" - -#: builtin/apply.c:4532 -msgid "apply a patch without touching the working tree" -msgstr "appliquer les patch sans toucher à la copie de travail" - -#: builtin/apply.c:4534 -msgid "accept a patch that touches outside the working area" -msgstr "accepter un patch qui touche hors de la copie de travail" - -#: builtin/apply.c:4536 -msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" - -#: builtin/apply.c:4538 -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" - -#: builtin/apply.c:4540 -msgid "build a temporary index based on embedded index information" -msgstr "" -"construire un index temporaire fondé sur l'information de l'index embarqué" - -#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 -msgid "paths are separated with NUL character" -msgstr "les chemins sont séparés par un caractère NUL" - -#: builtin/apply.c:4545 -msgid "ensure at least <n> lines of context match" -msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" - -#: builtin/apply.c:4547 -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" - -#: builtin/apply.c:4550 builtin/apply.c:4553 -msgid "ignore changes in whitespace when finding context" -msgstr "ignorer des modifications d'espace lors de la recherche de contexte" - -#: builtin/apply.c:4556 -msgid "apply the patch in reverse" -msgstr "appliquer le patch en sens inverse" - -#: builtin/apply.c:4558 -msgid "don't expect at least one line of context" -msgstr "ne pas s'attendre à au moins une ligne de contexte" - -#: builtin/apply.c:4560 -msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" - -#: builtin/apply.c:4562 -msgid "allow overlapping hunks" -msgstr "accepter les recouvrements de sections" - -#: builtin/apply.c:4565 -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" - -#: builtin/apply.c:4568 -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" - -#: builtin/apply.c:4571 -msgid "prepend <root> to all filenames" -msgstr "préfixer tous les noms de fichier avec <root>" - -#: builtin/apply.c:4593 -msgid "--3way outside a repository" -msgstr "--3way hors d'un dépôt" - -#: builtin/apply.c:4601 -msgid "--index outside a repository" -msgstr "--index hors d'un dépôt" - -#: builtin/apply.c:4604 -msgid "--cached outside a repository" -msgstr "--cached hors d'un dépôt" - -#: builtin/apply.c:4623 -#, c-format -msgid "can't open patch '%s'" -msgstr "ouverture impossible du patch '%s'" - -#: builtin/apply.c:4637 -#, 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" - -#: builtin/apply.c:4643 builtin/apply.c:4653 -#, 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." - #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -3753,19 +7353,14 @@ msgid "git archive: Remote with no URL" msgstr "git archive : Dépôt distant sans URL" #: builtin/archive.c:58 -msgid "git archive: expected ACK/NAK, got EOF" -msgstr "git archive : ACK/NACK attendu, EOF reçu" +msgid "git archive: expected ACK/NAK, got a flush packet" +msgstr "git archive : ACK/NACK attendu, paquet de nettoyage reçu" #: builtin/archive.c:61 #, c-format msgid "git archive: NACK %s" msgstr "git archive : NACK %s" -#: builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "erreur distante : %s" - #: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive : erreur de protocole" @@ -3774,164 +7369,270 @@ msgstr "git archive : erreur de protocole" msgid "git archive: expected a flush" msgstr "git archive : vidage attendu" -#: builtin/bisect--helper.c:7 +#: builtin/bisect--helper.c:12 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect --helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:17 +#: builtin/bisect--helper.c:13 +msgid "git bisect--helper --write-terms <bad_term> <good_term>" +msgstr "git bisect--helper --write-terms <terme-pour-mauvais> <terme-pour-bon>" + +#: builtin/bisect--helper.c:14 +msgid "git bisect--helper --bisect-clean-state" +msgstr "git bisect--helper --bisect-clean-state" + +#: builtin/bisect--helper.c:46 +#, c-format +msgid "'%s' is not a valid term" +msgstr "'%s' n'est pas un terme valide" + +#: builtin/bisect--helper.c:50 +#, 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:60 +#, 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:71 +msgid "please use two different terms" +msgstr "veuillez utiliser deux termes différents" + +#: builtin/bisect--helper.c:78 +msgid "could not open the file BISECT_TERMS" +msgstr "impossible d'ouvrir le fichier BISECT_TERMS" + +#: builtin/bisect--helper.c:120 msgid "perform 'git bisect next'" msgstr "effectuer 'git bisect next'" -#: builtin/bisect--helper.c:19 +#: builtin/bisect--helper.c:122 +msgid "write the terms to .git/BISECT_TERMS" +msgstr "écrire les termes dans .git/BISECT_TERMS" + +#: builtin/bisect--helper.c:124 +msgid "cleanup the bisection state" +msgstr "vérifier l'état de la bissection" + +#: builtin/bisect--helper.c:126 +msgid "check for expected revs" +msgstr "vérifier si des révisions sont attendues" + +#: builtin/bisect--helper.c:128 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel" -#: builtin/blame.c:33 +#: builtin/bisect--helper.c:143 +msgid "--write-terms requires two arguments" +msgstr "--write-terms exige deux arguments" + +#: builtin/bisect--helper.c:147 +msgid "--bisect-clean-state requires no arguments" +msgstr "--bisect-clean-state ne supporte aucun argument" + +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" -msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>" +msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>" -#: builtin/blame.c:38 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<options-de-révision> sont documentés dans git-rev-list(1)" -#: builtin/blame.c:1782 -msgid "Blaming lines" -msgstr "Assignation de blâme au lignes" +#: builtin/blame.c:406 +#, c-format +msgid "expecting a color: %s" +msgstr "couleur attendue : %s" + +#: builtin/blame.c:413 +msgid "must end with a color" +msgstr "doit finir avec une couleur" -#: builtin/blame.c:2531 +#: builtin/blame.c:700 +#, c-format +msgid "invalid color '%s' in color.blame.repeatedLines" +msgstr "couleur invalide '%s' dans color.blame.repeatedlines" + +#: builtin/blame.c:718 +msgid "invalid value for blame.coloring" +msgstr "valeur invalide pour blame.coloring" + +#: builtin/blame.c:789 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:2532 +#: builtin/blame.c:790 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)" -#: builtin/blame.c:2533 +#: builtin/blame.c:791 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:2534 +#: builtin/blame.c:792 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:2535 +#: builtin/blame.c:793 msgid "Force progress reporting" msgstr "Forcer l'affichage de l'état d'avancement" -#: builtin/blame.c:2536 +#: builtin/blame.c:794 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:2537 +#: builtin/blame.c:795 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:2538 +#: builtin/blame.c:796 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:2539 +#: builtin/blame.c:797 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:2540 +#: builtin/blame.c:798 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:2541 +#: builtin/blame.c:799 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:2542 +#: builtin/blame.c:800 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:2543 +#: builtin/blame.c:801 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:2544 +#: builtin/blame.c:802 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:2545 +#: builtin/blame.c:803 msgid "Show author email instead of name (Default: off)" -msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)" +msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)" -#: builtin/blame.c:2546 +#: builtin/blame.c:804 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:2547 +#: builtin/blame.c:805 +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:806 +msgid "color lines by age" +msgstr "colorier les lignes par âge" + +#: builtin/blame.c:813 +msgid "Use an experimental heuristic to improve diffs" +msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs" + +#: builtin/blame.c:815 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:2548 +#: builtin/blame.c:816 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:2549 +#: builtin/blame.c:817 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:2550 builtin/blame.c:2551 +#: builtin/blame.c:818 builtin/blame.c:819 msgid "score" msgstr "score" -#: builtin/blame.c:2550 +#: builtin/blame.c:818 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:2551 +#: builtin/blame.c:819 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:2552 +#: builtin/blame.c:820 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2552 +#: builtin/blame.c:820 msgid "Process only line range n,m, counting from 1" msgstr "" "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1" -#. TRANSLATORS: This string is used to tell us the maximum -#. display width for a relative timestamp in "git blame" -#. output. For C locale, "4 years, 11 months ago", which -#. takes 22 places, is the longest among various forms of -#. relative timestamps, but your language may need more or -#. fewer display columns. -#: builtin/blame.c:2641 +#: builtin/blame.c:869 +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "" +"--progress ne peut pas être utilisé avec --incremental ou les formats " +"porcelaine" + +#. TRANSLATORS: This string is used to tell us the +#. maximum display width for a relative timestamp in +#. "git blame" output. For C locale, "4 years, 11 +#. months ago", which takes 22 places, is the longest +#. among various forms of relative timestamps, but +#. your language may need more or fewer display +#. columns. +#. +#: builtin/blame.c:920 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" -#: builtin/branch.c:26 +#: builtin/blame.c:1007 +#, 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:1053 +msgid "Blaming lines" +msgstr "Assignation de blâme aux lignes" + +#: builtin/branch.c:28 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:27 +#: builtin/branch.c:29 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]" -#: builtin/branch.c:28 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..." -#: builtin/branch.c:29 +#: builtin/branch.c:31 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>" -#: builtin/branch.c:30 +#: builtin/branch.c:32 +msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" +msgstr "" +"git branch [<options>] (-c | -C) [<ancienne-branche>] <nouvelle-branche>" + +#: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<options>] [-r | -a] [--points-at]" -#: builtin/branch.c:143 +#: builtin/branch.c:34 +msgid "git branch [<options>] [-r | -a] [--format]" +msgstr "git branch [<options>] [-r | -a] [--format]" + +#: builtin/branch.c:151 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -3940,7 +7641,7 @@ msgstr "" "suppression de la branche '%s' qui a été fusionnée dans\n" " '%s', mais pas dans HEAD." -#: builtin/branch.c:147 +#: builtin/branch.c:155 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -3949,336 +7650,324 @@ msgstr "" "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n" " '%s', même si elle est fusionnée dans HEAD." -#: builtin/branch.c:161 +#: builtin/branch.c:169 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Impossible de rechercher l'objet commit pour '%s'" -#: builtin/branch.c:165 +#: builtin/branch.c:173 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" "La branche '%s' n'est pas totalement fusionnée.\n" -"Si vous êtes sur que vous voulez la supprimer, lancez 'git branch -D %s'." +"Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'." -#: builtin/branch.c:178 +#: builtin/branch.c:186 msgid "Update of config-file failed" msgstr "Échec de la mise à jour du fichier de configuration" -#: builtin/branch.c:206 +#: builtin/branch.c:217 msgid "cannot use -a with -d" msgstr "impossible d'utiliser -a avec -d" -#: builtin/branch.c:212 +#: builtin/branch.c:223 msgid "Couldn't look up commit object for HEAD" msgstr "Impossible de rechercher l'objet commit pour HEAD" -#: builtin/branch.c:226 +#: builtin/branch.c:237 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'" -#: builtin/branch.c:241 +#: builtin/branch.c:252 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "branche de suivi '%s' non trouvée." -#: builtin/branch.c:242 +#: builtin/branch.c:253 #, c-format msgid "branch '%s' not found." msgstr "branche '%s' non trouvée." -#: builtin/branch.c:257 +#: builtin/branch.c:268 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Erreur lors de la suppression de la branche de suivi '%s'" -#: builtin/branch.c:258 +#: builtin/branch.c:269 #, c-format msgid "Error deleting branch '%s'" msgstr "Erreur lors de la suppression de la branche '%s'" -#: builtin/branch.c:265 +#: builtin/branch.c:276 #, 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:266 +#: builtin/branch.c:277 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branche %s supprimée (précédemment %s).\n" -# féminin pour une branche -#: builtin/branch.c:309 -#, c-format -msgid "[%s: gone]" -msgstr "[%s: disparue]" - -#: builtin/branch.c:314 -#, c-format -msgid "[%s]" -msgstr "[%s]" - -#: builtin/branch.c:319 -#, c-format -msgid "[%s: behind %d]" -msgstr "[%s: en retard de %d]" +#: builtin/branch.c:421 builtin/tag.c:59 +msgid "unable to parse format string" +msgstr "impossible d'analyser la chaîne de format" -#: builtin/branch.c:321 -#, c-format -msgid "[behind %d]" -msgstr "[en retard de %d]" - -#: builtin/branch.c:325 -#, c-format -msgid "[%s: ahead %d]" -msgstr "[%s : en avance de %d]" - -#: builtin/branch.c:327 -#, c-format -msgid "[ahead %d]" -msgstr "[en avance de %d]" - -#: builtin/branch.c:330 -#, c-format -msgid "[%s: ahead %d, behind %d]" -msgstr "[%s : en avance de %d, en retard de %d]" - -#: builtin/branch.c:333 -#, c-format -msgid "[ahead %d, behind %d]" -msgstr "[en avance de %d, en retard de %d]" - -#: builtin/branch.c:346 -msgid " **** invalid ref ****" -msgstr " **** référence invalide ****" - -#: builtin/branch.c:372 -#, c-format -msgid "(no branch, rebasing %s)" -msgstr "(aucune branche, rebasage de %s)" - -#: builtin/branch.c:375 -#, c-format -msgid "(no branch, bisect started on %s)" -msgstr "(aucune branche, bisect a démarré sur %s)" - -#. TRANSLATORS: make sure this matches -#. "HEAD detached at " in wt-status.c -#: builtin/branch.c:381 -#, c-format -msgid "(HEAD detached at %s)" -msgstr "(HEAD détachée sur %s)" - -#. TRANSLATORS: make sure this matches -#. "HEAD detached from " in wt-status.c -#: builtin/branch.c:386 -#, c-format -msgid "(HEAD detached from %s)" -msgstr "(HEAD détachée depuis %s)" - -#: builtin/branch.c:390 -msgid "(no branch)" -msgstr "(aucune branche)" - -#: builtin/branch.c:541 +#: builtin/branch.c:458 #, c-format msgid "Branch %s is being rebased at %s" msgstr "La branche %s est en cours de rebasage sur %s" -#: builtin/branch.c:545 +#: builtin/branch.c:462 #, c-format msgid "Branch %s is being bisected at %s" msgstr "La branche %s est en cours de bissection sur %s" -#: builtin/branch.c:560 +#: builtin/branch.c:479 +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:481 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:570 +#: builtin/branch.c:492 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:587 +#: builtin/branch.c:519 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:591 +#: builtin/branch.c:521 +msgid "Branch copy failed" +msgstr "Échec de copie de la branche" + +#: builtin/branch.c:525 +#, 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:528 #, c-format msgid "Renamed a misnamed branch '%s' away" -msgstr "Renommage d'un branche mal nommée '%s'" +msgstr "Renommage d'une branche mal nommée '%s'" -#: builtin/branch.c:594 +#: builtin/branch.c:534 #, 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:601 +#: builtin/branch.c:543 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:623 -msgid "could not write branch description template" -msgstr "impossible d'écrire le modèle de description de branche" +#: builtin/branch.c:545 +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:561 +#, c-format +msgid "" +"Please edit the description for the branch\n" +" %s\n" +"Lines starting with '%c' will be stripped.\n" +msgstr "" +"Veuillez éditer la description de la branche\n" +" %s\n" +"Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/branch.c:651 +#: builtin/branch.c:602 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:653 +#: builtin/branch.c:604 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:654 +#: builtin/branch.c:605 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:655 +#: builtin/branch.c:606 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:657 -msgid "change upstream info" -msgstr "modifier l'information amont" +#: builtin/branch.c:608 +msgid "do not use" +msgstr "ne pas utiliser" -#: builtin/branch.c:659 +#: builtin/branch.c:610 msgid "upstream" msgstr "amont" -#: builtin/branch.c:659 +#: builtin/branch.c:610 msgid "change the upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:661 +#: builtin/branch.c:611 +msgid "Unset the upstream info" +msgstr "Désactiver l'information amont" + +#: builtin/branch.c:612 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:662 +#: builtin/branch.c:613 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:664 builtin/branch.c:665 +#: builtin/branch.c:615 builtin/branch.c:617 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:668 +#: builtin/branch.c:616 builtin/branch.c:618 +msgid "print only branches that don't contain the commit" +msgstr "afficher seulement les branches qui ne contiennent pas le commit" + +#: builtin/branch.c:621 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:669 +#: builtin/branch.c:622 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:671 +#: builtin/branch.c:624 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:672 +#: builtin/branch.c:625 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:673 +#: builtin/branch.c:626 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:674 +#: builtin/branch.c:627 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:675 +#: builtin/branch.c:628 +msgid "copy a branch and its reflog" +msgstr "copier une branche et son reflog" + +#: builtin/branch.c:629 +msgid "copy a branch, even if target exists" +msgstr "copier une branche, même si la cible existe" + +#: builtin/branch.c:630 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:676 +#: builtin/branch.c:631 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:678 +#: builtin/branch.c:634 +msgid "deprecated synonym for --create-reflog" +msgstr "synonyme déconseillé de --create-reflog" + +#: builtin/branch.c:639 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:679 +#: builtin/branch.c:640 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:680 +#: builtin/branch.c:641 msgid "print only branches that are merged" msgstr "afficher seulement les branches qui sont fusionnées" -#: builtin/branch.c:681 +#: builtin/branch.c:642 msgid "print only branches that are not merged" msgstr "afficher seulement les branches qui ne sont pas fusionnées" -#: builtin/branch.c:682 +#: builtin/branch.c:643 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:644 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 +#: builtin/tag.c:413 msgid "key" msgstr "clé" -#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:645 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 +#: builtin/tag.c:414 msgid "field name to sort on" msgstr "nom du champ servant à trier" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 -#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 -#: builtin/tag.c:369 +#: builtin/branch.c:647 builtin/for-each-ref.c:43 builtin/notes.c:410 +#: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576 +#: builtin/tag.c:416 msgid "object" msgstr "objet" -#: builtin/branch.c:687 +#: builtin/branch.c:648 msgid "print only branches of the object" msgstr "afficher seulement les branches de l'objet" -#: builtin/branch.c:705 -msgid "Failed to resolve HEAD as a valid ref." -msgstr "Échec de résolution de HEAD comme référence valide." +#: builtin/branch.c:650 builtin/for-each-ref.c:49 builtin/tag.c:423 +msgid "sorting and filtering are case insensitive" +msgstr "le tri et le filtrage sont non-sensibles à la casse" + +#: builtin/branch.c:651 builtin/for-each-ref.c:38 builtin/tag.c:421 +#: builtin/verify-tag.c:39 +msgid "format to use for the output" +msgstr "format à utiliser pour la sortie" -#: builtin/branch.c:709 builtin/clone.c:707 +#: builtin/branch.c:674 builtin/clone.c:739 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:729 +#: builtin/branch.c:697 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:740 builtin/branch.c:782 +#: builtin/branch.c:717 builtin/branch.c:769 builtin/branch.c:778 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:758 +#: builtin/branch.c:745 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:763 +#: builtin/branch.c:750 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:770 +#: builtin/branch.c:757 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:773 +#: builtin/branch.c:760 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:788 -msgid "too many branches for a rename operation" -msgstr "trop de branches pour une opération de renommage" +#: builtin/branch.c:775 +msgid "too many branches for a copy operation" +msgstr "trop de branches pour une opération de copie" -#: builtin/branch.c:793 -msgid "too many branches to set new upstream" -msgstr "trop de branches pour spécifier une branche amont" +#: builtin/branch.c:784 +msgid "too many arguments for a rename operation" +msgstr "trop d'arguments pour une opération de renommage" + +#: builtin/branch.c:789 +msgid "too many arguments to set new upstream" +msgstr "trop d'arguments pour spécifier une branche amont" -#: builtin/branch.c:797 +#: builtin/branch.c:793 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -4286,380 +7975,381 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 +#: builtin/branch.c:796 builtin/branch.c:818 builtin/branch.c:834 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:804 +#: builtin/branch.c:800 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:816 -msgid "too many branches to unset upstream" -msgstr "trop de branches pour désactiver un amont" +#: builtin/branch.c:812 +msgid "too many arguments to unset upstream" +msgstr "trop d'arguments pour désactiver un amont" -#: builtin/branch.c:820 +#: builtin/branch.c:816 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:826 +#: builtin/branch.c:822 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:840 -msgid "it does not make sense to create 'HEAD' manually" -msgstr "créer manuellement 'HEAD' n'a pas de sens" - -#: builtin/branch.c:846 +#: builtin/branch.c:837 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche" -#: builtin/branch.c:849 -#, c-format -msgid "" -"The --set-upstream flag is deprecated and will be removed. Consider using --" -"track or --set-upstream-to\n" -msgstr "" -"l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --" -"track ou --set-upstream-to\n" - -#: builtin/branch.c:866 -#, c-format +#: builtin/branch.c:840 msgid "" -"\n" -"If you wanted to make '%s' track '%s', do this:\n" -"\n" +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." msgstr "" -"\n" -"Si vous vouliez que '%s' suive '%s', faîtes ceci :\n" -"\n" +"l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-" +"upstream-to' à la place." -#: builtin/bundle.c:51 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "%s est correct\n" -#: builtin/bundle.c:64 +#: builtin/bundle.c:58 msgid "Need a repository to create a bundle." msgstr "La création d'un colis requiert un dépôt." -#: builtin/bundle.c:68 +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." -#: builtin/cat-file.c:428 +#: builtin/cat-file.c:577 msgid "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" -"<type>|--textconv) <object>" +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "" "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p " -"| <type> | --textconv) <objet>" +"| <type> | --textconv | --filters) [--path=<chemin>] <objet>" -#: builtin/cat-file.c:429 -msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" -msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" +#: builtin/cat-file.c:578 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" +msgstr "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" -#: builtin/cat-file.c:466 +#: builtin/cat-file.c:615 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:467 +#: builtin/cat-file.c:616 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:468 +#: builtin/cat-file.c:617 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:470 +#: builtin/cat-file.c:619 msgid "exit with zero when there's no error" msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur" -#: builtin/cat-file.c:471 +#: builtin/cat-file.c:620 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:473 +#: builtin/cat-file.c:622 msgid "for blob objects, run textconv on object's content" msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" -#: builtin/cat-file.c:475 +#: builtin/cat-file.c:624 +msgid "for blob objects, run filters on object's content" +msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet" + +#: builtin/cat-file.c:625 git-submodule.sh:864 +msgid "blob" +msgstr "blob" + +#: builtin/cat-file.c:626 +msgid "use a specific path for --textconv/--filters" +msgstr "utiliser un chemin spécifique pour --textconv/--filters" + +#: builtin/cat-file.c:628 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus" -#: builtin/cat-file.c:476 +#: builtin/cat-file.c:629 msgid "buffer --batch output" msgstr "bufferiser la sortie de --batch" -#: builtin/cat-file.c:478 +#: builtin/cat-file.c:631 msgid "show info and content of objects fed from the standard input" msgstr "" "afficher l'information et le contenu des objets passés en entrée standard" -#: builtin/cat-file.c:481 +#: builtin/cat-file.c:634 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" -#: builtin/cat-file.c:484 +#: builtin/cat-file.c:637 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "suivre les liens symbolique internes à la copie de travail (utilisé avec --" "batch ou --batch-check)" -#: builtin/cat-file.c:486 +#: builtin/cat-file.c:639 msgid "show all objects with --batch or --batch-check" msgstr "montrer tous les objets avec --batch ou --batch-check" -#: builtin/check-attr.c:11 +#: builtin/cat-file.c:641 +msgid "do not order --batch-all-objects output" +msgstr "ne pas ordonner la sortie de --batch-all-objects" + +#: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..." -#: builtin/check-attr.c:12 +#: builtin/check-attr.c:13 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]" -#: builtin/check-attr.c:19 +#: builtin/check-attr.c:20 msgid "report all attributes set on file" msgstr "afficher tous les attributs associés au fichier" -#: builtin/check-attr.c:20 +#: builtin/check-attr.c:21 msgid "use .gitattributes only from the index" msgstr "utiliser .gitattributes seulement depuis l'index" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101 msgid "read file names from stdin" msgstr "lire les noms de fichier depuis l'entrée standard" -#: builtin/check-attr.c:23 builtin/check-ignore.c:24 +#: builtin/check-attr.c:24 builtin/check-ignore.c:26 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:18 builtin/checkout.c:1135 builtin/gc.c:325 +#: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503 +#: builtin/worktree.c:447 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" -#: builtin/check-ignore.c:26 +#: builtin/check-ignore.c:28 msgid "show non-matching input paths" msgstr "afficher les chemins en entrée qui ne correspondent pas" -#: builtin/check-ignore.c:28 +#: builtin/check-ignore.c:30 msgid "ignore index when checking" msgstr "ignorer l'index pendant la vérification" -#: builtin/check-ignore.c:154 +#: builtin/check-ignore.c:159 msgid "cannot specify pathnames with --stdin" msgstr "impossible de spécifier les chemins avec --stdin" -#: builtin/check-ignore.c:157 +#: builtin/check-ignore.c:162 msgid "-z only makes sense with --stdin" msgstr "-z n'a de sens qu'avec l'option --stdin" -#: builtin/check-ignore.c:159 +#: builtin/check-ignore.c:164 msgid "no path specified" msgstr "aucun chemin spécifié" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:168 msgid "--quiet is only valid with a single pathname" msgstr "--quiet n'est valide qu'avec un seul chemin" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:170 msgid "cannot have both --quiet and --verbose" msgstr "impossible d'avoir --quiet et --verbose" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:173 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching n'est valide qu'avec --verbose" -#: builtin/check-mailmap.c:8 +#: builtin/check-mailmap.c:9 msgid "git check-mailmap [<options>] <contact>..." msgstr "git check-mailmap [<options>] <contact>..." -#: builtin/check-mailmap.c:13 +#: builtin/check-mailmap.c:14 msgid "also read contacts from stdin" msgstr "lire aussi les contacts depuis l'entrée standard" -#: builtin/check-mailmap.c:24 +#: builtin/check-mailmap.c:25 #, c-format msgid "unable to parse contact: %s" msgstr "impossible d'analyser le contact : %s" -#: builtin/check-mailmap.c:47 +#: builtin/check-mailmap.c:48 msgid "no contacts specified" msgstr "aucun contact spécifié" -#: builtin/checkout-index.c:127 +#: builtin/checkout-index.c:128 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<options>] [--] [<fichier>...]" -#: builtin/checkout-index.c:144 +#: builtin/checkout-index.c:143 msgid "stage should be between 1 and 3 or all" msgstr "stage doit valoir entre 1 et 3, ou all" -#: builtin/checkout-index.c:160 +#: builtin/checkout-index.c:159 msgid "check out all files in the index" msgstr "extraire tous les fichiers présents dans l'index" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:160 msgid "force overwrite of existing files" msgstr "forcer l'écrasement des fichiers existants" -#: builtin/checkout-index.c:163 +#: builtin/checkout-index.c:162 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:165 +#: builtin/checkout-index.c:164 msgid "don't checkout new files" msgstr "ne pas extraire les nouveaux fichiers" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:166 msgid "update stat information in the index file" msgstr "mettre à jour l'information de stat dans le fichier d'index" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:170 msgid "read list of paths from the standard input" msgstr "lire la liste des chemins depuis l'entrée standard" -#: builtin/checkout-index.c:173 +#: builtin/checkout-index.c:172 msgid "write the content to temporary files" msgstr "écrire le contenu dans des fichiers temporaires" -#: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 -#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 -#: builtin/submodule--helper.c:774 +#: builtin/checkout-index.c:173 builtin/column.c:31 +#: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364 +#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736 +#: builtin/worktree.c:620 msgid "string" msgstr "chaîne" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:174 msgid "when creating files, prepend <string>" msgstr "lors de la création de fichiers, préfixer par <chaîne>" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:176 msgid "copy out the files from named stage" msgstr "copier les fichiers depuis l'index nommé" -#: builtin/checkout.c:25 +#: builtin/checkout.c:29 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<options>] <branche>" -#: builtin/checkout.c:26 +#: builtin/checkout.c:30 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<options>] [<branche>] -- <fichier>..." -#: builtin/checkout.c:134 builtin/checkout.c:167 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "le chemin '%s' n'a pas notre version" -#: builtin/checkout.c:136 builtin/checkout.c:169 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "le chemin '%s' n'a pas leur version" -#: builtin/checkout.c:152 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "le chemin '%s' n'a aucune des versions nécessaires" -#: builtin/checkout.c:196 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "le chemin '%s' n'a pas les versions nécessaires" -#: builtin/checkout.c:213 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "chemin '%s' : impossible de fusionner" -#: builtin/checkout.c:230 +#: builtin/checkout.c:233 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 -#: builtin/checkout.c:259 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins" -#: builtin/checkout.c:262 builtin/checkout.c:265 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:268 +#: builtin/checkout.c:273 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en " "même temps." -#: builtin/checkout.c:279 builtin/checkout.c:473 -msgid "corrupt index file" -msgstr "fichier d'index corrompu" - -#: builtin/checkout.c:339 builtin/checkout.c:346 +#: builtin/checkout.c:342 builtin/checkout.c:349 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:495 +#: builtin/checkout.c:508 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:622 +#: builtin/checkout.c:645 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:660 +#: builtin/checkout.c:686 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:664 builtin/clone.c:661 +#: builtin/checkout.c:690 builtin/clone.c:692 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" -#: builtin/checkout.c:668 +#: builtin/checkout.c:694 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:671 +#: builtin/checkout.c:697 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:675 +#: builtin/checkout.c:701 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:677 builtin/checkout.c:1067 +#: builtin/checkout.c:703 builtin/checkout.c:1052 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:679 +#: builtin/checkout.c:705 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:731 +#: builtin/checkout.c:756 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:737 +#: builtin/checkout.c:762 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4682,7 +8372,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:756 +#: builtin/checkout.c:781 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4711,166 +8401,162 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:792 +#: builtin/checkout.c:813 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:796 +#: builtin/checkout.c:817 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:823 builtin/checkout.c:1062 +#: builtin/checkout.c:845 builtin/checkout.c:1047 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:968 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:1008 builtin/worktree.c:212 +#: builtin/checkout.c:993 builtin/worktree.c:241 builtin/worktree.c:396 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1037 +#: builtin/checkout.c:1022 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1076 +#: builtin/checkout.c:1061 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1079 builtin/checkout.c:1083 +#: builtin/checkout.c:1064 builtin/checkout.c:1068 #, 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:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 -#: builtin/checkout.c:1098 +#: builtin/checkout.c:1072 builtin/checkout.c:1075 builtin/checkout.c:1080 +#: builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1103 +#: builtin/checkout.c:1088 #, 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:1136 builtin/checkout.c:1138 builtin/clone.c:88 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 -#: builtin/worktree.c:325 +#: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119 +#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:440 +#: builtin/worktree.c:442 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1137 +#: builtin/checkout.c:1122 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1124 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1125 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1141 -msgid "detach the HEAD at named commit" -msgstr "détacher la HEAD à la validation nommée" +#: builtin/checkout.c:1126 builtin/worktree.c:444 +msgid "detach HEAD at named commit" +msgstr "détacher la HEAD au commit nommé" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1127 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1129 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1129 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1131 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1134 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1136 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1138 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1151 builtin/merge.c:230 +#: builtin/checkout.c:1140 builtin/merge.c:273 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 +#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264 msgid "style" msgstr "style" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1143 msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1156 +#: builtin/checkout.c:1146 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:1158 +#: builtin/checkout.c:1148 msgid "second guess 'git checkout <no-such-branch>'" msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1150 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:1161 builtin/clone.c:60 builtin/fetch.c:116 -#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 -#: builtin/send-pack.c:168 +#: builtin/checkout.c:1154 builtin/clone.c:86 builtin/fetch.c:138 +#: builtin/merge.c:270 builtin/pull.c:128 builtin/push.c:572 +#: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" -#: builtin/checkout.c:1192 +#: builtin/checkout.c:1184 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1209 +#: builtin/checkout.c:1201 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1214 -msgid "Missing branch name; try -b" -msgstr "Nom de branche manquant ; essayez -b" +#: builtin/checkout.c:1206 +msgid "missing branch name; try -b" +msgstr "nom de branche manquant ; essayez -b" -#: builtin/checkout.c:1250 +#: builtin/checkout.c:1243 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1257 +#: builtin/checkout.c:1250 #, c-format -msgid "" -"Cannot update paths and switch to branch '%s' at the same time.\n" -"Did you intend to checkout '%s' which can not be resolved as commit?" +msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -"Impossible de mettre à jour les chemins et de basculer sur la branche '%s' " -"en même temps.\n" -"Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?" +"'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis" -#: builtin/checkout.c:1262 +#: builtin/checkout.c:1254 #, 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:1266 +#: builtin/checkout.c:1258 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4878,50 +8564,81 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." -#: builtin/clean.c:25 +#: builtin/checkout.c:1278 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"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" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"'%s' correspond à plusieurs branches de suivi distant. Nous avons\n" +"trouvé %d distants avec une référence correspondante. Nous avons essayé\n" +"de résoudre l'argument comme un chemin, sans plus de résultat !\n" +"\n" +"Si vous souhaitiez extraire une branche de suivi distant sur 'origin',\n" +"par exemple, qualifiez-la complètement avec l'option --track :\n" +"\n" +" git checkout --track origin/<nom>\n" +"\n" +"Si vous souhaitez privilégier un distant particulier lorsque <nom> est\n" +"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n" +"votre config." + +#: builtin/clean.c:27 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..." -#: builtin/clean.c:29 +#: builtin/clean.c:31 #, c-format msgid "Removing %s\n" msgstr "Suppression de %s\n" -#: builtin/clean.c:30 +#: builtin/clean.c:32 #, c-format msgid "Would remove %s\n" msgstr "Supprimerait %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:33 #, c-format msgid "Skipping repository %s\n" msgstr "Ignore le dépôt %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:34 #, c-format msgid "Would skip repository %s\n" msgstr "Ignorerait le dépôt %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:35 #, c-format msgid "failed to remove %s" msgstr "échec de la suppression de %s" -#: builtin/clean.c:291 +#: builtin/clean.c:297 git-add--interactive.perl:579 +#, c-format msgid "" "Prompt help:\n" "1 - select a numbered item\n" "foo - select item based on unique prefix\n" -" - (empty) select nothing" +" - (empty) select nothing\n" msgstr "" "Aide en ligne :\n" "1 - sélectionner un élément numéroté\n" "foo - sélectionner un élément par un préfixe unique\n" -" - (vide) ne rien sélectionner" +" - (vide) ne rien sélectionner\n" -#: builtin/clean.c:295 +#: builtin/clean.c:301 git-add--interactive.perl:588 +#, c-format msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -4930,7 +8647,7 @@ msgid "" "foo - select item based on unique prefix\n" "-... - unselect specified items\n" "* - choose all items\n" -" - (empty) finish selecting" +" - (empty) finish selecting\n" msgstr "" "Aide en ligne :\n" "1 - sélectionner un seul élément\n" @@ -4939,38 +8656,40 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" "-... - désélectionner les éléments spécifiés\n" "* - choisir tous les éléments\n" -" - (vide) terminer la sélection" +" - (vide) terminer la sélection\n" -#: builtin/clean.c:511 -#, c-format -msgid "Huh (%s)?" -msgstr "Hein (%s) ?" +#: builtin/clean.c:517 git-add--interactive.perl:554 +#: git-add--interactive.perl:559 +#, c-format, perl-format +msgid "Huh (%s)?\n" +msgstr "Hein (%s) ?\n" -#: builtin/clean.c:653 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs à ignorer>> " -#: builtin/clean.c:690 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" -#: builtin/clean.c:711 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:752 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:777 -msgid "Bye." -msgstr "Au revoir." +#: builtin/clean.c:783 git-add--interactive.perl:1717 +#, c-format +msgid "Bye.\n" +msgstr "Au revoir.\n" -#: builtin/clean.c:785 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -4988,62 +8707,64 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:812 +#: builtin/clean.c:818 git-add--interactive.perl:1793 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: builtin/clean.c:813 +#: builtin/clean.c:819 git-add--interactive.perl:1790 msgid "What now" msgstr "Et maintenant ?" -#: builtin/clean.c:821 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Supprimerait l'élément suivant :" msgstr[1] "Supprimerait les éléments suivants :" -#: builtin/clean.c:838 +#: builtin/clean.c:843 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:869 +#: builtin/clean.c:905 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:871 +#: builtin/clean.c:907 msgid "force" msgstr "forcer" -#: builtin/clean.c:872 +#: builtin/clean.c:908 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:874 +#: builtin/clean.c:910 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 -#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 +#: builtin/clean.c:911 builtin/describe.c:545 builtin/describe.c:547 +#: builtin/grep.c:875 builtin/log.c:161 builtin/log.c:163 +#: builtin/ls-files.c:549 builtin/name-rev.c:415 builtin/name-rev.c:417 +#: builtin/show-ref.c:177 msgid "pattern" msgstr "motif" -#: builtin/clean.c:876 +#: builtin/clean.c:912 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:877 +#: builtin/clean.c:913 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:879 +#: builtin/clean.c:915 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:897 +#: builtin/clean.c:933 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" -#: builtin/clean.c:901 +#: builtin/clean.c:937 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -5051,7 +8772,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:904 +#: builtin/clean.c:940 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -5059,116 +8780,149 @@ msgstr "" "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clone.c:37 +#: builtin/clone.c:43 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:62 +#: builtin/clone.c:88 msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 +#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480 msgid "create a bare repository" msgstr "créer un dépôt nu" -#: builtin/clone.c:67 +#: builtin/clone.c:93 msgid "create a mirror repository (implies bare)" msgstr "créer un dépôt miroir (implique dépôt nu)" -#: builtin/clone.c:69 +#: builtin/clone.c:95 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" -#: builtin/clone.c:71 +#: builtin/clone.c:97 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, toujours copier" -#: builtin/clone.c:73 +#: builtin/clone.c:99 msgid "setup as shared repository" msgstr "régler comme dépôt partagé" -#: builtin/clone.c:75 builtin/clone.c:77 +#: builtin/clone.c:101 builtin/clone.c:105 +msgid "pathspec" +msgstr "spécificateur de chemin" + +#: builtin/clone.c:101 builtin/clone.c:105 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" -#: builtin/clone.c:79 +#: builtin/clone.c:108 msgid "number of submodules cloned in parallel" msgstr "nombre de sous-modules clonés en parallèle" -#: builtin/clone.c:80 builtin/init-db.c:470 +#: builtin/clone.c:109 builtin/init-db.c:477 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:81 builtin/init-db.c:471 +#: builtin/clone.c:110 builtin/init-db.c:478 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:83 builtin/submodule--helper.c:498 -#: builtin/submodule--helper.c:777 +#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:1739 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:85 +#: builtin/clone.c:116 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1741 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/pack-objects.c:3191 builtin/repack.c:320 msgid "name" msgstr "nom" -#: builtin/clone.c:87 +#: builtin/clone.c:118 msgid "use <name> instead of 'origin' to track upstream" msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont" -#: builtin/clone.c:89 +#: builtin/clone.c:120 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" -#: builtin/clone.c:91 +#: builtin/clone.c:122 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201 +#: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814 +#: builtin/pull.c:216 msgid "depth" msgstr "profondeur" -#: builtin/clone.c:93 +#: builtin/clone.c:124 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:95 +#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3182 +#: parse-options.h:154 +msgid "time" +msgstr "heure" + +#: builtin/clone.c:126 +msgid "create a shallow clone since a specific time" +msgstr "créer un clone superficiel depuis une date spécifique" + +#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166 +msgid "revision" +msgstr "révision" + +#: builtin/clone.c:128 builtin/fetch.c:144 +msgid "deepen history of shallow clone, excluding rev" +msgstr "" +"approfondir l'historique d'un clone superficiel en excluant une révision" + +#: builtin/clone.c:130 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -#: builtin/clone.c:97 +#: builtin/clone.c:132 +msgid "don't clone any tags, and make later fetches not to follow them" +msgstr "" +"ne pas cloner les tags et indiquer aux récupérations futures de ne pas le " +"faire" + +#: builtin/clone.c:134 msgid "any cloned submodules will be shallow" msgstr "tous les sous-modules clonés seront superficiels" -#: builtin/clone.c:98 builtin/init-db.c:479 +#: builtin/clone.c:135 builtin/init-db.c:486 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:99 builtin/init-db.c:480 +#: builtin/clone.c:136 builtin/init-db.c:487 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" -#: builtin/clone.c:100 +#: builtin/clone.c:137 msgid "key=value" msgstr "clé=valeur" -#: builtin/clone.c:101 +#: builtin/clone.c:138 msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229 +#: builtin/push.c:583 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232 +#: builtin/push.c:585 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" -#: builtin/clone.c:241 +#: builtin/clone.c:279 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -5176,54 +8930,42 @@ msgstr "" "Aucun nom de répertoire n'a pu être deviné\n" "Veuillez spécifier un répertoire dans la ligne de commande" -#: builtin/clone.c:307 -#, 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é." - -#: builtin/clone.c:309 +#: builtin/clone.c:332 #, 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." +msgid "info: Could not add alternate for '%s': %s\n" +msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n" -#: builtin/clone.c:314 +#: builtin/clone.c:404 #, c-format -msgid "reference repository '%s' is shallow" -msgstr "le dépôt de référence '%s' est superficiel" - -#: builtin/clone.c:317 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "le dépôt de référence '%s' est greffé" +msgid "failed to open '%s'" +msgstr "échec à l'ouverture de '%s'" -#: builtin/clone.c:384 +#: builtin/clone.c:412 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:398 +#: builtin/clone.c:426 #, c-format msgid "failed to stat %s\n" msgstr "échec du stat de %s\n" -#: builtin/clone.c:420 +#: builtin/clone.c:448 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:424 +#: builtin/clone.c:452 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:449 builtin/clone.c:633 +#: builtin/clone.c:478 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:461 +#: builtin/clone.c:492 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -5233,158 +8975,168 @@ msgstr "" "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" "et réessayer l'extraction avec 'git checkout -f HEAD'\n" -#: builtin/clone.c:538 +#: builtin/clone.c:569 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:628 -#, c-format -msgid "Checking connectivity... " -msgstr "Vérification de la connectivité... " - -#: builtin/clone.c:631 -msgid "remote did not send all necessary objects" -msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" - -#: builtin/clone.c:649 +#: builtin/clone.c:680 #, c-format msgid "unable to update %s" msgstr "impossible de mettre à jour %s" -#: builtin/clone.c:698 +#: builtin/clone.c:730 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD distante réfère à une référence non existante, impossible de " "l'extraire.\n" -#: builtin/clone.c:729 +#: builtin/clone.c:760 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:767 +#: builtin/clone.c:805 msgid "unable to write parameters to config file" msgstr "impossible d'écrire les paramètres dans le fichier de configuration" -#: builtin/clone.c:830 +#: builtin/clone.c:868 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" -#: builtin/clone.c:832 +#: builtin/clone.c:870 msgid "cannot unlink temporary alternates file" msgstr "impossible de unlinker le fichier temporaire alternates" -#: builtin/clone.c:864 builtin/receive-pack.c:1731 +#: builtin/clone.c:910 builtin/receive-pack.c:1935 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:868 +#: builtin/clone.c:914 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:879 +#: builtin/clone.c:927 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:882 +#: builtin/clone.c:930 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:895 +#: builtin/clone.c:943 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:901 builtin/fetch.c:1174 +#: builtin/clone.c:949 builtin/fetch.c:1512 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:911 +#: builtin/clone.c:959 #, 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:921 +#: builtin/clone.c:969 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 -#: builtin/worktree.c:220 builtin/worktree.c:247 +#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271 +#: builtin/worktree.c:247 builtin/worktree.c:277 #, 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:939 +#: builtin/clone.c:989 #, 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:957 +#: builtin/clone.c:1009 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:959 +#: builtin/clone.c:1011 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:998 +#: builtin/clone.c:1035 +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "" +"clone --recursive n'est pas compatible avec à la fois --reference et --" +"reference-if-able" + +#: builtin/clone.c:1096 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:1001 +#: builtin/clone.c:1098 +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:1100 +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:1102 +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:1105 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:1006 +#: builtin/clone.c:1110 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:1010 -#, c-format -msgid "Don't know how to clone %s" -msgstr "Je ne sais pas cloner %s" - -#: builtin/clone.c:1059 builtin/clone.c:1067 +#: builtin/clone.c:1180 builtin/clone.c:1188 #, 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:1070 +#: builtin/clone.c:1191 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." -#: builtin/column.c:9 +#: builtin/column.c:10 msgid "git column [<options>]" msgstr "git column [<options>]" -#: builtin/column.c:26 +#: builtin/column.c:27 msgid "lookup config vars" msgstr "rechercher les variables de configuration" -#: builtin/column.c:27 builtin/column.c:28 +#: builtin/column.c:28 builtin/column.c:29 msgid "layout to use" msgstr "mise en page à utiliser" -#: builtin/column.c:29 +#: builtin/column.c:30 msgid "Maximum width" msgstr "Largeur maximale" -#: builtin/column.c:30 +#: builtin/column.c:31 msgid "Padding space on left border" msgstr "Remplissage d'espace sur la bordure gauche" -#: builtin/column.c:31 +#: builtin/column.c:32 msgid "Padding space on right border" msgstr "Remplissage d'espace sur le côté droit" -#: builtin/column.c:32 +#: builtin/column.c:33 msgid "Padding space between columns" msgstr "Remplissage d'espace entre les colonnes" @@ -5402,59 +9154,6 @@ msgstr "git status [<options>] [--] <spécification-de-chemin>..." #: builtin/commit.c:48 msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly. Run the\n" -"following command and follow the instructions in your editor to edit\n" -"your configuration file:\n" -"\n" -" git config --global --edit\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "" -"Votre nom et votre adresse e-mail ont été configurés automatiquement en se\n" -"fondant sur votre nom d'utilisateur et le nom de votre machine. Veuillez \n" -"vérifier qu'ils sont corrects. Vous pouvez supprimer ce message en les \n" -"paramétrant explicitement. Lancez les commandes suivantes et suivez les\n" -"instruction dans votre éditeur pour éditer votre fichier de configuration :\n" -"\n" -" git config --global --edit\n" -"\n" -"Après ceci, vous pouvez corriger l'identité utilisée pour cette validation " -"avec :\n" -"\n" -" git commit --amend --reset-author\n" - -#: builtin/commit.c:61 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly:\n" -"\n" -" git config --global user.name \"Your Name\"\n" -" git config --global user.email you@example.com\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "" -"Votre nom et votre adresse e-mail ont été configurés automatiquement en se " -"fondant\n" -"sur votre nom d'utilisateur et le nom de votre machine. Veuillez vérifier " -"qu'ils sont corrects.\n" -"Vous pouvez supprimer ce message en les paramétrant explicitement :\n" -"\n" -" git config --global user.name \"Votre Nom\"\n" -" git config --global user.email vous@exemple.com\n" -"\n" -"Après ceci, vous pouvez corriger l'identité utilisée pour ce commit avec :\n" -"\n" -" git commit --amend --reset-author\n" - -#: builtin/commit.c:73 -msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" @@ -5464,7 +9163,7 @@ msgstr "" "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n" "supprimer complètement le commit avec \"git reset HEAD^\".\n" -#: builtin/commit.c:78 +#: builtin/commit.c:53 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -5479,11 +9178,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:85 +#: builtin/commit.c:60 msgid "Otherwise, please use 'git reset'\n" msgstr "Sinon, veuillez utiliser 'git reset'\n" -#: builtin/commit.c:88 +#: builtin/commit.c:63 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -5499,66 +9198,61 @@ msgstr "" "Puis \"git cherry-pick --continue\" continuera le picorage \n" "des commits restants.\n" -#: builtin/commit.c:307 +#: builtin/commit.c:306 msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" -#: builtin/commit.c:348 +#: builtin/commit.c:347 msgid "unable to create temporary index" msgstr "impossible de créer l'index temporaire" -#: builtin/commit.c:354 +#: builtin/commit.c:353 msgid "interactive add failed" msgstr "échec de l'ajout interactif" -#: builtin/commit.c:367 +#: builtin/commit.c:366 msgid "unable to update temporary index" msgstr "impossible de mettre à jour l'index temporaire" -#: builtin/commit.c:369 +#: builtin/commit.c:368 msgid "Failed to update main cache tree" msgstr "Impossible de mettre à jour l'arbre de cache principal" -#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462 msgid "unable to write new_index file" msgstr "impossible d'écrire le fichier new_index" -#: builtin/commit.c:447 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." -#: builtin/commit.c:449 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." -#: builtin/commit.c:458 +#: builtin/commit.c:455 msgid "cannot read the index" msgstr "impossible de lire l'index" -#: builtin/commit.c:477 +#: builtin/commit.c:474 msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" -#: builtin/commit.c:582 +#: builtin/commit.c:571 #, c-format msgid "commit '%s' lacks author header" msgstr "entête d'auteur manquant dans le commit '%s'" -#: builtin/commit.c:584 +#: builtin/commit.c:573 #, c-format msgid "commit '%s' has malformed author line" msgstr "le commit '%s' a une ligne d'auteur malformée" -#: builtin/commit.c:603 +#: builtin/commit.c:592 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" -#: builtin/commit.c:611 -#, c-format -msgid "invalid date format: %s" -msgstr "format de date invalide : %s" - -#: builtin/commit.c:655 +#: builtin/commit.c:644 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5566,38 +9260,38 @@ msgstr "" "impossible de sélectionner un caractère de commentaire\n" "qui n'est pas utilisé dans le message de validation actuel" -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 +#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:704 builtin/shortlog.c:285 +#: builtin/commit.c:693 builtin/shortlog.c:317 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" -#: builtin/commit.c:706 +#: builtin/commit.c:695 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" -#: builtin/commit.c:710 +#: builtin/commit.c:699 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:737 builtin/commit.c:745 +#: builtin/commit.c:728 builtin/commit.c:736 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:742 +#: builtin/commit.c:733 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" -#: builtin/commit.c:796 +#: builtin/commit.c:787 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:814 +#: builtin/commit.c:805 #, c-format msgid "" "\n" @@ -5612,7 +9306,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:819 +#: builtin/commit.c:810 #, c-format msgid "" "\n" @@ -5627,7 +9321,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:823 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5637,7 +9331,7 @@ msgstr "" "commençant par '%c' seront ignorées, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:839 +#: builtin/commit.c:831 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5648,150 +9342,163 @@ msgstr "" "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n" "si vous le souhaitez. Un message vide abandonne la validation.\n" -#: builtin/commit.c:859 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:867 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:874 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:892 +#: builtin/commit.c:880 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:949 +#: builtin/commit.c:946 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:964 builtin/tag.c:266 +#: builtin/commit.c:960 builtin/tag.c:258 #, 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" -#: builtin/commit.c:1066 +#: builtin/commit.c:1004 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun " "auteur existant" -#: builtin/commit.c:1081 builtin/commit.c:1321 +#: builtin/commit.c:1018 +#, c-format +msgid "Invalid ignored mode '%s'" +msgstr "Mode de fichier ignoré invalide '%s'" + +#: builtin/commit.c:1032 builtin/commit.c:1269 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1118 +#: builtin/commit.c:1070 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1148 +#: builtin/commit.c:1103 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens" -#: builtin/commit.c:1157 +#: builtin/commit.c:1112 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1160 +#: builtin/commit.c:1115 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1162 +#: builtin/commit.c:1117 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." -#: builtin/commit.c:1165 +#: builtin/commit.c:1120 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble" -#: builtin/commit.c:1175 +#: builtin/commit.c:1130 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." -#: builtin/commit.c:1177 -msgid "Option -m cannot be combined with -c/-C/-F/--fixup." -msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup." +#: builtin/commit.c:1132 +msgid "Option -m cannot be combined with -c/-C/-F." +msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F." -#: builtin/commit.c:1185 +#: builtin/commit.c:1140 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." -#: builtin/commit.c:1202 +#: builtin/commit.c:1157 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Une seule option parmi --include/--only/--all/--interactive/--patch peut " "être utilisée." -#: builtin/commit.c:1204 +#: builtin/commit.c:1159 msgid "No paths with --include/--only does not make sense." msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." -#: builtin/commit.c:1206 -msgid "Clever... amending the last one with dirty index." -msgstr "Malin... correction du dernier avec un index sale." - -#: builtin/commit.c:1208 -msgid "Explicit paths specified without -i or -o; assuming --only paths..." -msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..." - -#: builtin/commit.c:1220 builtin/tag.c:474 +#: builtin/commit.c:1173 builtin/tag.c:544 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" -#: builtin/commit.c:1225 +#: builtin/commit.c:1178 msgid "Paths with -a does not make sense." msgstr "Spécifier des chemins avec l'option -a n'a pas de sens." -#: builtin/commit.c:1335 builtin/commit.c:1621 +#: builtin/commit.c:1303 builtin/commit.c:1480 msgid "show status concisely" -msgstr "afficher le statut avec concision" +msgstr "afficher l'état avec concision" -#: builtin/commit.c:1337 builtin/commit.c:1623 +#: builtin/commit.c:1305 builtin/commit.c:1482 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 -#: builtin/worktree.c:437 +#: builtin/commit.c:1307 +msgid "show stash information" +msgstr "afficher l'information de remisage" + +#: builtin/commit.c:1309 builtin/commit.c:1484 +msgid "compute full ahead/behind values" +msgstr "calcule les valeurs complètes en avance/en retard" + +#: builtin/commit.c:1311 +msgid "version" +msgstr "version" + +#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558 +#: builtin/worktree.c:591 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1342 builtin/commit.c:1627 +#: builtin/commit.c:1314 builtin/commit.c:1488 msgid "show status in long format (default)" -msgstr "afficher le statut en format long (par défaut)" +msgstr "afficher l'état en format long (par défaut)" -#: builtin/commit.c:1345 builtin/commit.c:1630 +#: builtin/commit.c:1317 builtin/commit.c:1491 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:353 +#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/tag.c:398 msgid "mode" msgstr "mode" -#: builtin/commit.c:1348 builtin/commit.c:1633 +#: builtin/commit.c:1320 builtin/commit.c:1494 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " "no. (Défaut : all)" -#: builtin/commit.c:1351 -msgid "show ignored files" -msgstr "afficher les fichiers ignorés" +#: builtin/commit.c:1324 +msgid "" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" +msgstr "" +"afficher les fichiers ignorés, \"mode\" facultatif : traditional " +"(traditionnel), matching (correspondant), no. (Défaut : traditional)" -#: builtin/commit.c:1352 parse-options.h:155 +#: builtin/commit.c:1326 parse-options.h:167 msgid "when" msgstr "quand" -#: builtin/commit.c:1353 +#: builtin/commit.c:1327 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5799,350 +9506,460 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1355 +#: builtin/commit.c:1329 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1441 -msgid "couldn't look up newly created commit" -msgstr "impossible de retrouver le commit nouvellement créé" +#: builtin/commit.c:1330 +msgid "do not detect renames" +msgstr "ne pas détecter les renommages" -#: builtin/commit.c:1443 -msgid "could not parse newly created commit" -msgstr "impossible d'analyser le commit nouvellement créé" - -#: builtin/commit.c:1488 -msgid "detached HEAD" -msgstr "HEAD détachée" +#: builtin/commit.c:1332 +msgid "detect renames, optionally set similarity index" +msgstr "" +"détecter les renommages, en spécifiant optionnellement le facteur de " +"similarité" -#: builtin/commit.c:1491 -msgid " (root-commit)" -msgstr " (commit racine)" +#: builtin/commit.c:1352 +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "" +"Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis" -#: builtin/commit.c:1591 +#: builtin/commit.c:1450 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1592 +#: builtin/commit.c:1451 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1594 +#: builtin/commit.c:1453 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1595 builtin/tag.c:351 +#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1596 +#: builtin/commit.c:1455 msgid "author" msgstr "auteur" -#: builtin/commit.c:1596 +#: builtin/commit.c:1455 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1597 builtin/gc.c:326 +#: builtin/commit.c:1456 builtin/gc.c:504 msgid "date" msgstr "date" -#: builtin/commit.c:1597 +#: builtin/commit.c:1456 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 -#: builtin/notes.c:558 builtin/tag.c:349 +#: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404 +#: builtin/notes.c:567 builtin/tag.c:393 msgid "message" msgstr "message" -#: builtin/commit.c:1598 +#: builtin/commit.c:1457 msgid "commit message" msgstr "message de validation" -#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 -#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460 +#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92 msgid "commit" msgstr "commit" -#: builtin/commit.c:1599 +#: builtin/commit.c:1458 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1600 +#: builtin/commit.c:1459 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1601 +#: builtin/commit.c:1460 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "utiliser un message au format autosquash pour corriger le commit spécifié" -#: builtin/commit.c:1602 +#: builtin/commit.c:1461 msgid "use autosquash formatted message to squash specified commit" msgstr "" "utiliser un message au format autosquash pour compresser le commit spécifié" -#: builtin/commit.c:1603 +#: builtin/commit.c:1462 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:1604 builtin/log.c:1382 builtin/revert.c:86 +#: builtin/commit.c:1463 builtin/log.c:1457 builtin/merge.c:274 +#: builtin/pull.c:154 builtin/revert.c:106 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1605 +#: builtin/commit.c:1464 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1606 +#: builtin/commit.c:1465 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1607 +#: builtin/commit.c:1466 msgid "default" msgstr "défaut" -#: builtin/commit.c:1607 builtin/tag.c:354 +#: builtin/commit.c:1466 builtin/tag.c:399 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" -#: builtin/commit.c:1608 +#: builtin/commit.c:1467 msgid "include status in commit message template" -msgstr "inclure le statut dans le modèle de message de validation" +msgstr "inclure l'état dans le modèle de message de validation" -#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 -#: builtin/revert.c:93 +#: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184 +#: builtin/revert.c:114 msgid "GPG sign commit" msgstr "signer la validation avec GPG" -#: builtin/commit.c:1613 +#: builtin/commit.c:1472 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1614 +#: builtin/commit.c:1473 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1615 +#: builtin/commit.c:1474 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1616 +#: builtin/commit.c:1475 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1617 +#: builtin/commit.c:1476 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1618 +#: builtin/commit.c:1477 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1619 -msgid "bypass pre-commit hook" -msgstr "éviter d'utiliser le crochet pre-commit" +#: builtin/commit.c:1478 +msgid "bypass pre-commit and commit-msg hooks" +msgstr "éviter d'utiliser les crochets pre-commit et commit-msg" -#: builtin/commit.c:1620 +#: builtin/commit.c:1479 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1631 +#: builtin/commit.c:1492 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1632 +#: builtin/commit.c:1493 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1637 +#: builtin/commit.c:1498 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1639 +#: builtin/commit.c:1500 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1668 -msgid "could not parse HEAD commit" -msgstr "impossible d'analyser le commit HEAD" - -#: builtin/commit.c:1718 +#: builtin/commit.c:1573 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1725 +#: builtin/commit.c:1580 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1744 +#: builtin/commit.c:1599 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1755 +#: builtin/commit.c:1610 #, c-format -msgid "Aborting commit; you did not edit the message.\n" -msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" +msgid "Aborting commit due to empty commit message.\n" +msgstr "Abandon de la validation dû à un message de validation vide.\n" -#: builtin/commit.c:1760 +#: builtin/commit.c:1615 #, c-format -msgid "Aborting commit due to empty commit message.\n" -msgstr "Abandon de la validation du à un message de validation vide\n" +msgid "Aborting commit; you did not edit the message.\n" +msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" -#: builtin/commit.c:1808 +#: builtin/commit.c:1650 msgid "" -"Repository has been updated, but unable to write\n" +"repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" -"Le dépôt a été mis à jour, mais impossible d'écrire le fichier\n" +"le dépôt a été mis à jour, mais impossible d'écrire le fichier\n" "new_index. Vérifiez que le disque n'est pas plein ou que le quota\n" "n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer." -#: builtin/config.c:9 +#: builtin/commit-graph.c:10 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "git commit-graph [--object-dir <objdir>]" + +#: builtin/commit-graph.c:11 builtin/commit-graph.c:23 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "git commit-graph read [--object-dir <objdir>]" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:18 +msgid "git commit-graph verify [--object-dir <objdir>]" +msgstr "git commit-graph verify [--object-dir <objdir>]" + +#: builtin/commit-graph.c:13 builtin/commit-graph.c:28 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" +"stdin-packs|--stdin-commits]" +msgstr "" +"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" +"stdin-packs|--stdin-commits]" + +#: builtin/commit-graph.c:48 builtin/commit-graph.c:77 +#: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150 +#: builtin/log.c:1477 +msgid "dir" +msgstr "répertoire" + +#: builtin/commit-graph.c:49 builtin/commit-graph.c:78 +#: builtin/commit-graph.c:132 builtin/commit-graph.c:185 +msgid "The object directory to store the graph" +msgstr "Le répertoire d'objet où stocker le graphe" + +#: builtin/commit-graph.c:134 +msgid "start walk at all refs" +msgstr "commencer le parcours à toutes les réfs" + +#: builtin/commit-graph.c:136 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "scanner les index compactés listés sur stdin à la recherche de commits" + +#: builtin/commit-graph.c:138 +msgid "start walk at commits listed by stdin" +msgstr "commencer le parcours aux commits listés sur stdin" + +#: builtin/commit-graph.c:140 +msgid "include all commits already in the commit-graph file" +msgstr "" +"inclure tous les commits déjà présents dans le fichier de graphe de commits" + +#: builtin/commit-graph.c:149 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs" + +#: builtin/config.c:10 msgid "git config [<options>]" msgstr "git config [<options>]" -#: builtin/config.c:56 +#: builtin/config.c:101 +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "argument --type non reconnu, %s" + +#: builtin/config.c:113 +msgid "only one type at a time" +msgstr "qu'un seul type à la fois" + +#: builtin/config.c:122 msgid "Config file location" msgstr "Emplacement du fichier de configuration" -#: builtin/config.c:57 +#: builtin/config.c:123 msgid "use global config file" msgstr "utiliser les fichier de configuration global" -#: builtin/config.c:58 +#: builtin/config.c:124 msgid "use system config file" msgstr "utiliser le fichier de configuration du système" -#: builtin/config.c:59 +#: builtin/config.c:125 msgid "use repository config file" msgstr "utiliser le fichier de configuration du dépôt" -#: builtin/config.c:60 +#: builtin/config.c:126 msgid "use given config file" msgstr "utiliser le fichier de configuration spécifié" -#: builtin/config.c:61 +#: builtin/config.c:127 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:61 +#: builtin/config.c:127 msgid "read config from given blob object" msgstr "lire la configuration depuis l'objet blob fourni" -#: builtin/config.c:62 +#: builtin/config.c:128 msgid "Action" msgstr "Action" -#: builtin/config.c:63 +#: builtin/config.c:129 msgid "get value: name [value-regex]" msgstr "obtenir la valeur : nom [regex-de-valeur]" -#: builtin/config.c:64 +#: builtin/config.c:130 msgid "get all values: key [value-regex]" msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]" -#: builtin/config.c:65 +#: builtin/config.c:131 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]" -#: builtin/config.c:66 +#: builtin/config.c:132 msgid "get value specific for the URL: section[.var] URL" msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL" -#: builtin/config.c:67 +#: builtin/config.c:133 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]" -#: builtin/config.c:68 +#: builtin/config.c:134 msgid "add a new variable: name value" msgstr "ajouter une nouvelle variable : nom valeur" -#: builtin/config.c:69 +#: builtin/config.c:135 msgid "remove a variable: name [value-regex]" msgstr "supprimer une variable : nom [regex-de-valeur]" -#: builtin/config.c:70 +#: builtin/config.c:136 msgid "remove all matches: name [value-regex]" msgstr "supprimer toutes les correspondances nom [regex-de-valeur]" -#: builtin/config.c:71 +#: builtin/config.c:137 msgid "rename section: old-name new-name" msgstr "renommer une section : ancien-nom nouveau-nom" -#: builtin/config.c:72 +#: builtin/config.c:138 msgid "remove a section: name" msgstr "supprimer une section : nom" -#: builtin/config.c:73 +#: builtin/config.c:139 msgid "list all" msgstr "afficher tout" -#: builtin/config.c:74 +#: builtin/config.c:140 msgid "open an editor" msgstr "ouvrir un éditeur" -#: builtin/config.c:75 +#: builtin/config.c:141 msgid "find the color configured: slot [default]" msgstr "trouver la couleur configurée : slot [par défaut]" -#: builtin/config.c:76 +#: builtin/config.c:142 msgid "find the color setting: slot [stdout-is-tty]" msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]" -#: builtin/config.c:77 +#: builtin/config.c:143 msgid "Type" msgstr "Type" -#: builtin/config.c:78 +#: builtin/config.c:144 +msgid "value is given this type" +msgstr "ce type est assigné à la valeur" + +#: builtin/config.c:145 msgid "value is \"true\" or \"false\"" msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)" -#: builtin/config.c:79 +#: builtin/config.c:146 msgid "value is decimal number" msgstr "la valeur est un nombre décimal" -#: builtin/config.c:80 +#: builtin/config.c:147 msgid "value is --bool or --int" msgstr "la valeur est --bool ou --int" -#: builtin/config.c:81 +#: builtin/config.c:148 msgid "value is a path (file or directory name)" msgstr "la valeur est un chemin (vers un fichier ou un répertoire)" -#: builtin/config.c:82 +#: builtin/config.c:149 +msgid "value is an expiry date" +msgstr "la valeur est une date d'expiration" + +#: builtin/config.c:150 msgid "Other" msgstr "Autre" -#: builtin/config.c:83 +#: builtin/config.c:151 msgid "terminate values with NUL byte" msgstr "terminer les valeurs avec un caractère NUL" -#: builtin/config.c:84 +#: builtin/config.c:152 msgid "show variable names only" msgstr "n'afficher que les noms de variable" -#: builtin/config.c:85 +#: builtin/config.c:153 msgid "respect include directives on lookup" msgstr "respecter les directives d'inclusion lors de la recherche" -#: builtin/config.c:86 +#: builtin/config.c:154 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "afficher l'origine de la configuration (fichier, entrée standard, blob, " "ligne de commande)" -#: builtin/config.c:328 +#: builtin/config.c:155 +msgid "value" +msgstr "valeur" + +#: builtin/config.c:155 +msgid "with --get, use default value when missing entry" +msgstr "avec --get, utiliser le valeur par défaut quand l'entrée n'existe pas" + +#: builtin/config.c:168 +#, c-format +msgid "wrong number of arguments, should be %d" +msgstr "mauvais nombre d'arguments, devrait être %d" + +#: builtin/config.c:170 +#, c-format +msgid "wrong number of arguments, should be from %d to %d" +msgstr "mauvais nombre d'arguments, devrait être entre %d et %d" + +#: builtin/config.c:304 +#, c-format +msgid "invalid key pattern: %s" +msgstr "motif de clé invalide : %s" + +#: builtin/config.c:340 +#, c-format +msgid "failed to format default config value: %s" +msgstr "échec du formatage de la valeur de config par défaut : %s" + +#: builtin/config.c:397 +#, c-format +msgid "cannot parse color '%s'" +msgstr "impossible d'analyser la couleur '%s'" + +#: builtin/config.c:439 msgid "unable to parse default color value" msgstr "impossible de lire la valeur de couleur par défaut" -#: builtin/config.c:472 +#: builtin/config.c:492 builtin/config.c:724 +msgid "not in a git directory" +msgstr "pas dans un répertoire git" + +#: builtin/config.c:495 +msgid "writing to stdin is not supported" +msgstr "l'écriture sur stdin n'est pas supportée" + +#: builtin/config.c:498 +msgid "writing config blobs is not supported" +msgstr "l'écriture de blob de configuration n'est pas supportée<" + +#: builtin/config.c:583 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -6157,68 +9974,143 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" +#: builtin/config.c:606 +msgid "only one config file at a time" +msgstr "un seul fichier de configuration à la fois" + +#: builtin/config.c:611 +msgid "--local can only be used inside a git repository" +msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git" + #: builtin/config.c:614 +msgid "--blob can only be used inside a git repository" +msgstr "--blob ne peut être utilisé qu'à l'intérieur d'un dépôt git" + +#: builtin/config.c:633 +msgid "$HOME not set" +msgstr "$HOME n'est pas défini" + +#: builtin/config.c:670 +msgid "--get-color and variable type are incoherent" +msgstr "--get-color et le type de la variable sont incohérents" + +#: builtin/config.c:675 +msgid "only one action at a time" +msgstr "une seule action à la fois" + +#: builtin/config.c:688 +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only n'est applicable qu'avec --list ou --get-regexp" + +#: builtin/config.c:694 +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" +"--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --" +"list" + +#: builtin/config.c:700 +msgid "--default is only applicable to --get" +msgstr "--default n'est applicable qu'avec --get" + +#: builtin/config.c:713 +#, c-format +msgid "unable to read config file '%s'" +msgstr "lecture du fichier de configuration '%s' impossible" + +#: builtin/config.c:716 +msgid "error processing config file(s)" +msgstr "erreur lors du traitement de fichier(s) de configuration" + +#: builtin/config.c:726 +msgid "editing stdin is not supported" +msgstr "l'édition de stdin n'est pas supportée" + +#: builtin/config.c:728 +msgid "editing blobs is not supported" +msgstr "l'édition de blobs n'est pas supportée" + +#: builtin/config.c:742 #, c-format msgid "cannot create configuration file %s" msgstr "création impossible du fichier de configuration '%s'" -#: builtin/count-objects.c:77 +#: builtin/config.c:755 +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"impossible de surcharger des valeurs multiples avec une seule valeur\n" +" Utilisez une regexp, --add ou --replace-all pour modifier %s." + +#: builtin/config.c:829 builtin/config.c:840 +#, c-format +msgid "no such section: %s" +msgstr "section inexistante : %s" + +#: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:87 +#: builtin/count-objects.c:100 msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" -#: builtin/describe.c:17 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<options>] <commit ou apparenté>*" -#: builtin/describe.c:18 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<options>] --dirty" -#: builtin/describe.c:217 +#: builtin/describe.c:62 +msgid "head" +msgstr "tête" + +#: builtin/describe.c:62 +msgid "lightweight" +msgstr "léger" + +#: builtin/describe.c:62 +msgid "annotated" +msgstr "annoté" + +#: builtin/describe.c:272 #, c-format msgid "annotated tag %s not available" msgstr "l'étiquette annotée %s n'est pas disponible" -#: builtin/describe.c:221 +#: builtin/describe.c:276 #, c-format msgid "annotated tag %s has no embedded name" msgstr "l'étiquette annotée %s n'a pas de nom embarqué" -#: builtin/describe.c:223 +#: builtin/describe.c:278 #, c-format msgid "tag '%s' is really '%s' here" msgstr "l'étiquette '%s' est en fait '%s'" -#: builtin/describe.c:250 builtin/log.c:465 -#, c-format -msgid "Not a valid object name %s" -msgstr "%s n'est pas un nom d'objet valide" - -#: builtin/describe.c:253 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s n'est pas un objet '%s' valide" - -#: builtin/describe.c:270 +#: builtin/describe.c:322 #, c-format msgid "no tag exactly matches '%s'" msgstr "aucune étiquette ne correspond parfaitement à '%s'" -#: builtin/describe.c:272 +#: builtin/describe.c:324 #, c-format -msgid "searching to describe %s\n" -msgstr "recherche de la description de %s\n" +msgid "No exact match on refs or tags, searching to describe\n" +msgstr "" +"Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par " +"describe\n" -#: builtin/describe.c:319 +#: builtin/describe.c:378 #, c-format msgid "finished search at %s\n" msgstr "recherche terminée à %s\n" -#: builtin/describe.c:346 +#: builtin/describe.c:404 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -6227,7 +10119,7 @@ msgstr "" "Aucune étiquette annotée ne peut décrire '%s'.\n" "Cependant, il existe des étiquettes non-annotées : essayez avec --tags." -#: builtin/describe.c:350 +#: builtin/describe.c:408 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -6236,12 +10128,12 @@ msgstr "" "Aucune étiquette ne peut décrire '%s'.\n" "Essayez --always, ou créez des étiquettes." -#: builtin/describe.c:371 +#: builtin/describe.c:438 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits parcourus\n" -#: builtin/describe.c:374 +#: builtin/describe.c:441 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -6251,322 +10143,474 @@ msgstr "" "affichées\n" "abandon de la recherche à %s\n" -#: builtin/describe.c:396 +#: builtin/describe.c:509 +#, c-format +msgid "describe %s\n" +msgstr "décrire %s\n" + +#: builtin/describe.c:512 builtin/log.c:508 +#, c-format +msgid "Not a valid object name %s" +msgstr "%s n'est pas un nom d'objet valide" + +#: builtin/describe.c:520 +#, c-format +msgid "%s is neither a commit nor blob" +msgstr "%s n'est ni un commit ni un blob" + +#: builtin/describe.c:534 msgid "find the tag that comes after the commit" msgstr "rechercher l'étiquette qui suit le commit" -#: builtin/describe.c:397 +#: builtin/describe.c:535 msgid "debug search strategy on stderr" msgstr "déboguer la stratégie de recherche sur stderr" -#: builtin/describe.c:398 +#: builtin/describe.c:536 msgid "use any ref" msgstr "utiliser n'importe quelle référence" -#: builtin/describe.c:399 +#: builtin/describe.c:537 msgid "use any tag, even unannotated" msgstr "utiliser n'importe quelle étiquette, même non-annotée" -#: builtin/describe.c:400 +#: builtin/describe.c:538 msgid "always use long format" msgstr "toujours utiliser le format long" -#: builtin/describe.c:401 +#: builtin/describe.c:539 msgid "only follow first parent" msgstr "ne suivre que le premier parent" -#: builtin/describe.c:404 +#: builtin/describe.c:542 msgid "only output exact matches" msgstr "n'afficher que les correspondances exactes" -#: builtin/describe.c:406 +#: builtin/describe.c:544 msgid "consider <n> most recent tags (default: 10)" msgstr "" "considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)" -#: builtin/describe.c:408 +#: builtin/describe.c:546 msgid "only consider tags matching <pattern>" msgstr "ne considérer que les étiquettes correspondant à <motif>" -#: builtin/describe.c:410 builtin/name-rev.c:321 +#: builtin/describe.c:548 +msgid "do not consider tags matching <pattern>" +msgstr "ne pas considérer les étiquettes correspondant à <motif>" + +#: builtin/describe.c:550 builtin/name-rev.c:424 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrégés en dernier recours" -#: builtin/describe.c:411 +#: builtin/describe.c:551 builtin/describe.c:554 msgid "mark" msgstr "marque" -#: builtin/describe.c:412 +#: builtin/describe.c:552 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")" -#: builtin/describe.c:430 +#: builtin/describe.c:555 +msgid "append <mark> on broken working tree (default: \"-broken\")" +msgstr "" +"ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")" + +#: builtin/describe.c:573 msgid "--long is incompatible with --abbrev=0" msgstr "--long et --abbrev=0 sont incompatibles" -#: builtin/describe.c:456 +#: builtin/describe.c:602 msgid "No names found, cannot describe anything." msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit." -#: builtin/describe.c:476 +#: builtin/describe.c:652 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty est incompatible avec la spécification de commits ou assimilés" -#: builtin/diff.c:86 +#: builtin/describe.c:654 +msgid "--broken is incompatible with commit-ishes" +msgstr "--broken est incompatible avec les commits ou assimilés" + +#: builtin/diff.c:83 #, 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:237 +#: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "option invalide : %s" -#: builtin/diff.c:360 +#: builtin/diff.c:363 msgid "Not a git repository" msgstr "Ce n'est pas un dépôt git !" -#: builtin/diff.c:403 +#: builtin/diff.c:407 #, c-format msgid "invalid object '%s' given." msgstr "objet spécifié '%s' invalide." -#: builtin/diff.c:412 +#: builtin/diff.c:416 #, c-format msgid "more than two blobs given: '%s'" msgstr "plus de deux blobs spécifiés : '%s'" -#: builtin/diff.c:419 +#: builtin/diff.c:421 #, c-format msgid "unhandled object '%s' given." msgstr "objet non géré '%s' spécifié." -#: builtin/fast-export.c:25 +#: builtin/difftool.c:30 +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" +msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]" + +#: builtin/difftool.c:260 +#, c-format +msgid "failed: %d" +msgstr "échec : %d" + +#: builtin/difftool.c:302 +#, c-format +msgid "could not read symlink %s" +msgstr "lecture du lien symbolique %s impossible" + +#: builtin/difftool.c:304 +#, c-format +msgid "could not read symlink file %s" +msgstr "impossible de lire le fichier symlink %s" + +#: builtin/difftool.c:312 +#, c-format +msgid "could not read object %s for symlink %s" +msgstr "Impossible de lire l'objet %s pour le symlink %s" + +#: builtin/difftool.c:413 +msgid "" +"combined diff formats('-c' and '--cc') are not supported in\n" +"directory diff mode('-d' and '--dir-diff')." +msgstr "" +"les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n" +"dans le mode de diff de répertoire ('-d' et '--dir-diff')." + +#: builtin/difftool.c:633 +#, c-format +msgid "both files modified: '%s' and '%s'." +msgstr "les deux fichiers sont modifiés : '%s' et '%s'." + +#: builtin/difftool.c:635 +msgid "working tree file has been left." +msgstr "le fichier dans l'arbre de travail a été laissé." + +#: builtin/difftool.c:646 +#, c-format +msgid "temporary files exist in '%s'." +msgstr "des fichiers temporaires existent dans '%s'." + +#: builtin/difftool.c:647 +msgid "you may want to cleanup or recover these." +msgstr "vous pourriez souhaiter les nettoyer ou les récupérer." + +#: builtin/difftool.c:696 +msgid "use `diff.guitool` instead of `diff.tool`" +msgstr "utiliser `diff.guitool` au lieu de `diff.tool`" + +#: builtin/difftool.c:698 +msgid "perform a full-directory diff" +msgstr "réalise un diff de répertoire complet" + +#: builtin/difftool.c:700 +msgid "do not prompt before launching a diff tool" +msgstr "ne pas confirmer avant de lancer l'outil de diff" + +#: builtin/difftool.c:705 +msgid "use symlinks in dir-diff mode" +msgstr "utiliser les liens symboliques en mode de diff de répertoire" + +#: builtin/difftool.c:706 +msgid "tool" +msgstr "outil" + +#: builtin/difftool.c:707 +msgid "use the specified diff tool" +msgstr "utiliser l'outil de diff spécifié" + +#: builtin/difftool.c:709 +msgid "print a list of diff tools that may be used with `--tool`" +msgstr "afficher une liste des outils de diff utilisables avec `--tool`" + +#: builtin/difftool.c:712 +msgid "" +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"code" +msgstr "" +"provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code " +"non-nul" + +#: builtin/difftool.c:715 +msgid "specify a custom command for viewing diffs" +msgstr "spécifier une commande personnalisée pour visualiser les différences" + +#: builtin/difftool.c:739 +msgid "no <tool> given for --tool=<tool>" +msgstr "pas d'<outil> spécifié pour --tool=<outil>" + +#: builtin/difftool.c:746 +msgid "no <cmd> given for --extcmd=<cmd>" +msgstr "pas de <commande> spécifié pour --extcmd=<commande>" + +#: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [options-de-liste-de-révisions]" -#: builtin/fast-export.c:980 +#: builtin/fast-export.c:1006 msgid "show progress after <n> objects" msgstr "afficher la progression après <n> objets" -#: builtin/fast-export.c:982 +#: builtin/fast-export.c:1008 msgid "select handling of signed tags" msgstr "sélectionner la gestion des étiquettes signées" -#: builtin/fast-export.c:985 +#: builtin/fast-export.c:1011 msgid "select handling of tags that tag filtered objects" msgstr "" "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés" -#: builtin/fast-export.c:988 +#: builtin/fast-export.c:1014 msgid "Dump marks to this file" msgstr "Enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:990 +#: builtin/fast-export.c:1016 msgid "Import marks from this file" msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:992 +#: builtin/fast-export.c:1018 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:994 +#: builtin/fast-export.c:1020 msgid "Output full tree for each commit" msgstr "Afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:1022 msgid "Use the done feature to terminate the stream" msgstr "Utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:997 +#: builtin/fast-export.c:1023 msgid "Skip output of blob data" msgstr "Sauter l'affichage de données de blob" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1024 msgid "refspec" msgstr "spécificateur de référence" -#: builtin/fast-export.c:999 +#: builtin/fast-export.c:1025 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:1000 +#: builtin/fast-export.c:1026 msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fetch.c:20 +#: builtin/fetch.c:27 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/fetch.c:21 +#: builtin/fetch.c:28 msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -#: builtin/fetch.c:22 +#: builtin/fetch.c:29 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" -#: builtin/fetch.c:23 +#: builtin/fetch.c:30 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:92 builtin/pull.c:174 +#: builtin/fetch.c:112 builtin/pull.c:193 msgid "fetch from all remotes" msgstr "récupérer depuis tous les dépôts distants" -#: builtin/fetch.c:94 builtin/pull.c:177 +#: builtin/fetch.c:114 builtin/pull.c:196 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:96 builtin/pull.c:180 +#: builtin/fetch.c:116 builtin/pull.c:199 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:97 builtin/pull.c:182 +#: builtin/fetch.c:117 builtin/pull.c:201 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:99 +#: builtin/fetch.c:119 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:101 builtin/pull.c:184 +#: builtin/fetch.c:121 builtin/pull.c:203 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:103 +#: builtin/fetch.c:123 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:105 +#: builtin/fetch.c:125 msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules récupérés en parallèle" -#: builtin/fetch.c:107 builtin/pull.c:187 +#: builtin/fetch.c:127 builtin/pull.c:206 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:108 builtin/pull.c:190 +#: builtin/fetch.c:129 +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:130 builtin/fetch.c:153 builtin/pull.c:131 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:109 builtin/pull.c:191 +#: builtin/fetch.c:131 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:113 builtin/pull.c:199 +#: builtin/fetch.c:135 builtin/pull.c:214 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:115 +#: builtin/fetch.c:137 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:118 builtin/pull.c:202 +#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:120 builtin/pull.c:205 +#: builtin/fetch.c:142 +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:148 builtin/pull.c:220 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:122 builtin/log.c:1399 -msgid "dir" -msgstr "répertoire" - -#: builtin/fetch.c:123 +#: builtin/fetch.c:151 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:126 -msgid "default mode for recursion" -msgstr "mode par défaut pour la récursion" +#: builtin/fetch.c:154 +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" +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:128 builtin/pull.c:208 +#: builtin/fetch.c:158 builtin/pull.c:223 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:129 builtin/pull.c:210 +#: builtin/fetch.c:159 builtin/pull.c:225 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:130 builtin/pull.c:211 +#: builtin/fetch.c:160 builtin/pull.c:226 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:386 +#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:172 +msgid "server-specific" +msgstr "spécifique au serveur" + +#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "option à transmettre" + +#: builtin/fetch.c:167 +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:418 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:466 +#: builtin/fetch.c:552 +#, 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:645 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:471 +#: builtin/fetch.c:649 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:485 -#, c-format -msgid "! %-*s %-*s -> %s (can't fetch in current branch)" -msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)" - -#: builtin/fetch.c:486 builtin/fetch.c:574 +#: builtin/fetch.c:662 builtin/fetch.c:744 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:497 +#: builtin/fetch.c:663 +msgid "can't fetch in current branch" +msgstr "impossible de récupérer dans la branche actuelle" + +#: builtin/fetch.c:672 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552 -msgid " (unable to update local ref)" -msgstr " (impossible de mettre à jour la référence locale)" +#: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724 +#: builtin/fetch.c:739 +msgid "unable to update local ref" +msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:517 +#: builtin/fetch.c:694 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:520 +#: builtin/fetch.c:697 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:523 +#: builtin/fetch.c:700 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:569 -msgid "unable to update local ref" -msgstr "impossible de mettre à jour la référence locale" - -#: builtin/fetch.c:569 +#: builtin/fetch.c:739 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:576 -msgid "(non-fast-forward)" -msgstr "(pas d'avance rapide)" +#: builtin/fetch.c:744 +msgid "non-fast-forward" +msgstr "pas en avance rapide" -#: builtin/fetch.c:619 +#: builtin/fetch.c:790 #, 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:637 +#: builtin/fetch.c:811 #, 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:724 builtin/fetch.c:816 +#: builtin/fetch.c:900 builtin/fetch.c:1011 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:735 +#: builtin/fetch.c:911 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6575,55 +10619,57 @@ 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:787 +#: builtin/fetch.c:981 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:788 +#: builtin/fetch.c:982 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:820 +#: builtin/fetch.c:1014 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:821 builtin/remote.c:1025 +#: builtin/fetch.c:1015 builtin/remote.c:1035 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:841 +#: builtin/fetch.c:1038 #, 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:860 +#: builtin/fetch.c:1057 #, 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:863 +#: builtin/fetch.c:1060 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:920 -#, c-format -msgid "Don't know how to fetch from %s" -msgstr "Je ne sais pas récupérer depuis %s" - -#: builtin/fetch.c:1080 +#: builtin/fetch.c:1339 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1082 builtin/remote.c:96 +#: builtin/fetch.c:1341 builtin/remote.c:99 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1100 +#: builtin/fetch.c:1387 builtin/fetch.c:1555 +msgid "" +"--filter can only be used with the remote configured in core.partialClone" +msgstr "" +"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans core." +"partialClone" + +#: builtin/fetch.c:1410 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -6631,195 +10677,207 @@ 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:1123 +#: builtin/fetch.c:1447 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1165 +#: builtin/fetch.c:1496 +msgid "Negative depth in --deepen is not supported" +msgstr "Une profondeur négative dans --deepen n'est pas supportée" + +#: builtin/fetch.c:1498 +msgid "--deepen and --depth are mutually exclusive" +msgstr "--deepen et --depth sont mutuellement exclusifs" + +#: builtin/fetch.c:1503 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1505 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:1187 +#: builtin/fetch.c:1521 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1189 +#: builtin/fetch.c:1523 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:1200 +#: builtin/fetch.c:1532 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1208 +#: builtin/fetch.c:1539 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/fmt-merge-msg.c:14 +#: builtin/fmt-merge-msg.c:17 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:671 msgid "populate log with at most <n> entries from shortlog" msgstr "peupler le journal avec au plus <n> éléments depuis le journal court" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:674 msgid "alias for --log (deprecated)" msgstr "alias pour --log (obsolète)" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:677 msgid "text" msgstr "texte" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:678 msgid "use <text> as start of message" msgstr "utiliser <texte> comme début de message" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:679 msgid "file to read from" msgstr "fichier d'où lire" -#: builtin/for-each-ref.c:9 +#: builtin/for-each-ref.c:10 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<options>] [<motif>]" -#: builtin/for-each-ref.c:10 +#: builtin/for-each-ref.c:11 msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--point-at <objet>]" -#: builtin/for-each-ref.c:11 -msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<objet>]]" - #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [--contains [<object>]]" -msgstr "git for-each-ref [--contains [<objet>]]" +msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" +msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]" + +#: builtin/for-each-ref.c:13 +msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" +msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -#: builtin/for-each-ref.c:27 +#: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" msgstr "échapper les champs réservés pour les interpréteurs de commandes" -#: builtin/for-each-ref.c:29 +#: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" msgstr "échapper les champs réservés pour perl" -#: builtin/for-each-ref.c:31 +#: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for python" msgstr "échapper les champs réservés pour python" -#: builtin/for-each-ref.c:33 +#: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for Tcl" msgstr "échapper les champs réservés pour compatibilité avec Tcl" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:37 msgid "show only <n> matched refs" msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:37 builtin/tag.c:372 -msgid "format to use for the output" -msgstr "format à utiliser pour la sortie" +#: builtin/for-each-ref.c:39 builtin/tag.c:422 +msgid "respect format colors" +msgstr "respecter les couleurs de formatage" -#: builtin/for-each-ref.c:41 +#: builtin/for-each-ref.c:43 msgid "print only refs which points at the given object" msgstr "afficher seulement les références pointant sur l'objet" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:45 msgid "print only refs that are merged" msgstr "afficher seulement les références qui sont fusionnées" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:46 msgid "print only refs that are not merged" msgstr "afficher seulement les références qui ne sont pas fusionnées" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:47 msgid "print only refs which contain the commit" msgstr "afficher seulement les références qui contiennent le commit" -#: builtin/fsck.c:156 builtin/prune.c:140 -msgid "Checking connectivity" -msgstr "Vérification de la connectivité" +#: builtin/for-each-ref.c:48 +msgid "print only refs which don't contain the commit" +msgstr "afficher seulement les références qui ne contiennent pas le commit" -#: builtin/fsck.c:486 +#: builtin/fsck.c:574 msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" -#: builtin/fsck.c:552 +#: builtin/fsck.c:666 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<options>] [<objet>...]" -#: builtin/fsck.c:558 +#: builtin/fsck.c:672 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:559 +#: builtin/fsck.c:673 msgid "show dangling objects" msgstr "afficher les objets en suspens" -#: builtin/fsck.c:560 +#: builtin/fsck.c:674 msgid "report tags" msgstr "afficher les étiquettes" -#: builtin/fsck.c:561 +#: builtin/fsck.c:675 msgid "report root nodes" msgstr "signaler les nœuds racines" -#: builtin/fsck.c:562 +#: builtin/fsck.c:676 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:563 +#: builtin/fsck.c:677 msgid "make reflogs head nodes (default)" msgstr "considérer les reflogs comme nœuds tête (par défaut)" -#: builtin/fsck.c:564 +#: builtin/fsck.c:678 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:565 +#: builtin/fsck.c:679 msgid "check only connectivity" msgstr "ne vérifier que la connectivité" -#: builtin/fsck.c:566 +#: builtin/fsck.c:680 msgid "enable more strict checking" msgstr "activer une vérification plus strict" -#: builtin/fsck.c:568 +#: builtin/fsck.c:682 msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:569 builtin/prune.c:107 +#: builtin/fsck.c:683 builtin/prune.c:110 msgid "show progress" msgstr "afficher la progression" -#: builtin/fsck.c:630 +#: builtin/fsck.c:684 +msgid "show verbose names for reachable objects" +msgstr "afficher les noms étendus pour les objets inaccessibles" + +#: builtin/fsck.c:750 msgid "Checking objects" msgstr "Vérification des objets" -#: builtin/gc.c:25 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [<options>]" -#: builtin/gc.c:72 +#: builtin/gc.c:90 #, c-format -msgid "Invalid %s: '%s'" -msgstr "%s invalide : '%s'" +msgid "Failed to fstat %s: %s" +msgstr "Échec du stat de %s : %s" -#: builtin/gc.c:139 +#: builtin/gc.c:455 #, c-format -msgid "insanely long object directory %.*s" -msgstr "objet répertoire démentiellement long %.*s" +msgid "Can't stat %s" +msgstr "impossible de faire un stat de %s" -#: builtin/gc.c:290 +#: builtin/gc.c:464 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -6828,49 +10886,63 @@ msgid "" "\n" "%s" msgstr "" -"Le dernier lancement de gc a rapporter l'erreur suivante. Veuillez corriger\n" +"Le dernier lancement de gc a rapporté l'erreur suivante. Veuillez corriger\n" "la cause et supprimer %s.\n" "Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit " "supprimé.\n" "\n" "%s" -#: builtin/gc.c:327 +#: builtin/gc.c:505 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:329 +#: builtin/gc.c:507 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:330 +#: builtin/gc.c:508 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:331 +#: builtin/gc.c:511 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:373 +#: builtin/gc.c:514 +msgid "repack all other packs except the largest pack" +msgstr "recompacter tous les autres paquets excepté le plus gros paquet" + +#: builtin/gc.c:531 +#, c-format +msgid "failed to parse gc.logexpiry value %s" +msgstr "impossible d'analyser gc.logexpiry %s" + +#: builtin/gc.c:542 +#, c-format +msgid "failed to parse prune expiry value %s" +msgstr "impossible d'analyser la valeur d'expiration d'élagage %s" + +#: builtin/gc.c:562 #, 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:375 +#: builtin/gc.c:564 #, 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:376 +#: builtin/gc.c:565 #, 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:397 +#: builtin/gc.c:601 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -6878,258 +10950,287 @@ 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:441 +#: builtin/gc.c:652 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/grep.c:23 +#: builtin/grep.c:28 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]" -#: builtin/grep.c:219 +#: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep : échec de création du fil: %s" -#: builtin/grep.c:277 +#: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "nombre de fils spécifié invalide (%d) pour %s" -#: builtin/grep.c:452 builtin/grep.c:487 +#. TRANSLATORS: %s is the configuration +#. variable for tweaking threads, currently +#. grep.threads +#. +#: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728 +#: builtin/pack-objects.c:2636 +#, c-format +msgid "no threads support, ignoring %s" +msgstr "pas de support des fils, ignore %s" + +#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" -#: builtin/grep.c:502 +#: builtin/grep.c:638 #, 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:560 +#: builtin/grep.c:704 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend un valeur numérique" -#: builtin/grep.c:577 -#, c-format -msgid "cannot open '%s'" -msgstr "impossible d'ouvrir '%s'" - -#: builtin/grep.c:646 +#: builtin/grep.c:791 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:648 +#: builtin/grep.c:793 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:650 +#: builtin/grep.c:795 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:652 +#: builtin/grep.c:797 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" -#: builtin/grep.c:655 +#: builtin/grep.c:799 +msgid "recursively search in each submodule" +msgstr "rechercher récursivement dans chaque sous-module" + +#: builtin/grep.c:802 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:657 +#: builtin/grep.c:804 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" -#: builtin/grep.c:659 +#: builtin/grep.c:806 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:661 +#: builtin/grep.c:808 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:663 +#: builtin/grep.c:810 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:666 +#: builtin/grep.c:813 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:668 +#: builtin/grep.c:815 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:672 +#: builtin/grep.c:819 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:675 +#: builtin/grep.c:822 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:678 +#: builtin/grep.c:825 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:681 +#: builtin/grep.c:828 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:684 +#: builtin/grep.c:831 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:685 +#: builtin/grep.c:832 +msgid "show column number of first match" +msgstr "afficher le numéro de colonne de la première correspondance" + +#: builtin/grep.c:833 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:686 +#: builtin/grep.c:834 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:688 +#: builtin/grep.c:836 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:690 +#: builtin/grep.c:838 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:692 +#: builtin/grep.c:840 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:695 +#: builtin/grep.c:843 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:697 +#: builtin/grep.c:845 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:699 +#: builtin/grep.c:848 +msgid "show only matching parts of a line" +msgstr "n'afficher que les parties correspondantes d'une ligne" + +#: builtin/grep.c:850 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:700 +#: builtin/grep.c:851 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:702 +#: builtin/grep.c:853 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:704 +#: builtin/grep.c:855 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:707 +#: builtin/grep.c:858 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:710 +#: builtin/grep.c:861 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:712 +#: builtin/grep.c:863 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:714 +#: builtin/grep.c:865 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:715 +#: builtin/grep.c:866 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:718 +#: builtin/grep.c:869 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:720 +#: builtin/grep.c:871 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:723 +#: builtin/grep.c:874 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:725 +#: builtin/grep.c:876 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:727 +#: builtin/grep.c:878 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:739 +#: builtin/grep.c:890 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:741 +#: builtin/grep.c:892 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:743 +#: builtin/grep.c:894 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:747 +#: builtin/grep.c:898 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:747 +#: builtin/grep.c:898 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:750 +#: builtin/grep.c:902 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:813 -msgid "no pattern given." -msgstr "aucun motif fourni." +#: builtin/grep.c:966 +msgid "no pattern given" +msgstr "aucun motif fourni" -#: builtin/grep.c:845 builtin/index-pack.c:1477 +#: builtin/grep.c:1002 +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:1009 +#, c-format +msgid "unable to resolve revision: %s" +msgstr "impossible de résoudre la révision : %s" + +#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2632 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/grep.c:875 +#: builtin/grep.c:1049 builtin/pack-objects.c:3286 +msgid "no threads support, ignoring --threads" +msgstr "pas de support des fils, ignore --threads" + +#: builtin/grep.c:1073 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:901 -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:1096 +msgid "option not supported with --recurse-submodules" +msgstr "option non supportée avec --recurse-submodules" -#: builtin/grep.c:906 -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:1102 +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:909 -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:1108 +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:917 -msgid "both --cached and trees are given." -msgstr "--cached et des arbres sont fournis en même temps." +#: builtin/grep.c:1116 +msgid "both --cached and trees are given" +msgstr "--cached et des arbres sont fournis en même temps" -#: builtin/hash-object.c:81 +#: builtin/hash-object.c:84 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -7137,89 +11238,101 @@ msgstr "" "git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] " "[--] <fichier>..." -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:85 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:97 msgid "type" msgstr "type" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:97 msgid "object type" msgstr "type d'objet" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:98 msgid "write the object into the object database" msgstr "écrire l'objet dans la base de donnée d'objets" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:100 msgid "read the object from stdin" msgstr "lire l'objet depuis l'entrée standard" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:102 msgid "store file as is without filters" msgstr "stocker le fichier tel quel sans filtrage" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:103 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "juste hasher n'importe quel contenu pour créer des objets corrompus pour " "debugger Git" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:104 msgid "process file as it were from this path" msgstr "traiter le fichier comme s'il venait de ce chemin" -#: builtin/help.c:41 +#: builtin/help.c:46 msgid "print all available commands" msgstr "afficher toutes les commandes disponibles" -#: builtin/help.c:42 +#: builtin/help.c:47 +msgid "exclude guides" +msgstr "exclure les guides" + +#: builtin/help.c:48 msgid "print list of useful guides" msgstr "afficher une liste de guides utiles" -#: builtin/help.c:43 +#: builtin/help.c:49 +msgid "print all configuration variable names" +msgstr "afficher tous les noms de variables de configuration" + +#: builtin/help.c:51 msgid "show man page" msgstr "afficher la page de manuel" -#: builtin/help.c:44 +#: builtin/help.c:52 msgid "show manual in web browser" msgstr "afficher le manuel dans un navigateur web" -#: builtin/help.c:46 +#: builtin/help.c:54 msgid "show info page" msgstr "afficher la page info" -#: builtin/help.c:52 +#: builtin/help.c:56 +msgid "print command description" +msgstr "afficher la description de la commande" + +#: builtin/help.c:61 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]" -#: builtin/help.c:64 +#: builtin/help.c:73 #, c-format msgid "unrecognized help format '%s'" msgstr "format d'aide non reconnu '%s'" -#: builtin/help.c:91 +#: builtin/help.c:100 msgid "Failed to start emacsclient." msgstr "échec de démarrage d'emacsclient." -#: builtin/help.c:104 +#: builtin/help.c:113 msgid "Failed to parse emacsclient version." msgstr "échec d'analyse de la version d'emacsclient." -#: builtin/help.c:112 +#: builtin/help.c:121 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la version d'emacsclient '%d' est trop ancienne (<22)." -#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 +#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 #, c-format msgid "failed to exec '%s'" msgstr "échec de l'exécution de '%s'" -#: builtin/help.c:205 +#: builtin/help.c:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -7228,7 +11341,7 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n" "Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:217 +#: builtin/help.c:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -7237,352 +11350,326 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n" "Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:334 +#: builtin/help.c:346 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s' : visualiseur de manuel inconnu." -#: builtin/help.c:351 +#: builtin/help.c:363 msgid "no man viewer handled the request" msgstr "aucun visualiseur de manuel n'a pris en charge la demande" -#: builtin/help.c:359 +#: builtin/help.c:371 msgid "no info viewer handled the request" msgstr "aucun visualiseur de 'info' n'a pris en charge la demande" -#: builtin/help.c:408 -msgid "Defining attributes per path" -msgstr "Définition des attributs par chemin" - -#: builtin/help.c:409 -msgid "Everyday Git With 20 Commands Or So" -msgstr "Git de tous les jours avec à peu près 20 commandes" - -#: builtin/help.c:410 -msgid "A Git glossary" -msgstr "Un glossaire Git" - -#: builtin/help.c:411 -msgid "Specifies intentionally untracked files to ignore" -msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement" - -#: builtin/help.c:412 -msgid "Defining submodule properties" -msgstr "Définition des propriétés de sous-module" - -#: builtin/help.c:413 -msgid "Specifying revisions and ranges for Git" -msgstr "Spécification des révisions et portées pour Git" - -#: builtin/help.c:414 -msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" -msgstr "" -"Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)" - -#: builtin/help.c:415 -msgid "An overview of recommended workflows with Git" -msgstr "Un aperçu des flux de travail recommandés avec Git" - -#: builtin/help.c:427 -msgid "The common Git guides are:\n" -msgstr "Les guides Git populaires sont : \n" +#: builtin/help.c:418 +#, c-format +msgid "'%s' is aliased to '%s'" +msgstr "'%s' est un alias de '%s'" -#: builtin/help.c:448 builtin/help.c:465 +#: builtin/help.c:445 builtin/help.c:475 #, c-format msgid "usage: %s%s" msgstr "usage : %s%s" -#: builtin/help.c:481 -#, c-format -msgid "`git %s' is aliased to `%s'" -msgstr "`git %s\" est un alias de `%s'" - -#: builtin/index-pack.c:152 -#, c-format -msgid "unable to open %s" -msgstr "impossible d'ouvrir %s" +#: builtin/help.c:459 +msgid "'git help config' for more information" +msgstr "'git help config' pour plus d'information" -#: builtin/index-pack.c:202 +#: builtin/index-pack.c:208 #, c-format msgid "object type mismatch at %s" msgstr "type d'objet non correspondant à %s" -#: builtin/index-pack.c:222 +#: builtin/index-pack.c:228 #, c-format msgid "did not receive expected object %s" msgstr "objet attendu non reçu %s" -#: builtin/index-pack.c:225 +#: builtin/index-pack.c:231 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objet %s : type attendu %s, reçu %s" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:273 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "impossible de remplir %d octet" msgstr[1] "impossible de remplir %d octets" -#: builtin/index-pack.c:277 +#: builtin/index-pack.c:283 msgid "early EOF" msgstr "fin de fichier prématurée" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:284 msgid "read error on input" msgstr "erreur de lecture sur l'entrée" -#: builtin/index-pack.c:290 +#: builtin/index-pack.c:296 msgid "used more bytes than were available" msgstr "plus d'octets utilisés que disponibles" -#: builtin/index-pack.c:297 +#: builtin/index-pack.c:303 builtin/pack-objects.c:590 msgid "pack too large for current definition of off_t" msgstr "le paquet est trop grand pour la définition actuelle de off_t" -#: builtin/index-pack.c:313 +#: builtin/index-pack.c:306 builtin/unpack-objects.c:94 +msgid "pack exceeds maximum allowed size" +msgstr "le paquet dépasse la taille maximale permise" + +#: builtin/index-pack.c:321 #, c-format msgid "unable to create '%s'" msgstr "impossible de créer '%s'" -#: builtin/index-pack.c:318 +#: builtin/index-pack.c:327 #, c-format msgid "cannot open packfile '%s'" msgstr "impossible d'ouvrir le fichier paquet '%s'" -#: builtin/index-pack.c:332 +#: builtin/index-pack.c:341 msgid "pack signature mismatch" msgstr "la signature du paquet ne correspond pas" -#: builtin/index-pack.c:334 +#: builtin/index-pack.c:343 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "la version de paquet %<PRIu32> non supportée" -#: builtin/index-pack.c:352 +#: builtin/index-pack.c:361 #, c-format -msgid "pack has bad object at offset %lu: %s" -msgstr "le paquet a un mauvais objet à l'offset %lu: %s" +msgid "pack has bad object at offset %<PRIuMAX>: %s" +msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s" -#: builtin/index-pack.c:473 +#: builtin/index-pack.c:482 #, c-format msgid "inflate returned %d" msgstr "la décompression (inflate) a retourné %d" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:531 msgid "offset value overflow for delta base object" msgstr "dépassement de la valeur d'offset pour l'objet delta de base" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:539 msgid "delta base offset is out of bound" msgstr "l'objet delta de base est hors limite" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:547 #, c-format msgid "unknown object type %d" msgstr "type d'objet inconnu %d" -#: builtin/index-pack.c:569 +#: builtin/index-pack.c:578 msgid "cannot pread pack file" msgstr "impossible de lire (pread) le fichier paquet" -#: builtin/index-pack.c:571 +#: builtin/index-pack.c:580 #, c-format -msgid "premature end of pack file, %lu byte missing" -msgid_plural "premature end of pack file, %lu bytes missing" -msgstr[0] "fin prématurée du fichier paquet, %lu octet lu" -msgstr[1] "fin prématurée du fichier paquet, %lu octets lus" +msgid "premature end of pack file, %<PRIuMAX> byte missing" +msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" +msgstr[0] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu" +msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus" -#: builtin/index-pack.c:597 +#: builtin/index-pack.c:606 msgid "serious inflate inconsistency" msgstr "grave incohérence dans la décompression (inflate)" -#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772 -#: builtin/index-pack.c:806 builtin/index-pack.c:815 +#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780 +#: builtin/index-pack.c:819 builtin/index-pack.c:828 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:746 builtin/pack-objects.c:162 -#: builtin/pack-objects.c:254 +#: builtin/index-pack.c:754 builtin/pack-objects.c:143 +#: builtin/pack-objects.c:203 builtin/pack-objects.c:297 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" -#: builtin/index-pack.c:812 +#: builtin/index-pack.c:817 +#, c-format +msgid "cannot read existing object info %s" +msgstr "impossible de lire l'information existante de l'objet %s" + +#: builtin/index-pack.c:825 #, c-format msgid "cannot read existing object %s" msgstr "impossible de lire l'objet existant %s" -#: builtin/index-pack.c:826 +#: builtin/index-pack.c:839 #, c-format msgid "invalid blob object %s" msgstr "objet blob invalide %s" -#: builtin/index-pack.c:840 +#: builtin/index-pack.c:842 builtin/index-pack.c:861 +msgid "fsck error in packed object" +msgstr "erreur de fsck dans l'objet empaqueté" + +#: builtin/index-pack.c:858 #, c-format msgid "invalid %s" msgstr "%s invalide" -#: builtin/index-pack.c:843 -msgid "Error in object" -msgstr "Erreur dans l'objet" - -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:863 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Tous les objets enfants de %s ne sont pas accessibles" -#: builtin/index-pack.c:917 builtin/index-pack.c:948 +#: builtin/index-pack.c:935 builtin/index-pack.c:966 msgid "failed to apply delta" msgstr "échec d'application du delta" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1136 msgid "Receiving objects" msgstr "Réception d'objets" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1136 msgid "Indexing objects" msgstr "Indexation d'objets" -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1170 msgid "pack is corrupted (SHA1 mismatch)" msgstr "le paquet est corrompu (SHA1 ne correspond pas)" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1175 msgid "cannot fstat packfile" msgstr "impossible d'obtenir le statut (fstat) du fichier paquet" -#: builtin/index-pack.c:1158 +#: builtin/index-pack.c:1178 msgid "pack has junk at the end" msgstr "le paquet est invalide à la fin" -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1190 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusion extrême dans parse_pack_objects()" -#: builtin/index-pack.c:1194 +#: builtin/index-pack.c:1213 msgid "Resolving deltas" msgstr "Résolution des deltas" -#: builtin/index-pack.c:1205 +#: builtin/index-pack.c:1224 builtin/pack-objects.c:2407 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" -#: builtin/index-pack.c:1247 +#: builtin/index-pack.c:1266 msgid "confusion beyond insanity" msgstr "confusion extrême" -#: builtin/index-pack.c:1253 +#: builtin/index-pack.c:1272 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "complété avec %d objet local" msgstr[1] "complété avec %d objets locaux" -#: builtin/index-pack.c:1265 +#: builtin/index-pack.c:1284 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)" -#: builtin/index-pack.c:1269 +#: builtin/index-pack.c:1288 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "le paquet a %d delta non résolu" msgstr[1] "le paquet a %d deltas non résolus" -#: builtin/index-pack.c:1293 +#: builtin/index-pack.c:1312 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1369 +#: builtin/index-pack.c:1389 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1393 -msgid "error while closing pack file" -msgstr "erreur en fermeture du fichier paquet" +#: builtin/index-pack.c:1403 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1428 #, c-format -msgid "cannot write keep file '%s'" -msgstr "impossible d'écrire le fichier \"keep\" '%s'" +msgid "cannot write %s file '%s'" +msgstr "impossible d'écrire le fichier %s '%s'" -#: builtin/index-pack.c:1414 +#: builtin/index-pack.c:1436 #, c-format -msgid "cannot close written keep file '%s'" -msgstr "impossible de fermer le fichier \"keep\" '%s'" +msgid "cannot close written %s file '%s'" +msgstr "impossible de fermer le fichier %s écrit '%s'" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1460 +msgid "error while closing pack file" +msgstr "erreur en fermeture du fichier paquet" + +#: builtin/index-pack.c:1474 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1482 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1471 +#: builtin/index-pack.c:1526 builtin/pack-objects.c:2645 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 -#, c-format -msgid "no threads support, ignoring %s" -msgstr "pas de support des fils, ignore %s" - -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1542 +#: builtin/index-pack.c:1597 #, 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:1589 +#: builtin/index-pack.c:1645 #, 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:1596 +#: builtin/index-pack.c:1652 #, 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:1609 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'" - -#: builtin/index-pack.c:1638 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 -#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 +#: builtin/index-pack.c:1740 builtin/index-pack.c:1743 +#: builtin/index-pack.c:1759 builtin/index-pack.c:1763 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1723 +#: builtin/index-pack.c:1779 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1731 +#: builtin/index-pack.c:1781 +msgid "--stdin requires a git repository" +msgstr "--stdin requiert un dépôt git" + +#: builtin/index-pack.c:1787 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" +#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580 +msgid "fsck error in pack objects" +msgstr "erreur de fsck dans les objets paquets" + #: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" @@ -7598,72 +11685,72 @@ msgstr "impossible de faire un stat du modèle '%s'" msgid "cannot opendir '%s'" msgstr "impossible d'ouvrir (opendir) '%s'" -#: builtin/init-db.c:77 +#: builtin/init-db.c:78 #, c-format msgid "cannot readlink '%s'" msgstr "impossible de readlink '%s'" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "impossible de créer un lien symbolique de '%s' '%s'" -#: builtin/init-db.c:85 +#: builtin/init-db.c:86 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: builtin/init-db.c:89 +#: builtin/init-db.c:90 #, c-format msgid "ignoring template %s" msgstr "modèle %s ignoré" -#: builtin/init-db.c:120 +#: builtin/init-db.c:121 #, c-format -msgid "templates not found %s" -msgstr "modèles non trouvés %s" +msgid "templates not found in %s" +msgstr "modèles non trouvés dans %s" -#: builtin/init-db.c:135 +#: builtin/init-db.c:136 #, c-format msgid "not copying templates from '%s': %s" msgstr "pas de copie des modèles depuis '%s' : %s" -#: builtin/init-db.c:312 builtin/init-db.c:315 -#, c-format -msgid "%s already exists" -msgstr "%s existe déjà" - -#: builtin/init-db.c:344 +#: builtin/init-db.c:329 #, c-format msgid "unable to handle file type %d" msgstr "impossible de traiter le fichier de type %d" -#: builtin/init-db.c:347 +#: builtin/init-db.c:332 #, c-format msgid "unable to move %s to %s" msgstr "impossible de déplacer %s vers %s" -#. TRANSLATORS: The first '%s' is either "Reinitialized -#. existing" or "Initialized empty", the second " shared" or -#. "", and the last '%s%s' is the verbatim directory name. -#: builtin/init-db.c:403 +#: builtin/init-db.c:349 builtin/init-db.c:352 #, c-format -msgid "%s%s Git repository in %s%s\n" -msgstr "Dépôt Git%2$s %1$s dans %3$s%4$s\n" +msgid "%s already exists" +msgstr "%s existe déjà" -#: builtin/init-db.c:404 -msgid "Reinitialized existing" -msgstr "existant réinitialisé" +#: builtin/init-db.c:405 +#, c-format +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n" -#: builtin/init-db.c:404 -msgid "Initialized empty" -msgstr "vide initialisé" +#: builtin/init-db.c:406 +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "Dépôt Git existant réinitialisé dans %s%s\n" -#: builtin/init-db.c:405 -msgid " shared" -msgstr " partagé" +#: builtin/init-db.c:410 +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "Dépôt Git vide partagé initialisé dans %s%s\n" + +#: builtin/init-db.c:411 +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "Dépôt Git vide initialisé dans %s%s\n" -#: builtin/init-db.c:452 +#: builtin/init-db.c:459 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -7671,25 +11758,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--" "shared[=<permissions>]] [<répertoire>]" -#: builtin/init-db.c:475 +#: builtin/init-db.c:482 msgid "permissions" msgstr "permissions" -#: builtin/init-db.c:476 +#: builtin/init-db.c:483 msgid "specify that the git repository is to be shared amongst several users" msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs" -#: builtin/init-db.c:510 builtin/init-db.c:515 +#: builtin/init-db.c:517 builtin/init-db.c:522 #, c-format msgid "cannot mkdir %s" msgstr "impossible de créer le répertoire (mkdir) %s" -#: builtin/init-db.c:519 +#: builtin/init-db.c:526 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se déplacer vers le répertoire (chdir) %s" -#: builtin/init-db.c:540 +#: builtin/init-db.c:547 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -7698,7 +11785,7 @@ msgstr "" "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --" "git-dir=<répertoire>)" -#: builtin/init-db.c:568 +#: builtin/init-db.c:575 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accéder à l'arbre de travail '%s'" @@ -7711,352 +11798,410 @@ msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<symbole>[(=|:)<valeur>])...] [<fichier>...]" -#: builtin/interpret-trailers.c:26 +#: builtin/interpret-trailers.c:92 msgid "edit files in place" msgstr "éditer les fichiers sur place" -#: builtin/interpret-trailers.c:27 +#: builtin/interpret-trailers.c:93 msgid "trim empty trailers" msgstr "éliminer les lignes de fin vides" -#: builtin/interpret-trailers.c:28 +#: builtin/interpret-trailers.c:96 +msgid "where to place the new trailer" +msgstr "où placer les nouvelles lignes terminales" + +#: builtin/interpret-trailers.c:98 +msgid "action if trailer already exists" +msgstr "action si les lignes terminales existent déjà" + +#: builtin/interpret-trailers.c:100 +msgid "action if trailer is missing" +msgstr "action si les lignes terminales manquent" + +#: builtin/interpret-trailers.c:102 +msgid "output only the trailers" +msgstr "éliminer les lignes terminales vides" + +#: builtin/interpret-trailers.c:103 +msgid "do not apply config rules" +msgstr "ne pas appliquer les règles de la configuration" + +#: builtin/interpret-trailers.c:104 +msgid "join whitespace-continued values" +msgstr "joindre les valeurs continuées avec des caractères blancs" + +#: builtin/interpret-trailers.c:105 +msgid "set parsing options" +msgstr "paramètres d'analyse" + +#: builtin/interpret-trailers.c:107 msgid "trailer" msgstr "ligne de fin" -#: builtin/interpret-trailers.c:29 +#: builtin/interpret-trailers.c:108 msgid "trailer(s) to add" msgstr "ligne(s) de fin à ajouter" -#: builtin/interpret-trailers.c:42 +#: builtin/interpret-trailers.c:117 +msgid "--trailer with --only-input does not make sense" +msgstr "--trailer n'a aucune signification avec --only-input" + +#: builtin/interpret-trailers.c:127 msgid "no input file given for in-place editing" msgstr "aucun fichier en entrée pour l'éditon sur place" -#: builtin/log.c:43 +#: builtin/log.c:51 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]" -#: builtin/log.c:44 +#: builtin/log.c:52 msgid "git show [<options>] <object>..." msgstr "git show [<options>] <objet>..." -#: builtin/log.c:83 +#: builtin/log.c:96 #, c-format msgid "invalid --decorate option: %s" msgstr "option --decorate invalide : %s" -#: builtin/log.c:137 +#: builtin/log.c:157 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: builtin/log.c:138 +#: builtin/log.c:158 msgid "show source" msgstr "afficher la source" -#: builtin/log.c:139 +#: builtin/log.c:159 msgid "Use mail map file" msgstr "Utiliser le fichier de correspondance de mail" -#: builtin/log.c:140 +#: builtin/log.c:161 +msgid "only decorate refs that match <pattern>" +msgstr "décorer seulement les références correspondant à <motif>" + +#: builtin/log.c:163 +msgid "do not decorate refs that match <pattern>" +msgstr "ne pas décorer les références correspondant à <motif>" + +#: builtin/log.c:164 msgid "decorate options" msgstr "décorer les options" -#: builtin/log.c:143 +#: builtin/log.c:167 msgid "Process line range n,m in file, counting from 1" msgstr "" "Traiter seulement l'intervalle de lignes n,m du fichier en commençant le " "compte à 1" -#: builtin/log.c:239 +#: builtin/log.c:265 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:471 +#: builtin/log.c:516 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:485 builtin/log.c:578 +#: builtin/log.c:531 builtin/log.c:625 #, c-format msgid "Could not read object %s" msgstr "Impossible de lire l'objet %s" -#: builtin/log.c:602 +#: builtin/log.c:649 #, c-format msgid "Unknown type: %d" msgstr "Type inconnu : %d" -#: builtin/log.c:722 +#: builtin/log.c:770 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:812 +#: builtin/log.c:871 msgid "name of output directory is too long" msgstr "le nom du répertoire de sortie est trop long" -#: builtin/log.c:827 +#: builtin/log.c:887 #, c-format msgid "Cannot open patch file %s" msgstr "Impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:841 +#: builtin/log.c:904 msgid "Need exactly one range." msgstr "Exactement une plage nécessaire." -#: builtin/log.c:851 +#: builtin/log.c:914 msgid "Not a range." msgstr "Ceci n'est pas une plage." -#: builtin/log.c:957 +#: builtin/log.c:1020 msgid "Cover letter needs email format" -msgstr "La lettre de motivation doit être au format e-mail" +msgstr "La lettre de motivation doit être au format courriel" -#: builtin/log.c:1036 +#: builtin/log.c:1101 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1064 +#: builtin/log.c:1128 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1109 +#: builtin/log.c:1178 msgid "Two output directories?" msgstr "Deux répertoires de sortie ?" -#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959 #, c-format msgid "Unknown commit %s" msgstr "Commit inconnu %s" -#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 -#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 -#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 -#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Impossible de résoudre '%s' comme une référence valide." -#: builtin/log.c:1231 +#: builtin/log.c:1300 msgid "Could not find exact merge base." msgstr "Impossible de trouver la base de fusion exacte." -#: builtin/log.c:1235 +#: builtin/log.c:1304 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" "Or you could specify base commit by --base=<base-commit-id> manually." msgstr "" -"Impossible de récupérer l'amont, si vous voulez enregistrer le commit de base automatiquement,\n" -"veuillez utiliser git branch --set-upstream-to pour suivre une branche distante\n" -"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> manuellement." +"Impossible de récupérer l'amont, si vous voulez enregistrer le commit de " +"base automatiquement,\n" +"veuillez utiliser git branch --set-upstream-to pour suivre une branche " +"distante\n" +"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> " +"manuellement." -#: builtin/log.c:1255 +#: builtin/log.c:1324 msgid "Failed to find exact merge base" msgstr "Impossible de trouver la base de fusion exacte" -#: builtin/log.c:1266 +#: builtin/log.c:1335 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:1270 +#: builtin/log.c:1339 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:1319 +#: builtin/log.c:1392 msgid "cannot get patch id" msgstr "impossible d'obtenir l'id du patch" -#: builtin/log.c:1377 +#: builtin/log.c:1452 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1380 +#: builtin/log.c:1455 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1384 +#: builtin/log.c:1459 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1386 +#: builtin/log.c:1461 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1388 +#: builtin/log.c:1463 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:1389 +#: builtin/log.c:1464 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1390 +#: builtin/log.c:1465 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1392 +#: builtin/log.c:1467 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:1394 +#: builtin/log.c:1469 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1396 +#: builtin/log.c:1471 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" + +#: builtin/log.c:1474 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1399 +#: builtin/log.c:1477 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1402 +#: builtin/log.c:1480 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1405 +#: builtin/log.c:1483 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1407 +#: builtin/log.c:1485 msgid "output all-zero hash in From header" msgstr "écrire une empreinte à zéro dans l'entête From" -#: builtin/log.c:1409 +#: builtin/log.c:1487 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1411 +#: builtin/log.c:1489 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:1413 +#: builtin/log.c:1491 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1414 +#: builtin/log.c:1492 msgid "header" msgstr "en-tête" -#: builtin/log.c:1415 +#: builtin/log.c:1493 msgid "add email header" -msgstr "ajouter l'en-tête d'e-mail" +msgstr "ajouter l'en-tête de courriel" -#: builtin/log.c:1416 builtin/log.c:1418 +#: builtin/log.c:1494 builtin/log.c:1496 msgid "email" -msgstr "e-mail" +msgstr "courriel" -#: builtin/log.c:1416 +#: builtin/log.c:1494 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1418 +#: builtin/log.c:1496 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1420 +#: builtin/log.c:1498 msgid "ident" msgstr "ident" -#: builtin/log.c:1421 +#: builtin/log.c:1499 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:1423 +#: builtin/log.c:1501 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1424 +#: builtin/log.c:1502 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1425 builtin/log.c:1428 +#: builtin/log.c:1503 builtin/log.c:1506 msgid "boundary" msgstr "limite" -#: builtin/log.c:1426 +#: builtin/log.c:1504 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1429 +#: builtin/log.c:1507 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1433 +#: builtin/log.c:1511 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1435 +#: builtin/log.c:1513 msgid "signature" msgstr "signature" -#: builtin/log.c:1436 +#: builtin/log.c:1514 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1437 +#: builtin/log.c:1515 msgid "base-commit" msgstr "commit-de-base" -#: builtin/log.c:1438 +#: builtin/log.c:1516 msgid "add prerequisite tree info to the patch series" msgstr "Ajouter un arbre prérequis à la série de patchs" -#: builtin/log.c:1440 +#: builtin/log.c:1518 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1441 +#: builtin/log.c:1519 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1531 -msgid "-n and -k are mutually exclusive." -msgstr "-n et -k sont mutuellement exclusifs." +#: builtin/log.c:1521 +msgid "show progress while generating patches" +msgstr "" +"afficher la barre de progression durant la phase de génération des patchs" + +#: builtin/log.c:1596 +#, c-format +msgid "invalid ident line: %s" +msgstr "ligne d'identification invalide : %s" + +#: builtin/log.c:1611 +msgid "-n and -k are mutually exclusive" +msgstr "-n et -k sont mutuellement exclusifs" -#: builtin/log.c:1533 -msgid "--subject-prefix and -k are mutually exclusive." -msgstr "--subject-prefix et -k sont mutuellement exclusifs." +#: builtin/log.c:1613 +msgid "--subject-prefix/--rfc and -k are mutually exclusive" +msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs" -#: builtin/log.c:1541 +#: builtin/log.c:1621 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1543 +#: builtin/log.c:1623 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1545 +#: builtin/log.c:1625 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1573 +#: builtin/log.c:1657 msgid "standard output, or directory, which one?" msgstr "sortie standard, ou répertoire, lequel ?" -#: builtin/log.c:1575 +#: builtin/log.c:1659 #, c-format msgid "Could not create directory '%s'" msgstr "Impossible de créer le répertoire '%s'" -#: builtin/log.c:1672 +#: builtin/log.c:1752 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:1743 +#: builtin/log.c:1785 +msgid "Generating patches" +msgstr "Génération des patchs" + +#: builtin/log.c:1829 msgid "Failed to create output files" msgstr "Échec de création des fichiers en sortie" -#: builtin/log.c:1792 +#: builtin/log.c:1880 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:1846 +#: builtin/log.c:1934 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -8064,106 +12209,114 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spécifier " "<branche_amont> manuellement.\n" -#: builtin/ls-files.c:378 +#: builtin/ls-files.c:469 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<options>] [<fichier>...]" -#: builtin/ls-files.c:427 +#: builtin/ls-files.c:518 msgid "identify the file status with tags" -msgstr "identifier le statut de fichier avec les étiquettes" +msgstr "identifier l'état de fichier avec les étiquettes" -#: builtin/ls-files.c:429 +#: builtin/ls-files.c:520 msgid "use lowercase letters for 'assume unchanged' files" -msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'" +msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'" + +#: builtin/ls-files.c:522 +msgid "use lowercase letters for 'fsmonitor clean' files" +msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'" -#: builtin/ls-files.c:431 +#: builtin/ls-files.c:524 msgid "show cached files in the output (default)" msgstr "afficher les fichiers mis en cache dans la sortie (défaut)" -#: builtin/ls-files.c:433 +#: builtin/ls-files.c:526 msgid "show deleted files in the output" msgstr "afficher les fichiers supprimés dans la sortie" -#: builtin/ls-files.c:435 +#: builtin/ls-files.c:528 msgid "show modified files in the output" msgstr "afficher les fichiers modifiés dans la sortie" -#: builtin/ls-files.c:437 +#: builtin/ls-files.c:530 msgid "show other files in the output" msgstr "afficher les autres fichiers dans la sortie" -#: builtin/ls-files.c:439 +#: builtin/ls-files.c:532 msgid "show ignored files in the output" msgstr "afficher les fichiers ignorés dans la sortie" -#: builtin/ls-files.c:442 +#: builtin/ls-files.c:535 msgid "show staged contents' object name in the output" msgstr "afficher les nom des objets indexés dans la sortie" -#: builtin/ls-files.c:444 +#: builtin/ls-files.c:537 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:446 +#: builtin/ls-files.c:539 msgid "show 'other' directories' names only" msgstr "afficher seulement les noms des répertoires 'other'" -#: builtin/ls-files.c:448 +#: builtin/ls-files.c:541 msgid "show line endings of files" msgstr "afficher les fins de lignes des fichiers" -#: builtin/ls-files.c:450 +#: builtin/ls-files.c:543 msgid "don't show empty directories" msgstr "ne pas afficher les répertoires vides" -#: builtin/ls-files.c:453 +#: builtin/ls-files.c:546 msgid "show unmerged files in the output" msgstr "afficher les fichiers non fusionnés dans la sortie" -#: builtin/ls-files.c:455 +#: builtin/ls-files.c:548 msgid "show resolve-undo information" msgstr "afficher l'information resolv-undo" -#: builtin/ls-files.c:457 +#: builtin/ls-files.c:550 msgid "skip files matching pattern" msgstr "sauter les fichiers correspondant au motif" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:553 msgid "exclude patterns are read from <file>" msgstr "les motifs d'exclusion sont lus depuis <fichier>" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:556 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:465 +#: builtin/ls-files.c:558 msgid "add the standard git exclusions" msgstr "ajouter les exclusions git standard" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:561 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:471 +#: builtin/ls-files.c:564 +msgid "recurse through submodules" +msgstr "parcourir récursivement les sous-modules" + +#: builtin/ls-files.c:566 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:472 +#: builtin/ls-files.c:567 msgid "tree-ish" msgstr "arbre ou apparenté" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:568 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:475 +#: builtin/ls-files.c:570 msgid "show debugging data" msgstr "afficher les données de débogage" -#: builtin/ls-remote.c:7 +#: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" @@ -8173,45 +12326,45 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<dépôt> [<références>...]]" -#: builtin/ls-remote.c:50 +#: builtin/ls-remote.c:59 msgid "do not print remote URL" msgstr "ne pas afficher les URL distantes" -#: builtin/ls-remote.c:51 builtin/ls-remote.c:53 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 msgid "exec" msgstr "exécutable" -#: builtin/ls-remote.c:52 builtin/ls-remote.c:54 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 msgid "path of git-upload-pack on the remote host" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/ls-remote.c:56 +#: builtin/ls-remote.c:65 msgid "limit to tags" msgstr "limiter aux étiquettes" -#: builtin/ls-remote.c:57 +#: builtin/ls-remote.c:66 msgid "limit to heads" msgstr "limiter aux heads" -#: builtin/ls-remote.c:58 +#: builtin/ls-remote.c:67 msgid "do not show peeled tags" msgstr "ne pas afficher les étiquettes pelées" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:69 msgid "take url.<base>.insteadOf into account" msgstr "prendre en compte url.<base>.insteadOf" -#: builtin/ls-remote.c:62 +#: 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:64 +#: 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" -#: builtin/ls-tree.c:28 +#: builtin/ls-tree.c:30 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]" @@ -8249,191 +12402,190 @@ msgstr "" "afficher l'arbre entier ; pas seulement le répertoire courant (implique --" "full-name)" -#: builtin/merge.c:45 +#: builtin/mailsplit.c:241 +#, c-format +msgid "empty mbox: '%s'" +msgstr "mbox vide : '%s'" + +#: builtin/merge.c:51 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<options>] [<commit>...]" -#: builtin/merge.c:46 -msgid "git merge [<options>] <msg> HEAD <commit>" -msgstr "git merge [<options>] <message> HEAD <commit>" - -#: builtin/merge.c:47 +#: builtin/merge.c:52 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:101 +#: builtin/merge.c:53 +msgid "git merge --continue" +msgstr "git merge --continue" + +#: builtin/merge.c:110 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:138 +#: builtin/merge.c:176 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" -#: builtin/merge.c:139 +#: builtin/merge.c:177 #, c-format msgid "Available strategies are:" msgstr "Les stratégies disponibles sont :" -#: builtin/merge.c:144 +#: builtin/merge.c:182 #, c-format msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:194 builtin/pull.c:126 +#: builtin/merge.c:232 builtin/pull.c:142 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:197 builtin/pull.c:129 +#: builtin/merge.c:235 builtin/pull.c:145 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:198 builtin/pull.c:132 +#: builtin/merge.c:236 builtin/pull.c:148 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:200 builtin/pull.c:135 +#: builtin/merge.c:238 builtin/pull.c:151 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:203 builtin/pull.c:138 +#: builtin/merge.c:241 builtin/pull.c:157 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:205 builtin/pull.c:141 +#: builtin/merge.c:243 builtin/pull.c:160 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:207 builtin/pull.c:144 +#: builtin/merge.c:245 builtin/pull.c:163 msgid "edit message before committing" msgstr "éditer le message avant la validation" -#: builtin/merge.c:208 +#: builtin/merge.c:246 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:210 builtin/pull.c:150 +#: builtin/merge.c:248 builtin/pull.c:169 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:214 -msgid "Verify that the named commit has a valid GPG signature" -msgstr "Vérifier que la validation a une signature GPG valide" +#: builtin/merge.c:252 builtin/pull.c:172 +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:215 builtin/notes.c:771 builtin/pull.c:157 -#: builtin/revert.c:89 +#: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176 +#: builtin/revert.c:110 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:216 builtin/pull.c:158 +#: builtin/merge.c:254 builtin/pull.c:177 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:217 builtin/pull.c:161 +#: builtin/merge.c:255 builtin/pull.c:180 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:218 builtin/pull.c:162 +#: builtin/merge.c:256 builtin/pull.c:181 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:220 +#: builtin/merge.c:258 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:224 +#: builtin/merge.c:265 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:226 builtin/pull.c:169 +#: builtin/merge.c:267 +msgid "continue the current in-progress merge" +msgstr "continuer la fusion en cours" + +#: builtin/merge.c:269 builtin/pull.c:188 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" -#: builtin/merge.c:254 +#: builtin/merge.c:275 +msgid "verify commit-msg hook" +msgstr "vérifier le crochet commit-msg" + +#: builtin/merge.c:300 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:259 +#: builtin/merge.c:305 msgid "stash failed" msgstr "échec du remisage" -#: builtin/merge.c:264 +#: builtin/merge.c:310 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:283 builtin/merge.c:300 +#: builtin/merge.c:332 builtin/merge.c:349 msgid "read-tree failed" msgstr "read-tree a échoué" -#: builtin/merge.c:330 +#: builtin/merge.c:379 msgid " (nothing to squash)" msgstr " (rien à compresser)" -#: builtin/merge.c:343 +#: builtin/merge.c:390 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressée -- HEAD non mise à jour\n" -#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 -#: builtin/merge.c:1000 -#, c-format -msgid "Could not write to '%s'" -msgstr "Impossible d'écrire dans '%s'" - -#: builtin/merge.c:375 -msgid "Writing SQUASH_MSG" -msgstr "Écriture de SQUASH_MSG" - -#: builtin/merge.c:377 -msgid "Finishing SQUASH_MSG" -msgstr "Finition de SQUASH_MSG" - -#: builtin/merge.c:400 +#: builtin/merge.c:440 #, 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:451 +#: builtin/merge.c:491 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:541 +#: builtin/merge.c:578 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:660 +#: builtin/merge.c:699 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:674 +#: builtin/merge.c:713 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:687 +#: builtin/merge.c:728 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:776 +#: builtin/merge.c:779 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:785 +#: builtin/merge.c:788 #, 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:791 +#: builtin/merge.c:794 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -8450,54 +12602,70 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:815 +#: builtin/merge.c:830 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:835 +#: builtin/merge.c:849 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:890 +#: builtin/merge.c:902 #, 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:906 -#, c-format -msgid "'%s' is not a commit" -msgstr "'%s' n'est pas une validation" - -#: builtin/merge.c:947 +#: builtin/merge.c:941 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:949 +#: builtin/merge.c:943 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:951 +#: builtin/merge.c:945 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:956 +#: builtin/merge.c:950 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1091 +#: builtin/merge.c:1007 #, c-format -msgid "could not close '%s'" -msgstr "impossible de fermer '%s'" +msgid "Bad value '%s' in environment '%s'" +msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1219 +#: builtin/merge.c:1110 +#, c-format +msgid "not something we can merge in %s: %s" +msgstr "pas possible de fusionner ceci dans %s : %s" + +#: builtin/merge.c:1144 +msgid "not something we can merge" +msgstr "pas possible de fusionner ceci" + +#: builtin/merge.c:1247 +msgid "--abort expects no arguments" +msgstr "--abort n'accepte pas d'argument" + +#: builtin/merge.c:1251 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:1235 +#: builtin/merge.c:1263 +msgid "--continue expects no arguments" +msgstr "--continue ne supporte aucun argument" + +#: builtin/merge.c:1267 +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:1283 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8505,7 +12673,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1242 +#: builtin/merge.c:1290 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8513,152 +12681,160 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1245 +#: builtin/merge.c:1293 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:1254 +#: builtin/merge.c:1302 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1262 +#: builtin/merge.c:1310 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:1279 +#: builtin/merge.c:1327 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:1281 +#: builtin/merge.c:1329 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:1286 +#: builtin/merge.c:1334 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1288 +#: builtin/merge.c:1336 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:1344 +#: builtin/merge.c:1370 #, 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." -#: builtin/merge.c:1347 +#: builtin/merge.c:1373 #, 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." -#: builtin/merge.c:1350 +#: builtin/merge.c:1376 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: builtin/merge.c:1353 +#: builtin/merge.c:1379 #, 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" -#: builtin/merge.c:1415 +#: builtin/merge.c:1438 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1439 +#: builtin/merge.c:1447 +msgid "Already up to date." +msgstr "Déjà à jour." + +#: builtin/merge.c:1457 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1476 +#: builtin/merge.c:1498 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1483 +#: builtin/merge.c:1505 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1515 +#: builtin/merge.c:1530 +msgid "Already up to date. Yeeah!" +msgstr "Déjà à jour. Ouais !" + +#: builtin/merge.c:1536 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1538 builtin/merge.c:1617 +#: builtin/merge.c:1559 builtin/merge.c:1638 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1563 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1608 +#: builtin/merge.c:1629 #, 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:1610 +#: builtin/merge.c:1631 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1619 +#: builtin/merge.c:1640 #, 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:1631 +#: builtin/merge.c:1652 #, 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/merge-base.c:29 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <commit> <commit>..." -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:32 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <commit>..." -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:33 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <validation>..." -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:34 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <validation> <validation>" -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:35 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <référence> [<validation>]" -#: builtin/merge-base.c:214 +#: builtin/merge-base.c:221 msgid "output all common ancestors" msgstr "afficher tous les ancêtres communs" -#: builtin/merge-base.c:216 +#: builtin/merge-base.c:223 msgid "find ancestors for a single n-way merge" msgstr "trouver les ancêtres pour une fusion simple à n points" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:225 msgid "list revs not reachable from others" msgstr "afficher les révisions inaccessibles depuis les autres" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:227 msgid "is the first one ancestor of the other?" msgstr "est le premier ancêtre de l'autre ?" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:229 msgid "find where <commit> forked from reflog of <ref>" msgstr "trouver où <validation> a divergé du reflog de <référence>" -#: builtin/merge-file.c:8 +#: builtin/merge-file.c:9 msgid "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" @@ -8698,162 +12874,197 @@ msgstr "ne pas avertir à propos des conflits" msgid "set labels for file1/orig-file/file2" msgstr "définir les labels pour fichier1/fichier-orig/fichier2" -#: builtin/mktree.c:65 +#: builtin/merge-recursive.c:45 +#, c-format +msgid "unknown option %s" +msgstr "option inconnue %s" + +#: builtin/merge-recursive.c:51 +#, c-format +msgid "could not parse object '%s'" +msgstr "Impossible d'analyser l'objet '%s'" + +#: builtin/merge-recursive.c:55 +#, c-format +msgid "cannot handle more than %d base. Ignoring %s." +msgid_plural "cannot handle more than %d bases. Ignoring %s." +msgstr[0] "impossible de gérer plus de %d base. %s ignoré." +msgstr[1] "impossible de gérer plus de %d bases. %s ignoré." + +#: builtin/merge-recursive.c:63 +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-recursive.c:69 builtin/merge-recursive.c:71 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "impossible de résoudre la référence '%s'" + +#: builtin/merge-recursive.c:77 +#, c-format +msgid "Merging %s with %s\n" +msgstr "Fusion de %s avec %s\n" + +#: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:152 +#: builtin/mktree.c:154 msgid "input is NUL terminated" msgstr "l'entrée se termine par NUL" -#: builtin/mktree.c:153 builtin/write-tree.c:24 +#: builtin/mktree.c:155 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "autoriser les objets manquants" -#: builtin/mktree.c:154 +#: builtin/mktree.c:156 msgid "allow creation of more than one tree" msgstr "autoriser la création de plus d'un arbre" -#: builtin/mv.c:15 +#: builtin/mv.c:17 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<options>] <source>... <destination>" -#: builtin/mv.c:70 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?" -#: builtin/mv.c:72 builtin/rm.c:317 +#: builtin/mv.c:84 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Veuillez indexer vos modifications de .gitmodules ou les remiser pour " "continuer" -#: builtin/mv.c:90 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "%.*s est dans l'index" -#: builtin/mv.c:112 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "forcer le déplacement/renommage même si la cible existe" -#: builtin/mv.c:113 +#: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "sauter les erreurs de déplacement/renommage" -#: builtin/mv.c:152 +#: builtin/mv.c:168 #, c-format msgid "destination '%s' is not a directory" msgstr "la destination '%s' n'est pas un répertoire" -#: builtin/mv.c:163 +#: builtin/mv.c:179 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Vérification du renommage de '%s' en '%s'\n" -#: builtin/mv.c:167 +#: builtin/mv.c:183 msgid "bad source" msgstr "mauvaise source" -#: builtin/mv.c:170 +#: builtin/mv.c:186 msgid "can not move directory into itself" msgstr "impossible de déplacer un répertoire dans lui-même" -#: builtin/mv.c:173 +#: builtin/mv.c:189 msgid "cannot move directory over file" msgstr "impossible de déplacer un répertoire sur un fichier" -#: builtin/mv.c:182 +#: builtin/mv.c:198 msgid "source directory is empty" msgstr "le répertoire source est vide" -#: builtin/mv.c:207 +#: builtin/mv.c:223 msgid "not under version control" msgstr "pas sous le contrôle de version" -#: builtin/mv.c:210 +#: builtin/mv.c:226 msgid "destination exists" msgstr "la destination existe" -#: builtin/mv.c:218 +#: builtin/mv.c:234 #, c-format msgid "overwriting '%s'" msgstr "écrasement de '%s'" -#: builtin/mv.c:221 +#: builtin/mv.c:237 msgid "Cannot overwrite" msgstr "Impossible d'écraser" -#: builtin/mv.c:224 +#: builtin/mv.c:240 msgid "multiple sources for the same target" msgstr "multiples sources pour la même destination" -#: builtin/mv.c:226 +#: builtin/mv.c:242 msgid "destination directory does not exist" msgstr "le répertoire de destination n'existe pas" -#: builtin/mv.c:233 +#: builtin/mv.c:249 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, source=%s, destination=%s" -#: builtin/mv.c:254 +#: builtin/mv.c:270 #, c-format msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:355 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<options>] <validation>..." -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:356 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<options>] --all" -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:357 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<options>] --stdin" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:413 msgid "print only names (no SHA-1)" msgstr "afficher seulement les noms (pas de SHA-1)" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:414 msgid "only use tags to name the commits" msgstr "utiliser seulement les étiquettes pour nommer les validations" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:416 msgid "only use refs matching <pattern>" msgstr "utiliser seulement les références correspondant à <motif>" -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:418 +msgid "ignore refs matching <pattern>" +msgstr "ignorer les références correspondant à <motif>" + +#: builtin/name-rev.c:420 msgid "list all commits reachable from all refs" msgstr "" "afficher toutes les validations accessibles depuis toutes les références" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:421 msgid "read from stdin" msgstr "lire depuis l'entrée standard" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:422 msgid "allow to print `undefined` names (default)" msgstr "autoriser l'affichage des noms `non définis` (par défaut)" -#: builtin/name-rev.c:325 +#: builtin/name-rev.c:428 msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" -#: builtin/notes.c:25 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <références-notes>] [list [<object>]]" -#: builtin/notes.c:26 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" @@ -8861,12 +13072,12 @@ msgstr "" "git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> " "| -F <fichier> | (-c | -C) <objet>] [<objet>]" -#: builtin/notes.c:27 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" "git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>" -#: builtin/notes.c:28 +#: builtin/notes.c:31 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" @@ -8874,181 +13085,205 @@ msgstr "" "git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -" "F <fichier> | (-c | -C) <objet>] [<objet>]" -#: builtin/notes.c:29 +#: builtin/notes.c:32 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <références-notes>] edit [--allow-empty] [<objet>]" -#: builtin/notes.c:30 +#: builtin/notes.c:33 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <références-notes>] show [<objet>]" -#: builtin/notes.c:31 +#: builtin/notes.c:34 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" "git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] " "<références-notes>" -#: builtin/notes.c:32 +#: builtin/notes.c:35 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:33 +#: builtin/notes.c:36 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <références-notes>] remove [<objet>...]" -#: builtin/notes.c:35 -msgid "git notes [--ref <notes-ref>] prune [-n | -v]" -msgstr "git notes [--ref <références-notes>] prune [-n | -v]" +#: builtin/notes.c:38 +msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" +msgstr "git notes [--ref <référence-notes>] prune [-n] [-v]" -#: builtin/notes.c:36 +#: builtin/notes.c:39 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <références-notes>] get-ref" -#: builtin/notes.c:41 +#: builtin/notes.c:44 msgid "git notes [list [<object>]]" msgstr "git notes [list [<objet>]]" -#: builtin/notes.c:46 +#: builtin/notes.c:49 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<options>] [<objet>]" -#: builtin/notes.c:51 +#: builtin/notes.c:54 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<options>] <depuis-objet> <vers-objet>" -#: builtin/notes.c:52 +#: builtin/notes.c:55 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<depuis-objet> <vers-objet>]..." -#: builtin/notes.c:57 +#: builtin/notes.c:60 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<options>] [<objet>]" -#: builtin/notes.c:62 +#: builtin/notes.c:65 msgid "git notes edit [<object>]" msgstr "git notes edit [<objet>]" -#: builtin/notes.c:67 +#: builtin/notes.c:70 msgid "git notes show [<object>]" msgstr "git notes show [<objet>]" -#: builtin/notes.c:72 +#: builtin/notes.c:75 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<options>] <références-notes>" -#: builtin/notes.c:73 +#: builtin/notes.c:76 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<options>]" -#: builtin/notes.c:74 +#: builtin/notes.c:77 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<options>]" -#: builtin/notes.c:79 +#: builtin/notes.c:82 msgid "git notes remove [<object>]" msgstr "git notes remove [<objet>]" -#: builtin/notes.c:84 +#: builtin/notes.c:87 msgid "git notes prune [<options>]" msgstr "git notes prune [<options>]" -#: builtin/notes.c:89 +#: builtin/notes.c:92 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:147 +#: builtin/notes.c:97 +msgid "Write/edit the notes for the following object:" +msgstr "Écrire/éditer les notes pour l'objet suivant :" + +#: builtin/notes.c:150 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "impossible de démarrer 'show' pour l'objet '%s'" -#: builtin/notes.c:151 +#: builtin/notes.c:154 msgid "could not read 'show' output" msgstr "impossible de lire la sortie de 'show'" -#: builtin/notes.c:159 +#: builtin/notes.c:162 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "impossible de finir 'show' pour l'objet '%s'" -#: builtin/notes.c:174 builtin/tag.c:248 -#, c-format -msgid "could not create file '%s'" -msgstr "impossible de créer le fichier '%s'" - -#: builtin/notes.c:193 -msgid "Please supply the note contents using either -m or -F option" -msgstr "Veuillez fournir le contenu de la note en utilisant l'option -m ou -F" +#: builtin/notes.c:197 +msgid "please supply the note contents using either -m or -F option" +msgstr "veuillez fournir le contenu de la note en utilisant l'option -m ou -F" -#: builtin/notes.c:202 +#: builtin/notes.c:206 msgid "unable to write note object" msgstr "impossible d'écrire l'objet note" -#: builtin/notes.c:204 +#: builtin/notes.c:208 #, c-format -msgid "The note contents have been left in %s" -msgstr "Le contenu de la note a été laissé dans %s" +msgid "the note contents have been left in %s" +msgstr "le contenu de la note a été laissé dans %s" -#: builtin/notes.c:232 builtin/tag.c:439 +#: builtin/notes.c:236 builtin/tag.c:508 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: builtin/notes.c:234 builtin/tag.c:442 +#: builtin/notes.c:238 builtin/tag.c:511 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" -#: builtin/notes.c:256 +#: builtin/notes.c:257 builtin/notes.c:308 builtin/notes.c:310 +#: builtin/notes.c:378 builtin/notes.c:433 builtin/notes.c:519 +#: builtin/notes.c:524 builtin/notes.c:602 builtin/notes.c:664 #, c-format -msgid "Failed to read object '%s'." -msgstr "Impossible de lire l'objet '%s'." +msgid "failed to resolve '%s' as a valid ref." +msgstr "impossible de résoudre '%s' comme une référence valide." #: builtin/notes.c:260 #, c-format -msgid "Cannot read note data from non-blob object '%s'." -msgstr "Impossible de lire les informations de note d'un objet non-blob '%s'." +msgid "failed to read object '%s'." +msgstr "impossible de lire l'objet '%s'." -#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 -#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:946 +#: builtin/notes.c:264 +#, c-format +msgid "cannot read note data from non-blob object '%s'." +msgstr "impossible de lire les informations de note d'un objet non-blob '%s'." + +#: builtin/notes.c:304 +#, c-format +msgid "malformed input line: '%s'." +msgstr "ligne en entrée malformée : '%s'." + +#: builtin/notes.c:319 +#, c-format +msgid "failed to copy notes from '%s' to '%s'" +msgstr "impossible de copier les notes de '%s' vers '%s'" + +#. TRANSLATORS: the first %s will be replaced by a git +#. notes command: 'add', 'merge', 'remove', etc. +#. +#: builtin/notes.c:351 +#, c-format +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:371 builtin/notes.c:426 builtin/notes.c:502 +#: builtin/notes.c:514 builtin/notes.c:590 builtin/notes.c:657 +#: builtin/notes.c:807 builtin/notes.c:954 builtin/notes.c:975 msgid "too many parameters" msgstr "trop de paramètres" -#: builtin/notes.c:375 builtin/notes.c:662 +#: builtin/notes.c:384 builtin/notes.c:670 #, c-format -msgid "No note found for object %s." -msgstr "Pas de note trouvée pour l'objet %s." +msgid "no note found for object %s." +msgstr "pas de note trouvée pour l'objet %s." -#: builtin/notes.c:396 builtin/notes.c:559 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "note contents as a string" msgstr "contenu de la note sous forme de chaîne" -#: builtin/notes.c:399 builtin/notes.c:562 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "note contents in a file" msgstr "contenu de la note dans un fichier" -#: builtin/notes.c:402 builtin/notes.c:565 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "reuse and edit specified note object" msgstr "réutiliser et éditer l'objet de note spécifié" -#: builtin/notes.c:405 builtin/notes.c:568 +#: builtin/notes.c:414 builtin/notes.c:577 msgid "reuse specified note object" msgstr "réutiliser l'objet de note spécifié" -#: builtin/notes.c:408 builtin/notes.c:571 +#: builtin/notes.c:417 builtin/notes.c:580 msgid "allow storing empty note" msgstr "permettre de stocker une note vide" -#: builtin/notes.c:409 builtin/notes.c:480 +#: builtin/notes.c:418 builtin/notes.c:489 msgid "replace existing notes" msgstr "remplacer les notes existantes" -#: builtin/notes.c:434 +#: builtin/notes.c:443 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9057,30 +13292,30 @@ msgstr "" "Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. " "Utilisez '-f' pour écraser les notes existantes" -#: builtin/notes.c:449 builtin/notes.c:528 +#: builtin/notes.c:458 builtin/notes.c:537 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Écrasement des notes existantes pour l'objet %s\n" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 +#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894 #, c-format msgid "Removing note for object %s\n" msgstr "Suppression de la note pour l'objet %s\n" -#: builtin/notes.c:481 +#: builtin/notes.c:490 msgid "read objects from stdin" msgstr "lire les objets depuis l'entrée standard" -#: builtin/notes.c:483 +#: builtin/notes.c:492 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "charger la configuration de réécriture pour <commande> (implique --stdin)" -#: builtin/notes.c:501 +#: builtin/notes.c:510 msgid "too few parameters" msgstr "pas assez de paramètres" -#: builtin/notes.c:522 +#: builtin/notes.c:531 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9089,12 +13324,12 @@ msgstr "" "Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. " "Utilisez '-f' pour écraser les notes existantes" -#: builtin/notes.c:534 +#: builtin/notes.c:543 #, c-format -msgid "Missing notes on source object %s. Cannot copy." -msgstr "Notes manquantes sur l'objet source %s. Impossible de copier." +msgid "missing notes on source object %s. Cannot copy." +msgstr "notes manquantes sur l'objet source %s. Impossible de copier." -#: builtin/notes.c:586 +#: builtin/notes.c:595 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -9103,15 +13338,52 @@ msgstr "" "Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n" "Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n" -#: builtin/notes.c:768 +#: builtin/notes.c:690 +msgid "failed to delete ref NOTES_MERGE_PARTIAL" +msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:692 +msgid "failed to delete ref NOTES_MERGE_REF" +msgstr "échec de la suppression de la référence NOTES_MERGE_REF" + +#: builtin/notes.c:694 +msgid "failed to remove 'git notes merge' worktree" +msgstr "échec de la suppression de la copie de travail 'git notes merge'" + +#: builtin/notes.c:714 +msgid "failed to read ref NOTES_MERGE_PARTIAL" +msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:716 +msgid "could not find commit from NOTES_MERGE_PARTIAL." +msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL." + +#: builtin/notes.c:718 +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL." + +#: builtin/notes.c:731 +msgid "failed to resolve NOTES_MERGE_REF" +msgstr "échec de la résolution de NOTES_MERGE_REF" + +#: builtin/notes.c:734 +msgid "failed to finalize notes merge" +msgstr "impossible de finaliser la fusion de notes" + +#: builtin/notes.c:760 +#, c-format +msgid "unknown notes merge strategy %s" +msgstr "stratégie de fusion de notes inconnue %s" + +#: builtin/notes.c:776 msgid "General options" msgstr "Options générales" -#: builtin/notes.c:770 +#: builtin/notes.c:778 msgid "Merge options" msgstr "Options de fusion" -#: builtin/notes.c:772 +#: builtin/notes.c:780 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -9119,342 +13391,567 @@ msgstr "" "résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:774 +#: builtin/notes.c:782 msgid "Committing unmerged notes" msgstr "Validation des notes non fusionnées" -#: builtin/notes.c:776 +#: builtin/notes.c:784 msgid "finalize notes merge by committing unmerged notes" msgstr "finaliser la fusion de notes en validant les notes non fusionnées" -#: builtin/notes.c:778 +#: builtin/notes.c:786 msgid "Aborting notes merge resolution" msgstr "Abandon de la résolution de fusion des notes" -#: builtin/notes.c:780 +#: builtin/notes.c:788 msgid "abort notes merge" msgstr "abandonner la fusion de notes" -#: builtin/notes.c:857 +#: builtin/notes.c:799 +msgid "cannot mix --commit, --abort or -s/--strategy" +msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles" + +#: builtin/notes.c:804 +msgid "must specify a notes ref to merge" +msgstr "vous devez spécifier une référence de notes à fusionner" + +#: builtin/notes.c:828 +#, c-format +msgid "unknown -s/--strategy: %s" +msgstr "-s/--strategy inconnu : %s" + +#: builtin/notes.c:865 +#, c-format +msgid "a notes merge into %s is already in-progress at %s" +msgstr "une fusion de notes dans %s est déjà en cours avec %s" + +#: builtin/notes.c:868 +#, c-format +msgid "failed to store link to current notes ref (%s)" +msgstr "" +"impossible de stocker le lien vers la référence actuelle aux notes (%s)" + +#: builtin/notes.c:870 #, c-format -msgid "A notes merge into %s is already in-progress at %s" -msgstr "Une fusion de notes dans %s est déjà en cours avec %s" +msgid "" +"Automatic notes merge failed. Fix conflicts in %s and commit the result with " +"'git notes merge --commit', or abort the merge with 'git notes merge --" +"abort'.\n" +msgstr "" +"La fusion automatique des notes a échoué. Corrigez les conflits dans %s et " +"valide le résultat avec 'git notes merges --commit', ou abandonnez la fusion " +"avec 'git notes merge --abort'.\n" -#: builtin/notes.c:884 +#: builtin/notes.c:892 #, c-format msgid "Object %s has no note\n" msgstr "L'objet %s n'a pas de note\n" -#: builtin/notes.c:896 +#: builtin/notes.c:904 msgid "attempt to remove non-existent note is not an error" msgstr "" "la tentative de suppression d'une note non existante n'est pas une erreur" -#: builtin/notes.c:899 +#: builtin/notes.c:907 msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:980 +#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:152 +msgid "do not remove, show only" +msgstr "ne pas supprimer, afficher seulement" + +#: builtin/notes.c:946 +msgid "report pruned notes" +msgstr "afficher les notes éliminées" + +#: builtin/notes.c:988 msgid "notes-ref" msgstr "références-notes" -#: builtin/notes.c:981 +#: builtin/notes.c:989 msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" -#: builtin/notes.c:1016 builtin/remote.c:1628 +#: builtin/notes.c:1024 #, c-format -msgid "Unknown subcommand: %s" -msgstr "Sous-commande inconnue : %s" +msgid "unknown subcommand: %s" +msgstr "sous-commande inconnue : %s" -#: builtin/pack-objects.c:28 +#: builtin/pack-objects.c:48 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [options...] [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:49 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [options...] base-name [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:175 builtin/pack-objects.c:178 +#: builtin/pack-objects.c:414 #, c-format -msgid "deflate error (%d)" -msgstr "erreur de compression (%d)" +msgid "bad packed object CRC for %s" +msgstr "mauvais CRC d'objet empaqueté pour %s" + +#: builtin/pack-objects.c:425 +#, c-format +msgid "corrupt packed object for %s" +msgstr "objet empaqueté corrompu pour %s" + +#: builtin/pack-objects.c:556 +#, c-format +msgid "recursive delta detected for object %s" +msgstr "delta récursif détecté pour l'objet %s" + +#: builtin/pack-objects.c:756 +#, c-format +msgid "ordered %u objects, expected %<PRIu32>" +msgstr "%u objets commandés, %<PRIu32> attendus" -#: builtin/pack-objects.c:763 +#: builtin/pack-objects.c:769 +#, c-format +msgid "packfile is invalid: %s" +msgstr "le fichier packet est invalide : %s" + +#: builtin/pack-objects.c:773 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "ouverture du fichier paquet pour réutilisation impossible : %s" + +#: builtin/pack-objects.c:777 +msgid "unable to seek in reused packfile" +msgstr "impossible de rechercher (seek) dans le fichier paquet réutilisé" + +#: builtin/pack-objects.c:788 +msgid "unable to read from reused packfile" +msgstr "lecture du fichier de paquet réutilisé impossible" + +#: builtin/pack-objects.c:816 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" +msgstr "" +"désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à " +"cause de pack.packSizeLimit" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:829 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1017 +#: builtin/pack-objects.c:891 builtin/update-index.c:88 +#, c-format +msgid "failed to stat %s" +msgstr "échec du stat de %s" + +#: builtin/pack-objects.c:944 +#, c-format +msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" +msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus" + +#: builtin/pack-objects.c:1112 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:2177 +#: builtin/pack-objects.c:1489 +#, 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:1498 +#, 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:1771 +msgid "Counting objects" +msgstr "Décompte des objets" + +#: builtin/pack-objects.c:1913 +#, c-format +msgid "unable to get size of %s" +msgstr "impossible de récupérer la taille de %s" + +#: builtin/pack-objects.c:1928 +#, 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:1995 builtin/pack-objects.c:2011 +#: builtin/pack-objects.c:2021 +#, c-format +msgid "object %s cannot be read" +msgstr "l'objet %s ne peut être lu" + +#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025 +#, c-format +msgid "object %s inconsistent object length (%lu vs %lu)" +msgstr "longueur inconsistante de l'objet %s (%lu contre %lu)" + +#: builtin/pack-objects.c:2035 +msgid "suboptimal pack - out of memory" +msgstr "paquet sous-optimal - mémoire insuffisante" + +#: builtin/pack-objects.c:2366 +#, 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:2502 +#, 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:2586 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2563 +#: builtin/pack-objects.c:2592 +msgid "inconsistency with delta count" +msgstr "inconsistance dans le compte de delta" + +#: builtin/pack-objects.c:2671 +#, c-format +msgid "" +"expected edge object ID, got garbage:\n" +" %s" +msgstr "" +"ID d'objet de bord attendu, reçu des données illisibles :\n" +"%s" + +#: builtin/pack-objects.c:2677 +#, c-format +msgid "" +"expected object ID, got garbage:\n" +" %s" +msgstr "" +"ID d'objet attendu, reçu des données illisibles :\n" +"%s" + +#: builtin/pack-objects.c:2757 +msgid "invalid value for --missing" +msgstr "valeur invalide pour --missing" + +#: builtin/pack-objects.c:2816 builtin/pack-objects.c:2924 +msgid "cannot open pack index" +msgstr "impossible d'ouvrir l'index de paquet" + +#: builtin/pack-objects.c:2847 +#, 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:2932 +msgid "unable to force loose object" +msgstr "impossible de forcer l'objet libre" + +#: builtin/pack-objects.c:3019 +#, c-format +msgid "not a rev '%s'" +msgstr "'%s' n'est pas une révision" + +#: builtin/pack-objects.c:3022 +#, c-format +msgid "bad revision '%s'" +msgstr "mauvaise révision '%s'" + +#: builtin/pack-objects.c:3042 +msgid "unable to add recent objects" +msgstr "impossible d'ajouter les objets récents" + +#: builtin/pack-objects.c:3092 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2567 +#: builtin/pack-objects.c:3096 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2597 +#: builtin/pack-objects.c:3127 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:3129 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:3131 msgid "show progress meter during object writing phase" msgstr "afficher la barre de progression durant la phase d'écrite des objets" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:3134 msgid "similar to --all-progress when progress meter is shown" msgstr "similaire à --all-progress quand la barre de progression est affichée" -#: builtin/pack-objects.c:2605 -msgid "version[,offset]" -msgstr "version[,offset]" +#: builtin/pack-objects.c:3135 +msgid "<version>[,<offset>]" +msgstr "<version>[,<décalage>]" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:3136 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:2609 +#: builtin/pack-objects.c:3139 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:3141 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2613 +#: builtin/pack-objects.c:3143 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:3145 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2617 +#: builtin/pack-objects.c:3147 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:2619 +#: builtin/pack-objects.c:3149 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:2621 +#: builtin/pack-objects.c:3151 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:3153 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:3155 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2627 +#: builtin/pack-objects.c:3157 msgid "use threads when searching for best delta matches" msgstr "" "utiliser des fils lors de la recherche pour une meilleurs correspondance des " "deltas" -#: builtin/pack-objects.c:2629 +#: builtin/pack-objects.c:3159 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:3161 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2633 +#: builtin/pack-objects.c:3163 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:2636 +#: builtin/pack-objects.c:3166 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:3169 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:2642 +#: builtin/pack-objects.c:3172 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:3175 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:3177 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:2649 +#: builtin/pack-objects.c:3179 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2650 parse-options.h:142 -msgid "time" -msgstr "heure" +#: builtin/pack-objects.c:3181 +msgid "pack loose unreachable objects" +msgstr "empaqueter les objets inaccessibles détachés" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:3183 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:3186 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:2656 +#: builtin/pack-objects.c:3188 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:2658 +#: builtin/pack-objects.c:3190 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:2660 +#: builtin/pack-objects.c:3192 +msgid "ignore this pack" +msgstr "ignorer ce paquet" + +#: builtin/pack-objects.c:3194 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:2662 +#: builtin/pack-objects.c:3196 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:2664 +#: builtin/pack-objects.c:3198 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:2666 +#: builtin/pack-objects.c:3200 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:2757 -msgid "Counting objects" -msgstr "Décompte des objets" +#: builtin/pack-objects.c:3203 +msgid "handling for missing objects" +msgstr "gestion des objets manquants" + +#: builtin/pack-objects.c:3206 +msgid "do not pack objects in promisor packfiles" +msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs" -#: builtin/pack-refs.c:6 +#: builtin/pack-objects.c:3230 +#, 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:3235 +#, c-format +msgid "pack.deltaCacheLimit is too high, forcing %d" +msgstr "pack.deltaCacheLimit est trop grand, forcé à %d" + +#: builtin/pack-objects.c:3291 +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:3293 +msgid "minimum pack size limit is 1 MiB" +msgstr "la taille limite minimale d'un paquet est 1 MiB" + +#: builtin/pack-objects.c:3298 +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:3301 +msgid "--keep-unreachable and --unpack-unreachable are incompatible" +msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles" + +#: builtin/pack-objects.c:3307 +msgid "cannot use --filter without --stdout" +msgstr "impossible d'utiliser --filter sans --stdout" + +#: builtin/pack-objects.c:3363 +msgid "Enumerating objects" +msgstr "Énumération des objets" + +#: builtin/pack-objects.c:3382 +#, c-format +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgstr "" +"Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>)" + +#: builtin/pack-refs.c:7 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<options>]" -#: builtin/pack-refs.c:14 +#: builtin/pack-refs.c:15 msgid "pack everything" msgstr "empaqueter tout" -#: builtin/pack-refs.c:15 +#: builtin/pack-refs.c:16 msgid "prune loose refs (default)" msgstr "éliminer les références perdues (défaut)" -#: builtin/prune-packed.c:7 +#: builtin/prune-packed.c:9 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:40 +#: builtin/prune-packed.c:42 msgid "Removing duplicate objects" msgstr "Suppression des objets dupliqués" -#: builtin/prune.c:11 -msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" -msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]" +#: builtin/prune.c:12 +msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" +msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>…]" -#: builtin/prune.c:105 builtin/worktree.c:125 -msgid "do not remove, show only" -msgstr "ne pas supprimer, afficher seulement" - -#: builtin/prune.c:106 builtin/worktree.c:126 +#: builtin/prune.c:109 msgid "report pruned objects" msgstr "afficher les objets éliminés" -#: builtin/prune.c:109 builtin/worktree.c:128 +#: builtin/prune.c:112 msgid "expire objects older than <time>" msgstr "faire expirer les objets plus vieux que <heure>" -#: builtin/prune.c:123 +#: builtin/prune.c:114 +msgid "limit traversal to objects outside promisor packfiles" +msgstr "limiter la traversée aux objets hors des fichiers paquets prometteurs" + +#: builtin/prune.c:128 msgid "cannot prune in a precious-objects repo" msgstr "impossible de nettoyer dans un dépôt d'objets précieux" -#: builtin/pull.c:72 +#: builtin/pull.c:59 builtin/pull.c:61 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Valeur invalide pour %s : %s" + +#: builtin/pull.c:81 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/pull.c:120 +#: builtin/pull.c:132 +msgid "control for recursive fetching of submodules" +msgstr "contrôler la récupération récursive dans les sous-modules" + +#: builtin/pull.c:136 msgid "Options related to merging" msgstr "Options relatives à la fusion" -#: builtin/pull.c:123 +#: builtin/pull.c:139 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" -#: builtin/pull.c:147 builtin/revert.c:105 +#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" -#: builtin/pull.c:153 -msgid "verify that the named commit has a valid GPG signature" -msgstr "vérifier que le commit nommé a une signature GPG valide" - -#: builtin/pull.c:156 +#: builtin/pull.c:175 msgid "automatically stash/stash pop before and after rebase" msgstr "remiser avant et réappliquer après le rebasage automatiquement" -#: builtin/pull.c:172 +#: builtin/pull.c:191 msgid "Options related to fetching" msgstr "Options relatives au rapatriement" -#: builtin/pull.c:194 +#: builtin/pull.c:209 msgid "number of submodules pulled in parallel" msgstr "nombre de sous-modules tirés en parallèle" -#: builtin/pull.c:283 +#: builtin/pull.c:304 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valeur invalide pour pull.ff : %s" -#: builtin/pull.c:379 -msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "" -"impossible de tirer avec rebasage. Vous avez des modifications non indexées." - -#: builtin/pull.c:385 -msgid "Additionally, your index contains uncommitted changes." -msgstr "De plus, votre index contient des modifications non validées." - -#: builtin/pull.c:387 -msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "" -"impossible de tirer avec rebasage : votre index contient des modifications " -"non validées." - -#: builtin/pull.c:463 +#: builtin/pull.c:420 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9462,14 +13959,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:465 +#: builtin/pull.c:422 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:466 +#: builtin/pull.c:423 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -9477,7 +13974,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:469 +#: builtin/pull.c:426 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -9489,42 +13986,44 @@ msgstr "" "configuration\n" "pour la branche actuelle, vous devez spécifier la branche avec la commande." -#: builtin/pull.c:474 git-parse-remote.sh:73 +#: builtin/pull.c:431 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Vous n'êtes actuellement sur aucune branche." -#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 +#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser." -#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 +#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Veuillez spécifier une branche avec laquelle fusionner." -#: builtin/pull.c:479 builtin/pull.c:494 +#: builtin/pull.c:436 builtin/pull.c:451 msgid "See git-pull(1) for details." msgstr "Référez-vous à git-pull(1) pour de plus amples détails." -#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<distant>" -#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branche>" -#: builtin/pull.c:489 git-parse-remote.sh:75 +#: builtin/pull.c:446 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Pas d'information de suivi distant pour la branche actuelle." -#: builtin/pull.c:498 git-parse-remote.sh:95 +#: builtin/pull.c:455 git-parse-remote.sh:95 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 :" +msgstr "" +"Si vous souhaitez indiquer l'information de suivi distant pour cette " +"branche, vous pouvez le faire avec :" -#: builtin/pull.c:503 +#: builtin/pull.c:460 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -9534,17 +14033,29 @@ msgstr "" "'%s'\n" "du serveur distant, mais cette référence n'a pas été récupérée." -#: builtin/pull.c:864 +#: builtin/pull.c:829 +msgid "ignoring --verify-signatures for rebase" +msgstr "--verify-signatures est ignoré pour un rebasage" + +#: builtin/pull.c:877 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase." -#: builtin/pull.c:872 +#: builtin/pull.c:885 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:900 +#: builtin/pull.c:888 +msgid "pull with rebase" +msgstr "tirer avec un rebasage" + +#: builtin/pull.c:889 +msgid "please commit or stash them." +msgstr "veuillez les valider ou les remiser." + +#: builtin/pull.c:914 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -9555,7 +14066,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:905 +#: builtin/pull.c:919 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -9566,34 +14077,39 @@ msgid "" "to recover." msgstr "" "Avance rapide de votre arbre de travail impossible.\n" -"Après vous être assuré que toute modification précieuse a été sauvegardée " -"avec\n" +"Après avoir vérifié que toute modification précieuse a été sauvegardée avec\n" "$ git diff %s\n" "lancez\n" "$ git reset --hard\n" "pour régénérer." -#: builtin/pull.c:920 +#: builtin/pull.c:934 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tête vide." -#: builtin/pull.c:924 +#: builtin/pull.c:938 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." -#: builtin/push.c:16 +#: builtin/pull.c:945 +msgid "cannot rebase with locally recorded submodule modifications" +msgstr "" +"impossible de rebaser avec des modifications de sous-modules enregistrées " +"localement" + +#: builtin/push.c:19 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/push.c:89 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "raccourci d'étiquette sans <étiquette>" -#: builtin/push.c:99 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "--delete accepte seulement des noms entiers de références cibles" -#: builtin/push.c:143 +#: builtin/push.c:165 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -9602,7 +14118,7 @@ msgstr "" "Pour choisir l'option de manière permanente, voir push.default dans 'git " "help config'." -#: builtin/push.c:146 +#: builtin/push.c:168 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -9627,7 +14143,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:161 +#: builtin/push.c:183 #, c-format msgid "" "You are not currently on a branch.\n" @@ -9642,7 +14158,7 @@ msgstr "" "\n" " git push %s HEAD:<nom-de-la-branche-amont>\n" -#: builtin/push.c:175 +#: builtin/push.c:197 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -9656,13 +14172,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:183 +#: builtin/push.c:205 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "La branche courante %s a de multiples branches amont, impossible de pousser." -#: builtin/push.c:186 +#: builtin/push.c:208 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -9673,14 +14189,14 @@ msgstr "" "pas une branche amont de votre branche courante '%s', sans me dire\n" "quoi pousser pour mettre à jour quelle branche amont." -#: builtin/push.c:242 +#: builtin/push.c:267 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Vous n'avez pas spécifié de spécifications de référence à pousser, et push." "default est \"nothing\"." -#: builtin/push.c:249 +#: builtin/push.c:274 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -9695,7 +14211,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:255 +#: builtin/push.c:280 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -9710,7 +14226,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:261 +#: builtin/push.c:286 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -9728,13 +14244,13 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:268 +#: builtin/push.c:293 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Les mises à jour ont été rejetées car l'étiquette existe déjà dans la " "branche distante." -#: builtin/push.c:271 +#: builtin/push.c:296 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -9746,22 +14262,22 @@ msgstr "" "pointer\n" "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" -#: builtin/push.c:331 +#: builtin/push.c:357 #, c-format msgid "Pushing to %s\n" msgstr "Poussée vers %s\n" -#: builtin/push.c:335 +#: builtin/push.c:361 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:365 +#: builtin/push.c:395 #, c-format msgid "bad repository '%s'" msgstr "mauvais dépôt '%s'" -#: builtin/push.c:366 +#: builtin/push.c:396 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -9783,105 +14299,147 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:381 -msgid "--all and --tags are incompatible" -msgstr "--all et --tags sont incompatibles" - -#: builtin/push.c:382 -msgid "--all can't be combined with refspecs" -msgstr "--all ne peut pas être combiné avec des spécifications de référence" - -#: builtin/push.c:387 -msgid "--mirror and --tags are incompatible" -msgstr "--mirror et --tags sont incompatibles" - -#: builtin/push.c:388 -msgid "--mirror can't be combined with refspecs" -msgstr "--mirror ne peut pas être combiné avec des spécifications de référence" - -#: builtin/push.c:393 -msgid "--all and --mirror are incompatible" -msgstr "--all et --mirror sont incompatibles" - -#: builtin/push.c:505 +#: builtin/push.c:551 msgid "repository" msgstr "dépôt" -#: builtin/push.c:506 builtin/send-pack.c:161 +#: builtin/push.c:552 builtin/send-pack.c:164 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:507 builtin/send-pack.c:163 +#: builtin/push.c:553 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:509 +#: builtin/push.c:555 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:510 +#: builtin/push.c:556 msgid "push tags (can't be used with --all or --mirror)" msgstr "" "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)" -#: builtin/push.c:513 builtin/send-pack.c:164 +#: builtin/push.c:559 builtin/send-pack.c:167 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:515 builtin/send-pack.c:175 -msgid "refname>:<expect" -msgstr "nom de référence>:<attendu" +#: builtin/push.c:561 builtin/send-pack.c:181 +msgid "<refname>:<expect>" +msgstr "<nom-de-ref>:<attendu>" -#: builtin/push.c:516 builtin/send-pack.c:176 +#: builtin/push.c:562 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur" -#: builtin/push.c:519 +#: builtin/push.c:565 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:521 builtin/send-pack.c:169 +#: builtin/push.c:567 builtin/send-pack.c:175 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158 -#: builtin/send-pack.c:159 +#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161 +#: builtin/send-pack.c:162 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:524 +#: builtin/push.c:570 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:527 +#: builtin/push.c:573 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:529 +#: builtin/push.c:575 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:530 +#: builtin/push.c:576 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:533 builtin/send-pack.c:166 +#: builtin/push.c:579 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "signer la poussée avec GPG" -#: builtin/push.c:535 builtin/send-pack.c:170 +#: builtin/push.c:581 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "demande une transaction atomique sur le serveur distant" -#: builtin/push.c:549 +#: builtin/push.c:599 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:551 +#: builtin/push.c:601 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" -#: builtin/read-tree.c:37 +#: builtin/push.c:604 +msgid "--all and --tags are incompatible" +msgstr "--all et --tags sont incompatibles" + +#: builtin/push.c:606 +msgid "--all can't be combined with refspecs" +msgstr "--all ne peut pas être combiné avec des spécifications de référence" + +#: builtin/push.c:610 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror et --tags sont incompatibles" + +#: builtin/push.c:612 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror ne peut pas être combiné avec des spécifications de référence" + +#: builtin/push.c:615 +msgid "--all and --mirror are incompatible" +msgstr "--all et --mirror sont incompatibles" + +#: builtin/push.c:634 +msgid "push options must not have new line characters" +msgstr "" +"les options de poussée ne peuvent pas contenir de caractères de nouvelle " +"ligne" + +#: builtin/range-diff.c:8 +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 +msgid "git range-diff [<options>] <old-tip>...<new-tip>" +msgstr "git range-diff [<options>] <ancien-sommet>...<nouveau-sommet>" + +#: builtin/range-diff.c:10 +msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" +msgstr "git range-diff [<options>] <base> <ancien-sommet> <nouveau-sommet>" + +#: builtin/range-diff.c:26 +msgid "Percentage by which creation is weighted" +msgstr "Pourcentage par lequel la création est pondérée" + +#: builtin/range-diff.c:28 +#, fuzzy +msgid "use simple diff colors" +msgstr "utiliser des couleurs de diff simples" + +#: builtin/range-diff.c:75 builtin/range-diff.c:79 +#, c-format +msgid "no .. in range: '%s'" +msgstr "pas de .. dans la plage : '%s'" + +#: builtin/range-diff.c:89 +msgid "single arg format must be symmetric range" +msgstr "un format d'argument unique doit être une plage symétrique" + +#: builtin/range-diff.c:104 +msgid "need two commit ranges" +msgstr "plage entre deux commits requise" + +#: builtin/read-tree.c:40 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" @@ -9892,97 +14450,202 @@ msgstr "" "sparse-checkout] [--index-output=<fichier>] (--empty | <arbre ou apparenté " "1> [<arbre ou apparenté 2> [<arbre ou apparenté 3>]])" -#: builtin/read-tree.c:110 +#: builtin/read-tree.c:120 msgid "write resulting index to <file>" msgstr "écrire l'index résultant dans <fichier>" -#: builtin/read-tree.c:113 +#: builtin/read-tree.c:123 msgid "only empty the index" msgstr "juste vider l'index" -#: builtin/read-tree.c:115 +#: builtin/read-tree.c:125 msgid "Merging" msgstr "Fusion" -#: builtin/read-tree.c:117 +#: builtin/read-tree.c:127 msgid "perform a merge in addition to a read" msgstr "effectuer une fusion en plus d'une lecture" -#: builtin/read-tree.c:119 +#: builtin/read-tree.c:129 msgid "3-way merge if no file level merging required" msgstr "fusion à 3 points si aucune fusion de niveau fichier n'est requise" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:131 msgid "3-way merge in presence of adds and removes" msgstr "fusion à 3 points en présence d'ajouts et suppressions" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c:133 msgid "same as -m, but discard unmerged entries" msgstr "comme -m, mais annule les éléments non fusionnés" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:134 msgid "<subdirectory>/" msgstr "<sous-répertoire>/" -#: builtin/read-tree.c:125 +#: builtin/read-tree.c:135 msgid "read the tree into the index under <subdirectory>/" msgstr "lire l'arbre dans l'index dans <sous-répertoire>/" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:138 msgid "update working tree with merge result" msgstr "mettre à jour la copie de travail avec le résultat de la fusion" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:140 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:131 +#: builtin/read-tree.c:141 msgid "allow explicitly ignored files to be overwritten" msgstr "autoriser explicitement les fichiers ignorés à être écrasés" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:144 msgid "don't check the working tree after merging" msgstr "ne pas vérifier la copie de travail après la fusion" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:145 msgid "don't update the index or the work tree" msgstr "ne pas mettre à jour l'index ou la copie de travail" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c:147 msgid "skip applying sparse checkout filter" msgstr "sauter l'application du filtre d'extraction creuse" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:149 msgid "debug unpack-trees" msgstr "déboguer unpack-trees" -#: builtin/receive-pack.c:25 +#: builtin/rebase--helper.c:8 +msgid "git rebase--helper [<options>]" +msgstr "git rebase-helper [<options>]" + +#: builtin/rebase--helper.c:24 +msgid "keep empty commits" +msgstr "garder les validations vides" + +#: builtin/rebase--helper.c:26 builtin/revert.c:124 +msgid "allow commits with empty messages" +msgstr "autoriser les validations avec des messages vides" + +#: builtin/rebase--helper.c:27 +msgid "rebase merge commits" +msgstr "rebaser les commits de fusion" + +#: builtin/rebase--helper.c:29 +msgid "keep original branch points of cousins" +msgstr "conserver les points de branchement de cousins originaux" + +#: builtin/rebase--helper.c:30 +msgid "continue rebase" +msgstr "continuer le rebasage" + +#: builtin/rebase--helper.c:32 +msgid "abort rebase" +msgstr "abandonner le rebasage" + +#: builtin/rebase--helper.c:35 +msgid "make rebase script" +msgstr "créer les script de rebasage" + +#: builtin/rebase--helper.c:37 +msgid "shorten commit ids in the todo list" +msgstr "raccourcir les identifiants de commits dans la liste à-faire" + +#: builtin/rebase--helper.c:39 +msgid "expand commit ids in the todo list" +msgstr "étendre les identifiants de commit dans la liste à-faire" + +#: builtin/rebase--helper.c:41 +msgid "check the todo list" +msgstr "vérifier la liste à-faire" + +#: builtin/rebase--helper.c:43 +msgid "skip unnecessary picks" +msgstr "éviter les commandes de picorage non nécessaires" + +#: builtin/rebase--helper.c:45 +msgid "rearrange fixup/squash lines" +msgstr "réarranger les lignes fixup/squash" + +#: builtin/rebase--helper.c:47 +msgid "insert exec commands in todo list" +msgstr "insérer les commandes exec dans la liste à-faire" + +#: builtin/rebase--helper.c:68 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges" + +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <répertoire-git>" -#: builtin/receive-pack.c:1719 +#: builtin/receive-pack.c:830 +msgid "" +"By default, updating the current branch in a non-bare repository\n" +"is denied, because it will make the index and work tree inconsistent\n" +"with what you pushed, and will require 'git reset --hard' to match\n" +"the work tree to HEAD.\n" +"\n" +"You can set the 'receive.denyCurrentBranch' configuration variable\n" +"to 'ignore' or 'warn' in the remote repository to allow pushing into\n" +"its current branch; however, this is not recommended unless you\n" +"arranged to update its work tree to match what you pushed in some\n" +"other way.\n" +"\n" +"To squelch this message and still keep the default behaviour, set\n" +"'receive.denyCurrentBranch' configuration variable to 'refuse'." +msgstr "" +"Par défaut, mettre à jour la branche actuelle dans un dépôt non-nu\n" +"est réfusé parce que cela rendrait l'index et la copie de travail\n" +"inconsistants avec ce que vous avez poussé et nécessiterait\n" +"'git reset --hard' pour réaligner la copie de travail avec HEAD.\n" +"\n" +"Vous pouvez régler « receive.denyCurrentBranch » à 'ignore' ou\n" +"'warn' dans le dépôt distant pour permettre la poussée dans la\n" +"branche actuelle ; cependant, ce n'est pas recommandé à moins que\n" +"vous ayez déjà mis à jour sa copie de travail par une moyen détourné\n" +"pour correspondre à ce que vous avez poussé.\n" +"\n" +"Pour éliminer ce message et conserver le comportement par défaut,\n" +"réglez « receive.denyCurrentBranch » à 'refuse'." + +#: builtin/receive-pack.c:850 +msgid "" +"By default, deleting the current branch is denied, because the next\n" +"'git clone' won't result in any file checked out, causing confusion.\n" +"\n" +"You can set 'receive.denyDeleteCurrent' configuration variable to\n" +"'warn' or 'ignore' in the remote repository to allow deleting the\n" +"current branch, with or without a warning message.\n" +"\n" +"To squelch this message, you can set it to 'refuse'." +msgstr "" +"Par défaut, supprimer la branche actuelle est refusé parce que le\n" +"prochain 'git clone' n'extraira aucun fichier et causer de la confusion.\n" +"\n" +"Vous pouvez régler « receive.denyDeleteCurrent » à 'warn' ou 'ignore'\n" +"dans le dépôt distant pour permettre la suppression la branche actuelle\n" +"avec ou sans message d'avertissement.\n" +"\n" +"Pour éliminer ce message, réglez-le à 'refuse'." + +#: builtin/receive-pack.c:1923 msgid "quiet" msgstr "quiet" -#: builtin/receive-pack.c:1733 +#: builtin/receive-pack.c:1937 msgid "You must specify a directory." msgstr "Vous devez spécifier un répertoire." -#: builtin/reflog.c:423 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "'%s' pour '%s' n'est pas un horodatage valide" - -#: builtin/reflog.c:540 builtin/reflog.c:545 +#: builtin/reflog.c:536 builtin/reflog.c:541 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' n'est pas un horodatage valide" -#: builtin/remote.c:12 +#: builtin/remote.c:15 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:13 +#: builtin/remote.c:16 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -9990,83 +14653,83 @@ msgstr "" "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nom> <url>" -#: builtin/remote.c:14 builtin/remote.c:34 +#: builtin/remote.c:17 builtin/remote.c:37 msgid "git remote rename <old> <new>" msgstr "git remote rename <ancienne> <nouvelle>" -#: builtin/remote.c:15 builtin/remote.c:39 +#: builtin/remote.c:18 builtin/remote.c:42 msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: builtin/remote.c:16 builtin/remote.c:44 +#: builtin/remote.c:19 builtin/remote.c:47 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)" -#: builtin/remote.c:17 +#: builtin/remote.c:20 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nom>" -#: builtin/remote.c:18 +#: builtin/remote.c:21 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nom>" -#: builtin/remote.c:19 +#: builtin/remote.c:22 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<groupe> | " "<distante>)...]" -#: builtin/remote.c:20 +#: builtin/remote.c:23 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nom> <branche>..." -#: builtin/remote.c:21 builtin/remote.c:70 +#: builtin/remote.c:24 builtin/remote.c:73 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nom>" -#: builtin/remote.c:22 builtin/remote.c:75 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nom> <nouvelle-URL>" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nom> <URL>" -#: builtin/remote.c:29 +#: builtin/remote.c:32 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<options>] <nom> <URL>" -#: builtin/remote.c:49 +#: builtin/remote.c:52 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branche>..." -#: builtin/remote.c:50 +#: builtin/remote.c:53 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nom> <branche>..." -#: builtin/remote.c:55 +#: builtin/remote.c:58 msgid "git remote show [<options>] <name>" msgstr "git remote show [<options>] <nom>" -#: builtin/remote.c:60 +#: builtin/remote.c:63 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<options>] <nom>" -#: builtin/remote.c:65 +#: builtin/remote.c:68 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<options>] [<groupe> | <distante>]..." -#: builtin/remote.c:94 +#: builtin/remote.c:97 #, c-format msgid "Updating %s" msgstr "Mise à jour de %s" -#: builtin/remote.c:126 +#: builtin/remote.c:129 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -10074,92 +14737,88 @@ msgstr "" "--mirror est dangereux et obsolète ; merci\n" "\t d'utiliser --mirror=fetch ou --mirror=push à la place" -#: builtin/remote.c:143 +#: builtin/remote.c:146 #, c-format msgid "unknown mirror argument: %s" msgstr "argument miroir inconnu : %s" -#: builtin/remote.c:159 +#: builtin/remote.c:162 msgid "fetch the remote branches" msgstr "rapatrier les branches distantes" -#: builtin/remote.c:161 +#: builtin/remote.c:164 msgid "import all tags and associated objects when fetching" msgstr "" "importer toutes les étiquettes et les objets associés lors du rapatriement" -#: builtin/remote.c:164 +#: builtin/remote.c:167 msgid "or do not fetch any tag at all (--no-tags)" msgstr "ou ne rapatrier aucune étiquette (--no-tags)" -#: builtin/remote.c:166 +#: builtin/remote.c:169 msgid "branch(es) to track" msgstr "branche(s) à suivre" -#: builtin/remote.c:167 +#: builtin/remote.c:170 msgid "master branch" msgstr "branche maîtresse" -#: builtin/remote.c:168 -msgid "push|fetch" -msgstr "push|fetch" - -#: builtin/remote.c:169 +#: builtin/remote.c:172 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis" -#: builtin/remote.c:181 +#: builtin/remote.c:184 msgid "specifying a master branch makes no sense with --mirror" msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror" -#: builtin/remote.c:183 +#: builtin/remote.c:186 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "spécifier les branches à suivre n'a de sens qu'avec des miroirs de " "rapatriement" -#: builtin/remote.c:190 builtin/remote.c:633 +#: builtin/remote.c:193 builtin/remote.c:635 #, c-format msgid "remote %s already exists." msgstr "la distante %s existe déjà." -#: builtin/remote.c:194 builtin/remote.c:637 +#: builtin/remote.c:197 builtin/remote.c:639 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' n'est pas un nom valide de distante" -#: builtin/remote.c:234 +#: builtin/remote.c:237 #, c-format msgid "Could not setup master '%s'" msgstr "Impossible de paramétrer la maîtresse '%s'" -#: builtin/remote.c:336 +#: builtin/remote.c:343 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" "Impossible d'obtenir une correspondance distante pour la spécification de " "référence %s" -#: builtin/remote.c:437 builtin/remote.c:445 +#: builtin/remote.c:442 builtin/remote.c:450 msgid "(matching)" msgstr "(correspond)" -#: builtin/remote.c:449 +#: builtin/remote.c:454 msgid "(delete)" msgstr "(supprimer)" -#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858 +#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863 #, c-format msgid "No such remote: %s" msgstr "Distante inconnue : %s" -#: builtin/remote.c:643 +#: builtin/remote.c:645 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Impossible de renommer la section de configuration '%s' en '%s'" -#: builtin/remote.c:663 +#: builtin/remote.c:665 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -10170,17 +14829,17 @@ msgstr "" "\t%s\n" "\tVeuillez mettre à jour la configuration manuellement si nécessaire." -#: builtin/remote.c:699 +#: builtin/remote.c:701 #, c-format msgid "deleting '%s' failed" msgstr "échec de suppression de '%s'" -#: builtin/remote.c:733 +#: builtin/remote.c:735 #, c-format msgid "creating '%s' failed" msgstr "échec de création de '%s'" -#: builtin/remote.c:796 +#: builtin/remote.c:801 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -10195,127 +14854,144 @@ msgstr[1] "" "supprimées ;\n" "pour les supprimer, utilisez :" -#: builtin/remote.c:810 +#: builtin/remote.c:815 #, c-format msgid "Could not remove config section '%s'" msgstr "Impossible de supprimer la section de configuration '%s'" -#: builtin/remote.c:911 +#: builtin/remote.c:916 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)" -#: builtin/remote.c:914 +#: builtin/remote.c:919 msgid " tracked" msgstr " suivi" -#: builtin/remote.c:916 +#: builtin/remote.c:921 msgid " stale (use 'git remote prune' to remove)" msgstr " dépassé (utilisez 'git remote prune' pour supprimer)" -#: builtin/remote.c:918 +#: builtin/remote.c:923 msgid " ???" msgstr " ???" -#: builtin/remote.c:959 +#: builtin/remote.c:964 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche" -#: builtin/remote.c:967 +#: builtin/remote.c:973 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebase de manière interactive sur la distante %s" -#: builtin/remote.c:971 +#: builtin/remote.c:975 +#, c-format +msgid "rebases interactively (with merges) onto remote %s" +msgstr "rebase de manière interactive (avec fusions) sur la distante %s" + +#: builtin/remote.c:978 +#, c-format +msgid "rebases onto remote %s" +msgstr "rebase sur la distante %s" + +#: builtin/remote.c:982 #, c-format msgid " merges with remote %s" msgstr " fusionne avec la distante %s" -#: builtin/remote.c:972 -msgid " and with remote" -msgstr " et avec la distante" - -#: builtin/remote.c:974 +#: builtin/remote.c:985 #, c-format msgid "merges with remote %s" msgstr "fusionne avec la distante %s" -#: builtin/remote.c:975 -msgid " and with remote" -msgstr " et avec la distante" +#: builtin/remote.c:988 +#, c-format +msgid "%-*s and with remote %s\n" +msgstr "%-*s et avec la distante %s\n" -#: builtin/remote.c:1021 +#: builtin/remote.c:1031 msgid "create" msgstr "créer" -#: builtin/remote.c:1024 +#: builtin/remote.c:1034 msgid "delete" msgstr "supprimer" -#: builtin/remote.c:1028 +#: builtin/remote.c:1038 msgid "up to date" msgstr "à jour" -#: builtin/remote.c:1031 +#: builtin/remote.c:1041 msgid "fast-forwardable" msgstr "peut être mis à jour en avance rapide" -#: builtin/remote.c:1034 +#: builtin/remote.c:1044 msgid "local out of date" msgstr "le local n'est pas à jour" -#: builtin/remote.c:1041 +#: builtin/remote.c:1051 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s force vers %-*s (%s)" -#: builtin/remote.c:1044 +#: builtin/remote.c:1054 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s pousse vers %-*s (%s)" -#: builtin/remote.c:1048 +#: builtin/remote.c:1058 #, c-format msgid " %-*s forces to %s" msgstr " %-*s force vers %s" -#: builtin/remote.c:1051 +#: builtin/remote.c:1061 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s pousse vers %s" -#: builtin/remote.c:1119 +#: builtin/remote.c:1129 msgid "do not query remotes" msgstr "ne pas interroger les distantes" -#: builtin/remote.c:1146 +#: builtin/remote.c:1156 #, c-format msgid "* remote %s" msgstr "* distante %s" -#: builtin/remote.c:1147 +#: builtin/remote.c:1157 #, c-format msgid " Fetch URL: %s" msgstr " URL de rapatriement : %s" -#: builtin/remote.c:1148 builtin/remote.c:1301 +#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 msgid "(no URL)" msgstr "(pas d'URL)" -#. TRANSLATORS: the colon ':' should align with -#. the one in " Fetch URL: %s" translation -#: builtin/remote.c:1159 builtin/remote.c:1161 +#. TRANSLATORS: the colon ':' should align +#. with the one in " Fetch URL: %s" +#. translation. +#. +#: builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " Push URL: %s" msgstr " URL push : %s" -#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 +#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 #, c-format msgid " HEAD branch: %s" msgstr " Branche HEAD : %s" -#: builtin/remote.c:1169 +#: builtin/remote.c:1176 +msgid "(not queried)" +msgstr "(non demandé)" + +#: builtin/remote.c:1178 +msgid "(unknown)" +msgstr "(inconnu)" + +#: builtin/remote.c:1182 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -10323,275 +14999,408 @@ msgstr "" " Branche HEAD (la HEAD distante est ambiguë, peut être l'une des " "suivantes) :\n" -#: builtin/remote.c:1181 +#: builtin/remote.c:1194 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branche distante :%s" msgstr[1] " Branches distantes :%s" -#: builtin/remote.c:1184 builtin/remote.c:1211 +#: builtin/remote.c:1197 builtin/remote.c:1223 msgid " (status not queried)" -msgstr " (statut non demandé)" +msgstr " (état non demandé)" -#: builtin/remote.c:1193 +#: builtin/remote.c:1206 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branche locale configurée pour 'git pull' :" msgstr[1] " Branches locales configurées pour 'git pull' :" -#: builtin/remote.c:1201 +#: builtin/remote.c:1214 msgid " Local refs will be mirrored by 'git push'" msgstr " Les références locales seront reflétées par 'git push'" -#: builtin/remote.c:1208 +#: builtin/remote.c:1220 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Référence locale configurée pour 'git push'%s :" msgstr[1] " Références locales configurées pour 'git push'%s :" -#: builtin/remote.c:1229 +#: builtin/remote.c:1241 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "définir refs/remotes/<nom>/HEAD selon la distante" -#: builtin/remote.c:1231 +#: builtin/remote.c:1243 msgid "delete refs/remotes/<name>/HEAD" msgstr "supprimer refs/remotes/<nom>/HEAD" -#: builtin/remote.c:1246 +#: builtin/remote.c:1258 msgid "Cannot determine remote HEAD" msgstr "Impossible de déterminer la HEAD distante" -#: builtin/remote.c:1248 +#: builtin/remote.c:1260 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Il y a de multiples branches HEAD distantes. Veuillez en choisir une " "explicitement avec :" -#: builtin/remote.c:1258 +#: builtin/remote.c:1270 #, c-format msgid "Could not delete %s" msgstr "Impossible de supprimer %s" -#: builtin/remote.c:1266 +#: builtin/remote.c:1278 #, c-format msgid "Not a valid ref: %s" msgstr "Référence non valide : %s" -#: builtin/remote.c:1268 +#: builtin/remote.c:1280 #, c-format msgid "Could not setup %s" msgstr "Impossible de paramétrer %s" -#: builtin/remote.c:1286 +#: builtin/remote.c:1298 #, c-format msgid " %s will become dangling!" msgstr " %s se retrouvera en suspens !" -#: builtin/remote.c:1287 +#: builtin/remote.c:1299 #, c-format msgid " %s has become dangling!" msgstr " %s se retrouve en suspens !" -#: builtin/remote.c:1297 +#: builtin/remote.c:1309 #, c-format msgid "Pruning %s" msgstr "Élimination de %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1310 #, c-format msgid "URL: %s" msgstr "URL : %s" -#: builtin/remote.c:1314 +#: builtin/remote.c:1326 #, c-format msgid " * [would prune] %s" msgstr " * [serait éliminé] %s" -#: builtin/remote.c:1317 +#: builtin/remote.c:1329 #, c-format msgid " * [pruned] %s" msgstr " * [éliminé] %s" -#: builtin/remote.c:1362 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "éliminer les distants après le rapatriement" -#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 +#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 #, c-format msgid "No such remote '%s'" msgstr "Pas de serveur remote '%s'" -#: builtin/remote.c:1441 +#: builtin/remote.c:1453 msgid "add branch" msgstr "ajouter une branche" -#: builtin/remote.c:1448 +#: builtin/remote.c:1460 msgid "no remote specified" msgstr "pas de serveur distant spécifié" -#: builtin/remote.c:1465 +#: builtin/remote.c:1477 msgid "query push URLs rather than fetch URLs" msgstr "interroger les URLs de poussée plutôt que les URLs de récupération" -#: builtin/remote.c:1467 +#: builtin/remote.c:1479 msgid "return all URLs" msgstr "retourner toutes les URLs" -#: builtin/remote.c:1495 +#: builtin/remote.c:1507 #, c-format msgid "no URLs configured for remote '%s'" msgstr "aucune URL configurée pour le dépôt distant '%s'" -#: builtin/remote.c:1521 +#: builtin/remote.c:1533 msgid "manipulate push URLs" msgstr "manipuler les URLs push" -#: builtin/remote.c:1523 +#: builtin/remote.c:1535 msgid "add URL" msgstr "ajouter une URL" -#: builtin/remote.c:1525 +#: builtin/remote.c:1537 msgid "delete URLs" msgstr "supprimer des URLs" -#: builtin/remote.c:1532 +#: builtin/remote.c:1544 msgid "--add --delete doesn't make sense" msgstr "--add --delete n'a aucun sens" -#: builtin/remote.c:1573 +#: builtin/remote.c:1583 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Motif d'URL ancien invalide : %s" -#: builtin/remote.c:1581 +#: builtin/remote.c:1591 #, c-format msgid "No such URL found: %s" msgstr "Pas d'URL trouvée : %s" -#: builtin/remote.c:1583 +#: builtin/remote.c:1593 msgid "Will not delete all non-push URLs" msgstr "Pas de suppression de toutes les URLs non-push" -#: builtin/remote.c:1597 +#: builtin/remote.c:1609 msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" -#: builtin/repack.c:17 +#: builtin/remote.c:1640 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Sous-commande inconnue : %s" + +#: builtin/repack.c:20 msgid "git repack [<options>]" msgstr "git repack [<options>]" -#: builtin/repack.c:159 +#: builtin/repack.c:25 +msgid "" +"Incremental repacks are incompatible with bitmap indexes. Use\n" +"--no-write-bitmap-index or disable the pack.writebitmaps configuration." +msgstr "" +"Les repaquetages incrémentaux sont incompatibles avec les index bitmap. " +"Utilisez\n" +"--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps." + +#: builtin/repack.c:287 msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" -#: builtin/repack.c:161 +#: builtin/repack.c:289 msgid "same as -a, and turn unreachable objects loose" msgstr "identique à -a et transformer les objets inaccessibles en suspens" -#: builtin/repack.c:164 +#: builtin/repack.c:292 msgid "remove redundant packs, and run git-prune-packed" msgstr "supprimer les paquets redondants et lancer git-prune-packed" -#: builtin/repack.c:166 +#: builtin/repack.c:294 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passer --no-reuse-delta à git-pack-objects" -#: builtin/repack.c:168 +#: builtin/repack.c:296 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passer --no-reuse-object à git-pack-objects" -#: builtin/repack.c:170 +#: builtin/repack.c:298 msgid "do not run git-update-server-info" msgstr "ne pas lancer git update-server-info" -#: builtin/repack.c:173 +#: builtin/repack.c:301 msgid "pass --local to git-pack-objects" msgstr "passer --local à git-pack-objects" -#: builtin/repack.c:175 +#: builtin/repack.c:303 msgid "write bitmap index" msgstr "écrire un index en bitmap" -#: builtin/repack.c:176 +#: builtin/repack.c:304 msgid "approxidate" msgstr "date approximative" -#: builtin/repack.c:177 +#: builtin/repack.c:305 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:179 +#: builtin/repack.c:307 +msgid "with -a, repack unreachable objects" +msgstr "avec -a, repaquétiser les objets inaccessibles" + +#: builtin/repack.c:309 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:180 builtin/repack.c:184 +#: builtin/repack.c:310 builtin/repack.c:316 msgid "bytes" msgstr "octets" -#: builtin/repack.c:181 +#: builtin/repack.c:311 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:183 +#: builtin/repack.c:313 msgid "limits the maximum delta depth" msgstr "limite la profondeur maximale des deltas" -#: builtin/repack.c:185 +#: builtin/repack.c:315 +msgid "limits the maximum number of threads" +msgstr "limite le nombre maximal de fils" + +#: builtin/repack.c:317 msgid "maximum size of each packfile" msgstr "taille maximum de chaque fichier paquet" -#: builtin/repack.c:187 +#: builtin/repack.c:319 msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:197 +#: builtin/repack.c:321 +msgid "do not repack this pack" +msgstr "ne pas rempaqueter ce paquet" + +#: builtin/repack.c:331 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:381 +#: builtin/repack.c:335 +msgid "--keep-unreachable and -A are incompatible" +msgstr "--keep-unreachable et -A sont incompatibles" + +#: builtin/repack.c:510 builtin/worktree.c:140 #, c-format -msgid "removing '%s' failed" -msgstr "la suppression de '%s' a échoué" +msgid "failed to remove '%s'" +msgstr "échec de la suppression de '%s'" -#: builtin/replace.c:19 +#: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <objet> <remplacement>" -#: builtin/replace.c:20 +#: builtin/replace.c:23 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <objet>" -#: builtin/replace.c:21 +#: builtin/replace.c:24 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <commit> [<parent>...]" -#: builtin/replace.c:22 +#: builtin/replace.c:25 +msgid "git replace [-f] --convert-graft-file" +msgstr "git replace [-f] --convert-graft-file" + +#: builtin/replace.c:26 msgid "git replace -d <object>..." msgstr "git replace -d <objet>..." -#: builtin/replace.c:23 +#: builtin/replace.c:27 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<motif>]]" -#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 +#: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206 +#, c-format +msgid "failed to resolve '%s' as a valid ref" +msgstr "échec à résoudre '%s' comme une référence valide" + +#: builtin/replace.c:86 +#, c-format +msgid "" +"invalid replace format '%s'\n" +"valid formats are 'short', 'medium' and 'long'" +msgstr "" +"format de remplacement invalide '%s'\n" +"les formats valides sont 'short', 'medium' et 'long'" + +#: builtin/replace.c:121 +#, c-format +msgid "replace ref '%s' not found" +msgstr "réf de remplacement '%s' non trouvée" + +#: builtin/replace.c:137 +#, c-format +msgid "Deleted replace ref '%s'" +msgstr "Référence de remplacement '%s' supprimée" + +#: builtin/replace.c:149 +#, c-format +msgid "'%s' is not a valid ref name" +msgstr "'%s' n'est pas un nom valide de référence" + +#: builtin/replace.c:154 +#, c-format +msgid "replace ref '%s' already exists" +msgstr "la référence de remplacement '%s' existe déjà" + +#: builtin/replace.c:174 +#, c-format +msgid "" +"Objects must be of the same type.\n" +"'%s' points to a replaced object of type '%s'\n" +"while '%s' points to a replacement object of type '%s'." +msgstr "" +"Les objets doivent être du même type.\n" +"'%s' pointe sur un objet remplacé de type '%s' tandis que\n" +"'%s' pointe sur un objet remplaçant de type '%s'." + +#: builtin/replace.c:225 +#, c-format +msgid "unable to open %s for writing" +msgstr "impossible d'ouvrir %s en écriture" + +#: builtin/replace.c:238 +msgid "cat-file reported failure" +msgstr "cat-file a retourné un échec" + +#: builtin/replace.c:254 +#, c-format +msgid "unable to open %s for reading" +msgstr "impossible d'ouvrir %s en écriture" + +#: builtin/replace.c:268 +msgid "unable to spawn mktree" +msgstr "impossible de lire l'arbre (%s)" + +#: builtin/replace.c:272 +msgid "unable to read from mktree" +msgstr "impossible de lire depui mktree" + +#: builtin/replace.c:281 +msgid "mktree reported failure" +msgstr "mktree a échoué" + +#: builtin/replace.c:285 +msgid "mktree did not return an object name" +msgstr "mktree n'a pas retourné de nom d'objet" + +#: builtin/replace.c:294 #, c-format -msgid "Not a valid object name: '%s'" -msgstr "Nom d'objet invalide : '%s'" +msgid "unable to fstat %s" +msgstr "fstat de %s impossible" + +#: builtin/replace.c:299 +msgid "unable to write object to database" +msgstr "impossible d'écrire l'objet dans la base de données" -#: builtin/replace.c:355 +#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 +#: builtin/replace.c:445 +#, c-format +msgid "not a valid object name: '%s'" +msgstr "nom d'objet invalide : '%s'" + +#: builtin/replace.c:322 +#, c-format +msgid "unable to get object type for %s" +msgstr "impossible d'obtenir le type de l'objet pour %s" + +#: builtin/replace.c:338 +msgid "editing object file failed" +msgstr "échec de l'édition du fichier d'objet" + +#: builtin/replace.c:347 +#, c-format +msgid "new object is the same as the old one: '%s'" +msgstr "le nouvel objet est identique à l'ancien : '%s'" + +#: builtin/replace.c:407 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mauvaise étiquette de fusion dans le commit '%s'" -#: builtin/replace.c:357 +#: builtin/replace.c:409 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "étiquette de fusion malformée dans le commit '%s'" -#: builtin/replace.c:368 +#: builtin/replace.c:421 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -10600,208 +15409,284 @@ msgstr "" "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; " "utilisez --edit au lieu de --graft" -#: builtin/replace.c:401 +#: builtin/replace.c:460 #, c-format -msgid "the original commit '%s' has a gpg signature." -msgstr "le commit original '%s' contient une signature GPG." +msgid "the original commit '%s' has a gpg signature" +msgstr "le commit original '%s' contient une signature GPG" -#: builtin/replace.c:402 +#: builtin/replace.c:461 msgid "the signature will be removed in the replacement commit!" msgstr "la signature sera éliminée dans la validation de remplacement !" -#: builtin/replace.c:408 +#: builtin/replace.c:471 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Impossible d'écrire le commit de remplacement pour '%s'" -#: builtin/replace.c:432 +#: builtin/replace.c:479 +#, c-format +msgid "graft for '%s' unnecessary" +msgstr "graft pour '%s' non nécessaire" + +#: builtin/replace.c:482 +#, c-format +msgid "new commit is the same as the old one: '%s'" +msgstr "le nouveau commit est identique à l'ancien : '%s'" + +#: builtin/replace.c:514 +#, c-format +msgid "" +"could not convert the following graft(s):\n" +"%s" +msgstr "" +"impossible de convertir la(les) greffe(s) suivante(s) :\n" +"%s" + +#: builtin/replace.c:535 msgid "list replace refs" msgstr "afficher les références de remplacement" -#: builtin/replace.c:433 +#: builtin/replace.c:536 msgid "delete replace refs" msgstr "supprimer les références de remplacement" -#: builtin/replace.c:434 +#: builtin/replace.c:537 msgid "edit existing object" msgstr "éditer l'objet existant" -#: builtin/replace.c:435 +#: builtin/replace.c:538 msgid "change a commit's parents" msgstr "Modifier les parents d'un commit" -#: builtin/replace.c:436 +#: builtin/replace.c:539 +msgid "convert existing graft file" +msgstr "convertir le fichier de greffe existant" + +#: builtin/replace.c:540 msgid "replace the ref if it exists" msgstr "remplacer la référence si elle existe" -#: builtin/replace.c:437 +#: builtin/replace.c:542 msgid "do not pretty-print contents for --edit" msgstr "afficher sans mise en forme pour --edit" -#: builtin/replace.c:438 +#: builtin/replace.c:543 msgid "use this format" msgstr "utiliser ce format" -#: builtin/rerere.c:12 +#: builtin/replace.c:556 +msgid "--format cannot be used when not listing" +msgstr "--format ne peut pas être utilisé sans lister" + +#: builtin/replace.c:564 +msgid "-f only makes sense when writing a replacement" +msgstr "-f n'a de sens qu'en écrivant un remplacement" + +#: builtin/replace.c:568 +msgid "--raw only makes sense with --edit" +msgstr "--raw n'a de sens qu'avec l'option --edit" + +#: builtin/replace.c:574 +msgid "-d needs at least one argument" +msgstr "-d requiert au moins un argument" + +#: builtin/replace.c:580 +msgid "bad number of arguments" +msgstr "mauvais nombre d'arguments" + +#: builtin/replace.c:586 +msgid "-e needs exactly one argument" +msgstr "-e requiert un seul argument" + +#: builtin/replace.c:592 +msgid "-g needs at least one argument" +msgstr "-g requiert au moins un argument" + +#: builtin/replace.c:598 +msgid "--convert-graft-file takes no argument" +msgstr "--convert-graft-file ne supporte aucun argument" + +#: builtin/replace.c:604 +msgid "only one pattern can be given with -l" +msgstr "-l n'accepte qu'un motifs" + +#: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" "git rerere [clear | forget <chemin>... | status | remaining | diff | gc]" -#: builtin/rerere.c:58 +#: builtin/rerere.c:59 msgid "register clean resolutions in index" msgstr "enregistrer des résolutions propres dans l'index" -#: builtin/reset.c:26 +#: builtin/reset.c:29 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -#: builtin/reset.c:27 -msgid "git reset [-q] <tree-ish> [--] <paths>..." -msgstr "git reset [-q] <arbre ou apparenté> [--] <chemins>..." +#: builtin/reset.c:30 +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<arbre ou apparenté>] [--] <chemins>..." -#: builtin/reset.c:28 +#: builtin/reset.c:31 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<arbre ou apparenté>] [--] [<chemins>...]" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "mixed" msgstr "mixed" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "soft" msgstr "soft" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "hard" msgstr "hard" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "merge" msgstr "merge" -#: builtin/reset.c:34 +#: builtin/reset.c:37 msgid "keep" msgstr "keep" -#: builtin/reset.c:74 +#: builtin/reset.c:78 msgid "You do not have a valid HEAD." msgstr "Vous n'avez pas une HEAD valide." -#: builtin/reset.c:76 +#: builtin/reset.c:80 msgid "Failed to find tree of HEAD." msgstr "Impossible de trouver l'arbre pour HEAD." -#: builtin/reset.c:82 +#: builtin/reset.c:86 #, c-format msgid "Failed to find tree of %s." msgstr "Impossible de trouver l'arbre pour %s." -#: builtin/reset.c:100 +#: builtin/reset.c:111 #, c-format msgid "HEAD is now at %s" msgstr "HEAD est maintenant à %s" -#: builtin/reset.c:183 +#: builtin/reset.c:189 #, c-format 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:276 +#: builtin/reset.c:289 msgid "be quiet, only report errors" msgstr "être silencieux, afficher seulement les erreurs" -#: builtin/reset.c:278 +#: builtin/reset.c:291 msgid "reset HEAD and index" msgstr "réinitialiser HEAD et l'index" -#: builtin/reset.c:279 +#: builtin/reset.c:292 msgid "reset only HEAD" msgstr "réinitialiser seulement HEAD" -#: builtin/reset.c:281 builtin/reset.c:283 +#: builtin/reset.c:294 builtin/reset.c:296 msgid "reset HEAD, index and working tree" msgstr "réinitialiser HEAD, l'index et la copie de travail" -#: builtin/reset.c:285 +#: builtin/reset.c:298 msgid "reset HEAD but keep local changes" msgstr "réinitialiser HEAD mais garder les changements locaux" -#: builtin/reset.c:288 +#: builtin/reset.c:304 msgid "record only the fact that removed paths will be added later" msgstr "" "enregistrer seulement le fait que les chemins effacés seront ajoutés plus " "tard" -#: builtin/reset.c:305 +#: builtin/reset.c:321 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Échec de résolution de '%s' comme une révision valide." -#: builtin/reset.c:313 +#: builtin/reset.c:329 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Échec de résolution de '%s' comme un arbre valide." -#: builtin/reset.c:322 +#: builtin/reset.c:338 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch est incompatible avec --{hard,mixed,soft}" -#: builtin/reset.c:331 +#: builtin/reset.c:347 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la " "place." -#: builtin/reset.c:333 +#: builtin/reset.c:349 #, c-format msgid "Cannot do %s reset with paths." msgstr "Impossible de faire un \"%s reset\" avec des chemins." -#: builtin/reset.c:343 +#: builtin/reset.c:359 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu" -#: builtin/reset.c:347 +#: builtin/reset.c:363 msgid "-N can only be used with --mixed" msgstr "-N ne peut être utilisé qu'avec --mixed" -#: builtin/reset.c:364 +#: builtin/reset.c:380 msgid "Unstaged changes after reset:" msgstr "Modifications non indexées après reset :" -#: builtin/reset.c:370 +#: builtin/reset.c:386 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'." -#: builtin/reset.c:374 +#: builtin/reset.c:390 msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." -#: builtin/rev-list.c:350 +#: builtin/rev-list.c:399 +msgid "cannot combine --exclude-promisor-objects and --missing" +msgstr "impossible de combiner --exclude-promisor-objects et --missing" + +#: builtin/rev-list.c:457 +msgid "object filtering requires --objects" +msgstr "le filtrage d'objet exige --objects" + +#: builtin/rev-list.c:460 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "valeur invalide de 'sparse' '%s'" + +#: builtin/rev-list.c:501 msgid "rev-list does not support display of notes" msgstr "rev-list ne supporte l'affichage des notes" -#: builtin/rev-parse.c:358 +#: builtin/rev-list.c:504 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet" + +#: builtin/rev-parse.c:406 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]" -#: builtin/rev-parse.c:363 +#: builtin/rev-parse.c:411 msgid "keep the `--` passed as an arg" msgstr "garder le `--` passé en argument" -#: builtin/rev-parse.c:365 +#: builtin/rev-parse.c:413 msgid "stop parsing after the first non-option argument" msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option" -#: builtin/rev-parse.c:368 +#: builtin/rev-parse.c:416 msgid "output in stuck long form" msgstr "sortie en forme longue fixée" -#: builtin/rev-parse.c:499 +#: builtin/rev-parse.c:549 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -10816,119 +15701,92 @@ msgstr "" "Lancez \"git rev-parse --parseopt -h\" pour plus d'information sur " "l'utilisation principale." -#: builtin/revert.c:22 +#: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<options>] <commit ou apparenté>..." -#: builtin/revert.c:23 +#: builtin/revert.c:25 msgid "git revert <subcommand>" msgstr "git revert <sous-commande>" -#: builtin/revert.c:28 +#: builtin/revert.c:30 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<options>] <commit ou apparenté>..." -#: builtin/revert.c:29 +#: builtin/revert.c:31 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <sous-commande>" -#: builtin/revert.c:71 +#: builtin/revert.c:91 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s : %s ne peut pas être utilisé avec %s" -#: builtin/revert.c:80 +#: builtin/revert.c:100 msgid "end revert or cherry-pick sequence" msgstr "mettre fin au retour ou picorage" -#: builtin/revert.c:81 +#: builtin/revert.c:101 msgid "resume revert or cherry-pick sequence" msgstr "reprendre le retour ou picorage" -#: builtin/revert.c:82 +#: builtin/revert.c:102 msgid "cancel revert or cherry-pick sequence" msgstr "annuler le retour ou picorage" -#: builtin/revert.c:83 +#: builtin/revert.c:103 msgid "don't automatically commit" msgstr "ne pas valider automatiquement" -#: builtin/revert.c:84 +#: builtin/revert.c:104 msgid "edit the commit message" msgstr "éditer le message de validation" -#: builtin/revert.c:87 -msgid "parent number" -msgstr "numéro de parent" +#: builtin/revert.c:107 +msgid "parent-number" +msgstr "numéro-de-parent" -#: builtin/revert.c:89 +#: builtin/revert.c:108 +msgid "select mainline parent" +msgstr "sélectionner le parent principal" + +#: builtin/revert.c:110 msgid "merge strategy" msgstr "stratégie de fusion" -#: builtin/revert.c:90 +#: builtin/revert.c:111 msgid "option" msgstr "option" -#: builtin/revert.c:91 +#: builtin/revert.c:112 msgid "option for merge strategy" msgstr "option pour la stratégie de fusion" -#: builtin/revert.c:104 +#: builtin/revert.c:121 msgid "append commit name" msgstr "ajouter le nom de validation" -#: builtin/revert.c:106 +#: builtin/revert.c:123 msgid "preserve initially empty commits" msgstr "préserver les validations vides initialement" -#: builtin/revert.c:107 -msgid "allow commits with empty messages" -msgstr "autoriser les validations avec des messages vides" - -#: builtin/revert.c:108 +#: builtin/revert.c:125 msgid "keep redundant, empty commits" msgstr "garder les validations redondantes, vides" -#: builtin/revert.c:112 -msgid "program error" -msgstr "erreur du programme" - -#: builtin/revert.c:197 +#: builtin/revert.c:219 msgid "revert failed" msgstr "revert a échoué" -#: builtin/revert.c:212 +#: builtin/revert.c:232 msgid "cherry-pick failed" msgstr "le picorage a échoué" -#: builtin/rm.c:17 +#: builtin/rm.c:18 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<options>] [--] <fichier>..." -#: builtin/rm.c:65 -msgid "" -"the following submodule (or one of its nested submodules)\n" -"uses a .git directory:" -msgid_plural "" -"the following submodules (or one of their nested submodules)\n" -"use a .git directory:" -msgstr[0] "" -"le sous-module suivant (ou un de ses sous-modules imbriqués)\n" -"utilise un répertoire .git :" -msgstr[1] "" -"les sous-modules suivants (ou un de leurs sous-modules imbriqués)\n" -"utilisent un répertoire .git :" - -#: builtin/rm.c:71 -msgid "" -"\n" -"(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "" -"\n" -"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " -"historique)" - -#: builtin/rm.c:230 +#: builtin/rm.c:206 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -10942,7 +15800,7 @@ msgstr[1] "" "les fichiers suivants ont du contenu indexé différent\n" "du fichier et de HEAD :" -#: builtin/rm.c:235 +#: builtin/rm.c:211 msgid "" "\n" "(use -f to force removal)" @@ -10950,13 +15808,13 @@ msgstr "" "\n" "(utilisez -f pour forcer la suppression)" -#: builtin/rm.c:239 +#: builtin/rm.c:215 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "le fichier suivant a des changements indexés :" msgstr[1] "les fichiers suivants ont des changements indexés :" -#: builtin/rm.c:243 builtin/rm.c:254 +#: builtin/rm.c:219 builtin/rm.c:228 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -10964,43 +15822,54 @@ msgstr "" "\n" "(utilisez --cached pour garder le fichier, ou -f pour forcer la suppression)" -#: builtin/rm.c:251 +#: builtin/rm.c:225 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "le fichier suivant a des modifications locales :" msgstr[1] "les fichiers suivants ont des modifications locales :" -#: builtin/rm.c:269 +#: builtin/rm.c:241 msgid "do not list removed files" msgstr "ne pas afficher les fichiers supprimés" -#: builtin/rm.c:270 +#: builtin/rm.c:242 msgid "only remove from the index" msgstr "supprimer seulement de l'index" -#: builtin/rm.c:271 +#: builtin/rm.c:243 msgid "override the up-to-date check" msgstr "outrepasser la vérification des fichiers à jour" -#: builtin/rm.c:272 +#: builtin/rm.c:244 msgid "allow recursive removal" msgstr "autoriser la suppression récursive" -#: builtin/rm.c:274 +#: builtin/rm.c:246 msgid "exit with a zero status even if nothing matched" -msgstr "sortir avec un statut zéro même si rien ne correspondait" +msgstr "sortir avec un état zéro même si rien ne correspondait" -#: builtin/rm.c:335 +#: builtin/rm.c:288 +msgid "please stage your changes to .gitmodules or stash them to proceed" +msgstr "" +"veuillez indexer vos modifications de .gitmodules ou les remiser pour " +"continuer" + +#: builtin/rm.c:306 #, c-format msgid "not removing '%s' recursively without -r" msgstr "pas de suppression récursive de '%s' sans -r" -#: builtin/rm.c:374 +#: builtin/rm.c:345 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm : impossible de supprimer %s" -#: builtin/send-pack.c:18 +#: builtin/rm.c:368 +#, c-format +msgid "could not remove '%s'" +msgstr "impossible de supprimer '%s'" + +#: builtin/send-pack.c:20 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " @@ -11013,49 +15882,73 @@ msgstr "" " --all et la spécification explicite de <référence> sont mutuellement " "exclusifs." -#: builtin/send-pack.c:160 +#: builtin/send-pack.c:163 msgid "remote name" msgstr "nom distant" -#: builtin/send-pack.c:171 +#: builtin/send-pack.c:177 msgid "use stateless RPC protocol" msgstr "utiliser un protocole RPC sans état" -#: builtin/send-pack.c:172 +#: builtin/send-pack.c:178 msgid "read refs from stdin" msgstr "lire les références depuis l'entrée standard" -#: builtin/send-pack.c:173 +#: builtin/send-pack.c:179 msgid "print status from remote helper" msgstr "afficher les messages du greffon de protocole distant" -#: builtin/shortlog.c:13 -msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" -msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]" +#: builtin/serve.c:7 +msgid "git serve [<options>]" +msgstr "git serve [<options>]" + +#: builtin/serve.c:17 builtin/upload-pack.c:23 +msgid "quit after a single request/response exchange" +msgstr "quitter après un unique échange requête/réponse" -#: builtin/shortlog.c:242 +#: builtin/serve.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "sortir immédiatement après l'annonce des capacités" + +#: builtin/shortlog.c:14 +msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" +msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] <chemin>...]" + +#: builtin/shortlog.c:15 +msgid "git log --pretty=short | git shortlog [<options>]" +msgstr "git log --pretty=short | git shortlog [<options>]" + +#: builtin/shortlog.c:264 +msgid "Group by committer rather than author" +msgstr "Grouper par validateur plutôt que par auteur" + +#: builtin/shortlog.c:266 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:244 +#: builtin/shortlog.c:268 msgid "Suppress commit descriptions, only provides commit count" msgstr "" "Supprimer les descriptions de validation, fournit seulement le nombre de " "validations" -#: builtin/shortlog.c:246 +#: builtin/shortlog.c:270 msgid "Show the email address of each author" -msgstr "Afficher l'adresse e-mail de chaque auteur" +msgstr "Afficher l'adresse courriel de chaque auteur" -#: builtin/shortlog.c:247 -msgid "w[,i1[,i2]]" -msgstr "w[,i1[,i2]]" +#: builtin/shortlog.c:271 +msgid "<w>[,<i1>[,<i2>]]" +msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:248 +#: builtin/shortlog.c:272 msgid "Linewrap output" msgstr "Couper les lignes" -#: builtin/show-branch.c:10 +#: builtin/shortlog.c:299 +msgid "too many arguments given outside repository" +msgstr "trop d'arguments fournis hors d'un dépôt" + +#: builtin/show-branch.c:13 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -11067,77 +15960,133 @@ msgstr "" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]" -#: builtin/show-branch.c:14 +#: builtin/show-branch.c:17 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]" -#: builtin/show-branch.c:640 +#: builtin/show-branch.c:395 +#, c-format +msgid "ignoring %s; cannot handle more than %d ref" +msgid_plural "ignoring %s; cannot handle more than %d refs" +msgstr[0] "%s ignoré; impossible de gérer plus de %d référence" +msgstr[1] "%s ignoré; impossible de gérer plus de %d références" + +#: builtin/show-branch.c:549 +#, c-format +msgid "no matching refs with %s" +msgstr "aucune référence correspond à %s" + +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "afficher les branches de suivi distantes et les branches locales" -#: builtin/show-branch.c:642 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "afficher les branches de suivi distantes" -#: builtin/show-branch.c:644 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "couleur '*!+-' correspondant à la branche" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "afficher <n> validations de plus après l'ancêtre commun" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "synonyme de more=-1" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "supprimer les chaînes de nommage" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "inclure la branche courante" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "nommer les validations avec leurs noms d'objet" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "afficher les bases possibles de fusion" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "afficher les références inaccessibles depuis toute autre référence" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "afficher les validations dans l'ordre topologique" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "" "afficher seulement les validations qui ne sont pas sur la première branche" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "afficher les fusions accessibles depuis une seule pointe" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "tri topologique, maintenant l'ordre par date si possible" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "" "afficher les <n> plus récents éléments de ref-log en commençant à la base" -#: builtin/show-ref.c:10 +#: builtin/show-branch.c:711 +msgid "" +"--reflog is incompatible with --all, --remotes, --independent or --merge-base" +msgstr "" +"--reflog est incompatible avec --all, --remotes, --independant et --merge-" +"base" + +#: builtin/show-branch.c:735 +msgid "no branches given, and HEAD is not valid" +msgstr "aucune branche spécifiée, et HEAD est invalide" + +#: builtin/show-branch.c:738 +msgid "--reflog option needs one branch name" +msgstr "--reflog requiert un nom de branche" + +#: builtin/show-branch.c:741 +#, c-format +msgid "only %d entry can be shown at one time." +msgid_plural "only %d entries can be shown at one time." +msgstr[0] "%d entrée seulement ne peut être montrée en même temps." +msgstr[1] "%d entrées seulement ne peuvent être montrée en même temps." + +#: builtin/show-branch.c:745 +#, c-format +msgid "no such ref %s" +msgstr "référence inexistante %s" + +#: builtin/show-branch.c:829 +#, c-format +msgid "cannot handle more than %d rev." +msgid_plural "cannot handle more than %d revs." +msgstr[0] "impossible de gérer plus de %d révision." +msgstr[1] "impossible de gérer plus de %d révisions." + +#: builtin/show-branch.c:833 +#, c-format +msgid "'%s' is not a valid ref." +msgstr "'%s' n'est pas une référence valide." + +#: builtin/show-branch.c:836 +#, c-format +msgid "cannot find commit %s (%s)" +msgstr "impossible de trouver le commit %s (%s)" + +#: builtin/show-ref.c:11 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" @@ -11145,245 +16094,458 @@ msgstr "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]" -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:12 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<motif>]" -#: builtin/show-ref.c:165 +#: builtin/show-ref.c:160 msgid "only show tags (can be combined with heads)" msgstr "afficher seulement les étiquettes (peut être combiné avec heads)" -#: builtin/show-ref.c:166 +#: builtin/show-ref.c:161 msgid "only show heads (can be combined with tags)" msgstr "afficher seulement les têtes (peut être combiné avec tags)" -#: builtin/show-ref.c:167 +#: builtin/show-ref.c:162 msgid "stricter reference checking, requires exact ref path" msgstr "" "vérification de référence plus stricte, nécessite un chemin de référence " "exact" -#: builtin/show-ref.c:170 builtin/show-ref.c:172 +#: builtin/show-ref.c:165 builtin/show-ref.c:167 msgid "show the HEAD reference, even if it would be filtered out" msgstr "afficher la référence HEAD, même si elle serait filtrée" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:169 msgid "dereference tags into object IDs" msgstr "déréférencer les étiquettes en IDs d'objet" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:171 msgid "only show SHA1 hash using <n> digits" msgstr "afficher seulement le hachage SHA1 en utilisant <n> chiffres" -#: builtin/show-ref.c:180 +#: builtin/show-ref.c:175 msgid "do not print results to stdout (useful with --verify)" msgstr "" "ne pas afficher les résultats sur la sortie standard (pratique avec --verify)" -#: builtin/show-ref.c:182 +#: builtin/show-ref.c:177 msgid "show refs from stdin that aren't in local repository" msgstr "" "afficher les références de l'entrée standard qui ne sont pas dans le dépôt " "local" -#: builtin/stripspace.c:17 +#: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" -#: builtin/stripspace.c:18 +#: builtin/stripspace.c:19 msgid "git stripspace [-c | --comment-lines]" msgstr "git stripspace [-c | --comment-lines]" -#: builtin/stripspace.c:35 +#: builtin/stripspace.c:36 msgid "skip and remove all lines starting with comment character" msgstr "" "sauter et supprimer toutes les lignes commençant par le caractère de " "commentaire" -#: builtin/stripspace.c:38 +#: builtin/stripspace.c:39 msgid "prepend comment character and space to each line" msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace" -#: builtin/submodule--helper.c:24 +#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" -#: builtin/submodule--helper.c:31 +#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Nom de référence complet attendu, %s obtenu" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:61 +msgid "submodule--helper print-default-remote takes no arguments" +msgstr "submodule--helper print-default-remote n'accepte aucun argument" + +#: builtin/submodule--helper.c:99 #, c-format msgid "cannot strip one component off url '%s'" msgstr "impossible de supprimer un composant de l'URL '%s'" -#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 -#: builtin/submodule--helper.c:486 +#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356 msgid "alternative anchor for relative paths" msgstr "ancre alternative pour les chemins relatifs" -#: builtin/submodule--helper.c:283 +#: builtin/submodule--helper.c:412 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606 +#: builtin/submodule--helper.c:629 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules" -#: builtin/submodule--helper.c:366 +#: builtin/submodule--helper.c:521 +#, c-format +msgid "Entering '%s'\n" +msgstr "Entrée dans '%s'\n" + +#: builtin/submodule--helper.c:524 +#, c-format +msgid "" +"run_command returned non-zero status for %s\n" +"." +msgstr "" +"run_command a retourné un statut non-nul pour %s\n" +"." + +#: builtin/submodule--helper.c:545 +#, c-format +msgid "" +"run_command returned non-zero status while recursing in the nested " +"submodules of %s\n" +"." +msgstr "" +"run_command a retourné un statut non-nul pendant la récursion dans les sous-modules inclus de %s\n" +"." + +#: builtin/submodule--helper.c:561 +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:563 builtin/submodule--helper.c:1040 +msgid "Recurse into nested submodules" +msgstr "Parcourir récursivement les sous-modules" + +#: builtin/submodule--helper.c:568 +msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" +msgstr "git submodule--helper foreach [--quiet] [--recursive] <chemin>" + +#: builtin/submodule--helper.c:644 +#, c-format +msgid "" +"could not lookup configuration '%s'. Assuming this repository is its own " +"authoritative upstream." +msgstr "" +"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme " +"son propre amont d'autorité." + +#: builtin/submodule--helper.c:655 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:370 +#: builtin/submodule--helper.c:659 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n" -#: builtin/submodule--helper.c:380 +#: builtin/submodule--helper.c:669 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" -msgstr "attention : nous vous suggérons de spécifier une commande de mode de mise à jour pour le sous-module '%s'\n" +msgstr "" +"attention : nous vous suggérons de spécifier une commande de mode de mise à " +"jour pour le sous-module '%s'\n" -#: builtin/submodule--helper.c:387 +#: builtin/submodule--helper.c:676 #, c-format msgid "Failed to register update mode for submodule path '%s'" -msgstr "Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module '%s'" +msgstr "" +"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module " +"'%s'" -#: builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:698 msgid "Suppress output for initializing a submodule" msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module" -#: builtin/submodule--helper.c:411 +#: builtin/submodule--helper.c:703 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<chemin>]" -#: builtin/submodule--helper.c:432 -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper <nom> <chemin>" - -#: builtin/submodule--helper.c:438 +#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le " "chemin '%s'" -#: builtin/submodule--helper.c:489 +#: builtin/submodule--helper.c:814 +#, c-format +msgid "could not resolve HEAD ref inside the submodule '%s'" +msgstr "impossible de résoudre HEAD dans le sous-module '%s'" + +#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010 +#, c-format +msgid "failed to recurse into submodule '%s'" +msgstr "récursion impossible dans le sous-module '%s'" + +#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176 +msgid "Suppress submodule status output" +msgstr "supprimer la sortie d'état du sous-module" + +#: builtin/submodule--helper.c:866 +msgid "" +"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:867 +msgid "recurse into nested submodules" +msgstr "parcourir récursivement les sous-modules" + +#: builtin/submodule--helper.c:872 +msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" +msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]" + +#: builtin/submodule--helper.c:896 +msgid "git submodule--helper name <path>" +msgstr "git submodule--helper <nom> <chemin>" + +#: builtin/submodule--helper.c:960 +#, c-format +msgid "Synchronizing submodule url for '%s'\n" +msgstr "Synchronisation de l'URL sous-module pour '%s'\n" + +#: builtin/submodule--helper.c:966 +#, c-format +msgid "failed to register url for submodule path '%s'" +msgstr "échec d'enregistrement de l'URL pour le chemin de sous-module '%s'" + +#: builtin/submodule--helper.c:980 +#, c-format +msgid "failed to get the default remote for submodule '%s'" +msgstr "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'" + +#: builtin/submodule--helper.c:991 +#, c-format +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:1038 +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:1045 +msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]" + +#: builtin/submodule--helper.c:1099 +#, c-format +msgid "" +"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " +"really want to remove it including all of its history)" +msgstr "" +"L'arbre de travail du sous-module '%s' contient un répertoire .git (utilisez " +"'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " +"historique)" + +#: builtin/submodule--helper.c:1111 +#, c-format +msgid "" +"Submodule work tree '%s' contains local modifications; use '-f' to discard " +"them" +msgstr "" +"L'arbre de travail du sous-module '%s' contient des modifications locales ; " +"utilisez '-f' pour les annuler" + +#: builtin/submodule--helper.c:1119 +#, c-format +msgid "Cleared directory '%s'\n" +msgstr "Répertoire '%s' nettoyé\n" + +#: builtin/submodule--helper.c:1121 +#, c-format +msgid "Could not remove submodule work tree '%s'\n" +msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n" + +#: builtin/submodule--helper.c:1132 +#, c-format +msgid "could not create empty submodule directory %s" +msgstr "impossible de créer le répertoire vide du sous-module %s" + +#: builtin/submodule--helper.c:1148 +#, c-format +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:1177 +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:1178 +msgid "Unregister all submodules" +msgstr "Désenregistrer tous les sous-modules" + +#: builtin/submodule--helper.c:1183 +msgid "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" +msgstr "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]" + +#: builtin/submodule--helper.c:1197 +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "" +"Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules" + +#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293 +#, c-format +msgid "submodule '%s' cannot add alternate: %s" +msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s" + +#: builtin/submodule--helper.c:1329 +#, c-format +msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" +msgstr "" +"La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue" + +#: builtin/submodule--helper.c:1336 +#, c-format +msgid "Value '%s' for submodule.alternateLocation is not recognized" +msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue" + +#: builtin/submodule--helper.c:1359 msgid "where the new submodule will be cloned to" msgstr "emplacement où le sous-module sera cloné" -#: builtin/submodule--helper.c:492 +#: builtin/submodule--helper.c:1362 msgid "name of the new submodule" msgstr "nom du nouveau sous-module" -#: builtin/submodule--helper.c:495 +#: builtin/submodule--helper.c:1365 msgid "url where to clone the submodule from" msgstr "URL depuis laquelle cloner le sous-module" -#: builtin/submodule--helper.c:501 +#: builtin/submodule--helper.c:1373 msgid "depth for shallow clones" msgstr "profondeur de l'historique des clones superficiels" -#: builtin/submodule--helper.c:507 +#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751 +msgid "force cloning progress" +msgstr "forcer l'affichage de la progression du clonage" + +#: builtin/submodule--helper.c:1381 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" -msgstr "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference <dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>" - -#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 -#, c-format -msgid "could not create directory '%s'" -msgstr "impossible de créer le répertoire '%s'" +msgstr "" +"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference " +"<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>" -#: builtin/submodule--helper.c:534 +#: builtin/submodule--helper.c:1412 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué" -#: builtin/submodule--helper.c:550 -#, c-format -msgid "cannot open file '%s'" -msgstr "impossible d'ouvrir le fichier '%s'" - -#: builtin/submodule--helper.c:555 -#, c-format -msgid "could not close file %s" -msgstr "impossible de fermer le fichier %s" - -#: builtin/submodule--helper.c:562 +#: builtin/submodule--helper.c:1426 #, c-format msgid "could not get submodule directory for '%s'" msgstr "impossible de créer le répertoire de sous-module pour '%s'" -#: builtin/submodule--helper.c:609 +#: builtin/submodule--helper.c:1492 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Le chemin de sous-module '%s' n'est pas initialisé" -#: builtin/submodule--helper.c:613 +#: builtin/submodule--helper.c:1496 msgid "Maybe you want to use 'update --init'?" msgstr "Vous voudriez sûrement utiliser 'update --init' ?" -#: builtin/submodule--helper.c:639 +#: builtin/submodule--helper.c:1525 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Sous-module non fusionné %s non traité" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:1554 #, c-format msgid "Skipping submodule '%s'" msgstr "Sous-module '%s' non traité" -#: builtin/submodule--helper.c:768 +#: builtin/submodule--helper.c:1689 +#, c-format +msgid "Failed to clone '%s'. Retry scheduled" +msgstr "Impossible de cloner '%s'. Réessai prévu" + +#: builtin/submodule--helper.c:1700 +#, c-format +msgid "Failed to clone '%s' a second time, aborting" +msgstr "Impossible de cloner '%s' pour la seconde fois, abandon" + +#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953 msgid "path into the working tree" msgstr "chemin dans la copie de travail" -#: builtin/submodule--helper.c:771 +#: builtin/submodule--helper.c:1733 msgid "path into the working tree, across nested submodule boundaries" -msgstr "chemin dans la copie de travail, traversant les frontières de sous-modules" +msgstr "" +"chemin dans la copie de travail, traversant les frontières de sous-modules" -#: builtin/submodule--helper.c:775 +#: builtin/submodule--helper.c:1737 msgid "rebase, merge, checkout or none" msgstr "valeurs possibles : rebase, merge, checkout ou none" -#: builtin/submodule--helper.c:779 +#: builtin/submodule--helper.c:1743 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:782 +#: builtin/submodule--helper.c:1746 msgid "parallel jobs" msgstr "jobs parallèles" -#: builtin/submodule--helper.c:783 +#: builtin/submodule--helper.c:1748 +msgid "whether the initial clone should follow the shallow recommendation" +msgstr "spécifie si le clonage initial doit être aussi superficiel" + +#: builtin/submodule--helper.c:1749 msgid "don't print cloning progress" msgstr "ne pas afficher la progression du clonage" -#: builtin/submodule--helper.c:788 +#: builtin/submodule--helper.c:1756 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:798 +#: builtin/submodule--helper.c:1769 msgid "bad value for update parameter" msgstr "valeur invalide pour la mise à jour du paramètre" -#: builtin/submodule--helper.c:855 -msgid "submodule--helper subcommand must be called with a subcommand" -msgstr "la sous-commande submodule--helper doit être appelée avec une sous-commande" +#: builtin/submodule--helper.c:1837 +#, c-format +msgid "" +"Submodule (%s) branch configured to inherit branch from superproject, but " +"the superproject is not on any branch" +msgstr "" +"la branche du sous-module %s est configurée pour hériter de la branche du " +"superprojet, mais le superprojet n'est sur aucune branche" + +#: builtin/submodule--helper.c:1954 +msgid "recurse into submodules" +msgstr "parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:862 +#: builtin/submodule--helper.c:1960 +msgid "git submodule--helper embed-git-dir [<path>...]" +msgstr "git submodule--helper embed-git-dir [<chemin>...]" + +#: builtin/submodule--helper.c:2071 +#, c-format +msgid "%s doesn't support --super-prefix" +msgstr "%s ne gère pas --super-prefix" + +#: builtin/submodule--helper.c:2077 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" -#: builtin/symbolic-ref.c:7 +#: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "git symbolic-ref [<options>] nom [<référence>]" -#: builtin/symbolic-ref.c:8 +#: builtin/symbolic-ref.c:9 msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <nom>" @@ -11400,15 +16562,15 @@ msgstr "supprimer la référence symbolique" msgid "shorten ref output" msgstr "raccourcir l'affichage de la référence" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason" msgstr "raison" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason of the update" msgstr "raison de la mise à jour" -#: builtin/tag.c:23 +#: builtin/tag.c:25 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" @@ -11416,38 +16578,35 @@ msgstr "" "git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-" "étiquette> [<head>]" -#: builtin/tag.c:24 +#: builtin/tag.c:26 msgid "git tag -d <tagname>..." msgstr "git tag -d <nométiquette>..." -#: builtin/tag.c:25 +#: builtin/tag.c:27 msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <object>]\n" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "" -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <objet>]\n" +"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" +"points-at <objet>]\n" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<motif>...]" -#: builtin/tag.c:27 -msgid "git tag -v <tagname>..." -msgstr "git tag -v <nométiquette>..." +#: builtin/tag.c:29 +msgid "git tag -v [--format=<format>] <tagname>..." +msgstr "git tag -v [--format=<format>] <nométiquette>..." -#: builtin/tag.c:81 -#, c-format -msgid "tag name too long: %.*s..." -msgstr "nom d'étiquette trop long : %.*s..." - -#: builtin/tag.c:86 +#: builtin/tag.c:87 #, c-format msgid "tag '%s' not found." msgstr "étiquette '%s' non trouvée." -#: builtin/tag.c:101 +#: builtin/tag.c:103 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Étiquette '%s' supprimée (elle était sur %s)\n" -#: builtin/tag.c:117 +#: builtin/tag.c:133 #, c-format msgid "" "\n" @@ -11460,7 +16619,7 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/tag.c:121 +#: builtin/tag.c:137 #, c-format msgid "" "\n" @@ -11475,519 +16634,774 @@ 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:199 +#: builtin/tag.c:191 msgid "unable to sign the tag" msgstr "impossible de signer l'étiquette" -#: builtin/tag.c:201 +#: builtin/tag.c:193 msgid "unable to write tag file" msgstr "impossible d'écrire le fichier d'étiquettes" -#: builtin/tag.c:226 +#: builtin/tag.c:218 msgid "bad object type." msgstr "mauvais type d'objet." -#: builtin/tag.c:239 -msgid "tag header too big." -msgstr "en-tête d'étiquette trop gros." - -#: builtin/tag.c:275 +#: builtin/tag.c:267 msgid "no tag message?" msgstr "pas de message pour l'étiquette ?" -#: builtin/tag.c:281 +#: builtin/tag.c:274 #, 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:339 +#: builtin/tag.c:383 msgid "list tag names" msgstr "afficher les noms des étiquettes" -#: builtin/tag.c:341 +#: builtin/tag.c:385 msgid "print <n> lines of each tag message" msgstr "affiche <n> lignes de chaque message d'étiquette" -#: builtin/tag.c:343 +#: builtin/tag.c:387 msgid "delete tags" msgstr "supprimer des étiquettes" -#: builtin/tag.c:344 +#: builtin/tag.c:388 msgid "verify tags" msgstr "vérifier des étiquettes" -#: builtin/tag.c:346 +#: builtin/tag.c:390 msgid "Tag creation options" msgstr "Options de création de l'étiquette" -#: builtin/tag.c:348 +#: builtin/tag.c:392 msgid "annotated tag, needs a message" msgstr "étiquette annotée, nécessite un message" -#: builtin/tag.c:350 +#: builtin/tag.c:394 msgid "tag message" msgstr "message pour l'étiquette" -#: builtin/tag.c:352 +#: builtin/tag.c:396 +msgid "force edit of tag message" +msgstr "forcer l'édition du message d'étiquetage" + +#: builtin/tag.c:397 msgid "annotated and GPG-signed tag" msgstr "étiquette annotée et signée avec GPG" -#: builtin/tag.c:356 +#: builtin/tag.c:401 msgid "use another key to sign the tag" msgstr "utiliser une autre clé pour signer l'étiquette" -#: builtin/tag.c:357 +#: builtin/tag.c:402 msgid "replace the tag if exists" msgstr "remplacer l'étiquette si elle existe" -#: builtin/tag.c:358 builtin/update-ref.c:368 +#: builtin/tag.c:403 builtin/update-ref.c:369 msgid "create a reflog" msgstr "créer un reflog" -#: builtin/tag.c:360 +#: builtin/tag.c:405 msgid "Tag listing options" msgstr "Options d'affichage des étiquettes" -#: builtin/tag.c:361 +#: builtin/tag.c:406 msgid "show tag list in columns" msgstr "afficher la liste des étiquettes sous forme de colonnes" -#: builtin/tag.c:362 builtin/tag.c:363 +#: builtin/tag.c:407 builtin/tag.c:409 msgid "print only tags that contain the commit" msgstr "afficher seulement les étiquettes qui contiennent la validation" -#: builtin/tag.c:364 +#: builtin/tag.c:408 builtin/tag.c:410 +msgid "print only tags that don't contain the commit" +msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation" + +#: builtin/tag.c:411 msgid "print only tags that are merged" msgstr "afficher seulement les étiquettes qui sont fusionnées" -#: builtin/tag.c:365 +#: builtin/tag.c:412 msgid "print only tags that are not merged" msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées" -#: builtin/tag.c:370 +#: builtin/tag.c:417 msgid "print only tags of the object" msgstr "afficher seulement les étiquettes de l'objet" -#: builtin/tag.c:399 +#: builtin/tag.c:461 msgid "--column and -n are incompatible" msgstr "--column et -n sont incompatibles" -#: builtin/tag.c:419 -msgid "-n option is only allowed with -l." -msgstr "l'option -n est autorisée seulement avec -l." +#: builtin/tag.c:483 +msgid "-n option is only allowed in list mode" +msgstr "l'option -n est autorisée seulement en mode de liste" -#: builtin/tag.c:421 -msgid "--contains option is only allowed with -l." -msgstr "l'option --contains est autorisée seulement avec -l." +#: builtin/tag.c:485 +msgid "--contains option is only allowed in list mode" +msgstr "l'option --contains est autorisée seulement en mode de liste" -#: builtin/tag.c:423 -msgid "--points-at option is only allowed with -l." -msgstr "l'option --points-at est autorisée seulement avec -l." +#: builtin/tag.c:487 +msgid "--no-contains option is only allowed in list mode" +msgstr "l'option --contains est autorisée seulement en mode liste" -#: builtin/tag.c:425 -msgid "--merged and --no-merged option are only allowed with -l" -msgstr "les options --merged et --no-merged ne sont autorisées qu'avec -l" +#: builtin/tag.c:489 +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:433 +#: builtin/tag.c:491 +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:502 msgid "only one -F or -m option is allowed." msgstr "une seule option -F ou -m est autorisée." -#: builtin/tag.c:452 +#: builtin/tag.c:521 msgid "too many params" msgstr "trop de paramètres" -#: builtin/tag.c:458 +#: builtin/tag.c:527 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' n'est pas un nom d'étiquette valide." -#: builtin/tag.c:463 +#: builtin/tag.c:532 #, c-format msgid "tag '%s' already exists" msgstr "l'étiquette '%s' existe déjà" -#: builtin/tag.c:491 +#: builtin/tag.c:563 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" -#: builtin/unpack-objects.c:490 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "Dépaquetage des objets" -#: builtin/update-index.c:79 +#: builtin/update-index.c:82 #, c-format msgid "failed to create directory %s" msgstr "échec de la création du répertoire %s" -#: builtin/update-index.c:85 -#, c-format -msgid "failed to stat %s" -msgstr "échec du stat de %s" - -#: builtin/update-index.c:95 +#: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" msgstr "échec de la création du fichier %s" -#: builtin/update-index.c:103 +#: builtin/update-index.c:106 #, c-format msgid "failed to delete file %s" msgstr "échec de la suppression du fichier %s" -#: builtin/update-index.c:110 builtin/update-index.c:212 +#: builtin/update-index.c:113 builtin/update-index.c:219 #, c-format msgid "failed to delete directory %s" msgstr "échec de la suppression du répertoire %s" -#: builtin/update-index.c:133 +#: builtin/update-index.c:138 #, c-format msgid "Testing mtime in '%s' " msgstr "Test du mtime dans '%s' " -#: builtin/update-index.c:145 +#: builtin/update-index.c:152 msgid "directory stat info does not change after adding a new file" msgstr "" "l'information de stat du répertoire ne change pas après ajout d'un fichier" -#: builtin/update-index.c:158 +#: builtin/update-index.c:165 msgid "directory stat info does not change after adding a new directory" msgstr "" "l'information de stat du répertoire ne change pas après ajout d'un répertoire" -#: builtin/update-index.c:171 +#: builtin/update-index.c:178 msgid "directory stat info changes after updating a file" msgstr "" "l'information de stat du répertoire change après mise à jour d'un fichier" -#: builtin/update-index.c:182 +#: builtin/update-index.c:189 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "l'information de stat du répertoire change après l'ajout d'un fichier dans " "un sous-répertoire" -#: builtin/update-index.c:193 +#: builtin/update-index.c:200 msgid "directory stat info does not change after deleting a file" msgstr "" "l'information de stat du répertoire ne change pas après la suppression d'un " "fichier<" -#: builtin/update-index.c:206 +#: builtin/update-index.c:213 msgid "directory stat info does not change after deleting a directory" msgstr "" "l'information de stat du répertoire ne change pas après la suppression d'un " "répertoire" -#: builtin/update-index.c:213 +#: builtin/update-index.c:220 msgid " OK" msgstr " OK" -#: builtin/update-index.c:575 +#: builtin/update-index.c:588 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<options>] [--] [<fichier>...]" -#: builtin/update-index.c:930 +#: builtin/update-index.c:944 msgid "continue refresh even when index needs update" msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour" -#: builtin/update-index.c:933 +#: builtin/update-index.c:947 msgid "refresh: ignore submodules" msgstr "rafraîchir : ignorer les sous-modules" -#: builtin/update-index.c:936 +#: builtin/update-index.c:950 msgid "do not ignore new files" msgstr "ne pas ignorer les nouveaux fichiers" -#: builtin/update-index.c:938 +#: builtin/update-index.c:952 msgid "let files replace directories and vice-versa" msgstr "laisser les fichiers remplacer des répertoires et vice-versa" -#: builtin/update-index.c:940 +#: builtin/update-index.c:954 msgid "notice files missing from worktree" msgstr "aviser des fichiers manquants dans la copie de travail" -#: builtin/update-index.c:942 +#: builtin/update-index.c:956 msgid "refresh even if index contains unmerged entries" msgstr "rafraîchir même si l'index contient des éléments non fusionnés" -#: builtin/update-index.c:945 +#: builtin/update-index.c:959 msgid "refresh stat information" msgstr "rafraîchir l'information de stat" -#: builtin/update-index.c:949 +#: builtin/update-index.c:963 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "comme --refresh, mais en ignorant l'option assume-unchanged" -#: builtin/update-index.c:953 +#: builtin/update-index.c:967 msgid "<mode>,<object>,<path>" msgstr "<mode>, <objet>, <chemin>" -#: builtin/update-index.c:954 +#: builtin/update-index.c:968 msgid "add the specified entry to the index" msgstr "ajouter l'élément spécifié dans l'index" -#: builtin/update-index.c:958 -msgid "(+/-)x" -msgstr "(+/-)x" - -#: builtin/update-index.c:959 -msgid "override the executable bit of the listed files" -msgstr "outrepasser le bit exécutable pour les fichiers listés" - -#: builtin/update-index.c:963 +#: builtin/update-index.c:977 msgid "mark files as \"not changing\"" msgstr "marquer les fichiers comme \"non changeants\"" -#: builtin/update-index.c:966 +#: builtin/update-index.c:980 msgid "clear assumed-unchanged bit" msgstr "mettre à zéro le bit supposé-non-modifié" -#: builtin/update-index.c:969 +#: builtin/update-index.c:983 msgid "mark files as \"index-only\"" msgstr "marquer les fichiers comme \"index seulement\"" -#: builtin/update-index.c:972 +#: builtin/update-index.c:986 msgid "clear skip-worktree bit" msgstr "mettre à zéro le bit sauter-la-copie-de travail" -#: builtin/update-index.c:975 +#: builtin/update-index.c:989 msgid "add to index only; do not add content to object database" msgstr "" "ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de " "données des objets" -#: builtin/update-index.c:977 +#: builtin/update-index.c:991 msgid "remove named paths even if present in worktree" msgstr "" "supprimer les chemins nommés même s'ils sont présents dans la copie de " "travail" -#: builtin/update-index.c:979 +#: builtin/update-index.c:993 msgid "with --stdin: input lines are terminated by null bytes" msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls" -#: builtin/update-index.c:981 +#: builtin/update-index.c:995 msgid "read list of paths to be updated from standard input" msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard" -#: builtin/update-index.c:985 +#: builtin/update-index.c:999 msgid "add entries from standard input to the index" msgstr "ajouter les éléments depuis l'entrée standard à l'index" -#: builtin/update-index.c:989 +#: builtin/update-index.c:1003 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés" -#: builtin/update-index.c:993 +#: builtin/update-index.c:1007 msgid "only update entries that differ from HEAD" msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD" -#: builtin/update-index.c:997 +#: builtin/update-index.c:1011 msgid "ignore files missing from worktree" msgstr "ignorer les fichiers manquants dans la copie de travail" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:1014 msgid "report actions to standard output" msgstr "afficher les actions sur la sortie standard" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1016 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1020 msgid "write index in this format" msgstr "écrire l'index dans ce format" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1022 msgid "enable or disable split index" msgstr "activer ou désactiver l'index divisé" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:1024 msgid "enable/disable untracked cache" msgstr "activer ou désactiver le cache de non-suivis" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1026 msgid "test if the filesystem supports untracked cache" msgstr "tester si le système de fichier supporte le cache de non-suivis" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1028 msgid "enable untracked cache without testing the filesystem" msgstr "activer le cache de non-suivis sans tester le système de fichier" -#: builtin/update-index.c:1134 +#: builtin/update-index.c:1030 +msgid "write out the index even if is not flagged as changed" +msgstr "écrire l'index même s'il n'est pas marqué comme modifié" + +#: builtin/update-index.c:1032 +msgid "enable or disable file system monitor" +msgstr "" +"activer ou désactiver la surveillance du système de fichier (fsmonitor)" + +#: builtin/update-index.c:1034 +msgid "mark files as fsmonitor valid" +msgstr "marquer les fichiers comme valides pour fsmonitor" + +#: builtin/update-index.c:1037 +msgid "clear fsmonitor valid bit" +msgstr "effacer le bit de validité fsmonitor" + +#: builtin/update-index.c:1136 +msgid "" +"core.splitIndex is set to false; remove or change it, if you really want to " +"enable split index" +msgstr "" +"core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous " +"souhaitez vraiment activer l'index coupé" + +#: builtin/update-index.c:1145 +msgid "" +"core.splitIndex is set to true; remove or change it, if you really want to " +"disable split index" +msgstr "" +"core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous " +"souhaitez vraiment désactiver l'index coupé" + +#: builtin/update-index.c:1156 +msgid "" +"core.untrackedCache is set to true; remove or change it, if you really want " +"to disable the untracked cache" +msgstr "" +"core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous " +"souhaitez vraiment désactiver le cache des fichiers non-suivis" + +#: builtin/update-index.c:1160 msgid "Untracked cache disabled" msgstr "Le cache non suivi est désactivé" -#: builtin/update-index.c:1146 +#: builtin/update-index.c:1168 +msgid "" +"core.untrackedCache is set to false; remove or change it, if you really want " +"to enable the untracked cache" +msgstr "" +"core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous " +"souhaitez vraiment activer le cache des fichiers non-suivis" + +#: builtin/update-index.c:1172 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Le cache non suivi est activé pour '%s'" -#: builtin/update-ref.c:9 +#: builtin/update-index.c:1180 +msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" +msgstr "" +"core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment " +"activer la surveillance du système de fichiers" + +#: builtin/update-index.c:1184 +msgid "fsmonitor enabled" +msgstr "fsmonitor activé" + +#: builtin/update-index.c:1187 +msgid "" +"core.fsmonitor is set; remove it if you really want to disable fsmonitor" +msgstr "" +"core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous " +"souhaitez vraiment désactiver la surveillance du système de fichiers" + +#: builtin/update-index.c:1191 +msgid "fsmonitor disabled" +msgstr "fsmonitor désactivé" + +#: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]" -#: builtin/update-ref.c:10 +#: builtin/update-ref.c:11 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "" "git update-ref [<options>] <nom-référence> <nouvelle-valeur> [<ancienne-" "valeur>]" -#: builtin/update-ref.c:11 +#: builtin/update-ref.c:12 msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<options>] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:364 msgid "delete the reference" msgstr "supprimer la référence" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:366 msgid "update <refname> not the one it points to" msgstr "mettre à jour <nomréférence> et non la référence pointée par lui" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:367 msgid "stdin has NUL-terminated arguments" msgstr "l'entrée standard a des arguments qui se terminent par NUL" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:368 msgid "read updates from stdin" msgstr "lire les mises à jour depuis l'entrée standard" -#: builtin/update-server-info.c:6 +#: builtin/update-server-info.c:7 msgid "git update-server-info [--force]" msgstr "git update-server-info [--force]" -#: builtin/update-server-info.c:14 +#: builtin/update-server-info.c:15 msgid "update the info files from scratch" msgstr "mettre à jour les fichiers d'information à partir de zéro" -#: builtin/verify-commit.c:17 +#: builtin/upload-pack.c:11 +msgid "git upload-pack [<options>] <dir>" +msgstr "git upload-pack [<options>] <répertoire>" + +#: builtin/upload-pack.c:25 +msgid "exit immediately after initial ref advertisement" +msgstr "Sortir immédiatement après l'annonce initiale des références" + +#: builtin/upload-pack.c:27 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "" +"nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire " +"Git" + +#: builtin/upload-pack.c:29 +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "interrompre le transfert après <n> secondes d'inactivité" + +#: builtin/verify-commit.c:20 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <commit>..." -#: builtin/verify-commit.c:72 +#: builtin/verify-commit.c:76 msgid "print commit contents" msgstr "afficher le contenu du commit" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 +#: builtin/verify-commit.c:77 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "afficher les messages bruts de gpg" -#: builtin/verify-pack.c:54 +#: builtin/verify-pack.c:55 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -#: builtin/verify-pack.c:64 +#: builtin/verify-pack.c:65 msgid "verbose" msgstr "verbeux" -#: builtin/verify-pack.c:66 +#: builtin/verify-pack.c:67 msgid "show statistics only" msgstr "afficher seulement les statistiques" -#: builtin/verify-tag.c:17 -msgid "git verify-tag [-v | --verbose] <tag>..." -msgstr "git verify-tag [-v | --verbose] <étiquette>..." +#: builtin/verify-tag.c:19 +msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." +msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..." -#: builtin/verify-tag.c:34 +#: builtin/verify-tag.c:37 msgid "print tag contents" msgstr "afficher le contenu de l'étiquette" -#: builtin/worktree.c:15 -msgid "git worktree add [<options>] <path> [<branch>]" -msgstr "git worktree add [<options>] <chemin> [<branche>]" +#: builtin/worktree.c:17 +msgid "git worktree add [<options>] <path> [<commit-ish>]" +msgstr "git worktree add [<options>] <chemin> [<commit>]" + +#: builtin/worktree.c:18 +msgid "git worktree list [<options>]" +msgstr "git worktree list [<options>]" + +#: builtin/worktree.c:19 +msgid "git worktree lock [<options>] <path>" +msgstr "git worktree lock [<options>] <chemin>" -#: builtin/worktree.c:16 +#: builtin/worktree.c:20 +msgid "git worktree move <worktree> <new-path>" +msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>" + +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<options>]" -#: builtin/worktree.c:17 -msgid "git worktree list [<options>]" -msgstr "git worktree prune [<options>]" +#: builtin/worktree.c:22 +msgid "git worktree remove [<options>] <worktree>" +msgstr "git worktree remove [<options>] <arbre-de-travail>" + +#: builtin/worktree.c:23 +msgid "git worktree unlock <path>" +msgstr "git worktree unlock <chemin>" -#: builtin/worktree.c:40 +#: builtin/worktree.c:59 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Suppression de worktrees/%s : répertoire invalide" -#: builtin/worktree.c:46 +#: builtin/worktree.c:65 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas" -#: builtin/worktree.c:51 +#: builtin/worktree.c:70 builtin/worktree.c:79 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)" -#: builtin/worktree.c:62 +#: builtin/worktree.c:89 +#, c-format +msgid "" +"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " +"%<PRIuMAX>)" +msgstr "" +"Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets " +"attendus, %<PRIuMAX> octets lus)" + +#: builtin/worktree.c:97 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Suppression de worktrees/%s : fichier gitdir invalide" -#: builtin/worktree.c:78 +#: builtin/worktree.c:106 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Suppression de worktrees/%s : le fichier gitdir point sur un endroit " "inexistant" -#: builtin/worktree.c:113 -#, c-format -msgid "failed to remove '%s'" -msgstr "échec de la suppression de '%s'" +#: builtin/worktree.c:153 +msgid "report pruned working trees" +msgstr "afficher les arbres de travail éliminés" + +#: builtin/worktree.c:155 +msgid "expire working trees older than <time>" +msgstr "faire expirer les arbres de travail plus vieux que <temps>" -#: builtin/worktree.c:202 +#: builtin/worktree.c:230 #, c-format msgid "'%s' already exists" msgstr "'%s' existe déjà" -#: builtin/worktree.c:234 +#: builtin/worktree.c:261 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:270 +#: builtin/worktree.c:380 builtin/worktree.c:386 #, c-format -msgid "Preparing %s (identifier %s)" -msgstr "Préparation de %s (identifiant %s)" +msgid "Preparing worktree (new branch '%s')" +msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')" -#: builtin/worktree.c:322 +#: builtin/worktree.c:382 +#, 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:391 +#, c-format +msgid "Preparing worktree (checking out '%s')" +msgstr "Préparation de l'arbre de travail (extraction de '%s')" + +#: builtin/worktree.c:397 +#, c-format +msgid "Preparing worktree (detached HEAD %s)" +msgstr "Préparation de l'arbre de travail (HEAD détachée %s)" + +#: builtin/worktree.c:438 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:324 +#: builtin/worktree.c:441 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:326 +#: builtin/worktree.c:443 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:327 -msgid "detach HEAD at named commit" -msgstr "détacher la HEAD au commit nommé" - -#: builtin/worktree.c:328 +#: builtin/worktree.c:445 msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" -#: builtin/worktree.c:336 +#: builtin/worktree.c:446 +msgid "keep the new working tree locked" +msgstr "conserver le verrou sur le nouvel arbre de travail" + +#: builtin/worktree.c:449 +msgid "set up tracking mode (see git-branch(1))" +msgstr "régler le mode de suivi (voir git-branch(1))" + +#: builtin/worktree.c:452 +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:460 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/write-tree.c:13 +#: builtin/worktree.c:521 +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:621 +msgid "reason for locking" +msgstr "raison du verrouillage" + +#: builtin/worktree.c:633 builtin/worktree.c:666 builtin/worktree.c:720 +#: builtin/worktree.c:860 +#, c-format +msgid "'%s' is not a working tree" +msgstr "'%s' n'est pas une copie de travail" + +#: builtin/worktree.c:635 builtin/worktree.c:668 +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:640 +#, c-format +msgid "'%s' is already locked, reason: %s" +msgstr "'%s' est déjà verrouillé, car '%s'" + +#: builtin/worktree.c:642 +#, c-format +msgid "'%s' is already locked" +msgstr "'%s' est déjà verrouillé" + +#: builtin/worktree.c:670 +#, c-format +msgid "'%s' is not locked" +msgstr "'%s' n'est pas verrouillé" + +#: builtin/worktree.c:695 +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:722 builtin/worktree.c:862 +#, c-format +msgid "'%s' is a main working tree" +msgstr "'%s' est un arbre de travail principal" + +#: builtin/worktree.c:727 +#, 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:733 +#, c-format +msgid "target '%s' already exists" +msgstr "la cible '%s' existe déjà" + +#: builtin/worktree.c:740 +#, c-format +msgid "cannot move a locked working tree, lock reason: %s" +msgstr "" +"impossible de déplacer un arbre de travail verrouillé, raison du " +"verrouillage : %s" + +#: builtin/worktree.c:742 +msgid "cannot move a locked working tree" +msgstr "impossible de déplacer un arbre de travail verrouillé" + +#: builtin/worktree.c:745 +#, 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:750 +#, c-format +msgid "failed to move '%s' to '%s'" +msgstr "échec au déplacement de '%s' vers '%s'" + +#: builtin/worktree.c:798 +#, c-format +msgid "failed to run 'git status' on '%s'" +msgstr "échec du lancement de 'git status' sur '%s'" + +#: builtin/worktree.c:802 +#, c-format +msgid "'%s' is dirty, use --force to delete it" +msgstr "'%s' est sale, utilisez --force pour le supprimer" + +#: builtin/worktree.c:807 +#, 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:818 builtin/worktree.c:832 +#, c-format +msgid "failed to delete '%s'" +msgstr "échec de la suppression de '%s'" + +#: builtin/worktree.c:844 +msgid "force removing even if the worktree is dirty" +msgstr "forcer la suppression même si l'arbre de travail est sale" + +#: builtin/worktree.c:866 +#, c-format +msgid "cannot remove a locked working tree, lock reason: %s" +msgstr "" +"impossible de supprimer un arbre de travail verrouillé, raison du " +"verrouillage : %s" + +#: builtin/worktree.c:868 +msgid "cannot remove a locked working tree" +msgstr "impossible de supprimer un arbre de travail verrouillé" + +#: builtin/worktree.c:871 +#, c-format +msgid "validation failed, cannot remove working tree: %s" +msgstr "" +"la validation a échoué, impossible de supprimer l'arbre de travail : %s" + +#: builtin/write-tree.c:14 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<préfixe>/]" -#: builtin/write-tree.c:26 +#: builtin/write-tree.c:27 msgid "<prefix>/" msgstr "<préfixe>/" -#: builtin/write-tree.c:27 +#: builtin/write-tree.c:28 msgid "write tree object for a subdirectory <prefix>" msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" @@ -11995,11 +17409,41 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le débogage" +#: credential-cache--daemon.c:222 +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "" +"Les permissions de votre répertoire de socket sont trop permissives ;\n" +"les autres utilisateurs pourraient lire vos identifiants secrets. Lancez :\n" +"\n" +" chmod 0700 %s" + #: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "afficher les messages de debug sur stderr" -#: git.c:14 +#: git.c:27 +msgid "" +"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" +" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"bare]\n" +" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\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" +" [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n" +" <commande> [<args>]" + +#: git.c:34 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" @@ -12009,169 +17453,799 @@ msgstr "" "quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n" "pour en lire plus à propos d'une commande spécifique ou d'un concept." -#: http.c:322 +#: git.c:173 +#, c-format +msgid "no directory given for --git-dir\n" +msgstr "aucun répertoire fourni pour --git-dir\n" + +#: git.c:187 +#, c-format +msgid "no namespace given for --namespace\n" +msgstr "aucun espace de nom fournit pour --namespace\n" + +#: git.c:201 +#, c-format +msgid "no directory given for --work-tree\n" +msgstr "aucun répertoire fourni pour --work-tree\n" + +#: git.c:215 +#, c-format +msgid "no prefix given for --super-prefix\n" +msgstr "aucun préfixe fourni pour --super-prefix\n" + +#: git.c:237 +#, c-format +msgid "-c expects a configuration string\n" +msgstr "-c requiert une chaîne de configuration\n" + +#: git.c:275 +#, c-format +msgid "no directory given for -C\n" +msgstr "aucun répertoire fourni pour -C\n" + +#: git.c:300 +#, c-format +msgid "unknown option: %s\n" +msgstr "option inconnue : %s\n" + +#: git.c:770 +#, 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:782 +#, c-format +msgid "failed to run command '%s': %s\n" +msgstr "échec au lancement de la commande '%s' : %s\n" + +#: http.c:348 +#, c-format +msgid "negative value for http.postbuffer; defaulting to %d" +msgstr "" +"valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d" + +#: http.c:369 +msgid "Delegation control is not supported with cURL < 7.22.0" +msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0" + +#: http.c:378 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0" -#: common-cmds.h:9 -msgid "start a working area (see also: git help tutorial)" -msgstr "démarrer une zone de travail (voir aussi : git help tutorial)" - -#: common-cmds.h:10 -msgid "work on the current change (see also: git help everyday)" +#: http.c:1854 +#, c-format +msgid "" +"unable to update url base from redirection:\n" +" asked for: %s\n" +" redirect: %s" msgstr "" -"travailler sur la modification actuelle (voir aussi : git help revisions)" +"impossible de mettre à jour la base de l'url depuis la redirection :\n" +" demandé : %s\n" +" redirection : %s" -#: common-cmds.h:11 -msgid "examine the history and state (see also: git help revisions)" -msgstr "examiner l'historique et l'état (voir aussi : git help revisions)" +#: remote-curl.c:401 +#, c-format +msgid "redirecting to %s" +msgstr "redirection vers %s" -#: common-cmds.h:12 -msgid "grow, mark and tweak your common history" -msgstr "agrandir, marquer et modifier votre historique" +#: list-objects-filter-options.h:59 +msgid "args" +msgstr "args" -#: common-cmds.h:13 -msgid "collaborate (see also: git help workflows)" -msgstr "collaborer (voir aussi : git help workflows)" +#: list-objects-filter-options.h:60 +msgid "object filtering" +msgstr "filtrage d'objet" -#: common-cmds.h:17 +#: parse-options.h:157 +msgid "expiry-date" +msgstr "date-d'expiration" + +#: parse-options.h:172 +msgid "no-op (backward compatibility)" +msgstr "sans action (rétrocompatibilité)" + +#: parse-options.h:251 +msgid "be more verbose" +msgstr "être plus verbeux" + +#: parse-options.h:253 +msgid "be more quiet" +msgstr "être plus silencieux" + +#: parse-options.h:259 +msgid "use <n> digits to display SHA-1s" +msgstr "utiliser <n> chiffres pour afficher les SHA-1s" + +#: command-list.h:50 msgid "Add file contents to the index" msgstr "Ajouter le contenu de fichiers dans l'index" -#: common-cmds.h:18 +#: command-list.h:51 +msgid "Apply a series of patches from a mailbox" +msgstr "Appliquer une série de patchs depuis une boîte mail" + +#: command-list.h:52 +msgid "Annotate file lines with commit information" +msgstr "Annoter les lignes du fichier avec l'information de commit" + +#: command-list.h:53 +msgid "Apply a patch to files and/or to the index" +msgstr "Appliquer une patch à des fichiers ou à l'index" + +#: command-list.h:54 +msgid "Import an Arch repository into Git" +msgstr "Importer dans Git un dépôt Arch" + +#: command-list.h:55 +msgid "Create an archive of files from a named tree" +msgstr "Créer une archive des fichiers depuis un arbre nommé" + +#: command-list.h:56 msgid "Use binary search to find the commit that introduced a bug" msgstr "Trouver par recherche binaire la modification qui a introduit un bogue" -#: common-cmds.h:19 +#: command-list.h:57 +msgid "Show what revision and author last modified each line of a file" +msgstr "" +"Montrer la révision et l'auteur qui ont modifié en dernier chaque ligne d'un " +"fichier" + +#: command-list.h:58 msgid "List, create, or delete branches" msgstr "Lister, créer ou supprimer des branches" -#: common-cmds.h:20 +#: command-list.h:59 +msgid "Move objects and refs by archive" +msgstr "Déplacer les objets et références par archive" + +#: command-list.h:60 +msgid "Provide content or type and size information for repository objects" +msgstr "" +"Fournir les contenu ou l'information de type et taille pour les objets du " +"dépôt" + +#: command-list.h:61 +msgid "Display gitattributes information" +msgstr "Afficher les informations gitattributes" + +#: command-list.h:62 +msgid "Debug gitignore / exclude files" +msgstr "Déboguer gitignore / les fichiers d'exclusion" + +#: command-list.h:63 +msgid "Show canonical names and email addresses of contacts" +msgstr "Afficher les noms canoniques et les adresses courriel des contacts" + +#: command-list.h:64 msgid "Switch branches or restore working tree files" msgstr "Basculer de branche ou restaurer la copie de travail" -#: common-cmds.h:21 +#: command-list.h:65 +msgid "Copy files from the index to the working tree" +msgstr "Copier les fichiers depuis l'index dans la copie de travail" + +#: command-list.h:66 +msgid "Ensures that a reference name is well formed" +msgstr "Assure qu'un nom de référence est bien formé" + +#: command-list.h:67 +msgid "Find commits yet to be applied to upstream" +msgstr "Trouver les commits à appliquer en amont" + +#: command-list.h:68 +msgid "Apply the changes introduced by some existing commits" +msgstr "Appliquer les modifications introduites par des commits existants" + +#: command-list.h:69 +msgid "Graphical alternative to git-commit" +msgstr "Alternative graphique à git-commit" + +#: command-list.h:70 +msgid "Remove untracked files from the working tree" +msgstr "Supprimer les fichiers non-suivis de l'arbre de travail" + +#: command-list.h:71 msgid "Clone a repository into a new directory" msgstr "Cloner un dépôt dans un nouveau répertoire" -#: common-cmds.h:22 +#: command-list.h:72 +msgid "Display data in columns" +msgstr "Afficher les données en colonnes" + +#: command-list.h:73 msgid "Record changes to the repository" msgstr "Enregistrer les modifications dans le dépôt" -#: common-cmds.h:23 +#: command-list.h:74 +msgid "Write and verify Git commit graph files" +msgstr "Écrire et vérifier les fichiers de graphe de commit Git" + +#: command-list.h:75 +msgid "Create a new commit object" +msgstr "Créer un nouvel objet commit" + +#: command-list.h:76 +msgid "Get and set repository or global options" +msgstr "voir et régler les options globales ou de dépôt" + +#: command-list.h:77 +msgid "Count unpacked number of objects and their disk consumption" +msgstr "" +"Compter le nombre d'objets non-empaquetés et leur consommation d'espace " +"disque" + +#: command-list.h:78 +msgid "Retrieve and store user credentials" +msgstr "Récupérer et sauvegarder les certificats d'utilisateur" + +#: command-list.h:79 +msgid "Helper to temporarily store passwords in memory" +msgstr "Assistant pour maintenir temporairement en mémoire les mots de passe" + +#: command-list.h:80 +msgid "Helper to store credentials on disk" +msgstr "Assistant pour sauvegarder les certificats sur disque" + +#: command-list.h:81 +msgid "Export a single commit to a CVS checkout" +msgstr "Exporter un commit unique en extraction CVS" + +#: command-list.h:82 +msgid "Salvage your data out of another SCM people love to hate" +msgstr "Sauver vos données depuis un autre SCM qu'on aime à haïr" + +#: command-list.h:83 +msgid "A CVS server emulator for Git" +msgstr "Un émulateur de serveur CVS pour Git" + +#: command-list.h:84 +msgid "A really simple server for Git repositories" +msgstr "Un serveur vraiment simple pour les dépôts Git" + +#: command-list.h:85 +msgid "Give an object a human readable name based on an available ref" +msgstr "" +"Baptiser un objet avec un nom lisible à partir d'une référence disponible" + +#: command-list.h:86 msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Afficher les changements entre les validations, entre validation et copie de " "travail, etc" -#: common-cmds.h:24 +#: command-list.h:87 +msgid "Compares files in the working tree and the index" +msgstr "Compare des fichiers de l'arbre de travail et de l'index" + +#: command-list.h:88 +msgid "Compare a tree to the working tree or index" +msgstr "Comparer un arbre avec l'arbre de travail ou l'index" + +#: command-list.h:89 +msgid "Compares the content and mode of blobs found via two tree objects" +msgstr "Compare le contenu et la mode des blobs trouvés via deux objets arbre" + +#: command-list.h:90 +msgid "Show changes using common diff tools" +msgstr "Afficher les modifications en utilisant les outils habituel de diff" + +#: command-list.h:91 +msgid "Git data exporter" +msgstr "Exporteur de données Git" + +#: command-list.h:92 +msgid "Backend for fast Git data importers" +msgstr "Moteur pour les importateurs rapides de données Git" + +#: command-list.h:93 msgid "Download objects and refs from another repository" msgstr "Télécharger les objets et références depuis un autre dépôt" -#: common-cmds.h:25 +#: command-list.h:94 +msgid "Receive missing objects from another repository" +msgstr "Télécharger les objets manquants depuis un autre dépôt" + +#: command-list.h:95 +msgid "Rewrite branches" +msgstr "Réécrire les branches" + +#: command-list.h:96 +msgid "Produce a merge commit message" +msgstr "Produire un message de validation de fusion" + +#: command-list.h:97 +msgid "Output information on each ref" +msgstr "Afficher l'information de chaque référence" + +#: command-list.h:98 +msgid "Prepare patches for e-mail submission" +msgstr "Préparer les patchs pour soumission par courriel" + +#: command-list.h:99 +msgid "Verifies the connectivity and validity of the objects in the database" +msgstr "" +"Vérifier la connectivité et la validité des objets dans la base de données" + +#: command-list.h:100 +msgid "Cleanup unnecessary files and optimize the local repository" +msgstr "Effacer les fichiers non-nécessaires et optimiser le dépôt local" + +#: command-list.h:101 +msgid "Extract commit ID from an archive created using git-archive" +msgstr "Extraire l'ID du commit depuis une archive créée par git-archive" + +#: command-list.h:102 msgid "Print lines matching a pattern" msgstr "Afficher les lignes correspondant à un motif" -#: common-cmds.h:26 +#: command-list.h:103 +msgid "A portable graphical interface to Git" +msgstr "Une interface graphique portable pour Git" + +#: command-list.h:104 +msgid "Compute object ID and optionally creates a blob from a file" +msgstr "" +"Calculer l'ID d'objet et créer optionnellement un blob depuis un fichier" + +#: command-list.h:105 +msgid "Display help information about Git" +msgstr "Afficher l'information d'aide à propos de Git" + +#: command-list.h:106 +msgid "Server side implementation of Git over HTTP" +msgstr "Implantation côté serveur de Git sur HTTP" + +#: command-list.h:107 +msgid "Download from a remote Git repository via HTTP" +msgstr "Télécharger depuis un dépôt Git distant via HTTP" + +#: command-list.h:108 +msgid "Push objects over HTTP/DAV to another repository" +msgstr "Pousser les objets sur un autre dépôt via HTTP/DAV" + +#: command-list.h:109 +msgid "Send a collection of patches from stdin to an IMAP folder" +msgstr "Envoyer un ensemble de patchs depuis stdin vers un répertoire IMAP" + +#: command-list.h:110 +msgid "Build pack index file for an existing packed archive" +msgstr "" +"Construire un fichier d'index pack depuis une archive compactée existante" + +#: command-list.h:111 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Créer un dépôt Git vide ou réinitialiser un existant" -#: common-cmds.h:27 +#: command-list.h:112 +msgid "Instantly browse your working repository in gitweb" +msgstr "Naviguer instantanément votre dépôt de travail dans gitweb" + +#: command-list.h:113 +msgid "add or parse structured information in commit messages" +msgstr "" +"ajouter ou analyser l'information structurée dans les messages de validation" + +#: command-list.h:114 +msgid "The Git repository browser" +msgstr "Le navigateur de dépôt Git" + +#: command-list.h:115 msgid "Show commit logs" msgstr "Afficher l'historique des validations" -#: common-cmds.h:28 +#: command-list.h:116 +msgid "Show information about files in the index and the working tree" +msgstr "" +"Afficher l'information à propos des fichiers dans l'index ou l'arbre de " +"travail" + +#: command-list.h:117 +msgid "List references in a remote repository" +msgstr "Lister les références dans un dépôt distant" + +#: command-list.h:118 +msgid "List the contents of a tree object" +msgstr "Afficher le contenu d'un objet arbre" + +#: command-list.h:119 +msgid "Extracts patch and authorship from a single e-mail message" +msgstr "" +"Extraire le patch et l'information de d'auteur depuis un simple message de " +"courriel" + +#: command-list.h:120 +msgid "Simple UNIX mbox splitter program" +msgstr "Programme simple de découpage de mbox UNIX" + +#: command-list.h:121 msgid "Join two or more development histories together" msgstr "Fusionner deux ou plusieurs historiques de développement ensemble" -#: common-cmds.h:29 +#: command-list.h:122 +msgid "Find as good common ancestors as possible for a merge" +msgstr "Trouver un ancêtre aussi bon que possible pour une fusion" + +#: command-list.h:123 +msgid "Run a three-way file merge" +msgstr "Lancer une fusion à 3 points" + +#: command-list.h:124 +msgid "Run a merge for files needing merging" +msgstr "Lancer une fusion à 3 points pour les fichiers à fusionner" + +#: command-list.h:125 +msgid "The standard helper program to use with git-merge-index" +msgstr "Le programme assistant standard à utiliser avec git-merge-index" + +#: command-list.h:126 +msgid "Run merge conflict resolution tools to resolve merge conflicts" +msgstr "" +"Lancer les outils de résolution de conflit de fusion pour résoudre les " +"conflits de fusion" + +#: command-list.h:127 +msgid "Show three-way merge without touching index" +msgstr "Afficher la fusion à trois points sans modifier l'index" + +#: command-list.h:128 +msgid "Creates a tag object" +msgstr "Créer un objet étiquette" + +#: command-list.h:129 +msgid "Build a tree-object from ls-tree formatted text" +msgstr "Construire un objet arbre depuis une texte formaté comme ls-tree" + +#: command-list.h:130 msgid "Move or rename a file, a directory, or a symlink" msgstr "Déplacer ou renommer un fichier, un répertoire, ou un lien symbolique" -#: common-cmds.h:30 +#: command-list.h:131 +msgid "Find symbolic names for given revs" +msgstr "Trouver les noms symboliques pour des révisions données" + +#: command-list.h:132 +msgid "Add or inspect object notes" +msgstr "Ajouter ou inspecter les notes d'un objets" + +#: command-list.h:133 +msgid "Import from and submit to Perforce repositories" +msgstr "Importer et soumettre à des dépôt Perforce" + +#: command-list.h:134 +msgid "Create a packed archive of objects" +msgstr "Créer une archive compactée d'objets" + +#: command-list.h:135 +msgid "Find redundant pack files" +msgstr "Trouver les fichiers pack redondants" + +#: command-list.h:136 +msgid "Pack heads and tags for efficient repository access" +msgstr "Empaqueter les têtes et les étiquettes pour un accès efficace au dépôt" + +#: command-list.h:137 +msgid "Routines to help parsing remote repository access parameters" +msgstr "" +"Routines pour aider à analyser les paramètres d'accès aux dépôts distants" + +#: command-list.h:138 +msgid "Compute unique ID for a patch" +msgstr "Calculer l'ID unique d'un patch" + +#: command-list.h:139 +msgid "Prune all unreachable objects from the object database" +msgstr "" +"Éliminer les objets inatteignables depuis la base de données des objets" + +#: command-list.h:140 +msgid "Remove extra objects that are already in pack files" +msgstr "Éliminer les objets qui sont déjà présents dans les fichiers pack" + +#: command-list.h:141 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Rapatrier et intégrer un autre dépôt ou une branche locale" -#: common-cmds.h:31 +#: command-list.h:142 msgid "Update remote refs along with associated objects" msgstr "Mettre à jour les références distantes ainsi que les objets associés" -#: common-cmds.h:32 +#: command-list.h:143 +msgid "Applies a quilt patchset onto the current branch" +msgstr "Appliquer un patchset quilt sur la branche courante" + +#: command-list.h:144 +msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" +"Comparer deux plages de commits (par exemple deux versions d'une branche)" + +#: command-list.h:145 +msgid "Reads tree information into the index" +msgstr "Lire l'information d'arbre dans l'index" + +#: command-list.h:146 msgid "Reapply commits on top of another base tip" msgstr "Réapplication des commits sur le sommet de l'autre base" -#: common-cmds.h:33 +#: command-list.h:147 +msgid "Receive what is pushed into the repository" +msgstr "Recevoir ce qui est poussé dans le dépôt" + +#: command-list.h:148 +msgid "Manage reflog information" +msgstr "Gérer l'information de reflog" + +#: command-list.h:149 +msgid "Manage set of tracked repositories" +msgstr "Gérer un ensemble de dépôts suivis" + +#: command-list.h:150 +msgid "Pack unpacked objects in a repository" +msgstr "Empaqueter les objets non-empaquetés d'un dépôt" + +#: command-list.h:151 +msgid "Create, list, delete refs to replace objects" +msgstr "Créer, lister, supprimer des référence pour remplacer des objets" + +#: command-list.h:152 +msgid "Generates a summary of pending changes" +msgstr "Générer une résumé des modifications en attentes" + +#: command-list.h:153 +msgid "Reuse recorded resolution of conflicted merges" +msgstr "Réutiliser une résolution enregistrée de fusions conflictuelles" + +#: command-list.h:154 msgid "Reset current HEAD to the specified state" msgstr "Réinitialiser la HEAD courante à l'état spécifié" -#: common-cmds.h:34 +#: command-list.h:155 +msgid "Revert some existing commits" +msgstr "Inverser des commits existants" + +#: command-list.h:156 +msgid "Lists commit objects in reverse chronological order" +msgstr "Afficher les objets commit dans l'ordre chronologique inverse" + +#: command-list.h:157 +msgid "Pick out and massage parameters" +msgstr "Analyser et préparer les paramètres" + +#: command-list.h:158 msgid "Remove files from the working tree and from the index" msgstr "Supprimer des fichiers de la copie de travail et de l'index" -#: common-cmds.h:35 +#: command-list.h:159 +msgid "Send a collection of patches as emails" +msgstr "Envoyer un ensemble de patchs comme courriels" + +#: command-list.h:160 +msgid "Push objects over Git protocol to another repository" +msgstr "Pousser les objets sur un autre dépôt via le protocole Git" + +#: command-list.h:161 +msgid "Restricted login shell for Git-only SSH access" +msgstr "shell de login restreint pour un accès SSH vers Git seulement" + +#: command-list.h:162 +msgid "Summarize 'git log' output" +msgstr "Résumer la sortie de 'git log'" + +#: command-list.h:163 msgid "Show various types of objects" msgstr "Afficher différents types d'objets" -#: common-cmds.h:36 +#: command-list.h:164 +msgid "Show branches and their commits" +msgstr "Afficher les branches et leurs commits" + +#: command-list.h:165 +msgid "Show packed archive index" +msgstr "Afficher l'index de l'archive empaquetée" + +#: command-list.h:166 +msgid "List references in a local repository" +msgstr "Lister les références du dépôt local" + +#: command-list.h:167 +msgid "Git's i18n setup code for shell scripts" +msgstr "Le code d'initialisation i18n pour les scripts shell" + +#: command-list.h:168 +msgid "Common Git shell script setup code" +msgstr "Le code d'initialisation commun aux scripts shell Git" + +#: command-list.h:169 +msgid "Stash the changes in a dirty working directory away" +msgstr "Remiser les modifications d'un répertoire de travail sale" + +#: command-list.h:170 +msgid "Add file contents to the staging area" +msgstr "Ajouter le contenu de fichiers à l'index" + +#: command-list.h:171 msgid "Show the working tree status" -msgstr "Afficher le statut de la copie de travail" +msgstr "Afficher l'état de la copie de travail" + +#: command-list.h:172 +msgid "Remove unnecessary whitespace" +msgstr "Retirer les espaces inutiles" -#: common-cmds.h:37 +#: command-list.h:173 +msgid "Initialize, update or inspect submodules" +msgstr "Initialiser, mettre à jour et inspecter les sous-modules" + +#: command-list.h:174 +msgid "Bidirectional operation between a Subversion repository and Git" +msgstr "Opération Bidirectionnelles entre un dépôt Subversion et Git" + +#: command-list.h:175 +msgid "Read, modify and delete symbolic refs" +msgstr "Lire, modifier et supprimer les références symboliques" + +#: command-list.h:176 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" "Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG" -#: parse-options.h:145 -msgid "expiry-date" -msgstr "date-d'expiration" +#: command-list.h:177 +msgid "Creates a temporary file with a blob's contents" +msgstr "Créer un fichier temporaire avec le contenu d'un blob" -#: parse-options.h:160 -msgid "no-op (backward compatibility)" -msgstr "sans action (rétrocompatibilité)" +#: command-list.h:178 +msgid "Unpack objects from a packed archive" +msgstr "Dépaqueter les objets depuis une archive empaquetée" -#: parse-options.h:237 -msgid "be more verbose" -msgstr "être plus verbeux" +#: command-list.h:179 +msgid "Register file contents in the working tree to the index" +msgstr "Enregistrer le contenu d'un fichier de l'arbre de travail dans l'index" -#: parse-options.h:239 -msgid "be more quiet" -msgstr "être plus silencieux" +#: command-list.h:180 +msgid "Update the object name stored in a ref safely" +msgstr "" +"Mettre à jour le nom d'objet stocké dans une référence en toute sécurité" -#: parse-options.h:245 -msgid "use <n> digits to display SHA-1s" -msgstr "utiliser <n> chiffres pour afficher les SHA-1s" +#: command-list.h:181 +msgid "Update auxiliary info file to help dumb servers" +msgstr "" +"Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs " +"idiots" + +#: command-list.h:182 +msgid "Send archive back to git-archive" +msgstr "Renvoyer une archive dans git-archive" + +#: command-list.h:183 +msgid "Send objects packed back to git-fetch-pack" +msgstr "Renvoyer des objets empaquetés dans git-fetch-pack" + +#: command-list.h:184 +msgid "Show a Git logical variable" +msgstr "Afficher un variable logique de Git" + +#: command-list.h:185 +msgid "Check the GPG signature of commits" +msgstr "Vérifier la signature GPG de commits" + +#: command-list.h:186 +msgid "Validate packed Git archive files" +msgstr "Valider des fichiers d'archive Git empaquetés" + +#: command-list.h:187 +msgid "Check the GPG signature of tags" +msgstr "Vérifier la signature GPG d'étiquettes" + +#: command-list.h:188 +msgid "Git web interface (web frontend to Git repositories)" +msgstr "Interface web de Git" + +#: command-list.h:189 +msgid "Show logs with difference each commit introduces" +msgstr "Afficher les journaux avec la différence que chaque commit introduit" + +#: command-list.h:190 +msgid "Manage multiple working trees" +msgstr "Gère de arbres de travail multiples" + +#: command-list.h:191 +msgid "Create a tree object from the current index" +msgstr "Créer un objet arbre depuis l'index courant" + +#: command-list.h:192 +msgid "Defining attributes per path" +msgstr "Définition des attributs par chemin" + +#: command-list.h:193 +msgid "Git command-line interface and conventions" +msgstr "interface en ligne de commande et conventions de Git" + +#: command-list.h:194 +msgid "A Git core tutorial for developers" +msgstr "Tutoriel du cœur de Git pour les développeurs" + +#: command-list.h:195 +msgid "Git for CVS users" +msgstr "Git pour les utilisateurs de CVS" + +#: command-list.h:196 +msgid "Tweaking diff output" +msgstr "Bidouillage de la sortie diff" + +#: command-list.h:197 +msgid "A useful minimum set of commands for Everyday Git" +msgstr "Un ensemble minimal utile des commandes de Git pour tous les jours" + +#: command-list.h:198 +msgid "A Git Glossary" +msgstr "Un glossaire Git" + +#: command-list.h:199 +msgid "Hooks used by Git" +msgstr "Crochets utilisés par Git" + +#: command-list.h:200 +msgid "Specifies intentionally untracked files to ignore" +msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement" + +#: command-list.h:201 +msgid "Defining submodule properties" +msgstr "Définition des propriétés de sous-module" + +#: command-list.h:202 +msgid "Git namespaces" +msgstr "Espaces de nom de Git" + +#: command-list.h:203 +msgid "Git Repository Layout" +msgstr "Disposition d'un dépôt Git" + +#: command-list.h:204 +msgid "Specifying revisions and ranges for Git" +msgstr "Spécification des révisions et portées pour Git" + +#: command-list.h:205 +msgid "A tutorial introduction to Git: part two" +msgstr "Une introduction pratique à Git : deuxième partie" + +#: command-list.h:206 +msgid "A tutorial introduction to Git" +msgstr "Une introduction pratique à Git" + +#: command-list.h:207 +msgid "An overview of recommended workflows with Git" +msgstr "Un aperçu des flux de travail recommandés avec Git" #: rerere.h:40 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" -#: git-bisect.sh:55 +#: git-bisect.sh:54 msgid "You need to start by \"git bisect start\"" msgstr "Vous devez démarrer avec \"git bisect start\"" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:61 +#: git-bisect.sh:60 msgid "Do you want me to do it for you [Y/n]? " msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? " -#: git-bisect.sh:122 +#: git-bisect.sh:121 #, sh-format msgid "unrecognised option: '$arg'" msgstr "option inconnue : '$arg'" -#: git-bisect.sh:126 +#: git-bisect.sh:125 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "'$arg' ne semble être une révision valide" -#: git-bisect.sh:155 +#: git-bisect.sh:154 msgid "Bad HEAD - I need a HEAD" msgstr "Mauvaise HEAD - j'ai besoin d'une HEAD" -#: git-bisect.sh:168 +#: git-bisect.sh:167 #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." @@ -12179,39 +18253,40 @@ msgstr "" "L'extraction de '$start_head' a échoué. Essayez 'git bisect reset <branche-" "valide>'." -#: git-bisect.sh:178 +#: git-bisect.sh:177 msgid "won't bisect on cg-seek'ed tree" msgstr "refus de bissecter sur un arbre 'cg-seeked'" -#: git-bisect.sh:182 +#: git-bisect.sh:181 msgid "Bad HEAD - strange symbolic ref" msgstr "Mauvaise HEAD - référence symbolique douteuse" -#: git-bisect.sh:234 +#: git-bisect.sh:233 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "Mauvais argument pour bisect_write : $state" -#: git-bisect.sh:263 +#: git-bisect.sh:246 #, sh-format msgid "Bad rev input: $arg" msgstr "Mauvaise révision en entrée : $arg" -#: git-bisect.sh:278 -msgid "Please call 'bisect_state' with at least one argument." -msgstr "Veuillez appeler 'bisect_state' avec au moins un argument." +#: git-bisect.sh:265 +#, sh-format +msgid "Bad rev input: $bisected_head" +msgstr "Mauvaise révision en entrée : $bisected_head" -#: git-bisect.sh:290 +#: git-bisect.sh:274 #, sh-format msgid "Bad rev input: $rev" msgstr "Mauvaise révision en entrée : $rev" -#: git-bisect.sh:299 +#: git-bisect.sh:283 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "'git bisect $TERM_BAD' n'accepte qu'un seul argument." -#: git-bisect.sh:322 +#: git-bisect.sh:306 #, sh-format msgid "Warning: bisecting only with a $TERM_BAD commit." msgstr "Attention : bissection avec seulement une validation $TERM_BAD." @@ -12219,11 +18294,11 @@ msgstr "Attention : bissection avec seulement une validation $TERM_BAD." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:328 +#: git-bisect.sh:312 msgid "Are you sure [Y/n]? " -msgstr "Êtes-vous sûr [Y/n] ? " +msgstr "Confirmez-vous [Y/n] ? " -#: git-bisect.sh:340 +#: git-bisect.sh:324 #, sh-format msgid "" "You need to give me at least one $bad_syn and one $good_syn revision.\n" @@ -12234,7 +18309,7 @@ msgstr "" "(Vous pouvez utiliser \"git bisect $bad_syn\" et \"git bisect $good_syn\" " "pour cela.)" -#: git-bisect.sh:343 +#: git-bisect.sh:327 #, sh-format msgid "" "You need to start by \"git bisect start\".\n" @@ -12247,16 +18322,16 @@ msgstr "" "(Vous pouvez utiliser \"git bisect $bad_syn\" et \"git bisect $good_syn\" " "pour cela.)" -#: git-bisect.sh:414 git-bisect.sh:546 +#: git-bisect.sh:398 git-bisect.sh:512 msgid "We are not bisecting." msgstr "Pas de bissection en cours." -#: git-bisect.sh:421 +#: git-bisect.sh:405 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "'$invalid' n'est pas une validation valide" -#: git-bisect.sh:430 +#: git-bisect.sh:414 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" @@ -12265,25 +18340,29 @@ msgstr "" "Échec d'extraction de la HEAD d'origine '$branch'.\n" "Essayez 'git bisect reset <commit>'." -#: git-bisect.sh:458 +#: git-bisect.sh:422 msgid "No logfile given" msgstr "Pas de fichier de log donné" -#: git-bisect.sh:459 +#: git-bisect.sh:423 #, sh-format msgid "cannot read $file for replaying" msgstr "impossible de lire $file pour rejouer" -#: git-bisect.sh:480 +#: git-bisect.sh:444 msgid "?? what are you talking about?" msgstr "?? de quoi parlez-vous ?" -#: git-bisect.sh:492 +#: git-bisect.sh:453 +msgid "bisect run failed: no command provided." +msgstr "la bissection a échoué : aucune commande fournie." + +#: git-bisect.sh:458 #, sh-format msgid "running $command" msgstr "lancement de $command" -#: git-bisect.sh:499 +#: git-bisect.sh:465 #, sh-format msgid "" "bisect run failed:\n" @@ -12292,11 +18371,11 @@ msgstr "" "la bissection a échoué :\n" "le code retour $res de '$command' est < 0 ou >= 128" -#: git-bisect.sh:525 +#: git-bisect.sh:491 msgid "bisect run cannot continue any more" msgstr "la bissection ne peut plus continuer" -#: git-bisect.sh:531 +#: git-bisect.sh:497 #, sh-format msgid "" "bisect run failed:\n" @@ -12305,41 +18384,22 @@ msgstr "" "la bissection a échoué :\n" "'bisect_state $state' a retourné le code erreur $res" -#: git-bisect.sh:538 +#: git-bisect.sh:504 msgid "bisect run success" msgstr "succès de la bissection" -#: git-bisect.sh:565 -msgid "please use two different terms" -msgstr "veuillez utiliser deux termes différents" - -#: git-bisect.sh:575 -#, sh-format -msgid "'$term' is not a valid term" -msgstr "'$term' n'est pas un terme valide" - -#: git-bisect.sh:578 -#, sh-format -msgid "can't use the builtin command '$term' as a term" -msgstr "impossible d'utiliser la commande incluse '$term' comme terme" - -#: git-bisect.sh:587 git-bisect.sh:593 -#, sh-format -msgid "can't change the meaning of term '$term'" -msgstr "impossible de modifier la signification du terme '$term'" - -#: git-bisect.sh:606 +#: git-bisect.sh:533 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" "Commande invalide : vous êtes actuellement dans une bissection $TERM_BAD/" "$TERM_GOOD." -#: git-bisect.sh:636 +#: git-bisect.sh:567 msgid "no terms defined" msgstr "aucun terme défini" -#: git-bisect.sh:653 +#: git-bisect.sh:584 #, sh-format msgid "" "invalid argument $arg for 'git bisect terms'.\n" @@ -12349,60 +18409,97 @@ msgstr "" "Les options supportées sont : --term-good|--term-old et --term-bad|--term-" "new." -#: git-rebase.sh:57 +#: git-merge-octopus.sh:46 msgid "" -"When you have resolved this problem, run \"git rebase --continue\".\n" -"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" -"To check out the original branch and stop rebasing, run \"git rebase --abort" -"\"." +"Error: Your local changes to the following files would be overwritten by " +"merge" +msgstr "" +"Erreur : vos modifications locales aux fichiers suivants seraient écrasées " +"par la fusion" + +#: git-merge-octopus.sh:61 +msgid "Automated merge did not work." +msgstr "La fusion automatique a échoué." + +#: git-merge-octopus.sh:62 +msgid "Should not be doing an octopus." +msgstr "L'Octopus ne devrait pas arriver." + +#: git-merge-octopus.sh:73 +#, sh-format +msgid "Unable to find common commit with $pretty_name" +msgstr "Impossible de trouver un commit commun avec $pretty_name" + +#: git-merge-octopus.sh:77 +#, sh-format +msgid "Already up to date with $pretty_name" +msgstr "Déjà à jour avec $pretty_name" + +#: git-merge-octopus.sh:89 +#, sh-format +msgid "Fast-forwarding to: $pretty_name" +msgstr "Mise à jour en avance rapide sur $pretty_name" + +#: git-merge-octopus.sh:97 +#, sh-format +msgid "Trying simple merge with $pretty_name" +msgstr "Essai de fusion simple avec $pretty_name" + +#: git-merge-octopus.sh:102 +msgid "Simple merge did not work, trying automatic merge." +msgstr "La fusion simple a échoué, essai avec la fusion automatique." + +#: git-rebase.sh:61 +msgid "" +"Resolve all conflicts manually, mark them as resolved with\n" +"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" +"You can instead skip this commit: run \"git rebase --skip\".\n" +"To abort and get back to the state before \"git rebase\", run \"git rebase --" +"abort\"." msgstr "" -"Lorsque vous aurez résolu ce problème, lancez \"git rebase --continue\".\n" -"Si vous préférez sauter ce patch, lancez \"git rebase --skip\" à la place.\n" -"Pour extraire la branche d'origine et stopper le rebasage, lancez \"git " -"rebase --abort\"." +"Résolvez tous les conflits manuellement, marquez-les comme résolus avec\n" +"\"git add/rm <fichier en conflit>\", puis lancez \"git rebase --continue\".\n" +"Si vous préférez sauter ce commit, lancez \"git rebase --skip\". Pour " +"arrêter\n" +"et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"." -#: git-rebase.sh:168 +#: git-rebase.sh:173 git-rebase.sh:454 +#, sh-format +msgid "Could not move back to $head_name" +msgstr "Impossible de revenir à $head_name" + +#: git-rebase.sh:184 msgid "Applied autostash." msgstr "Autoremisage appliqué." -#: git-rebase.sh:171 +#: git-rebase.sh:187 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Impossible de stocker $stash_sha1" -#: git-rebase.sh:172 -msgid "" -"Applying autostash resulted in conflicts.\n" -"Your changes are safe in the stash.\n" -"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" -msgstr "" -"L'application de l'autoremisage a provoqué des conflits\n" -"Vos modifications sont à l'abri dans la remise.\n" -"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" - -#: git-rebase.sh:211 +#: git-rebase.sh:236 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: git-rebase.sh:216 -msgid "It looks like git-am is in progress. Cannot rebase." -msgstr "Il semble que git-am soit en cours. Impossible de rebaser." +#: git-rebase.sh:241 +msgid "It looks like 'git am' is in progress. Cannot rebase." +msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser." -#: git-rebase.sh:357 +#: git-rebase.sh:415 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: git-rebase.sh:368 +#: git-rebase.sh:426 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." -#: git-rebase.sh:375 +#: git-rebase.sh:433 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: git-rebase.sh:378 +#: git-rebase.sh:436 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -12410,12 +18507,7 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: git-rebase.sh:396 -#, sh-format -msgid "Could not move back to $head_name" -msgstr "Impossible de revenir à $head_name" - -#: git-rebase.sh:415 +#: git-rebase.sh:480 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -12437,225 +18529,267 @@ msgstr "" "chose\n" "d'important ici." -#: git-rebase.sh:466 +#: git-rebase.sh:545 +msgid "error: cannot combine '--signoff' with '--preserve-merges'" +msgstr "erreur : '--signoff' et '--preserve-merges' sont incompatibles" + +#: git-rebase.sh:556 +msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'" +msgstr "erreur : '--rebase-merges' et '--preserve-merges' sont incompatibles" + +#: git-rebase.sh:562 +msgid "error: cannot combine '--rebase_merges' with '--strategy-option'" +msgstr "erreur : '--rebase-merges' et '--strategy-option' sont incompatibles" + +#: git-rebase.sh:564 +msgid "error: cannot combine '--rebase_merges' with '--strategy'" +msgstr "erreur : '--rebase-merges' et '--strategy' sont incompatibles" + +#: git-rebase.sh:590 #, sh-format -msgid "invalid upstream $upstream_name" -msgstr "invalide $upstream_name en amont" +msgid "invalid upstream '$upstream_name'" +msgstr "invalide '$upstream_name' en amont" -#: git-rebase.sh:490 +#: git-rebase.sh:614 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name : il y a plus d'une base de fusion" -#: git-rebase.sh:493 git-rebase.sh:497 +#: git-rebase.sh:617 git-rebase.sh:621 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name : il n'y a pas de base de fusion" -#: git-rebase.sh:502 +#: git-rebase.sh:626 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Ne pointe pas sur une validation valide : $onto_name" -#: git-rebase.sh:525 +#: git-rebase.sh:652 #, sh-format -msgid "fatal: no such branch: $branch_name" -msgstr "fatal : pas de branche : $branch_name" +msgid "fatal: no such branch/commit '$branch_name'" +msgstr "fatal : pas de branche ou commit '$branch_name'" -#: git-rebase.sh:558 +#: git-rebase.sh:685 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: git-rebase.sh:563 +#: git-rebase.sh:690 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Autoremisage créé : $stash_abbrev" -#: git-rebase.sh:567 +#: git-rebase.sh:694 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: git-rebase.sh:587 +#: git-rebase.sh:717 +#, sh-format +msgid "HEAD is up to date." +msgstr "HEAD est à jour." + +#: git-rebase.sh:719 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La branche courante $branch_name est à jour." -#: git-rebase.sh:591 +#: git-rebase.sh:727 +#, sh-format +msgid "HEAD is up to date, rebase forced." +msgstr "HEAD est à jour, rebasage forcé." + +#: git-rebase.sh:729 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "La branche courante $branch_name est à jour, rebasage forcé." -#: git-rebase.sh:602 +#: git-rebase.sh:741 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Changements de $mb sur $onto :" -#: git-rebase.sh:611 +#: git-rebase.sh:750 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -"Premièrement, rembobinons head pour rejouer votre travail par-dessus..." +"Rembobinage préalable de head pour pouvoir rejouer votre travail par-" +"dessus..." -#: git-rebase.sh:621 +#: git-rebase.sh:760 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name mise à jour en avance rapide sur $onto_name." -#: git-stash.sh:51 +#: git-stash.sh:61 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear avec des paramètres n'est pas implémenté" -#: git-stash.sh:74 +#: git-stash.sh:108 msgid "You do not have the initial commit yet" msgstr "Vous n'avez pas encore la validation initiale" -#: git-stash.sh:89 +#: git-stash.sh:123 msgid "Cannot save the current index state" msgstr "Impossible de sauver l'état courant de l'index" -#: git-stash.sh:124 git-stash.sh:137 +#: git-stash.sh:138 +msgid "Cannot save the untracked files" +msgstr "Impossible de sauver les fichiers non-suivis" + +#: git-stash.sh:158 git-stash.sh:171 msgid "Cannot save the current worktree state" msgstr "Impossible de sauver l'état courant de la copie de travail" -#: git-stash.sh:141 +#: git-stash.sh:175 msgid "No changes selected" msgstr "Aucun changement sélectionné" -#: git-stash.sh:144 +#: git-stash.sh:178 msgid "Cannot remove temporary index (can't happen)" msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)" -#: git-stash.sh:157 +#: git-stash.sh:191 msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'état de la copie de travail" -#: git-stash.sh:189 +#: git-stash.sh:229 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Impossible de mettre à jour $ref_stash avec $w_commit" -#. TRANSLATORS: $option is an invalid option, like -#. `--blah-blah'. The 7 spaces at the beginning of the -#. second line correspond to "error: ". So you should line -#. up the second line with however many characters the -#. translation of "error: " takes in your language. E.g. in -#. English this is: -#. -#. $ git stash save --blah-blah 2>&1 | head -n 2 -#. error: unknown option for 'stash save': --blah-blah -#. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:239 +#: git-stash.sh:281 #, sh-format -msgid "" -"error: unknown option for 'stash save': $option\n" -" To provide a message, use git stash save -- '$option'" +msgid "error: unknown option for 'stash push': $option" +msgstr "erreur : option inconnue pour 'stash push' : $option" + +#: git-stash.sh:295 +msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -"erreur: option inconnue pour 'stash save': $option\n" -" Pour fournir un message, utilisez git stash save -- '$option'" +"Impossible d'utiliser --patch et --include-untracked ou --all en même temps" -#: git-stash.sh:260 +#: git-stash.sh:303 msgid "No local changes to save" msgstr "Pas de modifications locales à sauver" -#: git-stash.sh:264 +#: git-stash.sh:308 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: git-stash.sh:268 +#: git-stash.sh:312 msgid "Cannot save the current status" -msgstr "Impossible de sauver le statut courant" +msgstr "Impossible de sauver l'état courant" -#: git-stash.sh:286 +#: git-stash.sh:313 +#, sh-format +msgid "Saved working directory and index state $stash_msg" +msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg" + +#: git-stash.sh:342 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: git-stash.sh:405 +#: git-stash.sh:490 #, sh-format msgid "unknown option: $opt" msgstr "option inconnue : $opt" -#: git-stash.sh:415 -msgid "No stash found." -msgstr "Pas de remisage trouvé." +#: git-stash.sh:503 +msgid "No stash entries found." +msgstr "Aucune entrée de remisage trouvée." -#: git-stash.sh:422 +#: git-stash.sh:510 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Trop de révisions spécifiées : $REV" -#: git-stash.sh:428 +#: git-stash.sh:525 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference n'est pas une référence valide" -#: git-stash.sh:456 +#: git-stash.sh:553 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' n'est pas une validation de type remisage" -#: git-stash.sh:467 +#: git-stash.sh:564 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' n'est pas une référence de remisage" -#: git-stash.sh:475 +#: git-stash.sh:572 msgid "unable to refresh index" msgstr "impossible de rafraîchir l'index" -#: git-stash.sh:479 +#: git-stash.sh:576 msgid "Cannot apply a stash in the middle of a merge" msgstr "Impossible d'appliquer un remisage en cours de fusion" -#: git-stash.sh:487 +#: git-stash.sh:584 msgid "Conflicts in index. Try without --index." msgstr "Conflits dans l'index. Essayez sans --index." -#: git-stash.sh:489 +#: git-stash.sh:586 msgid "Could not save index tree" msgstr "Impossible de sauvegarder l'arbre d'index" -#: git-stash.sh:523 +#: git-stash.sh:595 +msgid "Could not restore untracked files from stash entry" +msgstr "" +"Impossible de restaurer les fichiers non-suivis depuis l'entrée de remisage" + +#: git-stash.sh:620 msgid "Cannot unstage modified files" msgstr "Impossible de désindexer les fichiers modifiés" -#: git-stash.sh:538 +#: git-stash.sh:635 msgid "Index was not unstashed." msgstr "L'index n'a pas été sorti de remise." -#: git-stash.sh:561 +#: git-stash.sh:649 +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." + +#: git-stash.sh:658 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} supprimé ($s)" -#: git-stash.sh:562 +#: git-stash.sh:659 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Impossible de supprimer l'élément de stash" -#: git-stash.sh:570 +#: git-stash.sh:667 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: git-stash.sh:642 +#: git-stash.sh:746 msgid "(To restore them type \"git stash apply\")" msgstr "(Pour les restaurer tapez \"git stash apply\")" -#: git-submodule.sh:219 +#: git-submodule.sh:188 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Un chemin relatif ne peut être utilisé que depuis la racine de la copie de " "travail" -#: git-submodule.sh:229 +#: git-submodule.sh:198 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../" -#: git-submodule.sh:246 +#: git-submodule.sh:217 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' existe déjà dans l'index" -#: git-submodule.sh:250 +#: git-submodule.sh:220 +#, sh-format +msgid "'$sm_path' already exists in the index and is not a submodule" +msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module" + +#: git-submodule.sh:226 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -12666,243 +18800,2083 @@ msgstr "" "$sm_path\n" "Utilisez -f si vous voulez vraiment l'ajouter." -#: git-submodule.sh:268 +#: git-submodule.sh:249 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Ajout du dépôt existant à '$sm_path' dans l'index" -#: git-submodule.sh:270 +#: git-submodule.sh:251 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide" -#: git-submodule.sh:278 +#: git-submodule.sh:259 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) " "distant(s) :" -#: git-submodule.sh:280 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from" -msgstr "" -"Si vous voulez réutiliser ce répertoire git local au lieu de cloner à " -"nouveau depuis" - -#: git-submodule.sh:282 -#, sh-format -msgid "" -"use the '--force' option. If the local git directory is not the correct repo" -msgstr "" -"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt " -"correct" - -#: git-submodule.sh:283 +#: git-submodule.sh:261 #, sh-format msgid "" +"If you want to reuse this local git directory instead of cloning again from\n" +" $realrepo\n" +"use the '--force' option. If the local git directory is not the correct " +"repo\n" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -"ou vous ne savez pas ce que cela signifie de choisir un autre nom avec " -"l'option '--name'." +"Si vous voulez réutiliser ce répertoire local git au lieu de le recloner " +"depuis\n" +" $realrepo\n" +"utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt " +"correct\n" +"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'." -#: git-submodule.sh:285 +#: git-submodule.sh:267 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'." -#: git-submodule.sh:297 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Impossible d'extraire le sous-module '$sm_path'" -#: git-submodule.sh:302 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Échec d'ajout du sous-module '$sm_path'" -#: git-submodule.sh:311 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Échec d'enregistrement du sous-module '$sm_path'" -#: git-submodule.sh:355 -#, sh-format -msgid "Entering '$displaypath'" -msgstr "Entrée dans '$displaypath'" - -#: git-submodule.sh:375 -#, sh-format -msgid "Stopping at '$displaypath'; script returned non-zero status." -msgstr "Arrêt sur '$displaypath' ; le script a retourné un statut non nul." - -#: git-submodule.sh:448 -#, sh-format -msgid "pathspec and --all are incompatible" -msgstr "un spécificateur de chemin et --all sont incompatibles" - -#: git-submodule.sh:453 -#, sh-format -msgid "Use '--all' if you really want to deinitialize all submodules" -msgstr "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules" - -#: git-submodule.sh:470 -#, sh-format -msgid "Submodule work tree '$displaypath' contains a .git directory" -msgstr "" -"La copie de travail du sous-module '$displaypath' contient un répertoire .git" - -#: git-submodule.sh:471 -#, sh-format -msgid "" -"(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "" -"(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " -"historique)" - -#: git-submodule.sh:477 -#, sh-format -msgid "" -"Submodule work tree '$displaypath' contains local modifications; use '-f' to " -"discard them" -msgstr "" -"La copie de travail du sous-module '$displaypath' contient des modifications " -"locales ; utilisez '-f' pour les annuler" - -#: git-submodule.sh:480 -#, sh-format -msgid "Cleared directory '$displaypath'" -msgstr "Répertoire '$displaypath' nettoyé" - -#: git-submodule.sh:481 -#, sh-format -msgid "Could not remove submodule work tree '$displaypath'" -msgstr "" -"Impossible de supprimer la copie de travail du sous-module '$displaypath'" - -#: git-submodule.sh:484 -#, sh-format -msgid "Could not create empty submodule directory '$displaypath'" -msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'" - -#: git-submodule.sh:493 -#, sh-format -msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" -msgstr "" -"Le sous-module '$name' ($url) n'est pas enregistré pour le chemin " -"'$displaypath'" - -#: git-submodule.sh:635 +#: git-submodule.sh:565 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Impossible de trouver la révision courante dans le chemin de sous-module " "'$displaypath'" -#: git-submodule.sh:644 +#: git-submodule.sh:575 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'" -#: git-submodule.sh:667 +#: git-submodule.sh:580 +#, sh-format +msgid "" +"Unable to find current ${remote_name}/${branch} revision in submodule path " +"'$sm_path'" +msgstr "" +"Impossible de trouver la révision courante ${remote_name}/${branch} dans le " +"chemin de sous-module '$sm_path'" + +#: git-submodule.sh:603 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:680 +#: git-submodule.sh:609 +#, sh-format +msgid "" +"Fetched in submodule path '$displaypath', but it did not contain $sha1. " +"Direct fetching of that commit failed." +msgstr "" +"Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas " +"$sha1. La récupération directe de ce commit a échoué." + +#: git-submodule.sh:616 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:681 +#: git-submodule.sh:617 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" -#: git-submodule.sh:685 +#: git-submodule.sh:621 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:686 +#: git-submodule.sh:622 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'" -#: git-submodule.sh:691 +#: git-submodule.sh:627 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:692 +#: git-submodule.sh:628 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'" -#: git-submodule.sh:697 +#: git-submodule.sh:633 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" -msgstr "L'exécution de '$command $sha1' a échoué dans le chemin de sous-module '$displaypath'" +msgstr "" +"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module " +"'$displaypath'" -#: git-submodule.sh:698 +#: git-submodule.sh:634 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'" -#: git-submodule.sh:729 +#: git-submodule.sh:665 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" -#: git-submodule.sh:837 +#: git-submodule.sh:761 msgid "The --cached option cannot be used with the --files option" msgstr "L'option --cached ne peut pas être utilisée avec l'option --files" -#: git-submodule.sh:889 +#: git-submodule.sh:813 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode $mod_dst inattendu" -#: git-submodule.sh:909 +#: git-submodule.sh:833 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Attention : $display_name ne contient pas la validation $sha1_src" -#: git-submodule.sh:912 +#: git-submodule.sh:836 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Attention : $display_name ne contient pas la validation $sha1_dst" -#: git-submodule.sh:915 +#: git-submodule.sh:839 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Attention : $display_name ne contient pas les validations $sha1_src et " "$sha1_dst" -#: git-submodule.sh:940 -msgid "blob" -msgstr "blob" +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." + +#: git-rebase--interactive.sh:43 +msgid "" +"\n" +"Commands:\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <command> = run command (the rest of the line) using shell\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "" +"\n" +"Commandes :\n" +" p, pick <commit> = utiliser le commit\n" +" r, reword <commit> = utiliser le commit, mais reformuler son message\n" +" e, edit <commit> = utiliser le commit, mais s'arrêter pour le modifier\n" +" s, squash <commit> = utiliser le commit, mais le fusionner avec le " +"précédent\n" +" f, fixup <commit> = comme \"squash\", mais en éliminant son message\n" +" x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n" +" d, drop <commit> = supprimer le commit\n" +" l, label <label> = étiqueter la HEAD courante avec un nom\n" +" t, reset <label> = réinitialiser HEAD à label\n" +" m, merge [-C <commit> | -c <commit>] <label> [# <uniligne>]\n" +" créer un commit de fusion utilisant le message de fusion original\n" +" (ou l'uniligne, si aucun commit de fusion n'a été spécifié).\n" +" Utilisez -c <commit> pour reformuler le message de validation.\n" +"\n" +"Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n" + +#: git-rebase--interactive.sh:64 git-rebase--preserve-merges.sh:173 +msgid "" +"\n" +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" +msgstr "" +"\n" +"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un " +"commit.\n" + +#: git-rebase--interactive.sh:68 git-rebase--preserve-merges.sh:177 +msgid "" +"\n" +"If you remove a line here THAT COMMIT WILL BE LOST.\n" +msgstr "" +"\n" +"Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n" -#: git-submodule.sh:1059 +#: git-rebase--interactive.sh:108 git-rebase--preserve-merges.sh:724 +msgid "could not detach HEAD" +msgstr "Impossible de détacher HEAD" + +#: git-rebase--interactive.sh:147 git-rebase--preserve-merges.sh:816 +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "" +"\n" +"Vous êtes en train d'éditer le fichier todo d'un rebasage interactif en " +"cours.\n" +"Pour continuer le rebasage après édition, lancez :\n" +" git rebase --continue\n" +"\n" + +#: git-rebase--interactive.sh:155 git-rebase--interactive.sh:241 +#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 +msgid "Could not execute editor" +msgstr "Impossible de lancer l'éditeur" + +#: git-rebase--interactive.sh:176 git-rebase--preserve-merges.sh:845 #, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'" +msgid "Could not checkout $switch_to" +msgstr "Impossible d'extraire $switch_to" + +#: git-rebase--interactive.sh:183 git-rebase--preserve-merges.sh:852 +msgid "No HEAD?" +msgstr "Pas de HEAD ?" -#: git-submodule.sh:1123 +#: git-rebase--interactive.sh:184 git-rebase--preserve-merges.sh:853 #, sh-format -msgid "Synchronizing submodule url for '$displaypath'" -msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" +msgid "Could not create temporary $state_dir" +msgstr "Impossible de créer un répertoire temporaire $state_dir" -#: git-parse-remote.sh:89 +#: git-rebase--interactive.sh:187 git-rebase--preserve-merges.sh:856 +msgid "Could not mark as interactive" +msgstr "Impossible de marquer comme interactif" + +#: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888 #, sh-format -msgid "See git-${cmd}(1) for details." -msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." +msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)" +msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)" + +#: git-rebase--interactive.sh:224 +msgid "" +"\n" +"\tHowever, if you remove everything, the rebase will be aborted.\n" +"\n" +"\t" +msgstr "" +"\n" +"Cependant, si vous effacez tout, le rebasage sera annulé.\n" +"\n" +"\t" + +#: git-rebase--interactive.sh:231 git-rebase--preserve-merges.sh:900 +msgid "Note that empty commits are commented out" +msgstr "Veuillez noter que les commits vides sont en commentaire" + +#: git-rebase--interactive.sh:280 +msgid "Could not generate todo list" +msgstr "Impossible de générer la liste à-faire" + +#: git-rebase--preserve-merges.sh:136 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "Rebasage ($new_count/$total)" + +#: git-rebase--preserve-merges.sh:152 +msgid "" +"\n" +"Commands:\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <commit> = run command (the rest of the line) using shell\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "" +"\n" +"Commandes :\n" +" p, pick <commit> = utiliser le commit\n" +" r, reword <commit> = utiliser le commit, mais reformuler son message\n" +" e, edit <commit> = utiliser le commit, mais s'arrêter pour le modifier\n" +" s, squash <commit> = utiliser le commit, mais le fusionner avec le " +"précédent\n" +" f, fixup <commit> = comme \"squash\", mais en éliminant son message\n" +" x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n" +" d, drop <commit> = supprimer le commit\n" +" l, label <label> = étiqueter la HEAD courante avec un nom\n" +" t, reset <label> = réinitialiser HEAD à label\n" +" m, merge [-C <commit> | -c <commit>] <label> [# <uniligne>]\n" +" créer un commit de fusion utilisant le message de fusion original\n" +" (ou l'uniligne, si aucun commit de fusion n'a été spécifié).\n" +" Utilisez -c <commit> pour reformuler le message de validation.\n" +"\n" +"Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n" + +#: git-rebase--preserve-merges.sh:215 +#, sh-format +msgid "" +"You can amend the commit now, with\n" +"\n" +"\tgit commit --amend $gpg_sign_opt_quoted\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +"\tgit rebase --continue" +msgstr "" +"Vous pouvez corriger le commit maintenant, avec\n" +"\n" +"\tgit commit --amend $gpg_sign_opt_quoted\n" +"\n" +"après avoir réalisé vos modifications, lancez\n" +"\n" +"\tgit rebase --continue" + +#: git-rebase--preserve-merges.sh:240 +#, sh-format +msgid "$sha1: not a commit that can be picked" +msgstr "$sha1 n'est pas un commit qui peut être picorer" + +#: git-rebase--preserve-merges.sh:279 +#, sh-format +msgid "Invalid commit name: $sha1" +msgstr "Nom de commit invalide : $sha1" + +#: git-rebase--preserve-merges.sh:309 +msgid "Cannot write current commit's replacement sha1" +msgstr "Impossible de sauver le sha1 du remplaçant du commit en cours" + +#: git-rebase--preserve-merges.sh:360 +#, sh-format +msgid "Fast-forward to $sha1" +msgstr "Avance rapide sur $sha1" + +#: git-rebase--preserve-merges.sh:362 +#, sh-format +msgid "Cannot fast-forward to $sha1" +msgstr "Avance rapide impossible sur $sha1" + +#: git-rebase--preserve-merges.sh:371 +#, sh-format +msgid "Cannot move HEAD to $first_parent" +msgstr "Impossible de déplacer HEAD sur $first_parent" + +#: git-rebase--preserve-merges.sh:376 +#, sh-format +msgid "Refusing to squash a merge: $sha1" +msgstr "Refus d'écraser un commit de fusion: $sha1" + +#: git-rebase--preserve-merges.sh:394 +#, sh-format +msgid "Error redoing merge $sha1" +msgstr "Erreur lors de la réapplication de la fusion $sha1" + +#: git-rebase--preserve-merges.sh:403 +#, sh-format +msgid "Could not pick $sha1" +msgstr "Impossible de picorer $sha1" + +#: git-rebase--preserve-merges.sh:412 +#, sh-format +msgid "This is the commit message #${n}:" +msgstr "Ceci est le ${n}ième message de validation :" + +#: git-rebase--preserve-merges.sh:417 +#, sh-format +msgid "The commit message #${n} will be skipped:" +msgstr "Le message de validation ${n} sera ignoré :" + +#: git-rebase--preserve-merges.sh:428 +#, sh-format +msgid "This is a combination of $count commit." +msgid_plural "This is a combination of $count commits." +msgstr[0] "Ceci est la combinaison de $count commit." +msgstr[1] "Ceci est la combinaison de $count commits." + +#: git-rebase--preserve-merges.sh:437 +#, sh-format +msgid "Cannot write $fixup_msg" +msgstr "Impossible d'écrire $fixup_msg" + +#: git-rebase--preserve-merges.sh:440 +msgid "This is a combination of 2 commits." +msgstr "Ceci est la combinaison de 2 commits." + +#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 +#: git-rebase--preserve-merges.sh:527 +#, sh-format +msgid "Could not apply $sha1... $rest" +msgstr "Impossible d'appliquer $sha1... $rest" + +#: git-rebase--preserve-merges.sh:556 +#, sh-format +msgid "" +"Could not amend commit after successfully picking $sha1... $rest\n" +"This is most likely due to an empty commit message, or the pre-commit hook\n" +"failed. If the pre-commit hook failed, you may need to resolve the issue " +"before\n" +"you are able to reword the commit." +msgstr "" +"Impossible de corriger le commit après avoir réussi à picorer $sha1... " +"$rest\n" +"C'est probablement dû à un message de validation vide ou le crochet pre-" +"commit\n" +"a échoué. Si le crochet pre-commit a échoué, vous devez peut-être résoudre " +"le\n" +"problème avant de pouvoir reformuler le message du commit." + +#: git-rebase--preserve-merges.sh:571 +#, sh-format +msgid "Stopped at $sha1_abbrev... $rest" +msgstr "Arrêté à $sha1_abbrev... $rest" + +#: git-rebase--preserve-merges.sh:586 +#, sh-format +msgid "Cannot '$squash_style' without a previous commit" +msgstr "'$squash_style' impossible avec le commit précédent" + +#: git-rebase--preserve-merges.sh:628 +#, sh-format +msgid "Executing: $rest" +msgstr "Exécution : $rest" + +#: git-rebase--preserve-merges.sh:636 +#, sh-format +msgid "Execution failed: $rest" +msgstr "L'exécution a échoué : $rest" + +#: git-rebase--preserve-merges.sh:638 +msgid "and made changes to the index and/or the working tree" +msgstr "et a mis à jour l'index ou la copie de travail" + +#: git-rebase--preserve-merges.sh:640 +msgid "" +"You can fix the problem, and then run\n" +"\n" +"\tgit rebase --continue" +msgstr "" +"Vous pouvez corriger le problème, puis lancer\n" +"\n" +"git rebase --continue" + +#. TRANSLATORS: after these lines is a command to be issued by the user +#: git-rebase--preserve-merges.sh:653 +#, sh-format +msgid "" +"Execution succeeded: $rest\n" +"but left changes to the index and/or the working tree\n" +"Commit or stash your changes, and then run\n" +"\n" +"\tgit rebase --continue" +msgstr "" +"L'exécution a réussi : $rest\n" +"mais a laissé des modifications dans l'index ou la copie de travail\n" +"Validez ou remisez vos modification, puis lancez\n" +"\n" +"\tgit rebase --continue" + +#: git-rebase--preserve-merges.sh:664 +#, sh-format +msgid "Unknown command: $command $sha1 $rest" +msgstr "Commande inconnue : $command $sha1 $rest" + +#: git-rebase--preserve-merges.sh:665 +msgid "Please fix this using 'git rebase --edit-todo'." +msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'." + +#: git-rebase--preserve-merges.sh:700 +#, sh-format +msgid "Successfully rebased and updated $head_name." +msgstr "Rebasage et mise à jour de $head_name avec succès." + +#: git-rebase--preserve-merges.sh:757 +msgid "Could not remove CHERRY_PICK_HEAD" +msgstr "Impossible de supprimer CHERRY_PICK_HEAD" + +#: git-rebase--preserve-merges.sh:762 +#, sh-format +msgid "" +"You have staged changes in your working tree.\n" +"If these changes are meant to be\n" +"squashed into the previous commit, run:\n" +"\n" +" git commit --amend $gpg_sign_opt_quoted\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit $gpg_sign_opt_quoted\n" +"\n" +"In both cases, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" +msgstr "" +"Vous avez des modifications indexées dans votre copie de travail.\n" +"Si ces modifications devaient être ajoutées\n" +"dans le commit précédent, lancez :\n" +"\n" +" git commit --amend $gpg_sign_opt_quoted\n" +"\n" +"Si elles devaient aller dans un nouveau commit, lancez :\n" +"\n" +" git commit $gpg_sign_opt_quoted\n" +"\n" +"Dans les deux cas, une fois fini, continuez avec :\n" +"\n" +" git rebase --continue\n" + +#: git-rebase--preserve-merges.sh:779 +msgid "Error trying to find the author identity to amend commit" +msgstr "" +"Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit" + +#: git-rebase--preserve-merges.sh:784 +msgid "" +"You have uncommitted changes in your working tree. Please commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" +"Vous avez des modifications non validées dans votre copie de travail.\n" +"Veuillez les valider d'abord, puis relancer 'git rebase --continue'." + +#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 +msgid "Could not commit staged changes." +msgstr "impossible de valider les modifications indexées." + +#: git-rebase--preserve-merges.sh:893 +msgid "" +"\n" +"However, if you remove everything, the rebase will be aborted.\n" +"\n" +msgstr "" +"\n" +"Cependant, si vous effacez tout, le rebasage sera annulé.\n" +"\n" + +#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 +msgid "Could not init rewritten commits" +msgstr "Impossible d'initialiser les commits réécrits" + +#: git-sh-setup.sh:89 git-sh-setup.sh:94 +#, sh-format +msgid "usage: $dashless $USAGE" +msgstr "usage : $dashless $USAGE" + +#: git-sh-setup.sh:190 +#, sh-format +msgid "Cannot chdir to $cdup, the toplevel of the working tree" +msgstr "" +"Impossible de se placer dans le répertoire $cdup, la racine de la copie de " +"travail" + +#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#, sh-format +msgid "fatal: $program_name cannot be used without a working tree." +msgstr "fatal : $program_name ne peut pas être utilisé sans copie de travail." + +#: git-sh-setup.sh:220 +msgid "Cannot rebase: You have unstaged changes." +msgstr "Impossible de rebaser : vous avez des modifications non indexées." + +#: git-sh-setup.sh:223 +msgid "Cannot rewrite branches: You have unstaged changes." +msgstr "" +"Impossible de réécrire les branches : vous avez des modifications non " +"indexées." + +#: git-sh-setup.sh:226 +msgid "Cannot pull with rebase: You have unstaged changes." +msgstr "" +"impossible de tirer avec rebasage. Vous avez des modifications non indexées." + +#: git-sh-setup.sh:229 +#, sh-format +msgid "Cannot $action: You have unstaged changes." +msgstr "$action est impossible : vous avez des modifications non indexées." + +#: git-sh-setup.sh:242 +msgid "Cannot rebase: Your index contains uncommitted changes." +msgstr "" +"Impossible de rebaser : votre index contient des modifications non validées." + +#: git-sh-setup.sh:245 +msgid "Cannot pull with rebase: Your index contains uncommitted changes." +msgstr "" +"impossible de tirer avec rebasage : votre index contient des modifications " +"non validées." + +#: git-sh-setup.sh:248 +#, sh-format +msgid "Cannot $action: Your index contains uncommitted changes." +msgstr "" +"$action est impossible : votre index contient des modifications non validées." + +#: git-sh-setup.sh:252 +msgid "Additionally, your index contains uncommitted changes." +msgstr "De plus, votre index contient des modifications non validées." + +#: git-sh-setup.sh:372 +msgid "You need to run this command from the toplevel of the working tree." +msgstr "" +"Vous devez lancer cette commande depuis la racine de votre copie de travail." + +#: git-sh-setup.sh:377 +msgid "Unable to determine absolute path of git directory" +msgstr "Impossible de déterminer le chemin absolu du répertoire git" + +#. TRANSLATORS: you can adjust this to align "git add -i" status menu +#: git-add--interactive.perl:196 +#, perl-format +msgid "%12s %12s %s" +msgstr "%12s %s12s %s" + +#: git-add--interactive.perl:197 +msgid "staged" +msgstr "indexé" + +#: git-add--interactive.perl:197 +msgid "unstaged" +msgstr "non-indexé" + +#: git-add--interactive.perl:253 git-add--interactive.perl:278 +msgid "binary" +msgstr "binaire" + +#: git-add--interactive.perl:262 git-add--interactive.perl:316 +msgid "nothing" +msgstr "rien" + +#: git-add--interactive.perl:298 git-add--interactive.perl:313 +msgid "unchanged" +msgstr "inchangé" + +#: git-add--interactive.perl:609 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "%d chemin ajouté\n" +msgstr[1] "%d chemins ajoutés\n" + +#: git-add--interactive.perl:612 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "%d chemin mis à jour\n" +msgstr[1] "%d chemins mis à jour\n" + +#: git-add--interactive.perl:615 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "%d chemin inversé\n" +msgstr[1] "%d chemins inversés\n" + +#: git-add--interactive.perl:618 +#, perl-format +msgid "touched %d path\n" +msgid_plural "touched %d paths\n" +msgstr[0] "%d chemin touché\n" +msgstr[1] "%d chemins touchés\n" + +#: git-add--interactive.perl:627 +msgid "Update" +msgstr "Mise à jour" + +#: git-add--interactive.perl:639 +msgid "Revert" +msgstr "Inverser" + +#: git-add--interactive.perl:662 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "note : %s n'est plus suivi à présent.\n" + +#: git-add--interactive.perl:673 +msgid "Add untracked" +msgstr "Ajouter un fichier non-suivi" + +#: git-add--interactive.perl:679 +msgid "No untracked files.\n" +msgstr "Aucun Fichier non suivi.\n" + +#: git-add--interactive.perl:1033 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera\n" +"immédiatement marquée comme indexée." + +#: git-add--interactive.perl:1036 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for stashing." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera\n" +"immédiatement marquée comme remisée." + +#: git-add--interactive.perl:1039 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for unstaging." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera\n" +"immédiatement marquée comme desindexée." + +#: git-add--interactive.perl:1042 git-add--interactive.perl:1051 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for applying." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera\n" +"immédiatement marquée comme appliquée." + +#: git-add--interactive.perl:1045 git-add--interactive.perl:1048 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding." +msgstr "" +"Si le patch s'applique proprement, la section éditée sera\n" +"immédiatement marquée comme éliminée." + +#: git-add--interactive.perl:1085 +#, perl-format +msgid "failed to open hunk edit file for writing: %s" +msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s" + +#: git-add--interactive.perl:1086 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "" +"Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n" + +#: git-add--interactive.perl:1092 +#, perl-format +msgid "" +"---\n" +"To remove '%s' lines, make them ' ' lines (context).\n" +"To remove '%s' lines, delete them.\n" +"Lines starting with %s will be removed.\n" +msgstr "" +"---\n" +"Pour éliminer les lignes '%s', rendez-les ' ' (contexte).\n" +"Pour éliminer les lignes '%s', effacez-les.\n" +"Les lignes commençant par %s seront éliminées.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1100 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Si ça ne s'applique pas proprement, vous aurez la possibilité de\n" +"l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n" +"alors l'édition sera abandonnée et la section conservée.\n" + +#: git-add--interactive.perl:1114 +#, perl-format +msgid "failed to open hunk edit file for reading: %s" +msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: git-add--interactive.perl:1213 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" " +"l'élimine !) [y|n] ? " + +#: git-add--interactive.perl:1222 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this hunk and all later hunks in the file\n" +"d - do not stage this hunk or any of the later hunks in the file" +msgstr "" +"y - indexer cette section\n" +"n - ne pas indexer cette section\n" +"q - quitter ; ne pas indexer cette section ni les autres restantes\n" +"a - indexer cette section et toutes les suivantes de ce fichier\n" +"d - ne pas indexer cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1228 +msgid "" +"y - stash this hunk\n" +"n - do not stash this hunk\n" +"q - quit; do not stash this hunk or any of the remaining ones\n" +"a - stash this hunk and all later hunks in the file\n" +"d - do not stash this hunk or any of the later hunks in the file" +msgstr "" +"y - remiser cette section\n" +"n - ne pas remiser cette section\n" +"q - quitter ; ne pas remiser cette section ni les autres restantes\n" +"a - remiser cette section et toutes les suivantes de ce fichier\n" +"d - ne pas remiser cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1234 +msgid "" +"y - unstage this hunk\n" +"n - do not unstage this hunk\n" +"q - quit; do not unstage this hunk or any of the remaining ones\n" +"a - unstage this hunk and all later hunks in the file\n" +"d - do not unstage this hunk or any of the later hunks in the file" +msgstr "" +"y - désindexer cette section\n" +"n - ne pas désindexer cette section\n" +"q - quitter ; ne pas désindexer cette section ni les autres restantes\n" +"a - désindexer cette section et toutes les suivantes de ce fichier\n" +"d - ne pas désindexer cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1240 +msgid "" +"y - apply this hunk to index\n" +"n - do not apply this hunk to index\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file" +msgstr "" +"y - appliquer cette section\n" +"n - ne pas appliquer cette section\n" +"q - quitter ; ne pas appliquer cette section ni les autres restantes\n" +"a - appliquer cette section et toutes les suivantes de ce fichier\n" +"d - ne pas appliquer cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1246 +msgid "" +"y - discard this hunk from worktree\n" +"n - do not discard this hunk from worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file" +msgstr "" +"y - supprimer cette section\n" +"n - ne pas supprimer cette section\n" +"q - quitter ; ne pas supprimer cette section ni les autres restantes\n" +"a - supprimer cette section et toutes les suivantes de ce fichier\n" +"d - ne pas supprimer cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1252 +msgid "" +"y - discard this hunk from index and worktree\n" +"n - do not discard this hunk from index and worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file" +msgstr "" +"y - éliminer cette section de l'index et de l'arbre de travail\n" +"n - ne pas éliminer cette section\n" +"q - quitter ; ne pas éliminer cette section ni les autres restantes\n" +"a - éliminer cette section et toutes les suivantes de ce fichier\n" +"d - ne pas éliminer cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1258 +msgid "" +"y - apply this hunk to index and worktree\n" +"n - do not apply this hunk to index and worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file" +msgstr "" +"y - appliquer cette section à l'index et à l'arbre de travail\n" +"n - ne pas appliquer cette section\n" +"q - quitter ; ne pas appliquer cette section ni les autres restantes\n" +"a - appliquer cette section et toutes les suivantes de ce fichier\n" +"d - ne pas appliquer cette section ni les suivantes de ce fichier" + +#: git-add--interactive.perl:1273 +msgid "" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" +"g - selectionner une section et s'y rendre\n" +"/ - rechercher une section correspondant à une regex donnée\n" +"j - laisser cette section non décidée et aller à la suivante non-décidée\n" +"J - laisser cette section non décidée et aller à la suivante\n" +"k - laisser cette section non décidée et aller à la précédente non-décidée\n" +"K - laisser cette section non décidée et aller à la précédente\n" +"s - découper la section en sections plus petites\n" +"e - éditer manuellement la section actuelle\n" +"? - afficher l'aide\n" + +#: git-add--interactive.perl:1304 +msgid "The selected hunks do not apply to the index!\n" +msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n" + +#: git-add--interactive.perl:1305 +msgid "Apply them to the worktree anyway? " +msgstr "Les appliquer quand même à l'arbre de travail ? " + +#: git-add--interactive.perl:1308 +msgid "Nothing was applied.\n" +msgstr "Rien n'a été appliqué.\n" + +#: git-add--interactive.perl:1319 +#, perl-format +msgid "ignoring unmerged: %s\n" +msgstr "fichier non-fusionné ignoré : %s\n" + +#: git-add--interactive.perl:1328 +msgid "Only binary files changed.\n" +msgstr "Seuls des fichiers binaires ont changé.\n" + +#: git-add--interactive.perl:1330 +msgid "No changes.\n" +msgstr "Aucune modification.\n" + +#: git-add--interactive.perl:1338 +msgid "Patch update" +msgstr "Mise à jour par patch" + +#: git-add--interactive.perl:1390 +#, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1391 +#, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1392 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Indexer cette section [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1395 +#, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1396 +#, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1397 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Remiser cette section [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1400 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1401 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1402 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1405 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1406 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1407 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1410 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1411 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1412 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1415 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1416 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1417 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1420 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d" +"%s,?] ? " + +#: git-add--interactive.perl:1421 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d" +"%s,?] ? " + +#: git-add--interactive.perl:1422 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1522 +msgid "No other hunks to goto\n" +msgstr "Aucune autre section à atteindre\n" + +#: git-add--interactive.perl:1529 +msgid "go to which hunk (<ret> to see more)? " +msgstr "aller à quelle section (<ret> pour voir plus) ? " + +#: git-add--interactive.perl:1531 +msgid "go to which hunk? " +msgstr "aller à quelle section ? " + +#: git-add--interactive.perl:1540 +#, perl-format +msgid "Invalid number: '%s'\n" +msgstr "Nombre invalide : '%s'\n" + +#: git-add--interactive.perl:1545 +#, perl-format +msgid "Sorry, only %d hunk available.\n" +msgid_plural "Sorry, only %d hunks available.\n" +msgstr[0] "Désolé, %d seule section disponible.\n" +msgstr[1] "Désolé, Seulement %d sections disponibles.\n" + +#: git-add--interactive.perl:1571 +msgid "No other hunks to search\n" +msgstr "aucune autre section à rechercher\n" + +#: git-add--interactive.perl:1575 +msgid "search for regex? " +msgstr "rechercher la regex ? " + +#: git-add--interactive.perl:1588 +#, perl-format +msgid "Malformed search regexp %s: %s\n" +msgstr "Regex de recherche malformée %s : %s\n" + +#: git-add--interactive.perl:1598 +msgid "No hunk matches the given pattern\n" +msgstr "Aucune section ne correspond au motif donné\n" + +#: git-add--interactive.perl:1610 git-add--interactive.perl:1632 +msgid "No previous hunk\n" +msgstr "Pas de section précédente\n" + +#: git-add--interactive.perl:1619 git-add--interactive.perl:1638 +msgid "No next hunk\n" +msgstr "Pas de section suivante\n" + +#: git-add--interactive.perl:1644 +msgid "Sorry, cannot split this hunk\n" +msgstr "Désolé, impossible de découper cette section\n" + +#: git-add--interactive.perl:1650 +#, perl-format +msgid "Split into %d hunk.\n" +msgid_plural "Split into %d hunks.\n" +msgstr[0] "Découpée en %d section.\n" +msgstr[1] "Découpée en %d sections.\n" + +#: git-add--interactive.perl:1660 +msgid "Sorry, cannot edit this hunk\n" +msgstr "Désolé, impossible d'éditer cette section\n" + +#: git-add--interactive.perl:1706 +msgid "Review diff" +msgstr "Réviser la différence" + +#. TRANSLATORS: please do not translate the command names +#. 'status', 'update', 'revert', etc. +#: git-add--interactive.perl:1725 +msgid "" +"status - show paths with changes\n" +"update - add working tree state to the staged set of changes\n" +"revert - revert staged set of changes back to the HEAD version\n" +"patch - pick hunks and update selectively\n" +"diff - view diff between HEAD and index\n" +"add untracked - add contents of untracked files to the staged set of " +"changes\n" +msgstr "" +"status - montrer les chemins modifiés\n" +"update - ajouter l'état de l'arbre de travail aux modifications à " +"indexer\n" +"revert - faire revenir les modifications à indexer à la version HEAD\n" +"patch - sélectionner les sections et mettre à jour sélectivement\n" +"diff - visualiser les diff entre HEAD et l'index\n" +"add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n" + +#: git-add--interactive.perl:1742 git-add--interactive.perl:1747 +#: git-add--interactive.perl:1750 git-add--interactive.perl:1757 +#: git-add--interactive.perl:1761 git-add--interactive.perl:1767 +msgid "missing --" +msgstr "-- manquant" + +#: git-add--interactive.perl:1763 +#, perl-format +msgid "unknown --patch mode: %s" +msgstr "mode de --patch inconnu : %s" + +#: git-add--interactive.perl:1769 git-add--interactive.perl:1775 +#, perl-format +msgid "invalid argument %s, expecting --" +msgstr "argument invalide %s, -- attendu" + +#: git-send-email.perl:130 +msgid "local zone differs from GMT by a non-minute interval\n" +msgstr "" +"la zone locale diffère du GMT par un intervalle supérieur à une minute\n" + +#: git-send-email.perl:137 git-send-email.perl:143 +msgid "local time offset greater than or equal to 24 hours\n" +msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n" + +#: git-send-email.perl:211 git-send-email.perl:217 +msgid "the editor exited uncleanly, aborting everything" +msgstr "l'éditeur est sorti en erreur, abandon total" + +#: git-send-email.perl:294 +#, perl-format +msgid "" +"'%s' contains an intermediate version of the email you were composing.\n" +msgstr "" +"'%s' contient une version intermédiaire du courriel que vous composiez.\n" + +#: git-send-email.perl:299 +#, perl-format +msgid "'%s.final' contains the composed email.\n" +msgstr "'%s.final' contient le courriel composé.\n" + +#: git-send-email.perl:317 +msgid "--dump-aliases incompatible with other options\n" +msgstr "--dump-aliases est incompatible avec d'autres options\n" + +#: git-send-email.perl:383 git-send-email.perl:638 +msgid "Cannot run git format-patch from outside a repository\n" +msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n" + +#: git-send-email.perl:386 +msgid "" +"`batch-size` and `relogin` must be specified together (via command-line or " +"configuration option)\n" +msgstr "" +"`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de " +"commande ou des options de configuration)\n" + +#: git-send-email.perl:456 +#, perl-format +msgid "Unknown --suppress-cc field: '%s'\n" +msgstr "Champ de --suppress-cc inconnu : '%s'\n" + +#: git-send-email.perl:485 +#, perl-format +msgid "Unknown --confirm setting: '%s'\n" +msgstr "Paramètre de --confirm inconnu : '%s'\n" + +#: git-send-email.perl:513 +#, perl-format +msgid "warning: sendmail alias with quotes is not supported: %s\n" +msgstr "" +"attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n" + +#: git-send-email.perl:515 +#, perl-format +msgid "warning: `:include:` not supported: %s\n" +msgstr "attention : `:include:` n'est pas supporté : %s\n" + +#: git-send-email.perl:517 +#, perl-format +msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" +msgstr "" +"attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n" + +#: git-send-email.perl:522 +#, perl-format +msgid "warning: sendmail line is not recognized: %s\n" +msgstr "attention : ligne sendmail non reconnue : %s\n" + +#: git-send-email.perl:604 +#, perl-format +msgid "" +"File '%s' exists but it could also be the range of commits\n" +"to produce patches for. Please disambiguate by...\n" +"\n" +" * Saying \"./%s\" if you mean a file; or\n" +" * Giving --format-patch option if you mean a range.\n" +msgstr "" +"Le fichier '%s' existe mais ce pourrait aussi être la plage de commmits\n" +"pour lequel les patches sont à produire. Veuillez préciser...\n" +"\n" +" * en indiquant \"./%s\" si vous désignez un fichier, ou\n" +" * en fournissant l'option --format-patch pour une plage.\n" + +#: git-send-email.perl:625 +#, perl-format +msgid "Failed to opendir %s: %s" +msgstr "Échec à l'ouverture du répertoire %s : %s" + +#: git-send-email.perl:649 +#, perl-format +msgid "" +"fatal: %s: %s\n" +"warning: no patches were sent\n" +msgstr "" +"fatal : %s : %s\n" +"attention : aucun patch envoyé\n" + +#: git-send-email.perl:660 +msgid "" +"\n" +"No patch files specified!\n" +"\n" +msgstr "" +"\n" +"Aucun fichier patch spécifié !\n" +"\n" + +#: git-send-email.perl:673 +#, perl-format +msgid "No subject line in %s?" +msgstr "Ligne de sujet non trouvée dans %s ?" + +#: git-send-email.perl:683 +#, perl-format +msgid "Failed to open for writing %s: %s" +msgstr "Impossible d'ouvrir %s en écriture : %s" + +#: git-send-email.perl:694 +msgid "" +"Lines beginning in \"GIT:\" will be removed.\n" +"Consider including an overall diffstat or table of contents\n" +"for the patch you are writing.\n" +"\n" +"Clear the body content if you don't wish to send a summary.\n" +msgstr "" +"Les lignes commençant par \"GIT:\" seront supprimées.\n" +"Envisagez d'inclure un diffstat global ou une table des matières\n" +"pour le patch que vous êtes en train d'écrire.\n" +"\n" +"Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n" + +#: git-send-email.perl:718 +#, perl-format +msgid "Failed to open %s: %s" +msgstr "Échec à l'ouverture de %s : %s" + +#: git-send-email.perl:735 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "Échec à l'ouverture de %s.final : %s" + +#: git-send-email.perl:778 +msgid "Summary email is empty, skipping it\n" +msgstr "Le courriel de résumé etant vide, il a été ignoré\n" + +#. TRANSLATORS: please keep [y/N] as is. +#: git-send-email.perl:813 +#, perl-format +msgid "Are you sure you want to use <%s> [y/N]? " +msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? " + +#: git-send-email.perl:868 +msgid "" +"The following files are 8bit, but do not declare a Content-Transfer-" +"Encoding.\n" +msgstr "" +"Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-" +"Transfer-Encoding.\n" + +#: git-send-email.perl:873 +msgid "Which 8bit encoding should I declare [UTF-8]? " +msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? " + +#: git-send-email.perl:881 +#, perl-format +msgid "" +"Refusing to send because the patch\n" +"\t%s\n" +"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " +"want to send.\n" +msgstr "" +"Envoi refusé parce que le patch\n" +"\t%s\n" +"a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez " +"vraiment envoyer.\n" + +#: git-send-email.perl:900 +msgid "To whom should the emails be sent (if anyone)?" +msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?" + +#: git-send-email.perl:918 +#, perl-format +msgid "fatal: alias '%s' expands to itself\n" +msgstr "fatal : l'alias '%s' se développe en lui-même\n" + +#: git-send-email.perl:930 +msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " +msgstr "" +"Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en " +"a) ? " + +#: git-send-email.perl:988 git-send-email.perl:996 +#, perl-format +msgid "error: unable to extract a valid address from: %s\n" +msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n" + +#. TRANSLATORS: Make sure to include [q] [d] [e] in your +#. translation. The program will only accept English input +#. at this point. +#: git-send-email.perl:1000 +msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " +msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): " + +#: git-send-email.perl:1317 +#, perl-format +msgid "CA path \"%s\" does not exist" +msgstr "le chemin vers la CA \"%s\" n'existe pas" + +#: git-send-email.perl:1400 +msgid "" +" The Cc list above has been expanded by additional\n" +" addresses found in the patch commit message. By default\n" +" send-email prompts before sending whenever this occurs.\n" +" This behavior is controlled by the sendemail.confirm\n" +" configuration setting.\n" +"\n" +" For additional information, run 'git send-email --help'.\n" +" To retain the current behavior, but squelch this message,\n" +" run 'git config --global sendemail.confirm auto'.\n" +"\n" +msgstr "" +" La liste CC ci-dessus a été étendue avec des adresses\n" +" supplémentaires trouvées dans le message de validation.\n" +" Par défaut dans ce cas, send-email demande confirmation avant envoi.\n" +" Ce comportement est géré par le paramètre de configuration\n" +" sendemail.confirm.\n" +"\n" +" Pour tout information complémentaire, lancez 'git send-email --help'.\n" +" Pour conserver le comportement actuel, mais éliminer ce message,\n" +" lancez 'git config --global sendemail.confirm auto'.\n" +"\n" + +#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your +#. translation. The program will only accept English input +#. at this point. +#: git-send-email.perl:1415 +msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " +msgstr "Envoyer ce courriel ? ([y]es|[n]o|[e]dit|[q]uit|[a]ll) : " + +#: git-send-email.perl:1418 +msgid "Send this email reply required" +msgstr "Une réponse est nécessaire" + +#: git-send-email.perl:1446 +msgid "The required SMTP server is not properly defined." +msgstr "Le serveur SMTP nécessaire n'est pas défini correctement." + +#: git-send-email.perl:1493 +#, perl-format +msgid "Server does not support STARTTLS! %s" +msgstr "Le serveur ne supporte pas STARTTLS ! %s" + +#: git-send-email.perl:1498 git-send-email.perl:1502 +#, perl-format +msgid "STARTTLS failed! %s" +msgstr "echec de STARTTLS ! %s" + +#: git-send-email.perl:1511 +msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." +msgstr "" +"Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-" +"debug." + +#: git-send-email.perl:1529 +#, perl-format +msgid "Failed to send %s\n" +msgstr "échec de l'envoi de %s\n" + +#: git-send-email.perl:1532 +#, perl-format +msgid "Dry-Sent %s\n" +msgstr "Envoi simulé de %s\n" + +#: git-send-email.perl:1532 +#, perl-format +msgid "Sent %s\n" +msgstr "%s envoyé\n" + +#: git-send-email.perl:1534 +msgid "Dry-OK. Log says:\n" +msgstr "Simulation OK. Le journal indique :\n" + +#: git-send-email.perl:1534 +msgid "OK. Log says:\n" +msgstr "OK. Le journal indique :\n" + +#: git-send-email.perl:1546 +msgid "Result: " +msgstr "Résultat : " + +#: git-send-email.perl:1549 +msgid "Result: OK\n" +msgstr "Résultat : OK\n" + +#: git-send-email.perl:1567 +#, perl-format +msgid "can't open file %s" +msgstr "impossible d'ouvrir le fichier %s" + +#: git-send-email.perl:1614 git-send-email.perl:1634 +#, perl-format +msgid "(mbox) Adding cc: %s from line '%s'\n" +msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n" + +#: git-send-email.perl:1620 +#, perl-format +msgid "(mbox) Adding to: %s from line '%s'\n" +msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n" + +#: git-send-email.perl:1673 +#, perl-format +msgid "(non-mbox) Adding cc: %s from line '%s'\n" +msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n" + +#: git-send-email.perl:1698 +#, perl-format +msgid "(body) Adding cc: %s from line '%s'\n" +msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n" + +#: git-send-email.perl:1809 +#, perl-format +msgid "(%s) Could not execute '%s'" +msgstr "(%s) Impossible d'exécuter '%s'" + +#: git-send-email.perl:1816 +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) Ajout de %s : %s depuis : '%s'\n" + +#: git-send-email.perl:1820 +#, perl-format +msgid "(%s) failed to close pipe to '%s'" +msgstr "(%s) échec de la fermeture du pipe vers '%s'" + +#: git-send-email.perl:1850 +msgid "cannot send message as 7bit" +msgstr "impossible d'envoyer un message comme 7bit" + +#: git-send-email.perl:1858 +msgid "invalid transfer encoding" +msgstr "codage de transfert invalide" + +#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961 +#, perl-format +msgid "unable to open %s: %s\n" +msgstr "impossible d'ouvrir %s :%s\n" + +#: git-send-email.perl:1902 +#, perl-format +msgid "%s: patch contains a line longer than 998 characters" +msgstr "%s : le patch contient une ligne plus longue que 998 caractères" + +#: git-send-email.perl:1919 +#, perl-format +msgid "Skipping %s with backup suffix '%s'.\n" +msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" + +#. TRANSLATORS: please keep "[y|N]" as is. +#: git-send-email.perl:1923 +#, perl-format +msgid "Do you really want to send %s? [y|N]: " +msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " + +#~ msgid "could not parse '%s' (looking for '%s'" +#~ msgstr "impossible d'analyser '%s' (à la recherche de '%s')" + +#~ msgid "color both diff and diff-between-diffs" +#~ msgstr "colorer à la fois les diffs et le diff-between-diffs" + +#~ msgid "push|fetch" +#~ msgstr "push|fetch" + +#~ msgid "Dirty index: cannot merge (dirty: %s)" +#~ msgstr "Index sale : fusion impossible (sales : %s)" + +#~ msgid "(+/-)x" +#~ msgstr "(+/-)x" + +#~ msgid "<command>" +#~ msgstr "<commande>" + +#~ msgid "w[,i1[,i2]]" +#~ msgstr "w[,i1[,i2]]" + +#~ msgid "Entering '$displaypath'" +#~ msgstr "Entrée dans '$displaypath'" + +#~ msgid "Stopping at '$displaypath'; script returned non-zero status." +#~ msgstr "Arrêt sur '$displaypath' ; le script a retourné un état non nul." + +#~ msgid "Everyday Git With 20 Commands Or So" +#~ msgstr "Git de tous les jours avec à peu près 20 commandes" + +#~ msgid "Could not open '%s' for writing" +#~ msgstr "Impossible d'ouvrir '%s' en écriture" + +#~ msgid "" +#~ "unexpected 1st line of squash message:\n" +#~ "\n" +#~ "\t%.*s" +#~ msgstr "" +#~ "première ligne de message de compression inattendue :\n" +#~ "\n" +#~ "\t%.*s" + +#~ msgid "" +#~ "invalid 1st line of squash message:\n" +#~ "\n" +#~ "\t%.*s" +#~ msgstr "" +#~ "première ligne de message de compression invalide :\n" +#~ "\n" +#~ "\t%.*s" + +#~ msgid "BUG: returned path string doesn't match cwd?" +#~ msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?" + +#~ msgid "Error in object" +#~ msgstr "Erreur dans l'objet" + +#~ msgid "git fetch-pack: expected ACK/NAK, got EOF" +#~ msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu" + +#~ msgid "invalid filter-spec expression '%s'" +#~ msgstr "expression de filtre invalide : '%s'" + +#~ msgid "The copy of the patch that failed is found in: %s" +#~ msgstr "La copie du patch qui a échoué se trouve dans : %s" + +#~ msgid "pathspec and --all are incompatible" +#~ msgstr "un spécificateur de chemin et --all sont incompatibles" + +#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" +#~ msgstr "" +#~ "Le sous-module '$name' ($url) n'est pas enregistré pour le chemin " +#~ "'$displaypath'" + +#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" +#~ msgstr "" +#~ "Les champs To/CC/Bcc ne sont pas encore interprétés, ils ont été ignorés\n" + +#~ msgid "" +#~ "empty strings as pathspecs will be made invalid in upcoming releases. " +#~ "please use . instead if you meant to match all paths" +#~ msgstr "" +#~ "les chaines de caractères vides comme spécificateurs de chemin seront " +#~ "invalides dans les prochaines versions. Veuillez utiliser . à la place " +#~ "pour correspondre à tous le chemins" + +#~ msgid "could not truncate '%s'" +#~ msgstr "impossible de tronquer '%s'" + +#~ msgid "could not finish '%s'" +#~ msgstr "impossible de finir '%s'" + +#~ msgid "could not write to %s" +#~ msgstr "Impossible d'écrire dans %s" + +#~ msgid "could not close %s" +#~ msgstr "impossible de fermer %s" + +#~ msgid "Copied a misnamed branch '%s' away" +#~ msgstr "Copie d'une branche mal nommée '%s'" + +#~ msgid "it does not make sense to create 'HEAD' manually" +#~ msgstr "créer manuellement 'HEAD' n'a pas de sens" + +#~ msgid "Don't know how to clone %s" +#~ msgstr "Je ne sais pas cloner %s" + +#~ msgid "show ignored files" +#~ msgstr "afficher les fichiers ignorés" + +#~ msgid "Don't know how to fetch from %s" +#~ msgstr "Je ne sais pas récupérer depuis %s" + +#~ msgid "'$term' is not a valid term" +#~ msgstr "'$term' n'est pas un terme valide" + +#~ msgid "" +#~ "error: unknown option for 'stash save': $option\n" +#~ " To provide a message, use git stash save -- '$option'" +#~ msgstr "" +#~ "erreur: option inconnue pour 'stash save': $option\n" +#~ " Pour fournir un message, utilisez git stash save -- '$option'" + +#~ msgid "Failed to recurse into submodule path '$sm_path'" +#~ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'" + +#~ msgid "%%(trailers) does not take arguments" +#~ msgstr "%%(trailers) n'accepte pas d'argument" + +#~ msgid "submodule update strategy not supported for submodule '%s'" +#~ msgstr "" +#~ "stratégie de mise à jour de sous-module non supportée pour le sous-module " +#~ "'%s'" + +#~ msgid "change upstream info" +#~ msgstr "modifier l'information amont" + +#~ msgid "" +#~ "\n" +#~ "If you wanted to make '%s' track '%s', do this:\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "Si vous vouliez que '%s' suive '%s', faites ceci :\n" +#~ "\n" + +#~ msgid "basename" +#~ msgstr "nom de base" + +#~ msgid "prepend parent project's basename to output" +#~ msgstr "préfixer le nom de base du projet parent à la sortie" + +#~ msgid "" +#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" +#~ " - $line" +#~ msgstr "" +#~ "Attention : le SHA-1 manque ou n'est pas un commit dans la ligne " +#~ "suivante :\n" +#~ " - $line" + +#~ msgid "" +#~ "Warning: the command isn't recognized in the following line:\n" +#~ " - $line" +#~ msgstr "" +#~ "Attention : la commande n'est pas reconnue dans le ligne suivante :\n" +#~ " - $line" + +#~ msgid "Or you can abort the rebase with 'git rebase --abort'." +#~ msgstr "" +#~ "Ou bien vous pouvez abandonner le rebasage avec 'git rebase --abort'." + +#~ msgid "Could not open file '%s'" +#~ msgstr "impossible d'ouvrir le fichier '%s'" + +#~ msgid "in %0.1f seconds automatically..." +#~ msgstr "dans %0.1f secondes automatiquement..." + +#~ msgid "dup2(%d,%d) failed" +#~ msgstr "échec de dup2(%d,%d)" + +#~ msgid "Initial commit on " +#~ msgstr "Validation initiale sur " + +#~ msgid "Patch is empty. Was it split wrong?" +#~ msgstr "Le patch est vide. Le découpage était-il bon ?" + +#~ msgid "" +#~ "You still have unmerged paths in your index.\n" +#~ "Did you forget to use 'git add'?" +#~ msgstr "" +#~ "Vous avez toujours des chemins non fusionnés dans votre index\n" +#~ "Auriez-vous oublié de faire 'git add' ?" + +#~ msgid "" +#~ "Cannot update paths and switch to branch '%s' at the same time.\n" +#~ "Did you intend to checkout '%s' which can not be resolved as commit?" +#~ msgstr "" +#~ "Impossible de mettre à jour les chemins et de basculer sur la branche " +#~ "'%s' en même temps.\n" +#~ "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?" + +#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..." +#~ msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..." + +#~ msgid "default mode for recursion" +#~ msgstr "mode par défaut pour la récursion" + +#~ msgid "submodule--helper subcommand must be called with a subcommand" +#~ msgstr "" +#~ "la sous-commande submodule--helper doit être appelée avec une sous-" +#~ "commande" + +#~ msgid "could not stat '%s" +#~ msgstr "stat impossible de '%s'" + +#~ msgid "tag: tagging " +#~ msgstr "étiquette: étiquetage de " + +#~ msgid "commit object" +#~ msgstr "objet commit" + +#~ msgid "tree object" +#~ msgstr "objet arbre" + +#~ msgid "blob object" +#~ msgstr "objet blob" + +#~ msgid "" +#~ "There is nothing to exclude from by :(exclude) patterns.\n" +#~ "Perhaps you forgot to add either ':/' or '.' ?" +#~ msgstr "" +#~ "Il n'y a rien dont il faut exclure par des motifs :(exclure).\n" +#~ "Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?" + +#~ msgid "unrecognized format: %%(%s)" +#~ msgstr "format non reconnu %%(%s)" + +#~ msgid ":strip= requires a positive integer argument" +#~ msgstr ":strip= requiert un argument entier positif" + +#~ msgid "ref '%s' does not have %ld components to :strip" +#~ msgstr "la réf '%s' n'a pas %ld composants à :strip" + +#~ msgid "unknown %.*s format %s" +#~ msgstr "format de %.*s inconnu %s" + +# féminin pour une branche +#~ msgid "[%s: gone]" +#~ msgstr "[%s: disparue]" + +#~ msgid "[%s]" +#~ msgstr "[%s]" + +#~ msgid "[%s: behind %d]" +#~ msgstr "[%s: en retard de %d]" + +#~ msgid "[%s: ahead %d]" +#~ msgstr "[%s : en avance de %d]" + +#~ msgid "[%s: ahead %d, behind %d]" +#~ msgstr "[%s : en avance de %d, en retard de %d]" + +#~ msgid " **** invalid ref ****" +#~ msgstr " **** référence invalide ****" + +#~ msgid "insanely long object directory %.*s" +#~ msgstr "objet répertoire démentiellement long %.*s" + +#~ msgid "git merge [<options>] <msg> HEAD <commit>" +#~ msgstr "git merge [<options>] <message> HEAD <commit>" + +#~ msgid "tag name too long: %.*s..." +#~ msgstr "nom d'étiquette trop long : %.*s..." + +#~ msgid "tag header too big." +#~ msgstr "en-tête d'étiquette trop gros." + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for discarding" +#~ msgstr "" +#~ "Si le patch s'applique proprement, la section éditée sera\n" +#~ "immediatement marquée comme éliminée" + +#~ msgid "Use an experimental blank-line-based heuristic to improve diffs" +#~ msgstr "" +#~ "Utiliser une heuristique expérimentale reposant sur les lignes vides pour " +#~ "améliorer le diffs" + +#~ msgid "Clever... amending the last one with dirty index." +#~ msgstr "Malin... correction du dernier avec un index sale." + +#~ msgid "" +#~ "the following submodule (or one of its nested submodules)\n" +#~ "uses a .git directory:" +#~ msgid_plural "" +#~ "the following submodules (or one of their nested submodules)\n" +#~ "use a .git directory:" +#~ msgstr[0] "" +#~ "le sous-module suivant (ou un de ses sous-modules imbriqués)\n" +#~ "utilise un répertoire .git :" +#~ msgstr[1] "" +#~ "les sous-modules suivants (ou un de leurs sous-modules imbriqués)\n" +#~ "utilisent un répertoire .git :" + +#~ msgid "" +#~ "\n" +#~ "(use 'rm -rf' if you really want to remove it including all of its " +#~ "history)" +#~ msgstr "" +#~ "\n" +#~ "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout " +#~ "son historique)" + +#~ msgid "Error wrapping up %s." +#~ msgstr "Erreur lors de l'emballage de %s." + +#~ msgid "Your local changes would be overwritten by cherry-pick." +#~ msgstr "Vos modifications locales seraient écrasées par cherry-pick." + +#~ msgid "Cannot revert during another revert." +#~ msgstr "Impossible d'annuler un commit pendant l'annulation d'un commit." + +#~ msgid "Cannot cherry-pick during another cherry-pick." +#~ msgstr "Impossible de picorer pendant un autre picorage." + +#~ msgid "Could not parse line %d." +#~ msgstr "Impossible d'analyser la ligne %d." + +#~ msgid "Could not open %s" +#~ msgstr "Impossible d'ouvrir %s" + +#~ msgid "Could not format %s." +#~ msgstr "Impossible de formater %s." + +#~ msgid "%s: %s" +#~ msgstr "%s : %s" + +#~ msgid "cannot open %s: %s" +#~ msgstr "impossible d'ouvrir %s : %s" + +#~ msgid "You need to set your committer info first" +#~ msgstr "Vous devez d'abord définir vos informations de validateur" + +#~ msgid "This is the 2nd commit message:" +#~ msgstr "Ceci est le deuxième message de validation :" + +#~ msgid "This is the 3rd commit message:" +#~ msgstr "Ceci est le troisième message de validation :" + +#~ msgid "This is the 4th commit message:" +#~ msgstr "Ceci est le quatrième message de validation :" + +#~ msgid "This is the 5th commit message:" +#~ msgstr "Ceci est le cinquième message de validation :" + +#~ msgid "This is the 6th commit message:" +#~ msgstr "Ceci est le sixième message de validation :" + +#~ msgid "This is the 7th commit message:" +#~ msgstr "Ceci est le septième message de validation :" + +#~ msgid "This is the 8th commit message:" +#~ msgstr "Ceci est le huitième message de validation :" + +#~ msgid "This is the 9th commit message:" +#~ msgstr "Ceci est le neuvième message de validation :" + +#~ msgid "This is the 10th commit message:" +#~ msgstr "Ceci est le dixième message de validation :" + +#~ msgid "This is the ${n}th commit message:" +#~ msgstr "Ceci est le ${n}ième message de validation :" + +#~ msgid "This is the ${n}st commit message:" +#~ msgstr "Ceci est le ${n}ième message de validation :" + +#~ msgid "This is the ${n}nd commit message:" +#~ msgstr "Ceci est le ${n}ième message de validation :" + +#~ msgid "This is the ${n}rd commit message:" +#~ msgstr "Ceci est le ${n}ième message de validation :" + +#~ msgid "The 1st commit message will be skipped:" +#~ msgstr "Le premier message de validation sera ignoré :" + +#~ msgid "The 2nd commit message will be skipped:" +#~ msgstr "Le deuxième message de validation sera ignoré :" + +#~ msgid "The 3rd commit message will be skipped:" +#~ msgstr "Le troisième message de validation sera ignoré :" + +#~ msgid "The 4th commit message will be skipped:" +#~ msgstr "Le quatrième message de validation sera ignoré :" + +#~ msgid "The 5th commit message will be skipped:" +#~ msgstr "Le cinquième message de validation sera ignoré :" + +#~ msgid "The 6th commit message will be skipped:" +#~ msgstr "Le sixième message de validation sera ignoré :" + +#~ msgid "The 7th commit message will be skipped:" +#~ msgstr "Le septième message de validation sera ignoré :" + +#~ msgid "The 8th commit message will be skipped:" +#~ msgstr "Le huitième message de validation sera ignoré :" + +#~ msgid "The 9th commit message will be skipped:" +#~ msgstr "Le neuvième message de validation sera ignoré :" + +#~ msgid "The 10th commit message will be skipped:" +#~ msgstr "Le dixième message de validation sera ignoré :" + +#~ msgid "The ${n}th commit message will be skipped:" +#~ msgstr "le ${n}ième message de validation sera ignoré :" + +#~ msgid "The ${n}st commit message will be skipped:" +#~ msgstr "Le message de validation ${n} sera ignoré :" + +#~ msgid "The ${n}nd commit message will be skipped:" +#~ msgstr "Le message de validation ${n} sera ignoré :" + +#~ msgid "The ${n}rd commit message will be skipped:" +#~ msgstr "Le message de validation ${n} sera ignoré :" + +#~ msgid "could not run gpg." +#~ msgstr "impossible de lancer gpg." + +#~ msgid "gpg did not accept the data" +#~ msgstr "gpg n'a pas accepté les données" + +#~ msgid "unsupported object type in the tree" +#~ msgstr "type d'objet non supporté dans l'arbre" + +#~ msgid "Fatal merge failure, shouldn't happen." +#~ msgstr "Échec fatal de fusion, qui ne devrait jamais arriver." + +#~ msgid "Unprocessed path??? %s" +#~ msgstr "Chemin non traité ??? %s" + +#~ msgid "Cannot %s during a %s" +#~ msgstr "Impossible de %s pendant un %s" + +#~ msgid "Can't cherry-pick into empty head" +#~ msgstr "Impossible de picorer vers une HEAD vide" + +#~ msgid "could not open %s for writing" +#~ msgstr "Impossible d'ouvrir '%s' en écriture" + +#~ msgid "bug: unhandled unmerged status %x" +#~ msgstr "bogue : état de non-fusion non géré %x" + +#~ msgid "bug: unhandled diff status %c" +#~ msgstr "bogue : état de diff non géré %c" + +#~ msgid "could not write branch description template" +#~ msgstr "impossible d'écrire le modèle de description de branche" + +#~ msgid "corrupt index file" +#~ msgstr "fichier d'index corrompu" + +#~ msgid "detach the HEAD at named commit" +#~ msgstr "détacher la HEAD à la validation nommée" + +#~ msgid "Checking connectivity... " +#~ msgstr "Vérification de la connectivité... " + +#~ msgid " (unable to update local ref)" +#~ msgstr " (impossible de mettre à jour la référence locale)" + +#~ msgid "Reinitialized existing" +#~ msgstr "existant réinitialisé" + +#~ msgid "Initialized empty" +#~ msgstr "vide initialisé" + +#~ msgid " shared" +#~ msgstr " partagé" + +#~ msgid "Verify that the named commit has a valid GPG signature" +#~ msgstr "Vérifier que la validation a une signature GPG valide" + +#~ msgid "Writing SQUASH_MSG" +#~ msgstr "Écriture de SQUASH_MSG" + +#~ msgid "Finishing SQUASH_MSG" +#~ msgstr "Finition de SQUASH_MSG" + +#~ msgid " and with remote" +#~ msgstr " et avec la distante" + +#~ msgid "removing '%s' failed" +#~ msgstr "la suppression de '%s' a échoué" + +#~ msgid "Please call 'bisect_state' with at least one argument." +#~ msgstr "Veuillez appeler 'bisect_state' avec au moins un argument." + +#~ msgid "" +#~ "If you want to reuse this local git directory instead of cloning again " +#~ "from" +#~ msgstr "" +#~ "Si vous voulez réutiliser ce répertoire git local au lieu de cloner à " +#~ "nouveau depuis" + +#~ msgid "" +#~ "use the '--force' option. If the local git directory is not the correct " +#~ "repo" +#~ msgstr "" +#~ "utilisez l'option '--force'. Si le répertoire local git n'est pas le " +#~ "dépôt correct" + +#~ msgid "" +#~ "or you are unsure what this means choose another name with the '--name' " +#~ "option." +#~ msgstr "" +#~ "ou si vous ne savez pas ce que cela signifie, choisissez un autre nom " +#~ "avec l'option '--name'." + +#~ msgid "Submodule work tree '$displaypath' contains a .git directory" +#~ msgstr "" +#~ "La copie de travail du sous-module '$displaypath' contient un répertoire ." +#~ "git" + +#~ msgid "" +#~ "(use 'rm -rf' if you really want to remove it including all of its " +#~ "history)" +#~ msgstr "" +#~ "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout " +#~ "son historique)" #~ msgid "'%s': %s" #~ msgstr "'%s' : %s" @@ -12910,12 +20884,6 @@ msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." #~ msgid "unable to access '%s': %s" #~ msgstr "impossible d'accéder à '%s' : %s" -#~ msgid "could not open '%s' for reading: %s" -#~ msgstr "impossible d'ouvrir '%s' en lecture : %s" - -#~ msgid "could not open '%s' for writing: %s" -#~ msgstr "impossible d'ouvrir '%s' en écriture : %s" - #~ msgid " git branch -d %s\n" #~ msgstr " git branch -d %s\n" @@ -12930,9 +20898,6 @@ msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." #~ "Veuillez indexer vos modifications de .gitmodules ou remisez-les pour " #~ "continuer" -#~ msgid "could not verify the tag '%s'" -#~ msgstr "impossible de vérifier l'étiquette '%s'" - #~ msgid "failed to remove: %s" #~ msgstr "échec de la suppression de %s" @@ -12951,15 +20916,9 @@ msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." #~ "Reporter les validations locales sur le sommet mis à jour d'une branche " #~ "amont" -#~ msgid "unable to parse format" -#~ msgstr "impossible d'analyser le format" - #~ msgid "improper format entered align:%s" #~ msgstr "format non convenable align:%s" -#~ msgid "Could not set core.worktree in %s" -#~ msgstr "Impossible de paramétrer core.worktree dans %s" - #~ msgid "" #~ "push.default is unset; its implicit value has changed in\n" #~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" @@ -13035,12 +20994,6 @@ msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." #~ msgid "branch '%s' does not point at a commit" #~ msgstr "la branche '%s' ne pointe pas sur un commit" -#~ msgid "object '%s' does not point to a commit" -#~ msgstr "l'objet '%s' ne pointe pas sur un commit" - -#~ msgid "some refs could not be read" -#~ msgstr "des références n'ont pas pu être lues" - #~ msgid "print only merged branches" #~ msgstr "afficher seulement les branches fusionnées" @@ -13059,9 +21012,6 @@ msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." #~ msgid "insanely long template path %s" #~ msgstr "chemin de modèle %s démentiellement long" -#~ msgid "insane git directory %s" -#~ msgstr "répertoire git démentiel %s" - #~ msgid "unsupported sort specification '%s'" #~ msgstr "spécification de tri non supportée '%s'" @@ -13071,9 +21021,6 @@ msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." #~ msgid "switch 'points-at' requires an object" #~ msgstr "le commutateur 'points-at' a besoin d'un objet" -#~ msgid "sort tags" -#~ msgstr "trier les étiquettes" - #~ msgid "--sort and -n are incompatible" #~ msgstr "--sort et -n sont incompatibles" @@ -13100,9 +21047,6 @@ msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." #~ msgid "-b and -B are mutually exclusive" #~ msgstr "-b et -B sont mutuellement exclusifs" -#~ msgid "You need to set your committer info first" -#~ msgstr "Vous devez d'abord définir vos informations de validateur" - #~ msgid "" #~ "When you have resolved this problem, run \"$cmdline --continue\".\n" #~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" @@ -13130,8 +21074,8 @@ msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." #~ "Pour restaurer la branche d'origine et stopper le patchage, lancez " #~ "\"$cmdline --abort\"." -#~ msgid "Patch does not have a valid e-mail address." -#~ msgstr "Le patch n'a pas d'adresse e-mail valide." +#~ msgid "Patch does not have a valid courriel address." +#~ msgstr "Le patch n'a pas d'adresse courriel valide." #~ msgid "Applying: $FIRSTLINE" #~ msgstr "Application : $FIRSTLINE" @@ -13149,16 +21093,9 @@ msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." #~ "add/rm <fichier>'\n" #~ "si nécessaire pour marquer comme résolu et valider." -#~ msgid "Pull is not possible because you have unmerged files." -#~ msgstr "" -#~ "Le pull n'est pas possible car vous avez des fichiers non fusionnés." - #~ msgid "no branch specified" #~ msgstr "aucune branche spécifiée" -#~ msgid "check a branch out in a separate working directory" -#~ msgstr "extraire une branche dans un répertoire de travail séparé" - #~ msgid "prune .git/worktrees" #~ msgstr "éliminer .git/worktrees" @@ -13189,9 +21126,6 @@ msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." #~ msgid "no files added" #~ msgstr "aucun fichier ajouté" -#~ msgid "force creation (when already exists)" -#~ msgstr "forcer la création (même si la cible existe)" - #~ msgid "slot" #~ msgstr "emplacement" @@ -13204,18 +21138,12 @@ msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." #~ msgid "Failed to lock HEAD during fast_forward_to" #~ msgstr "Échec du verrouillage de HEAD pendant l'avance rapide" -#~ msgid "invalid commit: %s" -#~ msgstr "commit invalide : %s" - #~ msgid "cannot lock HEAD ref" #~ msgstr "impossible de verrouiller la référence HEAD" #~ msgid "cannot update HEAD ref" #~ msgstr "impossible de mettre à jour la référence HEAD" -#~ msgid "cannot tell cwd" -#~ msgstr "impossible de déterminer le répertoire de travail courant" - #~ msgid "%s: cannot lock the ref" #~ msgstr "%s : impossible de verrouiller la référence" |