diff options
author | Jiang Xin <worldhello.net@gmail.com> | 2020-01-04 08:46:36 +0800 |
---|---|---|
committer | Jiang Xin <worldhello.net@gmail.com> | 2020-01-04 08:46:36 +0800 |
commit | 3a05aacddd8e3d65ba7988dc6e4f8a88bc4e3320 (patch) | |
tree | 9d4365d90cbdf4d38f41b95b9f85371305c03438 | |
parent | l10n: vi(4800t): Updated Vietnamese translation v2.25.0 (diff) | |
parent | l10n: fr.po v2.25.0 rnd 1 (diff) | |
download | tgif-3a05aacddd8e3d65ba7988dc6e4f8a88bc4e3320.tar.xz |
Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master
* 'fr_v2.25.0_rnd1' of github.com:jnavila/git:
l10n: fr.po v2.25.0 rnd 1
-rw-r--r-- | po/fr.po | 5071 |
1 files changed, 2800 insertions, 2271 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-10-28 13:19+0800\n" -"PO-Revision-Date: 2019-10-28 20:35+0100\n" +"POT-Creation-Date: 2019-12-30 08:48+0800\n" +"PO-Revision-Date: 2019-12-31 17:37+0100\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" @@ -86,37 +86,464 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" "X-Generator: Poedit 2.2.3\n" -#: advice.c:109 +#: add-interactive.c:347 +#, c-format +msgid "Huh (%s)?" +msgstr "Hein (%s) ?" + +#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216 +#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643 +#: builtin/rebase.c:2019 builtin/rebase.c:2063 +msgid "could not read index" +msgstr "impossible de lire l'index" + +#: add-interactive.c:555 git-add--interactive.perl:269 +#: git-add--interactive.perl:294 +msgid "binary" +msgstr "binaire" + +#: add-interactive.c:613 git-add--interactive.perl:278 +#: git-add--interactive.perl:332 +msgid "nothing" +msgstr "rien" + +#: add-interactive.c:614 git-add--interactive.perl:314 +#: git-add--interactive.perl:329 +msgid "unchanged" +msgstr "inchangé" + +#: add-interactive.c:651 git-add--interactive.perl:643 +msgid "Update" +msgstr "Mise à jour" + +#: add-interactive.c:668 add-interactive.c:856 +#, c-format +msgid "could not stage '%s'" +msgstr "impossible d'indexer '%s'" + +#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409 +#: builtin/rebase.c:895 +msgid "could not write index" +msgstr "impossible d'écrire l'index" + +#: add-interactive.c:677 git-add--interactive.perl:628 +#, c-format, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "%d chemin mis à jour\n" +msgstr[1] "%d chemins mis à jour\n" + +#: add-interactive.c:695 git-add--interactive.perl:678 +#, c-format, perl-format +msgid "note: %s is untracked now.\n" +msgstr "note : %s n'est plus suivi à présent.\n" + +#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281 +#: builtin/reset.c:144 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "échec de make_cache_entry pour le chemin '%s'" + +#: add-interactive.c:730 git-add--interactive.perl:655 +msgid "Revert" +msgstr "Inverser" + +#: add-interactive.c:746 +msgid "Could not parse HEAD^{tree}" +msgstr "impossible d'analyser HEAD^{tree}" + +#: add-interactive.c:784 git-add--interactive.perl:631 +#, c-format, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "%d chemin inversé\n" +msgstr[1] "%d chemins inversés\n" + +#: add-interactive.c:835 git-add--interactive.perl:695 +#, c-format +msgid "No untracked files.\n" +msgstr "Aucun Fichier non suivi.\n" + +#: add-interactive.c:839 git-add--interactive.perl:689 +msgid "Add untracked" +msgstr "Ajouter un fichier non-suivi" + +#: add-interactive.c:866 git-add--interactive.perl:625 +#, c-format, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "%d chemin ajouté\n" +msgstr[1] "%d chemins ajoutés\n" + +#: add-interactive.c:896 +#, c-format +msgid "ignoring unmerged: %s" +msgstr "fichier non-fusionné ignoré : %s" + +#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Seuls des fichiers binaires ont changé.\n" + +#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368 +#, c-format +msgid "No changes.\n" +msgstr "Aucune modification.\n" + +#: add-interactive.c:914 git-add--interactive.perl:1376 +msgid "Patch update" +msgstr "Mise à jour par patch" + +#: add-interactive.c:953 git-add--interactive.perl:1754 +msgid "Review diff" +msgstr "Réviser la différence" + +#: add-interactive.c:981 +msgid "show paths with changes" +msgstr "afficher les chemins comprenant des modifications" + +#: add-interactive.c:983 +msgid "add working tree state to the staged set of changes" +msgstr "ajouter l'état de l'arbre de travail à l'ensemble des modifications indexées" + +#: add-interactive.c:985 +msgid "revert staged set of changes back to the HEAD version" +msgstr "retourner l'ensemble de modifications indexées à la version HEAD" + +#: add-interactive.c:987 +msgid "pick hunks and update selectively" +msgstr "sélection et mise à jour individuelle des sections" + +#: add-interactive.c:989 +msgid "view diff between HEAD and index" +msgstr "visualiser les diffs entre HEAD et l'index" + +#: add-interactive.c:991 +msgid "add contents of untracked files to the staged set of changes" +msgstr "ajouter le contenu des fichiers non-suivis à l'ensemble des modifications indexées" + +#: add-interactive.c:999 add-interactive.c:1048 +msgid "Prompt help:" +msgstr "Aide :" + +#: add-interactive.c:1001 +msgid "select a single item" +msgstr "sélectionner un seul élément" + +#: add-interactive.c:1003 +msgid "select a range of items" +msgstr "sélectionner une plage d'éléments" + +#: add-interactive.c:1005 +msgid "select multiple ranges" +msgstr "sélectionner plusieurs plages" + +#: add-interactive.c:1007 add-interactive.c:1052 +msgid "select item based on unique prefix" +msgstr "sélectionner un élément basé sur une préfixe unique" + +#: add-interactive.c:1009 +msgid "unselect specified items" +msgstr "désélectionner les éléments spécifiés" + +#: add-interactive.c:1011 +msgid "choose all items" +msgstr "choisir tous les éléments" + +#: add-interactive.c:1013 +msgid "(empty) finish selecting" +msgstr "(vide) arrêter de sélectionner" + +#: add-interactive.c:1050 +msgid "select a numbered item" +msgstr "sélectionner un élément par son numéro" + +#: add-interactive.c:1054 +msgid "(empty) select nothing" +msgstr "(vide) ne rien sélectionner" + +#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851 +msgid "*** Commands ***" +msgstr "*** Commandes ***" + +#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848 +msgid "What now" +msgstr "Et maintenant ?" + +#: add-interactive.c:1115 git-add--interactive.perl:213 +msgid "staged" +msgstr "indexé" + +#: add-interactive.c:1115 git-add--interactive.perl:213 +msgid "unstaged" +msgstr "non-indexé" + +#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197 +#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144 +#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878 +#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213 +msgid "path" +msgstr "chemin" + +#: add-interactive.c:1122 +msgid "could not refresh index" +msgstr "impossible de rafraîchir l'index" + +#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765 +#, c-format +msgid "Bye.\n" +msgstr "Au revoir.\n" + +#: add-patch.c:15 +#, c-format +msgid "Stage mode change [y,n,a,q,d%s,?]? " +msgstr "Indexer le changement de mode [y,n,a,q,d%s,?] ? " + +#: add-patch.c:16 +#, c-format +msgid "Stage deletion [y,n,a,q,d%s,?]? " +msgstr "Indexer la suppression [y,n,a,q,d%s,?] ? " + +#: add-patch.c:17 +#, c-format +msgid "Stage this hunk [y,n,a,q,d%s,?]? " +msgstr "Indexer cette section [y,n,a,q,d%s,?] ? " + +#: add-patch.c:111 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "impossible d'analyser l'entête de section '%.*s'" + +#: add-patch.c:130 add-patch.c:134 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "impossible d'analyser l'entête coloré de section '%.*s'" + +#: add-patch.c:176 +msgid "could not parse diff" +msgstr "impossible d'analyser la diff" + +#: add-patch.c:194 +msgid "could not parse colored diff" +msgstr "impossible d'analyser la diff colorée" + +#: add-patch.c:508 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"ligne de contexte attendue #%d dans\n" +"%.*s" + +#: add-patch.c:523 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" +"les sections ne se recouvrent pas :\n" +"%.*s\n" +"\tne se termine pas par :\n" +"%.*s" + +#: add-patch.c:799 git-add--interactive.perl:1112 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "" +"Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n" + +#: add-patch.c:803 +#, c-format +msgid "" +"---\n" +"To remove '%c' lines, make them ' ' lines (context).\n" +"To remove '%c' lines, delete them.\n" +"Lines starting with %c will be removed.\n" +msgstr "" +"---\n" +"Pour éliminer les lignes '%c', rendez-les ' ' (contexte).\n" +"Pour éliminer les lignes '%c', effacez-les.\n" +"Les lignes commençant par %c seront éliminées.\n" + +#: add-patch.c:810 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging.\n" +msgstr "" +"Si le patch s'applique proprement, la section éditée sera\n" +"immédiatement marquée comme indexée.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: add-patch.c:818 git-add--interactive.perl:1126 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Si ça ne s'applique pas proprement, vous aurez la possibilité de\n" +"l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n" +"alors l'édition sera abandonnée et la section conservée.\n" + +#: add-patch.c:851 +msgid "could not parse hunk header" +msgstr "impossible d'analyser l'entête de section" + +#: add-patch.c:895 add-patch.c:1294 +msgid "'git apply --cached' failed" +msgstr "'git apply --cached' a échoué" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#. +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: add-patch.c:952 git-add--interactive.perl:1239 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" " +"l'élimine !) [y|n] ? " + +#: add-patch.c:1009 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this and all the remaining hunks\n" +"d - do not stage this hunk nor any of the remaining hunks\n" +msgstr "" +"y - indexer cette section\n" +"n - ne pas indexer cette section\n" +"q - quitter ; ne pas indexer cette section ni les autres restantes\n" +"a - indexer cette section et toutes les suivantes\n" +"d - ne pas indexer cette section ni les suivantes\n" + +#: add-patch.c:1016 +msgid "" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" +"j - laisser cette section non décidée et aller à la suivante non-décidée\n" +"J - laisser cette section non décidée et aller à la suivante\n" +"k - laisser cette section non décidée et aller à la précédente non-décidée\n" +"K - laisser cette section non décidée et aller à la précédente\n" +"g - sélectionner une section et s'y rendre\n" +"/ - rechercher une section correspondant à une regex donnée\n" +"s - découper la section en sections plus petites\n" +"e - éditer manuellement la section actuelle\n" +"? - afficher l'aide\n" + +#: add-patch.c:1137 add-patch.c:1147 +msgid "No previous hunk" +msgstr "Pas de section précédente" + +#: add-patch.c:1142 add-patch.c:1152 +msgid "No next hunk" +msgstr "Pas de section suivante" + +#: add-patch.c:1158 +msgid "No other hunks to goto" +msgstr "Aucune autre section à atteindre" + +#: add-patch.c:1169 git-add--interactive.perl:1577 +msgid "go to which hunk (<ret> to see more)? " +msgstr "aller à quelle section (<ret> pour voir plus) ? " + +#: add-patch.c:1170 git-add--interactive.perl:1579 +msgid "go to which hunk? " +msgstr "aller à quelle section ? " + +#: add-patch.c:1181 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Numéro invalide : '%s'" + +#: add-patch.c:1186 +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "Désolé, %d seule section disponible." +msgstr[1] "Désolé, Seulement %d sections disponibles." + +#: add-patch.c:1195 +msgid "No other hunks to search" +msgstr "aucune autre section à rechercher" + +#: add-patch.c:1201 git-add--interactive.perl:1623 +msgid "search for regex? " +msgstr "rechercher la regex ? " + +#: add-patch.c:1216 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Regex de recherche malformée %s : %s" + +#: add-patch.c:1233 +msgid "No hunk matches the given pattern" +msgstr "Aucune section ne correspond au motif donné" + +#: add-patch.c:1240 +msgid "Sorry, cannot split this hunk" +msgstr "Désolé, impossible de découper cette section" + +#: add-patch.c:1244 +#, c-format +msgid "Split into %d hunks." +msgstr "Découpée en %d sections." + +#: add-patch.c:1248 +msgid "Sorry, cannot edit this hunk" +msgstr "Désolé, impossible d'éditer cette section" + +#: advice.c:111 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sastuce: %.*s%s\n" -#: advice.c:162 +#: advice.c:164 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:164 +#: advice.c:166 msgid "Committing is not possible because you have unmerged files." msgstr "Impossible de valider car vous avez des fichiers non fusionnés." -#: advice.c:166 +#: advice.c:168 msgid "Merging is not possible because you have unmerged files." msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés." -#: advice.c:168 +#: advice.c:170 msgid "Pulling is not possible because you have unmerged files." msgstr "Impossible de tirer car vous avez des fichiers non fusionnés." -#: advice.c:170 +#: advice.c:172 msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés." -#: advice.c:172 +#: advice.c:174 #, 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:180 +#: advice.c:182 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." @@ -124,23 +551,23 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nécessaire pour marquer la résolution et valider." -#: advice.c:188 +#: advice.c:190 msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:193 builtin/merge.c:1332 +#: advice.c:195 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)." -#: advice.c:195 +#: advice.c:197 msgid "Please, commit your changes before merging." msgstr "Veuillez valider vos changements avant de fusionner." -#: advice.c:196 +#: advice.c:198 msgid "Exiting because of unfinished merge." msgstr "Abandon à cause d'une fusion non terminée." -#: advice.c:202 +#: advice.c:204 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -359,24 +786,24 @@ msgstr "lecture du lien symbolique %s impossible" msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: apply.c:2926 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: apply.c:3047 +#: apply.c:3057 #, 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:3059 +#: apply.c:3069 #, 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:3065 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -385,463 +812,449 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: apply.c:3087 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: apply.c:3095 +#: apply.c:3105 #, 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:3142 +#: apply.c:3152 #, 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:3152 +#: apply.c:3162 #, 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:3160 +#: apply.c:3170 #, 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:3178 +#: apply.c:3188 #, 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:3191 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: apply.c:3197 +#: apply.c:3207 #, 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:3218 +#: apply.c:3228 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: apply.c:3341 +#: apply.c:3351 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 +#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" -#: apply.c:3401 +#: apply.c:3411 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" -#: apply.c:3430 apply.c:3673 +#: apply.c:3440 apply.c:3683 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: apply.c:3516 apply.c:3688 +#: apply.c:3526 apply.c:3698 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: apply.c:3525 apply.c:3696 +#: apply.c:3535 apply.c:3706 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: apply.c:3560 +#: apply.c:3570 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:3573 #, 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:3589 apply.c:3593 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossible de lire le contenu actuel de '%s'" -#: apply.c:3595 +#: apply.c:3605 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Échec du retour à une fusion à 3 points…\n" -#: apply.c:3609 +#: apply.c:3619 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch %s appliqué avec des conflits.\n" -#: apply.c:3614 +#: apply.c:3624 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch %s appliqué proprement.\n" -#: apply.c:3640 +#: apply.c:3650 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: apply.c:3713 +#: apply.c:3723 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: apply.c:3715 +#: apply.c:3725 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1320 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: apply.c:3924 +#: apply.c:3934 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: apply.c:3927 +#: apply.c:3937 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: apply.c:3947 +#: apply.c:3957 #, 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:3952 +#: apply.c:3962 #, 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:3972 +#: apply.c:3982 #, 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:3976 +#: apply.c:3986 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: apply.c:3991 +#: apply.c:4001 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: apply.c:4083 +#: apply.c:4093 #, 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:4090 +#: apply.c:4100 #, 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:4093 +#: apply.c:4103 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "l'information de sha1 est manquante ou inutilisable (%s)." -#: 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:4102 +#: apply.c:4112 #, c-format msgid "could not add %s to temporary index" msgstr "impossible d'ajouter %s à l'index temporaire" -#: apply.c:4112 +#: apply.c:4122 #, c-format msgid "could not write temporary index to %s" msgstr "impossible d'écrire l'index temporaire dans %s" -#: apply.c:4250 +#: apply.c:4260 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: apply.c:4284 +#: apply.c:4294 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: apply.c:4290 +#: apply.c:4300 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: apply.c:4298 +#: apply.c:4308 #, 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:4304 apply.c:4449 +#: apply.c:4314 apply.c:4459 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4347 +#: apply.c:4357 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" -#: apply.c:4351 +#: apply.c:4361 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: apply.c:4421 +#: apply.c:4431 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: apply.c:4519 +#: apply.c:4529 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: apply.c:4527 +#: apply.c:4537 msgid "internal error" msgstr "erreur interne" -#: apply.c:4530 +#: apply.c:4540 #, 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:4541 +#: apply.c:4551 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 +#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" -#: apply.c:4563 +#: apply.c:4573 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: apply.c:4567 +#: apply.c:4577 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: apply.c:4686 +#: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traité." -#: apply.c:4694 +#: apply.c:4704 msgid "unrecognized input" msgstr "entrée non reconnue" -#: apply.c:4714 +#: apply.c:4724 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: apply.c:4871 +#: apply.c:4881 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s' :%s" -#: apply.c:4898 +#: apply.c:4908 #, 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:4904 apply.c:4919 +#: apply.c:4914 apply.c:4929 #, 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:4912 +#: apply.c:4922 #, 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:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4938 builtin/add.c:579 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: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:4956 +#: apply.c:4966 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4959 +#: apply.c:4969 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4961 builtin/am.c:2206 +#: apply.c:4971 builtin/am.c:2206 msgid "num" msgstr "num" -#: apply.c:4962 +#: apply.c:4972 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: apply.c:4965 +#: apply.c:4975 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: apply.c:4967 +#: apply.c:4977 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:4971 +#: apply.c:4981 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:4973 +#: apply.c:4983 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:4975 +#: apply.c:4985 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:4977 +#: apply.c:4987 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:4979 +#: apply.c:4989 msgid "mark new files with `git add --intent-to-add`" msgstr "marquer les nouveaux fichiers `git add --intent-to-add`" -#: apply.c:4981 +#: apply.c:4991 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: apply.c:4983 +#: apply.c:4993 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: apply.c:4986 +#: apply.c:4996 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)" -#: apply.c:4988 +#: apply.c:4998 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:4990 +#: apply.c:5000 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:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5003 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:4995 +#: apply.c:5005 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1474 msgid "action" msgstr "action" -#: apply.c:4997 +#: apply.c:5007 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:5000 apply.c:5003 +#: apply.c:5010 apply.c:5013 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: apply.c:5006 +#: apply.c:5016 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: apply.c:5008 +#: apply.c:5018 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: apply.c:5010 +#: apply.c:5020 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: apply.c:5012 +#: apply.c:5022 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: 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:2085 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22 +#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774 +#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "mode verbeux" -#: apply.c:5015 +#: apply.c:5025 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:5018 +#: apply.c:5028 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:5020 builtin/am.c:2194 +#: apply.c:5030 builtin/am.c:2194 msgid "root" msgstr "racine" -#: apply.c:5021 +#: apply.c:5031 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" @@ -864,7 +1277,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:516 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" @@ -896,7 +1309,7 @@ msgstr "fmt" msgid "archive format" msgstr "format d'archive" -#: archive.c:458 builtin/log.c:1581 +#: archive.c:458 builtin/log.c:1653 msgid "prefix" msgstr "préfixe" @@ -904,12 +1317,12 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in t |