diff options
author | Jean-Noël Avila <jn.avila@free.fr> | 2019-05-17 19:55:39 +0200 |
---|---|---|
committer | Jean-Noël Avila <jn.avila@free.fr> | 2019-05-17 19:55:39 +0200 |
commit | 1d9f0b79a0f568c4d40703ff223b8ea80abcb086 (patch) | |
tree | cd993f720f023d8ef7813553141e8f3ca0a6eaf9 /po | |
parent | l10n: sv.po: Update Swedish translation (4577t0f0u) (diff) | |
download | tgif-1d9f0b79a0f568c4d40703ff223b8ea80abcb086.tar.xz |
l10n: fr.po v2.22.0.rnd1
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Diffstat (limited to 'po')
-rw-r--r-- | po/fr.po | 7063 |
1 files changed, 3998 insertions, 3065 deletions
@@ -1,7 +1,7 @@ # French translations for Git. -# Copyright (C) 2018 Jean-Noël Avila <jn.avila@free.fr> +# Copyright (C) 2019 Jean-Noël Avila <jn.avila@free.fr> # This file is distributed under the same license as the Git package. -# Jean-Noël Avila <jn.avila@free.fr>, 2018. +# Jean-Noël Avila <jn.avila@free.fr>, 2013-2019. # Sébastien Helleu <flashcode@flashtux.org>, 2013. # # French translations of common Git words used in this file: @@ -30,6 +30,7 @@ # to deflate | compresser # email | courriel # entry | élément +# fanout | dispersion # fast-forward | avance rapide # fast-forwarded | mis à jour en avance rapide # to fetch | rapatrier @@ -74,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-02-15 10:09+0800\n" -"PO-Revision-Date: 2019-02-15 22:18+0100\n" +"POT-Creation-Date: 2019-05-14 17:09+0800\n" +"PO-Revision-Date: 2019-05-17 19:53+0200\n" "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -84,37 +85,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" -#: advice.c:101 +#: advice.c:103 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sastuce: %.*s%s\n" -#: advice.c:154 +#: advice.c:156 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Impossible de picorer car vous avez des fichiers non fusionnés." -#: advice.c:156 +#: advice.c:158 msgid "Committing is not possible because you have unmerged files." msgstr "Impossible de valider car vous avez des fichiers non fusionnés." -#: advice.c:158 +#: advice.c:160 msgid "Merging is not possible because you have unmerged files." msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés." -#: advice.c:160 +#: advice.c:162 msgid "Pulling is not possible because you have unmerged files." msgstr "Impossible de tirer car vous avez des fichiers non fusionnés." -#: advice.c:162 +#: advice.c:164 msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés." -#: advice.c:164 +#: advice.c:166 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés." -#: advice.c:172 +#: advice.c:174 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -122,23 +123,23 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nécessaire pour marquer la résolution et valider." -#: advice.c:180 +#: advice.c:182 msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:185 builtin/merge.c:1290 +#: advice.c:187 builtin/merge.c:1320 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: advice.c:187 +#: advice.c:189 msgid "Please, commit your changes before merging." msgstr "Veuillez valider vos changements avant de fusionner." -#: advice.c:188 +#: advice.c:190 msgid "Exiting because of unfinished merge." msgstr "Abandon à cause d'une fusion non terminée." -#: advice.c:194 +#: advice.c:196 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -178,99 +179,99 @@ msgstr "cmdline se termine par \\" msgid "unclosed quote" msgstr "citation non fermée" -#: apply.c:59 +#: apply.c:63 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "option d'espace non reconnue '%s'" -#: apply.c:75 +#: apply.c:79 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "option d'ignorance d'espace non reconnue '%s'" -#: apply.c:125 +#: apply.c:129 msgid "--reject and --3way cannot be used together." msgstr "--reject et --3way ne peuvent pas être utilisés ensemble." -#: apply.c:127 +#: apply.c:131 msgid "--cached and --3way cannot be used together." msgstr "--cached et --3way ne peuvent pas être utilisés ensemble." -#: apply.c:130 +#: apply.c:134 msgid "--3way outside a repository" msgstr "--3way hors d'un dépôt" -#: apply.c:141 +#: apply.c:145 msgid "--index outside a repository" msgstr "--index hors d'un dépôt" -#: apply.c:144 +#: apply.c:148 msgid "--cached outside a repository" msgstr "--cached hors d'un dépôt" -#: apply.c:825 +#: apply.c:829 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Impossible de préparer la regexp d'horodatage %s" -#: apply.c:834 +#: apply.c:838 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec a retourné %d pour l'entrée : %s" -#: apply.c:908 +#: apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "nom de fichier du patch introuvable à la ligne %d" -#: apply.c:946 +#: apply.c:950 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " "ligne %d" -#: apply.c:952 +#: apply.c:956 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " "à la ligne %d" -#: apply.c:953 +#: apply.c:957 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " "à la ligne %d" -#: apply.c:958 +#: apply.c:962 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" -#: apply.c:987 +#: apply.c:991 #, c-format msgid "invalid mode on line %d: %s" msgstr "mode invalide dans la ligne %d : %s" -#: apply.c:1306 +#: apply.c:1310 #, c-format msgid "inconsistent header lines %d and %d" msgstr "lignes d'entête inconsistantes %d et %d" -#: apply.c:1478 +#: apply.c:1482 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" -#: apply.c:1547 +#: apply.c:1551 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" -#: apply.c:1567 +#: apply.c:1571 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -285,83 +286,83 @@ msgstr[1] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composants de préfixe de chemin (ligne %d)" -#: apply.c:1580 +#: apply.c:1584 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)" -#: apply.c:1768 +#: apply.c:1772 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: apply.c:1770 +#: apply.c:1774 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: apply.c:1804 +#: apply.c:1808 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: apply.c:1841 +#: apply.c:1845 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: apply.c:1843 +#: apply.c:1847 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: apply.c:1846 +#: apply.c:1850 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" -#: apply.c:1993 +#: apply.c:1997 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: apply.c:2030 +#: apply.c:2034 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: apply.c:2192 +#: apply.c:2196 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: apply.c:2278 +#: apply.c:2282 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: apply.c:2282 +#: apply.c:2286 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: apply.c:2941 +#: apply.c:2945 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: apply.c:3062 +#: apply.c:3066 #, 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:3074 +#: apply.c:3078 #, 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:3080 +#: apply.c:3084 #, c-format msgid "" "while searching for:\n" @@ -370,464 +371,463 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: apply.c:3102 +#: apply.c:3106 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: apply.c:3110 +#: apply.c:3114 #, 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:3157 +#: apply.c:3161 #, 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:3167 +#: apply.c:3171 #, 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:3175 +#: apply.c:3179 #, 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:3193 +#: apply.c:3197 #, 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:3206 +#: apply.c:3210 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: apply.c:3212 +#: apply.c:3216 #, 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:3233 +#: apply.c:3237 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: apply.c:3356 +#: apply.c:3360 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278 +#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" -#: apply.c:3416 +#: apply.c:3420 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" -#: apply.c:3445 apply.c:3688 +#: apply.c:3449 apply.c:3692 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: apply.c:3531 apply.c:3703 +#: apply.c:3535 apply.c:3707 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: apply.c:3540 apply.c:3711 +#: apply.c:3544 apply.c:3715 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: apply.c:3575 +#: apply.c:3579 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:3578 +#: apply.c:3582 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retour à une fusion à 3 points…\n" -#: apply.c:3594 apply.c:3598 +#: apply.c:3598 apply.c:3602 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossible de lire le contenu actuel de '%s'" -#: apply.c:3610 +#: apply.c:3614 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Echec du retour à une fusion à 3 points…\n" -#: apply.c:3624 +#: apply.c:3628 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch %s appliqué avec des conflits.\n" -#: apply.c:3629 +#: apply.c:3633 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch %s appliqué proprement.\n" -#: apply.c:3655 +#: apply.c:3659 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: apply.c:3728 +#: apply.c:3732 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: apply.c:3730 +#: apply.c:3734 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846 -#: read-cache.c:1299 +#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: apply.c:3939 +#: apply.c:3943 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: apply.c:3942 +#: apply.c:3946 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: apply.c:3962 +#: apply.c:3966 #, 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:3967 +#: apply.c:3971 #, 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:3987 +#: apply.c:3991 #, 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:3991 +#: apply.c:3995 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: apply.c:4006 +#: apply.c:4010 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: apply.c:4098 +#: apply.c:4102 #, 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:4105 +#: apply.c:4109 #, 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:4108 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "l'information de sha1 est manquante ou inutilisable (%s)." -#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143 +#: apply.c:4117 builtin/checkout.c:257 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:4117 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "impossible d'ajouter %s à l'index temporaire" -#: apply.c:4127 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "impossible d'écrire l'index temporaire dans %s" -#: apply.c:4265 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: apply.c:4299 +#: apply.c:4303 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: apply.c:4305 +#: apply.c:4309 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: apply.c:4313 +#: apply.c:4317 #, 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:4319 apply.c:4464 +#: apply.c:4323 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4362 +#: apply.c:4366 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" -#: apply.c:4366 +#: apply.c:4370 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: apply.c:4436 +#: apply.c:4440 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: apply.c:4534 +#: apply.c:4538 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: apply.c:4542 +#: apply.c:4546 msgid "internal error" msgstr "erreur interne" -#: apply.c:4545 +#: apply.c:4549 #, 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:4556 +#: apply.c:4560 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118 +#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" -#: apply.c:4578 +#: apply.c:4582 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: apply.c:4582 +#: apply.c:4586 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: apply.c:4692 +#: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traité." -#: apply.c:4700 +#: apply.c:4704 msgid "unrecognized input" msgstr "entrée non reconnue" -#: apply.c:4720 +#: apply.c:4724 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: apply.c:4875 +#: apply.c:4879 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s' :%s" -#: apply.c:4902 +#: apply.c:4906 #, 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:4908 apply.c:4923 +#: apply.c:4912 apply.c:4927 #, 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:4916 +#: apply.c:4920 #, 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:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4936 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:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263 -#: builtin/pull.c:200 builtin/submodule--helper.c:407 +#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213 +#: builtin/clone.c:123 builtin/fetch.c:118 builtin/merge.c:271 +#: builtin/pull.c:207 builtin/submodule--helper.c:407 #: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197 +#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852 +#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197 msgid "path" msgstr "chemin" -#: apply.c:4960 +#: apply.c:4964 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4963 +#: apply.c:4967 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4965 builtin/am.c:2212 +#: apply.c:4969 builtin/am.c:2219 msgid "num" msgstr "num" -#: apply.c:4966 +#: apply.c:4970 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: apply.c:4969 +#: apply.c:4973 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: apply.c:4971 +#: apply.c:4975 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:4975 +#: apply.c:4979 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:4977 +#: apply.c:4981 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:4979 +#: apply.c:4983 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:4981 +#: apply.c:4985 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:4983 +#: apply.c:4987 msgid "mark new files with `git add --intent-to-add`" msgstr "marquer les nouveaux fichiers `git add --intent-to-add`" -#: apply.c:4985 +#: apply.c:4989 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: apply.c:4987 +#: apply.c:4991 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: apply.c:4990 +#: apply.c:4994 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" -#: apply.c:4992 +#: apply.c:4996 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:4994 +#: apply.c:4998 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:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5001 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:4999 +#: apply.c:5003 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97 +#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 -#: builtin/pack-objects.c:3314 builtin/rebase.c:1065 +#: builtin/pack-objects.c:3317 builtin/rebase.c:1415 msgid "action" msgstr "action" -#: apply.c:5001 +#: apply.c:5005 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:5004 apply.c:5007 +#: apply.c:5008 apply.c:5011 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: apply.c:5010 +#: apply.c:5014 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: apply.c:5012 +#: apply.c:5016 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: apply.c:5014 +#: apply.c:5018 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: apply.c:5016 +#: apply.c:5020 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724 -#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128 -#: builtin/rebase--interactive.c:159 +#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "mode verbeux" -#: apply.c:5019 +#: apply.c:5023 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:5022 +#: apply.c:5026 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:5024 builtin/am.c:2200 +#: apply.c:5028 builtin/am.c:2207 msgid "root" msgstr "racine" -#: apply.c:5025 +#: apply.c:5029 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" @@ -850,7 +850,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" @@ -882,7 +882,7 @@ msgstr "fmt" msgid "archive format" msgstr "format d'archive" -#: archive.c:456 builtin/log.c:1549 +#: archive.c:456 builtin/log.c:1557 msgid "prefix" msgstr "préfixe" @@ -890,11 +890,11 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129 -#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895 -#: 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:162 +#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091 +#: builtin/fast-export.c:1093 builtin/grep.c:895 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:176 msgid "file" msgstr "fichier" @@ -926,8 +926,8 @@ msgstr "compression efficace" msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859 +#: archive.c:477 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858 msgid "repo" msgstr "dépôt" @@ -935,7 +935,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:479 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:713 #: builtin/notes.c:498 msgid "command" msgstr "commande" @@ -981,16 +981,16 @@ msgstr "mode de fichier non supporté :0%o (SHA1: %s)" msgid "cannot read %s" msgstr "impossible de lire %s" -#: archive-tar.c:458 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "impossible de démarrer le filtre '%s'" -#: archive-tar.c:461 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "impossible de rediriger un descripteur" -#: archive-tar.c:468 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "le filtre '%s' a retourné une erreur" @@ -1005,7 +1005,7 @@ msgstr "le chemin n'est pas codé en UTF-8 valide : %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s" -#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228 +#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" @@ -1108,26 +1108,26 @@ msgstr "Bissection : une base de fusion doit être testée\n" msgid "a %s revision is needed" msgstr "une révision %s est nécessaire" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" -#: bisect.c:937 builtin/merge.c:139 +#: bisect.c:928 builtin/merge.c:146 #, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" -#: bisect.c:967 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "impossible de lire les références de bissection" -#: bisect.c:986 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s était à la fois %s et %s\n" -#: bisect.c:994 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -1136,7 +1136,7 @@ msgstr "" "Aucun commit testable n'a été trouvé\n" "Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n" -#: bisect.c:1013 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1146,53 +1146,53 @@ msgstr[1] "(à peu près %d étapes)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1019 +#: bisect.c:1010 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bissection : %d révision à tester après ceci %s\n" msgstr[1] "Bissection : %d révisions à tester après ceci %s\n" -#: blame.c:1792 +#: blame.c:1794 msgid "--contents and --reverse do not blend well." msgstr "--contents et --reverse ne font pas bon ménage." -#: blame.c:1806 +#: blame.c:1808 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:1827 +#: blame.c:1829 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:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993 -#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936 -#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407 -#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152 +#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030 +#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940 +#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 builtin/merge.c:415 +#: builtin/pack-objects.c:3140 builtin/pack-objects.c:3155 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" -#: blame.c:1854 +#: blame.c:1856 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:1865 +#: blame.c:1867 #, c-format msgid "no such path %s in %s" msgstr "pas de chemin %s dans %s" -#: blame.c:1876 +#: blame.c:1878 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossible de lire le blob %s pour le chemin %s" -#: branch.c:52 +#: branch.c:53 #, c-format msgid "" "\n" @@ -1205,97 +1205,97 @@ msgstr "" "l'information de suivi distant en invoquant\n" "\"git branch --setup-upstream-to=%s%s%s\"." -#: branch.c:66 +#: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "La branche %s ne peut pas être sa propre branche amont." -#: branch.c:92 +#: branch.c:93 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" "La branche '%s' est paramétrée pour suivre la branche distante '%s' de '%s' " "en rebasant." -#: branch.c:93 +#: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "" "La branche '%s' est paramétrée pour suivre la branche distante '%s' depuis " "'%s'." -#: branch.c:97 +#: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "" "La branche '%s' est paramétrée pour suivre la branche locale '%'s en " "rebasant." -#: branch.c:98 +#: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'." -#: branch.c:103 +#: branch.c:104 #, c-format |