diff options
author | Jiang Xin <worldhello.net@gmail.com> | 2018-09-06 09:17:55 +0800 |
---|---|---|
committer | Jiang Xin <worldhello.net@gmail.com> | 2018-09-06 09:17:55 +0800 |
commit | f1627fad4f479c6105d7384f76e3cea2962eef74 (patch) | |
tree | 2ddf79f3c1c602d9acfa2cfb520d169ce6cb1cf2 | |
parent | l10n: sv.po: Update Swedish translation (3958t0f0u) (diff) | |
parent | l10n: fr.po v2.19.0 rnd 2 (diff) | |
download | tgif-f1627fad4f479c6105d7384f76e3cea2962eef74.tar.xz |
Merge branch 'fr_2.19.0_rnd1' of git://github.com/jnavila/git
* 'fr_2.19.0_rnd1' of git://github.com/jnavila/git:
l10n: fr.po v2.19.0 rnd 2
l10n: fr.po v2.19.0 rnd 1
l10n: fr: fix a message seen in git bisect
-rw-r--r-- | po/fr.po | 7374 |
1 files changed, 4588 insertions, 2786 deletions
@@ -74,8 +74,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2018-06-16 22:06+0800\n" -"PO-Revision-Date: 2018-06-16 20:42+0200\n" +"POT-Creation-Date: 2018-09-04 08:50+0800\n" +"PO-Revision-Date: 2018-09-05 22:18+0200\n" "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -84,37 +84,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" -#: advice.c:92 +#: advice.c:97 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sastuce: %.*s%s\n" -#: advice.c:137 +#: advice.c:150 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Impossible de picorer car vous avez des fichiers non fusionnés." -#: advice.c:139 +#: advice.c:152 msgid "Committing is not possible because you have unmerged files." msgstr "Impossible de valider car vous avez des fichiers non fusionnés." -#: advice.c:141 +#: advice.c:154 msgid "Merging is not possible because you have unmerged files." msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés." -#: advice.c:143 +#: advice.c:156 msgid "Pulling is not possible because you have unmerged files." msgstr "Impossible de tirer car vous avez des fichiers non fusionnés." -#: advice.c:145 +#: advice.c:158 msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés." -#: advice.c:147 +#: advice.c:160 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés." -#: advice.c:155 +#: advice.c:168 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -122,23 +122,23 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nécessaire pour marquer la résolution et valider." -#: advice.c:163 +#: advice.c:176 msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:168 builtin/merge.c:1250 +#: advice.c:181 builtin/merge.c:1286 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: advice.c:170 +#: advice.c:183 msgid "Please, commit your changes before merging." msgstr "Veuillez valider vos changements avant de fusionner." -#: advice.c:171 +#: advice.c:184 msgid "Exiting because of unfinished merge." msgstr "Abandon à cause d'une fusion non terminée." -#: advice.c:177 +#: advice.c:190 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -170,99 +170,99 @@ msgstr "" " git checkout -b <nom-de-la-nouvelle-branche>\n" "\n" -#: apply.c:58 +#: apply.c:59 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "option d'espace non reconnue '%s'" -#: apply.c:74 +#: apply.c:75 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "option d'ignorance d'espace non reconnue '%s'" -#: apply.c:122 +#: apply.c:125 msgid "--reject and --3way cannot be used together." msgstr "--reject et --3way ne peuvent pas être utilisés ensemble." -#: apply.c:124 +#: apply.c:127 msgid "--cached and --3way cannot be used together." msgstr "--cached et --3way ne peuvent pas être utilisés ensemble." -#: apply.c:127 +#: apply.c:130 msgid "--3way outside a repository" msgstr "--3way hors d'un dépôt" -#: apply.c:138 +#: apply.c:141 msgid "--index outside a repository" msgstr "--index hors d'un dépôt" -#: apply.c:141 +#: apply.c:144 msgid "--cached outside a repository" msgstr "--cached hors d'un dépôt" -#: apply.c:821 +#: apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Impossible de préparer la regexp d'horodatage %s" -#: apply.c:830 +#: apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec a retourné %d pour l'entrée : %s" -#: apply.c:904 +#: apply.c:909 #, c-format msgid "unable to find filename in patch at line %d" msgstr "nom de fichier du patch introuvable à la ligne %d" -#: apply.c:942 +#: apply.c:947 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " "ligne %d" -#: apply.c:948 +#: apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " "à la ligne %d" -#: apply.c:949 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " "à la ligne %d" -#: apply.c:954 +#: apply.c:959 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" -#: apply.c:983 +#: apply.c:988 #, c-format msgid "invalid mode on line %d: %s" msgstr "mode invalide dans la ligne %d : %s" -#: apply.c:1301 +#: apply.c:1306 #, c-format msgid "inconsistent header lines %d and %d" msgstr "lignes d'entête inconsistantes %d et %d" -#: apply.c:1473 +#: apply.c:1478 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" -#: apply.c:1542 +#: apply.c:1547 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" -#: apply.c:1562 +#: apply.c:1567 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -277,83 +277,83 @@ msgstr[1] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composants de préfixe de chemin (ligne %d)" -#: apply.c:1575 +#: apply.c:1580 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)" -#: apply.c:1763 +#: apply.c:1768 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: apply.c:1765 +#: apply.c:1770 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: apply.c:1799 +#: apply.c:1804 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: apply.c:1836 +#: apply.c:1841 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: apply.c:1838 +#: apply.c:1843 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: apply.c:1841 +#: apply.c:1846 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" -#: apply.c:1988 +#: apply.c:1993 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: apply.c:2025 +#: apply.c:2030 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: apply.c:2185 +#: apply.c:2190 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: apply.c:2271 +#: apply.c:2276 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: apply.c:2275 +#: apply.c:2280 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: apply.c:2934 +#: apply.c:2939 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: apply.c:3055 +#: apply.c:3060 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)." msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)." -#: apply.c:3067 +#: apply.c:3072 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d" -#: apply.c:3073 +#: apply.c:3078 #, c-format msgid "" "while searching for:\n" @@ -362,576 +362,630 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: apply.c:3095 +#: apply.c:3100 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: apply.c:3103 +#: apply.c:3108 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section " "inverse" -#: apply.c:3149 +#: apply.c:3154 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index" -#: apply.c:3159 +#: apply.c:3164 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" "le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel." -#: apply.c:3167 +#: apply.c:3172 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide" -#: apply.c:3185 +#: apply.c:3190 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue" -#: apply.c:3198 +#: apply.c:3203 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: apply.c:3204 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s " "trouvé)" -#: apply.c:3225 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: apply.c:3347 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278 +#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" -#: apply.c:3404 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" -#: apply.c:3433 apply.c:3673 +#: apply.c:3441 apply.c:3681 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: apply.c:3516 apply.c:3687 +#: apply.c:3524 apply.c:3696 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: apply.c:3525 apply.c:3695 +#: apply.c:3533 apply.c:3704 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: apply.c:3560 +#: apply.c:3568 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " "points." -#: apply.c:3563 +#: apply.c:3571 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retour à une fusion à 3 points…\n" -#: apply.c:3579 apply.c:3583 +#: apply.c:3587 apply.c:3591 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossible de lire le contenu actuel de '%s'" -#: apply.c:3595 +#: apply.c:3603 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Echec du retour à une fusion à 3 points…\n" -#: apply.c:3609 +#: apply.c:3617 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch %s appliqué avec des conflits.\n" -#: apply.c:3614 +#: apply.c:3622 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch %s appliqué proprement.\n" -#: apply.c:3640 +#: apply.c:3648 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: apply.c:3712 +#: apply.c:3721 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: apply.c:3714 +#: apply.c:3723 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: apply.c:3864 apply.c:3866 +#: apply.c:3874 apply.c:3876 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: apply.c:3922 +#: apply.c:3932 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: apply.c:3925 +#: apply.c:3935 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: apply.c:3945 +#: apply.c:3955 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" -#: apply.c:3950 +#: apply.c:3960 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" -#: apply.c:3970 +#: apply.c:3980 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique" -#: apply.c:3974 +#: apply.c:3984 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: apply.c:3989 +#: apply.c:3999 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: apply.c:4080 +#: apply.c:4091 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "l'information sha1 est manquante ou inutilisable pour le sous-module %s" -#: apply.c:4087 +#: apply.c:4098 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle" -#: apply.c:4090 +#: apply.c:4101 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "l'information de sha1 est manquante ou inutilisable (%s)." -#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 +#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" -#: apply.c:4099 +#: apply.c:4110 #, c-format msgid "could not add %s to temporary index" msgstr "impossible d'ajouter %s à l'index temporaire" -#: apply.c:4109 +#: apply.c:4120 #, c-format msgid "could not write temporary index to %s" msgstr "impossible d'écrire l'index temporaire dans %s" -#: apply.c:4247 +#: apply.c:4258 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: apply.c:4282 +#: apply.c:4292 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: apply.c:4288 +#: apply.c:4298 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: apply.c:4296 +#: apply.c:4306 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "création du magasin de stockage pour le fichier nouvellement créé %s " "impossible" -#: apply.c:4302 apply.c:4446 +#: apply.c:4312 apply.c:4457 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4343 +#: apply.c:4355 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" -#: apply.c:4347 +#: apply.c:4359 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: apply.c:4417 +#: apply.c:4429 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: apply.c:4515 +#: apply.c:4527 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: apply.c:4523 +#: apply.c:4535 msgid "internal error" msgstr "erreur interne" -#: apply.c:4526 +#: apply.c:4538 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." -#: apply.c:4537 +#: apply.c:4549 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036 +#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" -#: apply.c:4559 +#: apply.c:4571 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: apply.c:4563 +#: apply.c:4575 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: apply.c:4673 +#: apply.c:4685 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traité." -#: apply.c:4681 +#: apply.c:4693 msgid "unrecognized input" msgstr "entrée non reconnue" -#: apply.c:4700 +#: apply.c:4712 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: apply.c:4837 +#: apply.c:4849 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s' :%s" -#: apply.c:4864 +#: apply.c:4876 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erreur d'espace ignorée" msgstr[1] "%d erreurs d'espace ignorées" -#: apply.c:4870 apply.c:4885 +#: apply.c:4882 apply.c:4897 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ligne a ajouté des erreurs d'espace." msgstr[1] "%d lignes ont ajouté des erreurs d'espace." -#: apply.c:4878 +#: apply.c:4890 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace." msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace." -#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389 +#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 -#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198 -#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210 -#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584 -#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807 -#: git-add--interactive.perl:197 +#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257 +#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260 +#: builtin/pull.c:198 builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 +#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197 msgid "path" msgstr "chemin" -#: apply.c:4922 +#: apply.c:4934 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4925 +#: apply.c:4937 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4927 builtin/am.c:2263 +#: apply.c:4939 builtin/am.c:2263 msgid "num" msgstr "num" -#: apply.c:4928 +#: apply.c:4940 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: apply.c:4931 +#: apply.c:4943 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: apply.c:4933 +#: apply.c:4945 msgid "instead of applying the patch, output diffstat for the input" msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" -#: apply.c:4937 +#: apply.c:4949 msgid "show number of added and deleted lines in decimal notation" msgstr "" "afficher le nombre de lignes ajoutées et supprimées en notation décimale" -#: apply.c:4939 +#: apply.c:4951 msgid "instead of applying the patch, output a summary for the input" msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée" -#: apply.c:4941 +#: apply.c:4953 msgid "instead of applying the patch, see if the patch is applicable" msgstr "au lieu d'appliquer le patch, voir si le patch est applicable" -#: apply.c:4943 +#: apply.c:4955 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" -#: apply.c:4945 +#: apply.c:4957 +msgid "mark new files with `git add --intent-to-add`" +msgstr "marquer les nouveaux fichiers `git add --intent-to-add`" + +#: apply.c:4959 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: apply.c:4947 +#: apply.c:4961 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: apply.c:4950 +#: apply.c:4964 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" -#: apply.c:4952 +#: apply.c:4966 msgid "attempt three-way merge if a patch does not apply" msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement" -#: apply.c:4954 +#: apply.c:4968 msgid "build a temporary index based on embedded index information" msgstr "" "construire un index temporaire fondé sur l'information de l'index embarqué" -#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 +#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: apply.c:4959 +#: apply.c:4973 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 +#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 -#: builtin/pack-objects.c:3177 +#: builtin/pack-objects.c:3202 msgid "action" msgstr "action" -#: apply.c:4961 +#: apply.c:4975 msgid "detect new or modified lines that have whitespace errors" msgstr "" "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs " "d'espace" -#: apply.c:4964 apply.c:4967 +#: apply.c:4978 apply.c:4981 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: apply.c:4970 +#: apply.c:4984 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: apply.c:4972 +#: apply.c:4986 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: apply.c:4974 +#: apply.c:4988 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: apply.c:4976 +#: apply.c:4990 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666 -#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124 +#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671 +#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124 msgid "be verbose" msgstr "mode verbeux" -#: apply.c:4979 +#: apply.c:4993 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolérer des erreurs de détection de retours chariot manquants en fin de " "fichier" -#: apply.c:4982 +#: apply.c:4996 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au compte de lignes dans les en-têtes de section" -#: apply.c:4984 builtin/am.c:2251 +#: apply.c:4998 builtin/am.c:2251 msgid "root" msgstr "racine" -#: apply.c:4985 +#: apply.c:4999 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" -#: archive.c:13 +#: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]" -#: archive.c:14 +#: archive.c:15 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:15 +#: archive.c:16 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou " "apparenté> [<chemin>...]" -#: archive.c:16 +#: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 +#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" -#: archive.c:434 +#: archive.c:446 msgid "fmt" msgstr "fmt" -#: archive.c:434 +#: archive.c:446 msgid "archive format" msgstr "format d'archive" -#: archive.c:435 builtin/log.c:1462 +#: archive.c:447 builtin/log.c:1473 msgid "prefix" msgstr "préfixe" -#: archive.c:436 +#: archive.c:448 msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127 -#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869 -#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119 +#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873 +#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555 +#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119 #: parse-options.h:165 msgid "file" msgstr "fichier" -#: archive.c:438 builtin/archive.c:89 +#: archive.c:450 builtin/archive.c:89 msgid "write the archive to this file" msgstr "écrire l'archive dans ce fichier" -#: archive.c:440 +#: archive.c:452 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le répertoire de travail" -#: archive.c:441 +#: archive.c:453 msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" -#: archive.c:442 +#: archive.c:454 msgid "store only" msgstr "stockage seulement" -#: archive.c:443 +#: archive.c:455 msgid "compress faster" msgstr "compression rapide" -#: archive.c:451 +#: archive.c:463 msgid "compress better" msgstr "compression efficace" -#: archive.c:454 +#: archive.c:466 msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113 -#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593 +#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738 msgid "repo" msgstr "dépôt" -#: archive.c:457 builtin/archive.c:91 +#: archive.c:469 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "récupérer l'archive depuis le dépôt distant <dépôt>" -#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489 +#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714 +#: builtin/notes.c:491 msgid "command" msgstr "commande" -#: archive.c:459 builtin/archive.c:93 +#: archive.c:471 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" -#: archive.c:466 +#: archive.c:478 msgid "Unexpected option --remote" msgstr "Option --remote inattendue" -#: archive.c:468 +#: archive.c:480 msgid "Option --exec can only be used together with --remote" msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote" -#: archive.c:470 +#: archive.c:482 msgid "Unexpected option --output" msgstr "Option --output inattendue" -#: archive.c:492 +#: archive.c:504 #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'archive inconnu '%s'" -#: archive.c:499 +#: archive.c:511 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argument non supporté pour le format '%s' : -%d" +#: archive-tar.c:125 archive-zip.c:344 +#, c-format +msgid "cannot stream blob %s" +msgstr "impossible de transmettre le blob %s en flux" + +#: archive-tar.c:260 archive-zip.c:361 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "mode de fichier non supporté :0%o (SHA1: %s)" + +#: archive-tar.c:287 archive-zip.c:352 +#, c-format +msgid "cannot read %s" +msgstr "impossible de lire %s" + +#: archive-tar.c:458 +#, c-format +msgid "unable to start '%s' filter" +msgstr "impossible de démarrer le filtre '%s'" + +#: archive-tar.c:461 +msgid "unable to redirect descriptor" +msgstr "impossible de rediriger un descripteur" + +#: archive-tar.c:468 +#, c-format +msgid "'%s' filter reported error" +msgstr "le filtre '%s' a retourné une erreur" + +#: archive-zip.c:313 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "le chemin n'est pas codé en UTF-8 valide : %s" + +#: archive-zip.c:317 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s" + +#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219 +#, c-format +msgid "deflate error (%d)" +msgstr "erreur de compression (%d)" + +#: archive-zip.c:605 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>" + #: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" @@ -945,22 +999,22 @@ msgstr "" "Les motifs de négation sont ignorés dans les attributs git\n" "Utilisez '\\!' pour un point d'exclamation littéral." -#: bisect.c:461 +#: bisect.c:467 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Contenu mal cité dans le fichier '%s' : %s" -#: bisect.c:669 +#: bisect.c:675 #, c-format msgid "We cannot bisect more!\n" msgstr "Impossible de pousser la bissection plus loin !\n" -#: bisect.c:723 +#: bisect.c:729 #, c-format msgid "Not a valid commit name %s" msgstr "%s n'est pas un nom de commit valide" -#: bisect.c:747 +#: bisect.c:753 #, c-format msgid "" "The merge base %s is bad.\n" @@ -969,7 +1023,7 @@ msgstr "" "La base de fusion %s est mauvaise.\n" "Cela signifie que le bogue été corrigé entre %s et [%s].\n" -#: bisect.c:752 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is new.\n" @@ -978,7 +1032,7 @@ msgstr "" "La base de fusion %s est nouvelle.\n" "La propriété a changé entre %s et [%s].\n" -#: bisect.c:757 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is %s.\n" @@ -987,7 +1041,7 @@ msgstr "" "La base de fusion %s est %s.\n" "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n" -#: bisect.c:765 +#: bisect.c:771 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -998,7 +1052,7 @@ msgstr "" "git bisect ne peut pas fonctionner correctement dans ce cas.\n" "Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n" -#: bisect.c:778 +#: bisect.c:784 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1010,36 +1064,36 @@ msgstr "" "et %s.\n" "On continue tout de même." -#: bisect.c:811 +#: bisect.c:817 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bissection : une base de fusion doit être testée\n" -#: bisect.c:851 +#: bisect.c:857 #, c-format msgid "a %s revision is needed" msgstr "une révision %s est nécessaire" -#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236 +#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichie |