diff options
| author |  Jean-Noël Avila <jn.avila@free.fr> | 2019-10-21 20:49:16 +0200 |
|---|---|---|
| committer | Jean-Noël Avila <jn.avila@free.fr> | 2019-10-21 20:49:16 +0200 |
| commit | 13bcea8c7fc6efa048dec77f717930519fb8a055 (patch) | |
| tree | a883d2fc9e47439180016e41e76d5ce59a0dfcb2 | |
| parent | Merge remote-tracking branch 'git-po/master' into git-po-master (diff) | |
| download | tgif-13bcea8c7fc6efa048dec77f717930519fb8a055.tar.xz | |
l10n: fr 2.24.0 rnd 1
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
| -rw-r--r-- | po/fr.po | 4940 |
1 files changed, 2510 insertions, 2430 deletions
@@ -75,8 +75,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-08-10 20:12+0800\n" -"PO-Revision-Date: 2019-08-10 18:17+0200\n" +"POT-Creation-Date: 2019-10-21 19:55+0800\n" +"PO-Revision-Date: 2019-10-21 20:17+0200\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -128,7 +128,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:193 builtin/merge.c:1332 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." @@ -275,17 +275,7 @@ msgstr "mode invalide dans la ligne %d : %s" msgid "inconsistent header lines %d and %d" msgstr "lignes d'entête inconsistantes %d et %d" -#: apply.c:1460 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recomptage : ligne inattendue : %.*s" - -#: apply.c:1529 -#, 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:1551 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -300,83 +290,93 @@ 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:1564 +#: apply.c:1385 #, 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:1752 +#: apply.c:1481 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recomptage : ligne inattendue : %.*s" + +#: apply.c:1550 +#, 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:1753 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: apply.c:1830 +#: apply.c:1831 #, 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:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: apply.c:2925 +#: apply.c:2926 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: apply.c:3046 +#: apply.c:3047 #, 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:3058 +#: apply.c:3059 #, 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:3064 +#: apply.c:3065 #, c-format msgid "" "while searching for:\n" @@ -385,463 +385,463 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: apply.c:3086 +#: apply.c:3087 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: apply.c:3094 +#: apply.c:3095 #, 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:3141 +#: apply.c:3142 #, 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:3151 +#: apply.c:3152 #, 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:3159 +#: apply.c:3160 #, 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:3177 +#: apply.c:3178 #, 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:3190 +#: apply.c:3191 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: apply.c:3196 +#: apply.c:3197 #, 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:3217 +#: apply.c:3218 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: apply.c:3340 +#: apply.c:3341 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" -#: apply.c:3400 +#: apply.c:3401 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" -#: apply.c:3429 apply.c:3672 +#: apply.c:3430 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: apply.c:3515 apply.c:3687 +#: apply.c:3516 apply.c:3688 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: apply.c:3524 apply.c:3695 +#: apply.c:3525 apply.c:3696 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: apply.c:3559 +#: apply.c:3560 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:3562 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retour à une fusion à 3 points…\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossible de lire le contenu actuel de '%s'" -#: apply.c:3594 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Échec du retour à une fusion à 3 points…\n" -#: apply.c:3608 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch %s appliqué avec des conflits.\n" -#: apply.c:3613 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch %s appliqué proprement.\n" -#: apply.c:3639 +#: apply.c:3640 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: apply.c:3712 +#: apply.c:3713 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: apply.c:3714 +#: apply.c:3715 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 #: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: apply.c:3923 +#: apply.c:3924 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: apply.c:3926 +#: apply.c:3927 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: apply.c:3946 +#: apply.c:3947 #, 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:3951 +#: apply.c:3952 #, 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:3971 +#: apply.c:3972 #, 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:3975 +#: apply.c:3976 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: apply.c:3990 +#: apply.c:3991 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: apply.c:4082 +#: apply.c:4083 #, 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:4089 +#: apply.c:4090 #, 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:4092 +#: apply.c:4093 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "l'information de sha1 est manquante ou inutilisable (%s)." -#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" -#: apply.c:4101 +#: apply.c:4102 #, c-format msgid "could not add %s to temporary index" msgstr "impossible d'ajouter %s à l'index temporaire" -#: apply.c:4111 +#: apply.c:4112 #, c-format msgid "could not write temporary index to %s" msgstr "impossible d'écrire l'index temporaire dans %s" -#: apply.c:4249 +#: apply.c:4250 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: apply.c:4283 +#: apply.c:4284 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: apply.c:4289 +#: apply.c:4290 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: apply.c:4297 +#: apply.c:4298 #, 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:4303 apply.c:4448 +#: apply.c:4304 apply.c:4449 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4346 +#: apply.c:4347 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" -#: apply.c:4350 +#: apply.c:4351 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: apply.c:4420 +#: apply.c:4421 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: apply.c:4518 +#: apply.c:4519 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: apply.c:4526 +#: apply.c:4527 msgid "internal error" msgstr "erreur interne" -#: apply.c:4529 +#: apply.c:4530 #, 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:4540 +#: apply.c:4541 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" -#: apply.c:4562 +#: apply.c:4563 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: apply.c:4566 +#: apply.c:4567 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: apply.c:4676 +#: apply.c:4686 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traité." -#: apply.c:4684 +#: apply.c:4694 msgid "unrecognized input" msgstr "entrée non reconnue" -#: apply.c:4704 +#: apply.c:4714 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: apply.c:4859 +#: apply.c:4871 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s' :%s" -#: apply.c:4886 +#: apply.c:4898 #, 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:4892 apply.c:4907 +#: apply.c:4904 apply.c:4919 #, 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:4900 +#: apply.c:4912 #, 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:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 -#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 -#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 +#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 +#: builtin/pull.c:209 builtin/submodule--helper.c:407 #: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 #: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 #: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 msgid "path" msgstr "chemin" -#: apply.c:4944 +#: apply.c:4956 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4947 +#: apply.c:4959 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4961 builtin/am.c:2206 msgid "num" msgstr "num" -#: apply.c:4950 +#: apply.c:4962 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: apply.c:4953 +#: apply.c:4965 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: apply.c:4955 +#: apply.c:4967 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:4959 +#: apply.c:4971 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:4961 +#: apply.c:4973 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:4963 +#: apply.c:4975 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:4965 +#: apply.c:4977 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:4967 +#: apply.c:4979 msgid "mark new files with `git add --intent-to-add`" msgstr "marquer les nouveaux fichiers `git add --intent-to-add`" -#: apply.c:4969 +#: apply.c:4981 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: apply.c:4971 +#: apply.c:4983 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: apply.c:4974 +#: apply.c:4986 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)" -#: apply.c:4976 +#: apply.c:4988 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:4978 +#: apply.c:4990 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:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: apply.c:4983 +#: apply.c:4995 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 msgid "action" msgstr "action" -#: apply.c:4985 +#: apply.c:4997 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:4988 apply.c:4991 +#: apply.c:5000 apply.c:5003 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: apply.c:4994 +#: apply.c:5006 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: apply.c:4996 +#: apply.c:5008 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: apply.c:4998 +#: apply.c:5010 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: apply.c:5000 +#: apply.c:5012 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "mode verbeux" -#: apply.c:5003 +#: apply.c:5015 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:5006 +#: apply.c:5018 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:5008 builtin/am.c:2205 +#: apply.c:5020 builtin/am.c:2194 msgid "root" msgstr "racine" -#: apply.c:5009 +#: apply.c:5021 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" @@ -896,7 +896,7 @@ msgstr "fmt" msgid "archive format" msgstr "format d'archive" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:458 builtin/log.c:1581 msgid "prefix" msgstr "préfixe" @@ -904,11 +904,12 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 -#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 -#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 +#: parse-options.h:186 msgid "file" msgstr "fichier" @@ -940,7 +941,7 @@ msgstr "compression efficace" msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 #: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "dépôt" @@ -949,7 +950,7 @@ msgstr "dépôt" 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:481 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "commande" @@ -985,26 +986,26 @@ msgstr "Argument non supporté pour le format '%s' : -%d" msgid "cannot stream blob %s" msgstr "impossible de transmettre le blob %s en flux" -#: archive-tar.c:260 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "mode de fichier non supporté :0%o (SHA1: %s)" -#: archive-tar.c:287 archive-zip.c:353 +#: archive-tar.c:293 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "impossible de lire %s" -#: archive-tar.c:459 +#: archive-tar.c:465 #, c-format msgid "unable to start '%s' filter" msgstr "impossible de démarrer le filtre '%s'" -#: archive-tar.c:462 +#: archive-tar.c:468 msgid "unable to redirect descriptor" msgstr "impossible de rediriger un descripteur" -#: archive-tar.c:469 +#: archive-tar.c:475 #, c-format msgid "'%s' filter reported error" msgstr "le filtre '%s' a retourné une erreur" @@ -1029,17 +1030,17 @@ msgstr "erreur de compression (%d)" msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>" -#: attr.c:211 +#: attr.c:213 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s n'est pas un nom valide d'attribut" -#: attr.c:368 +#: attr.c:370 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s non permis : %s : %d" -#: attr.c:408 +#: attr.c:410 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1167,41 +1168,41 @@ 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:2697 +#: blame.c:2700 msgid "--contents and --reverse do not blend well." msgstr "--contents et --reverse ne font pas bon ménage." -#: blame.c:2711 +#: blame.c:2714 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:2732 +#: blame.c:2735 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:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 -#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 -#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971 +#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 +#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 +#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" -#: blame.c:2759 +#: blame.c:2762 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:2770 +#: blame.c:2773 #, c-format msgid "no such path %s in %s" msgstr "pas de chemin %s dans %s" -#: blame.c:2781 +#: blame.c:2784 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossible de lire le blob %s pour le chemin %s" @@ -1364,7 +1365,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962 #: builtin/commit.c:791 #, c-format msgid "could not open '%s'" @@ -1417,7 +1418,7 @@ msgstr "rev-list a disparu" 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:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" @@ -1440,8 +1441,8 @@ msgstr "l'index de groupe a disparu" msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 +#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" @@ -1471,27 +1472,27 @@ msgstr "" "Supprimez ce message en lançant\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1127 +#: commit.c:1128 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La validation %s a une signature GPG non fiable, prétendument par %s." -#: commit.c:1130 +#: commit.c:1131 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La validation %s a une mauvaise signature GPG prétendument par %s." -#: commit.c:1133 +#: commit.c:1134 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: commit.c:1136 +#: commit.c:1137 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La validation %s a une signature GPG correcte par %s\n" -#: commit.c:1390 +#: commit.c:1391 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" @@ -1559,189 +1560,204 @@ msgstr "" msgid "unable to find all commit-graph files" msgstr "impossible de trouver tous les fichiers du graphe de commit" -#: commit-graph.c:554 commit-graph.c:614 +#: commit-graph.c:561 commit-graph.c:621 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "position de commit invalide. Le graphe de commit est vraisemblablement " "corrompu" -#: commit-graph.c:575 +#: commit-graph.c:582 #, c-format msgid "could not find commit %s" msgstr "impossible de trouver le commit %s" -#: commit-graph.c:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:855 builtin/am.c:1287 +#, c-format +msgid "unable to parse commit %s" +msgstr "impossible d'analyser le commit %s" + +#: commit-graph.c:859 +#, c-format +msgid "unable to get tree for %s" +msgstr "impossible de récupérer l'arbre de %s" + +#: commit-graph.c:1017 builtin/pack-objects.c:2641 #, c-format msgid "unable to get type of object %s" msgstr "impossible d'obtenir le type de l'objet %s" -#: commit-graph.c:1034 +#: commit-graph.c:1049 msgid "Loading known commits in commit graph" msgstr "Lecture des commits connus dans un graphe de commit" -#: commit-graph.c:1051 +#: commit-graph.c:1066 msgid "Expanding reachable commits in commit graph" msgstr "Expansion des commits joignables dans un graphe de commit" -#: commit-graph.c:1070 +#: commit-graph.c:1085 msgid "Clearing commit marks in commit graph" msgstr "Suppression les marques de commit dans le graphe de commits" -#: commit-graph.c:1089 +#: commit-graph.c:1104 msgid "Computing commit graph generation numbers" msgstr "Calcul des chiffres de génération du graphe de commits" -#: commit-graph.c:1163 +#: commit-graph.c:1179 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet" msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets" -#: commit-graph.c:1176 +#: commit-graph.c:1192 #, c-format msgid "error adding pack %s" msgstr "erreur à l'ajout du packet %s" -#: commit-graph.c:1180 +#: commit-graph.c:1196 #, c-format msgid "error opening index for %s" msgstr "erreur à l'ouverture de l'index pour %s" -#: commit-graph.c:1204 +#: commit-graph.c:1220 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Recherche de commits pour un graphe de commits depuis %d réf" msgstr[1] "Recherche de commits pour un graphe de commits depuis %d réfs" -#: commit-graph.c:1238 +#: commit-graph.c:1240 +#, c-format +msgid "invalid commit object id: %s" +msgstr "identifiant d'objet commit invalide : %s" + +#: commit-graph.c:1255 msgid "Finding commits for commit graph among packed objects" msgstr "" "Recherche de commits pour un graphe de commits parmi les objets empaquetés" -#: commit-graph.c:1253 +#: commit-graph.c:1270 msgid "Counting distinct commits in commit graph" msgstr "Comptage des commits distincts dans un graphe de commit" -#: commit-graph.c:1284 +#: commit-graph.c:1300 msgid "Finding extra edges in commit graph" msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits" -#: commit-graph.c:1332 +#: commit-graph.c:1346 msgid "failed to write correct number of base graph ids" msgstr "échec à l'écriture le nombre correct d'id de base de fusion" -#: commit-graph.c:1365 midx.c:811 +#: commit-graph.c:1379 midx.c:810 #, 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:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241 #, c-format msgid "unable to create '%s'" msgstr "impossible de créer '%s'" -#: commit-graph.c:1437 +#: commit-graph.c:1451 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Écriture le graphe de commits en %d passe" msgstr[1] "Écriture le graphe de commits en %d passes" -#: commit-graph.c:1478 +#: commit-graph.c:1492 msgid "unable to open commit-graph chain file" msgstr "impossible d'ouvrir le fichier de graphe de commit" -#: commit-graph.c:1490 +#: commit-graph.c:1504 msgid "failed to rename base commit-graph file" msgstr "échec du renommage du fichier de graphe de commits" -#: commit-graph.c:1510 +#: commit-graph.c:1524 msgid "failed to rename temporary commit-graph file" msgstr "impossible de renommer le fichier temporaire de graphe de commits" -#: commit-graph.c:1621 +#: commit-graph.c:1635 msgid "Scanning merged commits" msgstr "Analyse des commits de fusion" -#: commit-graph.c:1632 +#: commit-graph.c:1646 #, c-format msgid "unexpected duplicate commit id %s" msgstr "id de commit %s dupliqué inattendu" -#: commit-graph.c:1657 +#: commit-graph.c:1670 msgid "Merging commit-graph" msgstr "fusion du graphe de commits" -#: commit-graph.c:1844 +#: commit-graph.c:1860 #, 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:1855 +#: commit-graph.c:1871 msgid "too many commits to write graph" msgstr "trop de commits pour écrire un graphe" -#: commit-graph.c:1945 +#: commit-graph.c:1961 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "le graphe de commit a une somme de contrôle incorrecte et est " "vraisemblablement corrompu" -#: commit-graph.c:1955 +#: commit-graph.c:1971 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s" -#: commit-graph.c:1965 commit-graph.c:1980 +#: commit-graph.c:1981 commit-graph.c:1996 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = " "%u != %u" -#: commit-graph.c:1972 +#: commit-graph.c:1988 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "échec de l'analyse le commit %s depuis le graphe de commits" -#: commit-graph.c:1989 +#: commit-graph.c:2006 msgid "Verifying commits in commit graph" msgstr "Verification des commits dans le graphe de commits" -#: commit-graph.c:2002 +#: commit-graph.c:2020 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "échec de l'analyse du commit %s depuis la base de données d'objets pour le " "graphe de commit" -#: commit-graph.c:2009 +#: commit-graph.c:2027 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != " "%s" -#: commit-graph.c:2019 +#: commit-graph.c:2037 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" "la liste des parents du graphe de commit pour le commit %s est trop longue" -#: commit-graph.c:2028 +#: commit-graph.c:2046 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "le parent du graphe de commit pour %s est %s != %s" -#: commit-graph.c:2041 +#: commit-graph.c:2059 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "la liste de parents du graphe de commit pour le commit %s se termine trop tôt" -#: commit-graph.c:2046 +#: commit-graph.c:2064 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1749,7 +1765,7 @@ msgstr "" "le graphe de commit a un numéro de génération nul pour le commit %s, mais " "non-nul ailleurs" -#: commit-graph.c:2050 +#: commit-graph.c:2068 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1757,12 +1773,12 @@ msgstr "" "le graphe de commit a un numéro de génération non-nul pour le commit %s, " "mais nul ailleurs" -#: commit-graph.c:2065 +#: commit-graph.c:2083 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "la génération du graphe de commit pour le commit %s est %u != %u" -#: commit-graph.c:2071 +#: commit-graph.c:2089 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -1813,7 +1829,7 @@ msgstr "la clé ne contient pas de section: %s" msgid "key does not contain variable name: %s" msgstr "la clé ne contient pas de nom de variable : %s" -#: config.c:406 sequencer.c:2463 +#: config.c:406 sequencer.c:2401 #, c-format msgid "invalid key: %s" msgstr "clé invalide : %s" @@ -1946,155 +1962,148 @@ msgstr "core.commentChar ne devrait être qu'un unique caractère" msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1430 +#: config.c:1425 #, c-format msgid "malformed value for %s" msgstr "valeur mal formée pour %s" -#: config.c:1456 +#: config.c:1451 #, c-format msgid "malformed value for %s: %s" msgstr "valeur mal formée pour %s : %s" -#: config.c:1457 +#: config.c:1452 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "doit être parmi nothing, matching, simple, upstream ou current" -#: config.c:1518 builtin/pack-objects.c:3410 +#: config.c:1513 builtin/pack-objects.c:3394 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" -#: config.c:1639 +#: config.c:1634 #, c-format msgid "unable to load config blob object '%s'" msgstr "impossible de charger l'objet blob de config '%s'" -#: config.c:1642 +#: config.c:1637 #, 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:1659 +#: config.c:1654 #, c-format msgid "unable to resolve config blob '%s'" msgstr "impossible de résoudre le blob de config '%s'" -#: config.c:1689 +#: config.c:1684 #, c-format msgid "failed to parse %s" msgstr "échec de l'analyse de %s" -#: config.c:1745 +#: config.c:1740 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:2094 +#: config.c:2091 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:2264 +#: config.c:2261 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: config.c:2307 -#, 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:2333 +#: config.c:2306 #, 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:2379 +#: config.c:2352 #, 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:2381 +#: config.c:2354 #, 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:2462 +#: config.c:2435 #, c-format msgid "invalid section name '%s'" msgstr "nom de section invalide '%s'" -#: config.c:2494 +#: config.c:2467 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2523 +#: config.c:2496 #, c-format msgid "failed to write new configuration file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2775 config.c:3099 +#: config.c:2748 config.c:3072 #, c-format msgid "could not lock config file %s" msgstr "impossible de verrouiller le fichier de configuration %s" -#: config.c:2786 +#: config.c:2759 #, c-format msgid "opening %s" msgstr "ouverture de %s" -#: config.c:2821 builtin/config.c:328 +#: config.c:2794 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "motif invalide : %s" -#: config.c:2846 +#: config.c:2819 #, c-format msgid "invalid config file %s" msgstr "fichier de configuration invalide %s" -#: config.c:2859 config.c:3112 +#: config.c:2832 config.c:3085 #, c-format msgid "fstat on %s failed" msgstr "échec de fstat sur %s" -#: config.c:2870 +#: config.c:2843 #, c-format msgid "unable to mmap '%s'" msgstr "impossible de réaliser un map de '%s'" -#: config.c:2879 config.c:3117 +#: config.c:2852 config.c:3090 #, c-format msgid "chmod on %s failed" msgstr "échec de chmod sur %s" -#: config.c:2964 config.c:3214 +#: config.c:2937 config.c:3187 #, c-format msgid "could not write config file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2998 +#: config.c:2971 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:3000 builtin/remote.c:782 +#: config.c:2973 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" -#: config.c:3090 +#: config.c:3063 #, c-format msgid "invalid section name: %s" msgstr "nom de section invalide : %s" -#: config.c:3257 +#: config.c:3230 #, c-format msgid "missing value for '%s'" msgstr "valeur manquante pour '%s'" @@ -2218,7 +2227,7 @@ msgstr "impossible de rechercher %s (%s)" msgid "unknown port %s" msgstr "port inconnu %s" -#: connect.c:845 connect.c:1171 +#: connect.c:845 connect.c:1175 #, c-format msgid "strange hostname '%s' blocked" msgstr "nom d'hôte étrange '%s' bloqué" @@ -2233,60 +2242,60 @@ msgstr "port étrange '%s' bloqué" msgid "cannot start proxy %s" msgstr "impossible de démarrer un proxy %s" -#: connect.c:924 +#: connect.c:928 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:1119 +#: connect.c:1123 msgid "ssh variant 'simple' does not support -4" msgstr "la variante ssh 'simple' ne supporte pas -4" -#: connect.c:1131 +#: connect.c:1135 msgid "ssh variant 'simple' does not support -6" msgstr "la variante ssh 'simple' ne supporte pas -6" -#: connect.c:1148 +#: connect.c:1152 msgid "ssh variant 'simple' does not support setting port" msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port" -#: connect.c:1260 +#: connect.c:1264 #, c-format msgid "strange pathname '%s' blocked" msgstr "chemin étrange '%s' bloqué" -#: connect.c:1307 +#: connect.c:1311 msgid "unable to fork" msgstr "fork impossible" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Vérification de la connectivité" -#: connected.c:98 +#: connected.c:100 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" -#: connected.c:118 +#: connected.c:120 msgid "failed write to rev-list" msgstr "impossible d'écrire dans la rev-list" -#: connected.c:125 +#: connected.c:127 msgid "failed to close rev-list's stdin" msgstr "impossible de fermer l'entrée standard du rev-list" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "crlf_action illégal %d" -#: convert.c:206 +#: 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:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2295,12 +2304,12 @@ 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:216 +#: 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:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2309,12 +2318,12 @@ 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:279 +#: 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:286 +#: convert.c:287 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" @@ -2323,12 +2332,12 @@ msgstr "" "Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez " "utiliser UTF-%s comme encodage d'arbre de travail." -#: convert.c:304 +#: 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:306 +#: convert.c:307 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -2338,52 +2347,52 @@ msgstr "" "utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre " "de travail." -#: convert.c:424 convert.c:495 +#: 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:467 +#: 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:673 +#: 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:693 +#: 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:700 +#: convert.c:701 #, c-format msgid "external filter '%s' failed %d" msgstr "le filtre externe '%s' a échoué %d" -#: convert.c:735 convert.c:738 +#: 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:741 convert.c:796 +#: convert.c:742 convert.c:797 #, c-format msgid "external filter '%s' failed" msgstr "le filtre externe '%s' a échoué" -#: convert.c:844 +#: convert.c:845 msgid "unexpected filter type" msgstr "type de filtre inattendu" -#: convert.c:855 +#: convert.c:856 msgid "path name too long for external filter" msgstr "nom de chemin trop long pour un filtre externe" -#: convert.c:929 +#: convert.c:930 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2392,67 +2401,67 @@ msgstr "" "le filtre externe '%s' n'est plus disponible bien que tous les chemins " "n'aient pas été filtrés" -#: convert.c:1228 +#: convert.c:1229 msgid "true/false are no valid working-tree-encodings" msgstr "true/false ne sont pas des encodages d'arbre de travail valides" -#: convert.c:1398 convert.c:1432 +#: convert.c:1417 convert.c:1451 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s : le filtre clean '%s' a échoué" -#: convert.c:1476 +#: convert.c:1495 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s : le filtre smudge '%s' a échoué" -#: date.c:137 +#: date.c:138 msgid "in the future" msgstr "dans le futur" -#: date.c:143 +#: date.c:144 #, c-format 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:150 +#: date.c:151 #, c-format 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:157 +#: date.c:158 #, c-format 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:164 +#: date.c:165 #, c-format 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:170 +#: date.c:171 #, c-format 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:177 +#: date.c:178 #, c-format 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:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2460,14 +2469,14 @@ msgstr[0] "%<PRIuMAX> an" msgstr[1] "%<PRIuMAX> ans" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, c-format 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:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2505,7 +2514,7 @@ msgstr "Marquage de %d îlots, fait.\n" msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:544 +#: diffcore-rename.c:543 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" @@ -2573,35 +2582,35 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:4215 +#: diff.c:4218 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:4560 +#: diff.c:4563 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:4563 +#: diff.c:4566 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S et --find-object sont mutuellement exclusifs" -#: diff.c:4641 +#: diff.c:4644 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:4689 +#: diff.c:4692 #, c-format msgid "invalid --stat value: %s" msgstr "valeur invalide de --stat : %s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s attend une valeur numérique" -#: diff.c:4726 +#: diff.c:4729 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2610,42 +2619,42 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4811 +#: diff.c:4814 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s" -#: diff.c:4835 +#: diff.c:4838 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valeur inconnue après ws-error-highlight=%.*s" -#: diff.c:4849 +#: diff.c:4852 #, c-format msgid "unable to resolve '%s'" msgstr "impossible de résoudre '%s'" -#: diff.c:4899 diff.c:4905 +#: diff.c:4902 diff.c:4908 #, c-format msgid "%s expects <n>/<m> form" msgstr "forme <n>/<m> attendue par %s" -#: diff.c:4917 +#: diff.c:4920 #, c-format msgid "%s expects a character, got '%s'" msgstr "caractère attendu par %s, '%s' trouvé" -#: diff.c:4938 +#: diff.c:4941 #, c-format msgid "bad --color-moved argument: %s" msgstr "mauvais argument --color-moved : %s" -#: diff.c:4957 +#: diff.c:4960 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode invalide '%s' dans --color-moved-ws" -#: diff.c:4997 +#: diff.c:5000 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2653,155 +2662,155 @@ msgstr "" "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " "\"histogram\"" -#: diff.c:5033 diff.c:5053 +#: diff.c:5036 diff.c:5056 #, c-format msgid "invalid argument to %s" msgstr "argument invalide pour %s" -#: diff.c:5191 +#: diff.c:5194 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'" -#: diff.c:5247 +#: diff.c:5250 #, c-format msgid "bad --word-diff argument: %s" msgstr "mauvais argument pour --word-diff : %s" -#: diff.c:5270 +#: diff.c:5273 msgid "Diff output format options" msgstr "Options de format de sortie de diff" -#: diff.c:5272 diff.c:5278 +#: diff.c:5275 diff.c:5281 msgid "generate patch" msgstr "générer la rustine" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5278 builtin/log.c:172 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5283 diff.c:5397 diff.c:5404 msgid "<n>" msgstr "<n>" -#: diff.c:5281 diff.c:5284 +#: diff.c:5284 diff.c:5287 msgid "generate diffs with <n> lines context" msgstr "générer les diffs avec <n> lignes de contexte" -#: diff.c:5286 +#: diff.c:5289 msgid "generate the diff in raw format" msgstr "générer le diff en format brut" -#: diff.c:5289 +#: diff.c:5292 msgid "synonym for '-p --raw'" msgstr "synonyme de '-p --raw'" -#: diff.c:5293 +#: diff.c:5296 msgid "synonym for '-p --stat'" msgstr "synonyme de '-p --stat'" -#: diff.c:5297 +#: diff.c:5300 msgid "machine friendly --stat" msgstr "--stat pour traitement automatique" -#: diff.c:5300 +#: diff.c:5303 msgid "output only the last line of --stat" msgstr "afficher seulement la dernière ligne de --stat" -#: diff.c:5302 diff.c:5310 +#: diff.c:5305 diff.c:5313 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5303 +#: diff.c:5306 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "afficher la distribution des quantités de modifications relatives pour " "chaque sous-répertoire" -#: diff.c:5307 +#: diff.c:5310 msgid "synonym for --dirstat=cumulative" msgstr "synonyme pour --dirstat=cumulative" -#: diff.c:5311 +#: diff.c:5314 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonyme pour --dirstat=files,param1,param2..." -#: diff.c:5315 +#: diff.c:5318 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "avertir si les modifications introduisent des marqueurs de conflit ou des " "erreurs d'espace" -#: diff.c:5318 +#: diff.c:5321 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "résumé succinct tel que les créations, les renommages et les modifications " "de mode" -#: diff.c:5321 +#: diff.c:5324 msgid "show only names of changed files" msgstr "n'afficher que les noms de fichiers modifiés" -#: diff.c:5324 +#: diff.c:5327 msgid "show only names and status of changed files" msgstr "n'afficher que les noms et les status des fichiers modifiés" -#: diff.c:5326 +#: diff.c:5329 msgid "<width>[,<name-width>[,<count>]]" msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]" -#: diff.c:5327 +#: diff.c:5330 msgid "generate diffstat" msgstr "générer un diffstat" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5332 diff.c:5335 diff.c:5338 msgid "<width>" msgstr "<largeur>" -#: diff.c:5330 +#: diff.c:5333 msgid "generate diffstat with a given width" msgstr "générer un diffstat avec la largeur indiquée" -#: diff.c:5333 +#: diff.c:5336 msgid "generate diffstat with a given name width" msgstr "génerer un diffstat avec la largeur de nom indiquée" -#: diff.c:5336 +#: diff.c:5339 msgid "generate diffstat with a given graph width" msgstr "génerer un diffstat avec la largeur de graphe indiquée" -#: diff.c:5338 +#: diff.c:5341 msgid "<count>" msgstr "<compte>" -#: diff.c:5339 +#: diff.c:5342 msgid "generate diffstat with limited lines" msgstr "générer un diffstat avec des lignes limitées" -#: diff.c:5342 +#: diff.c:5345 msgid "generate compact summary in diffstat" msgstr "générer une résumé compact dans le diffstat" -#: diff.c:5345 +#: diff.c:5348 msgid "output a binary diff that can be applied" msgstr "produire un diff binaire qui peut être appliqué" -#: diff.c:5348 +#: diff.c:5351 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "afficher les noms complets des objets pre- et post-image sur les lignes " "\"index\"" -#: diff.c:5350 +#: diff.c:5353 msgid "show colored diff" msgstr "afficher un diff coloré" -#: diff.c:5351 +#: diff.c:5354 msgid "<kind>" msgstr "<sorte>" -#: diff.c:5352 +#: diff.c:5355 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2809,7 +2818,7 @@ msgstr "" "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', " "'nouveau' dans le diff" -#: diff.c:5355 +#: diff.c:5358 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2817,93 +2826,93 @@ msgstr "" "ne pas compresser les chemins et utiliser des NULs comme terminateurs de " "champs dans --raw ou --numstat" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473 msgid "<prefix>" msgstr "<préfixe>" -#: diff.c:5359 +#: diff.c:5362 msgid "show the given source prefix instead of \"a/\"" msgstr "afficher le préfixe de source indiqué au lieu de \"a/\"" -#: diff.c:5362 +#: diff.c:5365 msgid "show the given destination prefix instead of \"b/\"" msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\"" -#: diff.c:5365 +#: diff.c:5368 msgid "prepend an additional prefix to every line of output" msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée" -#: diff.c:5368 +#: diff.c:5371 msgid "do not show any source or destination prefix" msgstr "n'afficher aucun préfixe, ni de source, ni de destination" -#: diff.c:5371 +#: diff.c:5374 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "afficher le contexte entre les sections à concurrence du nombre de ligne " "indiqué" -#: diff.c:5375 diff.c:5380 diff.c:5385 +#: diff.c:5378 diff.c:5383 diff.c:5388 msgid "<char>" msgstr "<caractère>" -#: diff.c:5376 +#: diff.c:5379 msgid "specify the character to indicate a new line instead of '+'" msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'" -#: diff.c:5381 +#: diff.c:5384 msgid "specify the character to indicate an old line instead of '-'" msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'" -#: diff.c:5386 +#: diff.c:5389 msgid "specify the character to indicate a context instead of ' '" msgstr "" "spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '" -#: diff.c:5389 +#: diff.c:5392 msgid "Diff rename options" msgstr "Options de renommage de diff" -#: diff.c:5390 +#: diff.c:5393 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5391 +#: diff.c:5394 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "casser les modifications d'une réécrire complète en paires de suppression et " "création" -#: diff.c:5395 +#: diff.c:5398 msgid "detect renames" msgstr "détecter les renommages" -#: diff.c:5399 +#: diff.c:5402 msgid "omit the preimage for deletes" msgstr "supprimer la pré-image pour les suppressions" -#: diff.c:5402 +#: diff.c:5405 msgid "detect copies" msgstr "détecter les copies" -#: diff.c:5406 +#: diff.c:5409 msgid "use unmodified files as source to find copies" msgstr "" "utiliser les fichiers non-modifiés comme sources pour trouver des copies" -#: diff.c:5408 +#: diff.c:5411 msgid "disable rename detection" msgstr "désactiver la détection de renommage" -#: diff.c:5411 +#: diff.c:5414 msgid "use empty blobs as rename source" msgstr "utiliser des blobs vides comme source de renommage" -#: diff.c:5413 +#: diff.c:5416 msgid "continue listing the history of a file beyond renames" msgstr "continuer à afficher l'historique d'un fichier au delà des renommages" -#: diff.c:5416 +#: diff.c:5419 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2911,161 +2920,161 @@ msgstr "" "empêcher la détection de renommage/copie si le nombre de cibles de renommage/" "copie excède la limite indiquée" -#: diff.c:5418 +#: diff.c:5421 msgid "Diff algorithm options" msgstr "Options de l'algorithme de diff" -#: diff.c:5420 +#: diff.c:5423 msgid "produce the smallest possible diff" msgstr "produire le diff le plus petit possible" -#: diff.c:5423 +#: diff.c:5426 msgid "ignore whitespace when comparing lines" msgstr "ignorer les espaces lors de la comparaison de ligne" -#: diff.c:5426 +#: diff.c:5429 msgid "ignore changes in amount of whitespace" msgstr "ignorer des modifications du nombre d'espaces" -#: diff.c:5429 +#: diff.c:5432 msgid "ignore changes in whitespace at EOL" msgstr "ignorer des modifications d'espace en fin de ligne" -#: diff.c:5432 +#: diff.c:5435 msgid "ignore carrier-return at the end of line" msgstr "ignore le retour chariot en fin de ligne" -#: diff.c:5435 +#: diff.c:5438 msgid "ignore changes whose lines are all blank" msgstr "ignorer les modifications dont les lignes sont vides" -#: diff.c:5438 +#: diff.c:5441 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "heuristique qui déplace les limites de sections de diff pour faciliter la " "lecture" -#: diff.c:5441 +#: diff.c:5444 msgid "generate diff using the \"patience diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"patience\"" -#: diff.c:5445 +#: diff.c:5448 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" "générer un diff en utilisant l'algorithme de différence \"histogramme\"" -#: diff.c:5447 +#: diff.c:5450 msgid "<algorithm>" msgstr "<algorithme>" -#: diff.c:5448 +#: diff.c:5451 msgid "choose a diff algorithm" msgstr "choisir un algorithme de différence" -#: diff.c:5450 +#: diff.c:5453 msgid "<text>" msgstr "<texte>" -#: diff.c:5451 +#: diff.c:5454 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\"" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5456 diff.c:5465 diff.c:5468 msgid "<mode>" msgstr "<mode>" -#: diff.c:5454 +#: diff.c:5457 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "afficher des différences par mot, en utilisant <mode> pour délimiter les " "mots modifiés" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5459 diff.c:5462 diff.c:5507 msgid "<regex>" msgstr "<regex>" -#: diff.c:5457 +#: diff.c:5460 msgid "use <regex> to decide what a word is" msgstr "utiliser <regex> pour décider ce qu'est un mot" -#: diff.c:5460 +#: diff.c:5463 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5463 +#: diff.c:5466 msgid "moved lines of code are colored differently" msgstr "les lignes déplacées sont colorées différemment" -#: diff.c:5466 +#: diff.c:5469 msgid "how white spaces are ignored in --color-moved" msgstr "comment les espaces sont ignorés dans --color-moved" -#: diff.c:5469 +#: diff.c:5472 msgid "Other diff options" msgstr "Autres options diff" -#: diff.c:5471 +#: diff.c:5474 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "lancé depuis un sous-répertoire, exclure les modifications en dehors et " "afficher les chemins relatifs" -#: diff.c:5475 +#: diff.c:5478 msgid "treat all files as text" msgstr "traiter les fichiers comme texte" -#: diff.c:5477 +#: diff.c:5480 msgid "swap two inputs, reverse the diff" msgstr "échanger les entrées, inverser le diff" -#: diff.c:5479 +#: diff.c:5482 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon" -#: diff.c:5481 +#: diff.c:5484 msgid "disable all output of the program" msgstr "désactiver tous les affichages du programme" -#: diff.c:5483 +#: diff.c:5486 msgid "allow an external diff helper to be executed" msgstr "autoriser l'exécution d'un assistant externe de diff" -#: diff.c:5485 +#: diff.c:5488 msgid "run external text conversion filters when comparing binary files" msgstr "" "lancer les filtres externes de conversion en texte lors de la comparaison de " "fichiers binaires" -#: diff.c:5487 +#: diff.c:5490 msgid "<when>" msgstr "<quand>" -#: diff.c:5488 +#: diff.c:5491 msgid "ignore changes to submodules in the diff generation" msgstr "" "ignorer les modifications dans les sous-modules lors de la génération de diff" -#: diff.c:5491 +#: diff.c:5494 msgid "<format>" msgstr "<format>" -#: diff.c:5492 +#: diff.c:5495 msgid "specify how differences in submodules are shown" msgstr "spécifier comment les différences dans les sous-modules sont affichées" -#: diff.c:5496 +#: diff.c:5499 msgid "hide 'git add -N' entries from the index" msgstr "masquer les entrées 'git add -N' de l'index" -#: diff.c:5499 +#: diff.c:5502 msgid "treat 'git add -N' entries as real in the index" msgstr "traiter les entrées 'git add -N' comme réelles dans l'index" -#: diff.c:5501 +#: diff.c:5504 msgid "<string>" msgstr "<chaîne>" -#: diff.c:5502 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3073,7 +3082,7 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la " "chaîne spécifiée" -#: diff.c:5505 +#: diff.c:5508 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3081,26 +3090,26 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la regex " "spécifiée" -#: diff.c:5508 +#: diff.c:5511 msgid "show all changes in the changeset with -S or -G" msgstr "" "afficher toutes les modifications dans l'ensemble de modifications avec -S " "ou -G" -#: diff.c:5511 +#: diff.c:5514 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue" -#: diff.c:5514 +#: diff.c:5517 msgid "control the order in which files appear in the output" msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie" -#: diff.c:5515 +#: diff.c:5518 msgid "<object-id>" msgstr "<id-objet>" -#: diff.c:5516 +#: diff.c:5519 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3108,35 +3117,35 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de l'objet " "indiqué" -#: diff.c:5518 +#: diff.c:5521 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5519 +#: diff.c:5522 msgid "select files by diff type" msgstr "sélectionner les fichiers par types de diff" -#: diff.c:5521 +#: diff.c:5524 msgid "<file>" msgstr "<fichier>" -#: diff.c:5522 +#: diff.c:5525 msgid "Output to a specific file" msgstr "Sortie vers un fichier spécifié" -#: diff.c:6177 +#: diff.c:6180 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:6180 +#: diff.c:6183 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:6183 +#: diff.c:6186 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3144,41 +3153,41 @@ msgstr "" "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le " "commande." -#: dir.c:537 +#: dir.c:549 #, 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:926 +#: dir.c:938 #, c-format msgid "cannot use %s as an exclude file" msgstr "impossible d'utiliser %s comme fichier d'exclusion" -#: dir.c:1843 +#: dir.c:1877 #, c-format msgid "could not open directory '%s'" msgstr "impossible d'ouvrir le répertoire '%s'" -#: dir.c:2085 +#: dir.c:2128 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2209 +#: dir.c:2252 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:3013 +#: dir.c:3056 #, c-format msgid "index file corrupt in repo %s" msgstr "fichier d'index corrompu dans le dépôt %s" -#: dir.c:3058 dir.c:3063 +#: dir.c:3101 dir.c:3106 #, c-format msgid "could not create directories for %s" msgstr "impossible de créer les répertoires pour %s" -#: dir.c:3092 +#: dir.c:3135 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" @@ -3199,12 +3208,12 @@ msgstr "Filtrage du contenu" msgid "could not stat file '%s'" msgstr "impossible de stat le fichier '%s'" -#: environment.c:150 +#: environment.c:148 #, c-format msgid "bad git namespace path \"%s\"" msgstr "Espaces de nom de Git \"%s\"" -#: environment.c:332 +#: environment.c:330 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "impossible de régler GIT_DIR à '%s'" @@ -3214,159 +3223,155 @@ msgstr "impossible de régler GIT_DIR à '%s'" 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:151 +#: fetch-pack.c:150 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack : liste superficielle attendue" -#: fetch-pack.c:154 +#: fetch-pack.c:153 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" "git fetch-pack : paquet de vidage attendu après une liste superficielle" -#: fetch-pack.c:165 +#: 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:185 +#: 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:196 +#: fetch-pack.c:195 msgid "unable to write to remote" msgstr "impossible d'écrire sur un distant" -#: fetch-pack.c:258 +#: fetch-pack.c:257 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc nécessite multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:356 fetch-pack.c:1280 #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalide : %s" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:362 fetch-pack.c:1286 #, c-format msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:364 fetch-pack.c:1288 #, c-format msgid "object not found: %s" msgstr "objet non trouvé : %s" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:367 fetch-pack.c:1291 #, c-format msgid "error in object: %s" msgstr "Erreur dans l'objet : %s" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:369 fetch-pack.c:1293 #, c-format msgid "no shallow found: %s" msgstr "Pas de superficiel trouvé : %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:372 fetch-pack.c:1297 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "superficiel/non superficiel attendu, %s trouvé" -#: fetch-pack.c:417 +#: fetch-pack.c:414 #, c-format msgid "got %s %d %s" msgstr "réponse %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:431 #, c-format msgid "invalid commit %s" msgstr "commit invalide %s" -#: fetch-pack.c:465 +#: fetch-pack.c:462 msgid "giving up" msgstr "abandon" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:475 progress.c:312 msgid "done" msgstr "fait" -#: fetch-pack.c:489 +#: fetch-pack.c:487 #, c-format msgid "got %s (%d) %s" msgstr "%s trouvé (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:533 #, c-format msgid "Marking %s as complete" msgstr "Marquage de %s comme terminé" -#: fetch-pack.c:744 +#: fetch-pack.c:742 #, c-format msgid "already have %s (%s)" msgstr "%s déjà possédé (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:781 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral" -#: fetch-pack.c:791 +#: fetch-pack.c:789 msgid "protocol error: bad pack header" msgstr "erreur de protocole : mauvais entête de paquet" -#: fetch-pack.c:859 +#: fetch-pack.c:857 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack : impossible de dupliquer %s" -#: fetch-pack.c:875 +#: fetch-pack.c:873 #, c-format msgid "%s failed" msgstr "échec de %s" -#: fetch-pack.c:877 +#: fetch-pack.c:875 msgid "error in sideband demultiplexer" msgstr "erreur dans le démultiplexer latéral" -#: fetch-pack.c:908 +#: fetch-pack.c:907 #, c-format msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 -#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 -#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 -#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 +#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927 +#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943 +#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959 +#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981 #, c-format msgid "Server supports %s" msgstr "Le serveur supporte %s" -#: fetch-pack.c:915 +#: fetch-pack.c:914 msgid "Server does not support shallow clients" msgstr "Le serveur ne supporte les clients superficiels" -#: fetch-pack.c:975 +#: fetch-pack.c:974 msgid "Server does not support --shallow-since" msgstr "Le receveur ne gère pas --shallow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:979 msgid "Server does not support --shallow-exclude" msgstr "Le receveur ne gère pas --shallow-exclude" -#: fetch-pack.c:984 +#: fetch-pack.c:983 msgid "Server does not support --deepen" msgstr "Le receveur ne gère pas --deepen" -#: fetch-pack.c:1001 +#: fetch-pack.c:1000 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1012 fetch-pack.c:1468 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." -#: fetch-pack.c:1151 +#: fetch-pack.c:1150 msgid "Server does not support shallow requests" msgstr "Le serveur ne supporte les requêtes superficielles" @@ -3374,72 +3379,72 @@ msgstr "Le serveur ne supporte les requêtes superficielles" msgid "Server supports filter" msgstr "Le serveur supporte filter" -#: fetch-pack.c:1184 +#: fetch-pack.c:1180 msgid "unable to write request to remote" msgstr "impossible d'écrire la requête sur le distant" -#: fetch-pack.c:1202 +#: fetch-pack.c:1198 #, c-format msgid "error reading section header '%s'" msgstr "erreur à la lecture de l'entête de section '%s'" -#: fetch-pack.c:1208 +#: fetch-pack.c:1204 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' attendu, '%s' reçu" -#: fetch-pack.c:1247 +#: fetch-pack.c:1243 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "ligne d'acquittement inattendue : '%s'" -#: fetch-pack.c:1252 +#: fetch-pack.c:1248 #, c-format msgid "error processing acks: %d" msgstr "erreur lors du traitement des acquittements : %d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1258 msgid "expected packfile to be sent after 'ready'" msgstr "fichier paquet attendu à envoyer après 'ready'" -#: fetch-pack.c:1264 +#: fetch-pack.c:1260 msgid "expected no other sections to be sent after no 'ready'" msgstr "aucune autre section attendue à envoyer après absence de 'ready'" -#: fetch-pack.c:1306 +#: fetch-pack.c:1302 #, c-format msgid "error processing shallow info: %d" msgstr "erreur lors du traitement de l'information de superficialité : %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1349 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref attendu, '%s' trouvé" -#: fetch-pack.c:1358 +#: fetch-pack.c:1354 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inattendu : '%s'" -#: fetch-pack.c:1363 +#: fetch-pack.c:1359 #, c-format msgid "error processing wanted refs: %d" msgstr "erreur lors du traitement des références voulues : %d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1693 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1716 builtin/clone.c:685 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: fetch-pack.c:1739 +#: fetch-pack.c:1743 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1746 #, 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é" @@ -3462,18 +3467,24 @@ msgstr "impossible d'écrire la signature détachée dans '%s'" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "couleur invalide '%.*s' ignorée dans log.graphColors" -#: grep.c:2117 +#: grep.c:627 +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est supporté qu'avec -P avec PCRE v2" + +#: grep.c:2083 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2100 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: grep.c:2145 +#: grep.c:2111 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquée" @@ -3620,12 +3631,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [<options>]" -#: help.c:782 +#: help.c:783 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:786 +#: help.c:787 msgid "" "\n" "Did you mean this?" @@ -3698,43 +3709,58 @@ msgstr "le nom n'est constitué que de caractères interdits : %s" msgid "invalid date format: %s" msgstr "format de date invalide : %s" -#: list-objects.c:129 +#: list-objects.c:127 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "" "l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre" -#: list-objects.c:142 +#: list-objects.c:140 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" "l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob" -#: list-objects.c:378 +#: list-objects.c:375 #, c-format msgid "unable to load root tree for commit %s" msgstr "impossible de charger l'arbre racine pour le commit %s" -#: list-objects-filter-options.c:36 -msgid "multiple filter-specs cannot be combined" -msgstr "impossible de combiner des spécificateurs multiples de filtre" +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "impossible d'accéder au blob clairsemé dans '%s'" + +#: list-objects-filter.c:495 +#, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "attendu : 'tree:<profondeur>'" -#: list-objects-filter-options.c:84 +#: list-objects-filter-options.c:73 msgid "sparse:path filters support has been dropped" msgstr "sparse : le support des filtres de chemin a été abandonné" -#: list-objects-filter-options.c:94 +#: list-objects-filter-options.c:86 #, c-format msgid "invalid filter-spec '%s'" msgstr "spécificateur de filtre invalide '%s'" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" -msgstr "impossible de modifier le prometteur distant de clone partiel" +#: list-objects-filter-options.c:102 +#, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "le caractère doit être échappé dans le spécificateur de sous-filtre : '%c'" + +#: list-objects-filter-options.c:144 +msgid "expected something after combine:" +msgstr "quelque chose attendu après combine :" + +#: list-objects-filter-options.c:226 +msgid "multiple filter-specs cannot be combined" +msgstr "impossible de combiner des spécificateurs multiples de filtre" #: lockfile.c:151 #, c-format @@ -3764,117 +3790,113 @@ msgstr "Impossible de créer '%s.lock' : %s" msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 -#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 +#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" -#: merge-recursive.c:322 +#: merge-recursive.c:367 msgid "(bad commit)\n" msgstr "(mauvais commit)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:390 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion." -#: merge-recursive.c:354 +#: merge-recursive.c:399 #, 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:437 -msgid "error building trees" -msgstr "erreur de construction des arbres" - -#: merge-recursive.c:863 +#: merge-recursive.c:885 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:874 +#: merge-recursive.c:896 #, 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:888 merge-recursive.c:907 +#: merge-recursive.c:910 merge-recursive.c:929 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:897 +#: merge-recursive.c:919 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:960 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:941 +#: merge-recursive.c:965 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:965 +#: merge-recursive.c:990 #, c-format msgid "failed to open '%s': %s" msgstr "échec à l'ouverture de '%s' : %s" -#: merge-recursive.c:976 +#: merge-recursive.c:1001 #, c-format msgid "failed to symlink '%s': %s" msgstr "échec à la création du lien symbolique '%s' : %s" -#: merge-recursive.c:981 +#: merge-recursive.c:1006 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:1177 +#: merge-recursive.c:1199 #, 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:1184 +#: merge-recursive.c:1206 #, 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:1191 +#: merge-recursive.c:1213 #, 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:1199 merge-recursive.c:1211 +#: merge-recursive.c:1221 merge-recursive.c:1233 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Avance rapide du sous-module %s au commit suivant :" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1224 merge-recursive.c:1236 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rapide du sous-module %s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1259 #, 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:1241 +#: merge-recursive.c:1263 #, 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:1242 +#: merge-recursive.c:1264 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:1245 +#: merge-recursive.c:1267 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3891,33 +3913,33 @@ msgstr "" "\n" "qui acceptera cette suggestion.\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1276 #, 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:1327 +#: merge-recursive.c:1349 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-recursive.c:1332 +#: merge-recursive.c:1354 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-recursive.c:1364 +#: merge-recursive.c:1386 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1387 +#: merge-recursive.c:1410 #, 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:1459 +#: merge-recursive.c:1482 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3926,7 +3948,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre." -#: merge-recursive.c:1464 +#: merge-recursive.c:1487 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3935,7 +3957,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " "%s de %s laissée dans l'arbre." -#: merge-recursive.c:1471 +#: merge-recursive.c:1494 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3944,7 +3966,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1476 +#: merge-recursive.c:1499 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3953,41 +3975,41 @@ 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:1511 +#: merge-recursive.c:1534 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1511 +#: merge-recursive.c:1534 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Refus de perdre le fichier modifié %s" -#: merge-recursive.c:1601 +#: merge-recursive.c:1624 #, 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:1659 +#: merge-recursive.c:1682 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s" -#: merge-recursive.c:1690 +#: merge-recursive.c:1713 #, 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:1695 +#: merge-recursive.c:1718 #, 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:1714 +#: merge-recursive.c:1737 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3996,18 +4018,18 @@ msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1719 +#: merge-recursive.c:1742 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1851 #, 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:2035 +#: merge-recursive.c:2056 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4018,7 +4040,7 @@ msgstr "" "parce que le répertoire %s a été renommé en plusieurs autres répertoires, " "sans aucune destination récupérant la majorité des fichiers." -#: merge-recursive.c:2067 +#: merge-recursive.c:2088 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4027,7 +4049,7 @@ msgstr "" "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne " "des renommages implicites de répertoire déplaçant les chemins suivants : %s." -#: merge-recursive.c:2077 +#: merge-recursive.c:2098 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4036,7 +4058,7 @@ msgstr "" "CONFLIT (renommage implicite de répertoire) : impossible de transformer " "plusieurs chemins sur %s ; les chemins concernés sont : %s" -#: merge-recursive.c:2169 +#: merge-recursive.c:2190 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4045,7 +4067,7 @@ msgstr "" "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. " "Renommage de répertoire %s->%s dans %s" -#: merge-recursive.c:2413 +#: merge-recursive.c:2435 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4054,52 +4076,52 @@ msgstr "" "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été " "renommé." -#: merge-recursive.c:2938 +#: merge-recursive.c:2961 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-recursive.c:2941 +#: merge-recursive.c:2964 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-recursive.c:3005 +#: merge-recursive.c:3028 msgid "modify" msgstr "modification" -#: merge-recursive.c:3005 +#: merge-recursive.c:3028 msgid "modified" msgstr "modifié" -#: merge-recursive.c:3017 +#: merge-recursive.c:3040 msgid "content" msgstr "contenu" -#: merge-recursive.c:3021 +#: merge-recursive.c:3044 msgid "add/add" msgstr "ajout/ajout" -#: merge-recursive.c:3044 +#: merge-recursive.c:3067 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:3066 git-submodule.sh:937 +#: merge-recursive.c:3089 git-submodule.sh:937 msgid "submodule" msgstr "sous-module" -#: merge-recursive.c:3067 +#: merge-recursive.c:3090 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-recursive.c:3097 +#: merge-recursive.c:3120 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:3179 +#: merge-recursive.c:3203 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4108,7 +4130,7 @@ msgstr "" "Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé " "en %s ; déplacé dans %s." -#: merge-recursive.c:3182 +#: merge-recursive.c:3206 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4118,7 +4140,7 @@ msgstr "" "a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé " "vers %s." -#: merge-recursive.c:3186 +#: merge-recursive.c:3210 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4127,7 +4149,7 @@ msgstr "" "Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été " "renommé en %s ; déplacé dans %s." -#: merge-recursive.c:3189 +#: merge-recursive.c:3213 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4137,176 +4159,176 @@ msgstr "" "répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être " "être déplacé vers %s." -#: merge-recursive.c:3303 +#: merge-recursive.c:3327 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:3326 +#: merge-recursive.c:3350 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:3331 +#: merge-recursive.c:3355 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:3338 +#: merge-recursive.c:3362 #, 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:3347 +#: merge-recursive.c:3371 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:3356 +#: merge-recursive.c:3380 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s" -#: merge-recursive.c:3394 -#, 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:3405 +#: merge-recursive.c:3424 msgid "Already up to date!" msgstr "Déjà à jour !" -#: merge-recursive.c:3414 +#: merge-recursive.c:3433 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:3513 +#: merge-recursive.c:3537 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:3526 +#: merge-recursive.c:3550 #, 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:3565 +#: merge-recursive.c:3600 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:3631 +#: merge-recursive.c:3659 +#, 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:3756 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." -#: midx.c:69 +#: midx.c:68 #, c-format msgid "multi-pack-index file %s is too small" msgstr "le fichier d'index multi-paquet %s est trop petit" -#: midx.c:85 +#: midx.c:84 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" "la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature " "0x%08x" -#: midx.c:90 +#: midx.c:89 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "la version d'index multi-paquet %d n'est pas reconnue" -#: midx.c:95 +#: midx.c:94 #, c-format msgid "hash version %u does not match" msgstr "la version %u du condensé ne correspond pas" -#: midx.c:109 +#: midx.c:108 msgid "invalid chunk offset (too large)" msgstr "décalage de section invalide (trop grand)" -#: midx.c:133 +#: midx.c:132 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" "identifiant de terminaison de tronçon d'index multi-paquet terminant " "apparaît plus tôt qu'attendu" -#: midx.c:146 +#: midx.c:145 msgid "multi-pack-index missing required pack-name chunk" msgstr "index multi-paquet manque de tronçon de nom de paquet" -#: midx.c:148 +#: midx.c:147 msgid "multi-pack-index missing required OID fanout chunk" msgstr "index multi-paquet manque de tronçon de d'étalement OID requis" -#: midx.c:150 +#: midx.c:149 msgid "multi-pack-index missing required OID lookup chunk" msgstr "index multi-paquet manque de tronçon de recherche OID" -#: midx.c:152 +#: midx.c:151 msgid "multi-pack-index missing required object offsets chunk" msgstr "index multi-paquet manque de tronçon de décalage d'objet" -#: midx.c:166 +#: midx.c:165 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'" -#: midx.c:211 +#: midx.c:210 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mauvais pack-int-id : %u (%u paquets au total)" -#: midx.c:261 +#: midx.c:260 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "multi-pack-index stock un décalage en 64-bit, mais off_t est trop petit" -#: midx.c:289 +#: midx.c:288 msgid "error preparing packfile from multi-pack-index" msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet" -#: midx.c:470 +#: midx.c:469 #, c-format msgid "failed to add packfile '%s'" msgstr "échec de l'ajout du fichier paquet '%s'" -#: midx.c:476 +#: midx.c:475 #, c-format msgid "failed to open pack-index '%s'" msgstr "échec à l'ouverture du fichier paquet '%s'" -#: midx.c:536 +#: midx.c:535 #, c-format msgid "failed to locate object %d in packfile" msgstr "échec de localisation de l'objet %d dans le fichier paquet" -#: midx.c:865 +#: midx.c:864 #, c-format msgid "did not see pack-file %s to drop" msgstr "fichier paquet à éliminer %s non trouvé" -#: midx.c:1036 +#: midx.c:1035 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "échec du nettoyage de l'index de multi-paquet à %s" -#: midx.c:1091 +#: midx.c:1090 msgid "Looking for referenced packfiles" msgstr "Recherche de fichiers paquets référencés" -#: midx.c:1106 +#: midx.c:1105 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -4314,57 +4336,57 @@ msgstr "" "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = " "étalement[%d]" -#: midx.c:1110 +#: midx.c:1109 msgid "Verifying OID order in MIDX" msgstr "Vérification de l'ordre des OID dans MIDX" -#: midx.c:1119 +#: midx.c:1118 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1138 +#: midx.c:1137 msgid "Sorting objects by packfile" msgstr "Classement des objets par fichier paquet" -#: midx.c:1144 +#: midx.c:1143 msgid "Verifying object offsets" msgstr "Vérification des décalages des objets" -#: midx.c:1160 +#: midx.c:1159 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s" -#: midx.c:1166 +#: midx.c:1165 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "impossible de lire le fichier paquet %s" -#: midx.c:1175 +#: midx.c:1174 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>" -#: midx.c:1350 +#: midx.c:1349 msgid "could not start pack-objects" msgstr "Impossible de démarrer le groupement d'objets" -#: midx.c:1369 +#: midx.c:1368 msgid "could not finish pack-objects" msgstr "Impossible de finir le groupement d'objets" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "impossible de créer le fil lazy_dir : %s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "impossible de créer le fil lazy_name : %s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "impossible de joindre le fil lazy_name : %s" @@ -4408,41 +4430,41 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Mauvaise valeur de %s : '%s'" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "type d'objet invalide \"%s\"" -#: object.c:174 +#: 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:234 +#: 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:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" -#: object.c:267 object.c:278 +#: object.c:266 object.c:277 #, c-format msgid "hash mismatch %s" msgstr "incohérence de hachage %s" -#: packfile.c:648 +#: packfile.c:641 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" -#: packfile.c:1899 +#: packfile.c:1887 #, 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:1903 +#: packfile.c:1891 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -4488,26 +4510,26 @@ msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)" msgid "did you mean `--%s` (with two dashes ?)" msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?" -#: parse-options.c:859 +#: parse-options.c:860 #, c-format msgid "unknown option `%s'" msgstr "option inconnue « %s »" -#: parse-options.c:861 +#: parse-options.c:862 #, c-format msgid "unknown switch `%c'" msgstr "bascule inconnue « %c »" -#: parse-options.c:863 +#: parse-options.c:864 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "option non-ascii inconnue dans la chaîne : '%s'" -#: parse-options.c:887 +#: parse-options.c:888 msgid "..." msgstr "..." -#: parse-options.c:906 +#: parse-options.c:907 #, c-format msgid "usage: %s" msgstr "usage : %s" @@ -4515,21 +4537,21 @@ msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:913 #, c-format msgid " or: %s" msgstr " ou : %s" -#: parse-options.c:915 +#: parse-options.c:916 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:955 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:968 +#: parse-options.c:969 #, c-format msgid "alias of --%s" msgstr "alias pour --%s" @@ -4704,29 +4726,38 @@ msgstr "impossible de créer le lstat en fil : %s" msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: range-diff.c:70 +#: promisor-remote.c:25 +msgid "Remote with no URL" +msgstr "Dépôt distant sans URL" + +#: promisor-remote.c:61 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "un nom de prometteur distant ne peut pas commencer par '/' : %s" + +#: range-diff.c:71 msgid "could not start `log`" msgstr "impossible de démarrer `log`" -#: range-diff.c:72 +#: range-diff.c:73 msgid "could not read `log` output" msgstr "impossible de lire la sortie de `log`" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:92 sequencer.c:4985 #, c-format msgid "could not parse commit '%s'" msgstr "impossible d'analyser le commit '%s'" -#: range-diff.c:117 +#: range-diff.c:118 #, c-format msgid "could not parse git header '%.*s'" msgstr "impossible d'analyser l'entête git '%.*s'" -#: range-diff.c:274 +#: range-diff.c:275 msgid "failed to generate diff" msgstr "échec de la génération de diff" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:507 range-diff.c:509 #, c-format msgid "could not parse log for '%s'" msgstr "impossible d'analyser le journal pour '%s'" @@ -4772,11 +4803,11 @@ msgstr "fstat de '%s' impossible" msgid "'%s' appears as both a file and as a directory" msgstr "'%s' existe à la fois comme un fichier et un répertoire" -#: read-cache.c:1499 +#: read-cache.c:1520 msgid "Refresh index" msgstr "Rafraîchir l'index" -#: read-cache.c:1613 +#: read-cache.c:1635 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4785,7 +4816,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1623 +#: read-cache.c:1645 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4794,138 +4825,138 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1679 +#: read-cache.c:1701 #, c-format msgid "bad signature 0x%08x" msgstr "signature incorrecte 0x%08x" -#: read-cache.c:1682 +#: read-cache.c:1704 #, c-format msgid "bad index version %d" msgstr "mauvaise version d'index %d" -#: read-cache.c:1691 +#: read-cache.c:1713 msgid "bad index file sha1 signature" msgstr "mauvaise signature sha1 d'index" -#: read-cache.c:1721 +#: read-cache.c:1743 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "l'index utilise l'extension %.4s qui n'est pas comprise" -#: read-cache.c:1723 +#: read-cache.c:1745 #, c-format msgid "ignoring %.4s extension" msgstr "extension %.4s ignorée" -#: read-cache.c:1760 +#: read-cache.c:1782 #, c-format msgid "unknown index entry format 0x%08x" msgstr "format d'entrée d'index inconnu 0x%08x" -#: read-cache.c:1776 +#: read-cache.c:1798 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "champ de nom malformé dans l'index, près du chemin '%s'" -#: read-cache.c:1833 +#: read-cache.c:1855 msgid "unordered stage entries in index" msgstr "entrées de préparation non ordonnées dans l'index" -#: read-cache.c:1836 +#: read-cache.c:1858 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "entrées multiples de préparation pour le fichier fusionné '%s'" -#: read-cache.c:1839 +#: read-cache.c:1861 #, c-format msgid "unordered stage entries for '%s'" msgstr "entrées de préparation non ordonnées pour '%s'" -#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 -#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 +#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 #: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: read-cache.c:2087 +#: read-cache.c:2108 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "impossible de créer le fil load_cache_entries : %s" -#: read-cache.c:2100 +#: read-cache.c:2121 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "impossible de joindre le fil load_cach_entries : %s" -#: read-cache.c:2133 +#: read-cache.c:2154 #, c-format msgid "%s: index file open failed" msgstr "%s : l'ouverture du fichier d'index a échoué" -#: read-cache.c:2137 +#: read-cache.c:2158 #, c-format msgid "%s: cannot stat the open index" msgstr "%s : impossible de faire un stat sur l'index ouvert" -#: read-cache.c:2141 +#: read-cache.c:2162 #, c-format msgid "%s: index file smaller than expected" msgstr "%s : fichier d'index plus petit qu'attendu" -#: read-cache.c:2145 +#: read-cache.c:2166 #, c-format msgid "%s: unable to map index file" msgstr "%s : impossible de mapper le fichier d'index" -#: read-cache.c:2187 +#: read-cache.c:2208 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "impossible de créer le fil load_index_extensions : %s" -#: read-cache.c:2214 +#: read-cache.c:2235 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "impossible de joindre le fil load_index_extensions : %s" -#: read-cache.c:2246 +#: read-cache.c:2267 #, c-format msgid "could not freshen shared index '%s'" msgstr "impossible de rafraîchir l'index partagé '%s'" -#: read-cache.c:2293 +#: read-cache.c:2314 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "index cassé, %s attendu dans %s, %s obtenu" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 #, c-format msgid "could not stat '%s'" msgstr "stat impossible de '%s'" -#: read-cache.c:3105 +#: read-cache.c:3126 #, c-format msgid "unable to open git dir: %s" msgstr "impossible d'ouvrir le répertoire git : %s" -#: read-cache.c:3117 +#: read-cache.c:3138 #, c-format msgid "unable to unlink: %s" msgstr "échec lors de l'unlink : %s" -#: read-cache.c:3142 +#: read-cache.c:3163 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "impossible de régler les bits de droit de '%s'" -#: read-cache.c:3291 +#: read-cache.c:3312 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s : impossible de revenir à l'étape 0" @@ -5032,8 +5063,8 @@ msgstr "" msgid "Note that empty commits are commented out" msgstr "Veuillez noter que les commits vides sont en commentaire" -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 -#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388 +#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "impossible d'écrire '%s'" @@ -5080,7 +5111,7 @@ msgstr "%s ne pointe pas sur un objet valide!" msgid "ignoring dangling symref %s" msgstr "symref pendant %s ignoré" -#: refs.c:669 ref-filter.c:2092 +#: refs.c:669 ref-filter.c:2098 #, c-format msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" @@ -5105,14 +5136,14 @@ msgstr "la référence '%s' existe déjà" msgid "unexpected object ID when writing '%s'" msgstr "id d'objet inattendu pendant l'écriture de '%s'" -#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 -#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 +#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 +#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "impossible d'écrire dans '%s'" -#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 -#: builtin/rebase.c:1003 +#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 +#: builtin/rebase.c:1004 #, c-format msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" @@ -5147,21 +5178,21 @@ msgstr "refus de mettre à jour une réf avec un nom cassé '%s'" msgid "update_ref failed for ref '%s': %s" msgstr "échec de update_ref pour la réf '%s' : %s" -#: refs.c:2012 +#: refs.c:2023 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "mises à jour multiples pour la réf '%s' non permises" -#: refs.c:2044 +#: refs.c:2055 msgid "ref updates forbidden inside quarantine environment" msgstr "mises à jour des références interdites en environnement de quarantaine" -#: refs.c:2140 refs.c:2170 +#: refs.c:2151 refs.c:2181 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe ; impossible de créer '%s'" -#: refs.c:2146 refs.c:2181 +#: refs.c:2157 refs.c:2192 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "impossible de traiter '%s' et '%s' en même temps" @@ -5171,13 +5202,13 @@ msgstr "impossible de traiter '%s' et '%s' en même temps" msgid "could not remove reference %s" msgstr "impossible de supprimer la référence %s" -#: refs/files-backend.c:1248 refs/packed-backend.c:1532 -#: refs/packed-backend.c:1542 +#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "Impossible de supprimer la référence %s : %s" -#: refs/files-backend.c:1251 refs/packed-backend.c:1545 +#: refs/files-backend.c:1251 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "impossible de supprimer les références : %s" @@ -5188,7 +5219,7 @@ msgid "invalid refspec '%s'" msgstr "spécificateur de réference invalide : '%s'" # à priori on parle d'une branche ici -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1938 msgid "gone" msgstr "disparue" @@ -5207,283 +5238,283 @@ msgstr "en retard de %d" msgid "ahead %d, behind %d" msgstr "en avance de %d, en retard de %d" -#: ref-filter.c:162 +#: ref-filter.c:165 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format attendu : %%(color:<couleur>)" -#: ref-filter.c:164 +#: ref-filter.c:167 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "couleur non reconnue : %%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:189 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valeur entière attendue refname:lstrip=%s" -#: ref-filter.c:190 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valeur entière attendue refname:rstrip=%s" -#: ref-filter.c:192 +#: ref-filter.c:195 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argument %%(%s) non reconnu : %s" -#: ref-filter.c:247 +#: ref-filter.c:250 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) n'accepte pas d'argument" -#: ref-filter.c:269 +#: ref-filter.c:272 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "argument %%(objectsize) non reconnu : %s" -#: ref-filter.c:277 +#: ref-filter.c:280 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) n'accepte pas d'argument" -#: ref-filter.c:289 +#: ref-filter.c:292 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) n'accepte pas d'argument" -#: ref-filter.c:298 +#: ref-filter.c:301 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) n'accepte pas d'argument" -#: ref-filter.c:320 +#: ref-filter.c:323 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argument %%(trailers) inconnu : %s" -#: ref-filter.c:349 +#: ref-filter.c:352 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valeur positive attendue contents:lines=%s" -#: ref-filter.c:351 +#: ref-filter.c:354 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argument %%(contents) non reconnu : %s" -#: ref-filter.c:366 +#: ref-filter.c:369 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valeur positive attendue objectname:short=%s" -#: ref-filter.c:370 +#: ref-filter.c:373 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argument %%(objectname) non reconnu : %s" -#: ref-filter.c:400 +#: ref-filter.c:403 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format attendu : %%(align:<largeur>,<position>)" -#: ref-filter.c:412 +#: ref-filter.c:415 #, c-format msgid "unrecognized position:%s" msgstr "position non reconnue : %s" -#: ref-filter.c:419 +#: ref-filter.c:422 #, c-format msgid "unrecognized width:%s" msgstr "largeur non reconnue : %s" -#: ref-filter.c:428 +#: ref-filter.c:431 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argument %%(align) non reconnu : %s" -#: ref-filter.c:436 +#: ref-filter.c:439 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "valeur positive attendue avec l'atome %%(align)" -#: ref-filter.c:454 +#: ref-filter.c:457 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argument %%(if) non reconnu : %s" -#: ref-filter.c:556 +#: ref-filter.c:559 #, c-format msgid "malformed field name: %.*s" msgstr "nom de champ malformé %.*s" -#: ref-filter.c:583 +#: ref-filter.c:586 #, c-format msgid "unknown field name: %.*s" msgstr "nom de champ inconnu : %.*s" -#: ref-filter.c:587 +#: ref-filter.c:590 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet" -#: ref-filter.c:711 +#: ref-filter.c:714 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format : atome %%(if) utilisé sans un atome %%(then)" -#: ref-filter.c:774 +#: ref-filter.c:777 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format : atome %%(then) utilisé sans un atome %%(if)" -#: ref-filter.c:776 +#: ref-filter.c:779 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format : atome %%(then) utilisé plus d'une fois" -#: ref-filter.c:778 +#: ref-filter.c:781 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atome %%(then) utilisé après %%(else)" -#: ref-filter.c:806 +#: ref-filter.c:809 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(if)" -#: ref-filter.c:808 +#: ref-filter.c:811 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(then)" -#: ref-filter.c:810 +#: ref-filter.c:813 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format : atome %%(else) utilisé plus d'une fois" -#: ref-filter.c:825 +#: ref-filter.c:828 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format : atome %%(end) utilisé sans atome correspondant" -#: ref-filter.c:882 +#: ref-filter.c:885 #, c-format msgid "malformed format string %s" msgstr "Chaîne de formatage mal formée %s" -#: ref-filter.c:1485 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing %s" msgstr "aucune branche, rebasage de %s" -#: ref-filter.c:1488 +#: ref-filter.c:1491 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "aucune branche, rebasage de la HEAD détachée %s" -#: ref-filter.c:1491 +#: ref-filter.c:1494 #, c-format msgid "no branch, bisect started on %s" msgstr "aucune branche, bisect a démarré sur %s" -#: ref-filter.c:1501 +#: ref-filter.c:1504 msgid "no branch" msgstr "aucune branche" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1540 ref-filter.c:1749 #, c-format msgid "missing object %s for %s" msgstr "objet manquant %s pour %s" -#: ref-filter.c:1547 +#: ref-filter.c:1550 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "échec de parse_object_buffer sur %s pour %s" -#: ref-filter.c:1998 +#: ref-filter.c:2004 #, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" -#: ref-filter.c:2087 +#: ref-filter.c:2093 #, c-format msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:2382 +#: ref-filter.c:2389 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:2482 +#: ref-filter.c:2489 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "l'option « %s » est incompatible avec --merged" -#: ref-filter.c:2485 +#: ref-filter.c:2492 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "l'option « %s » est incompatible avec --no-merged" -#: ref-filter.c:2495 +#: ref-filter.c:2502 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: ref-filter.c:2500 +#: ref-filter.c:2507 #, c-format msgid "option `%s' must point to a commit" msgstr "l'option '%s' doit pointer sur un commit" -#: remote.c:363 +#: remote.c:366 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" "un raccourci de configuration de distant ne peut pas commencer par '/' : %s" -#: remote.c:410 +#: remote.c:413 msgid "more than one receivepack given, using the first" msgstr "plus d'un receivepack fournis, utilisation du premier" -#: remote.c:418 +#: remote.c:421 msgid "more than one uploadpack given, using the first" msgstr "plus d'un uploadpack fournis, utilisation du premier" -#: remote.c:608 +#: remote.c:611 #, 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:612 +#: remote.c:615 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:616 +#: remote.c:619 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#: remote.c:684 +#: remote.c:687 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "la clé '%s' du modèle n'a pas de '*'" -#: remote.c:694 +#: remote.c:697 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "la valeur '%s' du modèle n'a pas de '*'" -#: remote.c:1000 +#: remote.c:1003 #, c-format msgid "src refspec %s does not match any" msgstr "" "le spécificateur de référence source %s ne correspond à aucune référence" -#: remote.c:1005 +#: remote.c:1008 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5493,7 +5524,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1023 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5517,7 +5548,7 @@ msgstr "" "Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence " "totalement qualifiée." -#: remote.c:1040 +#: remote.c:1043 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5528,7 +5559,7 @@ msgstr "" "Souhaitiez-vous créer une nouvelle branche en poussant sur\n" "'%s:refs/heads/%s' ?" -#: remote.c:1045 +#: remote.c:1048 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5539,7 +5570,7 @@ msgstr "" "Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1050 +#: remote.c:1053 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5550,7 +5581,7 @@ msgstr "" "Souhaitiez-vous créer un nouvel arbre en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1055 +#: remote.c:1058 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5561,119 +5592,119 @@ msgstr "" "Souhaitiez-vous créer un nouveau blob en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1091 +#: remote.c:1094 #, c-format msgid "%s cannot be resolved to branch" msgstr "'%s' ne peut pas être résolue comme une branche" -#: remote.c:1102 +#: remote.c:1105 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "suppression d '%s' impossible : la référence distante n'existe pas" -#: remote.c:1114 +#: remote.c:1117 #, c-format msgid "dst refspec %s matches more than one" msgstr "" "le spécificateur de référence dst %s correspond à plus d'un spécificateur de " "références" -#: remote.c:1121 +#: remote.c:1124 #, c-format msgid "dst ref %s receives from more than one src" msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source" -#: remote.c:1624 remote.c:1725 +#: remote.c:1627 remote.c:1728 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1633 +#: remote.c:1636 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1636 +#: remote.c:1639 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurée pour la branche '%s'" -#: remote.c:1642 +#: remote.c:1645 #, 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:1657 +#: remote.c:1660 #, 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:1669 +#: remote.c:1672 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branche '%s' n'a aucune branche distante de poussée" -#: remote.c:1679 +#: remote.c:1682 #, 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:1692 +#: remote.c:1695 msgid "push has no destination (push.default is 'nothing')" msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')" -#: remote.c:1714 +#: remote.c:1717 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de résoudre une poussée 'simple' pour une destination unique" -#: remote.c:1840 +#: remote.c:1843 #, c-format msgid "couldn't find remote ref %s" msgstr "impossible de trouver la référence distante %s" -#: remote.c:1853 +#: remote.c:1856 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Référence bizarre '%s' ignorée localement" -#: remote.c:2016 +#: remote.c:2019 #, 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:2020 +#: remote.c:2023 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2023 +#: remote.c:2026 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:2027 +#: remote.c:2030 #, 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:2030 +#: remote.c:2033 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (utilisez \"%s\" pour plus de détails)\n" -#: remote.c:2034 +#: remote.c:2037 #, 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:2040 +#: remote.c:2043 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2043 +#: remote.c:2046 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5685,11 +5716,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:2051 +#: remote.c:2054 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:2054 +#: remote.c:2057 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5704,12 +5735,12 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:2064 +#: remote.c:2067 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" -#: remote.c:2247 +#: remote.c:2250 #, c-format msgid "cannot parse expected object name '%s'" msgstr "impossible d'analyser le nom attendu d'objet '%s'" @@ -5787,7 +5818,7 @@ msgstr "impossible de délier '%s' qui est errant" msgid "Recorded preimage for '%s'" msgstr "Pré-image enregistrée pour '%s'" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" @@ -5822,20 +5853,20 @@ msgstr "Résolution pour '%s' oubliée\n" msgid "unable to open rr-cache directory" msgstr "impossible d'ouvrir le répertoire rr-cache" -#: revision.c:2507 +#: revision.c:2509 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2510 +#: revision.c:2512 #, 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:2710 +#: revision.c:2720 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" -#: revision.c:2714 +#: revision.c:2724 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s" @@ -5858,31 +5889,31 @@ msgstr "" "Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook " "false`." -#: send-pack.c:141 +#: 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:143 +#: 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:145 +#: send-pack.c:146 #, c-format msgid "remote unpack failed: %s" msgstr "le dépaquetage a échoué : %s" -#: send-pack.c:306 +#: send-pack.c:307 msgid "failed to sign the push certificate" msgstr "impossible de signer le certificat de poussée" -#: send-pack.c:420 +#: send-pack.c:421 msgid "the receiving end does not support --signed push" msgstr "Le receveur ne gère pas les poussées avec --signed" -#: send-pack.c:422 +#: send-pack.c:423 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5890,11 +5921,11 @@ msgstr "" "pas d'envoi de certificat de poussée car le receveur ne gère pas les " "poussées avec --signed" -#: send-pack.c:434 +#: send-pack.c:435 msgid "the receiving end does not support --atomic push" msgstr "Le receveur ne gère pas les poussées avec --atomic" -#: send-pack.c:439 +#: send-pack.c:440 msgid "the receiving end does not support push options" msgstr "Le receveur ne gère pas les options de poussées" @@ -5908,7 +5939,7 @@ msgstr "mode de nettoyage invalide de message de validation '%s'" msgid "could not delete '%s'" msgstr "Impossible de supprimer '%s'" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "impossible de supprimer '%s'" @@ -5948,7 +5979,7 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:401 sequencer.c:2847 #, c-format msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" @@ -5958,15 +5989,15 @@ msgstr "impossible de verrouiller '%s'" msgid "could not write eol to '%s'" msgstr "impossible d'écrire la fin de ligne dans '%s'" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 +#: sequencer.c:3130 #, c-format msgid "failed to finalize '%s'" msgstr "échec lors de la finalisation de '%s'" -#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 -#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 -#: builtin/merge.c:1112 builtin/rebase.c:567 +#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 +#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 +#: builtin/rebase.c:568 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" @@ -5993,70 +6024,65 @@ msgstr "Mode de nettoyage invalide %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:632 +#: sequencer.c:631 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:649 +#: sequencer.c:648 msgid "unable to update cache tree" msgstr "impossible de mettre à jour l'arbre de cache" -#: sequencer.c:663 +#: sequencer.c:662 msgid "could not resolve HEAD commit" msgstr "impossible de résoudre le commit HEAD" -#: sequencer.c:743 +#: sequencer.c:742 #, c-format msgid "no key present in '%.*s'" msgstr "aucune clé présente dans '%.*s'" -#: sequencer.c:754 +#: sequencer.c:753 #, c-format msgid "unable to dequote value of '%s'" msgstr "Impossible de décoter la valeur de '%s'" -#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 +#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: sequencer.c:801 +#: sequencer.c:800 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' déjà fourni" -#: sequencer.c:806 +#: sequencer.c:805 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' déjà fourni" -#: sequencer.c:811 +#: sequencer.c:810 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' déjà fourni" -#: sequencer.c:815 +#: sequencer.c:814 #, c-format msgid "unknown variable '%s'" msgstr "variable inconnue '%s'" -#: sequencer.c:820 +#: sequencer.c:819 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' manquant" -#: sequencer.c:822 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' manquant" -#: sequencer.c:824 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' manquant" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "format de date invalide '%s' dans '%s'" - -#: sequencer.c:901 +#: sequencer.c:872 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6085,15 +6111,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "écriture du commit racine" - -#: sequencer.c:1216 +#: sequencer.c:1146 msgid "'prepare-commit-msg' hook failed" msgstr "échec du crochet 'prepare-commit-msg'" -#: sequencer.c:1223 +#: sequencer.c:1153 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6122,7 +6144,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1166 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6148,326 +6170,326 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1208 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: sequencer.c:1280 +#: sequencer.c:1210 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: sequencer.c:1326 +#: sequencer.c:1256 msgid "unable to resolve HEAD after creating commit" msgstr "impossible de résoudre HEAD après création du commit" -#: sequencer.c:1328 +#: sequencer.c:1258 msgid "detached HEAD" msgstr "HEAD détachée" -#: sequencer.c:1332 +#: sequencer.c:1262 msgid " (root-commit)" msgstr " (commit racine)" -#: sequencer.c:1353 +#: sequencer.c:1283 msgid "could not parse HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:1355 +#: sequencer.c:1285 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s n'est pas un commit !" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1289 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1341 sequencer.c:1933 msgid "unable to parse commit author" msgstr "impossible d'analyser l'auteur du commit" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1369 sequencer.c:1429 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 +#: builtin/merge.c:908 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: sequencer.c:1526 +#: sequencer.c:1456 #, c-format msgid "could not parse commit %s" msgstr "impossible d'analyser le commit %s" -#: sequencer.c:1531 +#: sequencer.c:1461 #, c-format msgid "could not parse parent commit %s" msgstr "impossible d'analyser le commit parent %s" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1535 sequencer.c:1645 #, c-format msgid "unknown command: %d" msgstr "commande inconnue : %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1592 sequencer.c:1617 #, c-format msgid "This is a combination of %d commits." msgstr "Ceci est la combinaison de %d commits." -#: sequencer.c:1672 +#: sequencer.c:1602 msgid "need a HEAD to fixup" msgstr "une HEAD est nécessaire à la correction" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1604 sequencer.c:3157 msgid "could not read HEAD" msgstr "Impossible de lire HEAD" -#: sequencer.c:1676 +#: sequencer.c:1606 msgid "could not read HEAD's commit message" msgstr "impossible de lire le message de validation de HEAD" -#: sequencer.c:1682 +#: sequencer.c:1612 #, c-format msgid "cannot write '%s'" msgstr "impossible d'écrire '%s'" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1619 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Ceci est le premier message de validation :" -#: sequencer.c:1697 +#: sequencer.c:1627 #, c-format msgid "could not read commit message of %s" msgstr "impossible de lire le message de validation de %s" -#: sequencer.c:1704 +#: sequencer.c:1634 #, c-format msgid "This is the commit message #%d:" msgstr "Ceci est le message de validation numéro %d :" -#: sequencer.c:1710 +#: sequencer.c:1640 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Le message de validation %d sera ignoré :" -#: sequencer.c:1798 +#: sequencer.c:1728 msgid "your index file is unmerged." msgstr "votre fichier d'index n'est pas fusionné." -#: sequencer.c:1805 +#: sequencer.c:1735 msgid "cannot fixup root commit" msgstr "impossible de réparer le commit racine" -#: sequencer.c:1824 +#: sequencer.c:1754 #, 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:1832 sequencer.c:1840 +#: sequencer.c:1762 sequencer.c:1770 #, c-format msgid "commit %s does not have parent %d" msgstr "le commit %s n'a pas de parent %d" -#: sequencer.c:1846 +#: sequencer.c:1776 #, 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:1865 +#: sequencer.c:1795 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:1930 +#: sequencer.c:1860 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossible de renommer '%s' en '%s'" -#: sequencer.c:1985 +#: sequencer.c:1915 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:1986 +#: sequencer.c:1916 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:2045 +#: sequencer.c:1983 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:2052 +#: sequencer.c:1990 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:2128 +#: sequencer.c:2066 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s n'accepte pas d'argument : '%s'" -#: sequencer.c:2137 +#: sequencer.c:2075 #, c-format msgid "missing arguments for %s" msgstr "argument manquant pour %s" -#: sequencer.c:2174 +#: sequencer.c:2112 #, c-format msgid "could not parse '%.*s'" msgstr "impossible d'analyser '%.*s'" -#: sequencer.c:2228 +#: sequencer.c:2166 #, c-format msgid "invalid line %d: %.*s" msgstr "ligne %d invalide : %.*s" -#: sequencer.c:2239 +#: sequencer.c:2177 #, c-format msgid "cannot '%s' without a previous commit" msgstr "'%s' impossible avec le commit précédent" -#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 #: builtin/rebase.c:204 builtin/rebase.c:229 #, c-format msgid "could not read '%s'." msgstr "impossible de lire '%s'." -#: sequencer.c:2323 +#: sequencer.c:2261 msgid "cancelling a cherry picking in progress" msgstr "annulation d'un picorage en cours" -#: sequencer.c:2330 +#: sequencer.c:2268 msgid "cancelling a revert in progress" msgstr "annulation d'un retour en cours" -#: sequencer.c:2364 +#: sequencer.c:2302 msgid "please fix this using 'git rebase --edit-todo'." msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: sequencer.c:2366 +#: sequencer.c:2304 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "feuille d'instruction inutilisable : '%s'" -#: sequencer.c:2371 +#: sequencer.c:2309 msgid "no commits parsed." msgstr "aucun commit analysé." -#: sequencer.c:2382 +#: sequencer.c:2320 msgid "cannot cherry-pick during a revert." msgstr "impossible de picorer pendant l'annulation d'un commit." -#: sequencer.c:2384 +#: sequencer.c:2322 msgid "cannot revert during a cherry-pick." msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:2466 +#: sequencer.c:2404 #, c-format msgid "invalid value for %s: %s" msgstr "valeur invalide pour %s : %s" -#: sequencer.c:2553 +#: sequencer.c:2491 msgid "unusable squash-onto" msgstr "\"écrase-sur\" inutilisable" -#: sequencer.c:2569 +#: sequencer.c:2507 #, c-format msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformée : %s" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2590 sequencer.c:4308 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:2668 +#: sequencer.c:2606 msgid "revert is already in progress" msgstr "un retour est déjà en cours" -#: sequencer.c:2670 +#: sequencer.c:2608 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "essayez \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2673 +#: sequencer.c:2611 msgid "cherry-pick is already in progress" msgstr "un picorage est déjà en cours" -#: sequencer.c:2675 +#: sequencer.c:2613 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2689 +#: sequencer.c:2627 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossible de créer le répertoire de séquenceur '%s'" -#: sequencer.c:2704 +#: sequencer.c:2642 msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2702 sequencer.c:4057 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2704 sequencer.c:2715 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2706 sequencer.c:2750 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:2798 builtin/grep.c:734 +#: sequencer.c:2736 builtin/grep.c:736 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:2800 +#: sequencer.c:2738 #, c-format msgid "cannot read '%s': %s" msgstr "impossible de lire '%s' : %s" -#: sequencer.c:2801 +#: sequencer.c:2739 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:2807 +#: sequencer.c:2745 #, 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:2818 +#: sequencer.c:2756 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:2859 +#: sequencer.c:2797 msgid "no revert in progress" msgstr "Pas de retour en cours ?" -#: sequencer.c:2867 +#: sequencer.c:2805 msgid "no cherry-pick in progress" msgstr "aucun picorage en cours" -#: sequencer.c:2877 +#: sequencer.c:2815 msgid "failed to skip the commit" msgstr "échec du saut de commit" -#: sequencer.c:2884 +#: sequencer.c:2822 msgid "there is nothing to skip" msgstr "il n'y a rien à sauter" -#: sequencer.c:2887 +#: sequencer.c:2825 #, c-format msgid "" "have you committed already?\n" @@ -6476,21 +6498,21 @@ msgstr "" "Avez-vous déjà validé ?\n" "essayez \"git %s -continue\"" -#: sequencer.c:3011 sequencer.c:4015 +#: sequencer.c:2949 sequencer.c:3969 #, c-format msgid "could not update %s" msgstr "impossible de mettre à jour %s" -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:2987 sequencer.c:3949 msgid "cannot read HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:3066 +#: sequencer.c:3004 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3074 +#: sequencer.c:3012 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6509,27 +6531,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3022 #, c-format msgid "Could not apply %s... %.*s" msgstr "impossible d'appliquer %s... %.*s" -#: sequencer.c:3091 +#: sequencer.c:3029 #, c-format msgid "Could not merge %.*s" msgstr "Impossible de fusionner %.*s" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 -#: builtin/rebase.c:1953 builtin/rebase.c:2008 +#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 +#: builtin/rebase.c:1987 builtin/rebase.c:2031 msgid "could not read index" msgstr "impossible de lire l'index" -#: sequencer.c:3136 +#: sequencer.c:3074 #, c-format msgid "" "execution failed: %s\n" @@ -6544,11 +6566,11 @@ msgstr "" "git rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3080 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:3148 +#: sequencer.c:3086 #, c-format msgid "" "execution succeeded: %s\n" @@ -6565,77 +6587,77 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3209 +#: sequencer.c:3147 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom de label illégal '%.*s'" -#: sequencer.c:3263 +#: sequencer.c:3201 msgid "writing fake root commit" msgstr "écriture d'un commit racine bidon" -#: sequencer.c:3268 +#: sequencer.c:3206 msgid "writing squash-onto" msgstr "écriture de 'écraser-sur'" -#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 +#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861 #, c-format msgid "failed to find tree of %s" msgstr "impossible de trouver l'arbre de %s" -#: sequencer.c:3324 builtin/rebase.c:873 +#: sequencer.c:3262 builtin/rebase.c:874 msgid "could not write index" msgstr "impossible d'écrire l'index" -#: sequencer.c:3351 +#: sequencer.c:3289 #, c-format msgid "could not resolve '%s'" msgstr "impossible de résoudre '%s'" -#: sequencer.c:3379 +#: sequencer.c:3320 msgid "cannot merge without a current revision" msgstr "impossible de fusionner avec une révision courante" -#: sequencer.c:3401 +#: sequencer.c:3342 #, c-format msgid "unable to parse '%.*s'" msgstr "impossible d'analyser '%.*s'" -#: sequencer.c:3410 +#: sequencer.c:3351 #, c-format msgid "nothing to merge: '%.*s'" msgstr "rien à fusionner : '%.*s'" -#: sequencer.c:3422 +#: sequencer.c:3363 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:3437 +#: sequencer.c:3378 #, c-format msgid "could not get commit message of '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:3590 +#: sequencer.c:3538 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "impossible de seulement essayer de fusionner '%.*s'" -#: sequencer.c:3606 +#: sequencer.c:3554 msgid "merge: Unable to write new index file" msgstr "fusion : Impossible d'écrire le nouveau fichier index" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3623 builtin/rebase.c:712 #, c-format msgid "Applied autostash.\n" msgstr "Autoremisage appliqué.\n" -#: sequencer.c:3687 +#: sequencer.c:3635 #, c-format msgid "cannot store %s" msgstr "impossible de stocker %s" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6646,31 +6668,31 @@ msgstr "" "Vos modifications sont à l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" -#: sequencer.c:3751 +#: sequencer.c:3699 #, c-format msgid "could not checkout %s" msgstr "extraction de %s impossible" -#: sequencer.c:3765 +#: sequencer.c:3713 #, c-format msgid "%s: not a valid OID" msgstr "%s n'est pas un OID valide" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3718 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: sequencer.c:3785 +#: sequencer.c:3733 #, c-format msgid "Stopped at HEAD\n" msgstr "arrêt à HEAD\n" -#: sequencer.c:3787 +#: sequencer.c:3735 #, c-format msgid "Stopped at %s\n" msgstr "Arrêté à %s\n" -#: sequencer.c:3795 +#: sequencer.c:3743 #, c-format msgid "" "Could not execute the todo command\n" @@ -6691,48 +6713,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3877 +#: sequencer.c:3827 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "arrêt à %s... %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:3898 #, c-format msgid "unknown command %d" msgstr "commande inconnue %d" -#: sequencer.c:4003 +#: sequencer.c:3957 msgid "could not read orig-head" msgstr "impossible de lire orig-head" -#: sequencer.c:4008 +#: sequencer.c:3962 msgid "could not read 'onto'" msgstr "impossible de lire 'onto'" -#: sequencer.c:4022 +#: sequencer.c:3976 #, c-format msgid "could not update HEAD to %s" msgstr "impossible de mettre à jour HEAD sur %s" -#: sequencer.c:4115 +#: sequencer.c:4069 msgid "cannot rebase: You have unstaged changes." msgstr "impossible de rebaser : vous avez des modifications non indexées." -#: sequencer.c:4124 +#: sequencer.c:4078 msgid "cannot amend non-existing commit" msgstr "impossible de corriger un commit non-existant" -#: sequencer.c:4126 +#: sequencer.c:4080 #, c-format msgid "invalid file: '%s'" msgstr "fichier invalide : '%s'" -#: sequencer.c:4128 +#: sequencer.c:4082 #, c-format msgid "invalid contents: '%s'" msgstr "contenu invalide : '%s'" -#: sequencer.c:4131 +#: sequencer.c:4085 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6742,42 +6764,42 @@ msgstr "" "Vous avez des modifications non validées dans votre copie de travail.\n" "Veuillez les valider d'abord, puis relancer 'git rebase --continue'." -#: sequencer.c:4167 sequencer.c:4205 +#: sequencer.c:4121 sequencer.c:4159 #, c-format msgid "could not write file: '%s'" msgstr "impossible d'écrire le fichier : '%s'" -#: sequencer.c:4220 +#: sequencer.c:4174 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossible de supprimer CHERRY_PICK_HEAD" -#: sequencer.c:4227 +#: sequencer.c:4181 msgid "could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: sequencer.c:4328 +#: sequencer.c:4285 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:4332 +#: sequencer.c:4289 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:4367 +#: sequencer.c:4324 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" -#: sequencer.c:4810 +#: sequencer.c:4774 msgid "make_script: unhandled options" msgstr "make_script : options non gérées" -#: sequencer.c:4813 +#: sequencer.c:4777 msgid "make_script: error preparing revisions" msgstr "make_script : erreur lors de la préparation des révisions" -#: sequencer.c:4971 +#: sequencer.c:4935 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -6787,24 +6809,24 @@ msgstr "" "rebase --continue'.\n" "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n" -#: sequencer.c:5083 sequencer.c:5100 +#: sequencer.c:5047 sequencer.c:5064 msgid "nothing to do" msgstr "rien à faire" -#: sequencer.c:5114 +#: sequencer.c:5078 msgid "could not skip unnecessary pick commands" msgstr "impossible d'éviter les commandes de picorage non nécessaires" -#: sequencer.c:5197 +#: sequencer.c:5166 msgid "the script was already rearranged." msgstr "le script a déjà été réarrangé." -#: setup.c:123 +#: setup.c:124 #, c-format msgid "'%s' is outside repository" msgstr "'%s' est hors du dépôt" -#: setup.c:173 +#: setup.c:174 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6814,7 +6836,7 @@ msgstr "" "Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui " "n'existent pas localement." -#: setup.c:186 +#: setup.c:187 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6825,14 +6847,14 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:235 +#: setup.c:236 #, 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:254 +#: setup.c:255 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6843,94 +6865,94 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:390 +#: setup.c:391 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:394 +#: setup.c:395 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:540 +#: setup.c:541 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Version attendue du dépôt git <= %d, %d trouvée" -#: setup.c:548 +#: setup.c:549 msgid "unknown repository extensions found:" msgstr "extensions de dépôt inconnues trouvées :" -#: setup.c:567 +#: setup.c:568 #, c-format msgid "error opening '%s'" msgstr "erreur à l'ouverture de '%s'" -#: setup.c:569 +#: setup.c:570 #, c-format msgid "too large to be a .git file: '%s'" msgstr "trop gros pour être une fichier .git : '%s'" -#: setup.c:571 +#: setup.c:572 #, c-format msgid "error reading %s" msgstr "erreur à la lecture de %s" -#: setup.c:573 +#: setup.c:574 #, c-format msgid "invalid gitfile format: %s" msgstr "format de fichier git invalide : %s" -#: setup.c:575 +#: setup.c:576 #, c-format msgid "no path in gitfile: %s" msgstr "aucun chemin dans le fichier git : %s" -#: setup.c:577 +#: setup.c:578 #, c-format msgid "not a git repository: %s" msgstr "ce n'est pas un dépôt git : %s" -#: setup.c:676 +#: setup.c:677 #, c-format msgid "'$%s' too big" msgstr "'$%s' trop gros" -#: setup.c:690 +#: setup.c:691 #, c-format msgid "not a git repository: '%s'" msgstr "ce n'est pas un dépôt git : '%s'" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:720 setup.c:722 setup.c:753 #, c-format msgid "cannot chdir to '%s'" msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 msgid "cannot come back to cwd" msgstr "impossible de revenir au répertoire de travail courant" -#: setup.c:851 +#: setup.c:852 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "échec du stat de '%*s%s%s'" -#: setup.c:1083 +#: setup.c:1090 msgid "Unable to read current working directory" msgstr "Impossible d'accéder au répertoire de travail courant" -#: setup.c:1092 setup.c:1098 +#: setup.c:1099 setup.c:1105 #, c-format msgid "cannot change to '%s'" msgstr "impossible de modifier en '%s'" -#: setup.c:1103 +#: setup.c:1110 #, 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:1109 +#: setup.c:1116 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6941,7 +6963,7 @@ msgstr "" "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "n'est pas défini)." -#: setup.c:1220 +#: setup.c:1227 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6951,286 +6973,286 @@ msgstr "" "Le propriétaire des fichiers doit toujours avoir les droits en lecture et " "écriture." -#: setup.c:1264 +#: setup.c:1271 msgid "open /dev/null or dup failed" msgstr "échec de l'ouverture ou au dup de /dev/null" -#: setup.c:1279 +#: setup.c:1286 msgid "fork failed" msgstr "échec de la bifurcation" -#: setup.c:1284 +#: setup.c:1291 msgid "setsid failed" msgstr "échec du setsid" -#: sha1-file.c:453 +#: sha1-file.c:452 #, 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:504 +#: sha1-file.c:503 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "impossible de normaliser le chemin d'objet alternatif : %s" -#: sha1-file.c:576 +#: sha1-file.c:575 #, 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:583 +#: sha1-file.c:582 #, c-format msgid "unable to normalize object directory: %s" msgstr "impossible de normaliser le répertoire d'objet : %s" -#: sha1-file.c:626 +#: sha1-file.c:625 msgid "unable to fdopen alternates lockfile" msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives" -#: sha1-file.c:644 +#: sha1-file.c:643 msgid "unable to read alternates file" msgstr "lecture du fichier d'alternatives impossible" -#: sha1-file.c:651 +#: sha1-file.c:650 msgid "unable to move new alternates file into place" msgstr "impossible de déplacer le nouveau fichier d'alternative" -#: sha1-file.c:686 +#: sha1-file.c:685 #, c-format msgid "path '%s' does not exist" msgstr "le chemin '%s' n'existe pas" -#: sha1-file.c:712 +#: sha1-file.c:711 #, 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:718 +#: sha1-file.c:717 #, 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:724 +#: sha1-file.c:723 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: sha1-file.c:732 +#: sha1-file.c:731 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: sha1-file.c:792 +#: sha1-file.c:791 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "ligne invalide pendant l'analyse des refs alternatives : %s" -#: sha1-file.c:944 +#: sha1-file.c:943 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>" -#: sha1-file.c:969 +#: sha1-file.c:964 msgid "mmap failed" msgstr "échec de mmap" -#: sha1-file.c:1133 +#: sha1-file.c:1128 #, c-format msgid "object file %s is empty" msgstr "le fichier objet %s est vide" -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1252 sha1-file.c:2392 #, c-format msgid "corrupt loose object '%s'" msgstr "objet libre corrompu '%s'" -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1254 sha1-file.c:2396 #, c-format msgid "garbage at end of loose object '%s'" msgstr "données incorrectes à la fin de l'objet libre '%s'" -#: sha1-file.c:1301 +#: sha1-file.c:1296 msgid "invalid object type" msgstr "type d'objet invalide" -#: sha1-file.c:1385 +#: sha1-file.c:1380 #, 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:1388 +#: sha1-file.c:1383 #, c-format msgid "unable to unpack %s header" msgstr "impossible de dépaqueter l'entête %s" -#: sha1-file.c:1394 +#: sha1-file.c:1389 #, 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:1397 +#: sha1-file.c:1392 #, c-format msgid "unable to parse %s header" msgstr "impossible d'analyser l'entête %s" -#: sha1-file.c:1588 +#: sha1-file.c:1584 #, c-format msgid "failed to read object %s" msgstr "impossible de lire l'objet %s" -#: sha1-file.c:1592 +#: sha1-file.c:1588 #, c-format msgid "replacement %s not found for %s" msgstr "remplacement %s non trouvé pour %s" -#: sha1-file.c:1596 +#: sha1-file.c:1592 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'objet libre %s (stocké dans %s) est corrompu" -#: sha1-file.c:1600 +#: sha1-file.c:1596 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu" -#: sha1-file.c:1703 +#: sha1-file.c:1699 #, c-format msgid "unable to write file %s" msgstr "impossible d'écrire le fichier %s" -#: sha1-file.c:1710 +#: sha1-file.c:1706 #, c-format msgid "unable to set permission to '%s'" msgstr "impossible de régler les droits de '%s'" -#: sha1-file.c:1717 +#: sha1-file.c:1713 msgid "file write error" msgstr "erreur d'écriture d'un fichier" -#: sha1-file.c:1736 +#: sha1-file.c:1732 msgid "error when closing loose object file" msgstr "erreur en fermeture du fichier d'objet esseulé" -#: sha1-file.c:1801 +#: sha1-file.c:1797 #, 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:1803 +#: sha1-file.c:1799 msgid "unable to create temporary file" msgstr "impossible de créer un fichier temporaire" -#: sha1-file.c:1827 +#: sha1-file.c:1823 msgid "unable to write loose object file" msgstr "impossible d'écrire le fichier d'objet esseulé" -#: sha1-file.c:1833 +#: sha1-file.c:1829 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "impossible de compresser le nouvel objet %s (%d)" -#: sha1-file.c:1837 +#: sha1-file.c:1833 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "échec de deflateEnd sur l'objet %s (%d)" -#: sha1-file.c:1841 +#: sha1-file.c:1837 #, c-format msgid "confused by unstable object source data for %s" msgstr "données de source d'objet instable pour %s" -#: sha1-file.c:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1847 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "échec de utime() sur %s" -#: sha1-file.c:1926 +#: sha1-file.c:1922 #, c-format msgid "cannot read object for %s" msgstr "impossible de lire l'objet pour %s" -#: sha1-file.c:1966 +#: sha1-file.c:1962 msgid "corrupt commit" msgstr "commit corrompu" -#: sha1-file.c:1974 +#: sha1-file.c:1970 msgid "corrupt tag" msgstr "étiquette corrompue" -#: sha1-file.c:2073 +#: sha1-file.c:2069 #, c-format msgid "read error while indexing %s" msgstr "erreur de lecture à l'indexation de %s" -#: sha1-file.c:2076 +#: sha1-file.c:2072 #, c-format msgid "short read while indexing %s" msgstr "lecture tronquée pendant l'indexation de %s" -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2145 sha1-file.c:2154 #, c-format msgid "%s: failed to insert into database" msgstr "%s : échec de l'insertion dans la base de données" -#: sha1-file.c:2164 +#: sha1-file.c:2160 #, c-format msgid "%s: unsupported file type" msgstr "%s : type de fichier non supporté" -#: sha1-file.c:2188 +#: sha1-file.c:2184 #, c-format msgid "%s is not a valid object" msgstr "%s n'est pas un objet valide" -#: sha1-file.c:2190 +#: sha1-file.c:2186 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" -#: sha1-file.c:2217 builtin/index-pack.c:155 +#: sha1-file.c:2213 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2403 sha1-file.c:2455 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "incohérence de hachage pour %s (%s attendu)" -#: sha1-file.c:2431 +#: sha1-file.c:2427 #, c-format msgid "unable to mmap %s" msgstr "impossible de mmap %s" -#: sha1-file.c:2436 +#: sha1-file.c:2432 #, c-format msgid "unable to unpack header of %s" msgstr "impossible de dépaqueter l'entête de %s" -#: sha1-file.c:2442 +#: sha1-file.c:2438 #, c-format msgid "unable to parse header of %s" msgstr "impossible d'analyser l'entête de %s" -#: sha1-file.c:2453 +#: sha1-file.c:2449 #, c-format msgid "unable to unpack contents of %s" msgstr "impossible de dépaqueter le contenu de %s" -#: sha1-name.c:490 +#: sha1-name.c:487 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "le SHA1 court %s est ambigu" -#: sha1-name.c:501 +#: sha1-name.c:498 msgid "The candidates are:" msgstr "Les candidats sont :" -#: sha1-name.c:800 +#: sha1-name.c:797 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" @@ -7255,43 +7277,43 @@ msgstr "" "en lançant \"git config advice.objectNameWarning false\"" #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:822 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u Gio" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:824 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u Gio/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:832 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u Mio" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:834 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u Mio/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:841 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u Kio" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:843 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u Kio/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:849 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7299,7 +7321,7 @@ msgstr[0] "%u octet" msgstr[1] "%u octets" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:851 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" @@ -7419,28 +7441,28 @@ msgstr "impossible de démarrer ls-files dans .." msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree a renvoyé un code de retour inattendu %d" -#: submodule-config.c:232 +#: submodule-config.c:236 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "nom de sous-module suspicieux %s ignoré" -#: submodule-config.c:299 +#: submodule-config.c:303 msgid "negative values not allowed for submodule.fetchjobs" msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs" -#: submodule-config.c:397 +#: submodule-config.c:401 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "'%s' ignoré et qui peut être interprété comme une option de ligne de " "commande : %s" -#: submodule-config.c:486 +#: submodule-config.c:490 #, c-format msgid "invalid value for %s" msgstr "Valeur invalide pour %s" -#: submodule-config.c:755 +#: submodule-config.c:761 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Impossible de mettre à jour l'élément %s de .gitmodules" @@ -7475,7 +7497,7 @@ msgstr "impossible de lire le fichier d'entrée '%s'" msgid "could not read from stdin" msgstr "Impossible de lire depuis l'entrée standard" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1011 wrapper.c:665 #, c-format msgid "could not stat %s" msgstr "stat impossible de %s" @@ -7504,47 +7526,47 @@ msgstr "impossible de renommer un fichier temporaire en %s" 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 +#: transport.c:145 #, c-format msgid "could not read bundle '%s'" msgstr "impossible de lire la liasse '%s'" -#: transport.c:208 +#: transport.c:214 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport : option de profondeur invalide '%s'" -#: transport.c:259 +#: transport.c:266 msgid "see protocol.version in 'git help config' for more details" msgstr "voir protocol.version dans 'git help config' pour plus d'information" -#: transport.c:260 +#: transport.c:267 msgid "server options require protocol version 2 or later" msgstr "les options de serveur exigent une version 2 ou supérieure" -#: transport.c:625 +#: transport.c:632 msgid "could not parse transport.color.* config" msgstr "impossible d'analyser la configuration transport.color.*" -#: transport.c:698 +#: transport.c:705 msgid "support for protocol v2 not implemented yet" msgstr "le support du protocole v2 n'est pas encore implanté" -#: transport.c:825 +#: transport.c:831 #, c-format msgid "unknown value for config '%s': %s" msgstr "valeur inconnue pour la config '%s' : %s" -#: transport.c:891 +#: transport.c:897 #, c-format msgid "transport '%s' not allowed" msgstr "transport '%s' non permis" -#: transport.c:945 +#: transport.c:949 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync n'est plus supporté" -#: transport.c:1040 +#: transport.c:1044 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -7553,7 +7575,7 @@ msgstr "" "Les chemins suivants de sous-module contiennent des modifications\n" "qui ne peuvent être trouvées sur aucun distant :\n" -#: transport.c:1044 +#: transport.c:1048 #, c-format msgid "" "\n" @@ -7580,33 +7602,33 @@ msgstr "" "pour les pousser vers un serveur distant.\n" "\n" -#: transport.c:1052 +#: transport.c:1056 msgid "Aborting." msgstr "Abandon." -#: transport.c:1193 +#: transport.c:1201 msgid "failed to push all needed submodules" msgstr "échec de la poussée de tous les sous-modules nécessaires" -#: transport.c:1340 transport-helper.c:645 +#: transport.c:1345 transport-helper.c:655 msgid "operation not supported by protocol" msgstr "option non supportée par le protocole" -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:61 transport-helper.c:90 msgid "full write to remote helper failed" msgstr "échec de l'écriture totale sur l'assistant distant" -#: transport-helper.c:134 +#: transport-helper.c:144 #, c-format msgid "unable to find remote helper for '%s'" msgstr "Impossible de trouver un assistant distant pour '%s'" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:160 transport-helper.c:569 msgid "can't dup helper output fd" msgstr "" "impossible de dupliquer le descripteur de flux de sortie de l'assistant" -#: transport-helper.c:201 +#: transport-helper.c:211 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -7615,103 +7637,103 @@ msgstr "" "capacité obligatoire inconnue %s ; cet assistant distant requiert " "probablement une une nouvelle version de Git" -#: transport-helper.c:207 +#: transport-helper.c:217 msgid "this remote helper should implement refspec capability" msgstr "cet assistant distant devrait supporter la capacité refspec" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:284 transport-helper.c:424 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s a dit de manière inattendue : '%s'" -#: transport-helper.c:403 +#: transport-helper.c:413 #, c-format msgid "%s also locked %s" msgstr "%s a aussi verrouillé %s" -#: transport-helper.c:481 +#: transport-helper.c:491 msgid "couldn't run fast-import" msgstr "impossible de lancer fast-import" -#: transport-helper.c:504 +#: transport-helper.c:514 msgid "error while running fast-import" msgstr "erreur au lancement de fast-import" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:543 transport-helper.c:1128 #, c-format msgid "could not read ref %s" msgstr "impossible de lire la réf %s" -#: transport-helper.c:578 +#: transport-helper.c:588 #, c-format msgid "unknown response to connect: %s" msgstr "réponse inconnue à connect : %s" -#: transport-helper.c:600 +#: transport-helper.c:610 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:602 +#: transport-helper.c:612 msgid "invalid remote service path" msgstr "chemin de service distant invalide" -#: transport-helper.c:648 +#: transport-helper.c:658 #, c-format msgid "can't connect to subservice %s" msgstr "impossible de se connecter au sous-service %s" -#: transport-helper.c:720 +#: transport-helper.c:734 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "ok/error attendu, l'assistant a dit '%s'" -#: transport-helper.c:773 +#: transport-helper.c:787 #, c-format msgid "helper reported unexpected status of %s" msgstr "l'assistant a renvoyé un statut de retour inattendu %s" -#: transport-helper.c:834 +#: transport-helper.c:848 #, c-format msgid "helper %s does not support dry-run" msgstr "l'assistant %s ne gère pas dry-run" -#: transport-helper.c:837 +#: transport-helper.c:851 #, c-format msgid "helper %s does not support --signed" msgstr "l'assistant %s ne gère pas --signed" -#: transport-helper.c:840 +#: transport-helper.c:854 #, 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:847 +#: transport-helper.c:861 #, c-format msgid "helper %s does not support 'push-option'" msgstr "l'assistant %s ne gère pas 'push-option'" -#: transport-helper.c:945 +#: transport-helper.c:959 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:950 +#: transport-helper.c:964 #, c-format msgid "helper %s does not support 'force'" msgstr "l'assistant %s ne gère pas 'force'" -#: transport-helper.c:997 +#: transport-helper.c:1011 msgid "couldn't run fast-export" msgstr "impossible de lancer fast-export" -#: transport-helper.c:1002 +#: transport-helper.c:1016 msgid "error while running fast-export" msgstr "erreur au lancement de fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1041 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -7720,47 +7742,47 @@ 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:1091 +#: transport-helper.c:1114 #, c-format msgid "malformed response in ref list: %s" msgstr "réponse malformée dans le liste de réfs : %s" -#: transport-helper.c:1244 +#: transport-helper.c:1266 #, c-format msgid "read(%s) failed" msgstr "échec de read(%s)" -#: transport-helper.c:1271 +#: transport-helper.c:1293 #, c-format msgid "write(%s) failed" msgstr "échec de write(%s)" -#: transport-helper.c:1320 +#: transport-helper.c:1342 #, c-format msgid "%s thread failed" msgstr "échec du fil d'exécution %s" -#: transport-helper.c:1324 +#: transport-helper.c:1346 #, c-format msgid "%s thread failed to join: %s" msgstr "échec de jonction du fil d'exécution %s : %s" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1365 transport-helper.c:1369 #, 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:1384 +#: transport-helper.c:1406 #, c-format msgid "%s process failed to wait" msgstr "échec du processus %s pour l'attente" -#: transport-helper.c:1388 +#: transport-helper.c:1410 #, c-format msgid "%s process failed" msgstr "échec du processus %s" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1428 transport-helper.c:1437 msgid "can't start thread for copying data" msgstr "impossible de démarrer le fil d'exécution pour copier les données" @@ -7780,7 +7802,7 @@ msgstr "nom de fichier vide dans une entrée de l'arbre" msgid "too-short tree file" msgstr "fichier arbre trop court" -#: unpack-trees.c:111 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7791,7 +7813,7 @@ msgstr "" "%%sVeuillez valider ou remiser vos modifications avant de basculer de " "branche." -#: unpack-trees.c:113 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7801,7 +7823,7 @@ msgstr "" "l'extraction :\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7811,7 +7833,7 @@ msgstr "" "fusion :\n" "%%sVeuillez valider ou remiser vos modifications avant la fusion." -#: unpack-trees.c:118 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7821,7 +7843,7 @@ msgstr "" "fusion :\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7830,7 +7852,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%sVeuillez valider ou remiser vos modifications avant %s." -#: unpack-trees.c:123 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7839,7 +7861,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:127 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7849,7 +7871,7 @@ msgstr "" "contenus :\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7859,7 +7881,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:134 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7868,7 +7890,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par l'extraction :\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7878,7 +7900,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:139 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7887,7 +7909,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par la fusion :\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7897,7 +7919,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:144 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7906,7 +7928,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par %s :\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7917,7 +7939,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:152 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7927,7 +7949,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7937,7 +7959,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:157 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7946,7 +7968,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par la fusion :\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7956,7 +7978,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:162 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7965,12 +7987,12 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par %s :\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:169 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible." -#: unpack-trees.c:173 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -7980,7 +8002,7 @@ msgstr "" "pas à jour :\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:174 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -7991,7 +8013,7 @@ msgstr "" "jour par l'extraction creuse :\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -8002,7 +8024,7 @@ msgstr "" "à jour par extraction creuse :\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:178 #, c-format msgid "" "Cannot update submodule:\n" @@ -8011,16 +8033,16 @@ msgstr "" "Mise à jour impossible pour le sous-module :\n" "%s" -#: unpack-trees.c:256 +#: unpack-trees.c:255 #, c-format msgid "Aborting\n" msgstr "Abandon\n" -#: unpack-trees.c:318 +#: unpack-trees.c:317 msgid "Updating files" msgstr "Mise à jour des fichiers" -#: unpack-trees.c:350 +#: unpack-trees.c:349 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8059,7 +8081,7 @@ msgstr "numéro de port invalide" msgid "invalid '..' path segment" msgstr "segment de chemin '..' invalide" -#: worktree.c:258 builtin/am.c:2095 +#: worktree.c:258 builtin/am.c:2084 #, c-format msgid "failed to read '%s'" msgstr "échec de la lecture de '%s'" @@ -8092,17 +8114,17 @@ msgstr "'%s' n'est pas un fichier .git, code d'erreur %d" msgid "'%s' does not point back to '%s'" msgstr "'%s' ne pointe pas en retour sur '%s'" -#: wrapper.c:223 wrapper.c:393 +#: wrapper.c:186 wrapper.c:356 #, c-format msgid "could not open '%s' for reading and writing" msgstr "impossible d'ouvrir '%s' en lecture/écriture" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:387 wrapper.c:588 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accéder à '%s'" -#: wrapper.c:632 +#: wrapper.c:596 msgid "unable to get current working directory" msgstr "impossible d'accéder au répertoire de travail courant" @@ -8447,80 +8469,88 @@ msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" #: wt-status.c:1437 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " (utilisez \"git cherry-pick --skip\" pour sauter ce patch)" + +#: wt-status.c:1439 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:1447 +#: wt-status.c:1449 msgid "Revert currently in progress." msgstr "Rétablissement en cours." -#: wt-status.c:1450 +#: wt-status.c:1452 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1456 +#: wt-status.c:1458 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1459 +#: wt-status.c:1461 msgid " (run \"git revert --continue\" to continue)" msgstr " (lancez \"git revert --continue\" pour continuer)" -#: wt-status.c:1462 +#: wt-status.c:1464 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1464 +#: wt-status.c:1466 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (utilisez \"git revert --skip\" pour sauter ce patch)" + +#: wt-status.c:1468 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1474 +#: wt-status.c:1478 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1478 +#: wt-status.c:1482 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1481 +#: wt-status.c:1485 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:1690 +#: wt-status.c:1694 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1697 +#: wt-status.c:1701 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1699 +#: wt-status.c:1703 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1709 +#: wt-status.c:1713 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1726 +#: wt-status.c:1730 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1727 +#: wt-status.c:1731 msgid "No commits yet" msgstr "Aucun commit" -#: wt-status.c:1741 +#: wt-status.c:1745 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1743 +#: wt-status.c:1747 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1747 +#: wt-status.c:1751 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8532,32 +8562,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1753 +#: wt-status.c:1757 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1755 +#: wt-status.c:1759 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1761 +#: wt-status.c:1765 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1766 +#: wt-status.c:1770 #, 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:1769 +#: wt-status.c:1773 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1772 +#: wt-status.c:1776 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8566,70 +8596,75 @@ 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:1775 +#: wt-status.c:1779 #, 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:1778 +#: wt-status.c:1782 #, 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:1781 wt-status.c:1786 +#: wt-status.c:1785 wt-status.c:1790 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1784 +#: wt-status.c:1788 #, 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:1788 +#: wt-status.c:1792 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1901 +#: wt-status.c:1905 msgid "No commits yet on " msgstr "Encore aucun commit sur " -#: wt-status.c:1905 +#: wt-status.c:1909 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1936 +#: wt-status.c:1940 msgid "different" msgstr "différent" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1942 wt-status.c:1950 msgid "behind " msgstr "derrière " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1945 wt-status.c:1948 msgid "ahead " msgstr "devant " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2470 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "Impossible de %s : vous avez des modifications non indexées." -#: wt-status.c:2472 +#: wt-status.c:2476 msgid "additionally, your index contains uncommitted changes." msgstr "de plus, votre index contient des modifications non validées." -#: wt-status.c:2474 +#: wt-status.c:2478 #, 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:452 +#, c-format +msgid "failed to unlink '%s'" +msgstr "échec pour délier '%s'" + #: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<options>] [--] <chemin>..." @@ -8652,7 +8687,7 @@ msgstr "suppression de '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:234 builtin/rev-parse.c:897 msgid "Could not read the index" msgstr "Impossible de lire l'index" @@ -8688,8 +8723,8 @@ 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:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 #: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "simuler l'action" @@ -8746,7 +8781,7 @@ msgstr "" 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:309 builtin/update-index.c:1001 +#: builtin/add.c:309 builtin/update-index.c:1002 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exécutable pour les fichiers listés" @@ -8823,116 +8858,112 @@ msgstr "Rien de spécifié, rien n'a été ajouté.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" -#: builtin/am.c:348 +#: builtin/am.c:347 msgid "could not parse author script" msgstr "impossible d'analyser l'auteur du script" -#: builtin/am.c:432 +#: builtin/am.c:431 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' a été effacé par le crochet applypatch-msg" -#: builtin/am.c:474 +#: builtin/am.c:473 #, c-format msgid "Malformed input line: '%s'." msgstr "Ligne en entrée malformée : '%s'." -#: builtin/am.c:512 +#: builtin/am.c:511 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Impossible de copier les notes de '%s' vers '%s'" -#: builtin/am.c:538 +#: builtin/am.c:537 msgid "fseek failed" msgstr "échec de fseek" -#: builtin/am.c:726 +#: builtin/am.c:725 #, c-format msgid "could not parse patch '%s'" msgstr "impossible d'analyser le patch '%s'" -#: builtin/am.c:791 +#: builtin/am.c:790 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:839 +#: builtin/am.c:838 msgid "invalid timestamp" msgstr "horodatage invalide" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:843 builtin/am.c:855 msgid "invalid Date line" msgstr "ligne de Date invalide" -#: builtin/am.c:851 +#: builtin/am.c:850 msgid "invalid timezone offset" msgstr "décalage horaire invalide" -#: builtin/am.c:944 +#: builtin/am.c:943 msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:948 builtin/clone.c:406 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/am.c:954 +#: builtin/am.c:953 msgid "Failed to split patches." msgstr "Échec de découpage des patchs." -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "impossible d'écrire le fichier d'index" - -#: builtin/am.c:1098 +#: builtin/am.c:1084 #, 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:1099 +#: builtin/am.c:1085 #, 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:1100 +#: builtin/am.c:1086 #, 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:1183 +#: builtin/am.c:1169 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent " "être perdus." -#: builtin/am.c:1211 +#: builtin/am.c:1197 msgid "Patch is empty." msgstr "Le patch actuel est vide." -#: builtin/am.c:1277 +#: builtin/am.c:1262 #, c-format -msgid "invalid ident line: %.*s" -msgstr "ligne d'identification invalide : %.*s" +msgid "missing author line in commit %s" +msgstr "ligne d'auteur manquante dans le commit %s" -#: builtin/am.c:1299 +#: builtin/am.c:1265 #, c-format -msgid "unable to parse commit %s" -msgstr "impossible d'analyser le commit %s" +msgid "invalid ident line: %.*s" +msgstr "ligne d'identification invalide : %.*s" -#: builtin/am.c:1496 +#: builtin/am.c:1484 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:1498 +#: builtin/am.c:1486 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:1517 +#: builtin/am.c:1505 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8940,24 +8971,24 @@ msgstr "" "Avez-vous édité le patch à la main ?\n" "Il ne s'applique pas aux blobs enregistrés dans son index." -#: builtin/am.c:1523 +#: builtin/am.c:1511 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour à un patch de la base et fusion à 3 points..." -#: builtin/am.c:1549 +#: builtin/am.c:1537 msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." -#: builtin/am.c:1581 +#: builtin/am.c:1569 msgid "applying to an empty history" msgstr "application à un historique vide" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1616 builtin/am.c:1620 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." -#: builtin/am.c:1650 +#: builtin/am.c:1638 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -8965,36 +8996,40 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1648 #, c-format 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:1710 +#: builtin/am.c:1695 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "impossible d'écrire le fichier d'index" + +#: builtin/am.c:1699 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1739 builtin/am.c:1807 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1756 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: builtin/am.c:1773 +#: builtin/am.c:1762 #, c-format msgid "Patch failed at %s %.*s" msgstr "le patch a échoué à %s %.*s" -#: builtin/am.c:1777 +#: builtin/am.c:1766 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:1821 +#: builtin/am.c:1810 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9005,7 +9040,7 @@ msgstr "" "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: builtin/am.c:1828 +#: builtin/am.c:1817 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9018,17 +9053,17 @@ msgstr "" "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour " "accepter son état." -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329 #: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:1987 +#: builtin/am.c:1976 msgid "failed to clean index" msgstr "échec du nettoyage de l'index" -#: builtin/am.c:2031 +#: builtin/am.c:2020 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9036,145 +9071,145 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: builtin/am.c:2128 +#: builtin/am.c:2117 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2164 +#: builtin/am.c:2153 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2165 +#: builtin/am.c:2154 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --skip | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2160 msgid "run interactively" msgstr "exécution interactive" -#: builtin/am.c:2173 +#: builtin/am.c:2162 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2175 +#: builtin/am.c:2164 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:297 builtin/stash.c:812 msgid "be quiet" msgstr "être silencieux" -#: builtin/am.c:2178 +#: builtin/am.c:2167 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:2181 +#: builtin/am.c:2170 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par défaut)" -#: builtin/am.c:2183 +#: builtin/am.c:2172 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k à git-mailinfo" -#: builtin/am.c:2185 +#: builtin/am.c:2174 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b à git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2176 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m à git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2178 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:2192 +#: builtin/am.c:2181 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:2195 +#: builtin/am.c:2184 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 -#: builtin/am.c:2224 +#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 +#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 +#: builtin/am.c:2213 msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" -#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 -#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 -#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 +#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 +#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 +#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:141 parse-options.h:162 parse-options.h:312 +#: parse-options.h:150 parse-options.h:171 parse-options.h:312 msgid "n" msgstr "n" -#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2221 +#: builtin/am.c:2210 msgid "format the patch(es) are in" msgstr "format de présentation des patchs" -#: builtin/am.c:2227 +#: builtin/am.c:2216 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:2229 +#: builtin/am.c:2218 msgid "continue applying patches after resolving a conflict" msgstr "continuer à appliquer les patchs après résolution d'un conflit" -#: builtin/am.c:2232 +#: builtin/am.c:2221 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2235 +#: builtin/am.c:2224 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2238 +#: builtin/am.c:2227 msgid "restore the original branch and abort the patching operation." msgstr "" "restaurer la branche originale et abandonner les applications de patch." -#: builtin/am.c:2241 +#: builtin/am.c:2230 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:2244 +#: builtin/am.c:2233 msgid "show the patch being applied." msgstr "afficher le patch en cours d'application." -#: builtin/am.c:2248 +#: builtin/am.c:2237 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2250 +#: builtin/am.c:2239 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 -#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 +#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "id-clé" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2256 +#: builtin/am.c:2245 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2274 +#: builtin/am.c:2263 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." @@ -9182,17 +9217,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:2281 +#: builtin/am.c:2270 msgid "failed to read the index" msgstr "échec à la lecture de l'index" -#: builtin/am.c:2296 +#: builtin/am.c:2285 #, 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:2320 +#: builtin/am.c:2309 #, c-format msgid "" "Stray %s directory found.\n" @@ -9201,13 +9236,13 @@ msgstr "" "Répertoire abandonné %s trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2326 +#: builtin/am.c:2315 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/am.c:2336 +#: builtin/am.c:2325 msgid "interactive mode requires patches on the command line" msgstr "le mode interactif requiert des rustines sur la ligne de commande" @@ -9525,160 +9560,160 @@ msgstr "--bisect-next-check exige 2 ou 3 arguments" msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms exige 0 ou 1 argument" -#: builtin/blame.c:32 +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>" -#: builtin/blame.c:37 +#: 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:410 +#: builtin/blame.c:409 #, c-format msgid "expecting a color: %s" msgstr "couleur attendue : %s" -#: builtin/blame.c:417 +#: builtin/blame.c:416 msgid "must end with a color" msgstr "doit finir avec une couleur" -#: builtin/blame.c:730 +#: builtin/blame.c:729 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "couleur invalide '%s' dans color.blame.repeatedlines" -#: builtin/blame.c:748 +#: builtin/blame.c:747 msgid "invalid value for blame.coloring" msgstr "valeur invalide pour blame.coloring" -#: builtin/blame.c:823 +#: builtin/blame.c:822 #, c-format msgid "cannot find revision %s to ignore" msgstr "référence à ignorer %s introuvable" -#: builtin/blame.c:845 +#: builtin/blame.c:844 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:846 +#: builtin/blame.c:845 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:847 +#: builtin/blame.c:846 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:848 +#: builtin/blame.c:847 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:849 +#: builtin/blame.c:848 msgid "Force progress reporting" msgstr "Forcer l'affichage de l'état d'avancement" -#: builtin/blame.c:850 +#: builtin/blame.c:849 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:851 +#: builtin/blame.c:850 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:852 +#: builtin/blame.c:851 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:853 +#: builtin/blame.c:852 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:854 +#: builtin/blame.c:853 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:855 +#: builtin/blame.c:854 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:856 +#: builtin/blame.c:855 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:857 +#: builtin/blame.c:856 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:858 +#: builtin/blame.c:857 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:859 +#: builtin/blame.c:858 msgid "Show author email instead of name (Default: off)" msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)" -#: builtin/blame.c:860 +#: builtin/blame.c:859 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:860 builtin/log.c:1630 msgid "rev" msgstr "rév" -#: builtin/blame.c:861 +#: builtin/blame.c:860 msgid "Ignore <rev> when blaming" msgstr "ignore <rev> pendant le blâme" -#: builtin/blame.c:862 +#: builtin/blame.c:861 msgid "Ignore revisions from <file>" msgstr "ignorer les révisions listées dans <fichier>" -#: builtin/blame.c:863 +#: builtin/blame.c:862 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:864 +#: builtin/blame.c:863 msgid "color lines by age" msgstr "colorier les lignes par âge" -#: builtin/blame.c:871 +#: builtin/blame.c:870 msgid "Use an experimental heuristic to improve diffs" msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs" -#: builtin/blame.c:873 +#: builtin/blame.c:872 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:874 +#: builtin/blame.c:873 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:875 +#: builtin/blame.c:874 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:875 builtin/blame.c:876 msgid "score" msgstr "score" -#: builtin/blame.c:876 +#: builtin/blame.c:875 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:877 +#: builtin/blame.c:876 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:878 +#: builtin/blame.c:877 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:877 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" @@ -9923,7 +9958,7 @@ msgstr "régler le mode de suivi (voir git-pull(1))" msgid "do not use" msgstr "ne pas utiliser" -#: builtin/branch.c:626 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:486 msgid "upstream" msgstr "amont" @@ -10034,7 +10069,7 @@ msgstr "le tri et le filtrage sont non-sensibles à la casse" msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:684 builtin/clone.c:760 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" @@ -10139,7 +10174,7 @@ msgstr "La création d'un colis requiert un dépôt." msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." -#: builtin/cat-file.c:594 +#: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10147,7 +10182,7 @@ msgstr "" "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p " "| <type> | --textconv | --filters) [--path=<chemin>] <objet>" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:596 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -10155,74 +10190,74 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:617 msgid "only one batch option may be specified" msgstr "une seule option de traitement ne peut être spécifiée à la fois" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:635 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:636 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:637 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:639 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:639 +#: builtin/cat-file.c:640 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:642 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:643 +#: builtin/cat-file.c:644 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:644 git-submodule.sh:936 +#: builtin/cat-file.c:645 git-submodule.sh:936 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:646 msgid "use a specific path for --textconv/--filters" msgstr "utiliser un chemin spécifique pour --textconv/--filters" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:648 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:648 +#: builtin/cat-file.c:649 msgid "buffer --batch output" msgstr "bufferiser la sortie de --batch" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:651 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:654 +#: builtin/cat-file.c:655 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:658 +#: builtin/cat-file.c:659 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:660 +#: builtin/cat-file.c:661 msgid "show all objects with --batch or --batch-check" msgstr "montrer tous les objets avec --batch ou --batch-check" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:663 msgid "do not order --batch-all-objects output" msgstr "ne pas ordonner la sortie de --batch-all-objects" @@ -10251,8 +10286,8 @@ msgid "terminate input and output records by a NUL character" msgstr "" "terminer les enregistrements en entrée et en sortie par un caractère NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537 +#: builtin/worktree.c:506 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -10346,7 +10381,7 @@ msgstr "écrire le contenu dans des fichiers temporaires" #: builtin/checkout-index.c:178 builtin/column.c:31 #: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 #: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/worktree.c:679 msgid "string" msgstr "chaîne" @@ -10374,100 +10409,100 @@ msgstr "git switch [<options>] <branche>" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<options>] [--source=<branche>] <fichier>..." -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:173 builtin/checkout.c:212 #, c-format msgid "path '%s' does not have our version" msgstr "le chemin '%s' n'a pas notre version" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have their version" msgstr "le chemin '%s' n'a pas leur version" -#: builtin/checkout.c:190 +#: builtin/checkout.c:191 #, 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:240 +#: builtin/checkout.c:241 #, c-format msgid "path '%s' does not have necessary versions" msgstr "le chemin '%s' n'a pas les versions nécessaires" -#: builtin/checkout.c:258 +#: builtin/checkout.c:259 #, c-format msgid "path '%s': cannot merge" msgstr "chemin '%s' : impossible de fusionner" -#: builtin/checkout.c:274 +#: builtin/checkout.c:275 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" -#: builtin/checkout.c:374 +#: builtin/checkout.c:375 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "%d conflit du fusion recréé" msgstr[1] "%d conflits du fusion recréés" -#: builtin/checkout.c:379 +#: builtin/checkout.c:380 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d chemin mis à jour depuis %s" msgstr[1] "%d chemins mis à jour depuis %s" -#: builtin/checkout.c:386 +#: builtin/checkout.c:387 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "%d chemin mis à jour depuis l'index" msgstr[1] "%d chemins mis à jour depuis l'index" -#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416 +#: builtin/checkout.c:420 #, 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:422 builtin/checkout.c:425 +#: builtin/checkout.c:423 builtin/checkout.c:426 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:429 +#: builtin/checkout.c:430 #, 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:433 +#: builtin/checkout.c:434 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ni '%s', ni '%s' spécifié" -#: builtin/checkout.c:437 +#: builtin/checkout.c:438 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié" -#: builtin/checkout.c:442 builtin/checkout.c:447 +#: builtin/checkout.c:443 builtin/checkout.c:448 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:507 builtin/checkout.c:514 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:679 +#: builtin/checkout.c:680 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:729 +#: builtin/checkout.c:730 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10477,12 +10512,6 @@ msgstr "" "suivants :\n" "%s" -#: builtin/checkout.c:736 -#, c-format -msgid "staged changes in the following files may be lost: %s" -msgstr "" -"les modifications indexées dans les fichiers suivants seraient perdues : %s" - #: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" @@ -10492,7 +10521,7 @@ msgstr "Impossible de faire un reflog pour '%s' : %s\n" msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:879 builtin/clone.c:713 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" @@ -10608,7 +10637,7 @@ msgstr "" "'%s' pourrait être un fichier local ou un branche de suivi.\n" "Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer" -#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" @@ -10711,9 +10740,9 @@ msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit" msgid "missing branch or commit argument" msgstr "argument de branche ou de commit manquant" -#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 -#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 -#: builtin/send-pack.c:174 +#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 +#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 +#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" @@ -10721,7 +10750,7 @@ msgstr "forcer l'affichage de l'état d'avancement" msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318 msgid "style" msgstr "style" @@ -10729,7 +10758,7 @@ msgstr "style" msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1452 builtin/worktree.c:503 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" @@ -10847,9 +10876,9 @@ msgstr "" "ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n" "votre config." -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 -#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 +#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 msgid "branch" msgstr "branche" @@ -10874,39 +10903,39 @@ msgstr "" msgid "use overlay mode (default)" msgstr "utiliser le mode de superposition (défaut)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1743 msgid "create and switch to a new branch" msgstr "créer et basculer sur une nouvelle branche" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1745 msgid "create/reset and switch to a branch" msgstr "créer/réinitialiser et basculer sur une branche" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1747 msgid "second guess 'git switch <no-such-branch>'" msgstr "interpréter 'git switch <branche-inexistante>'" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1749 msgid "throw away local modifications" msgstr "laisser tomber les modifications locales" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1781 msgid "which tree-ish to checkout from" msgstr "de quel <arbre-esque> faire l'extraction" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1783 msgid "restore the index" msgstr "restaurer l'index" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1785 msgid "restore the working tree (default)" msgstr "restaurer l'arbre de travail (par défaut)" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1787 msgid "ignore unmerged entries" msgstr "ignorer les entrées non-fusionnées" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1788 msgid "use overlay mode" msgstr "utiliser le mode de superposition" @@ -10946,7 +10975,7 @@ msgstr "échec de la suppression de %s" msgid "could not lstat %s\n" msgstr "lstat de %s impossible\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:301 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -10959,7 +10988,7 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" " - (vide) ne rien sélectionner\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:305 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -10980,38 +11009,38 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 +#: builtin/clean.c:521 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hein (%s) ?\n" -#: builtin/clean.c:662 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs à ignorer>> " -#: builtin/clean.c:699 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" -#: builtin/clean.c:720 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:786 git-add--interactive.perl:1763 +#: builtin/clean.c:787 git-add--interactive.perl:1763 #, c-format msgid "Bye.\n" msgstr "Au revoir.\n" -#: builtin/clean.c:794 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11029,64 +11058,64 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:821 git-add--interactive.perl:1849 +#: builtin/clean.c:822 git-add--interactive.perl:1849 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: builtin/clean.c:822 git-add--interactive.perl:1846 +#: builtin/clean.c:823 git-add--interactive.perl:1846 msgid "What now" msgstr "Et maintenant ?" -#: builtin/clean.c:830 +#: builtin/clean.c:831 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:846 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:908 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:910 +#: builtin/clean.c:911 msgid "force" msgstr "forcer" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:913 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 +#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 +#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 #: builtin/show-ref.c:179 msgid "pattern" msgstr "motif" -#: builtin/clean.c:915 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:918 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:936 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" -#: builtin/clean.c:940 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -11094,7 +11123,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:943 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11102,164 +11131,164 @@ msgstr "" "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clone.c:46 +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:93 +#: builtin/clone.c:92 msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 msgid "create a bare repository" msgstr "créer un dépôt nu" -#: builtin/clone.c:98 +#: builtin/clone.c:97 msgid "create a mirror repository (implies bare)" msgstr "créer un dépôt miroir (implique dépôt nu)" -#: builtin/clone.c:100 +#: builtin/clone.c:99 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" -#: builtin/clone.c:102 +#: builtin/clone.c:101 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, toujours copier" -#: builtin/clone.c:104 +#: builtin/clone.c:103 msgid "setup as shared repository" msgstr "régler comme dépôt partagé" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "spécificateur de chemin" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" -#: builtin/clone.c:110 +#: builtin/clone.c:109 msgid "number of submodules cloned in parallel" msgstr "nombre de sous-modules clonés en parallèle" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:110 builtin/init-db.c:486 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:111 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 #: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/clone.c:117 builtin/submodule--helper.c:1382 #: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3314 builtin/repack.c:319 +#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3294 builtin/repack.c:320 msgid "name" msgstr "nom" -#: builtin/clone.c:120 +#: builtin/clone.c:119 msgid "use <name> instead of 'origin' to track upstream" msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont" -#: builtin/clone.c:122 +#: builtin/clone.c:121 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" -#: builtin/clone.c:124 +#: builtin/clone.c:123 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 +#: builtin/pull.c:227 msgid "depth" msgstr "profondeur" -#: builtin/clone.c:126 +#: builtin/clone.c:125 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 msgid "time" msgstr "heure" -#: builtin/clone.c:128 +#: builtin/clone.c:127 msgid "create a shallow clone since a specific time" msgstr "créer un clone superficiel depuis une date spécifique" -#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 +#: builtin/rebase.c:1417 msgid "revision" msgstr "révision" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:129 builtin/fetch.c:172 msgid "deepen history of shallow clone, excluding rev" msgstr "" "approfondir l'historique d'un clone superficiel en excluant une révision" -#: builtin/clone.c:132 +#: builtin/clone.c:131 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -#: builtin/clone.c:134 +#: builtin/clone.c:133 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:136 +#: builtin/clone.c:135 msgid "any cloned submodules will be shallow" msgstr "tous les sous-modules clonés seront superficiels" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:136 builtin/init-db.c:495 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:137 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" -#: builtin/clone.c:139 +#: builtin/clone.c:138 msgid "key=value" msgstr "clé=valeur" -#: builtin/clone.c:140 +#: builtin/clone.c:139 msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 +#: builtin/push.c:572 builtin/send-pack.c:172 msgid "server-specific" msgstr "spécifique au serveur" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 +#: builtin/push.c:572 builtin/send-pack.c:173 msgid "option to transmit" msgstr "option à transmettre" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 +#: builtin/push.c:573 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 +#: builtin/push.c:575 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" -#: builtin/clone.c:149 +#: builtin/clone.c:148 msgid "any cloned submodules will use their remote-tracking branch" msgstr "" "tous les sous-modules clonés utiliseront leur branche de suivi à distance" -#: builtin/clone.c:285 +#: builtin/clone.c:284 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11267,47 +11296,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:338 +#: builtin/clone.c:337 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n" -#: builtin/clone.c:411 +#: builtin/clone.c:410 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:428 +#: builtin/clone.c:427 #, c-format msgid "failed to start iterator over '%s'" msgstr "échec du démarrage un itérateur sur '%s'" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "échec pour délier '%s'" - -#: builtin/clone.c:458 +#: builtin/clone.c:457 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:462 +#: builtin/clone.c:461 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:467 +#: builtin/clone.c:466 #, c-format msgid "failed to iterate over '%s'" msgstr "échec de l'itération sur '%s'" -#: builtin/clone.c:492 +#: builtin/clone.c:491 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:505 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11317,98 +11341,98 @@ msgstr "" "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" "et réessayer avec 'git restore --source=HEAD :/'\n" -#: builtin/clone.c:583 +#: builtin/clone.c:582 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:702 +#: builtin/clone.c:701 #, c-format msgid "unable to update %s" msgstr "impossible de mettre à jour %s" -#: builtin/clone.c:752 +#: builtin/clone.c:751 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:783 +#: builtin/clone.c:782 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:833 +#: builtin/clone.c:832 msgid "unable to write parameters to config file" msgstr "impossible d'écrire les paramètres dans le fichier de configuration" -#: builtin/clone.c:896 +#: builtin/clone.c:895 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" -#: builtin/clone.c:898 +#: builtin/clone.c:897 msgid "cannot unlink temporary alternates file" msgstr "impossible de délier le fichier temporaire alternates" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:937 builtin/receive-pack.c:1948 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:942 +#: builtin/clone.c:941 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:955 +#: builtin/clone.c:954 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:958 +#: builtin/clone.c:957 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:971 +#: builtin/clone.c:970 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:976 builtin/fetch.c:1790 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:987 +#: builtin/clone.c:986 #, 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:997 +#: builtin/clone.c:996 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 +#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 #, 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:1017 +#: builtin/clone.c:1016 #, 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:1037 +#: builtin/clone.c:1036 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1038 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1062 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11416,41 +11440,41 @@ msgstr "" "clone --recursive n'est pas compatible avec à la fois --reference et --" "reference-if-able" -#: builtin/clone.c:1124 +#: builtin/clone.c:1123 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:1126 +#: builtin/clone.c:1125 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:1128 +#: builtin/clone.c:1127 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:1130 +#: builtin/clone.c:1129 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:1133 +#: builtin/clone.c:1132 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:1138 +#: builtin/clone.c:1137 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1212 builtin/clone.c:1220 #, 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:1226 +#: builtin/clone.c:1223 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -11528,7 +11552,7 @@ msgid "id of a parent commit object" msgstr "id d'un objet commit parent" #: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 #: builtin/tag.c:412 msgid "message" msgstr "message" @@ -11542,7 +11566,7 @@ msgid "read commit log message from file" msgstr "lire le message de validation depuis un fichier" #: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/pull.c:195 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signer la validation avec GPG" @@ -11874,8 +11898,8 @@ msgstr "calcule les valeurs complètes en avance/en retard" msgid "version" msgstr "version" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 +#: builtin/worktree.c:650 msgid "machine-readable output" msgstr "sortie pour traitement automatique" @@ -11888,8 +11912,8 @@ msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" #: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 -#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 -#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 +#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 +#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 msgid "mode" msgstr "mode" @@ -11907,7 +11931,7 @@ msgstr "" "afficher les fichiers ignorés, \"mode\" facultatif : traditional " "(traditionnel), matching (correspondant), no. (Défaut : traditional)" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1362 parse-options.h:188 msgid "when" msgstr "quand" @@ -11962,7 +11986,7 @@ msgstr "auteur" msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1499 builtin/gc.c:538 msgid "date" msgstr "date" @@ -11998,8 +12022,8 @@ 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:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289 +#: builtin/pull.c:164 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" @@ -12106,69 +12130,68 @@ msgid "git commit-graph read [--object-dir <objdir>]" msgstr "git commit-graph read [--object-dir <objdir>]" #: builtin/commit-graph.c:13 builtin/commit-graph.c:19 -msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" -msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" #: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] <split options>" -msgstr "" -"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] <options de division>" +"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" +msgstr "git commit-graph write [--object-dir <répertoire-d'objet>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] [--|no-]progress] <options de division>" -#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 -#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 -#: builtin/log.c:1584 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:107 +#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 +#: builtin/log.c:1585 msgid "dir" msgstr "répertoire" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 -#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 +#: builtin/commit-graph.c:56 builtin/commit-graph.c:108 +#: builtin/commit-graph.c:171 builtin/commit-graph.c:255 msgid "The object directory to store the graph" msgstr "Le répertoire d'objet où stocker le graphe" -#: builtin/commit-graph.c:57 +#: builtin/commit-graph.c:58 msgid "if the commit-graph is split, only verify the tip file" msgstr "" "si le graphe de commit est divisé, vérifier seulement le fichier sommet" -#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 +#: builtin/commit-graph.c:80 builtin/commit-graph.c:125 #, c-format msgid "Could not open commit-graph '%s'" msgstr "impossible d'ouvrir le graphe de commit '%s'" -#: builtin/commit-graph.c:164 +#: builtin/commit-graph.c:173 msgid "start walk at all refs" msgstr "commencer le parcours à toutes les réfs" -#: builtin/commit-graph.c:166 +#: builtin/commit-graph.c:175 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:168 +#: builtin/commit-graph.c:177 msgid "start walk at commits listed by stdin" msgstr "commencer le parcours aux commits listés sur stdin" -#: builtin/commit-graph.c:170 +#: builtin/commit-graph.c:179 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:172 +#: builtin/commit-graph.c:182 msgid "allow writing an incremental commit-graph file" msgstr "permettre d'écrire un fichier incrémental de graphe de commit" -#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 +#: builtin/commit-graph.c:184 builtin/commit-graph.c:188 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" "le nombre maximum de commits dans un graphe de commit divisé pas de base" -#: builtin/commit-graph.c:176 +#: builtin/commit-graph.c:186 msgid "maximum ratio between two levels of a split commit-graph" msgstr "rapport maximum entre deux niveaux d'un graphe de commit divisé" -#: builtin/commit-graph.c:191 +#: builtin/commit-graph.c:204 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs" @@ -12487,59 +12510,59 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" -#: builtin/describe.c:27 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<options>] <commit ou apparenté>*" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<options>] --dirty" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "head" msgstr "tête" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "lightweight" msgstr "léger" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "annotated" msgstr "annoté" -#: builtin/describe.c:273 +#: builtin/describe.c:275 #, c-format msgid "annotated tag %s not available" msgstr "l'étiquette annotée %s n'est pas disponible" -#: builtin/describe.c:277 +#: builtin/describe.c:279 #, 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:279 +#: builtin/describe.c:281 #, c-format msgid "tag '%s' is really '%s' here" msgstr "l'étiquette '%s' est en fait '%s'" -#: builtin/describe.c:323 +#: builtin/describe.c:325 #, c-format msgid "no tag exactly matches '%s'" msgstr "aucune étiquette ne correspond parfaitement à '%s'" -#: builtin/describe.c:325 +#: builtin/describe.c:327 #, c-format 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:379 +#: builtin/describe.c:381 #, c-format msgid "finished search at %s\n" msgstr "recherche terminée à %s\n" -#: builtin/describe.c:405 +#: builtin/describe.c:407 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12548,7 +12571,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:409 +#: builtin/describe.c:411 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12557,12 +12580,12 @@ msgstr "" "Aucune étiquette ne peut décrire '%s'.\n" "Essayez --always, ou créez des étiquettes." -#: builtin/describe.c:439 +#: builtin/describe.c:441 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits parcourus\n" -#: builtin/describe.c:442 +#: builtin/describe.c:444 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12572,92 +12595,92 @@ msgstr "" "affichées\n" "abandon de la recherche à %s\n" -#: builtin/describe.c:510 +#: builtin/describe.c:512 #, c-format msgid "describe %s\n" msgstr "décrire %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:515 #, c-format msgid "Not a valid object name %s" msgstr "%s n'est pas un nom d'objet valide" -#: builtin/describe.c:521 +#: builtin/describe.c:523 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s n'est ni un commit ni un blob" -#: builtin/describe.c:535 +#: builtin/describe.c:537 msgid "find the tag that comes after the commit" msgstr "rechercher l'étiquette qui suit le commit" -#: builtin/describe.c:536 +#: builtin/describe.c:538 msgid "debug search strategy on stderr" msgstr "déboguer la stratégie de recherche sur stderr" -#: builtin/describe.c:537 +#: builtin/describe.c:539 msgid "use any ref" msgstr "utiliser n'importe quelle référence" -#: builtin/describe.c:538 +#: builtin/describe.c:540 msgid "use any tag, even unannotated" msgstr "utiliser n'importe quelle étiquette, même non-annotée" -#: builtin/describe.c:539 +#: builtin/describe.c:541 msgid "always use long format" msgstr "toujours utiliser le format long" -#: builtin/describe.c:540 +#: builtin/describe.c:542 msgid "only follow first parent" msgstr "ne suivre que le premier parent" -#: builtin/describe.c:543 +#: builtin/describe.c:545 msgid "only output exact matches" msgstr "n'afficher que les correspondances exactes" -#: builtin/describe.c:545 +#: builtin/describe.c:547 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:547 +#: builtin/describe.c:549 msgid "only consider tags matching <pattern>" msgstr "ne considérer que les étiquettes correspondant à <motif>" -#: builtin/describe.c:549 +#: builtin/describe.c:551 msgid "do not consider tags matching <pattern>" msgstr "ne pas considérer les étiquettes correspondant à <motif>" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:553 builtin/name-rev.c:426 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrégés en dernier recours" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:554 builtin/describe.c:557 msgid "mark" msgstr "marque" -#: builtin/describe.c:553 +#: builtin/describe.c:555 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:556 +#: builtin/describe.c:558 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:574 +#: builtin/describe.c:576 msgid "--long is incompatible with --abbrev=0" msgstr "--long et --abbrev=0 sont incompatibles" -#: builtin/describe.c:603 +#: builtin/describe.c:605 msgid "No names found, cannot describe anything." msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit." -#: builtin/describe.c:654 +#: builtin/describe.c:656 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty est incompatible avec la spécification de commits ou assimilés" -#: builtin/describe.c:656 +#: builtin/describe.c:658 msgid "--broken is incompatible with commit-ishes" msgstr "--broken est incompatible avec les commits ou assimilés" @@ -12694,27 +12717,27 @@ msgstr "objet non géré '%s' spécifié." msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "échec : %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "impossible de lire le fichier symlink %s" -#: builtin/difftool.c:305 +#: 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:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12722,53 +12745,53 @@ 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:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "les deux fichiers sont modifiés : '%s' et '%s'." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "le fichier dans l'arbre de travail a été laissé." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "des fichiers temporaires existent dans '%s'." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "vous pourriez souhaiter les nettoyer ou les récupérer." -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utiliser `diff.guitool` au lieu de `diff.tool`" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "réalise un diff de répertoire complet" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "ne pas confirmer avant de lancer l'outil de diff" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "utiliser les liens symboliques en mode de diff de répertoire" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "outil" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "utiliser l'outil de diff spécifié" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 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:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12776,31 +12799,31 @@ msgstr "" "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code " "non-nul" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "spécifier une commande personnalisée pour visualiser les différences" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "passé à `diff`" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool exige un arbre de travail ou --no-index" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff est incompatible avec --no-index" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "pas d'<outil> spécifié pour --tool=<outil>" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "pas de <commande> spécifié pour --extcmd=<commande>" @@ -12841,164 +12864,188 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [options-de-liste-de-révisions]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:852 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-tags ne soit spécifié." + +#: builtin/fast-export.c:1152 msgid "show progress after <n> objects" msgstr "afficher la progression après <n> objets" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1154 msgid "select handling of signed tags" msgstr "sélectionner la gestion des étiquettes signées" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1157 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:1132 +#: builtin/fast-export.c:1160 msgid "select handling of commit messages in an alternate encoding" msgstr "" "sélectionner la gestion des messages de validation dans un encodage " "alternatif" -#: builtin/fast-export.c:1135 +#: builtin/fast-export.c:1163 msgid "Dump marks to this file" msgstr "Enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1165 msgid "Import marks from this file" msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1169 +msgid "Import marks from this file if it exists" +msgstr "importer les marques depuis ce fichier s'il existe" + +#: builtin/fast-export.c:1171 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:1141 +#: builtin/fast-export.c:1173 msgid "Output full tree for each commit" msgstr "Afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1175 msgid "Use the done feature to terminate the stream" msgstr "Utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1176 msgid "Skip output of blob data" msgstr "Sauter l'affichage de données de blob" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1177 builtin/log.c:1633 msgid "refspec" msgstr "spécificateur de référence" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1178 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:1147 +#: builtin/fast-export.c:1179 msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1181 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "les parents références qui ne sont pas dans le flux d'export rapide par id " "d'objet" -#: builtin/fast-export.c:1151 +#: builtin/fast-export.c:1183 msgid "Show original object ids of blobs/commits" msgstr "Afficher les ids d'objet originaux des blobs/commits" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1185 +msgid "Label tags with mark ids" +msgstr "Marquer les étiquettes avec des ids de marque" + +#: builtin/fast-export.c:1220 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists" + +#: builtin/fetch.c:34 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:35 msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -#: builtin/fetch.c:32 +#: builtin/fetch.c:36 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:37 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:115 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel ne peut pas être négatif" + +#: builtin/fetch.c:138 builtin/pull.c:204 msgid "fetch from all remotes" msgstr "récupérer depuis tous les dépôts distants" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:140 builtin/pull.c:248 +msgid "set upstream for git pull/fetch" +msgstr "définir la branche amont pour git pull/fetch" + +#: builtin/fetch.c:142 builtin/pull.c:207 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:144 builtin/pull.c:210 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:130 +#: builtin/fetch.c:145 msgid "force overwrite of local reference" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:132 +#: builtin/fetch.c:147 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:149 builtin/pull.c:214 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:136 +#: builtin/fetch.c:151 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:138 +#: builtin/fetch.c:153 msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules récupérés en parallèle" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:155 builtin/pull.c:217 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:142 +#: builtin/fetch.c:157 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:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:144 +#: builtin/fetch.c:159 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:163 builtin/pull.c:225 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:150 +#: builtin/fetch.c:165 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:155 +#: builtin/fetch.c:170 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:161 builtin/pull.c:230 +#: builtin/fetch.c:176 builtin/pull.c:231 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:164 +#: builtin/fetch.c:179 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:167 +#: builtin/fetch.c:182 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -13006,91 +13053,91 @@ 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:171 builtin/pull.c:233 +#: builtin/fetch.c:186 builtin/pull.c:234 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:187 builtin/pull.c:236 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:237 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:180 +#: builtin/fetch.c:195 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:183 +#: builtin/fetch.c:198 msgid "run 'gc --auto' after fetching" msgstr "lancer 'gc --auto' après la récupération" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:200 builtin/pull.c:246 msgid "check for forced-updates on all updated branches" msgstr "vérifier les mises à jour forcées sur toutes les branches mises à jour" -#: builtin/fetch.c:491 +#: builtin/fetch.c:510 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:630 +#: builtin/fetch.c:650 #, 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:728 +#: builtin/fetch.c:748 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:732 +#: builtin/fetch.c:752 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:766 msgid "can't fetch in current branch" msgstr "impossible de récupérer dans la branche actuelle" -#: builtin/fetch.c:756 +#: builtin/fetch.c:776 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 +#: builtin/fetch.c:848 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:761 +#: builtin/fetch.c:781 msgid "would clobber existing tag" msgstr "écraserait l'étiquette existante" -#: builtin/fetch.c:783 +#: builtin/fetch.c:803 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:806 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:809 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:848 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:833 +#: builtin/fetch.c:853 msgid "non-fast-forward" msgstr "pas en avance rapide" -#: builtin/fetch.c:854 +#: builtin/fetch.c:874 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -13100,7 +13147,7 @@ msgstr "" "mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n" "'--show-forced-update' ou lancez 'git config fetch.showForcedUpdates true'." -#: builtin/fetch.c:858 +#: builtin/fetch.c:878 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13112,23 +13159,23 @@ msgstr "" "Vous pouvez utiliser '--no-show-forced-update' ou lancer\n" "'git config fetch.showForcedUpdates false' pour éviter ceci.\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:908 #, 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:909 +#: builtin/fetch.c:929 #, 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:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1020 builtin/fetch.c:1157 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1031 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13137,58 +13184,79 @@ 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:1101 +#: builtin/fetch.c:1127 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1128 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1160 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1161 builtin/remote.c:1036 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1184 #, 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:1177 +#: builtin/fetch.c:1203 #, 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:1180 +#: builtin/fetch.c:1206 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:1484 +#: builtin/fetch.c:1414 +msgid "multiple branch detected, incompatible with --set-upstream" +msgstr "branches multiples détectées, imcompatible avec --set-upstream" + +#: builtin/fetch.c:1429 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "dépôt amont non défini pour la branche de suivi à distance" + +#: builtin/fetch.c:1431 +msgid "not setting upstream for a remote tag" +msgstr "dépôt amont non défini pour l'étiquette distante" + +#: builtin/fetch.c:1433 +msgid "unknown branch type" +msgstr "type de branche inconnu" + +#: builtin/fetch.c:1435 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" +"Aucune branche source trouvée.\n" +"Vous devez spécifier exactement une branche avec l'option --set-upstream." + +#: builtin/fetch.c:1561 builtin/fetch.c:1623 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1532 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialClone" -msgstr "" -"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans " -"extensions.partialClone" +#: builtin/fetch.c:1583 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "impossible de récupérer '%s' (code de sortie : %d)\n" -#: builtin/fetch.c:1556 +#: builtin/fetch.c:1685 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13196,46 +13264,46 @@ msgstr "" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" "distant depuis lesquels les nouvelles révisions devraient être récupérées." -#: builtin/fetch.c:1593 +#: builtin/fetch.c:1722 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1774 msgid "Negative depth in --deepen is not supported" msgstr "Une profondeur négative dans --deepen n'est pas supportée" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1776 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen et --depth sont mutuellement exclusifs" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1781 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1783 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:1669 +#: builtin/fetch.c:1799 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1671 +#: builtin/fetch.c:1801 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:1680 +#: builtin/fetch.c:1810 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1817 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "La récupération d'un groupe et les spécifications de référence n'ont pas de " "sens" -#: builtin/fetch.c:1703 +#: builtin/fetch.c:1835 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13573,7 +13641,7 @@ msgstr "%s : objet manquant" msgid "invalid parameter: expected sha1, got '%s'" msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé" -#: builtin/gc.c:34 +#: builtin/gc.c:35 msgid "git gc [<options>]" msgstr "git gc [<options>]" @@ -13587,17 +13655,17 @@ msgstr "Échec du stat de %s : %s" msgid "failed to parse '%s' value '%s'" msgstr "échec de l'analyse de '%s' valeur '%s'" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "impossible de faire un stat de '%s'" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: builtin/gc.c:492 +#: builtin/gc.c:491 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -13613,56 +13681,56 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:540 +#: builtin/gc.c:539 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:542 +#: builtin/gc.c:541 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:543 +#: builtin/gc.c:542 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:546 +#: builtin/gc.c:545 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:549 +#: builtin/gc.c:548 msgid "repack all other packs except the largest pack" msgstr "recompacter tous les autres paquets excepté le plus gros paquet" -#: builtin/gc.c:566 +#: builtin/gc.c:565 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "impossible d'analyser gc.logexpiry %s" -#: builtin/gc.c:577 +#: builtin/gc.c:576 #, c-format msgid "failed to parse prune expiry value %s" msgstr "impossible d'analyser la valeur d'expiration d'élagage %s" -#: builtin/gc.c:597 +#: builtin/gc.c:596 #, 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:599 +#: builtin/gc.c:598 #, 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:600 +#: builtin/gc.c:599 #, 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:640 +#: builtin/gc.c:639 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -13670,7 +13738,7 @@ 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:695 +#: builtin/gc.c:694 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -13696,265 +13764,265 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s" #. grep.threads #. #: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2728 +#: builtin/pack-objects.c:2708 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" -#: builtin/grep.c:648 +#: builtin/grep.c:650 #, 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:714 +#: builtin/grep.c:716 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend une valeur numérique" -#: builtin/grep.c:813 +#: builtin/grep.c:815 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:815 +#: builtin/grep.c:817 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:817 +#: builtin/grep.c:819 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:819 +#: builtin/grep.c:821 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "recursively search in each submodule" msgstr "rechercher récursivement dans chaque sous-module" -#: builtin/grep.c:824 +#: builtin/grep.c:826 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:826 +#: builtin/grep.c:828 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" -#: builtin/grep.c:828 +#: builtin/grep.c:830 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:830 +#: builtin/grep.c:832 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:835 +#: builtin/grep.c:837 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "search in subdirectories (default)" msgstr "rechercher dans les sous-répertoires (défaut)" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:843 +#: builtin/grep.c:845 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:846 +#: builtin/grep.c:848 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:856 +#: builtin/grep.c:858 msgid "show column number of first match" msgstr "afficher le numéro de colonne de la première correspondance" -#: builtin/grep.c:857 +#: builtin/grep.c:859 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:867 +#: builtin/grep.c:869 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:869 +#: builtin/grep.c:871 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:872 +#: builtin/grep.c:874 msgid "show only matching parts of a line" msgstr "n'afficher que les parties correspondantes d'une ligne" -#: builtin/grep.c:874 +#: builtin/grep.c:876 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:875 +#: builtin/grep.c:877 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:877 +#: builtin/grep.c:879 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:879 +#: builtin/grep.c:881 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:882 +#: builtin/grep.c:884 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:889 +#: builtin/grep.c:891 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:890 +#: builtin/grep.c:892 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:893 +#: builtin/grep.c:895 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:895 +#: builtin/grep.c:897 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:898 +#: builtin/grep.c:900 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:902 +#: builtin/grep.c:904 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:914 +#: builtin/grep.c:916 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:916 +#: builtin/grep.c:918 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:918 +#: builtin/grep.c:920 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:926 +#: builtin/grep.c:928 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:990 +#: builtin/grep.c:992 msgid "no pattern given" msgstr "aucun motif fourni" -#: builtin/grep.c:1026 +#: builtin/grep.c:1028 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:1034 +#: builtin/grep.c:1036 #, c-format msgid "unable to resolve revision: %s" msgstr "impossible de résoudre la révision : %s" -#: builtin/grep.c:1065 +#: builtin/grep.c:1067 msgid "invalid option combination, ignoring --threads" msgstr "option de combinaison invalide, ignore --threads" -#: builtin/grep.c:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1070 builtin/pack-objects.c:3400 msgid "no threads support, ignoring --threads" msgstr "pas de support des fils, ignore --threads" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/grep.c:1094 +#: builtin/grep.c:1096 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:1117 +#: builtin/grep.c:1119 msgid "option not supported with --recurse-submodules" msgstr "option non supportée avec --recurse-submodules" -#: builtin/grep.c:1123 +#: builtin/grep.c:1125 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:1129 +#: builtin/grep.c:1131 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:1137 +#: builtin/grep.c:1139 msgid "both --cached and trees are given" msgstr "--cached et des arbres sont fournis en même temps" @@ -14268,7 +14336,7 @@ msgstr "confusion extrême dans parse_pack_objects()" msgid "Resolving deltas" msgstr "Résolution des deltas" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" @@ -14334,7 +14402,7 @@ msgstr "impossible de stocker le fichier paquet" msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" @@ -14617,74 +14685,74 @@ msgstr "Sortie finale : %d %s\n" msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:549 builtin/log.c:644 #, c-format msgid "could not read object %s" msgstr "impossible de lire l'objet %s" -#: builtin/log.c:668 +#: builtin/log.c:669 #, c-format msgid "unknown type: %d" msgstr "type inconnu : %d" -#: builtin/log.c:791 +#: builtin/log.c:792 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:908 +#: builtin/log.c:909 msgid "name of output directory is too long" msgstr "le nom du répertoire de sortie est trop long" -#: builtin/log.c:924 +#: builtin/log.c:925 #, c-format msgid "cannot open patch file %s" msgstr "impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:941 +#: builtin/log.c:942 msgid "need exactly one range" msgstr "exactement une plage nécessaire" -#: builtin/log.c:951 +#: builtin/log.c:952 msgid "not a range" msgstr "ceci n'est pas une plage" -#: builtin/log.c:1074 +#: builtin/log.c:1075 msgid "cover letter needs email format" msgstr "la lettre de motivation doit être au format courriel" -#: builtin/log.c:1080 +#: builtin/log.c:1081 msgid "failed to create cover-letter file" msgstr "échec de création du fichier de lettre de motivation" -#: builtin/log.c:1159 +#: builtin/log.c:1160 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1186 +#: builtin/log.c:1187 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1244 +#: builtin/log.c:1245 msgid "two output directories?" msgstr "deux répertoires de sortie ?" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 #, c-format msgid "unknown commit %s" msgstr "commit inconnu %s" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1366 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "échec à résoudre '%s' comme une référence valide" -#: builtin/log.c:1370 +#: builtin/log.c:1371 msgid "could not find exact merge base" msgstr "impossible de trouver la base de fusion exacte" -#: builtin/log.c:1374 +#: builtin/log.c:1375 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" @@ -14697,275 +14765,275 @@ msgstr "" "Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> " "manuellement" -#: builtin/log.c:1394 +#: builtin/log.c:1395 msgid "failed to find exact merge base" msgstr "échec à trouver la base de fusion exacte" -#: builtin/log.c:1405 +#: builtin/log.c:1406 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:1409 +#: builtin/log.c:1410 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:1462 +#: builtin/log.c:1463 msgid "cannot get patch id" msgstr "impossible d'obtenir l'id du patch" -#: builtin/log.c:1514 +#: builtin/log.c:1515 msgid "failed to infer range-diff ranges" msgstr "échec d'inférence d'intervalles de différence d'intervalles" -#: builtin/log.c:1559 +#: builtin/log.c:1560 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1562 +#: builtin/log.c:1563 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1566 +#: builtin/log.c:1567 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1568 +#: builtin/log.c:1569 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1570 +#: builtin/log.c:1571 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:1571 +#: builtin/log.c:1572 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1572 +#: builtin/log.c:1573 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1574 +#: builtin/log.c:1575 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:1576 +#: builtin/log.c:1577 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1578 +#: builtin/log.c:1579 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" -#: builtin/log.c:1581 +#: builtin/log.c:1582 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1584 +#: builtin/log.c:1585 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1587 +#: builtin/log.c:1588 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1590 +#: builtin/log.c:1591 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1592 +#: builtin/log.c:1593 msgid "output all-zero hash in From header" msgstr "écrire une empreinte à zéro dans l'entête From" -#: builtin/log.c:1594 +#: builtin/log.c:1595 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1596 +#: builtin/log.c:1597 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:1598 +#: builtin/log.c:1599 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1599 +#: builtin/log.c:1600 msgid "header" msgstr "en-tête" -#: builtin/log.c:1600 +#: builtin/log.c:1601 msgid "add email header" msgstr "ajouter l'en-tête de courriel" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1602 builtin/log.c:1604 msgid "email" msgstr "courriel" -#: builtin/log.c:1601 +#: builtin/log.c:1602 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1603 +#: builtin/log.c:1604 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1605 +#: builtin/log.c:1606 msgid "ident" msgstr "ident" -#: builtin/log.c:1606 +#: builtin/log.c:1607 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:1608 +#: builtin/log.c:1609 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1609 +#: builtin/log.c:1610 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1611 builtin/log.c:1614 msgid "boundary" msgstr "limite" -#: builtin/log.c:1611 +#: builtin/log.c:1612 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1614 +#: builtin/log.c:1615 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1618 +#: builtin/log.c:1619 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1620 +#: builtin/log.c:1621 msgid "signature" msgstr "signature" -#: builtin/log.c:1621 +#: builtin/log.c:1622 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1622 +#: builtin/log.c:1623 msgid "base-commit" msgstr "commit-de-base" -#: builtin/log.c:1623 +#: builtin/log.c:1624 msgid "add prerequisite tree info to the patch series" msgstr "Ajouter un arbre prérequis à la série de patchs" -#: builtin/log.c:1625 +#: builtin/log.c:1626 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1626 +#: builtin/log.c:1627 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1628 +#: builtin/log.c:1629 msgid "show progress while generating patches" msgstr "" "afficher la barre de progression durant la phase de génération des patchs" -#: builtin/log.c:1630 +#: builtin/log.c:1631 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "afficher les modifications par rapport à <rév> dans la première page ou une " "rustine" -#: builtin/log.c:1633 +#: builtin/log.c:1634 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "afficher les modifications par rapport à <refspec> dans la première page ou " "une rustine" -#: builtin/log.c:1635 +#: builtin/log.c:1636 msgid "percentage by which creation is weighted" msgstr "pourcentage par lequel la création est pondérée" -#: builtin/log.c:1710 +#: builtin/log.c:1711 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/log.c:1725 +#: builtin/log.c:1726 msgid "-n and -k are mutually exclusive" msgstr "-n et -k sont mutuellement exclusifs" -#: builtin/log.c:1727 +#: builtin/log.c:1728 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs" -#: builtin/log.c:1735 +#: builtin/log.c:1736 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1737 +#: builtin/log.c:1738 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1739 +#: builtin/log.c:1740 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1771 +#: builtin/log.c:1773 msgid "standard output, or directory, which one?" msgstr "sortie standard, ou répertoire, lequel ?" -#: builtin/log.c:1860 +#: builtin/log.c:1877 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:1864 +#: builtin/log.c:1881 msgid "Interdiff:" msgstr "Interdiff :" -#: builtin/log.c:1865 +#: builtin/log.c:1882 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contre v%d :" -#: builtin/log.c:1871 +#: builtin/log.c:1888 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiert --range-diff" -#: builtin/log.c:1875 +#: builtin/log.c:1892 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:1883 +#: builtin/log.c:1900 msgid "Range-diff:" msgstr "Diff-intervalle :" -#: builtin/log.c:1884 +#: builtin/log.c:1901 #, c-format msgid "Range-diff against v%d:" msgstr "Diff-intervalle contre v%d :" -#: builtin/log.c:1895 +#: builtin/log.c:1912 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:1931 +#: builtin/log.c:1948 msgid "Generating patches" msgstr "Génération des patchs" -#: builtin/log.c:1975 +#: builtin/log.c:1992 msgid "failed to create output files" msgstr "échec de création des fichiers en sortie" -#: builtin/log.c:2034 +#: builtin/log.c:2051 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:2088 +#: builtin/log.c:2105 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -15094,7 +15162,7 @@ msgstr "" msgid "do not print remote URL" msgstr "ne pas afficher les URL distantes" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488 msgid "exec" msgstr "exécutable" @@ -15207,33 +15275,33 @@ msgstr "Les stratégies disponibles sont :" msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:244 builtin/pull.c:152 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:247 builtin/pull.c:154 +#: builtin/merge.c:247 builtin/pull.c:155 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:248 builtin/pull.c:158 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:250 builtin/pull.c:161 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:253 builtin/pull.c:166 +#: builtin/merge.c:253 builtin/pull.c:167 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:255 builtin/pull.c:169 +#: builtin/merge.c:255 builtin/pull.c:170 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:257 builtin/pull.c:173 msgid "edit message before committing" msgstr "éditer le message avant la validation" @@ -15241,28 +15309,28 @@ msgstr "éditer le message avant la validation" msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:261 builtin/pull.c:180 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:265 builtin/pull.c:183 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:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 +#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:267 builtin/pull.c:188 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:268 builtin/pull.c:191 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:269 builtin/pull.c:192 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" @@ -15283,13 +15351,13 @@ msgstr "--abort mais laisser l'index et l'arbre de travail inchangés" msgid "continue the current in-progress merge" msgstr "continuer la fusion en cours" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:284 builtin/pull.c:199 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" #: builtin/merge.c:290 -msgid "verify commit-msg hook" -msgstr "vérifier le crochet commit-msg" +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg" #: builtin/merge.c:307 msgid "could not run stash." @@ -15332,33 +15400,33 @@ msgstr "'%s' ne pointe pas sur un commit" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:708 +#: builtin/merge.c:705 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:722 +#: builtin/merge.c:719 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:734 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:789 +#: builtin/merge.c:786 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:798 +#: builtin/merge.c:795 #, 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:804 +#: builtin/merge.c:801 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -15370,11 +15438,11 @@ msgstr "" "branche de sujet.\n" "\n" -#: builtin/merge.c:809 +#: builtin/merge.c:806 msgid "An empty message aborts the commit.\n" msgstr "Un message vide abandonne la validation.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:809 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15383,74 +15451,74 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:853 +#: builtin/merge.c:862 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:872 +#: builtin/merge.c:877 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:938 #, 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:972 +#: builtin/merge.c:977 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:974 +#: builtin/merge.c:979 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:976 +#: builtin/merge.c:981 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:981 +#: builtin/merge.c:986 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1038 +#: builtin/merge.c:1043 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1141 +#: builtin/merge.c:1146 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" -#: builtin/merge.c:1175 +#: builtin/merge.c:1180 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" -#: builtin/merge.c:1278 +#: builtin/merge.c:1283 msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" -#: builtin/merge.c:1282 +#: builtin/merge.c:1287 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:1291 +#: builtin/merge.c:1296 msgid "--quit expects no arguments" msgstr "--quit n'accepte pas d'argument" -#: builtin/merge.c:1304 +#: builtin/merge.c:1309 msgid "--continue expects no arguments" msgstr "--continue ne supporte aucun argument" -#: builtin/merge.c:1308 +#: builtin/merge.c:1313 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:1324 +#: builtin/merge.c:1329 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15458,7 +15526,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1331 +#: builtin/merge.c:1336 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15466,98 +15534,98 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1334 +#: builtin/merge.c:1339 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:1348 +#: builtin/merge.c:1353 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1350 +#: builtin/merge.c:1355 msgid "You cannot combine --squash with --commit." msgstr "Vous ne pouvez pas combiner --squash avec --commit." -#: builtin/merge.c:1366 +#: builtin/merge.c:1371 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:1383 +#: builtin/merge.c:1388 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:1385 +#: builtin/merge.c:1390 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:1390 +#: builtin/merge.c:1395 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1392 +#: builtin/merge.c:1397 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:1471 +#: builtin/merge.c:1476 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1480 +#: builtin/merge.c:1485 msgid "Already up to date." msgstr "Déjà à jour." -#: builtin/merge.c:1490 +#: builtin/merge.c:1495 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1537 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1544 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1569 msgid "Already up to date. Yeeah!" msgstr "Déjà à jour. Ouais !" -#: builtin/merge.c:1570 +#: builtin/merge.c:1575 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1598 builtin/merge.c:1663 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1602 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1654 #, 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:1651 +#: builtin/merge.c:1656 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1665 #, 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:1672 +#: builtin/merge.c:1677 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -15643,33 +15711,33 @@ 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/merge-recursive.c:46 +#: builtin/merge-recursive.c:47 #, c-format msgid "unknown option %s" msgstr "option inconnue %s" -#: builtin/merge-recursive.c:52 +#: builtin/merge-recursive.c:53 #, c-format msgid "could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: builtin/merge-recursive.c:56 +#: builtin/merge-recursive.c:57 #, 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:64 +#: builtin/merge-recursive.c:65 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:70 builtin/merge-recursive.c:72 +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 #, c-format msgid "could not resolve ref '%s'" msgstr "impossible de résoudre la référence '%s'" -#: builtin/merge-recursive.c:78 +#: builtin/merge-recursive.c:82 #, c-format msgid "Merging %s with %s\n" msgstr "Fusion de %s avec %s\n" @@ -15814,53 +15882,53 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:356 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<options>] <validation>..." -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:357 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<options>] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:358 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<options>] --stdin" -#: builtin/name-rev.c:411 +#: builtin/name-rev.c:415 msgid "print only names (no SHA-1)" msgstr "afficher seulement les noms (pas de SHA-1)" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:416 msgid "only use tags to name the commits" msgstr "utiliser seulement les étiquettes pour nommer les validations" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:418 msgid "only use refs matching <pattern>" msgstr "utiliser seulement les références correspondant à <motif>" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:420 msgid "ignore refs matching <pattern>" msgstr "ignorer les références correspondant à <motif>" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:422 msgid "list all commits reachable from all refs" msgstr "" "afficher toutes les validations accessibles depuis toutes les références" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:423 msgid "read from stdin" msgstr "lire depuis l'entrée standard" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:424 msgid "allow to print `undefined` names (default)" msgstr "autoriser l'affichage des noms `non définis` (par défaut)" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:430 msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" @@ -16260,7 +16328,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" @@ -16276,7 +16344,7 @@ msgstr "références-notes" msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1607 #, c-format msgid "unknown subcommand: %s" msgstr "sous-commande inconnue : %s" @@ -16353,71 +16421,71 @@ msgstr "échec du stat de %s" msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus" -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1164 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:1597 +#: builtin/pack-objects.c:1592 #, 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:1606 +#: builtin/pack-objects.c:1601 #, 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:1875 +#: builtin/pack-objects.c:1870 msgid "Counting objects" msgstr "Décompte des objets" -#: builtin/pack-objects.c:2005 +#: builtin/pack-objects.c:2000 #, c-format msgid "unable to get size of %s" msgstr "impossible de récupérer la taille de %s" -#: builtin/pack-objects.c:2020 +#: builtin/pack-objects.c:2015 #, 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:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 +#: builtin/pack-objects.c:2111 #, c-format msgid "object %s cannot be read" msgstr "l'objet %s ne peut être lu" -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)" -#: builtin/pack-objects.c:2130 +#: builtin/pack-objects.c:2125 msgid "suboptimal pack - out of memory" msgstr "paquet sous-optimal - mémoire insuffisante" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2440 #, 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:2588 +#: builtin/pack-objects.c:2572 #, 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:2675 +#: builtin/pack-objects.c:2659 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2665 msgid "inconsistency with delta count" msgstr "inconsistance dans le compte de delta" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2742 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16426,7 +16494,7 @@ msgstr "" "ID d'objet de bord attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2748 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16435,252 +16503,252 @@ msgstr "" "ID d'objet attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:2846 msgid "invalid value for --missing" msgstr "valeur invalide pour --missing" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 msgid "cannot open pack index" msgstr "impossible d'ouvrir l'index de paquet" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:2936 #, 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:3041 +#: builtin/pack-objects.c:3021 msgid "unable to force loose object" msgstr "impossible de forcer l'objet libre" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3113 #, c-format msgid "not a rev '%s'" msgstr "'%s' n'est pas une révision" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3116 #, c-format msgid "bad revision '%s'" msgstr "mauvaise révision '%s'" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3141 msgid "unable to add recent objects" msgstr "impossible d'ajouter les objets récents" -#: builtin/pack-objects.c:3214 +#: builtin/pack-objects.c:3194 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3198 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3228 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3230 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3232 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:3255 +#: builtin/pack-objects.c:3235 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:3256 +#: builtin/pack-objects.c:3236 msgid "<version>[,<offset>]" msgstr "<version>[,<décalage>]" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3237 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:3260 +#: builtin/pack-objects.c:3240 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3242 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3244 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3246 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3248 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:3270 +#: builtin/pack-objects.c:3250 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:3272 +#: builtin/pack-objects.c:3252 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3254 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3256 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3258 msgid "use threads when searching for best delta matches" msgstr "" "utiliser des fils lors de la recherche pour une meilleure correspondance des " "deltas" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3260 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3262 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3264 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:3287 +#: builtin/pack-objects.c:3267 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3270 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:3293 +#: builtin/pack-objects.c:3273 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3276 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3278 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:3300 +#: builtin/pack-objects.c:3280 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3282 msgid "pack loose unreachable objects" msgstr "empaqueter les objets inaccessibles détachés" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3284 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3287 msgid "use the sparse reachability algorithm" msgstr "utiliser l'algorithme de joignabilité creuse" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3289 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3291 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3293 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3295 msgid "ignore this pack" msgstr "ignorer ce paquet" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3297 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3299 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3301 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:3323 +#: builtin/pack-objects.c:3303 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:3327 +#: builtin/pack-objects.c:3307 msgid "write a bitmap index if possible" msgstr "écrire un index de bitmap si possible" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3311 msgid "handling for missing objects" msgstr "gestion des objets manquants" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3314 msgid "do not pack objects in promisor packfiles" msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3316 msgid "respect islands during delta compression" msgstr "respecter les îlots pendant la compression des deltas" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3345 #, 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:3366 +#: builtin/pack-objects.c:3350 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit est trop grand, forcé à %d" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3404 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:3422 +#: builtin/pack-objects.c:3406 msgid "minimum pack size limit is 1 MiB" msgstr "la taille limite minimale d'un paquet est 1 MiB" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3411 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:3430 +#: builtin/pack-objects.c:3414 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3420 msgid "cannot use --filter without --stdout" msgstr "impossible d'utiliser --filter sans --stdout" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3481 msgid "Enumerating objects" msgstr "Énumération des objets" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3511 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" @@ -16735,44 +16803,44 @@ msgstr "Valeur invalide pour %s : %s" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/pull.c:141 +#: builtin/pull.c:142 msgid "control for recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/pull.c:145 +#: builtin/pull.c:146 msgid "Options related to merging" msgstr "Options relatives à la fusion" -#: builtin/pull.c:148 +#: builtin/pull.c:149 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" -#: builtin/pull.c:185 +#: builtin/pull.c:186 msgid "automatically stash/stash pop before and after rebase" msgstr "remiser avant et réappliquer après le rebasage automatiquement" -#: builtin/pull.c:201 +#: builtin/pull.c:202 msgid "Options related to fetching" msgstr "Options relatives au rapatriement" -#: builtin/pull.c:211 +#: builtin/pull.c:212 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/pull.c:219 +#: builtin/pull.c:220 msgid "number of submodules pulled in parallel" msgstr "nombre de sous-modules tirés en parallèle" -#: builtin/pull.c:316 +#: builtin/pull.c:320 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valeur invalide pour pull.ff : %s" -#: builtin/pull.c:433 +#: builtin/pull.c:437 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -16780,14 +16848,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:435 +#: builtin/pull.c:439 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:436 +#: builtin/pull.c:440 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -16795,7 +16863,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:439 +#: builtin/pull.c:443 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16807,44 +16875,44 @@ msgstr "" "configuration\n" "pour la branche actuelle, vous devez spécifier la branche avec la commande." -#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Vous n'êtes actuellement sur aucune branche." -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:450 builtin/pull.c:465 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:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:452 builtin/pull.c:467 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:449 builtin/pull.c:464 +#: builtin/pull.c:453 builtin/pull.c:468 msgid "See git-pull(1) for details." msgstr "Référez-vous à git-pull(1) pour de plus amples détails." -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 +#: builtin/rebase.c:1353 git-parse-remote.sh:64 msgid "<remote>" msgstr "<distant>" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branche>" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:463 builtin/rebase.c:1345 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:468 git-parse-remote.sh:95 +#: builtin/pull.c:472 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 :" -#: builtin/pull.c:473 +#: builtin/pull.c:477 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16854,34 +16922,34 @@ msgstr "" "'%s'\n" "du serveur distant, mais cette référence n'a pas été récupérée." -#: builtin/pull.c:581 +#: builtin/pull.c:587 #, c-format msgid "unable to access commit %s" msgstr "impossible d'accéder le commit %s" -#: builtin/pull.c:861 +#: builtin/pull.c:867 msgid "ignoring --verify-signatures for rebase" msgstr "--verify-signatures est ignoré pour un rebasage" -#: builtin/pull.c:916 +#: builtin/pull.c:922 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase." -#: builtin/pull.c:924 +#: builtin/pull.c:930 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:928 +#: builtin/pull.c:934 msgid "pull with rebase" msgstr "tirer avec un rebasage" -#: builtin/pull.c:929 +#: builtin/pull.c:935 msgid "please commit or stash them." msgstr "veuillez les valider ou les remiser." -#: builtin/pull.c:954 +#: builtin/pull.c:960 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16892,7 +16960,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:960 +#: builtin/pull.c:966 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16909,15 +16977,15 @@ msgstr "" "$ git reset --hard\n" "pour régénérer." -#: builtin/pull.c:975 +#: builtin/pull.c:981 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tête vide." -#: builtin/pull.c:979 +#: builtin/pull.c:985 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." -#: builtin/pull.c:986 +#: builtin/pull.c:992 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossible de rebaser avec des modifications de sous-modules enregistrées " @@ -17093,137 +17161,137 @@ msgstr "" msgid "Pushing to %s\n" msgstr "Poussée vers %s\n" -#: builtin/push.c:364 +#: builtin/push.c:366 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:398 -#, c-format -msgid "bad repository '%s'" -msgstr "mauvais dépôt '%s'" - -#: builtin/push.c:399 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"Pas de destination pour pousser.\n" -"Spécifiez une URL depuis la ligne de commande ou configurez un dépôt distant " -"en utilisant\n" -"\n" -" git remote add <nom> <url>\n" -"\n" -"et poussez alors en utilisant le dépôt distant\n" -"\n" -" git push <nom>\n" - -#: builtin/push.c:554 +#: builtin/push.c:541 msgid "repository" msgstr "dépôt" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:542 builtin/send-pack.c:164 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:558 +#: builtin/push.c:545 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:559 +#: builtin/push.c:546 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:562 builtin/send-pack.c:167 +#: builtin/push.c:549 builtin/send-pack.c:167 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:551 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<nom-de-ref>:<attendu>" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:552 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:568 +#: builtin/push.c:555 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:557 builtin/send-pack.c:175 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 +#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:573 +#: builtin/push.c:560 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:563 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:578 +#: builtin/push.c:565 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:579 +#: builtin/push.c:566 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:569 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "signer la poussée avec GPG" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:571 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "demande une transaction atomique sur le serveur distant" -#: builtin/push.c:602 +#: builtin/push.c:589 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:604 +#: builtin/push.c:591 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" -#: builtin/push.c:607 +#: builtin/push.c:611 +#, c-format +msgid "bad repository '%s'" +msgstr "mauvais dépôt '%s'" + +#: builtin/push.c:612 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Pas de destination pour pousser.\n" +"Spécifiez une URL depuis la ligne de commande ou configurez un dépôt distant " +"en utilisant\n" +"\n" +" git remote add <nom> <url>\n" +"\n" +"et poussez alors en utilisant le dépôt distant\n" +"\n" +" git push <nom>\n" + +#: builtin/push.c:627 msgid "--all and --tags are incompatible" msgstr "--all et --tags sont incompatibles" -#: builtin/push.c:609 +#: builtin/push.c:629 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:613 +#: builtin/push.c:633 msgid "--mirror and --tags are incompatible" msgstr "--mirror et --tags sont incompatibles" -#: builtin/push.c:615 +#: builtin/push.c:635 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:618 +#: builtin/push.c:638 msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:637 +#: builtin/push.c:642 msgid "push options must not have new line characters" msgstr "" "les options de poussée ne peuvent pas contenir de caractères de nouvelle " @@ -17345,11 +17413,9 @@ msgstr "supprimer les messages d'information de suivi" #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" -msgstr "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base>] [<amont>] " -"[<branche>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" +msgstr "git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base> | --keep-base] [<amont> [<branche>]]" #: builtin/rebase.c:34 msgid "" @@ -17389,189 +17455,189 @@ msgstr "impossible de marquer comme interactif" msgid "could not generate todo list" msgstr "impossible de générer la liste à-faire" -#: builtin/rebase.c:382 +#: builtin/rebase.c:383 msgid "a base commit must be provided with --upstream or --onto" msgstr "un commit de base doit être fourni avec --upstream ou --onto" -#: builtin/rebase.c:437 +#: builtin/rebase.c:438 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<options>]" -#: builtin/rebase.c:449 +#: builtin/rebase.c:450 msgid "keep empty commits" msgstr "garder les validations vides" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:452 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "autoriser les validations avec des messages vides" -#: builtin/rebase.c:452 +#: builtin/rebase.c:453 msgid "rebase merge commits" msgstr "rebaser les commits de fusion" -#: builtin/rebase.c:454 +#: builtin/rebase.c:455 msgid "keep original branch points of cousins" msgstr "conserver les points de branchement de cousins originaux" -#: builtin/rebase.c:456 +#: builtin/rebase.c:457 msgid "move commits that begin with squash!/fixup!" msgstr "déplacer les commits qui commencent par squash!/fixup!" -#: builtin/rebase.c:457 +#: builtin/rebase.c:458 msgid "sign commits" msgstr "signer les commits" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:460 builtin/rebase.c:1427 msgid "display a diffstat of what changed upstream" msgstr "afficher un diffstat de ce qui a changé en amont" -#: builtin/rebase.c:461 +#: builtin/rebase.c:462 msgid "continue rebase" msgstr "continuer le rebasage" -#: builtin/rebase.c:463 +#: builtin/rebase.c:464 msgid "skip commit" msgstr "sauter le commit" -#: builtin/rebase.c:464 +#: builtin/rebase.c:465 msgid "edit the todo list" msgstr "éditer la liste à-faire" -#: builtin/rebase.c:466 +#: builtin/rebase.c:467 msgid "show the current patch" msgstr "afficher le patch courant" -#: builtin/rebase.c:469 +#: builtin/rebase.c:470 msgid "shorten commit ids in the todo list" msgstr "raccourcir les identifiants de commits dans la liste à-faire" -#: builtin/rebase.c:471 +#: builtin/rebase.c:472 msgid "expand commit ids in the todo list" msgstr "étendre les identifiants de commit dans la liste à-faire" -#: builtin/rebase.c:473 +#: builtin/rebase.c:474 msgid "check the todo list" msgstr "vérifier la liste à-faire" -#: builtin/rebase.c:475 +#: builtin/rebase.c:476 msgid "rearrange fixup/squash lines" msgstr "réarranger les lignes fixup/squash" -#: builtin/rebase.c:477 +#: builtin/rebase.c:478 msgid "insert exec commands in todo list" msgstr "insérer les commandes exec dans la liste à-faire" -#: builtin/rebase.c:478 +#: builtin/rebase.c:479 msgid "onto" msgstr "sur" -#: builtin/rebase.c:481 +#: builtin/rebase.c:482 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:481 +#: builtin/rebase.c:482 msgid "restrict revision" msgstr "restreindre la révision" -#: builtin/rebase.c:483 +#: builtin/rebase.c:484 msgid "squash-onto" msgstr "écraser-sur" -#: builtin/rebase.c:484 +#: builtin/rebase.c:485 msgid "squash onto" msgstr "écraser sur" -#: builtin/rebase.c:486 +#: builtin/rebase.c:487 msgid "the upstream commit" msgstr "le commit amont" -#: builtin/rebase.c:488 +#: builtin/rebase.c:489 msgid "head-name" msgstr "nom du head" -#: builtin/rebase.c:488 +#: builtin/rebase.c:489 msgid "head name" msgstr "nom du head" -#: builtin/rebase.c:493 +#: builtin/rebase.c:494 msgid "rebase strategy" msgstr "stratégie de rebasage" -#: builtin/rebase.c:494 +#: builtin/rebase.c:495 msgid "strategy-opts" msgstr "options de stratégie" -#: builtin/rebase.c:495 +#: builtin/rebase.c:496 msgid "strategy options" msgstr "options de stratégie" -#: builtin/rebase.c:496 +#: builtin/rebase.c:497 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:497 +#: builtin/rebase.c:498 msgid "the branch or commit to checkout" msgstr "la branche ou le commit à extraire" -#: builtin/rebase.c:498 +#: builtin/rebase.c:499 msgid "onto-name" msgstr "sur-le-nom" -#: builtin/rebase.c:498 +#: builtin/rebase.c:499 msgid "onto name" msgstr "sur le nom" -#: builtin/rebase.c:499 +#: builtin/rebase.c:500 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:499 +#: builtin/rebase.c:500 msgid "the command to run" msgstr "la commande à lancer" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:503 builtin/rebase.c:1510 msgid "automatically re-schedule any `exec` that fails" msgstr "re-planifier automatiquement tout `exec` qui échoue" -#: builtin/rebase.c:518 +#: builtin/rebase.c:519 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges" -#: builtin/rebase.c:534 +#: builtin/rebase.c:535 #, c-format msgid "%s requires an interactive rebase" msgstr "%s requiert un rebasage interactif" -#: builtin/rebase.c:586 +#: builtin/rebase.c:587 #, c-format msgid "could not get 'onto': '%s'" msgstr "impossible d'accéder 'onto' : '%s'" -#: builtin/rebase.c:601 +#: builtin/rebase.c:602 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head invalide : '%s'" -#: builtin/rebase.c:626 +#: builtin/rebase.c:627 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "allow_rerere_autoupdate invalide ignoré : '%s'" -#: builtin/rebase.c:702 +#: builtin/rebase.c:703 #, c-format msgid "Could not read '%s'" msgstr "Impossible de lire '%s'" -#: builtin/rebase.c:720 +#: builtin/rebase.c:721 #, c-format msgid "Cannot store %s" msgstr "Impossible de stocker %s" -#: builtin/rebase.c:827 +#: builtin/rebase.c:828 msgid "could not determine HEAD revision" msgstr "impossible de déterminer la révision HEAD" -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -17585,7 +17651,7 @@ msgstr "" "arrêter\n" "et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"." -#: builtin/rebase.c:1031 +#: builtin/rebase.c:1032 #, c-format msgid "" "\n" @@ -17604,7 +17670,7 @@ msgstr "" "\n" "Résultat, git ne peut pas les rebaser." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1339 #, c-format msgid "" "%s\n" @@ -17621,7 +17687,7 @@ msgstr "" " git rebase '<branche>'\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1355 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17635,127 +17701,131 @@ msgstr "" " git branch --set-upstream-to=%s/<branche> %s\n" "\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1385 msgid "exec commands cannot contain newlines" msgstr "les commandes exec ne peut pas contenir de retour à la ligne" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1389 msgid "empty exec command" msgstr "commande exec vide" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1418 msgid "rebase onto given branch instead of upstream" msgstr "rebaser sur la branche %s au lieu de la branche amont" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1420 +msgid "use the merge-base of upstream and branch as the current base" +msgstr "utiliser la base de fusion de l'amont et la branche comme base actuelle" + +#: builtin/rebase.c:1422 msgid "allow pre-rebase hook to run" msgstr "permettre le lancement du crochet pre-rebase" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1424 msgid "be quiet. implies --no-stat" msgstr "être silencieux. implique --no-stat" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1430 msgid "do not show diffstat of what changed upstream" msgstr "ne pas afficher un diffstat de ce qui a changé en amont" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1433 msgid "add a Signed-off-by: line to each commit" msgstr "ajouter une ligne Signed-off-by à chaque message de validation" -#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 +#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441 msgid "passed to 'git am'" msgstr "passé à 'git am'" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1443 builtin/rebase.c:1445 msgid "passed to 'git apply'" msgstr "passé jusqu'à git-apply" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1447 builtin/rebase.c:1450 msgid "cherry-pick all commits, even if unchanged" msgstr "picorer tous les commits, même sans modifiant" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1452 msgid "continue" msgstr "continuer" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1455 msgid "skip current patch and continue" msgstr "sauter le patch courant et continuer" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1457 msgid "abort and check out the original branch" msgstr "abandonner et extraire la branche d'origine" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1460 msgid "abort but keep HEAD where it is" msgstr "abandonne mais garde HEAD où il est" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1461 msgid "edit the todo list during an interactive rebase" msgstr "éditer la liste à faire lors d'un rebasage interactif" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1464 msgid "show the patch file being applied or merged" msgstr "afficher le patch en cours d'application ou de fusion" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1467 msgid "use merging strategies to rebase" msgstr "utiliser des stratégies de fusion pour rebaser" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1471 msgid "let the user edit the list of commits to rebase" msgstr "laisser l'utilisateur éditer la liste des commits à rebaser" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1475 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer" -#: builtin/rebase.c:1455 +#: builtin/rebase.c:1479 msgid "preserve empty commits during rebase" msgstr "préserver les validations vides pendant le rebasage" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1481 msgid "move commits that begin with squash!/fixup! under -i" msgstr "déplace les commits qui commencent par squash!/fixup! sous -i" -#: builtin/rebase.c:1463 +#: builtin/rebase.c:1487 msgid "automatically stash/stash pop before and after" msgstr "remiser et réappliquer automatiquement avant et après" -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1489 msgid "add exec lines after each commit of the editable list" msgstr "ajouter les lignes exec après chaque commit de la liste éditable" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1493 msgid "allow rebasing commits with empty messages" msgstr "autoriser les commits de rebasage avec des messages vides" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1496 msgid "try to rebase merges instead of skipping them" msgstr "essayer de rebaser les fusions au lieu de les garder" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1499 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1501 msgid "use the given merge strategy" msgstr "utiliser la stratégie de fusion indiquée" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1503 builtin/revert.c:115 msgid "option" msgstr "option" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1504 msgid "pass the argument through to the merge strategy" msgstr "passer les arguments jusqu'à la stratégie de fusion" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1507 msgid "rebase all reachable commits up to the root(s)" msgstr "rebaser tous les objets inatteignables depuis les racines" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1524 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17763,32 +17833,40 @@ msgstr "" "les support de rebase.useBuiltin a été supprimé !\n" "Voir son entrée dans 'git help config' pour plus de détails." -#: builtin/rebase.c:1506 +#: builtin/rebase.c:1530 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser." -#: builtin/rebase.c:1547 +#: builtin/rebase.c:1571 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges est déconseillé. Utilisez --rebase-merges à la " "place." -#: builtin/rebase.c:1551 +#: builtin/rebase.c:1576 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "impossible de combiner '--keep-base' avec '--onto'" + +#: builtin/rebase.c:1578 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "impossible de combiner '--keep-base' avec '--root'" + +#: builtin/rebase.c:1582 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1586 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'action --edit-todo peut seulement être utilisée lors d'un rebasage " "interactif." -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1609 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1621 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17796,16 +17874,16 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1640 msgid "could not discard worktree changes" msgstr "Impossible de supprimer les changements de l'arbre de travail" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1659 #, c-format msgid "could not move back to %s" msgstr "Impossible de revenir à %s" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1704 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17827,167 +17905,159 @@ msgstr "" "chose\n" "d'important ici.\n" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1725 msgid "switch `C' expects a numerical value" msgstr "l'option `C' attend un valeur numérique" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1766 #, c-format msgid "Unknown mode: %s" msgstr "mode inconnu : %s" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1788 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiert --merge ou --interactive" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1828 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec requiert --exec ou --interactive" -#: builtin/rebase.c:1809 +#: builtin/rebase.c:1840 msgid "cannot combine am options with either interactive or merge options" msgstr "" "impossible de combiner les options am avec l'options interactive ou merge" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1859 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1863 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "erreur : impossible de combiner '--preserve-merges' avec '--reschedule-" "failed-exec'" -#: builtin/rebase.c:1838 -msgid "cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "impossible de combiner '--rebase-merges' avec '--strategy-option'" - -#: builtin/rebase.c:1841 -msgid "cannot combine '--rebase-merges' with '--strategy'" -msgstr "impossible de combiner '--rebase-merges' avec '--strategy'" - -#: builtin/rebase.c:1865 +#: builtin/rebase.c:1887 #, c-format msgid "invalid upstream '%s'" msgstr "amont invalide '%s'" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1893 msgid "Could not create new root commit" msgstr "Impossible de créer un nouveau commit racine" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1919 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "'%s': exactement une base de fusion nécessaire avec une branche" + +#: builtin/rebase.c:1922 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': exactement une base de fusion nécessaire" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1930 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "ne pointe pas sur une validation valide : '%s'" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1955 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal : pas de branche ou commit '%s'" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/rebase.c:1963 builtin/submodule--helper.c:38 #: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1974 msgid "Could not resolve HEAD to a revision" msgstr "Impossible de résoudre le commit HEAD vers un révision" -#: builtin/rebase.c:1981 +#: builtin/rebase.c:2012 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: builtin/rebase.c:1984 +#: builtin/rebase.c:2015 #, c-format msgid "Unexpected stash response: '%s'" msgstr "réponse de remisage inattendue : '%s'" -#: builtin/rebase.c:1990 +#: builtin/rebase.c:2021 #, c-format msgid "Could not create directory for '%s'" msgstr "Impossible de créer le répertoire pour '%s'" -#: builtin/rebase.c:1993 +#: builtin/rebase.c:2024 #, c-format msgid "Created autostash: %s\n" msgstr "Autoremisage créé : %s\n" -#: builtin/rebase.c:1996 +#: builtin/rebase.c:2027 msgid "could not reset --hard" msgstr "impossible de réinitialiser --hard" -#: builtin/rebase.c:1997 builtin/reset.c:114 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD est maintenant à %s" - -#: builtin/rebase.c:2013 +#: builtin/rebase.c:2036 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: builtin/rebase.c:2040 +#: builtin/rebase.c:2063 #, c-format msgid "could not parse '%s'" msgstr "impossible d'analyser '%s'" -#: builtin/rebase.c:2053 +#: builtin/rebase.c:2076 #, c-format msgid "could not switch to %s" msgstr "Impossible de basculer vers %s" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:2087 msgid "HEAD is up to date." msgstr "HEAD est à jour." -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2089 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La branche courante %s est à jour.\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2097 msgid "HEAD is up to date, rebase forced." msgstr "HEAD est à jour, rebasage forcé." -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2099 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "La branche courante %s est à jour, rebasage forcé.\n" -#: builtin/rebase.c:2084 +#: builtin/rebase.c:2107 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2114 #, c-format msgid "Changes to %s:\n" msgstr "Changements vers %s :\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2117 #, c-format msgid "Changes from %s to %s:\n" msgstr "Changements de %s sur %s :\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2142 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Rembobinage préalable de head pour pouvoir rejouer votre travail par-" "dessus...\n" -#: builtin/rebase.c:2128 +#: builtin/rebase.c:2151 msgid "Could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2160 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rapide de %s sur %s.\n" @@ -17996,7 +18066,7 @@ msgstr "Avance rapide de %s sur %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <répertoire-git>" -#: builtin/receive-pack.c:832 +#: 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" @@ -18026,7 +18096,7 @@ msgstr "" "Pour éliminer ce message et conserver le comportement par défaut,\n" "réglez « receive.denyCurrentBranch » à 'refuse'." -#: builtin/receive-pack.c:852 +#: 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" @@ -18046,11 +18116,11 @@ msgstr "" "\n" "Pour éliminer ce message, réglez-le à 'refuse'." -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:1936 msgid "quiet" msgstr "quiet" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:1950 msgid "You must specify a directory." msgstr "Vous devez spécifier un répertoire." @@ -18632,11 +18702,11 @@ msgstr "être verbeux : doit être placé avant une sous-commande" msgid "Unknown subcommand: %s" msgstr "Sous-commande inconnue : %s" -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "git repack [<options>]" msgstr "git repack [<options>]" -#: builtin/repack.c:27 +#: builtin/repack.c:28 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -18645,117 +18715,117 @@ msgstr "" "Utilisez\n" "--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps." -#: builtin/repack.c:190 +#: builtin/repack.c:191 msgid "could not start pack-objects to repack promisor objects" msgstr "" "ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur" -#: builtin/repack.c:229 builtin/repack.c:408 +#: builtin/repack.c:230 builtin/repack.c:409 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack : attente de lignes d'Id d'objets en hexa complet seulement depuis " "les objects de paquet." -#: builtin/repack.c:246 +#: builtin/repack.c:247 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "impossible de terminer pack-objects pour ré-empaqueter les objets de " "prometteur" -#: builtin/repack.c:284 +#: builtin/repack.c:285 msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" -#: builtin/repack.c:286 +#: builtin/repack.c:287 msgid "same as -a, and turn unreachable objects loose" msgstr "identique à -a et transformer les objets inaccessibles en suspens" -#: builtin/repack.c:289 +#: builtin/repack.c:290 msgid "remove redundant packs, and run git-prune-packed" msgstr "supprimer les paquets redondants et lancer git-prune-packed" -#: builtin/repack.c:291 +#: builtin/repack.c:292 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passer --no-reuse-delta à git-pack-objects" -#: builtin/repack.c:293 +#: builtin/repack.c:294 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passer --no-reuse-object à git-pack-objects" -#: builtin/repack.c:295 +#: builtin/repack.c:296 msgid "do not run git-update-server-info" msgstr "ne pas lancer git update-server-info" -#: builtin/repack.c:298 +#: builtin/repack.c:299 msgid "pass --local to git-pack-objects" msgstr "passer --local à git-pack-objects" -#: builtin/repack.c:300 +#: builtin/repack.c:301 msgid "write bitmap index" msgstr "écrire un index en bitmap" -#: builtin/repack.c:302 +#: builtin/repack.c:303 msgid "pass --delta-islands to git-pack-objects" msgstr "passer --delta-islands à git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:304 msgid "approxidate" msgstr "date approximative" -#: builtin/repack.c:304 +#: 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:306 +#: builtin/repack.c:307 msgid "with -a, repack unreachable objects" msgstr "avec -a, repaquétiser les objets inaccessibles" -#: builtin/repack.c:308 +#: 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:309 builtin/repack.c:315 +#: builtin/repack.c:310 builtin/repack.c:316 msgid "bytes" msgstr "octets" -#: builtin/repack.c:310 +#: 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:312 +#: builtin/repack.c:313 msgid "limits the maximum delta depth" msgstr "limite la profondeur maximale des deltas" -#: builtin/repack.c:314 +#: builtin/repack.c:315 msgid "limits the maximum number of threads" msgstr "limite le nombre maximal de fils" -#: builtin/repack.c:316 +#: builtin/repack.c:317 msgid "maximum size of each packfile" msgstr "taille maximum de chaque fichier paquet" -#: builtin/repack.c:318 +#: 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:320 +#: builtin/repack.c:321 msgid "do not repack this pack" msgstr "ne pas rempaqueter ce paquet" -#: builtin/repack.c:330 +#: 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:334 +#: builtin/repack.c:335 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable et -A sont incompatibles" -#: builtin/repack.c:417 +#: builtin/repack.c:418 msgid "Nothing new to pack." msgstr "Rien de neuf à empaqueter." -#: builtin/repack.c:478 +#: builtin/repack.c:479 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18774,7 +18844,7 @@ msgstr "" "ALERTE : aussi échoué.\n" "ALERTE : Veuillez les renommer manuellement dans %s :\n" -#: builtin/repack.c:526 +#: builtin/repack.c:527 #, c-format msgid "failed to remove '%s'" msgstr "échec de la suppression de '%s'" @@ -18882,8 +18952,8 @@ msgstr "fstat de %s impossible" msgid "unable to write object to database" msgstr "impossible d'écrire l'objet dans la base de données" -#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423 +#: builtin/replace.c:453 #, c-format msgid "not a valid object name: '%s'" msgstr "nom d'objet invalide : '%s'" @@ -18902,22 +18972,22 @@ msgstr "échec de l'édition du fichier d'objet" msgid "new object is the same as the old one: '%s'" msgstr "le nouvel objet est identique à l'ancien : '%s'" -#: builtin/replace.c:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "impossible d'analyser %s comme commit" -#: builtin/replace.c:414 +#: builtin/replace.c:415 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mauvaise étiquette de fusion dans le commit '%s'" -#: builtin/replace.c:416 +#: builtin/replace.c:417 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "étiquette de fusion malformée dans le commit '%s'" -#: builtin/replace.c:428 +#: builtin/replace.c:429 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -18926,31 +18996,31 @@ msgstr "" "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; " "utilisez --edit au lieu de --graft" -#: builtin/replace.c:467 +#: builtin/replace.c:468 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "le commit original '%s' contient une signature GPG" -#: builtin/replace.c:468 +#: builtin/replace.c:469 msgid "the signature will be removed in the replacement commit!" msgstr "la signature sera éliminée dans la validation de remplacement !" -#: builtin/replace.c:478 +#: builtin/replace.c:479 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Impossible d'écrire le commit de remplacement pour '%s'" -#: builtin/replace.c:486 +#: builtin/replace.c:487 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft pour '%s' non nécessaire" -#: builtin/replace.c:490 +#: builtin/replace.c:491 #, 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:525 +#: builtin/replace.c:526 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -18959,71 +19029,71 @@ msgstr "" "impossible de convertir la(les) greffe(s) suivante(s) :\n" "%s" -#: builtin/replace.c:546 +#: builtin/replace.c:547 msgid "list replace refs" msgstr "afficher les références de remplacement" -#: builtin/replace.c:547 +#: builtin/replace.c:548 msgid "delete replace refs" msgstr "supprimer les références de remplacement" -#: builtin/replace.c:548 +#: builtin/replace.c:549 msgid "edit existing object" msgstr "éditer l'objet existant" -#: builtin/replace.c:549 +#: builtin/replace.c:550 msgid "change a commit's parents" msgstr "Modifier les parents d'un commit" -#: builtin/replace.c:550 +#: builtin/replace.c:551 msgid "convert existing graft file" msgstr "convertir le fichier de greffe existant" -#: builtin/replace.c:551 +#: builtin/replace.c:552 msgid "replace the ref if it exists" msgstr "remplacer la référence si elle existe" -#: builtin/replace.c:553 +#: builtin/replace.c:554 msgid "do not pretty-print contents for --edit" msgstr "afficher sans mise en forme pour --edit" -#: builtin/replace.c:554 +#: builtin/replace.c:555 msgid "use this format" msgstr "utiliser ce format" -#: builtin/replace.c:567 +#: builtin/replace.c:568 msgid "--format cannot be used when not listing" msgstr "--format ne peut pas être utilisé sans lister" -#: builtin/replace.c:575 +#: builtin/replace.c:576 msgid "-f only makes sense when writing a replacement" msgstr "-f n'a de sens qu'en écrivant un remplacement" -#: builtin/replace.c:579 +#: builtin/replace.c:580 msgid "--raw only makes sense with --edit" msgstr "--raw n'a de sens qu'avec l'option --edit" -#: builtin/replace.c:585 +#: builtin/replace.c:586 msgid "-d needs at least one argument" msgstr "-d requiert au moins un argument" -#: builtin/replace.c:591 +#: builtin/replace.c:592 msgid "bad number of arguments" msgstr "mauvais nombre d'arguments" -#: builtin/replace.c:597 +#: builtin/replace.c:598 msgid "-e needs exactly one argument" msgstr "-e requiert un seul argument" -#: builtin/replace.c:603 +#: builtin/replace.c:604 msgid "-g needs at least one argument" msgstr "-g requiert au moins un argument" -#: builtin/replace.c:609 +#: builtin/replace.c:610 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file ne supporte aucun argument" -#: builtin/replace.c:615 +#: builtin/replace.c:616 msgid "only one pattern can be given with -l" msgstr "-l n'accepte qu'un motifs" @@ -19092,13 +19162,18 @@ msgstr "Impossible de trouver l'arbre pour HEAD." msgid "Failed to find tree of %s." msgstr "Impossible de trouver l'arbre pour %s." +#: builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD est maintenant à %s" + #: builtin/reset.c:193 #, 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:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "être silencieux, afficher seulement les erreurs" @@ -19186,24 +19261,19 @@ msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'." msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:411 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "impossible de combiner --exclude-promisor-objects et --missing" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:472 msgid "object filtering requires --objects" msgstr "le filtrage d'objet exige --objects" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "valeur invalide de 'sparse' '%s'" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:522 msgid "rev-list does not support display of notes" msgstr "rev-list ne supporte l'affichage des notes" -#: builtin/rev-list.c:530 +#: builtin/rev-list.c:525 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet" @@ -19754,136 +19824,136 @@ msgstr "conflits dans l'index. Essayez sans --index." msgid "could not save index tree" msgstr "impossible de sauvegarder l'arbre d'index" -#: builtin/stash.c:434 +#: builtin/stash.c:436 msgid "could not restore untracked files from stash" msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage" -#: builtin/stash.c:448 +#: builtin/stash.c:450 #, c-format msgid "Merging %s with %s" msgstr "Fusion de %s avec %s" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:460 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "L'index n'a pas été sorti de remise." -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "tentative de recréer l'index" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "%s supprimé (%s)" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s : Impossible de supprimer l'élément de stash" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' n'est pas une référence de remisage" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "" "L'entrée de remisage est conservée au cas où vous en auriez encore besoin." -#: builtin/stash.c:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:796 builtin/stash.c:833 #, c-format msgid "Cannot update %s with %s" msgstr "Impossible de mettre à jour %s avec %s" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506 msgid "stash message" msgstr "message pour le remisage" -#: builtin/stash.c:818 +#: builtin/stash.c:824 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" exige un argument <commit>" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1046 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Aucun changement sélectionné" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1145 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Vous n'avez pas encore la validation initiale" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1172 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "Impossible de sauver l'état courant de l'index" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1181 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "Impossible de sauver les fichiers non-suivis" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200 #: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "Impossible de sauver l'état courant de la copie de travail" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1229 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'état de la copie de travail" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1278 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Impossible d'utiliser --patch et --include-untracked ou --all en même temps" -#: builtin/stash.c:1285 +#: builtin/stash.c:1294 msgid "Did you forget to 'git add'?" msgstr "Vous avez sûrement oublié 'git add' ?" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1309 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "Pas de modifications locales à sauver" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1316 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1331 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "Impossible de sauver l'état courant" -#: builtin/stash.c:1327 +#: builtin/stash.c:1336 #, c-format msgid "Saved working directory and index state %s" msgstr "Arbre de travail et état de l'index sauvegardés dans %s" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1426 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1461 builtin/stash.c:1497 msgid "keep index" msgstr "conserver l'index" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1463 builtin/stash.c:1499 msgid "stash in patch mode" msgstr "remiser une mode rustine" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1464 builtin/stash.c:1500 msgid "quiet mode" msgstr "mode silencieux" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1466 builtin/stash.c:1502 msgid "include untracked files in stash" msgstr "inclure les fichiers non suivis dans la remise" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1468 builtin/stash.c:1504 msgid "include ignore files" msgstr "inclure les fichiers ignorés" -#: builtin/stash.c:1555 +#: builtin/stash.c:1564 #, c-format msgid "could not exec %s" msgstr "impossible d'exécuter %s" @@ -20267,8 +20337,8 @@ msgid "don't print cloning progress" msgstr "ne pas afficher la progression du clonage" #: builtin/submodule--helper.c:1877 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]" +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]" #: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" @@ -20322,7 +20392,7 @@ msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail" -#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:433 git.c:683 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ne gère pas --super-prefix" @@ -20655,144 +20725,144 @@ msgstr " OK" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<options>] [--] [<fichier>...]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:972 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:974 +#: builtin/update-index.c:975 msgid "refresh: ignore submodules" msgstr "rafraîchir : ignorer les sous-modules" -#: builtin/update-index.c:977 +#: builtin/update-index.c:978 msgid "do not ignore new files" msgstr "ne pas ignorer les nouveaux fichiers" -#: builtin/update-index.c:979 +#: builtin/update-index.c:980 msgid "let files replace directories and vice-versa" msgstr "laisser les fichiers remplacer des répertoires et vice-versa" -#: builtin/update-index.c:981 +#: builtin/update-index.c:982 msgid "notice files missing from worktree" msgstr "aviser des fichiers manquants dans la copie de travail" -#: builtin/update-index.c:983 +#: builtin/update-index.c:984 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:986 +#: builtin/update-index.c:987 msgid "refresh stat information" msgstr "rafraîchir l'information de stat" -#: builtin/update-index.c:990 +#: builtin/update-index.c:991 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "comme --refresh, mais en ignorant l'option assume-unchanged" -#: builtin/update-index.c:994 +#: builtin/update-index.c:995 msgid "<mode>,<object>,<path>" msgstr "<mode>, <objet>, <chemin>" -#: builtin/update-index.c:995 +#: builtin/update-index.c:996 msgid "add the specified entry to the index" msgstr "ajouter l'élément spécifié dans l'index" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1006 msgid "mark files as \"not changing\"" msgstr "marquer les fichiers comme \"non changeants\"" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1009 msgid "clear assumed-unchanged bit" msgstr "mettre à zéro le bit supposé-non-modifié" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1012 msgid "mark files as \"index-only\"" msgstr "marquer les fichiers comme \"index seulement\"" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1015 msgid "clear skip-worktree bit" msgstr "mettre à zéro le bit sauter-la-copie-de travail" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1018 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:1019 +#: builtin/update-index.c:1020 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:1021 +#: builtin/update-index.c:1022 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:1023 +#: builtin/update-index.c:1024 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:1027 +#: builtin/update-index.c:1028 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:1031 +#: builtin/update-index.c:1032 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:1035 +#: builtin/update-index.c:1036 msgid "only update entries that differ from HEAD" msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1040 msgid "ignore files missing from worktree" msgstr "ignorer les fichiers manquants dans la copie de travail" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1043 msgid "report actions to standard output" msgstr "afficher les actions sur la sortie standard" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1045 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1049 msgid "write index in this format" msgstr "écrire l'index dans ce format" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1051 msgid "enable or disable split index" msgstr "activer ou désactiver l'index divisé" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1053 msgid "enable/disable untracked cache" msgstr "activer ou désactiver le cache de non-suivis" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1055 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:1056 +#: builtin/update-index.c:1057 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:1058 +#: builtin/update-index.c:1059 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:1060 +#: builtin/update-index.c:1061 msgid "enable or disable file system monitor" msgstr "" "activer ou désactiver la surveillance du système de fichier (fsmonitor)" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1063 msgid "mark files as fsmonitor valid" msgstr "marquer les fichiers comme valides pour fsmonitor" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1066 msgid "clear fsmonitor valid bit" msgstr "effacer le bit de validité fsmonitor" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1169 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -20800,7 +20870,7 @@ msgstr "" "core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous " "souhaitez vraiment activer l'index coupé" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1178 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -20808,7 +20878,7 @@ 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:1188 +#: builtin/update-index.c:1190 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -20816,11 +20886,11 @@ 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:1192 +#: builtin/update-index.c:1194 msgid "Untracked cache disabled" msgstr "Le cache non suivi est désactivé" -#: builtin/update-index.c:1200 +#: builtin/update-index.c:1202 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -20828,29 +20898,29 @@ 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:1204 +#: builtin/update-index.c:1206 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Le cache non suivi est activé pour '%s'" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1214 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:1216 +#: builtin/update-index.c:1218 msgid "fsmonitor enabled" msgstr "fsmonitor activé" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1221 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:1223 +#: builtin/update-index.c:1225 msgid "fsmonitor disabled" msgstr "fsmonitor désactivé" @@ -20946,56 +21016,56 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..." msgid "print tag contents" msgstr "afficher le contenu de l'étiquette" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<options>] <chemin> [<commit>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<options>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<options>] <chemin>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<options>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<options>] <arbre-de-travail>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <chemin>" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:898 #, c-format msgid "failed to delete '%s'" msgstr "échec de la suppression de '%s'" -#: builtin/worktree.c:80 +#: builtin/worktree.c:79 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Suppression de worktrees/%s : répertoire invalide" -#: builtin/worktree.c:86 +#: builtin/worktree.c:85 #, 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:91 builtin/worktree.c:100 +#: builtin/worktree.c:90 builtin/worktree.c:99 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Suppression de worktrees/%s : échec de la lecture du fichier gitdir (%s)" -#: builtin/worktree.c:110 +#: builtin/worktree.c:109 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -21004,37 +21074,37 @@ msgstr "" "Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets " "attendus, %<PRIuMAX> octets lus)" -#: builtin/worktree.c:118 +#: builtin/worktree.c:117 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Suppression de worktrees/%s : fichier gitdir invalide" -#: builtin/worktree.c:127 +#: builtin/worktree.c:126 #, 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:166 +#: builtin/worktree.c:165 msgid "report pruned working trees" msgstr "afficher les arbres de travail éliminés" -#: builtin/worktree.c:168 +#: builtin/worktree.c:167 msgid "expire working trees older than <time>" msgstr "faire expirer les arbres de travail plus vieux que <temps>" -#: builtin/worktree.c:235 +#: builtin/worktree.c:234 #, c-format msgid "'%s' already exists" msgstr "'%s' existe déjà" -#: builtin/worktree.c:252 +#: builtin/worktree.c:251 #, c-format msgid "unable to re-add worktree '%s'" msgstr "impossible de ré-ajouter l'arbre de travail '%s'" -#: builtin/worktree.c:257 +#: builtin/worktree.c:256 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -21044,7 +21114,7 @@ msgstr "" "utilisez 'add -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' " "pour corriger" -#: builtin/worktree.c:259 +#: builtin/worktree.c:258 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -21053,129 +21123,129 @@ msgstr "" "'%s' est un arbre de travail manquant mais déjà enregistré ;\n" "utilisez 'add -f' pour passer outre, ou 'prune' ou 'remove' pour corriger" -#: builtin/worktree.c:309 +#: builtin/worktree.c:308 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:439 builtin/worktree.c:445 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')" -#: builtin/worktree.c:442 +#: builtin/worktree.c:441 #, 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:451 +#: builtin/worktree.c:450 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Préparation de l'arbre de travail (extraction de '%s')" -#: builtin/worktree.c:457 +#: builtin/worktree.c:456 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Préparation de l'arbre de travail (HEAD détachée %s)" -#: builtin/worktree.c:498 +#: builtin/worktree.c:497 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:501 +#: builtin/worktree.c:500 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:503 +#: builtin/worktree.c:502 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:505 +#: builtin/worktree.c:504 msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" -#: builtin/worktree.c:506 +#: builtin/worktree.c:505 msgid "keep the new working tree locked" msgstr "conserver le verrou sur le nouvel arbre de travail" -#: builtin/worktree.c:509 +#: builtin/worktree.c:508 msgid "set up tracking mode (see git-branch(1))" msgstr "régler le mode de suivi (voir git-branch(1))" -#: builtin/worktree.c:512 +#: builtin/worktree.c:511 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:520 +#: builtin/worktree.c:519 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/worktree.c:581 +#: builtin/worktree.c:580 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:681 +#: builtin/worktree.c:680 msgid "reason for locking" msgstr "raison du verrouillage" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799 +#: builtin/worktree.c:926 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:694 builtin/worktree.c:727 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:700 +#: builtin/worktree.c:699 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:702 +#: builtin/worktree.c:701 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:730 +#: builtin/worktree.c:729 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" -#: builtin/worktree.c:771 +#: builtin/worktree.c:770 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:779 +#: builtin/worktree.c:778 msgid "force move even if worktree is dirty or locked" msgstr "" "forcer le déplacement même si l'arbre de travail est sale ou verrouillé" -#: builtin/worktree.c:802 builtin/worktree.c:929 +#: builtin/worktree.c:801 builtin/worktree.c:928 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' est un arbre de travail principal" -#: builtin/worktree.c:807 +#: builtin/worktree.c:806 #, 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:813 +#: builtin/worktree.c:812 #, c-format msgid "target '%s' already exists" msgstr "la cible '%s' existe déjà" -#: builtin/worktree.c:821 +#: builtin/worktree.c:820 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -21185,7 +21255,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:823 +#: builtin/worktree.c:822 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -21193,37 +21263,37 @@ msgstr "" "impossible de déplacer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:826 +#: builtin/worktree.c:825 #, 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:831 +#: builtin/worktree.c:830 #, c-format msgid "failed to move '%s' to '%s'" msgstr "échec au déplacement de '%s' vers '%s'" -#: builtin/worktree.c:879 +#: builtin/worktree.c:878 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "échec du lancement de 'git status' sur '%s'" -#: builtin/worktree.c:883 +#: builtin/worktree.c:882 #, c-format -msgid "'%s' is dirty, use --force to delete it" -msgstr "'%s' est sale, utilisez --force pour le supprimer" +msgid "'%s' contains modified or untracked files, use --force to delete it" +msgstr "'%s' contient des fichiers modifiés ou non-suivis, utilisez --force pour le supprimer" -#: builtin/worktree.c:888 +#: builtin/worktree.c:887 #, 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:911 +#: builtin/worktree.c:910 msgid "force removal even if worktree is dirty or locked" msgstr "" "forcer la suppression même si l'arbre de travail est sale ou verrouillé" -#: builtin/worktree.c:934 +#: builtin/worktree.c:933 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -21233,7 +21303,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:936 +#: builtin/worktree.c:935 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -21241,7 +21311,7 @@ msgstr "" "impossible de supprimer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:939 +#: builtin/worktree.c:938 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" @@ -21263,6 +21333,16 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le débogage" +#: fast-import.c:3118 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "commande 'mark' attendue, %s trouvé" + +#: fast-import.c:3123 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "commande 'to' attendue, %s trouvé" + #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -21375,39 +21455,39 @@ msgstr "" "l'alias '%s' modifie les variables d'environnement.\n" "Vous pouvez utiliser '!git' dans l'alias pour le faire" -#: git.c:377 +#: git.c:376 #, c-format msgid "empty alias for %s" msgstr "alias vide pour %s" -#: git.c:380 +#: git.c:379 #, c-format msgid "recursive alias: %s" msgstr "alias recursif : %s" -#: git.c:460 +#: git.c:459 msgid "write failure on standard output" msgstr "échec d'écriture sur la sortie standard" -#: git.c:462 +#: git.c:461 msgid "unknown write failure on standard output" msgstr "échec inconnu d'écriture sur la sortie standard" -#: git.c:464 +#: git.c:463 msgid "close failed on standard output" msgstr "échec de fermeture de la sortie standard" -#: git.c:793 +#: git.c:792 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "boucle d'alias détectée : l'expansion de '%s' ne finit jamais : %s" -#: git.c:843 +#: git.c:842 #, c-format msgid "cannot handle %s as a builtin" msgstr "impossible d'utiliser %s comme une fonction intégrée" -#: git.c:856 +#: git.c:855 #, c-format msgid "" "usage: %s\n" @@ -21416,13 +21496,13 @@ msgstr "" "usage : %s\n" "\n" -#: git.c:876 +#: git.c:875 #, 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:888 +#: git.c:887 #, c-format msgid "failed to run command '%s': %s\n" msgstr "échec au lancement de la commande '%s' : %s\n" @@ -21441,32 +21521,32 @@ msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0" 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" -#: http.c:876 +#: http.c:878 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REMOVE n'est pas supporté avec cuRL < 7.44.0" -#: http.c:949 +#: http.c:951 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Les restrictions de protocole ne sont pas supportés avec cuRL < 7.19.4" -#: http.c:1085 +#: http.c:1088 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Dorsale SSL '%s' non supportée. Dorsales SSL supportées :" -#: http.c:1092 +#: http.c:1095 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "Impossible de régler la dorsale SSL à '%s' : cURL a été construit sans " "dorsale SSL" -#: http.c:1096 +#: http.c:1099 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Impossible de spécifier le dorsal SSL à '%s' : déjà spécifié" -#: http.c:1965 +#: http.c:1968 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21562,7 +21642,7 @@ msgstr "impossible de récupérer par sha1 sur http intelligent" msgid "protocol error: expected sha/ref, got '%s'" msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1138 remote-curl.c:1250 #, c-format msgid "http transport does not support %s" msgstr "le transport http ne supporte pas %s" @@ -21571,36 +21651,36 @@ msgstr "le transport http ne supporte pas %s" msgid "git-http-push failed" msgstr "échec de git-http-push" -#: remote-curl.c:1360 +#: remote-curl.c:1356 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: usage: git remote-curl <distant> [<url>]" -#: remote-curl.c:1392 +#: remote-curl.c:1388 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl : erreur de lecture du flux de commande depuis git" -#: remote-curl.c:1399 +#: remote-curl.c:1395 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl : récupération tentée sans dépôt local" -#: remote-curl.c:1439 +#: remote-curl.c:1435 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl : commande inconnue '%s' depuis git" -#: list-objects-filter-options.h:61 +#: list-objects-filter-options.h:85 msgid "args" msgstr "args" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:86 msgid "object filtering" msgstr "filtrage d'objet" -#: parse-options.h:170 +#: parse-options.h:179 msgid "expiry-date" msgstr "date-d'expiration" -#: parse-options.h:184 +#: parse-options.h:193 msgid "no-op (backward compatibility)" msgstr "sans action (rétrocompatibilité)" |