diff --git a/po/fr.po b/po/fr.po index 68a4d45fd8f6a7..0cfc78cf6fefbd 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,6 +21,7 @@ # bypass | éviter d'utiliser # to checkout | extraire # cherry-pick | picorer +# chunk | tronçon # to commit | valider # commit-ish | commit ou apparenté # config file | fichier de configuration @@ -29,6 +30,7 @@ # debugging | débogage # to deflate | compresser # email | courriel +# enlistment | enrôlement # entry | élément # fanout | dispersion # fast-forward | avance rapide @@ -78,8 +80,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-08-16 11:48+0200\n" -"PO-Revision-Date: 2023-08-16 11:49+0200\n" +"POT-Creation-Date: 2023-11-08 04:57+0000\n" +"PO-Revision-Date: 2023-11-11 10:00+0100\n" "Last-Translator: Cédric Malard \n" "Language-Team: Jean-Noël Avila \n" "Language: fr\n" @@ -89,178 +91,236 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" "X-Generator: Poedit 3.0.1\n" +#: add-interactive.c:389 #, c-format msgid "Huh (%s)?" msgstr "Hein (%s) ?" +#: add-interactive.c:542 add-interactive.c:850 builtin/merge.c:382 +#: builtin/rebase.c:1300 builtin/rebase.c:1713 reset.c:140 sequencer.c:3655 +#: sequencer.c:4136 sequencer.c:4513 msgid "could not read index" msgstr "impossible de lire l'index" +#: add-interactive.c:596 msgid "binary" msgstr "binaire" +#: add-interactive.c:654 msgid "nothing" msgstr "rien" +#: add-interactive.c:655 msgid "unchanged" msgstr "inchangé" +#: add-interactive.c:692 msgid "Update" msgstr "Mise à jour" +#: add-interactive.c:713 add-interactive.c:717 add-interactive.c:905 #, c-format msgid "could not stage '%s'" msgstr "impossible d'indexer '%s'" +#: add-interactive.c:723 add-interactive.c:912 builtin/stash.c:611 reset.c:164 +#: sequencer.c:3893 msgid "could not write index" msgstr "impossible d'écrire l'index" +#: add-interactive.c:726 #, c-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:744 #, c-format msgid "note: %s is untracked now.\n" msgstr "note : %s n'est plus suivi à présent.\n" +#: add-interactive.c:749 apply.c:4161 builtin/checkout.c:324 +#: builtin/reset.c:182 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" +#: add-interactive.c:779 msgid "Revert" msgstr "Inverser" +#: add-interactive.c:795 msgid "Could not parse HEAD^{tree}" msgstr "Impossible d'analyser HEAD^{tree}" +#: add-interactive.c:833 #, c-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:884 #, c-format msgid "No untracked files.\n" msgstr "Aucun Fichier non suivi.\n" +#: add-interactive.c:888 msgid "Add untracked" msgstr "Ajouter un fichier non-suivi" +#: add-interactive.c:915 #, c-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:945 #, c-format msgid "ignoring unmerged: %s" msgstr "fichier non-fusionné ignoré : %s" +#: add-interactive.c:957 add-patch.c:1782 #, c-format msgid "Only binary files changed.\n" msgstr "Seuls des fichiers binaires ont changé.\n" +#: add-interactive.c:959 add-patch.c:1780 #, c-format msgid "No changes.\n" msgstr "Aucune modification.\n" +#: add-interactive.c:963 msgid "Patch update" msgstr "Mise à jour par patch" +#: add-interactive.c:1002 msgid "Review diff" msgstr "Réviser la différence" +#: add-interactive.c:1029 msgid "show paths with changes" msgstr "afficher les chemins comprenant des modifications" +#: add-interactive.c:1031 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:1033 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:1035 msgid "pick hunks and update selectively" msgstr "sélection et mise à jour individuelle des sections" +#: add-interactive.c:1037 msgid "view diff between HEAD and index" msgstr "visualiser les diffs entre HEAD et l'index" +#: add-interactive.c:1039 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:1047 add-interactive.c:1096 msgid "Prompt help:" msgstr "Aide :" +#: add-interactive.c:1049 msgid "select a single item" msgstr "sélectionner un seul élément" +#: add-interactive.c:1051 msgid "select a range of items" msgstr "sélectionner une plage d'éléments" +#: add-interactive.c:1053 msgid "select multiple ranges" msgstr "sélectionner plusieurs plages" +#: add-interactive.c:1055 add-interactive.c:1100 msgid "select item based on unique prefix" msgstr "sélectionner un élément basé sur une préfixe unique" +#: add-interactive.c:1057 msgid "unselect specified items" msgstr "désélectionner les éléments spécifiés" +#: add-interactive.c:1059 msgid "choose all items" msgstr "choisir tous les éléments" +#: add-interactive.c:1061 msgid "(empty) finish selecting" msgstr "(vide) arrêter de sélectionner" +#: add-interactive.c:1098 msgid "select a numbered item" msgstr "sélectionner un élément par son numéro" +#: add-interactive.c:1102 msgid "(empty) select nothing" msgstr "(vide) ne rien sélectionner" +#: add-interactive.c:1110 builtin/clean.c:847 msgid "*** Commands ***" msgstr "*** Commandes ***" +#: add-interactive.c:1111 builtin/clean.c:848 msgid "What now" msgstr "Et maintenant" +#: add-interactive.c:1163 msgid "staged" msgstr "indexé" +#: add-interactive.c:1163 msgid "unstaged" msgstr "non-indexé" +#: add-interactive.c:1163 apply.c:5067 apply.c:5070 builtin/am.c:2346 +#: builtin/am.c:2349 builtin/bugreport.c:119 builtin/clone.c:144 +#: builtin/diagnose.c:25 builtin/fetch.c:2155 builtin/hook.c:31 +#: builtin/merge.c:274 builtin/pull.c:201 builtin/submodule--helper.c:1777 +#: builtin/submodule--helper.c:1780 msgid "path" msgstr "chemin" +#: add-interactive.c:1170 msgid "could not refresh index" msgstr "impossible de rafraîchir l'index" +#: add-interactive.c:1184 builtin/clean.c:812 #, c-format msgid "Bye.\n" msgstr "Au revoir.\n" +#: add-patch.c:41 #, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? " +#: add-patch.c:42 #, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? " +#: add-patch.c:43 #, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "Indexer l'ajout [y,n,q,a,d%s,?] ? " +#: add-patch.c:44 #, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Indexer cette section [y,n,q,a,d%s,?] ? " +#: add-patch.c:46 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." @@ -268,6 +328,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme indexée." +#: add-patch.c:49 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -281,22 +342,27 @@ msgstr "" "a - indexer cette section et toutes les suivantes de ce fichier\n" "d - ne pas indexer cette section ni les suivantes de ce fichier\n" +#: add-patch.c:63 #, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? " +#: add-patch.c:64 #, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? " +#: add-patch.c:65 #, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "Remiser l'ajout [y,n,q,a,d%s,?] ? " +#: add-patch.c:66 #, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Remiser cette section [y,n,q,a,d%s,?] ? " +#: add-patch.c:68 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." @@ -304,6 +370,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme remisée." +#: add-patch.c:71 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -317,22 +384,27 @@ msgstr "" "a - remiser cette section et toutes les suivantes de ce fichier\n" "d - ne pas remiser cette section ni les suivantes de ce fichier\n" +#: add-patch.c:87 #, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? " +#: add-patch.c:88 #, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? " +#: add-patch.c:89 #, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "Désindexer l'ajout [y,n,q,a,d%s,?] ? " +#: add-patch.c:90 #, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? " +#: add-patch.c:92 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." @@ -340,6 +412,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme desindexée." +#: add-patch.c:95 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -353,22 +426,27 @@ msgstr "" "a - désindexer cette section et toutes les suivantes de ce fichier\n" "d - ne pas désindexer cette section ni les suivantes de ce fichier\n" +#: add-patch.c:110 #, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? " +#: add-patch.c:111 #, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? " +#: add-patch.c:112 #, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "Appliquer l'ajout à l'index [y,n,q,a,d%s,?] ? " +#: add-patch.c:113 #, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? " +#: add-patch.c:115 add-patch.c:183 add-patch.c:228 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." @@ -376,6 +454,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme appliquée." +#: add-patch.c:118 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -389,22 +468,27 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier\n" +#: add-patch.c:133 add-patch.c:201 #, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? " +#: add-patch.c:134 add-patch.c:202 #, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? " +#: add-patch.c:135 add-patch.c:203 #, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner l'ajout dans l'arbre [y,n,q,a,d%s,?] ? " +#: add-patch.c:136 add-patch.c:204 #, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? " +#: add-patch.c:138 add-patch.c:161 add-patch.c:206 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." @@ -412,6 +496,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme éliminée." +#: add-patch.c:141 add-patch.c:209 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -425,24 +510,29 @@ msgstr "" "a - supprimer cette section et toutes les suivantes de ce fichier\n" "d - ne pas supprimer cette section ni les suivantes de ce fichier\n" +#: add-patch.c:156 #, c-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? " +#: add-patch.c:157 #, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? " +#: add-patch.c:158 #, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner l'ajout de l'index et de l'arbre [y,n,q,a,d%s,?] ? " +#: add-patch.c:159 #, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " +#: add-patch.c:164 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -456,28 +546,33 @@ msgstr "" "a - éliminer cette section et toutes les suivantes de ce fichier\n" "d - ne pas éliminer cette section ni les suivantes de ce fichier\n" +#: add-patch.c:178 #, c-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a," "d%s,?] ? " +#: add-patch.c:179 #, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a," "d%s,?] ? " +#: add-patch.c:180 #, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer l'ajout dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " +#: add-patch.c:181 #, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " +#: add-patch.c:186 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -491,23 +586,28 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier\n" +#: add-patch.c:223 #, c-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? " +#: add-patch.c:224 #, c-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?] ? " +#: add-patch.c:225 #, c-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "Appliquer l'ajout dans l'arbre de travail [y,n,q,a,d%s,?] ? " +#: add-patch.c:226 #, c-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Appliquer la section à l'arbre de travail [y,n,q,a,d%s,?] ? " +#: add-patch.c:231 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -521,23 +621,29 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier\n" +#: add-patch.c:351 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "impossible d'analyser l'entête de section '%.*s'" +#: add-patch.c:439 msgid "could not parse diff" msgstr "impossible d'analyser la diff" +#: add-patch.c:458 msgid "could not parse colored diff" msgstr "impossible d'analyser la diff colorée" +#: add-patch.c:472 #, c-format msgid "failed to run '%s'" msgstr "échec pour lancer '%s'" +#: add-patch.c:630 msgid "mismatched output from interactive.diffFilter" msgstr "sortie sans correspondance depuis interactive.diffFilter" +#: add-patch.c:631 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -545,6 +651,7 @@ msgstr "" "Votre filtre doit maintenir une correspondance un-pour-un\n" "entre les lignes en entrée et en sortie." +#: add-patch.c:818 #, c-format msgid "" "expected context line #%d in\n" @@ -553,6 +660,7 @@ msgstr "" "ligne de contexte attendue #%d dans\n" "%.*s" +#: add-patch.c:833 #, c-format msgid "" "hunks do not overlap:\n" @@ -565,10 +673,12 @@ msgstr "" "\tne se termine pas par :\n" "%.*s" +#: add-patch.c:1110 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:1114 #, c-format msgid "" "---\n" @@ -581,6 +691,7 @@ msgstr "" "Pour éliminer les lignes '%c', effacez-les.\n" "Les lignes commençant par %c seront éliminées.\n" +#: add-patch.c:1129 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" @@ -590,9 +701,11 @@ msgstr "" "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:1162 msgid "could not parse hunk header" msgstr "impossible d'analyser l'entête de section" +#: add-patch.c:1207 msgid "'git apply --cached' failed" msgstr "'git apply --cached' a échoué" @@ -602,21 +715,26 @@ msgstr "'git apply --cached' a échoué" #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. +#: add-patch.c:1276 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 (\"n\" " "l'élimine !) [y|n] ? " +#: add-patch.c:1319 msgid "The selected hunks do not apply to the index!" msgstr "Les sections sélectionnées ne s'applique pas à l'index !" +#: add-patch.c:1320 msgid "Apply them to the worktree anyway? " msgstr "Les appliquer quand même à l'arbre de travail ? " +#: add-patch.c:1327 msgid "Nothing was applied.\n" msgstr "Rien n'a été appliqué.\n" +#: add-patch.c:1384 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -638,57 +756,73 @@ msgstr "" "e - éditer manuellement la section actuelle\n" "? - afficher l'aide\n" +#: add-patch.c:1546 add-patch.c:1556 msgid "No previous hunk" msgstr "Pas de section précédente" +#: add-patch.c:1551 add-patch.c:1561 msgid "No next hunk" msgstr "Pas de section suivante" +#: add-patch.c:1567 msgid "No other hunks to goto" msgstr "Aucune autre section à atteindre" +#: add-patch.c:1578 msgid "go to which hunk ( to see more)? " msgstr "aller à quelle section ( pour voir plus) ? " +#: add-patch.c:1579 msgid "go to which hunk? " msgstr "aller à quelle section ? " +#: add-patch.c:1590 #, c-format msgid "Invalid number: '%s'" msgstr "Numéro invalide : '%s'" +#: add-patch.c:1595 #, 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:1604 msgid "No other hunks to search" msgstr "Aucune autre section à rechercher" +#: add-patch.c:1610 msgid "search for regex? " msgstr "rechercher la regex ? " +#: add-patch.c:1625 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Regex de recherche malformée %s : %s" +#: add-patch.c:1642 msgid "No hunk matches the given pattern" msgstr "Aucune section ne correspond au motif donné" +#: add-patch.c:1649 msgid "Sorry, cannot split this hunk" msgstr "Désolé, impossible de découper cette section" +#: add-patch.c:1653 #, c-format msgid "Split into %d hunks." msgstr "Découpée en %d sections." +#: add-patch.c:1657 msgid "Sorry, cannot edit this hunk" msgstr "Désolé, impossible d'éditer cette section" +#: add-patch.c:1709 msgid "'git apply' failed" msgstr "'git apply' a échoué" +#: advice.c:85 #, c-format msgid "" "\n" @@ -697,28 +831,36 @@ msgstr "" "\n" "Désactivez ce message avec \"git config advice.%s false\"" +#: advice.c:101 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sastuce: %.*s%s\n" +#: advice.c:185 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:187 msgid "Committing is not possible because you have unmerged files." msgstr "Impossible de valider car vous avez des fichiers non fusionnés." +#: advice.c:189 msgid "Merging is not possible because you have unmerged files." msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés." +#: advice.c:191 msgid "Pulling is not possible because you have unmerged files." msgstr "Impossible de tirer car vous avez des fichiers non fusionnés." +#: advice.c:193 msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés." +#: advice.c:195 msgid "Rebasing is not possible because you have unmerged files." msgstr "Impossible de rebaser, car vous avez des fichiers non fusionnés." +#: advice.c:204 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -726,18 +868,23 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm '\n" "si nécessaire pour marquer la résolution et valider." +#: advice.c:212 msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." +#: advice.c:217 builtin/merge.c:1383 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." +#: advice.c:219 msgid "Please, commit your changes before merging." msgstr "Veuillez valider vos changements avant de fusionner." +#: advice.c:220 msgid "Exiting because of unfinished merge." msgstr "Abandon à cause d'une fusion non terminée." +#: advice.c:226 msgid "" "Diverging branches can't be fast-forwarded, you need to either:\n" "\n" @@ -756,9 +903,11 @@ msgstr "" "\n" "\tgit rebase\n" +#: advice.c:233 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." +#: advice.c:243 #, c-format msgid "" "The following paths and/or pathspecs matched paths that exist\n" @@ -770,6 +919,7 @@ msgstr "" "qui existent hors de votre définition d'extraction clairsemée, et ne seront\n" "donc pas mis à jour dans l'index :\n" +#: advice.c:250 msgid "" "If you intend to update such entries, try one of the following:\n" "* Use the --sparse option.\n" @@ -779,6 +929,7 @@ msgstr "" "* d'utiliser l'option --sparse,\n" "* de désactiver ou modifier les règles de choix clairsemé." +#: advice.c:258 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -823,6 +974,7 @@ msgstr "" "detachedHead à false\n" "\n" +#: advice.c:285 #, c-format msgid "" "The following paths have been moved outside the\n" @@ -833,6 +985,7 @@ msgstr "" "la définition d'extraction clairsemée mai ne sont pas\n" "clairsemés à cause de modifications locales\n" +#: advice.c:292 msgid "" "To correct the sparsity of these paths, do the following:\n" "* Use \"git add --sparse \" to update the index\n" @@ -842,80 +995,126 @@ msgstr "" "* Lancez \"git add --sparse \" pour mettre l'index à jour\n" "* Lancez \"git sparse-checkout reapply\" pour réappliquer les règles" +#: alias.c:71 msgid "cmdline ends with \\" msgstr "cmdline se termine par \\" +#: alias.c:72 msgid "unclosed quote" msgstr "citation non fermée" +#: alias.c:73 builtin/cat-file.c:1061 builtin/notes.c:452 builtin/notes.c:514 +#: builtin/notes.c:596 builtin/notes.c:608 builtin/notes.c:691 +#: builtin/notes.c:765 builtin/notes.c:916 builtin/notes.c:1068 +#: builtin/notes.c:1090 builtin/prune-packed.c:26 builtin/receive-pack.c:2515 +#: builtin/tag.c:604 msgid "too many arguments" msgstr "trop d'arguments" +#: apply.c:84 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "option d'espace non reconnue '%s'" +#: apply.c:100 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "option d'ignorance d'espace non reconnue '%s'" +#: apply.c:152 archive.c:682 builtin/add.c:386 builtin/add.c:388 +#: builtin/add.c:394 builtin/add.c:406 builtin/branch.c:817 +#: builtin/checkout-index.c:276 builtin/checkout.c:485 builtin/checkout.c:488 +#: builtin/checkout.c:1722 builtin/checkout.c:1832 builtin/checkout.c:1835 +#: builtin/clone.c:963 builtin/commit.c:374 builtin/commit.c:377 +#: builtin/commit.c:1224 builtin/commit.c:1280 builtin/commit.c:1297 +#: builtin/describe.c:616 builtin/diff-tree.c:165 builtin/difftool.c:745 +#: builtin/fast-export.c:1264 builtin/fetch.c:2266 builtin/fetch.c:2293 +#: builtin/fetch.c:2307 builtin/fetch.c:2312 builtin/help.c:618 +#: builtin/index-pack.c:1876 builtin/init-db.c:104 builtin/log.c:2103 +#: builtin/log.c:2105 builtin/ls-files.c:756 builtin/merge-base.c:166 +#: builtin/merge-base.c:172 builtin/merge.c:1404 builtin/merge.c:1406 +#: builtin/pack-objects.c:4401 builtin/push.c:643 builtin/push.c:681 +#: builtin/push.c:687 builtin/push.c:692 builtin/rebase.c:1255 +#: builtin/rebase.c:1257 builtin/rebase.c:1266 builtin/repack.c:1208 +#: builtin/repack.c:1214 builtin/repack.c:1216 builtin/repack.c:1266 +#: builtin/reset.c:376 builtin/reset.c:413 builtin/rev-list.c:562 +#: builtin/show-branch.c:722 builtin/show-branch.c:727 builtin/stash.c:1774 +#: builtin/stash.c:1777 builtin/submodule--helper.c:1205 +#: builtin/submodule--helper.c:2961 builtin/tag.c:539 builtin/tag.c:585 +#: builtin/worktree.c:1055 parse-options.c:1312 range-diff.c:572 +#: revision.c:2392 revision.c:2396 revision.c:2405 revision.c:2410 +#: revision.c:2641 revision.c:3040 revision.c:3044 revision.c:3052 +#: revision.c:3055 revision.c:3057 #, c-format msgid "options '%s' and '%s' cannot be used together" msgstr "les options '%s' et '%s' ne peuvent pas être utilisées ensemble" +#: apply.c:155 apply.c:166 apply.c:169 #, c-format msgid "'%s' outside a repository" msgstr "'%s' hors d'un dépôt" +#: apply.c:416 msgid "failed to read patch" msgstr "impossible de lire la rustine" +#: apply.c:418 msgid "patch too large" msgstr "la rustine est trop grosse" +#: apply.c:832 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Impossible de préparer la regexp d'horodatage %s" +#: apply.c:841 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec a retourné %d pour l'entrée : %s" +#: apply.c:915 #, c-format msgid "unable to find filename in patch at line %d" msgstr "nom de fichier du patch introuvable à la ligne %d" +#: apply.c:953 #, 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:959 #, 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:960 #, 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:965 #, 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:994 #, c-format msgid "invalid mode on line %d: %s" msgstr "mode invalide dans la ligne %d : %s" +#: apply.c:1313 #, c-format msgid "inconsistent header lines %d and %d" msgstr "lignes d'entête inconsistantes %d et %d" +#: apply.c:1403 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -930,75 +1129,93 @@ msgstr[1] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composants de préfixe de chemin (ligne %d)" +#: apply.c:1416 #, 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:1512 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" +#: apply.c:1581 #, 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:1784 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" +#: apply.c:1786 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" +#: apply.c:1820 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" +#: apply.c:1857 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" +#: apply.c:1859 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" +#: apply.c:1862 #, 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:2010 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" +#: apply.c:2047 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" +#: apply.c:2209 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" +#: apply.c:2295 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" +#: apply.c:2299 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" +#: apply.c:2968 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" +#: apply.c:3089 #, 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:3101 #, 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:3107 #, c-format msgid "" "while searching for:\n" @@ -1007,545 +1224,708 @@ msgstr "" "pendant la recherche de :\n" "%.*s" +#: apply.c:3129 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" +#: apply.c:3137 #, 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:3184 #, 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:3195 #, 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:3203 #, 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:3222 #, 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:3235 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" +#: apply.c:3242 #, 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:3263 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" +#: apply.c:3387 builtin/mv.c:508 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" +#: apply.c:3439 apply.c:3450 apply.c:3496 midx.c:124 pack-mtimes.c:42 +#: pack-revindex.c:223 setup.c:325 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" +#: apply.c:3447 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" +#: apply.c:3476 apply.c:3749 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" +#: apply.c:3587 apply.c:3764 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" +#: apply.c:3596 apply.c:3772 apply.c:3988 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" +#: apply.c:3633 msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "" "le dépôt n'a pas les blobs nécessaires pour effectuer une fusion à 3 points." +#: apply.c:3636 #, c-format msgid "Performing three-way merge...\n" msgstr "Application d'une fusion à 3 points…\n" +#: apply.c:3652 apply.c:3656 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossible de lire le contenu actuel de '%s'" +#: apply.c:3668 #, c-format msgid "Failed to perform three-way merge...\n" msgstr "Échec de l'application de la fusion à 3 points…\n" +#: apply.c:3682 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch %s appliqué avec des conflits.\n" +#: apply.c:3687 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch %s appliqué proprement.\n" +#: apply.c:3704 #, c-format msgid "Falling back to direct application...\n" msgstr "Retour à une application directe…\n" +#: apply.c:3716 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" +#: apply.c:3789 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" +#: apply.c:3791 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" +#: apply.c:3928 apply.c:3930 read-cache.c:813 read-cache.c:842 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" +#: apply.c:3986 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" +#: apply.c:3990 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" +#: apply.c:4010 #, 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:4015 #, 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:4035 apply.c:4464 #, 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:4039 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" +#: apply.c:4054 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." +#: apply.c:4146 #, 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:4153 #, 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:4156 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "l'information de sha1 est manquante ou inutilisable (%s)." +#: apply.c:4165 #, c-format msgid "could not add %s to temporary index" msgstr "impossible d'ajouter %s à l'index temporaire" +#: apply.c:4175 #, c-format msgid "could not write temporary index to %s" msgstr "impossible d'écrire l'index temporaire dans %s" +#: apply.c:4313 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" +#: apply.c:4347 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" +#: apply.c:4353 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" +#: apply.c:4361 #, 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:4367 apply.c:4539 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" +#: apply.c:4410 builtin/bisect.c:610 builtin/gc.c:2399 builtin/gc.c:2461 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" +#: apply.c:4414 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" +#: apply.c:4511 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" +#: apply.c:4609 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." +#: apply.c:4617 msgid "internal error" msgstr "erreur interne" +#: apply.c:4620 #, 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:4631 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" +#: apply.c:4640 apply.c:4645 apply.c:4649 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" +#: apply.c:4642 rerere.c:1070 #, c-format msgid "cannot unlink '%s'" msgstr "impossible de délier '%s'" +#: apply.c:4663 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." +#: apply.c:4667 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." +#: apply.c:4796 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traité." +#: apply.c:4805 msgid "No valid patches in input (allow with \"--allow-empty\")" msgstr "Pas de rustine valide sur l'entrée (permis avec \"--allow-empty\")" +#: apply.c:4826 t/helper/test-cache-tree.c:39 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" +#: apply.c:4983 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s' :%s" +#: apply.c:5010 #, 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:5016 apply.c:5031 #, 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:5024 #, 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:5040 builtin/mv.c:567 builtin/rm.c:441 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" +#: apply.c:5068 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" +#: apply.c:5071 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" +#: apply.c:5073 builtin/am.c:2355 msgid "num" msgstr "num" +#: apply.c:5074 msgid "remove leading slashes from traditional diff paths" msgstr "supprimer barres obliques des chemins traditionnels de diff" +#: apply.c:5077 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" +#: apply.c:5079 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:5083 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:5085 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:5087 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:5089 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:5091 msgid "mark new files with `git add --intent-to-add`" msgstr "marquer les nouveaux fichiers `git add --intent-to-add`" +#: apply.c:5093 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" +#: apply.c:5095 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" +#: apply.c:5098 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)" +#: apply.c:5100 msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "" "tenter une fusion à 3 points, revenir à un rustinage normal en cas d'échec" +#: apply.c:5102 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:5105 builtin/checkout-index.c:236 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" +#: apply.c:5107 msgid "ensure at least lines of context match" msgstr "s'assurer d'au moins lignes de correspondance de contexte" +#: apply.c:5108 builtin/am.c:2331 builtin/am.c:2334 +#: builtin/interpret-trailers.c:105 builtin/interpret-trailers.c:107 +#: builtin/pack-objects.c:4285 builtin/rebase.c:1110 msgid "action" msgstr "action" +#: apply.c:5109 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:5112 apply.c:5115 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" +#: apply.c:5118 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" +#: apply.c:5120 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" +#: apply.c:5122 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" +#: apply.c:5124 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" +#: apply.c:5127 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:5130 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:5132 builtin/am.c:2343 msgid "root" msgstr "racine" +#: apply.c:5133 msgid "prepend to all filenames" msgstr "préfixer tous les noms de fichier avec " +#: apply.c:5136 msgid "don't return error for empty patches" msgstr "ne pas renvoyer d'erreur pour les rustines vides" +#: archive-tar.c:136 archive-zip.c:350 #, c-format msgid "cannot stream blob %s" msgstr "impossible de transmettre le blob %s en flux" +#: archive-tar.c:276 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "mode de fichier non supporté :0%o (SHA1: %s)" +#: archive-tar.c:456 archive-zip.c:474 builtin/pack-objects.c:373 +#: builtin/pack-objects.c:376 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" +#: archive-tar.c:509 #, c-format msgid "unable to start '%s' filter" msgstr "impossible de démarrer le filtre '%s'" +#: archive-tar.c:512 msgid "unable to redirect descriptor" msgstr "impossible de rediriger un descripteur" +#: archive-tar.c:519 #, c-format msgid "'%s' filter reported error" msgstr "le filtre '%s' a retourné une erreur" +#: archive-zip.c:323 #, 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:327 #, 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:608 #, c-format msgid "timestamp too large for this system: %" msgstr "l'horodatage est trop grand pour ce système : %" +#: archive.c:24 msgid "git archive [] [...]" msgstr "git archive [] [...]" +#: archive.c:26 msgid "" "git archive --remote [--exec ] [] [...]" msgstr "" "git archive --remote [--exec ] [] [...]" +#: archive.c:27 msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote [--exec ] --list" +#: archive.c:220 archive.c:375 builtin/gc.c:528 builtin/notes.c:300 +#: builtin/tag.c:591 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" +#: archive.c:470 #, c-format msgid "pathspec '%s' matches files outside the current directory" msgstr "" "le spécificateur de chemin '%s' correspond à des fichiers hors du répertoire " "actuel" +#: archive.c:493 builtin/add.c:136 builtin/add.c:536 builtin/rm.c:345 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" +#: archive.c:516 #, c-format msgid "no such ref: %.*s" msgstr "référence inexistante : %.*s" +#: archive.c:523 #, c-format msgid "not a valid object name: %s" msgstr "nom d'objet invalide : %s" +#: archive.c:538 t/helper/test-cache-tree.c:44 #, c-format msgid "not a tree object: %s" msgstr "objet arbre invalide : %s" +#: archive.c:579 #, c-format msgid "File not found: %s" msgstr "Fichier non trouvé : %s" +#: archive.c:581 #, c-format msgid "Not a regular file: %s" msgstr "'%s' n'est pas un fichier normal" +#: archive.c:590 #, c-format msgid "unclosed quote: '%s'" msgstr "citation non fermée : '%s'" +#: archive.c:593 #, c-format msgid "missing colon: '%s'" msgstr "deux points manquants : '%s'" +#: archive.c:596 #, c-format msgid "empty file name: '%s'" msgstr "nom de fichier vide : '%s'" +#: archive.c:643 msgid "fmt" msgstr "fmt" +#: archive.c:643 msgid "archive format" msgstr "format d'archive" +#: archive.c:644 builtin/log.c:1935 parse-options.h:532 msgid "prefix" msgstr "préfixe" +#: archive.c:645 msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" +#: archive.c:646 archive.c:652 builtin/blame.c:898 builtin/blame.c:902 +#: builtin/blame.c:903 builtin/commit-tree.c:110 builtin/config.c:143 +#: builtin/fast-export.c:1200 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1206 builtin/gc.c:1513 builtin/gc.c:1579 +#: builtin/grep.c:994 builtin/hash-object.c:113 builtin/ls-files.c:622 +#: builtin/ls-files.c:625 builtin/notes.c:489 builtin/notes.c:665 +#: builtin/read-tree.c:124 parse-options.h:330 msgid "file" msgstr "fichier" +#: archive.c:647 archive.c:650 msgid "add untracked file to archive" msgstr "ajouter les fichiers non suivis à l'archive" +#: archive.c:650 msgid "path:content" msgstr "chemin:contenu" +#: archive.c:653 builtin/archive.c:89 msgid "write the archive to this file" msgstr "écrire l'archive dans ce fichier" +#: archive.c:655 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le répertoire de travail" +#: archive.c:656 msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" +#: archive.c:657 builtin/clone.c:148 builtin/fetch.c:2186 +#: builtin/pack-objects.c:4254 builtin/pack-objects.c:4258 builtin/pull.c:222 msgid "time" msgstr "heure" +#: archive.c:658 msgid "set modification time of archive entries" msgstr "régler la date de modification des entrées de l'archive" +#: archive.c:661 msgid "set compression level" msgstr "régler le niveau de compression" +#: archive.c:664 msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" +#: archive.c:666 builtin/archive.c:90 builtin/clone.c:134 builtin/clone.c:137 +#: builtin/submodule--helper.c:1789 builtin/submodule--helper.c:2685 msgid "repo" msgstr "dépôt" +#: archive.c:667 builtin/archive.c:91 msgid "retrieve the archive from remote repository " msgstr "récupérer l'archive depuis le dépôt distant " +#: archive.c:668 builtin/archive.c:92 builtin/difftool.c:720 +#: builtin/notes.c:585 msgid "command" msgstr "commande" +#: archive.c:669 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" +#: archive.c:676 msgid "Unexpected option --remote" msgstr "Option --remote inattendue" +#: archive.c:678 builtin/add.c:409 builtin/add.c:441 builtin/checkout.c:1841 +#: builtin/clone.c:1144 builtin/clone.c:1147 builtin/commit.c:386 +#: builtin/fast-export.c:1249 builtin/index-pack.c:1872 builtin/log.c:2273 +#: builtin/reset.c:385 builtin/reset.c:446 builtin/rm.c:289 +#: builtin/stash.c:1786 builtin/worktree.c:820 builtin/worktree.c:1057 +#: fetch-pack.c:344 http-fetch.c:150 http-fetch.c:159 revision.c:3059 #, c-format msgid "the option '%s' requires '%s'" msgstr "l'option '%s' requiert '%s'" +#: archive.c:680 msgid "Unexpected option --output" msgstr "Option --output inattendue" +#: archive.c:704 #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'archive inconnu '%s'" +#: archive.c:713 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argument non supporté pour le format '%s' : -%d" +#: attr.c:209 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s n'est pas un nom valide d'attribut" +#: attr.c:237 msgid "unable to add additional attribute" msgstr "Impossible d'ajouter l'attribut additionnel" +#: attr.c:359 #, c-format msgid "ignoring overly long attributes line %d" msgstr "ligne d'attribute trop longue ignorée %d" +#: attr.c:374 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s non permis : %s : %d" +#: attr.c:413 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1553,33 +1933,41 @@ msgstr "" "Les motifs de négation sont ignorés dans les attributs git\n" "Utilisez '\\!' pour un point d'exclamation littéral." +#: attr.c:736 #, c-format msgid "cannot fstat gitattributes file '%s'" msgstr "impossible de fstat le fichier gitattributes '%s'" +#: attr.c:741 #, c-format msgid "ignoring overly large gitattributes file '%s'" msgstr "fichier gitattributes trop gros ignoré '%s'" +#: attr.c:856 #, c-format msgid "ignoring overly large gitattributes blob '%s'" msgstr "blob gitattributes trop gros ignoré '%s'" +#: attr.c:1229 msgid "bad --attr-source or GIT_ATTR_SOURCE" msgstr "mauvais --attr-source ou GIT_ATTR_SOURCE" +#: bisect.c:491 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Contenu mal cité dans le fichier '%s' : %s" +#: bisect.c:703 #, c-format msgid "We cannot bisect more!\n" msgstr "Impossible de pousser la bissection plus loin !\n" +#: bisect.c:773 #, c-format msgid "Not a valid commit name %s" msgstr "%s n'est pas un nom de commit valide" +#: bisect.c:798 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1588,6 +1976,7 @@ msgstr "" "La base de fusion %s est mauvaise.\n" "Cela signifie que le bogue été corrigé entre %s et [%s].\n" +#: bisect.c:803 #, c-format msgid "" "The merge base %s is new.\n" @@ -1596,6 +1985,7 @@ msgstr "" "La base de fusion %s est nouvelle.\n" "La propriété a changé entre %s et [%s].\n" +#: bisect.c:808 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1604,6 +1994,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:816 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1614,6 +2005,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:829 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1625,29 +2017,36 @@ msgstr "" "et %s.\n" "On continue tout de même." +#: bisect.c:869 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bissection : une base de fusion doit être testée\n" +#: bisect.c:922 #, c-format msgid "a %s revision is needed" msgstr "une révision %s est nécessaire" +#: bisect.c:952 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" +#: bisect.c:999 builtin/merge.c:162 #, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" +#: bisect.c:1040 msgid "reading bisect refs failed" msgstr "impossible de lire les références de bissection" +#: bisect.c:1070 #, c-format msgid "%s was both %s and %s\n" msgstr "%s était à la fois %s et %s\n" +#: bisect.c:1080 #, c-format msgid "" "No testable commit found.\n" @@ -1656,6 +2055,7 @@ msgstr "" "Aucun commit testable n'a été trouvé\n" "Peut-être avez-vous démarré avec un mauvais arguement de chemin ?\n" +#: bisect.c:1111 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1665,37 +2065,50 @@ msgstr[1] "(à peu près %d étapes)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. +#: bisect.c:1117 #, 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:2770 msgid "--contents and --reverse do not blend well." msgstr "--contents et --reverse ne font pas bon ménage." +#: blame.c:2822 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:2831 builtin/commit.c:1141 builtin/log.c:510 builtin/log.c:1178 +#: builtin/log.c:1785 builtin/log.c:2229 builtin/log.c:2527 builtin/merge.c:418 +#: builtin/pack-objects.c:3422 builtin/pack-objects.c:3580 +#: builtin/pack-objects.c:4063 builtin/pack-objects.c:4078 +#: builtin/shortlog.c:273 midx.c:1159 pack-bitmap.c:1067 pack-bitmap.c:2188 +#: remote.c:2200 sequencer.c:2468 sequencer.c:5271 submodule.c:919 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" +#: blame.c:2849 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:2860 #, c-format msgid "no such path %s in %s" msgstr "pas de chemin %s dans %s" +#: blame.c:2873 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossible de lire le blob %s pour le chemin %s" +#: branch.c:100 msgid "" "cannot inherit upstream tracking configuration of multiple refs when " "rebasing is requested" @@ -1703,25 +2116,31 @@ msgstr "" "impossible d'hériter la configuration de suivi de référence amont depuis " "plusieurs références quand un rebasage est demandé" +#: branch.c:111 #, 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:167 #, c-format msgid "branch '%s' set up to track '%s' by rebasing." msgstr "la branche '%s' est paramétrée pour suivre '%s' en rebasant." +#: branch.c:168 #, c-format msgid "branch '%s' set up to track '%s'." msgstr "la branche '%s' est paramétrée pour suivre '%s'." +#: branch.c:171 #, c-format msgid "branch '%s' set up to track:" msgstr "la branche '%s' est paramétrée pour suivre :" +#: branch.c:183 msgid "unable to write upstream branch configuration" msgstr "échec de l'écriture de la configuration de branche amont" +#: branch.c:185 msgid "" "\n" "After fixing the error cause you may try to fix up\n" @@ -1731,16 +2150,19 @@ msgstr "" "Après correction de la cause de l'erreur, vous pouvez essayer\n" "de corriger l'information de suivi distant en invoquant :" +#: branch.c:226 #, c-format msgid "asked to inherit tracking from '%s', but no remote is set" msgstr "héritage de suivi depuis '%s' demandé, mais pas de distant configuré" +#: branch.c:232 #, c-format msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "" "héritage de suivi depuis '%s' demandé, mais pas de configuration de fusion " "renseignée" +#: branch.c:292 #, c-format msgid "not tracking: ambiguous information for ref '%s'" msgstr "pas de suivi : information ambiguë pour la référence '%s'" @@ -1756,6 +2178,7 @@ msgstr "pas de suivi : information ambiguë pour la référence '%s'" #. you'll probably want to swap the "%s" and leading " " space #. around. #. +#: branch.c:304 object-name.c:475 #, c-format msgid " %s\n" msgstr " %s\n" @@ -1763,6 +2186,7 @@ msgstr " %s\n" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. #. +#: branch.c:310 #, c-format msgid "" "There are multiple remotes whose fetch refspecs map to the remote\n" @@ -1783,30 +2207,36 @@ msgstr "" "que des réfspecs de récupération de distants différents\n" "correspondent à des espaces de nommage de suivi différents." +#: branch.c:374 #, c-format msgid "'%s' is not a valid branch name" msgstr "'%s' n'est pas un nom de branche valide" +#: branch.c:469 #, c-format msgid "a branch named '%s' already exists" msgstr "Une branche nommée '%s' existe déjà" +#: branch.c:473 #, c-format msgid "cannot force update the branch '%s' used by worktree at '%s'" msgstr "" "impossible de forcer la mise à jour de la branche '%s' utilisée par l'arbre-" "de-travail dans '%s'" +#: branch.c:498 #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" msgstr "" "Impossible de configurer le suivi de branche ; le point de départ '%s' n'est " "pas une branche" +#: branch.c:500 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la branche amont demandée '%s' n'existe pas" +#: branch.c:502 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1826,22 +2256,28 @@ msgstr "" "sa jumelle distante, vous pouvez utiliser \"git push -u\"\n" "pour paramétrer le suivi distant en même temps que vous poussez." +#: branch.c:550 builtin/replace.c:332 builtin/replace.c:388 +#: builtin/replace.c:434 builtin/replace.c:464 #, c-format msgid "not a valid object name: '%s'" msgstr "nom d'objet invalide : '%s'" +#: branch.c:571 #, c-format msgid "ambiguous object name: '%s'" msgstr "Nom d'objet ambigu : '%s'" +#: branch.c:576 #, c-format msgid "not a valid branch point: '%s'" msgstr "point d'embranchement invalide : '%s'" +#: branch.c:767 #, c-format msgid "submodule '%s': unable to find submodule" msgstr "sous-module '%s' : impossible de trouver le sous-module" +#: branch.c:770 #, c-format msgid "" "You may try updating the submodules using 'git checkout --no-recurse-" @@ -1850,24 +2286,30 @@ msgstr "" "Vous pouvez essayer de mettre à jour les sous-modules en utilisant 'git " "checkout --no-recurse-submodules %s && git submodule update --init'" +#: branch.c:781 branch.c:807 #, c-format msgid "submodule '%s': cannot create branch '%s'" msgstr "sous-module '%s' : impossible de créer la branche '%s'" +#: branch.c:841 #, c-format -msgid "'%s' is already checked out at '%s'" -msgstr "'%s' est déjà extrait dans '%s'" +msgid "'%s' is already used by worktree at '%s'" +msgstr "'%s' est déjà utilisé par l'arbre-de-travail dans '%s'" +#: builtin/add.c:32 msgid "git add [] [--] ..." msgstr "git add [] [--] ..." +#: builtin/add.c:64 #, c-format msgid "cannot chmod %cx '%s'" msgstr "impossible de chmod %cx '%s'" +#: builtin/add.c:126 msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" +#: builtin/add.c:159 msgid "" "the add.interactive.useBuiltin setting has been removed!\n" "See its entry in 'git help config' for details." @@ -1875,86 +2317,111 @@ msgstr "" "le réglage add.interactive.useBuiltin a été supprimé !\n" "Référez-vous à cette entrée dans 'git help config' pour plus de détails." -msgid "Could not read the index" -msgstr "Impossible de lire l'index" - -msgid "Could not write patch" -msgstr "Impossible d'écrire le patch" +#: builtin/add.c:185 +msgid "could not read the index" +msgstr "impossible de lire l'index" +#: builtin/add.c:200 msgid "editing patch failed" msgstr "échec de l'édition du patch" +#: builtin/add.c:203 read-cache.c:3209 #, c-format -msgid "Could not stat '%s'" -msgstr "Stat de '%s' impossible" +msgid "could not stat '%s'" +msgstr "impossible de stat '%s'" -msgid "Empty patch. Aborted." -msgstr "Patch vide. Abandon." +#: builtin/add.c:205 +msgid "empty patch. aborted" +msgstr "rustine vide. abandon" +#: builtin/add.c:211 #, c-format -msgid "Could not apply '%s'" -msgstr "Impossible d'appliquer '%s'" +msgid "could not apply '%s'" +msgstr "impossible d'appliquer '%s'" +#: builtin/add.c:220 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" +#: builtin/add.c:242 builtin/clean.c:935 builtin/fetch.c:2176 builtin/mv.c:174 +#: builtin/prune-packed.c:15 builtin/pull.c:215 builtin/push.c:604 +#: builtin/remote.c:1484 builtin/rm.c:252 builtin/send-pack.c:197 msgid "dry run" msgstr "simuler l'action" +#: builtin/add.c:243 builtin/check-ignore.c:24 builtin/commit.c:1509 +#: builtin/count-objects.c:102 builtin/fsck.c:908 builtin/log.c:2478 +#: builtin/mv.c:173 builtin/read-tree.c:129 msgid "be verbose" msgstr "mode verbeux" +#: builtin/add.c:245 msgid "interactive picking" msgstr "sélection interactive" +#: builtin/add.c:246 builtin/checkout.c:1653 builtin/reset.c:360 msgid "select hunks interactively" msgstr "sélection interactive des sections" +#: builtin/add.c:247 msgid "edit current diff and apply" msgstr "édition du diff actuel et application" +#: builtin/add.c:248 msgid "allow adding otherwise ignored files" msgstr "permettre l'ajout de fichiers ignorés" +#: builtin/add.c:249 msgid "update tracked files" msgstr "mettre à jour les fichiers suivis" +#: builtin/add.c:250 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)" +#: builtin/add.c:251 msgid "record only the fact that the path will be added later" msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard" +#: builtin/add.c:252 msgid "add changes from all tracked and untracked files" msgstr "ajouter les modifications de tous les fichiers suivis et non suivis" +#: builtin/add.c:255 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignorer les chemins effacés dans la copie de travail (identique à --no-all)" +#: builtin/add.c:257 msgid "don't add, only refresh the index" msgstr "ne pas ajouter, juste rafraîchir l'index" +#: builtin/add.c:258 msgid "just skip files which cannot be added because of errors" msgstr "" "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait " "d'erreurs" +#: builtin/add.c:259 msgid "check if - even missing - files are ignored in dry run" msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide" +#: builtin/add.c:260 builtin/mv.c:178 builtin/rm.c:259 msgid "allow updating entries outside of the sparse-checkout cone" msgstr "" "permettre la mise à jour des entrées hors du cone d'extraction clairsemée" +#: builtin/add.c:262 builtin/update-index.c:969 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exécutable pour les fichiers listés" +#: builtin/add.c:264 msgid "warn when adding an embedded repository" msgstr "avertir lors de l'ajout d'un dépôt embarqué" +#: builtin/add.c:286 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -1985,10 +2452,12 @@ msgstr "" "\n" "Référez-vous à \"git help submodule\" pour plus d'information." +#: builtin/add.c:315 #, c-format msgid "adding embedded git repository: %s" msgstr "dépôt git embarqué ajouté : %s" +#: builtin/add.c:335 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -1998,23 +2467,29 @@ msgstr "" "Éliminez ce message en lançant\n" "\"git config advice.addIgnoredFile false\"" +#: builtin/add.c:350 msgid "adding files failed" msgstr "échec de l'ajout de fichiers" +#: builtin/add.c:413 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x" +#: builtin/add.c:434 builtin/checkout.c:1829 builtin/commit.c:380 +#: builtin/reset.c:379 builtin/rm.c:283 builtin/stash.c:1780 #, c-format msgid "'%s' and pathspec arguments cannot be used together" msgstr "" "'%s' et les arguments de spécificateur de chemin ne peuvent pas être " "utilisés ensemble" +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Rien de spécifié, rien n'a été ajouté.\n" +#: builtin/add.c:447 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -2024,123 +2499,175 @@ msgstr "" "Éliminez ce message en lançant\n" "\"git config advice.addEmptyPathspec false\"" +#: builtin/add.c:465 builtin/check-ignore.c:185 builtin/checkout.c:568 +#: builtin/checkout.c:782 builtin/clean.c:1024 builtin/commit.c:394 +#: builtin/diff-tree.c:132 builtin/grep.c:560 builtin/mv.c:203 +#: builtin/reset.c:452 builtin/rm.c:303 builtin/submodule--helper.c:209 +#: builtin/submodule--helper.c:3240 read-cache.c:2035 read-cache.c:2353 +#: rerere.c:556 rerere.c:590 rerere.c:1104 submodule.c:1858 msgid "index file corrupt" msgstr "fichier d'index corrompu" +#: builtin/add.c:571 builtin/am.c:2010 builtin/am.c:2044 builtin/checkout.c:637 +#: builtin/checkout.c:913 builtin/clone.c:747 builtin/commit.c:458 +#: builtin/commit.c:482 builtin/commit.c:530 builtin/stash.c:304 merge.c:108 +#: rerere.c:712 +msgid "unable to write new index file" +msgstr "impossible d'écrire le nouveau fichier d'index" + +#: builtin/am.c:202 builtin/mailinfo.c:48 mailinfo.c:1257 #, c-format msgid "bad action '%s' for '%s'" msgstr "action invalide '%s' pour '%s'" +#: builtin/am.c:220 builtin/am.c:2262 builtin/am.c:2284 builtin/blame.c:741 +#: builtin/blame.c:759 builtin/fetch.c:164 builtin/pack-objects.c:3767 +#: builtin/pull.c:51 builtin/pull.c:53 builtin/pull.c:328 diff-merges.c:94 +#: gpg-interface.c:745 gpg-interface.c:760 ls-refs.c:37 parallel-checkout.c:47 +#: sequencer.c:2963 setup.c:589 #, c-format msgid "invalid value for '%s': '%s'" msgstr "valeur invalide pour '%s' : '%s'" +#: builtin/am.c:307 builtin/commit.c:859 builtin/merge.c:1149 sequencer.c:544 +#: sequencer.c:2011 sequencer.c:3262 sequencer.c:3697 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" +#: builtin/am.c:410 msgid "could not parse author script" msgstr "impossible d'analyser l'auteur du script" +#: builtin/am.c:417 builtin/am.c:462 builtin/am.c:467 builtin/am.c:1459 +#: builtin/am.c:2145 builtin/replace.c:467 commit.c:61 sequencer.c:3255 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" +#: builtin/am.c:502 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' a été effacé par le crochet applypatch-msg" +#: builtin/am.c:532 #, c-format msgid "Malformed input line: '%s'." msgstr "Ligne en entrée malformée : '%s'." +#: builtin/am.c:570 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Impossible de copier les notes de '%s' vers '%s'" +#: builtin/am.c:596 msgid "fseek failed" msgstr "échec de fseek" +#: builtin/am.c:764 builtin/am.c:856 builtin/rebase.c:676 sequencer.c:913 +#: wrapper.c:199 wrapper.c:369 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" +#: builtin/am.c:773 builtin/rebase.c:630 editor.c:148 sequencer.c:4259 +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" +#: builtin/am.c:784 #, c-format msgid "could not parse patch '%s'" msgstr "impossible d'analyser le patch '%s'" +#: builtin/am.c:849 msgid "Only one StGIT patch series can be applied at once" msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois" +#: builtin/am.c:897 msgid "invalid timestamp" msgstr "horodatage invalide" +#: builtin/am.c:902 builtin/am.c:914 msgid "invalid Date line" msgstr "ligne de Date invalide" +#: builtin/am.c:909 msgid "invalid timezone offset" msgstr "décalage horaire invalide" +#: builtin/am.c:1002 msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." +#: builtin/am.c:1007 builtin/clone.c:317 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" +#: builtin/am.c:1012 msgid "Failed to split patches." msgstr "Échec de découpage des patchs." +#: builtin/am.c:1161 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"." +#: builtin/am.c:1162 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"." +#: builtin/am.c:1167 #, c-format msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." msgstr "" "Pour enregistrer la rustine vide comme un commit vide, lancez \"%s --allow-" "empty\"." +#: builtin/am.c:1169 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --" "abort\"." +#: builtin/am.c:1264 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent " "être perdus." +#: builtin/am.c:1353 #, c-format msgid "missing author line in commit %s" msgstr "ligne d'auteur manquante dans le commit %s" +#: builtin/am.c:1356 #, c-format msgid "invalid ident line: %.*s" msgstr "ligne d'identification invalide : %.*s" +#: builtin/am.c:1378 builtin/checkout.c:822 builtin/clone.c:738 +#: commit-graph.c:1237 #, c-format msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" +#: builtin/am.c:1586 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " "points." +#: builtin/am.c:1588 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilisation de l'information de l'index pour reconstruire un arbre de base..." +#: builtin/am.c:1608 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -2148,25 +2675,33 @@ msgstr "" "Avez-vous édité le patch à la main ?\n" "Il ne s'applique pas aux blobs enregistrés dans son index." +#: builtin/am.c:1614 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour à un patch de la base et fusion à 3 points..." +#: builtin/am.c:1640 msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." +#: builtin/am.c:1664 builtin/merge.c:695 sequencer.c:1515 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" +#: builtin/am.c:1672 msgid "applying to an empty history" msgstr "application à un historique vide" +#: builtin/am.c:1691 builtin/commit.c:1847 builtin/merge.c:915 +#: builtin/merge.c:940 sequencer.c:1625 t/helper/test-fast-rebase.c:87 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" +#: builtin/am.c:1724 builtin/am.c:1728 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." +#: builtin/am.c:1746 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -2174,46 +2709,58 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. +#: builtin/am.c:1756 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : " +#: builtin/am.c:1803 builtin/commit.c:427 msgid "unable to write index file" msgstr "impossible d'écrire le fichier d'index" +#: builtin/am.c:1807 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" +#: builtin/am.c:1849 #, c-format msgid "Skipping: %.*s" msgstr "Ignoré : %.*s" +#: builtin/am.c:1854 #, c-format msgid "Creating an empty commit: %.*s" msgstr "Création d'un commit vide : %.*s" +#: builtin/am.c:1858 msgid "Patch is empty." msgstr "Le patch actuel est vide." +#: builtin/am.c:1869 builtin/am.c:1938 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" +#: builtin/am.c:1886 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "l'application de la rustine a échoué à %s %.*s" +#: builtin/am.c:1896 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" "Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec" +#: builtin/am.c:1942 msgid "No changes - recorded it as an empty commit." msgstr "aucune modification - enregistré comme un commit vide." +#: builtin/am.c:1944 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -2224,6 +2771,7 @@ msgstr "" "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " "patch." +#: builtin/am.c:1952 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -2236,16 +2784,17 @@ msgstr "" "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour " "accepter son état." -msgid "unable to write new index file" -msgstr "impossible d'écrire le nouveau fichier d'index" - +#: builtin/am.c:2060 builtin/am.c:2064 builtin/am.c:2076 builtin/reset.c:399 +#: builtin/reset.c:407 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." +#: builtin/am.c:2112 builtin/am.c:2188 msgid "failed to clean index" msgstr "échec du nettoyage de l'index" +#: builtin/am.c:2156 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -2253,113 +2802,159 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" +#: builtin/am.c:2229 builtin/bisect.c:183 worktree.c:242 #, c-format msgid "failed to read '%s'" msgstr "échec de la lecture de '%s'" -#, c-format -msgid "options '%s=%s' and '%s=%s' cannot be used together" -msgstr "les options '%s=%s' et '%s=%s' ne peuvent pas être utilisées ensemble" - +#: builtin/am.c:2300 msgid "git am [] [( | )...]" msgstr "git am [] [( | )...]" +#: builtin/am.c:2301 msgid "git am [] (--continue | --skip | --abort)" msgstr "git am [] (--continue | --skip | --abort)" +#: builtin/am.c:2307 msgid "run interactively" msgstr "exécution interactive" +#: builtin/am.c:2309 msgid "bypass pre-applypatch and applypatch-msg hooks" msgstr "court-circuiter les crochets pre-applypatch and applypatch-msg" +#: builtin/am.c:2311 msgid "historical option -- no-op" msgstr "option historique -- no-op" +#: builtin/am.c:2313 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" +#: builtin/am.c:2314 builtin/init-db.c:91 builtin/prune-packed.c:17 +#: builtin/repack.c:1159 builtin/stash.c:1022 msgid "be quiet" msgstr "être silencieux" +#: builtin/am.c:2316 msgid "add a Signed-off-by trailer to the commit message" msgstr "ajouter une ligne terminale Signed-off-by au message de validation" +#: builtin/am.c:2319 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par défaut)" +#: builtin/am.c:2321 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k à git-mailinfo" +#: builtin/am.c:2323 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b à git-mailinfo" +#: builtin/am.c:2325 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m à git-mailinfo" +#: builtin/am.c:2327 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox" +#: builtin/am.c:2330 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" +#: builtin/am.c:2332 msgid "pass it through git-mailinfo" msgstr "le passer à travers git-mailinfo" +#: builtin/am.c:2335 builtin/am.c:2338 builtin/am.c:2341 builtin/am.c:2344 +#: builtin/am.c:2347 builtin/am.c:2350 builtin/am.c:2353 builtin/am.c:2356 +#: builtin/am.c:2362 msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" +#: builtin/am.c:2352 builtin/commit.c:1540 builtin/fmt-merge-msg.c:19 +#: builtin/fmt-merge-msg.c:22 builtin/grep.c:978 builtin/merge.c:250 +#: builtin/pull.c:149 builtin/pull.c:211 builtin/pull.c:228 +#: builtin/rebase.c:1105 builtin/repack.c:1170 builtin/repack.c:1174 +#: builtin/repack.c:1176 builtin/show-branch.c:661 builtin/show-ref.c:301 +#: builtin/tag.c:456 parse-options.h:215 parse-options.h:276 +#: parse-options.h:526 msgid "n" msgstr "n" +#: builtin/am.c:2358 builtin/branch.c:758 builtin/bugreport.c:121 +#: builtin/cat-file.c:948 builtin/cat-file.c:952 builtin/cat-file.c:959 +#: builtin/diagnose.c:27 builtin/for-each-ref.c:48 builtin/ls-files.c:646 +#: builtin/ls-tree.c:373 builtin/replace.c:566 builtin/tag.c:492 +#: builtin/verify-tag.c:31 msgid "format" msgstr "format" +#: builtin/am.c:2359 msgid "format the patch(es) are in" msgstr "format de présentation des patchs" +#: builtin/am.c:2365 msgid "override error message when patch failure occurs" msgstr "surcharger le message d'erreur lors d'un échec d'application de patch" +#: builtin/am.c:2367 msgid "continue applying patches after resolving a conflict" msgstr "continuer à appliquer les patchs après résolution d'un conflit" +#: builtin/am.c:2370 msgid "synonyms for --continue" msgstr "synonymes de --continue" +#: builtin/am.c:2373 msgid "skip the current patch" msgstr "sauter le patch courant" +#: builtin/am.c:2376 msgid "restore the original branch and abort the patching operation" msgstr "restaurer la branche originale et abandonner les applications de patch" +#: builtin/am.c:2379 msgid "abort the patching operation but keep HEAD where it is" msgstr "abandonne l'opération de patch mais garde HEAD où il est" +#: builtin/am.c:2383 msgid "show the patch being applied" msgstr "afficher le patch en cours d'application" +#: builtin/am.c:2387 msgid "record the empty patch as an empty commit" msgstr "enregistrer la rustine vide comme un commit vide" +#: builtin/am.c:2391 msgid "lie about committer date" msgstr "mentir sur la date de validation" +#: builtin/am.c:2393 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" +#: builtin/am.c:2395 builtin/commit-tree.c:113 builtin/commit.c:1666 +#: builtin/merge.c:289 builtin/pull.c:186 builtin/rebase.c:1161 +#: builtin/revert.c:107 builtin/tag.c:471 msgid "key-id" msgstr "id-clé" +#: builtin/am.c:2396 builtin/rebase.c:1162 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" +#: builtin/am.c:2399 msgid "how to handle empty patches" msgstr "comment gérer les rustines vides" +#: builtin/am.c:2402 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" +#: builtin/am.c:2420 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -2367,14 +2962,17 @@ msgstr "" "L'option -b/--binary ne fait plus rien depuis longtemps,\n" "et elle sera supprimée. Veuillez ne plus l'utiliser." +#: builtin/am.c:2427 msgid "failed to read the index" msgstr "échec à la lecture de l'index" +#: builtin/am.c:2442 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "le répertoire précédent de rebasage %s existe toujours mais mbox donnée." +#: builtin/am.c:2466 #, c-format msgid "" "Stray %s directory found.\n" @@ -2383,94 +2981,119 @@ msgstr "" "Répertoire abandonné %s trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." +#: builtin/am.c:2472 msgid "Resolve operation not in progress, we are not resuming." msgstr "" "Pas de résolution de l'opération en cours, nous ne sommes pas dans une " "reprise." +#: builtin/am.c:2482 msgid "interactive mode requires patches on the command line" msgstr "le mode interactif requiert des rustines sur la ligne de commande" +#: builtin/apply.c:8 msgid "git apply [] [...]" msgstr "git apply [] [...]" +#: builtin/archive.c:19 diagnose.c:209 msgid "could not redirect output" msgstr "impossible de rediriger la sortie" +#: builtin/archive.c:36 msgid "git archive: Remote with no URL" msgstr "git archive : Dépôt distant sans URL" +#: builtin/archive.c:60 msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive : ACK/NACK attendu, paquet de nettoyage reçu" +#: builtin/archive.c:63 #, c-format msgid "git archive: NACK %s" msgstr "git archive : NACK %s" +#: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive : erreur de protocole" +#: builtin/archive.c:68 msgid "git archive: expected a flush" msgstr "git archive : vidage attendu" +#: builtin/bisect.c:29 msgid "" -"git bisect start [--term-{new,bad}= --term-{old,good}=] [--no-" +"git bisect start [--term-(new|bad)= --term-(old|good)=] [--no-" "checkout] [--first-parent] [ [...]] [--] [...]" msgstr "" "git bisect start [--term-{new,bad}= --term-{old,good}=] [--" "no-checkout] [--first-parent] [ [...]] [--] [...]" +#: builtin/bisect.c:33 msgid "git bisect (good|bad) [...]" msgstr "git bisect (good|bad) [...]" +#: builtin/bisect.c:37 msgid "git bisect skip [(|)...]" msgstr "git bisect skip [(|)...]" +#: builtin/bisect.c:41 msgid "git bisect reset []" msgstr "git bisect reset []" +#: builtin/bisect.c:45 msgid "git bisect replay " msgstr "git bisect replay " -msgid "git bisect run ..." -msgstr "git bisect run ..." +#: builtin/bisect.c:49 +msgid "git bisect run [...]" +msgstr "git bisect run [...]" +#: builtin/bisect.c:136 #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "impossible d'ouvrir le fichier '%s' en mode '%s'" +#: builtin/bisect.c:143 #, c-format msgid "could not write to file '%s'" msgstr "impossible d'écrire le fichier '%s'" +#: builtin/bisect.c:181 #, c-format msgid "cannot open file '%s' for reading" msgstr "impossible d'ouvrir le fichier '%s' en lecture" +#: builtin/bisect.c:197 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' n'est pas un terme valide" +#: builtin/bisect.c:201 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "impossible d'utiliser la commande incluse '%s' comme terme" +#: builtin/bisect.c:211 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "impossible de modifier la signification du terme '%s'" +#: builtin/bisect.c:221 msgid "please use two different terms" msgstr "veuillez utiliser deux termes différents" +#: builtin/bisect.c:237 #, c-format msgid "We are not bisecting.\n" msgstr "Pas de bissection en cours.\n" +#: builtin/bisect.c:245 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' n'est pas un commit valide" +#: builtin/bisect.c:256 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." @@ -2478,22 +3101,27 @@ msgstr "" "échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset " "'." +#: builtin/bisect.c:299 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Mauvais argument pour bisect_write : %s" +#: builtin/bisect.c:304 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "impossible d'obtenir l'oid de la révision '%s'" +#: builtin/bisect.c:316 #, c-format msgid "couldn't open the file '%s'" msgstr "impossible d'ouvrir le fichier '%s'" +#: builtin/bisect.c:342 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Commande invalide : vous êtes actuellement dans une bissection %s/%s" +#: builtin/bisect.c:370 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -2502,6 +3130,7 @@ msgstr "" "Vous devez me donner au moins une révision %s et une révision %s.\n" "Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela." +#: builtin/bisect.c:374 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -2512,6 +3141,7 @@ msgstr "" "Puis vous devez me donner au moins une révision %s et une révision %s.\n" "Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela." +#: builtin/bisect.c:394 #, c-format msgid "bisecting only with a %s commit" msgstr "bissection avec seulement un commit %s" @@ -2520,24 +3150,30 @@ msgstr "bissection avec seulement un commit %s" #. translation. The program will only accept English input #. at this point. #. +#: builtin/bisect.c:402 msgid "Are you sure [Y/n]? " msgstr "Confirmez-vous [Y/n] ? " +#: builtin/bisect.c:459 msgid "status: waiting for both good and bad commits\n" msgstr "status : en attente d'un commit bon et d'un commit mauvais\n" +#: builtin/bisect.c:461 #, c-format msgid "status: waiting for bad commit, %d good commit known\n" msgid_plural "status: waiting for bad commit, %d good commits known\n" msgstr[0] "status : en attente d'un mauvais commit, %d commit bon connu\n" msgstr[1] "status : en attente d'un mauvais commit, %d commits bons connus\n" +#: builtin/bisect.c:465 msgid "status: waiting for good commit(s), bad commit known\n" msgstr "status : en attente de bon(s) commit(s), un mauvais commit connu\n" +#: builtin/bisect.c:504 msgid "no terms defined" msgstr "aucun terme défini" +#: builtin/bisect.c:507 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -2546,6 +3182,7 @@ msgstr "" "Vos termes actuels sont %s pour l'état ancien\n" "et %s pour le nouvel état.\n" +#: builtin/bisect.c:517 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -2555,39 +3192,49 @@ msgstr "" "Les options supportées sont : --term-good|--term-old et --term-bad|--term-" "new." +#: builtin/bisect.c:584 builtin/bisect.c:1109 msgid "revision walk setup failed\n" msgstr "échec de la préparation du parcours des révisions\n" +#: builtin/bisect.c:606 #, c-format msgid "could not open '%s' for appending" msgstr "impossible d'ouvrir '%s' en ajout" +#: builtin/bisect.c:730 builtin/bisect.c:743 msgid "'' is not a valid term" msgstr "'' n'est pas un terme valide" +#: builtin/bisect.c:753 #, c-format msgid "unrecognized option: '%s'" msgstr "option non reconnue : '%s'" +#: builtin/bisect.c:757 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' ne semble être une révision valide" +#: builtin/bisect.c:788 msgid "bad HEAD - I need a HEAD" msgstr "mauvaise HEAD - j'ai besoin d'une HEAD" +#: builtin/bisect.c:804 #, c-format msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "" "l'extraction de '%s' a échoué. Essayez 'git bisect start '." +#: builtin/bisect.c:821 msgid "bad HEAD - strange symbolic ref" msgstr "mauvaise HEAD - référence symbolique douteuse" +#: builtin/bisect.c:841 #, c-format msgid "invalid ref: '%s'" msgstr "réference invalide : '%s'" +#: builtin/bisect.c:899 msgid "You need to start by \"git bisect start\"\n" msgstr "Vous devez démarrer avec \"git bisect start\"\n" @@ -2595,214 +3242,280 @@ msgstr "Vous devez démarrer avec \"git bisect start\"\n" #. translation. The program will only accept English input #. at this point. #. +#: builtin/bisect.c:910 msgid "Do you want me to do it for you [Y/n]? " msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? " +#: builtin/bisect.c:928 msgid "Please call `--bisect-state` with at least one argument" msgstr "Veuillez appeler `--bisect-state` avec au moins un argument" +#: builtin/bisect.c:941 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' n'accepte qu'un seul argument." +#: builtin/bisect.c:954 builtin/bisect.c:967 #, c-format msgid "Bad rev input: %s" msgstr "Mauvaise révision en entrée : %s" +#: builtin/bisect.c:974 #, c-format msgid "Bad rev input (not a commit): %s" msgstr "Mauvaise révision en entrée (pas un commit) : %s" +#: builtin/bisect.c:1006 msgid "We are not bisecting." msgstr "Pas de bissection en cours." +#: builtin/bisect.c:1056 #, c-format msgid "'%s'?? what are you talking about?" msgstr "'%s' ?? de quoi parlez-vous ?" +#: builtin/bisect.c:1068 #, c-format msgid "cannot read file '%s' for replaying" msgstr "impossible de lire le fichier '%s' pour rejouer" +#: builtin/bisect.c:1175 #, c-format msgid "running %s\n" msgstr "Lancement de %s\n" +#: builtin/bisect.c:1222 msgid "bisect run failed: no command provided." msgstr "la bissection a échoué : aucune commande fournie." +#: builtin/bisect.c:1242 #, c-format msgid "unable to verify %s on good revision" msgstr "impossible de vérifier %s sur une bonne révision" +#: builtin/bisect.c:1248 #, c-format msgid "bogus exit code %d for good revision" msgstr "code de sortie %d erroné pour une bonne révision" +#: builtin/bisect.c:1256 #, c-format msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" msgstr "la bissection a échoué : le code retour %d de %s est < 0 ou >= 128" +#: builtin/bisect.c:1271 #, c-format msgid "cannot open file '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" +#: builtin/bisect.c:1289 msgid "bisect run cannot continue any more" msgstr "la bissection ne peut plus continuer" +#: builtin/bisect.c:1291 msgid "bisect run success" msgstr "succès de la bissection" +#: builtin/bisect.c:1294 msgid "bisect found first bad commit" msgstr "la bissection a trouvé le premier mauvais commit" +#: builtin/bisect.c:1297 #, c-format msgid "bisect run failed: 'git bisect %s' exited with error code %d" msgstr "la bissection a échoué : 'git bisect %s' a retourné le code erreur %d" +#: builtin/bisect.c:1312 #, c-format msgid "'%s' requires either no argument or a commit" msgstr "%s supporte soit aucun argument, soit un commit" +#: builtin/bisect.c:1323 #, c-format msgid "'%s' requires 0 or 1 argument" msgstr "'%s' nécessite 0 ou 1 argument" +#: builtin/bisect.c:1347 #, c-format msgid "'%s' requires 0 arguments" msgstr "'%s' n'accepte aucun argument" +#: builtin/bisect.c:1366 msgid "no logfile given" msgstr "pas de fichier de log donné" +#: builtin/bisect.c:1402 #, c-format msgid "'%s' failed: no command provided." msgstr "'%s' a échoué : aucune commande fournie." +#: builtin/bisect.c:1433 msgid "need a command" msgstr "commande requise" +#: builtin/bisect.c:1438 builtin/cat-file.c:731 #, c-format msgid "unknown command: '%s'" msgstr "commande inconnue : '%s'" +#: builtin/blame.c:39 msgid "git blame [] [] [] [--] " msgstr "git blame [] [] [] [--] " +#: builtin/blame.c:40 msgid "git annotate [] [] [] [--] " msgstr "git annotate [] [] [] [--] " +#: builtin/blame.c:45 builtin/blame.c:52 msgid " are documented in git-rev-list(1)" msgstr " sont documentés dans git-rev-list(1)" +#: builtin/blame.c:421 #, c-format msgid "expecting a color: %s" msgstr "couleur attendue : %s" +#: builtin/blame.c:428 msgid "must end with a color" msgstr "doit finir avec une couleur" +#: builtin/blame.c:859 #, c-format msgid "cannot find revision %s to ignore" msgstr "référence à ignorer %s introuvable" +#: builtin/blame.c:881 msgid "show blame entries as we find them, incrementally" msgstr "" "montrer les éléments de blâme au fur et à mesure de leur découverte, de " "manière incrémentale" +#: builtin/blame.c:882 msgid "do not show object names of boundary commits (Default: off)" msgstr "" "ne pas montrer les noms des objets pour les commits de limite (Défaut : " "désactivé)" +#: builtin/blame.c:883 msgid "do not treat root commits as boundaries (Default: off)" msgstr "" "ne pas traiter les commits racine comme des limites (Défaut : désactivé)" +#: builtin/blame.c:884 msgid "show work cost statistics" msgstr "montrer les statistiques de coût d'activité" +#: builtin/blame.c:885 builtin/checkout.c:1608 builtin/clone.c:110 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:254 builtin/fetch.c:2183 +#: builtin/merge.c:288 builtin/multi-pack-index.c:130 +#: builtin/multi-pack-index.c:182 builtin/multi-pack-index.c:209 +#: builtin/multi-pack-index.c:238 builtin/pull.c:127 builtin/push.c:620 +#: builtin/remote.c:696 builtin/send-pack.c:205 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" +#: builtin/blame.c:886 msgid "show output score for blame entries" msgstr "montrer le score de sortie pour les éléments de blâme" +#: builtin/blame.c:887 msgid "show original filename (Default: auto)" msgstr "montrer les noms de fichier originaux (Défaut : auto)" +#: builtin/blame.c:888 msgid "show original linenumber (Default: off)" msgstr "montrer les numéros de lignes originaux (Défaut : désactivé)" +#: builtin/blame.c:889 msgid "show in a format designed for machine consumption" msgstr "afficher dans un format propice à la consommation par machine" +#: builtin/blame.c:890 msgid "show porcelain format with per-line commit information" msgstr "afficher en format porcelaine avec l'information de commit par ligne" +#: builtin/blame.c:891 msgid "use the same output mode as git-annotate (Default: off)" msgstr "utiliser le même mode de sortie que git-annotate (Défaut : désactivé)" +#: builtin/blame.c:892 msgid "show raw timestamp (Default: off)" msgstr "afficher les horodatages bruts (Défaut : désactivé)" +#: builtin/blame.c:893 msgid "show long commit SHA1 (Default: off)" msgstr "afficher les longs SHA1 de commits (Défaut : désactivé)" +#: builtin/blame.c:894 msgid "suppress author name and timestamp (Default: off)" msgstr "supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)" +#: builtin/blame.c:895 msgid "show author email instead of name (Default: off)" msgstr "afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)" +#: builtin/blame.c:896 msgid "ignore whitespace differences" msgstr "ignorer les différences d'espace" +#: builtin/blame.c:897 builtin/log.c:1983 msgid "rev" msgstr "rév" +#: builtin/blame.c:897 msgid "ignore when blaming" msgstr "ignorer pendant le blâme" +#: builtin/blame.c:898 msgid "ignore revisions from " msgstr "ignorer les révisions listées dans " +#: builtin/blame.c:899 msgid "color redundant metadata from previous line differently" msgstr "" "colorer différemment les métadonnées redondantes avec la ligne précédente" +#: builtin/blame.c:900 msgid "color lines by age" msgstr "colorier les lignes par âge" +#: builtin/blame.c:901 msgid "spend extra cycles to find better match" msgstr "" "dépenser des cycles supplémentaires pour trouver une meilleure correspondance" +#: builtin/blame.c:902 msgid "use revisions from instead of calling git-rev-list" msgstr "" "utiliser les révisions du fichier au lieu d'appeler git-rev-list" +#: builtin/blame.c:903 msgid "use 's contents as the final image" msgstr "utiliser le contenu de comme image finale" +#: builtin/blame.c:904 builtin/blame.c:905 msgid "score" msgstr "score" +#: builtin/blame.c:904 msgid "find line copies within and across files" msgstr "trouver les copies de ligne dans et entre les fichiers" +#: builtin/blame.c:905 msgid "find line movements within and across files" msgstr "trouver les mouvements de ligne dans et entre les fichiers" +#: builtin/blame.c:906 msgid "range" msgstr "plage" +#: builtin/blame.c:907 msgid "process only line range , or function :" msgstr "" "traiter seulement l'intervalle de ligne , ou la fonction : " +#: builtin/blame.c:970 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress ne peut pas être utilisé avec --incremental ou les formats " @@ -2816,21 +3529,26 @@ msgstr "" #. your language may need more or fewer display #. columns. #. +#: builtin/blame.c:1021 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" +#: builtin/blame.c:1137 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "le fichier %s n'a qu'%lu ligne" msgstr[1] "le fichier %s n'a que %lu lignes" +#: builtin/blame.c:1185 msgid "Blaming lines" msgstr "Assignation de blâme aux lignes" +#: builtin/branch.c:33 msgid "git branch [] [-r | -a] [--merged] [--no-merged]" msgstr "git branch [] [-r | -a] [--merged | --no-merged]" +#: builtin/branch.c:34 msgid "" "git branch [] [-f] [--recurse-submodules] []" @@ -2838,68 +3556,85 @@ msgstr "" "git branch [] [-f] [--recurse-submodules] []" +#: builtin/branch.c:35 msgid "git branch [] [-l] [...]" msgstr "git branch [] [-l] [...]" +#: builtin/branch.c:36 msgid "git branch [] [-r] (-d | -D) ..." msgstr "git branch [] [-r] (-d | -D) ..." +#: builtin/branch.c:37 msgid "git branch [] (-m | -M) [] " msgstr "" "git branch [] (-m | -M) [] " +#: builtin/branch.c:38 msgid "git branch [] (-c | -C) [] " msgstr "" "git branch [] (-c | -C) [] " +#: builtin/branch.c:39 msgid "git branch [] [-r | -a] [--points-at]" msgstr "git branch [] [-r | -a] [--points-at]" +#: builtin/branch.c:40 msgid "git branch [] [-r | -a] [--format]" msgstr "git branch [] [-r | -a] [--format]" +#: builtin/branch.c:175 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" -" '%s', but not yet merged to HEAD." +" '%s', but not yet merged to HEAD" msgstr "" "suppression de la branche '%s' qui a été fusionnée dans\n" -" '%s', mais pas dans HEAD." +" '%s', mais pas encore dans HEAD" +#: builtin/branch.c:179 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" -" '%s', even though it is merged to HEAD." +" '%s', even though it is merged to HEAD" msgstr "" -"branche '%s' non supprimée car elle n'a pas été fusionnée dans\n" -" '%s', même si elle est fusionnée dans HEAD." +"branche '%s' non supprimée car elle n'a pas encore été fusionnée dans\n" +" '%s', même si elle est fusionnée dans HEAD" +#: builtin/branch.c:193 #, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "Impossible de rechercher l'objet commit pour '%s'" +msgid "couldn't look up commit object for '%s'" +msgstr "impossible de rechercher l'objet commit pour '%s'" +#: builtin/branch.c:197 #, c-format msgid "" -"The branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'." +"the branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'" msgstr "" -"La branche '%s' n'est pas totalement fusionnée.\n" -"Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'." +"la branche '%s' n'est pas totalement fusionnée.\n" +"Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'" -msgid "Update of config-file failed" -msgstr "Échec de la mise à jour du fichier de configuration" +#: builtin/branch.c:210 +msgid "update of config-file failed" +msgstr "échec de la mise à jour du fichier de configuration" +#: builtin/branch.c:245 msgid "cannot use -a with -d" msgstr "impossible d'utiliser -a avec -d" +#: builtin/branch.c:263 #, c-format -msgid "Cannot delete branch '%s' checked out at '%s'" -msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'" +msgid "cannot delete branch '%s' used by worktree at '%s'" +msgstr "" +"impossible de supprimer la branche '%s' utilisée par l'arbre-de-travail dans " +"'%s'" +#: builtin/branch.c:278 #, c-format -msgid "remote-tracking branch '%s' not found." -msgstr "branche de suivi '%s' non trouvée." +msgid "remote-tracking branch '%s' not found" +msgstr "branche de suivi '%s' non trouvée" +#: builtin/branch.c:289 #, c-format msgid "" "branch '%s' not found.\n" @@ -2908,80 +3643,100 @@ msgstr "" "branche '%s' non trouvée.\n" "Avez-vous oublié --remote ?" +#: builtin/branch.c:293 #, c-format -msgid "branch '%s' not found." -msgstr "branche '%s' non trouvée." +msgid "branch '%s' not found" +msgstr "branche '%s' non trouvée" +#: builtin/branch.c:326 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Branche de suivi %s supprimée (précédemment %s).\n" +#: builtin/branch.c:327 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branche %s supprimée (précédemment %s).\n" +#: builtin/branch.c:467 builtin/tag.c:74 msgid "unable to parse format string" msgstr "impossible d'analyser la chaîne de format" +#: builtin/branch.c:500 msgid "could not resolve HEAD" msgstr "impossible de résoudre HEAD" +#: builtin/branch.c:506 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) pointe hors de refs/heads/" +#: builtin/branch.c:521 #, c-format -msgid "Branch %s is being rebased at %s" -msgstr "La branche %s est en cours de rebasage sur %s" +msgid "branch %s is being rebased at %s" +msgstr "la branche %s est en cours de rebasage sur %s" +#: builtin/branch.c:525 #, c-format -msgid "Branch %s is being bisected at %s" -msgstr "La branche %s est en cours de bissection sur %s" +msgid "branch %s is being bisected at %s" +msgstr "la branche %s est en cours de bissection sur %s" +#: builtin/branch.c:554 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "la HEAD de la copie de travail %s n'est pas mise à jour" +#: builtin/branch.c:581 #, c-format -msgid "Invalid branch name: '%s'" -msgstr "Nom de branche invalide : '%s'" +msgid "invalid branch name: '%s'" +msgstr "nom de branche invalide : '%s'" +#: builtin/branch.c:597 builtin/branch.c:881 builtin/branch.c:926 #, c-format -msgid "No commit on branch '%s' yet." -msgstr "Aucun commit sur la branche '%s'." +msgid "no commit on branch '%s' yet" +msgstr "aucun commit encore sur la branche '%s'" +#: builtin/branch.c:599 builtin/branch.c:882 #, c-format -msgid "No branch named '%s'." -msgstr "Aucune branche nommée '%s'." +msgid "no branch named '%s'" +msgstr "aucune branche nommée '%s'" -msgid "Branch rename failed" -msgstr "Échec de renommage de la branche" +#: builtin/branch.c:627 +msgid "branch rename failed" +msgstr "échec de renommage de la branche" -msgid "Branch copy failed" -msgstr "Échec de copie de la branche" +#: builtin/branch.c:629 +msgid "branch copy failed" +msgstr "échec de copie de la branche" +#: builtin/branch.c:633 #, c-format -msgid "Created a copy of a misnamed branch '%s'" -msgstr "Création d'une copie d'une branche mal nommée '%s'" +msgid "created a copy of a misnamed branch '%s'" +msgstr "création d'une copie d'une branche mal nommée '%s'" +#: builtin/branch.c:636 #, c-format -msgid "Renamed a misnamed branch '%s' away" -msgstr "Renommage d'une branche mal nommée '%s'" +msgid "renamed a misnamed branch '%s' away" +msgstr "renommage d'une branche mal nommée '%s'" +#: builtin/branch.c:643 #, c-format -msgid "Branch renamed to %s, but HEAD is not updated!" -msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !" +msgid "branch renamed to %s, but HEAD is not updated" +msgstr "la branche a été renommée en %s, mais HEAD n'est pas mise à jour" -msgid "Branch is renamed, but update of config-file failed" +#: builtin/branch.c:650 +msgid "branch is renamed, but update of config-file failed" msgstr "" -"La branche est renommée, mais la mise à jour du fichier de configuration a " +"la branche est renommée, mais la mise à jour du fichier de configuration a " "échoué" -msgid "Branch is copied, but update of config-file failed" +#: builtin/branch.c:652 +msgid "branch is copied, but update of config-file failed" msgstr "" -"La branche est copiée, mais la mise à jour du fichier de configuration a " +"la branche est copiée, mais la mise à jour du fichier de configuration a " "échoué" +#: builtin/branch.c:672 #, c-format msgid "" "Please edit the description for the branch\n" @@ -2992,114 +3747,155 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" +#: builtin/branch.c:710 msgid "Generic options" msgstr "Options génériques" +#: builtin/branch.c:712 msgid "show hash and subject, give twice for upstream branch" msgstr "afficher le hachage et le sujet, doublé pour la branche amont" +#: builtin/branch.c:713 msgid "suppress informational messages" msgstr "supprimer les messages d'information" +#: builtin/branch.c:715 builtin/checkout.c:1625 +#: builtin/submodule--helper.c:2989 msgid "set branch tracking configuration" msgstr "règler la configuration des branches de suivi" +#: builtin/branch.c:718 msgid "do not use" msgstr "ne pas utiliser" +#: builtin/branch.c:720 msgid "upstream" msgstr "amont" +#: builtin/branch.c:720 msgid "change the upstream info" msgstr "modifier l'information amont" +#: builtin/branch.c:721 msgid "unset the upstream info" msgstr "désactiver l'information amont" +#: builtin/branch.c:722 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" +#: builtin/branch.c:723 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" +#: builtin/branch.c:726 builtin/branch.c:728 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" +#: builtin/branch.c:727 builtin/branch.c:729 msgid "print only branches that don't contain the commit" msgstr "afficher seulement les branches qui ne contiennent pas le commit" +#: builtin/branch.c:732 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" +#: builtin/branch.c:733 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" +#: builtin/branch.c:736 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" +#: builtin/branch.c:737 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" +#: builtin/branch.c:738 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" +#: builtin/branch.c:739 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" +#: builtin/branch.c:741 builtin/for-each-ref.c:44 builtin/tag.c:485 msgid "do not output a newline after empty formatted refs" msgstr "ne pas générer de nouvelle ligne après des réfs formatées vides" +#: builtin/branch.c:742 msgid "copy a branch and its reflog" msgstr "copier une branche et son reflog" +#: builtin/branch.c:743 msgid "copy a branch, even if target exists" msgstr "copier une branche, même si la cible existe" +#: builtin/branch.c:744 msgid "list branch names" msgstr "afficher les noms des branches" +#: builtin/branch.c:745 msgid "show current branch name" msgstr "afficher le nom de la branche courante" +#: builtin/branch.c:746 builtin/submodule--helper.c:2987 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" +#: builtin/branch.c:748 msgid "edit the description for the branch" msgstr "éditer la description de la branche" +#: builtin/branch.c:749 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" +#: builtin/branch.c:750 msgid "print only branches that are merged" msgstr "afficher seulement les branches qui sont fusionnées" +#: builtin/branch.c:751 msgid "print only branches that are not merged" msgstr "afficher seulement les branches qui ne sont pas fusionnées" +#: builtin/branch.c:752 msgid "list branches in columns" msgstr "afficher les branches en colonnes" +#: builtin/branch.c:754 builtin/for-each-ref.c:53 builtin/notes.c:492 +#: builtin/notes.c:495 builtin/notes.c:668 builtin/notes.c:671 +#: builtin/tag.c:488 msgid "object" msgstr "objet" +#: builtin/branch.c:755 msgid "print only branches of the object" msgstr "afficher seulement les branches de l'objet" +#: builtin/branch.c:756 builtin/for-each-ref.c:59 builtin/tag.c:495 msgid "sorting and filtering are case insensitive" msgstr "le tri et le filtrage sont non-sensibles à la casse" +#: builtin/branch.c:757 builtin/ls-files.c:635 msgid "recurse through submodules" msgstr "parcourir récursivement les sous-modules" +#: builtin/branch.c:758 builtin/for-each-ref.c:48 builtin/ls-files.c:647 +#: builtin/ls-tree.c:374 builtin/tag.c:493 builtin/verify-tag.c:31 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -msgid "Failed to resolve HEAD as a valid ref." -msgstr "Échec de résolution de HEAD comme référence valide." +#: builtin/branch.c:776 +msgid "failed to resolve HEAD as a valid ref" +msgstr "échec de résolution de HEAD comme référence valide" +#: builtin/branch.c:780 builtin/clone.c:717 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" +#: builtin/branch.c:801 msgid "" "branch with --recurse-submodules can only be used if submodule." "propagateBranches is enabled" @@ -3107,91 +3903,114 @@ msgstr "" "brancher avec --recurse-submodules ne peut être utilisé que si submodule." "propagateBranches est activé" +#: builtin/branch.c:803 msgid "--recurse-submodules can only be used to create branches" msgstr "--recurse-submodules ne peut être utilisé que pour créer des branches" +#: builtin/branch.c:834 builtin/branch.c:893 msgid "branch name required" msgstr "le nom de branche est requis" -msgid "Cannot give description to detached HEAD" -msgstr "Impossible de décrire une HEAD détachée" +#: builtin/branch.c:869 +msgid "cannot give description to detached HEAD" +msgstr "impossible de décrire une HEAD détachée" +#: builtin/branch.c:875 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -msgid "cannot copy the current branch while not on any." -msgstr "impossible de copier la branche actuelle, il n'y en a pas." +#: builtin/branch.c:895 +msgid "cannot copy the current branch while not on any" +msgstr "impossible de copier la branche actuelle, il n'y en a pas" -msgid "cannot rename the current branch while not on any." -msgstr "impossible de renommer la branche actuelle, il n'y en a pas." +#: builtin/branch.c:896 +msgid "cannot rename the current branch while not on any" +msgstr "impossible de renommer la branche actuelle, il n'y en a pas" +#: builtin/branch.c:902 msgid "too many branches for a copy operation" msgstr "trop de branches pour une opération de copie" +#: builtin/branch.c:903 msgid "too many arguments for a rename operation" msgstr "trop d'arguments pour une opération de renommage" +#: builtin/branch.c:914 msgid "too many arguments to set new upstream" msgstr "trop d'arguments pour spécifier une branche amont" +#: builtin/branch.c:918 #, c-format msgid "" -"could not set upstream of HEAD to %s when it does not point to any branch." +"could not set upstream of HEAD to %s when it does not point to any branch" msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " -"aucune branche." +"aucune branche" +#: builtin/branch.c:921 builtin/branch.c:950 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" +#: builtin/branch.c:927 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" +#: builtin/branch.c:944 msgid "too many arguments to unset upstream" msgstr "trop d'arguments pour désactiver un amont" -msgid "could not unset upstream of HEAD when it does not point to any branch." +#: builtin/branch.c:948 +msgid "could not unset upstream of HEAD when it does not point to any branch" msgstr "" "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur " -"aucune branche." +"aucune branche" +#: builtin/branch.c:954 #, c-format -msgid "Branch '%s' has no upstream information" -msgstr "La branche '%s' n'a aucune information de branche amont" +msgid "branch '%s' has no upstream information" +msgstr "la branche '%s' n'a aucune information de branche amont" +#: builtin/branch.c:968 msgid "" -"The -a, and -r, options to 'git branch' do not take a branch name.\n" +"the -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list ?" msgstr "" -"Les options -a et -r de 'git branch' n'ont pas de sens avec un nom de " +"les options -a et -r de 'git branch' n'ont pas de sens avec un nom de " "branche.\n" "Vouliez-vous plutôt dire -a|-r --list  ?" +#: builtin/branch.c:972 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " -"'--set-upstream-to' instead." +"'--set-upstream-to' instead" msgstr "" "l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-" -"upstream-to' à la place." +"upstream-to' à la place" +#: builtin/bugreport.c:21 msgid "git version:\n" msgstr "version git ::\n" +#: builtin/bugreport.c:27 #, c-format msgid "uname() failed with error '%s' (%d)\n" msgstr "échec de uname() avec l'erreur '%s' (%d)\n" +#: builtin/bugreport.c:37 msgid "compiler info: " msgstr "info compilateur : " +#: builtin/bugreport.c:40 msgid "libc info: " msgstr "info libc : " +#: builtin/bugreport.c:54 msgid "not run from a git repository - no hooks to show\n" msgstr "lancé hors d'un dépôt git - aucun crochet à montrer\n" +#: builtin/bugreport.c:67 msgid "" "git bugreport [(-o | --output-directory) ] [(-s | --suffix) ]\n" " [--diagnose[=]]" @@ -3200,6 +4019,7 @@ msgstr "" "]\n" " [--diagnose[=]]" +#: builtin/bugreport.c:75 msgid "" "Thank you for filling out a Git bug report!\n" "Please answer the following questions to help us understand your issue.\n" @@ -3236,43 +4056,61 @@ msgstr "" "Veuillez relire le rapport de bogue ci-dessous.\n" "Vous pouvez supprimer toute ligne que vous ne souhaitez pas envoyer.\n" +#: builtin/bugreport.c:116 builtin/commit.c:1527 builtin/commit.c:1531 +#: builtin/commit.c:1692 builtin/fast-export.c:1191 builtin/fast-export.c:1194 +#: builtin/fast-export.c:1197 builtin/rebase.c:1172 parse-options.h:581 msgid "mode" msgstr "mode" +#: builtin/bugreport.c:117 msgid "" "create an additional zip archive of detailed diagnostics (default 'stats')" msgstr "" "créer une archive zip supplémentaire de diagnostique détaillé (par défaut " "'stats')" +#: builtin/bugreport.c:120 msgid "specify a destination for the bugreport file(s)" msgstr "spécifier la destination du/des fichier(s) de rapport de bogue" +#: builtin/bugreport.c:122 msgid "specify a strftime format suffix for the filename(s)" msgstr "spécifier une suffixe au format strftime pour le(s) nom(s) de fichier" +#: builtin/bugreport.c:130 +#, c-format +msgid "unknown argument `%s'" +msgstr "argument inconnu '%s'" + +#: builtin/bugreport.c:150 builtin/diagnose.c:53 #, c-format msgid "could not create leading directories for '%s'" msgstr "impossible de créer les répertoires de premier niveau pour '%s'" +#: builtin/bugreport.c:163 builtin/diagnose.c:59 #, c-format msgid "unable to create diagnostics archive %s" msgstr "impossible de créer l'archive de diagnostique %s" +#: builtin/bugreport.c:171 msgid "System Info" msgstr "Info système" +#: builtin/bugreport.c:174 msgid "Enabled Hooks" msgstr "Crochets activés" +#: builtin/bugreport.c:181 #, c-format msgid "unable to write to %s" msgstr "impossible d'écrire dans %s" +#: builtin/bugreport.c:191 #, c-format msgid "Created new report at '%s'.\n" msgstr "Nouveau rapport créé à '%s'.\n" +#: builtin/bundle.c:19 msgid "" "git bundle create [-q | --quiet | --progress]\n" " [--version=] " @@ -3280,83 +4118,116 @@ msgstr "" "git bundle create [-q | --quiet | --progress]\n" " [--version=] " +#: builtin/bundle.c:22 msgid "git bundle verify [-q | --quiet] " msgstr "git bundle verify [-q | --quiet] " +#: builtin/bundle.c:24 msgid "git bundle list-heads [...]" msgstr "git bundle list-heads [...]" +#: builtin/bundle.c:26 msgid "git bundle unbundle [--progress] [...]" msgstr "git bundle unbundle [--progress] [...]" +#: builtin/bundle.c:65 msgid "need a argument" msgstr "requiert un argument " +#: builtin/bundle.c:76 builtin/pack-objects.c:4196 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" +#: builtin/bundle.c:79 builtin/bundle.c:195 builtin/pack-objects.c:4199 msgid "show progress meter" msgstr "afficher la barre de progression" +#: builtin/bundle.c:82 msgid "historical; same as --progress" msgstr "option historique ; identique à --progress" +#: builtin/bundle.c:85 msgid "historical; does nothing" msgstr "option historique ; ne fait rien" +#: builtin/bundle.c:88 msgid "specify bundle format version" msgstr "spécifier la version du format de colis" +#: builtin/bundle.c:102 msgid "Need a repository to create a bundle." msgstr "La création d'un colis requiert un dépôt." +#: builtin/bundle.c:133 msgid "do not show bundle details" msgstr "ne pas afficher les détails du colis" +#: builtin/bundle.c:154 #, c-format msgid "%s is okay\n" msgstr "%s est correct\n" +#: builtin/bundle.c:210 msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." +#: builtin/bundle.c:213 msgid "Unbundling objects" msgstr "Dépaquetage d'objets" +#: builtin/cat-file.c:74 merge-recursive.c:966 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" +#: builtin/cat-file.c:663 msgid "flush is only for --buffer mode" msgstr "flush n'est que pour le mode --buffer" +#: builtin/cat-file.c:707 msgid "empty command in input" msgstr "commande vide dans l'entrée" +#: builtin/cat-file.c:709 #, c-format msgid "whitespace before command: '%s'" msgstr "caractère espace devant la commande : '%s'" +#: builtin/cat-file.c:718 #, c-format msgid "%s requires arguments" msgstr "%s nécessite des arguments" +#: builtin/cat-file.c:723 #, c-format msgid "%s takes no arguments" msgstr "%s n'accepte aucune argument" +#: builtin/cat-file.c:891 msgid "only one batch option may be specified" msgstr "une seule option de traitement ne peut être spécifiée à la fois" +#: builtin/cat-file.c:922 msgid "git cat-file " msgstr "git cat-file " +#: builtin/cat-file.c:923 msgid "git cat-file (-e | -p) " msgstr "git cat-file (-e | -p) " +#: builtin/cat-file.c:924 msgid "git cat-file (-t | -s) [--allow-unknown-type] " msgstr "git cat-file (-t | -s) [--allow-unknown-type] " +#: builtin/cat-file.c:925 +msgid "" +"git cat-file (--textconv | --filters)\n" +" [: | --path= ]" +msgstr "" +"git cat-file (--textconv | --filters)\n" +" [: | --path= ]" + +#: builtin/cat-file.c:927 msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" @@ -3368,71 +4239,84 @@ msgstr "" " [--buffer] [--follow-symlinks] [--unordered]\n" " [--textconv | --filters] [-Z]" -msgid "" -"git cat-file (--textconv | --filters)\n" -" [: | --path= ]" -msgstr "" -"git cat-file (--textconv | --filters)\n" -" [: | --path= ]" - +#: builtin/cat-file.c:934 msgid "Check object existence or emit object contents" msgstr "Vérifie l'existence d'un objet ou émettre le contenu de l'objet" +#: builtin/cat-file.c:936 msgid "check if exists" msgstr "Vérification si existe" +#: builtin/cat-file.c:937 msgid "pretty-print content" msgstr "affichage propre du contenu de " +#: builtin/cat-file.c:939 msgid "Emit [broken] object attributes" msgstr "Émet les attributs [broken] d'un objet" +#: builtin/cat-file.c:940 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" msgstr "montrer le type de l'objet (parmi 'blob', 'tree', 'commit', 'tag' ...)" +#: builtin/cat-file.c:941 msgid "show object size" msgstr "afficher la taille de l'objet" +#: builtin/cat-file.c:943 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus" +#: builtin/cat-file.c:944 builtin/log.c:253 msgid "use mail map file" msgstr "utiliser le fichier de correspondance de mail" +#: builtin/cat-file.c:947 msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "Traiter par lot les objets demandés sur stdin (ou --batch-all-objects)" +#: builtin/cat-file.c:949 msgid "show full or contents" msgstr "afficher tout le contenu de ou " +#: builtin/cat-file.c:953 msgid "like --batch, but don't emit " msgstr "comme --batch, mais ne pas émettre " +#: builtin/cat-file.c:956 msgid "stdin is NUL-terminated" msgstr "l'entrée se termine par NUL" +#: builtin/cat-file.c:958 msgid "stdin and stdout is NUL-terminated" msgstr "l'entrée et la sortie standard se terminent par NUL" +#: builtin/cat-file.c:960 msgid "read commands from stdin" msgstr "lire les commandes depuis l'entrée standard" +#: builtin/cat-file.c:964 msgid "with --batch[-check]: ignores stdin, batches all known objects" msgstr "" "avec --batch[-check] : ignore stdin, gère tous les objets connus par lots" +#: builtin/cat-file.c:966 msgid "Change or optimize batch output" msgstr "Changer ou optimiser la sortie de traitement" +#: builtin/cat-file.c:967 msgid "buffer --batch output" msgstr "bufferiser la sortie de --batch" +#: builtin/cat-file.c:969 msgid "follow in-tree symlinks" msgstr "suivi des liens symboliques dans l'arbre" +#: builtin/cat-file.c:971 msgid "do not order objects before emitting them" msgstr "ne pas ordonner les objets avant de les émettre" +#: builtin/cat-file.c:973 msgid "" "Emit object (blob or tree) with conversion or filter (stand-alone, or with " "batch)" @@ -3440,50 +4324,64 @@ msgstr "" "Émet l'objet (blob ou arbre) avec une conversion ou un filtre (autonome ou " "en lot)" +#: builtin/cat-file.c:975 msgid "run textconv on object's content" msgstr "lancer textconv sur le contenu de l'objet" +#: builtin/cat-file.c:977 msgid "run filters on object's content" msgstr "lancer les filtres sur le contenu de l'objet" +#: builtin/cat-file.c:978 msgid "blob|tree" msgstr "blob|arbre" +#: builtin/cat-file.c:979 msgid "use a for (--textconv | --filters); Not with 'batch'" msgstr "" "utiliser un spécifique pour (--textconv | --filters); pas pour les " "lots" +#: builtin/cat-file.c:1000 #, c-format msgid "'%s=<%s>' needs '%s' or '%s'" msgstr "'%s=<%s>' a besoin de '%s' ou '%s'" +#: builtin/cat-file.c:1002 msgid "path|tree-ish" msgstr "blob|arbre-esque" +#: builtin/cat-file.c:1009 builtin/cat-file.c:1012 builtin/cat-file.c:1015 +#: builtin/cat-file.c:1018 builtin/cat-file.c:1021 #, c-format msgid "'%s' requires a batch mode" msgstr "%s a besoin d'un mode par lots" +#: builtin/cat-file.c:1039 #, c-format msgid "'-%c' is incompatible with batch mode" msgstr "'-%c' est incompatible avec le mode par lots" +#: builtin/cat-file.c:1042 msgid "batch modes take no arguments" msgstr "les modes par lot n'acceptent aucun argument" +#: builtin/cat-file.c:1050 builtin/cat-file.c:1053 #, c-format msgid " required with '%s'" msgstr " nécessaire avec '%s'" +#: builtin/cat-file.c:1056 #, c-format msgid " required with '-%c'" msgstr " nécessaire avec '-%c'" +#: builtin/cat-file.c:1065 #, c-format msgid "only two arguments allowed in mode, not %d" msgstr "deux arguments seulement permis dans le mode , pas %d" +#: builtin/check-attr.c:19 msgid "" "git check-attr [--source ] [-a | --all | ...] [--] " "..." @@ -3491,197 +4389,264 @@ msgstr "" "git check-attr [--source ] [-a | --all | ...] [--] " "..." +#: builtin/check-attr.c:20 msgid "" "git check-attr --stdin [-z] [--source ] [-a | --all | ...]" msgstr "" "git check-attr --stdin [-z] [--source ] [-a | --all | ...]" +#: builtin/check-attr.c:27 msgid "report all attributes set on file" msgstr "afficher tous les attributs associés au fichier" +#: builtin/check-attr.c:28 msgid "use .gitattributes only from the index" msgstr "utiliser .gitattributes seulement depuis l'index" +#: builtin/check-attr.c:29 builtin/check-ignore.c:27 builtin/hash-object.c:110 msgid "read file names from stdin" msgstr "lire les noms de fichier depuis l'entrée standard" +#: builtin/check-attr.c:31 builtin/check-ignore.c:29 msgid "terminate input and output records by a NUL character" msgstr "" "terminer les enregistrements en entrée et en sortie par un caractère NUL" +#: builtin/check-attr.c:32 msgid "" msgstr "" +#: builtin/check-attr.c:32 msgid "which tree-ish to check attributes at" msgstr "à quel vérifier les attributs" +#: builtin/check-ignore.c:23 builtin/checkout.c:1604 builtin/gc.c:588 +#: builtin/worktree.c:793 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" +#: builtin/check-ignore.c:31 msgid "show non-matching input paths" msgstr "afficher les chemins en entrée qui ne correspondent pas" +#: builtin/check-ignore.c:33 msgid "ignore index when checking" msgstr "ignorer l'index pendant la vérification" +#: builtin/check-ignore.c:167 msgid "cannot specify pathnames with --stdin" msgstr "impossible de spécifier les chemins avec --stdin" +#: builtin/check-ignore.c:170 msgid "-z only makes sense with --stdin" msgstr "-z n'a de sens qu'avec l'option --stdin" +#: builtin/check-ignore.c:172 msgid "no path specified" msgstr "aucun chemin spécifié" +#: builtin/check-ignore.c:176 msgid "--quiet is only valid with a single pathname" msgstr "--quiet n'est valide qu'avec un seul chemin" +#: builtin/check-ignore.c:178 msgid "cannot have both --quiet and --verbose" msgstr "impossible d'avoir --quiet et --verbose" +#: builtin/check-ignore.c:181 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching n'est valide qu'avec --verbose" +#: builtin/check-mailmap.c:13 msgid "git check-mailmap [] ..." msgstr "git check-mailmap [] ..." +#: builtin/check-mailmap.c:18 msgid "also read contacts from stdin" msgstr "lire aussi les contacts depuis l'entrée standard" +#: builtin/check-mailmap.c:29 #, c-format msgid "unable to parse contact: %s" msgstr "impossible d'analyser le contact : %s" +#: builtin/check-mailmap.c:52 msgid "no contacts specified" msgstr "aucun contact spécifié" +#: builtin/checkout--worker.c:112 msgid "git checkout--worker []" msgstr "git checkout--worker []" +#: builtin/checkout--worker.c:120 builtin/checkout-index.c:241 +#: builtin/column.c:32 builtin/column.c:33 builtin/submodule--helper.c:1783 +#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1794 +#: builtin/worktree.c:791 builtin/worktree.c:1084 msgid "string" msgstr "chaîne" +#: builtin/checkout--worker.c:121 builtin/checkout-index.c:242 msgid "when creating files, prepend " msgstr "lors de la création de fichiers, préfixer par " +#: builtin/checkout-index.c:189 msgid "git checkout-index [] [--] [...]" msgstr "git checkout-index [] [--] [...]" +#: builtin/checkout-index.c:207 msgid "stage should be between 1 and 3 or all" msgstr "stage doit valoir entre 1 et 3, ou all" +#: builtin/checkout-index.c:225 msgid "check out all files in the index" msgstr "extraire tous les fichiers présents dans l'index" +#: builtin/checkout-index.c:227 msgid "do not skip files with skip-worktree set" msgstr "ne pas sauter des fichiers avec un ensemble skip-worktree" +#: builtin/checkout-index.c:228 msgid "force overwrite of existing files" msgstr "forcer l'écrasement des fichiers existants" +#: builtin/checkout-index.c:230 msgid "no warning for existing files and files not in index" msgstr "" "pas d'avertissement pour les fichiers existants et les fichiers absents de " "l'index" +#: builtin/checkout-index.c:232 msgid "don't checkout new files" msgstr "ne pas extraire les nouveaux fichiers" +#: builtin/checkout-index.c:234 msgid "update stat information in the index file" msgstr "mettre à jour l'information de stat dans le fichier d'index" +#: builtin/checkout-index.c:238 msgid "read list of paths from the standard input" msgstr "lire la liste des chemins depuis l'entrée standard" +#: builtin/checkout-index.c:240 msgid "write the content to temporary files" msgstr "écrire le contenu dans des fichiers temporaires" +#: builtin/checkout-index.c:244 msgid "copy out the files from named stage" msgstr "copier les fichiers depuis l'index nommé" +#: builtin/checkout.c:46 msgid "git checkout [] " msgstr "git checkout [] " +#: builtin/checkout.c:47 msgid "git checkout [] [] -- ..." msgstr "git checkout [] [] -- ..." +#: builtin/checkout.c:52 msgid "git switch [] []" msgstr "git switch [] " +#: builtin/checkout.c:57 msgid "git restore [] [--source=] ..." msgstr "git restore [] [--source=] ..." +#: builtin/checkout.c:212 builtin/checkout.c:251 #, c-format msgid "path '%s' does not have our version" msgstr "le chemin '%s' n'a pas notre version" +#: builtin/checkout.c:214 builtin/checkout.c:253 #, c-format msgid "path '%s' does not have their version" msgstr "le chemin '%s' n'a pas leur version" +#: builtin/checkout.c:230 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "le chemin '%s' n'a aucune des versions nécessaires" +#: builtin/checkout.c:284 #, c-format msgid "path '%s' does not have necessary versions" msgstr "le chemin '%s' n'a pas les versions nécessaires" +#: builtin/checkout.c:304 #, c-format msgid "path '%s': cannot merge" msgstr "chemin '%s' : impossible de fusionner" +#: builtin/checkout.c:320 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" +#: builtin/checkout.c:437 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "%d conflit du fusion recréé" msgstr[1] "%d conflits du fusion recréés" +#: builtin/checkout.c:442 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d chemin mis à jour depuis %s" msgstr[1] "%d chemins mis à jour depuis %s" +#: builtin/checkout.c:449 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "%d chemin mis à jour depuis l'index" msgstr[1] "%d chemins mis à jour depuis l'index" +#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:478 +#: builtin/checkout.c:482 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins" +#: builtin/checkout.c:492 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en " "même temps." +#: builtin/checkout.c:496 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ni '%s', ni '%s' spécifié" +#: builtin/checkout.c:500 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié" +#: builtin/checkout.c:518 builtin/checkout.c:522 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s" +#: builtin/checkout.c:532 +#, c-format +msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree" +msgstr "" +"'%s', '%s' ou '%s' ne peuvent pas être utilisés lors de l'extraction d'un " +"arbre" + +#: builtin/checkout.c:605 builtin/checkout.c:612 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" +#: builtin/checkout.c:805 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" +#: builtin/checkout.c:857 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -3691,40 +4656,51 @@ msgstr "" "suivants :\n" "%s" +#: builtin/checkout.c:950 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" +#: builtin/checkout.c:995 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" +#: builtin/checkout.c:999 builtin/clone.c:639 builtin/clone.c:665 +#: t/helper/test-fast-rebase.c:215 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" +#: builtin/checkout.c:1003 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" +#: builtin/checkout.c:1006 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" +#: builtin/checkout.c:1010 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" +#: builtin/checkout.c:1012 builtin/checkout.c:1449 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" +#: builtin/checkout.c:1014 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" +#: builtin/checkout.c:1065 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" +#: builtin/checkout.c:1071 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3747,6 +4723,7 @@ msgstr[1] "" "\n" "%s\n" +#: builtin/checkout.c:1090 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -3775,15 +4752,19 @@ msgstr[1] "" "git branch %s\n" "\n" +#: builtin/checkout.c:1125 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" +#: builtin/checkout.c:1129 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" +#: builtin/checkout.c:1173 builtin/checkout.c:1444 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" +#: builtin/checkout.c:1257 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -3792,6 +4773,7 @@ msgstr "" "'%s' pourrait être un fichier local ou un branche de suivi.\n" "Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer" +#: builtin/checkout.c:1264 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -3811,47 +4793,58 @@ msgstr "" "ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n" "votre config." +#: builtin/checkout.c:1274 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance" +#: builtin/checkout.c:1340 msgid "only one reference expected" msgstr "une seule référence attendue" +#: builtin/checkout.c:1357 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." +#: builtin/checkout.c:1403 builtin/worktree.c:443 builtin/worktree.c:898 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" +#: builtin/checkout.c:1416 builtin/checkout.c:1803 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" +#: builtin/checkout.c:1465 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "branche attendue, mais étiquette '%s' reçue" +#: builtin/checkout.c:1467 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "une branche est attendue, mais une branche distante '%s' a été reçue" +#: builtin/checkout.c:1469 builtin/checkout.c:1478 #, c-format msgid "a branch is expected, got '%s'" msgstr "une branche est attendue, mais '%s' a été reçue" +#: builtin/checkout.c:1472 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "une branche est attendue, mais un commit '%s' a été reçu" +#: builtin/checkout.c:1481 msgid "" "If you want to detach HEAD at the commit, try again with the --detach option." msgstr "" "Si vous souhaitez détacher HEAD à ce commit, réessayez avec l'option --" "detach." +#: builtin/checkout.c:1494 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -3859,6 +4852,7 @@ msgstr "" "impossible de basculer de branche pendant une fusion\n" "Envisagez \"git merge --quit\" ou \"git worktree add\"." +#: builtin/checkout.c:1498 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -3866,6 +4860,7 @@ msgstr "" "impossible de basculer de branche pendant une session am\n" "Envisagez \"git am --quit\" ou \"git worktree add\"." +#: builtin/checkout.c:1502 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -3873,6 +4868,7 @@ msgstr "" "impossible de basculer de branche pendant un rebasage\n" "Envisagez \"git rebase --quit\" ou \"git worktree add\"." +#: builtin/checkout.c:1506 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -3880,6 +4876,7 @@ msgstr "" "impossible de basculer de branche pendant un picorage\n" "Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"." +#: builtin/checkout.c:1510 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -3887,96 +4884,124 @@ msgstr "" "impossible de basculer de branche pendant un retour\n" "Envisagez \"git revert --quit\" ou \"git worktree add\"." +#: builtin/checkout.c:1514 msgid "you are switching branch while bisecting" msgstr "vous basculez de branche en cours de bissection" +#: builtin/checkout.c:1523 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" +#: builtin/checkout.c:1526 builtin/checkout.c:1530 builtin/checkout.c:1534 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ne peut pas être utilisé avec un basculement de branches" +#: builtin/checkout.c:1538 builtin/checkout.c:1541 builtin/checkout.c:1544 +#: builtin/checkout.c:1549 builtin/checkout.c:1554 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" +#: builtin/checkout.c:1551 #, c-format msgid "'%s' cannot take " msgstr "'%s' n'accepte pas " +#: builtin/checkout.c:1559 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit" +#: builtin/checkout.c:1566 msgid "missing branch or commit argument" msgstr "argument de branche ou de commit manquant" +#: builtin/checkout.c:1609 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" +#: builtin/checkout.c:1610 builtin/log.c:1970 parse-options.h:542 msgid "style" msgstr "style" +#: builtin/checkout.c:1611 msgid "conflict style (merge, diff3, or zdiff3)" msgstr "style de conflit (merge (fusion), diff3 ou zdiff3)" +#: builtin/checkout.c:1623 builtin/worktree.c:788 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" +#: builtin/checkout.c:1628 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" +#: builtin/checkout.c:1630 msgid "new-branch" msgstr "nouvelle branche" +#: builtin/checkout.c:1630 msgid "new unparented branch" msgstr "nouvelle branche sans parent" +#: builtin/checkout.c:1632 builtin/merge.c:292 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" +#: builtin/checkout.c:1635 msgid "do not check if another worktree is holding the given ref" msgstr "" "ne pas vérifier si une autre copie de travail contient le référence fournie" +#: builtin/checkout.c:1648 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" +#: builtin/checkout.c:1651 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" +#: builtin/checkout.c:1655 msgid "do not limit pathspecs to sparse entries only" msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux" +#: builtin/checkout.c:1718 #, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" msgstr "" "les options '-%c', '-%c' et '%s' ne peuvent pas être utilisées ensemble" +#: builtin/checkout.c:1759 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" +#: builtin/checkout.c:1764 #, c-format msgid "missing branch name; try -%c" msgstr "nom de branche manquant ; essayez -%c" +#: builtin/checkout.c:1796 #, c-format msgid "could not resolve %s" msgstr "impossible de résoudre %s" +#: builtin/checkout.c:1812 msgid "invalid path specification" msgstr "spécification de chemin invalide" +#: builtin/checkout.c:1819 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis" +#: builtin/checkout.c:1823 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'" +#: builtin/checkout.c:1848 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3984,55 +5009,76 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." +#: builtin/checkout.c:1853 msgid "you must specify path(s) to restore" msgstr "vous devez spécifier un ou des chemins à restaurer" +#: builtin/checkout.c:1878 builtin/checkout.c:1880 builtin/checkout.c:1933 +#: builtin/checkout.c:1935 builtin/clone.c:142 builtin/remote.c:174 +#: builtin/remote.c:176 builtin/submodule--helper.c:2944 +#: builtin/submodule--helper.c:3290 builtin/worktree.c:783 +#: builtin/worktree.c:785 msgid "branch" msgstr "branche" +#: builtin/checkout.c:1879 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" +#: builtin/checkout.c:1881 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" +#: builtin/checkout.c:1882 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" +#: builtin/checkout.c:1884 msgid "second guess 'git checkout ' (default)" msgstr "" "essayer d'interpréter 'git checkout ' (par défaut)" +#: builtin/checkout.c:1885 msgid "use overlay mode (default)" msgstr "utiliser le mode de superposition (défaut)" +#: builtin/checkout.c:1934 msgid "create and switch to a new branch" msgstr "créer et basculer sur une nouvelle branche" +#: builtin/checkout.c:1936 msgid "create/reset and switch to a branch" msgstr "créer/réinitialiser et basculer sur une branche" +#: builtin/checkout.c:1938 msgid "second guess 'git switch '" msgstr "interpréter 'git switch '" +#: builtin/checkout.c:1940 msgid "throw away local modifications" msgstr "laisser tomber les modifications locales" +#: builtin/checkout.c:1976 msgid "which tree-ish to checkout from" msgstr "de quel faire l'extraction" +#: builtin/checkout.c:1978 msgid "restore the index" msgstr "restaurer l'index" +#: builtin/checkout.c:1980 msgid "restore the working tree (default)" msgstr "restaurer l'arbre de travail (par défaut)" +#: builtin/checkout.c:1982 msgid "ignore unmerged entries" msgstr "ignorer les entrées non-fusionnées" +#: builtin/checkout.c:1983 msgid "use overlay mode" msgstr "utiliser le mode de superposition" +#: builtin/clean.c:34 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] " "[...]" @@ -4040,36 +5086,45 @@ msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] [...]" +#: builtin/clean.c:38 #, c-format msgid "Removing %s\n" msgstr "Suppression de %s\n" +#: builtin/clean.c:39 #, c-format msgid "Would remove %s\n" msgstr "Supprimerait %s\n" +#: builtin/clean.c:40 #, c-format msgid "Skipping repository %s\n" msgstr "Ignore le dépôt %s\n" +#: builtin/clean.c:41 #, c-format msgid "Would skip repository %s\n" msgstr "Ignorerait le dépôt %s\n" +#: builtin/clean.c:42 midx.c:1668 #, c-format msgid "failed to remove %s" msgstr "échec de la suppression de %s" +#: builtin/clean.c:43 #, c-format msgid "could not lstat %s\n" msgstr "lstat de %s impossible\n" +#: builtin/clean.c:44 msgid "Refusing to remove current working directory\n" msgstr "Refus de supprimer le répertoire de travail actuel\n" +#: builtin/clean.c:45 msgid "Would refuse to remove current working directory\n" msgstr "Refuserait de supprimer le répertoire de travail actuel\n" +#: builtin/clean.c:334 #, c-format msgid "" "Prompt help:\n" @@ -4082,6 +5137,7 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" " - (vide) ne rien sélectionner\n" +#: builtin/clean.c:338 #, c-format msgid "" "Prompt help:\n" @@ -4102,26 +5158,32 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection\n" +#: builtin/clean.c:553 #, c-format msgid "Huh (%s)?\n" msgstr "Hein (%s) ?\n" +#: builtin/clean.c:693 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs à ignorer>> " +#: builtin/clean.c:727 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" +#: builtin/clean.c:748 msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is +#: builtin/clean.c:789 #, c-format msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " +#: builtin/clean.c:820 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -4139,38 +5201,53 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" +#: builtin/clean.c:856 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Supprimerait l'élément suivant :" msgstr[1] "Supprimerait les éléments suivants :" +#: builtin/clean.c:872 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." +#: builtin/clean.c:934 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" +#: builtin/clean.c:936 msgid "force" msgstr "forcer" +#: builtin/clean.c:937 msgid "interactive cleaning" msgstr "nettoyage interactif" +#: builtin/clean.c:939 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" +#: builtin/clean.c:940 builtin/describe.c:588 builtin/describe.c:590 +#: builtin/grep.c:996 builtin/log.c:260 builtin/log.c:262 +#: builtin/ls-files.c:619 builtin/name-rev.c:570 builtin/name-rev.c:572 +#: builtin/pack-refs.c:28 builtin/pack-refs.c:30 builtin/show-ref.c:308 +#: ref-filter.h:120 msgid "pattern" msgstr "motif" +#: builtin/clean.c:941 msgid "add to ignore rules" msgstr "ajouter aux règles ignore" +#: builtin/clean.c:942 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" +#: builtin/clean.c:944 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" +#: builtin/clean.c:959 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -4178,6 +5255,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" +#: builtin/clean.c:962 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -4185,175 +5263,237 @@ msgstr "" "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " "nettoyer" +#: builtin/clean.c:974 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" +#: builtin/clone.c:58 msgid "git clone [] [--] []" msgstr "git clone [] [--] []" +#: builtin/clone.c:112 msgid "don't clone shallow repository" msgstr "ne pas cloner un dépôt superficiel" +#: builtin/clone.c:114 msgid "don't create a checkout" msgstr "ne pas créer d'extraction" +#: builtin/clone.c:115 builtin/clone.c:117 builtin/init-db.c:86 msgid "create a bare repository" msgstr "créer un dépôt nu" +#: builtin/clone.c:119 msgid "create a mirror repository (implies bare)" msgstr "créer un dépôt miroir (implique dépôt nu)" +#: builtin/clone.c:121 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" +#: builtin/clone.c:123 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, toujours copier" +#: builtin/clone.c:125 msgid "setup as shared repository" msgstr "régler comme dépôt partagé" +#: builtin/clone.c:127 msgid "pathspec" msgstr "spécificateur de chemin" +#: builtin/clone.c:127 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" +#: builtin/clone.c:131 msgid "number of submodules cloned in parallel" msgstr "nombre de sous-modules clonés en parallèle" +#: builtin/clone.c:132 builtin/init-db.c:83 msgid "template-directory" msgstr "répertoire-modèle" +#: builtin/clone.c:133 builtin/init-db.c:84 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" +#: builtin/clone.c:135 builtin/clone.c:137 builtin/submodule--helper.c:1790 +#: builtin/submodule--helper.c:2686 builtin/submodule--helper.c:3297 msgid "reference repository" msgstr "dépôt de référence" +#: builtin/clone.c:139 builtin/submodule--helper.c:1792 +#: builtin/submodule--helper.c:2688 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" +#: builtin/clone.c:140 builtin/column.c:28 builtin/fmt-merge-msg.c:28 +#: builtin/init-db.c:94 builtin/merge-file.c:54 builtin/merge.c:277 +#: builtin/pack-objects.c:4269 builtin/repack.c:1183 +#: builtin/submodule--helper.c:3299 t/helper/test-simple-ipc.c:597 +#: t/helper/test-simple-ipc.c:599 msgid "name" msgstr "nom" +#: builtin/clone.c:141 msgid "use instead of 'origin' to track upstream" msgstr "utiliser au lieu de 'origin' pour suivre la branche amont" +#: builtin/clone.c:143 msgid "checkout instead of the remote's HEAD" msgstr "extraire au lieu de la HEAD du répertoire distant" +#: builtin/clone.c:145 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" +#: builtin/clone.c:146 builtin/fetch.c:2184 builtin/pull.c:219 msgid "depth" msgstr "profondeur" +#: builtin/clone.c:147 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" +#: builtin/clone.c:149 msgid "create a shallow clone since a specific time" msgstr "créer un clone superficiel depuis une date spécifique" +#: builtin/clone.c:150 builtin/fetch.c:2188 builtin/fetch.c:2211 +#: builtin/pull.c:225 builtin/pull.c:250 builtin/rebase.c:1081 msgid "revision" msgstr "révision" +#: builtin/clone.c:151 builtin/fetch.c:2189 builtin/pull.c:226 msgid "deepen history of shallow clone, excluding rev" msgstr "" "approfondir l'historique d'un clone superficiel en excluant une révision" +#: builtin/clone.c:153 builtin/submodule--helper.c:1802 +#: builtin/submodule--helper.c:2702 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" +#: builtin/clone.c:155 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" "ne pas cloner les tags et indiquer aux récupérations futures de ne pas le " "faire" +#: builtin/clone.c:157 msgid "any cloned submodules will be shallow" msgstr "tous les sous-modules clonés seront superficiels" +#: builtin/clone.c:158 builtin/init-db.c:92 msgid "gitdir" msgstr "gitdir" +#: builtin/clone.c:159 builtin/init-db.c:93 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" +#: builtin/clone.c:160 msgid "key=value" msgstr "clé=valeur" +#: builtin/clone.c:161 msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" +#: builtin/clone.c:163 builtin/fetch.c:2209 builtin/ls-remote.c:81 +#: builtin/pull.c:241 builtin/push.c:629 builtin/send-pack.c:203 msgid "server-specific" msgstr "spécifique au serveur" +#: builtin/clone.c:163 builtin/fetch.c:2209 builtin/ls-remote.c:81 +#: builtin/pull.c:242 builtin/push.c:629 builtin/send-pack.c:204 msgid "option to transmit" msgstr "option à transmettre" +#: builtin/clone.c:167 msgid "apply partial clone filters to submodules" msgstr "appliquer les filtres de clone partiel aux sous-modules" +#: builtin/clone.c:169 msgid "any cloned submodules will use their remote-tracking branch" msgstr "" "tous les sous-modules clonés utiliseront leur branche de suivi à distance" +#: builtin/clone.c:171 msgid "initialize sparse-checkout file to include only files at root" msgstr "" "initialiser le fichier d'extraction clairsemée pour n'inclure que les " "fichiers à la racine" +#: builtin/clone.c:173 msgid "uri" msgstr "uri" +#: builtin/clone.c:173 msgid "a URI for downloading bundles before fetching from origin remote" msgstr "" "un URI pour télécharger des paquets avant de récupérer depuis le distant " "d'origine" +#: builtin/clone.c:248 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n" +#: builtin/clone.c:319 builtin/diff.c:95 builtin/rm.c:144 grep.c:1941 +#: setup.c:193 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" +#: builtin/clone.c:321 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" +#: builtin/clone.c:342 #, c-format msgid "'%s' is a symlink, refusing to clone with --local" msgstr "'%s' est un lien symbolique, refus de cloner avec --local" +#: builtin/clone.c:346 #, c-format msgid "failed to start iterator over '%s'" msgstr "échec du démarrage un itérateur sur '%s'" +#: builtin/clone.c:361 #, c-format msgid "symlink '%s' exists, refusing to clone with --local" msgstr "le lien symbolique '%s' existe, refus de cloner avec --local" +#: builtin/clone.c:376 compat/precompose_utf8.c:62 #, c-format msgid "failed to unlink '%s'" msgstr "échec pour délier '%s'" +#: builtin/clone.c:382 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" +#: builtin/clone.c:386 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" +#: builtin/clone.c:391 #, c-format msgid "failed to iterate over '%s'" msgstr "échec de l'itération sur '%s'" +#: builtin/clone.c:418 #, c-format msgid "done.\n" msgstr "fait.\n" +#: builtin/clone.c:432 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4363,43 +5503,55 @@ msgstr "" "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" "et réessayer avec 'git restore --source=HEAD :/'\n" +#: builtin/clone.c:509 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." +#: builtin/clone.c:611 fetch-pack.c:2091 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" +#: builtin/clone.c:627 #, c-format msgid "unable to update %s" msgstr "impossible de mettre à jour %s" +#: builtin/clone.c:685 msgid "failed to initialize sparse-checkout" msgstr "échec lors de l'initialisation l'extraction clairsemée" +#: builtin/clone.c:707 msgid "remote HEAD refers to nonexistent ref, unable to checkout" msgstr "" "la HEAD distante réfère à une référence non existante, impossible de " "l'extraire" +#: builtin/clone.c:742 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" +#: builtin/clone.c:830 msgid "unable to write parameters to config file" msgstr "impossible d'écrire les paramètres dans le fichier de configuration" +#: builtin/clone.c:897 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" +#: builtin/clone.c:899 msgid "cannot unlink temporary alternates file" msgstr "impossible de délier le fichier temporaire alternates" +#: builtin/clone.c:946 msgid "Too many arguments." msgstr "Trop d'arguments." +#: builtin/clone.c:950 scalar.c:456 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." +#: builtin/clone.c:968 msgid "" "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" "exclude" @@ -4407,43 +5559,54 @@ msgstr "" "--bundle-uri est incompatible avec --depth, --shallow-since, et --shallow-" "exclude" +#: builtin/clone.c:980 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" +#: builtin/clone.c:984 builtin/fetch.c:2321 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" +#: builtin/clone.c:994 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide." +#: builtin/clone.c:1000 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "le chemin du dépôt '%s' existe déjà et n'est pas un répertoire vide." +#: builtin/clone.c:1014 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." +#: builtin/clone.c:1029 builtin/clone.c:1050 builtin/difftool.c:268 +#: builtin/log.c:2170 builtin/worktree.c:455 builtin/worktree.c:487 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" +#: builtin/clone.c:1034 #, c-format msgid "could not create work tree dir '%s'" msgstr "impossible de créer le répertoire de la copie de travail '%s'" +#: builtin/clone.c:1054 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" +#: builtin/clone.c:1056 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" +#: builtin/clone.c:1085 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -4451,88 +5614,113 @@ msgstr "" "clone --recursive n'est pas compatible avec à la fois --reference et --" "reference-if-able" +#: builtin/clone.c:1163 builtin/remote.c:204 builtin/remote.c:734 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' n'est pas un nom valide de distante" +#: builtin/clone.c:1200 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." +#: builtin/clone.c:1202 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://" "\"." +#: builtin/clone.c:1204 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt " "\"file://\"." +#: builtin/clone.c:1206 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter est ignoré dans les clones locaux ; utilisez plutôt file:// ." +#: builtin/clone.c:1209 fetch-pack.c:1223 fetch-pack.c:1576 msgid "source repository is shallow, reject to clone." msgstr "le dépôt source est superficiel, clonage rejeté." +#: builtin/clone.c:1211 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" +#: builtin/clone.c:1216 msgid "--local is ignored" msgstr "--local est ignoré" +#: builtin/clone.c:1232 msgid "cannot clone from filtered bundle" msgstr "impossible de cloner depuis un colis filtré" +#: builtin/clone.c:1278 builtin/clone.c:1312 msgid "failed to initialize the repo, skipping bundle URI" msgstr "échec lors de l'initialisation du dépôt, URI du paquet ignoré" +#: builtin/clone.c:1280 #, c-format msgid "failed to fetch objects from bundle URI '%s'" msgstr "impossible de récupérer les objets depuis l'URI de paquet '%s'" +#: builtin/clone.c:1315 msgid "failed to fetch advertised bundles" msgstr "échec de récupération des colis annoncés" +#: builtin/clone.c:1349 builtin/clone.c:1406 msgid "remote transport reported error" msgstr "le transport distant a retourné une erreur" +#: builtin/clone.c:1359 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" +#: builtin/clone.c:1369 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." +#: builtin/column.c:10 msgid "git column []" msgstr "git column []" +#: builtin/column.c:28 msgid "lookup config vars" msgstr "rechercher les variables de configuration" +#: builtin/column.c:29 builtin/column.c:30 msgid "layout to use" msgstr "mise en page à utiliser" +#: builtin/column.c:31 msgid "maximum width" msgstr "largeur maximale" +#: builtin/column.c:32 msgid "padding space on left border" msgstr "remplissage d'espace sur la bordure gauche" +#: builtin/column.c:33 msgid "padding space on right border" msgstr "remplissage d'espace sur le côté droit" +#: builtin/column.c:34 msgid "padding space between columns" msgstr "remplissage d'espace entre les colonnes" +#: builtin/column.c:52 msgid "--command must be the first argument" msgstr "--command doit être le premier argument" +#: builtin/commit-graph.c:19 msgid "" "git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" +#: builtin/commit-graph.c:22 msgid "" "git commit-graph write [--object-dir ] [--append]\n" " [--split[=]] [--reachable | --stdin-packs | " @@ -4548,77 +5736,105 @@ msgstr "" "[no-]progress]\n" " " +#: builtin/commit-graph.c:57 builtin/fetch.c:2198 builtin/log.c:1939 +#: builtin/repack.c:1189 builtin/repack.c:1191 msgid "dir" msgstr "répertoire" +#: builtin/commit-graph.c:58 msgid "the object directory to store the graph" msgstr "le répertoire d'objet où stocker le graphe" +#: builtin/commit-graph.c:82 msgid "if the commit-graph is split, only verify the tip file" msgstr "" "si le graphe de commit est divisé, vérifier seulement le fichier sommet" +#: builtin/commit-graph.c:111 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Impossible d'ouvrir le graphe de commit '%s'" +#: builtin/commit-graph.c:115 +#, c-format +msgid "could not open commit-graph chain '%s'" +msgstr "impossible d'ouvrir le graphe de commit '%s'" + +#: builtin/commit-graph.c:162 #, c-format msgid "unrecognized --split argument, %s" msgstr "argument de --split non reconnu, %s" +#: builtin/commit-graph.c:175 #, c-format msgid "unexpected non-hex object ID: %s" msgstr "ID d'objet non hexadécimal inattendu : %s" +#: builtin/commit-graph.c:180 #, c-format msgid "invalid object: %s" msgstr "objet invalide : %s" +#: builtin/commit-graph.c:200 parse-options-cb.c:24 parse-options-cb.c:28 #, c-format msgid "option `%s' expects a numerical value" msgstr "l'option '%s' attend une valeur numérique" +#: builtin/commit-graph.c:231 msgid "start walk at all refs" msgstr "commencer le parcours à toutes les réfs" +#: builtin/commit-graph.c:233 msgid "scan pack-indexes listed by stdin for commits" msgstr "scanner les index compactés listés sur stdin à la recherche de commits" +#: builtin/commit-graph.c:235 msgid "start walk at commits listed by stdin" msgstr "commencer le parcours aux commits listés sur stdin" +#: builtin/commit-graph.c:237 msgid "include all commits already in the commit-graph file" msgstr "" "inclure tous les commits déjà présents dans le fichier de graphe de commits" +#: builtin/commit-graph.c:239 msgid "enable computation for changed paths" msgstr "activer le calcul pour les chemins modifiés" +#: builtin/commit-graph.c:241 msgid "allow writing an incremental commit-graph file" msgstr "permettre d'écrire un fichier incrémental de graphe de commit" +#: builtin/commit-graph.c:245 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" "le nombre maximum de commits dans un graphe de commit divisé pas de base" +#: builtin/commit-graph.c:247 msgid "maximum ratio between two levels of a split commit-graph" msgstr "rapport maximum entre deux niveaux d'un graphe de commit divisé" +#: builtin/commit-graph.c:249 msgid "only expire files older than a given date-time" msgstr "ne faire expirer que les fichiers plus vieux qu'une date-time donnée" +#: builtin/commit-graph.c:251 msgid "maximum number of changed-path Bloom filters to compute" msgstr "nombre maximum des filtres Bloom des chemins modifiés à calculer" +#: builtin/commit-graph.c:277 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs" +#: builtin/commit-graph.c:308 msgid "Collecting commits from input" msgstr "Collecte des commits depuis l'entrée" +#: builtin/commit-tree.c:20 msgid "git commit-tree [(-p )...]" msgstr "git commit-tree [(-p )...]" +#: builtin/commit-tree.c:21 msgid "" "git commit-tree [(-p )...] [-S[]] [(-m )...]\n" " [(-F )...] " @@ -4626,46 +5842,62 @@ msgstr "" "git commit-tree [(-p )...] [-S[]] [(-m )...]\n" " [(-F )...] " +#: builtin/commit-tree.c:34 #, c-format msgid "duplicate parent %s ignored" msgstr "le parent dupliqué %s est ignoré" +#: builtin/commit-tree.c:51 builtin/commit-tree.c:129 builtin/log.c:670 #, c-format msgid "not a valid object name %s" msgstr "nom d'objet invalide %s" +#: builtin/commit-tree.c:89 #, c-format msgid "git commit-tree: failed to read '%s'" msgstr "git commit-tree : échec de la lecture de '%s'" +#: builtin/commit-tree.c:91 #, c-format msgid "git commit-tree: failed to close '%s'" msgstr "git commit-tree : échec de la fermeture de '%s'" +#: builtin/commit-tree.c:104 msgid "parent" msgstr "parent" +#: builtin/commit-tree.c:105 msgid "id of a parent commit object" msgstr "id d'un objet commit parent" +#: builtin/commit-tree.c:107 builtin/commit.c:1650 builtin/merge.c:271 +#: builtin/notes.c:486 builtin/notes.c:662 builtin/stash.c:1743 +#: builtin/tag.c:465 msgid "message" msgstr "message" +#: builtin/commit-tree.c:108 builtin/commit.c:1650 msgid "commit message" msgstr "message de validation" +#: builtin/commit-tree.c:111 msgid "read commit log message from file" msgstr "lire le message de validation depuis un fichier" +#: builtin/commit-tree.c:114 builtin/commit.c:1667 builtin/merge.c:290 +#: builtin/pull.c:187 builtin/revert.c:108 msgid "GPG sign commit" msgstr "signer la validation avec GPG" +#: builtin/commit-tree.c:126 msgid "must give exactly one tree" msgstr "exactement un arbre obligatoire" +#: builtin/commit-tree.c:133 msgid "git commit-tree: failed to read" msgstr "git commit-tree : échec de la lecture" +#: builtin/commit.c:51 msgid "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" @@ -4687,9 +5919,11 @@ msgstr "" " [(--trailer [(=|:)])...] [-S[]]\n" " [--] [...]" +#: builtin/commit.c:63 msgid "git status [] [--] [...]" msgstr "git status [] [--] [...]" +#: builtin/commit.c:68 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -4700,6 +5934,7 @@ msgstr "" "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n" "supprimer complètement le commit avec \"git reset HEAD^\".\n" +#: builtin/commit.c:73 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4714,12 +5949,15 @@ msgstr "" " git commit --allow-empty\n" "\n" +#: builtin/commit.c:80 msgid "Otherwise, please use 'git rebase --skip'\n" msgstr "Sinon, veuillez utiliser 'git rebase --skip'\n" +#: builtin/commit.c:83 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "Sinon, veuillez utiliser 'git cherry-pick --skip'\n" +#: builtin/commit.c:86 msgid "" "and then use:\n" "\n" @@ -4741,60 +5979,74 @@ msgstr "" " git cherry-pick --skip\n" "\n" +#: builtin/commit.c:314 read-cache.c:3919 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" +#: builtin/commit.c:341 msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" +#: builtin/commit.c:391 msgid "No paths with --include/--only does not make sense." msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." +#: builtin/commit.c:404 msgid "unable to create temporary index" msgstr "impossible de créer l'index temporaire" +#: builtin/commit.c:413 msgid "interactive add failed" msgstr "échec de l'ajout interactif" +#: builtin/commit.c:429 msgid "unable to update temporary index" msgstr "impossible de mettre à jour l'index temporaire" +#: builtin/commit.c:431 msgid "Failed to update main cache tree" msgstr "Impossible de mettre à jour l'arbre de cache principal" -msgid "unable to write new_index file" -msgstr "impossible d'écrire le fichier new_index" - +#: builtin/commit.c:511 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." +#: builtin/commit.c:513 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." +#: builtin/commit.c:515 msgid "cannot do a partial commit during a rebase." msgstr "impossible de faire une validation partielle pendant un rebasage." +#: builtin/commit.c:523 msgid "cannot read the index" msgstr "impossible de lire l'index" +#: builtin/commit.c:542 msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" +#: builtin/commit.c:640 #, c-format msgid "commit '%s' lacks author header" msgstr "entête d'auteur manquant dans le commit '%s'" +#: builtin/commit.c:642 #, c-format msgid "commit '%s' has malformed author line" msgstr "le commit '%s' a une ligne d'auteur malformée" +#: builtin/commit.c:661 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" +#: builtin/commit.c:669 ident.c:531 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" +#: builtin/commit.c:714 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4802,38 +6054,50 @@ msgstr "" "impossible de sélectionner un caractère de commentaire\n" "qui n'est pas utilisé dans le message de validation actuel" +#: builtin/commit.c:770 builtin/commit.c:805 builtin/commit.c:1194 +#: builtin/merge-tree.c:454 #, c-format msgid "could not lookup commit '%s'" msgstr "impossible de rechercher le commit '%s'" +#: builtin/commit.c:783 builtin/shortlog.c:458 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" +#: builtin/commit.c:785 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" +#: builtin/commit.c:789 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" +#: builtin/commit.c:827 #, c-format msgid "options '%s' and '%s:%s' cannot be used together" msgstr "les options '%s' et '%s.%s' ne peuvent pas être utilisées ensemble" +#: builtin/commit.c:839 builtin/commit.c:855 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" +#: builtin/commit.c:846 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" +#: builtin/commit.c:887 bundle.c:150 rerere.c:471 rerere.c:682 sequencer.c:2773 +#: sequencer.c:3548 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" +#: builtin/commit.c:906 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" +#: builtin/commit.c:919 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4842,6 +6106,7 @@ msgstr "" "Veuillez saisir le message de validation pour vos modifications. Les lignes\n" "commençant par '%c' seront ignorées.\n" +#: builtin/commit.c:921 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4851,6 +6116,7 @@ msgstr "" "commençant par '%c' seront ignorées, et un message vide abandonne la " "validation.\n" +#: builtin/commit.c:925 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4861,6 +6127,7 @@ msgstr "" "par '%c' seront conservées ; vous pouvez les supprimer vous-même si vous le " "souhaitez.\n" +#: builtin/commit.c:929 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4871,6 +6138,7 @@ msgstr "" "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n" "si vous le souhaitez. Un message vide abandonne la validation.\n" +#: builtin/commit.c:941 msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -4884,6 +6152,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "et essayez à nouveau.\n" +#: builtin/commit.c:946 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -4897,115 +6166,147 @@ msgstr "" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "et essayez à nouveau.\n" +#: builtin/commit.c:973 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" +#: builtin/commit.c:981 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" +#: builtin/commit.c:988 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" +#: builtin/commit.c:1006 msgid "Cannot read index" msgstr "Impossible de lire l'index" +#: builtin/commit.c:1052 msgid "unable to pass trailers to --trailers" msgstr "impossible de passer les lignes finales à --trailers" +#: builtin/commit.c:1092 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" +#: builtin/commit.c:1106 builtin/tag.c:329 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" +#: builtin/commit.c:1152 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" "--author '%s' n'est pas de la forme 'Nom ' ni ne correspond à aucun " "auteur existant" +#: builtin/commit.c:1166 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Mode de fichier ignoré invalide '%s'" +#: builtin/commit.c:1184 builtin/commit.c:1476 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" +#: builtin/commit.c:1255 msgid "You are in the middle of a merge -- cannot reword." msgstr "Vous êtes en pleine fusion -- impossible de reformuler." +#: builtin/commit.c:1257 msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "Vous êtes en plein picorage -- impossible de reformuler." +#: builtin/commit.c:1260 #, c-format msgid "reword option of '%s' and path '%s' cannot be used together" msgstr "" "l'option de reformulation de '%s' et le chemin '%s' ne peuvent pas être " "utilisés ensemble" +#: builtin/commit.c:1262 #, c-format msgid "reword option of '%s' and '%s' cannot be used together" msgstr "" "l'option de reformulation de '%s' et '%s' ne peuvent pas être utilisés " "ensemble" +#: builtin/commit.c:1287 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." +#: builtin/commit.c:1290 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." +#: builtin/commit.c:1292 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." +#: builtin/commit.c:1294 msgid "You are in the middle of a rebase -- cannot amend." msgstr "Vous êtes en plein rebasage -- impossible de corriger (amend)." +#: builtin/commit.c:1314 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." +#: builtin/commit.c:1361 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "option inconnue : --fixup=%s:%s" +#: builtin/commit.c:1378 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "des chemins '%s ...' avec l'option -a n'a pas de sens" +#: builtin/commit.c:1511 builtin/commit.c:1678 msgid "show status concisely" msgstr "afficher l'état avec concision" +#: builtin/commit.c:1513 builtin/commit.c:1680 msgid "show branch information" msgstr "afficher l'information de branche" +#: builtin/commit.c:1515 msgid "show stash information" msgstr "afficher l'information de remisage" +#: builtin/commit.c:1517 builtin/commit.c:1682 msgid "compute full ahead/behind values" msgstr "calcule les valeurs complètes en avance/en retard" +#: builtin/commit.c:1519 msgid "version" msgstr "version" +#: builtin/commit.c:1519 builtin/commit.c:1684 builtin/fetch.c:2177 +#: builtin/push.c:605 builtin/worktree.c:1041 msgid "machine-readable output" msgstr "sortie pour traitement automatique" +#: builtin/commit.c:1522 builtin/commit.c:1686 msgid "show status in long format (default)" msgstr "afficher l'état en format long (par défaut)" +#: builtin/commit.c:1525 builtin/commit.c:1689 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" +#: builtin/commit.c:1528 builtin/commit.c:1692 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " "no. (Défaut : all)" +#: builtin/commit.c:1532 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -5013,9 +6314,11 @@ msgstr "" "afficher les fichiers ignorés, \"mode\" facultatif : traditional " "(traditionnel), matching (correspondant), no. (Défaut : traditional)" +#: builtin/commit.c:1534 parse-options.h:338 msgid "when" msgstr "quand" +#: builtin/commit.c:1535 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -5023,339 +6326,441 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" +#: builtin/commit.c:1537 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" +#: builtin/commit.c:1538 msgid "do not detect renames" msgstr "ne pas détecter les renommages" +#: builtin/commit.c:1540 msgid "detect renames, optionally set similarity index" msgstr "" "détecter les renommages, en spécifiant optionnellement le facteur de " "similarité" +#: builtin/commit.c:1563 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis" +#: builtin/commit.c:1643 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" +#: builtin/commit.c:1644 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" +#: builtin/commit.c:1646 msgid "Commit message options" msgstr "Options du message de validation" +#: builtin/commit.c:1647 builtin/merge.c:275 builtin/tag.c:467 msgid "read message from file" msgstr "lire le message depuis un fichier" +#: builtin/commit.c:1648 msgid "author" msgstr "auteur" +#: builtin/commit.c:1648 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" +#: builtin/commit.c:1649 builtin/gc.c:589 msgid "date" msgstr "date" +#: builtin/commit.c:1649 msgid "override date for commit" msgstr "remplacer la date pour la validation" +#: builtin/commit.c:1651 builtin/commit.c:1652 builtin/commit.c:1658 +#: builtin/merge-tree.c:552 parse-options.h:571 ref-filter.h:108 msgid "commit" msgstr "commit" +#: builtin/commit.c:1651 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" +#: builtin/commit.c:1652 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate . #. +#: builtin/commit.c:1657 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" +#: builtin/commit.c:1657 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" "utiliser un message au format autosquash pour corriger ou reformuler le " "commit spécifié" +#: builtin/commit.c:1658 msgid "use autosquash formatted message to squash specified commit" msgstr "" "utiliser un message au format autosquash pour compresser le commit spécifié" +#: builtin/commit.c:1659 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)" +#: builtin/commit.c:1660 builtin/interpret-trailers.c:116 msgid "trailer" msgstr "ligne de fin" +#: builtin/commit.c:1660 msgid "add custom trailer(s)" msgstr "ajouter des lignes terminales personnaliser" +#: builtin/commit.c:1661 builtin/log.c:1914 builtin/merge.c:293 +#: builtin/pull.c:153 builtin/revert.c:100 msgid "add a Signed-off-by trailer" msgstr "ajouter une ligne terminale Signed-off-by" +#: builtin/commit.c:1662 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" +#: builtin/commit.c:1663 msgid "force edit of commit" msgstr "forcer l'édition du commit" +#: builtin/commit.c:1665 msgid "include status in commit message template" msgstr "inclure l'état dans le modèle de message de validation" +#: builtin/commit.c:1670 msgid "Commit contents options" msgstr "Valider les options des contenus" +#: builtin/commit.c:1671 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" +#: builtin/commit.c:1672 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" +#: builtin/commit.c:1673 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" +#: builtin/commit.c:1674 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" +#: builtin/commit.c:1675 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" +#: builtin/commit.c:1676 msgid "bypass pre-commit and commit-msg hooks" msgstr "éviter d'utiliser les crochets pre-commit et commit-msg" +#: builtin/commit.c:1677 msgid "show what would be committed" msgstr "afficher ce qui serait validé" +#: builtin/commit.c:1690 msgid "amend previous commit" msgstr "corriger la validation précédente" +#: builtin/commit.c:1691 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" +#: builtin/commit.c:1698 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" +#: builtin/commit.c:1700 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" +#: builtin/commit.c:1732 sequencer.c:1447 sequencer.c:1526 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" +#: builtin/commit.c:1778 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" +#: builtin/commit.c:1785 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" +#: builtin/commit.c:1806 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" +#: builtin/commit.c:1813 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abandon de la validation dû à un message de validation vide.\n" +#: builtin/commit.c:1818 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" +#: builtin/commit.c:1829 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "" "Abandon de la validation dû à un corps de message de validation vide.\n" +#: builtin/commit.c:1864 msgid "" "repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full and quota is\n" +"new index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" -"le dépôt a été mis à jour, mais impossible d'écrire le fichier\n" -"new_index. Vérifiez que le disque n'est pas plein ou que le quota\n" +"le dépôt a été mis à jour, mais impossible d'écrire le nouveau fichier\n" +"d'index. Vérifiez que le disque n'est pas plein ou que le quota\n" "n'a pas été dépassé, puis lancez \"git restore --staged :/\" pour réparer." +#: builtin/config.c:19 msgid "git config []" msgstr "git config []" +#: builtin/config.c:117 #, c-format msgid "unrecognized --type argument, %s" msgstr "argument --type non reconnu, %s" +#: builtin/config.c:129 msgid "only one type at a time" msgstr "qu'un seul type à la fois" +#: builtin/config.c:138 msgid "Config file location" msgstr "Emplacement du fichier de configuration" +#: builtin/config.c:139 msgid "use global config file" msgstr "utiliser les fichier de configuration global" +#: builtin/config.c:140 msgid "use system config file" msgstr "utiliser le fichier de configuration du système" +#: builtin/config.c:141 msgid "use repository config file" msgstr "utiliser le fichier de configuration du dépôt" +#: builtin/config.c:142 msgid "use per-worktree config file" msgstr "utiliser un fichier de configuration par arbre de travail" +#: builtin/config.c:143 builtin/gc.c:1513 builtin/gc.c:1579 msgid "use given config file" msgstr "utiliser le fichier de configuration spécifié" +#: builtin/config.c:144 msgid "blob-id" msgstr "blob-id" +#: builtin/config.c:144 msgid "read config from given blob object" msgstr "lire la configuration depuis l'objet blob fourni" +#: builtin/config.c:145 msgid "Action" msgstr "Action" +#: builtin/config.c:146 msgid "get value: name [value-pattern]" msgstr "obtenir la valeur : nom [motif-de-valeur]" +#: builtin/config.c:147 msgid "get all values: key [value-pattern]" msgstr "obtenir toutes les valeurs : clé [motif-de-valeur]" +#: builtin/config.c:148 msgid "get values for regexp: name-regex [value-pattern]" msgstr "obtenir les valeur pour la regexp : regex-de-nom [motif-de-valeur]" +#: builtin/config.c:149 msgid "get value specific for the URL: section[.var] URL" msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL" +#: builtin/config.c:150 msgid "replace all matching variables: name value [value-pattern]" msgstr "" "remplacer toutes les variables correspondant : nom valeur [motif-de-valeur]" +#: builtin/config.c:151 msgid "add a new variable: name value" msgstr "ajouter une nouvelle variable : nom valeur" +#: builtin/config.c:152 msgid "remove a variable: name [value-pattern]" msgstr "supprimer une variable : nom [motif-de-valeur]" +#: builtin/config.c:153 msgid "remove all matches: name [value-pattern]" msgstr "supprimer toutes les correspondances nom [motif-de-valeur]" +#: builtin/config.c:154 msgid "rename section: old-name new-name" msgstr "renommer une section : ancien-nom nouveau-nom" +#: builtin/config.c:155 msgid "remove a section: name" msgstr "supprimer une section : nom" +#: builtin/config.c:156 msgid "list all" msgstr "afficher tout" +#: builtin/config.c:157 msgid "use string equality when comparing values to 'value-pattern'" msgstr "" "utiliser l'égalité de chaînes lors de la comparaison de 'motif-de-valeur'" +#: builtin/config.c:158 msgid "open an editor" msgstr "ouvrir un éditeur" +#: builtin/config.c:159 msgid "find the color configured: slot [default]" msgstr "trouver la couleur configurée : slot [par défaut]" +#: builtin/config.c:160 msgid "find the color setting: slot [stdout-is-tty]" msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]" +#: builtin/config.c:161 msgid "Type" msgstr "Type" +#: builtin/config.c:162 builtin/hash-object.c:106 msgid "type" msgstr "type" +#: builtin/config.c:162 msgid "value is given this type" msgstr "ce type est assigné à la valeur" +#: builtin/config.c:163 msgid "value is \"true\" or \"false\"" msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)" +#: builtin/config.c:164 msgid "value is decimal number" msgstr "la valeur est un nombre décimal" +#: builtin/config.c:165 msgid "value is --bool or --int" msgstr "la valeur est --bool ou --int" +#: builtin/config.c:166 msgid "value is --bool or string" msgstr "la valeur est --bool ou une chaîne" +#: builtin/config.c:167 msgid "value is a path (file or directory name)" msgstr "la valeur est un chemin (vers un fichier ou un répertoire)" +#: builtin/config.c:168 msgid "value is an expiry date" msgstr "la valeur est une date d'expiration" +#: builtin/config.c:169 msgid "Other" msgstr "Autre" +#: builtin/config.c:170 msgid "terminate values with NUL byte" msgstr "terminer les valeurs avec un caractère NUL" +#: builtin/config.c:171 msgid "show variable names only" msgstr "n'afficher que les noms de variable" +#: builtin/config.c:172 msgid "respect include directives on lookup" msgstr "respecter les directives d'inclusion lors de la recherche" +#: builtin/config.c:173 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "afficher l'origine de la configuration (fichier, entrée standard, blob, " "ligne de commande)" +#: builtin/config.c:174 msgid "show scope of config (worktree, local, global, system, command)" msgstr "" "afficher la portée de configuration (arbre de travail, local, global, " "système, commande)" +#: builtin/config.c:175 msgid "value" msgstr "valeur" +#: builtin/config.c:175 msgid "with --get, use default value when missing entry" msgstr "avec --get, utiliser le valeur par défaut quand l'entrée n'existe pas" +#: builtin/config.c:189 #, c-format msgid "wrong number of arguments, should be %d" msgstr "mauvais nombre d'arguments, devrait être %d" +#: builtin/config.c:191 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "mauvais nombre d'arguments, devrait être entre %d et %d" +#: builtin/config.c:357 #, c-format msgid "invalid key pattern: %s" msgstr "motif de clé invalide : %s" +#: builtin/config.c:379 config.c:3249 #, c-format msgid "invalid pattern: %s" msgstr "motif invalide : %s" +#: builtin/config.c:399 #, c-format msgid "failed to format default config value: %s" msgstr "échec du formatage de la valeur de config par défaut : %s" +#: builtin/config.c:464 #, c-format msgid "cannot parse color '%s'" msgstr "impossible d'analyser la couleur '%s'" +#: builtin/config.c:509 msgid "unable to parse default color value" msgstr "impossible de lire la valeur de couleur par défaut" +#: builtin/config.c:564 builtin/config.c:870 msgid "not in a git directory" msgstr "pas dans un répertoire git" +#: builtin/config.c:567 msgid "writing to stdin is not supported" msgstr "l'écriture sur stdin n'est pas supportée" +#: builtin/config.c:570 msgid "writing config blobs is not supported" msgstr "l'écriture de blob de configuration n'est pas supportée<" +#: builtin/config.c:662 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5370,21 +6775,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" +#: builtin/config.c:689 msgid "only one config file at a time" msgstr "un seul fichier de configuration à la fois" +#: builtin/config.c:695 msgid "--local can only be used inside a git repository" msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git" +#: builtin/config.c:697 msgid "--blob can only be used inside a git repository" msgstr "--blob ne peut être utilisé qu'à l'intérieur d'un dépôt git" +#: builtin/config.c:699 msgid "--worktree can only be used inside a git repository" msgstr "--worktree ne peut être utilisé qu'à l'intérieur d'un dépôt git" +#: builtin/config.c:721 builtin/gc.c:1552 builtin/gc.c:1620 msgid "$HOME not set" msgstr "$HOME n'est pas défini" +#: builtin/config.c:745 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -5395,15 +6806,19 @@ msgstr "" "la section \"CONFIGURATION FILE\" de \"git help worktree\" pour plus de " "détails" +#: builtin/config.c:780 msgid "--get-color and variable type are incoherent" msgstr "--get-color et le type de la variable sont incohérents" +#: builtin/config.c:785 msgid "only one action at a time" msgstr "une seule action à la fois" +#: builtin/config.c:798 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only n'est applicable qu'avec --list ou --get-regexp" +#: builtin/config.c:804 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" @@ -5411,29 +6826,37 @@ msgstr "" "--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --" "list" +#: builtin/config.c:810 msgid "--default is only applicable to --get" msgstr "--default n'est applicable qu'avec --get" +#: builtin/config.c:843 msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value ne s'applique qu'à 'motif-de-valeur'" +#: builtin/config.c:859 #, c-format msgid "unable to read config file '%s'" msgstr "lecture du fichier de configuration '%s' impossible" +#: builtin/config.c:862 msgid "error processing config file(s)" msgstr "erreur lors du traitement de fichier(s) de configuration" +#: builtin/config.c:872 msgid "editing stdin is not supported" msgstr "l'édition de stdin n'est pas supportée" +#: builtin/config.c:874 msgid "editing blobs is not supported" msgstr "l'édition de blobs n'est pas supportée" +#: builtin/config.c:888 #, c-format msgid "cannot create configuration file %s" msgstr "création impossible du fichier de configuration '%s'" +#: builtin/config.c:899 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -5442,13 +6865,16 @@ msgstr "" "impossible de surcharger des valeurs multiples avec une seule valeur\n" " Utilisez une regexp, --add ou --replace-all pour modifier %s." +#: builtin/config.c:973 builtin/config.c:985 #, c-format msgid "no such section: %s" msgstr "section inexistante : %s" +#: builtin/count-objects.c:104 msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" +#: builtin/credential-cache--daemon.c:239 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -5461,64 +6887,80 @@ msgstr "" "\n" " chmod 0700 %s" +#: builtin/credential-cache--daemon.c:288 msgid "print debugging messages to stderr" msgstr "afficher les messages de debug sur stderr" +#: builtin/credential-cache--daemon.c:328 msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "" "credential-cache--daemon non disponible ; pas de gestion des sockets unix" +#: builtin/credential-cache.c:184 msgid "credential-cache unavailable; no unix socket support" msgstr "credential-cache non disponible ; pas de gestion des socket unix" +#: builtin/credential-store.c:70 #, c-format msgid "unable to get credential storage lock in %d ms" msgstr "impossible d'accéder au verrou de stockage d'identification en %d ms" +#: builtin/describe.c:33 msgid "" "git describe [--all] [--tags] [--contains] [--abbrev=] [...]" msgstr "" "git describe [--all] [--tags] [--contains] [--abbrev=] [...]" +#: builtin/describe.c:34 msgid "" "git describe [--all] [--tags] [--contains] [--abbrev=] --dirty[=]" msgstr "" "git describe [--all] [--tags] [--contains] [--abbrev=] --dirty[=]" +#: builtin/describe.c:35 msgid "git describe " msgstr "git describe " +#: builtin/describe.c:71 msgid "head" msgstr "tête" +#: builtin/describe.c:71 msgid "lightweight" msgstr "léger" +#: builtin/describe.c:71 msgid "annotated" msgstr "annoté" +#: builtin/describe.c:286 #, c-format msgid "annotated tag %s not available" msgstr "l'étiquette annotée %s n'est pas disponible" +#: builtin/describe.c:290 #, c-format msgid "tag '%s' is externally known as '%s'" msgstr "l'étiquette '%s' est connue à l'extérieur comme '%s'" +#: builtin/describe.c:338 #, c-format msgid "no tag exactly matches '%s'" msgstr "aucune étiquette ne correspond parfaitement à '%s'" +#: builtin/describe.c:340 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par " "describe\n" +#: builtin/describe.c:407 #, c-format msgid "finished search at %s\n" msgstr "recherche terminée à %s\n" +#: builtin/describe.c:434 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -5527,6 +6969,7 @@ msgstr "" "Aucune étiquette annotée ne peut décrire '%s'.\n" "Cependant, il existe des étiquettes non-annotées : essayez avec --tags." +#: builtin/describe.c:438 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -5535,10 +6978,12 @@ msgstr "" "Aucune étiquette ne peut décrire '%s'.\n" "Essayez --always, ou créez des étiquettes." +#: builtin/describe.c:468 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits parcourus\n" +#: builtin/describe.c:471 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -5548,70 +6993,90 @@ msgstr "" "affichées\n" "abandon de la recherche à %s\n" +#: builtin/describe.c:540 #, c-format msgid "describe %s\n" msgstr "décrire %s\n" +#: builtin/describe.c:543 #, c-format msgid "Not a valid object name %s" msgstr "%s n'est pas un nom d'objet valide" +#: builtin/describe.c:551 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s n'est ni un commit ni un blob" +#: builtin/describe.c:576 msgid "find the tag that comes after the commit" msgstr "rechercher l'étiquette qui suit le commit" +#: builtin/describe.c:577 msgid "debug search strategy on stderr" msgstr "déboguer la stratégie de recherche sur stderr" +#: builtin/describe.c:578 msgid "use any ref" msgstr "utiliser n'importe quelle référence" +#: builtin/describe.c:579 msgid "use any tag, even unannotated" msgstr "utiliser n'importe quelle étiquette, même non-annotée" +#: builtin/describe.c:580 msgid "always use long format" msgstr "toujours utiliser le format long" +#: builtin/describe.c:581 msgid "only follow first parent" msgstr "ne suivre que le premier parent" +#: builtin/describe.c:584 msgid "only output exact matches" msgstr "n'afficher que les correspondances exactes" +#: builtin/describe.c:587 msgid "consider most recent tags (default: 10)" msgstr "" "considérer uniquement les étiquettes le plus récentes (défaut : 10)" +#: builtin/describe.c:589 msgid "only consider tags matching " msgstr "ne considérer que les étiquettes correspondant à " +#: builtin/describe.c:591 msgid "do not consider tags matching " msgstr "ne pas considérer les étiquettes correspondant à " +#: builtin/describe.c:593 builtin/name-rev.c:584 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrégés en dernier recours" +#: builtin/describe.c:594 builtin/describe.c:597 msgid "mark" msgstr "marque" +#: builtin/describe.c:595 msgid "append on dirty working tree (default: \"-dirty\")" msgstr "ajouter si la copie de travail est sale (défaut : \"-dirty\")" +#: builtin/describe.c:598 msgid "append on broken working tree (default: \"-broken\")" msgstr "" "ajouter si la copie de travail est cassée (défaut : \"-broken\")" +#: builtin/describe.c:645 msgid "No names found, cannot describe anything." msgstr "Aucun nom trouvé, impossible de décrire quoi que ce soit." +#: builtin/describe.c:700 builtin/describe.c:702 #, c-format msgid "option '%s' and commit-ishes cannot be used together" msgstr "" "l'option '%s' et des commit-esques ne peuvent pas être utilisées ensemble" +#: builtin/diagnose.c:9 msgid "" "git diagnose [(-o | --output-directory) ] [(-s | --suffix) ]\n" " [--mode=]" @@ -5619,67 +7084,85 @@ msgstr "" "git diagnose [-o | --output-directory ] [(-s | --suffix) ]\n" " [--mode=]" +#: builtin/diagnose.c:26 msgid "specify a destination for the diagnostics archive" msgstr "spécifier la destination de l'archive de diagnostique" +#: builtin/diagnose.c:28 msgid "specify a strftime format suffix for the filename" msgstr "spécifier une suffixe au format strftime pour le nom de fichier" +#: builtin/diagnose.c:30 msgid "specify the content of the diagnostic archive" msgstr "spécifier le contenu de l'archive de diagnostique" +#: builtin/diff-tree.c:167 msgid "--merge-base only works with two commits" msgstr "--merge-base ne fonctionne qu'avec deux commits" +#: builtin/diff.c:97 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique" +#: builtin/diff.c:222 msgid "no merge given, only parents." msgstr "pas de fusion fournie, seulement des parents." +#: builtin/diff.c:267 #, c-format msgid "invalid option: %s" msgstr "option invalide : %s" +#: builtin/diff.c:386 #, c-format msgid "%s...%s: no merge base" msgstr "%s..%s: pas de base de fusion" +#: builtin/diff.c:501 msgid "Not a git repository" msgstr "Ce n'est pas un dépôt git" +#: builtin/diff.c:547 builtin/grep.c:751 #, c-format msgid "invalid object '%s' given." msgstr "objet spécifié '%s' invalide." +#: builtin/diff.c:563 #, c-format msgid "more than two blobs given: '%s'" msgstr "plus de deux blobs spécifiés : '%s'" +#: builtin/diff.c:568 #, c-format msgid "unhandled object '%s' given." msgstr "objet non géré '%s' spécifié." +#: builtin/diff.c:602 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "\"%s...%s\" : bases multiples de fusion, utilisation de %s" +#: builtin/difftool.c:39 msgid "git difftool [] [ []] [--] [...]" msgstr "git difftool [] [ []] [--] [...]" +#: builtin/difftool.c:299 #, c-format msgid "could not read symlink %s" msgstr "lecture du lien symbolique %s impossible" +#: builtin/difftool.c:301 #, c-format msgid "could not read symlink file %s" msgstr "impossible de lire le fichier symlink %s" +#: builtin/difftool.c:310 #, c-format msgid "could not read object %s for symlink %s" msgstr "impossible de lire l'objet %s pour le symlink %s" +#: builtin/difftool.c:432 msgid "" "combined diff formats ('-c' and '--cc') are not supported in\n" "directory diff mode ('-d' and '--dir-diff')." @@ -5687,49 +7170,63 @@ msgstr "" "les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n" "dans le mode de diff de répertoire ('-d' et '--dir-diff')." +#: builtin/difftool.c:638 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "les deux fichiers sont modifiés : '%s' et '%s'." +#: builtin/difftool.c:640 msgid "working tree file has been left." msgstr "le fichier dans l'arbre de travail a été laissé." +#: builtin/difftool.c:645 sequencer.c:2338 sequencer.c:3632 sequencer.c:3636 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" +#: builtin/difftool.c:651 #, c-format msgid "temporary files exist in '%s'." msgstr "des fichiers temporaires existent dans '%s'." +#: builtin/difftool.c:652 msgid "you may want to cleanup or recover these." msgstr "vous pourriez souhaiter les nettoyer ou les récupérer." +#: builtin/difftool.c:657 #, c-format msgid "failed: %d" msgstr "échec : %d" +#: builtin/difftool.c:702 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utiliser `diff.guitool` au lieu de `diff.tool`" +#: builtin/difftool.c:704 msgid "perform a full-directory diff" msgstr "réalise un diff de répertoire complet" +#: builtin/difftool.c:706 msgid "do not prompt before launching a diff tool" msgstr "ne pas confirmer avant de lancer l'outil de diff" +#: builtin/difftool.c:711 msgid "use symlinks in dir-diff mode" msgstr "utiliser les liens symboliques en mode de diff de répertoire" +#: builtin/difftool.c:712 msgid "tool" msgstr "outil" +#: builtin/difftool.c:713 msgid "use the specified diff tool" msgstr "utiliser l'outil de diff spécifié" +#: builtin/difftool.c:715 msgid "print a list of diff tools that may be used with `--tool`" msgstr "afficher une liste des outils de diff utilisables avec `--tool`" +#: builtin/difftool.c:718 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit " "code" @@ -5737,187 +7234,244 @@ msgstr "" "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code " "de sortie non-nul" +#: builtin/difftool.c:721 msgid "specify a custom command for viewing diffs" msgstr "spécifier une commande personnalisée pour visualiser les différences" +#: builtin/difftool.c:722 msgid "passed to `diff`" msgstr "passé à `diff`" +#: builtin/difftool.c:738 msgid "difftool requires worktree or --no-index" msgstr "difftool exige un arbre de travail ou --no-index" +#: builtin/difftool.c:765 msgid "no given for --tool=" msgstr "pas d' spécifié pour --tool=" +#: builtin/difftool.c:772 msgid "no given for --extcmd=" msgstr "pas de spécifié pour --extcmd=" +#: builtin/fast-export.c:31 msgid "git fast-export []" msgstr "git fast-export []" +#: builtin/fast-export.c:865 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" "Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-" "tags ne soit spécifié." +#: builtin/fast-export.c:1170 msgid "--anonymize-map token cannot be empty" msgstr "le jeton --anonymize-map ne peut pas être vide" +#: builtin/fast-export.c:1190 msgid "show progress after objects" msgstr "afficher la progression après objets" +#: builtin/fast-export.c:1192 msgid "select handling of signed tags" msgstr "sélectionner la gestion des étiquettes signées" +#: builtin/fast-export.c:1195 msgid "select handling of tags that tag filtered objects" msgstr "" "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés" +#: builtin/fast-export.c:1198 msgid "select handling of commit messages in an alternate encoding" msgstr "" "sélectionner la gestion des messages de validation dans un encodage " "alternatif" +#: builtin/fast-export.c:1201 msgid "dump marks to this file" msgstr "enregistrer les marques dans ce fichier" +#: builtin/fast-export.c:1203 msgid "import marks from this file" msgstr "importer les marques depuis ce fichier" +#: builtin/fast-export.c:1207 msgid "import marks from this file if it exists" msgstr "importer les marques depuis ce fichier s'il existe" +#: builtin/fast-export.c:1209 msgid "fake a tagger when tags lack one" msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas" +#: builtin/fast-export.c:1211 msgid "output full tree for each commit" msgstr "afficher l'arbre complet pour chaque commit" +#: builtin/fast-export.c:1213 msgid "use the done feature to terminate the stream" msgstr "utiliser la fonction \"done\" pour terminer le flux" +#: builtin/fast-export.c:1214 msgid "skip output of blob data" msgstr "sauter l'affichage de données de blob" +#: builtin/fast-export.c:1215 builtin/log.c:1986 msgid "refspec" msgstr "spécificateur de référence" +#: builtin/fast-export.c:1216 msgid "apply refspec to exported refs" msgstr "appliquer le spécificateur de référence aux références exportées" +#: builtin/fast-export.c:1217 msgid "anonymize output" msgstr "anonymise la sortie" +#: builtin/fast-export.c:1218 msgid "from:to" msgstr "depuis:vers" +#: builtin/fast-export.c:1219 msgid "convert to in anonymized output" msgstr "convertit en dans la sortie anonymisée" +#: builtin/fast-export.c:1222 msgid "reference parents which are not in fast-export stream by object id" msgstr "" "référencer les parents qui ne sont pas dans le flux d'export rapide par id " "d'objet" +#: builtin/fast-export.c:1224 msgid "show original object ids of blobs/commits" msgstr "afficher les ids d'objet originaux des blobs/commits" +#: builtin/fast-export.c:1226 msgid "label tags with mark ids" msgstr "marquer les étiquettes avec des ids de marque" +#: builtin/fast-import.c:3106 #, c-format msgid "Missing from marks for submodule '%s'" msgstr "Champs from manquants pour le sous-module '%s'" +#: builtin/fast-import.c:3108 #, c-format msgid "Missing to marks for submodule '%s'" msgstr "Champs 'to' manquants pour le sous-module '%s'" +#: builtin/fast-import.c:3243 #, c-format msgid "Expected 'mark' command, got %s" msgstr "Commande 'mark' attendue, %s trouvé" +#: builtin/fast-import.c:3248 #, c-format msgid "Expected 'to' command, got %s" msgstr "Commande 'to' attendue, %s trouvé" +#: builtin/fast-import.c:3342 msgid "Expected format name:filename for submodule rewrite option" msgstr "" "Format attendu nom: pour l'option de réécriture de sous-" "module" +#: builtin/fast-import.c:3399 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "" "la fonctionnalité '%s' est interdite en entrée sans --allow-unsafe-features" +#: builtin/fetch-pack.c:250 #, c-format msgid "Lockfile created but not reported: %s" msgstr "Fichier verrou créé mais non reporté : %s" +#: builtin/fetch.c:47 msgid "git fetch [] [ [...]]" msgstr "git fetch [] [ [...]]" +#: builtin/fetch.c:48 msgid "git fetch [] " msgstr "git fetch [] " +#: builtin/fetch.c:49 msgid "git fetch --multiple [] [( | )...]" msgstr "git fetch --multiple [] [( | )...]" +#: builtin/fetch.c:50 msgid "git fetch --all []" msgstr "git fetch --all []" +#: builtin/fetch.c:150 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel ne peut pas être négatif" +#: builtin/fetch.c:574 msgid "couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" +#: builtin/fetch.c:857 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" +#: builtin/fetch.c:902 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" +#: builtin/fetch.c:906 msgid "[up to date]" msgstr "[à jour]" +#: builtin/fetch.c:919 builtin/fetch.c:937 builtin/fetch.c:1014 msgid "[rejected]" msgstr "[rejeté]" +#: builtin/fetch.c:920 msgid "can't fetch into checked-out branch" msgstr "impossible de récupérer dans la branche extraite" +#: builtin/fetch.c:931 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" +#: builtin/fetch.c:932 builtin/fetch.c:971 builtin/fetch.c:995 +#: builtin/fetch.c:1008 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" +#: builtin/fetch.c:938 msgid "would clobber existing tag" msgstr "écraserait l'étiquette existante" +#: builtin/fetch.c:960 msgid "[new tag]" msgstr "[nouvelle étiquette]" +#: builtin/fetch.c:963 msgid "[new branch]" msgstr "[nouvelle branche]" +#: builtin/fetch.c:966 msgid "[new ref]" msgstr "[nouvelle référence]" +#: builtin/fetch.c:1008 msgid "forced update" msgstr "mise à jour forcée" +#: builtin/fetch.c:1014 msgid "non-fast-forward" msgstr "pas en avance rapide" +#: builtin/fetch.c:1046 builtin/fetch.c:1431 builtin/grep.c:831 +#: sequencer.c:3323 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" +#: builtin/fetch.c:1118 msgid "" "fetch normally indicates which branches had a forced update,\n" "but that check has been disabled; to re-enable, use '--show-forced-updates'\n" @@ -5927,6 +7481,7 @@ msgstr "" "mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n" "'--show-forced-updates' ou lancez 'git config fetch.showForcedUpdates true'" +#: builtin/fetch.c:1122 #, c-format msgid "" "it took %.2f seconds to check forced updates; you can use\n" @@ -5938,16 +7493,19 @@ msgstr "" "Vous pouvez utiliser '--no-show-forced-updates' ou lancer\n" "'git config fetch.showForcedUpdates false' pour éviter cette vérification\n" +#: builtin/fetch.c:1149 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n" +#: builtin/fetch.c:1168 #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "" "%s rejeté parce que les mises à jour de racines superficielles ne sont pas " "permises" +#: builtin/fetch.c:1266 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5956,43 +7514,54 @@ msgstr "" "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n" " 'git remote prune %s' pour supprimer des branches anciennes en conflit" +#: builtin/fetch.c:1373 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" +#: builtin/fetch.c:1374 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" +#: builtin/fetch.c:1399 msgid "[deleted]" msgstr "[supprimé]" +#: builtin/fetch.c:1400 builtin/remote.c:1174 msgid "(none)" msgstr "(aucun(e))" +#: builtin/fetch.c:1420 #, c-format msgid "refusing to fetch into branch '%s' checked out at '%s'" msgstr "refus de récupérer dans la branche '%s' extraite dans '%s'" +#: builtin/fetch.c:1440 #, c-format msgid "option \"%s\" value \"%s\" is not valid for %s" msgstr "la valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" +#: builtin/fetch.c:1443 #, c-format msgid "option \"%s\" is ignored for %s\n" msgstr "l'option \"%s\" est ignorée pour %s\n" +#: builtin/fetch.c:1469 object-file.c:2534 #, c-format msgid "%s is not a valid object" msgstr "%s n'est pas un objet valide" +#: builtin/fetch.c:1471 #, c-format msgid "the object %s does not exist" msgstr "l'objet %s n'existe pas" +#: builtin/fetch.c:1741 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "branches multiples détectées, imcompatible avec --set-upstream" +#: builtin/fetch.c:1753 #, c-format msgid "" "could not set upstream of HEAD to '%s' from '%s' when it does not point to " @@ -6001,15 +7570,19 @@ msgstr "" "impossible de régler la branche amont de HEAD à '%s' depuis '%s' qui ne " "pointe sur aucune branche." +#: builtin/fetch.c:1766 msgid "not setting upstream for a remote remote-tracking branch" msgstr "dépôt amont non défini pour la branche de suivi à distance" +#: builtin/fetch.c:1768 msgid "not setting upstream for a remote tag" msgstr "dépôt amont non défini pour l'étiquette distante" +#: builtin/fetch.c:1770 msgid "unknown branch type" msgstr "type de branche inconnu" +#: builtin/fetch.c:1772 msgid "" "no source branch found;\n" "you need to specify exactly one branch with the --set-upstream option" @@ -6017,18 +7590,22 @@ msgstr "" "aucune branche source trouvée.\n" "Vous devez spécifier exactement une branche avec l'option --set-upstream" +#: builtin/fetch.c:1908 builtin/fetch.c:1986 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" +#: builtin/fetch.c:1919 builtin/fetch.c:1989 #, c-format msgid "could not fetch %s" msgstr "impossible de récupérer %s" +#: builtin/fetch.c:1931 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "impossible de récupérer '%s' (code de sortie : %d)\n" +#: builtin/fetch.c:2050 msgid "" "no remote repository specified; please specify either a URL or a\n" "remote name from which new revisions should be fetched" @@ -6036,84 +7613,110 @@ msgstr "" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" "distant depuis lesquels les nouvelles révisions devraient être récupérées" +#: builtin/fetch.c:2086 msgid "you need to specify a tag name" msgstr "Vous devez spécifier un nom d'étiquette" +#: builtin/fetch.c:2148 builtin/pull.c:196 msgid "fetch from all remotes" msgstr "récupérer depuis tous les dépôts distants" +#: builtin/fetch.c:2150 builtin/pull.c:256 msgid "set upstream for git pull/fetch" msgstr "définir la branche amont pour git pull/fetch" +#: builtin/fetch.c:2152 builtin/pull.c:199 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" +#: builtin/fetch.c:2154 msgid "use atomic transaction to update references" msgstr "utiliser une transaction atomique pour mettre à jour les références" +#: builtin/fetch.c:2156 builtin/pull.c:202 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" +#: builtin/fetch.c:2157 msgid "force overwrite of local reference" msgstr "forcer l'écrasement de la branche locale" +#: builtin/fetch.c:2159 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" +#: builtin/fetch.c:2161 builtin/pull.c:206 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" +#: builtin/fetch.c:2163 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" +#: builtin/fetch.c:2165 msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules récupérés en parallèle" +#: builtin/fetch.c:2167 msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "" "modifier le spécificateur de référence pour placer les références dans refs/" "prefetch/" +#: builtin/fetch.c:2169 builtin/pull.c:209 msgid "prune remote-tracking branches no longer on remote" msgstr "" "élaguer les branches de suivi distant si la branche n'existe plus dans le " "dépôt distant" +#: builtin/fetch.c:2171 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "élaguer les étiquettes locales qui ont disparu du dépôt distant et qui " "encombrent les étiquettes modifiées" +#: builtin/fetch.c:2172 builtin/fetch.c:2201 builtin/pull.c:130 msgid "on-demand" msgstr "à la demande" +#: builtin/fetch.c:2173 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" +#: builtin/fetch.c:2179 msgid "write fetched references to the FETCH_HEAD file" msgstr "écrire les références récupérées dans le fichier FETCH_HEAD" +#: builtin/fetch.c:2180 builtin/pull.c:217 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" +#: builtin/fetch.c:2182 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" +#: builtin/fetch.c:2185 builtin/fetch.c:2191 builtin/pull.c:220 +#: builtin/pull.c:229 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" +#: builtin/fetch.c:2187 builtin/pull.c:223 msgid "deepen history of shallow repository based on time" msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date" +#: builtin/fetch.c:2193 builtin/pull.c:232 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" +#: builtin/fetch.c:2196 msgid "re-fetch without negotiating common commits" msgstr "re-récupérer sans négocier les commits communs" +#: builtin/fetch.c:2199 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" +#: builtin/fetch.c:2202 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -6121,71 +7724,91 @@ msgstr "" "par défaut pour la récupération récursive de sous-modules (priorité plus " "basse que les fichiers de config)" +#: builtin/fetch.c:2206 builtin/pull.c:235 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" +#: builtin/fetch.c:2207 builtin/pull.c:237 msgid "refmap" msgstr "correspondance de référence" +#: builtin/fetch.c:2208 builtin/pull.c:238 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" +#: builtin/fetch.c:2212 builtin/pull.c:251 msgid "report that we have only objects reachable from this object" msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet" +#: builtin/fetch.c:2214 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "" "ne pas récupérer le fichier paquet ; à la place, afficher les ancêtres des " "sommets de négociation" +#: builtin/fetch.c:2217 builtin/fetch.c:2219 msgid "run 'maintenance --auto' after fetching" msgstr "lancer 'maintenance --auto' après la récupération" +#: builtin/fetch.c:2221 builtin/pull.c:254 msgid "check for forced-updates on all updated branches" msgstr "" "vérifier les mises à jour forcées (forced-updates) sur toutes les branches " "mises à jour" +#: builtin/fetch.c:2223 msgid "write the commit-graph after fetching" msgstr "écrire le graphe de commits après le rapatriement" +#: builtin/fetch.c:2225 msgid "accept refspecs from stdin" msgstr "lire les spécificateurs de référence depuis l'entrée standard" +#: builtin/fetch.c:2301 msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only nécessite au moins un --negotiation-tip=*" +#: builtin/fetch.c:2305 msgid "negative depth in --deepen is not supported" msgstr "une profondeur négative dans --deepen n'est pas supportée" +#: builtin/fetch.c:2314 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow sur un dépôt complet n'a pas de sens" +#: builtin/fetch.c:2334 #, c-format msgid "failed to fetch bundles from '%s'" msgstr "échec de récupération des colis depuis '%s'" +#: builtin/fetch.c:2338 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" +#: builtin/fetch.c:2340 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all n'a pas de sens avec des spécifications de référence" +#: builtin/fetch.c:2353 #, c-format msgid "no such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" +#: builtin/fetch.c:2361 msgid "fetching a group and specifying refspecs does not make sense" msgstr "" "la récupération d'un groupe avec des spécifications de référence n'a pas de " "sens" +#: builtin/fetch.c:2378 msgid "must supply remote when using --negotiate-only" msgstr "le distant doit être fourni lors de l'utilisation de --negotiate-only" +#: builtin/fetch.c:2383 msgid "protocol does not support --negotiate-only, exiting" msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon" +#: builtin/fetch.c:2404 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -6193,122 +7816,159 @@ msgstr "" "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans " "extensions.partialclone" +#: builtin/fetch.c:2408 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic ne peut être utilisée qu'en récupérant depuis un seul distant" +#: builtin/fetch.c:2412 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin ne peut être utilisée qu'en récupérant depuis un seul distant" +#: builtin/fmt-merge-msg.c:8 msgid "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" msgstr "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" +#: builtin/fmt-merge-msg.c:20 msgid "populate log with at most entries from shortlog" msgstr "peupler le journal avec au plus éléments depuis le journal court" +#: builtin/fmt-merge-msg.c:23 msgid "alias for --log (deprecated)" msgstr "alias pour --log (obsolète)" +#: builtin/fmt-merge-msg.c:26 msgid "text" msgstr "texte" +#: builtin/fmt-merge-msg.c:27 msgid "use as start of message" msgstr "utiliser comme début de message" +#: builtin/fmt-merge-msg.c:29 msgid "use instead of the real target branch" msgstr "utiliser au lieu de la branche cible reélle" +#: builtin/fmt-merge-msg.c:30 msgid "file to read from" msgstr "fichier d'où lire" +#: builtin/for-each-ref.c:13 msgid "git for-each-ref [] []" msgstr "git for-each-ref [] []" +#: builtin/for-each-ref.c:14 msgid "git for-each-ref [--points-at ]" msgstr "git for-each-ref [--points-at ]" +#: builtin/for-each-ref.c:15 msgid "git for-each-ref [--merged []] [--no-merged []]" msgstr "git for-each-ref [--merged []] [--no-merged []]" +#: builtin/for-each-ref.c:16 msgid "git for-each-ref [--contains []] [--no-contains []]" msgstr "git for-each-ref [--contains []] [--no-contains []]" +#: builtin/for-each-ref.c:36 msgid "quote placeholders suitably for shells" msgstr "échapper les champs réservés pour les interpréteurs de commandes" +#: builtin/for-each-ref.c:38 msgid "quote placeholders suitably for perl" msgstr "échapper les champs réservés pour perl" +#: builtin/for-each-ref.c:40 msgid "quote placeholders suitably for python" msgstr "échapper les champs réservés pour python" +#: builtin/for-each-ref.c:42 msgid "quote placeholders suitably for Tcl" msgstr "échapper les champs réservés pour compatibilité avec Tcl" +#: builtin/for-each-ref.c:47 msgid "show only matched refs" msgstr "n'afficher que références correspondant" +#: builtin/for-each-ref.c:49 builtin/tag.c:494 msgid "respect format colors" msgstr "respecter les couleurs de formatage" +#: builtin/for-each-ref.c:53 msgid "print only refs which points at the given object" msgstr "afficher seulement les références pointant sur l'objet" +#: builtin/for-each-ref.c:55 msgid "print only refs that are merged" msgstr "afficher seulement les références qui sont fusionnées" +#: builtin/for-each-ref.c:56 msgid "print only refs that are not merged" msgstr "afficher seulement les références qui ne sont pas fusionnées" +#: builtin/for-each-ref.c:57 msgid "print only refs which contain the commit" msgstr "afficher seulement les références qui contiennent le commit" +#: builtin/for-each-ref.c:58 msgid "print only refs which don't contain the commit" msgstr "afficher seulement les références qui ne contiennent pas le commit" +#: builtin/for-each-ref.c:60 msgid "read reference patterns from stdin" msgstr "lire les motifs de références depuis l'entrée standard" +#: builtin/for-each-ref.c:90 msgid "unknown arguments supplied with --stdin" msgstr "arguments inconnus fournis avec l'option --stdin" +#: builtin/for-each-repo.c:11 msgid "git for-each-repo --config= [--] " msgstr "git for-each-repo --config= [--] " +#: builtin/for-each-repo.c:40 msgid "config" msgstr "config" +#: builtin/for-each-repo.c:41 msgid "config key storing a list of repository paths" msgstr "clé de config qui stocke la liste des chemins de dépôts" +#: builtin/for-each-repo.c:49 msgid "missing --config=" msgstr "--config= manquant" +#: builtin/for-each-repo.c:53 #, c-format msgid "got bad config --config=%s" msgstr "config incorrecte --config=%s" +#: builtin/fsck.c:80 builtin/fsck.c:139 builtin/fsck.c:140 msgid "unknown" msgstr "inconnu" #. TRANSLATORS: e.g. error in tree 01bfda: +#: builtin/fsck.c:89 builtin/fsck.c:111 #, c-format msgid "error in %s %s: %s" msgstr "erreur dans l'objet %s %s : %s" #. TRANSLATORS: e.g. warning in tree 01bfda: +#: builtin/fsck.c:105 #, c-format msgid "warning in %s %s: %s" msgstr "avertissement dans l'objet %s %s : %s" +#: builtin/fsck.c:135 builtin/fsck.c:138 #, c-format msgid "broken link from %7s %s" msgstr "lien cassé dans l'objet %7s %s" +#: builtin/fsck.c:147 msgid "wrong object type in link" msgstr "type d'objet inconnu dans le lien" +#: builtin/fsck.c:163 #, c-format msgid "" "broken link from %7s %s\n" @@ -6317,147 +7977,187 @@ msgstr "" "lien cassé depuis %7s %s\n" " vers %7s %s" +#: builtin/fsck.c:200 builtin/prune.c:64 connected.c:115 msgid "Checking connectivity" msgstr "Vérification de la connectivité" +#: builtin/fsck.c:277 #, c-format msgid "missing %s %s" msgstr "objet %s manquant %s" +#: builtin/fsck.c:304 #, c-format msgid "unreachable %s %s" msgstr "objet %s inatteignable %s" +#: builtin/fsck.c:324 #, c-format msgid "dangling %s %s" msgstr "objet %s fantôme %s" +#: builtin/fsck.c:334 msgid "could not create lost-found" msgstr "impossible de créer le fichier lost-found" +#: builtin/fsck.c:341 builtin/gc.c:1930 builtin/rebase.c:216 +#: rebase-interactive.c:122 rerere.c:476 rerere.c:684 sequencer.c:4044 +#: sequencer.c:4070 sequencer.c:6248 #, c-format msgid "could not write '%s'" msgstr "impossible d'écrire '%s'" +#: builtin/fsck.c:345 #, c-format msgid "could not finish '%s'" msgstr "impossible de finir '%s'" +#: builtin/fsck.c:362 #, c-format msgid "Checking %s" msgstr "Vérification de l'objet %s" +#: builtin/fsck.c:400 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Vérification de la connectivité (%d objets)" +#: builtin/fsck.c:419 #, c-format msgid "Checking %s %s" msgstr "Vérification de l'objet %s %s" +#: builtin/fsck.c:424 msgid "broken links" msgstr "liens cassés" +#: builtin/fsck.c:433 #, c-format msgid "root %s" msgstr "racine %s" +#: builtin/fsck.c:441 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "étiquetage de l'objet %s %s (%s) dans %s" +#: builtin/fsck.c:467 #, c-format msgid "%s: object corrupt or missing" msgstr "%s : objet corrompu ou manquant" +#: builtin/fsck.c:492 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s : entrée %s de journal de références invalide" +#: builtin/fsck.c:507 #, c-format msgid "Checking reflog %s->%s" msgstr "Vérification du journal de réferences %s-> %s" +#: builtin/fsck.c:542 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s : pointeur de sha1 invalide %s" +#: builtin/fsck.c:549 #, c-format msgid "%s: not a commit" msgstr "l'objet %s n'est pas un commit" +#: builtin/fsck.c:603 msgid "notice: No default references" msgstr "note : pas de référence par défaut" +#: builtin/fsck.c:633 #, c-format msgid "%s: hash-path mismatch, found at: %s" msgstr "%s : incohérence de hachage,trouvé à : %s" +#: builtin/fsck.c:636 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s : objet corrompu ou manquant : %s" +#: builtin/fsck.c:640 #, c-format msgid "%s: object is of unknown type '%s': %s" msgstr "%s : l'objet a un type '%s' inconnu : %s" +#: builtin/fsck.c:657 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s : impossible d'analyser : %s" +#: builtin/fsck.c:678 #, c-format msgid "bad sha1 file: %s" msgstr "mauvais fichier de sha1 : %s" +#: builtin/fsck.c:699 msgid "Checking object directory" msgstr "Vérification du répertoire d'objet" +#: builtin/fsck.c:702 msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" +#: builtin/fsck.c:718 #, c-format msgid "Checking %s link" msgstr "Vérification du lien %s" +#: builtin/fsck.c:723 builtin/index-pack.c:874 #, c-format msgid "invalid %s" msgstr "%s invalide" +#: builtin/fsck.c:730 #, c-format msgid "%s points to something strange (%s)" msgstr "%s pointe sur quelque chose bizarre (%s)" +#: builtin/fsck.c:736 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s : la HEAD détachée ne pointe sur rien" +#: builtin/fsck.c:740 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "note : %s pointe sur une branche non-née (%s)" +#: builtin/fsck.c:752 #, c-format msgid "Checking cache tree of %s" msgstr "Vérification de l'arbre cache de %s" +#: builtin/fsck.c:757 #, c-format msgid "%s: invalid sha1 pointer in cache-tree of %s" msgstr "%s : pointer sha1 invalide dans l'arbre de cache de %s" +#: builtin/fsck.c:766 msgid "non-tree in cache-tree" msgstr "non-arbre dans l'arbre de cache" +#: builtin/fsck.c:797 #, c-format msgid "%s: invalid sha1 pointer in resolve-undo of %s" msgstr "%s : pointeur sha1 invalide dans resolve-undo de %s" +#: builtin/fsck.c:884 #, c-format msgid "unable to load rev-index for pack '%s'" msgstr "impossible de charger le rev-index pour le paquet '%s'" +#: builtin/fsck.c:889 #, c-format msgid "invalid rev-index for pack '%s'" msgstr "rev-index invalide pour le paquet '%s'" +#: builtin/fsck.c:900 msgid "" "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" " [--[no-]full] [--strict] [--verbose] [--lost-found]\n" @@ -6469,160 +8169,206 @@ msgstr "" " [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" " [--[no-]name-objects] [...]" +#: builtin/fsck.c:909 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" +#: builtin/fsck.c:910 msgid "show dangling objects" msgstr "afficher les objets en suspens" +#: builtin/fsck.c:911 msgid "report tags" msgstr "afficher les étiquettes" +#: builtin/fsck.c:912 msgid "report root nodes" msgstr "signaler les nœuds racines" +#: builtin/fsck.c:913 msgid "make index objects head nodes" msgstr "considérer les objets de l'index comme nœuds tête" # translated from man page +#: builtin/fsck.c:914 msgid "make reflogs head nodes (default)" msgstr "considérer les reflogs comme nœuds tête (par défaut)" +#: builtin/fsck.c:915 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" +#: builtin/fsck.c:916 msgid "check only connectivity" msgstr "ne vérifier que la connectivité" +#: builtin/fsck.c:917 builtin/mktag.c:80 msgid "enable more strict checking" msgstr "activer une vérification plus strict" +#: builtin/fsck.c:919 msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" +#: builtin/fsck.c:920 builtin/prune.c:157 msgid "show progress" msgstr "afficher la progression" +#: builtin/fsck.c:921 msgid "show verbose names for reachable objects" msgstr "afficher les noms étendus pour les objets inaccessibles" +#: builtin/fsck.c:982 builtin/index-pack.c:271 msgid "Checking objects" msgstr "Vérification des objets" +#: builtin/fsck.c:1010 #, c-format msgid "%s: object missing" msgstr "%s : objet manquant" +#: builtin/fsck.c:1021 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé" +#: builtin/fsmonitor--daemon.c:21 msgid "git fsmonitor--daemon start []" msgstr "git fsmonitor--daemon start []" +#: builtin/fsmonitor--daemon.c:22 msgid "git fsmonitor--daemon run []" msgstr "git fsmonitor--daemon run []" +#: builtin/fsmonitor--daemon.c:47 builtin/fsmonitor--daemon.c:56 #, c-format msgid "value of '%s' out of range: %d" msgstr "valeur de '%s' hors de gamme : %d" +#: builtin/fsmonitor--daemon.c:66 #, c-format msgid "value of '%s' not bool or int: %d" msgstr "la valeur de '%s' n'est ni bool ni int : %d" +#: builtin/fsmonitor--daemon.c:108 #, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "fsmonitor-daemon surveille '%s'\n" +#: builtin/fsmonitor--daemon.c:113 #, c-format msgid "fsmonitor-daemon is not watching '%s'\n" msgstr "fsmonitor-daemon ne surveille pas '%s'\n" +#: builtin/fsmonitor--daemon.c:180 #, c-format msgid "could not create fsmonitor cookie '%s'" msgstr "impossible de créer le cookie fsmonitor '%s'" +#: builtin/fsmonitor--daemon.c:765 #, c-format msgid "fsmonitor: cookie_result '%d' != SEEN" msgstr "fsmonitor: cookie_result '%d' != SEEN" +#: builtin/fsmonitor--daemon.c:1214 #, c-format msgid "could not start IPC thread pool on '%s'" msgstr "impossible de démarrer le stock de fils IPC sur '%s'" +#: builtin/fsmonitor--daemon.c:1224 msgid "could not start fsmonitor listener thread" msgstr "impossible de démarrer le fil d'écoute fsmonitor" +#: builtin/fsmonitor--daemon.c:1235 msgid "could not start fsmonitor health thread" msgstr "impossible de démarrer le fil de santé fsmonitor" +#: builtin/fsmonitor--daemon.c:1370 msgid "could not initialize listener thread" msgstr "impossible de démarrer le fil d'écoute" +#: builtin/fsmonitor--daemon.c:1375 msgid "could not initialize health thread" msgstr "impossible de démarrer le fil de santé" +#: builtin/fsmonitor--daemon.c:1394 #, c-format msgid "could not cd home '%s'" msgstr "impossible de changer de répertoire à la maison '%s'" +#: builtin/fsmonitor--daemon.c:1427 builtin/fsmonitor--daemon.c:1483 #, c-format msgid "fsmonitor--daemon is already running '%s'" msgstr "fsmonitor--daemon exécute déjà '%s'" +#: builtin/fsmonitor--daemon.c:1431 #, c-format msgid "running fsmonitor-daemon in '%s'\n" msgstr "lancement du fil fsmonitor-daemon dans '%s'\n" +#: builtin/fsmonitor--daemon.c:1487 #, c-format msgid "starting fsmonitor-daemon in '%s'\n" msgstr "démarrer fsmonitor-daemon dans '%s'\n" +#: builtin/fsmonitor--daemon.c:1513 msgid "daemon failed to start" msgstr "échec du démarrage du daemon" +#: builtin/fsmonitor--daemon.c:1516 msgid "daemon not online yet" msgstr "le daemon n'est pas encore en ligne" +#: builtin/fsmonitor--daemon.c:1519 msgid "daemon terminated" msgstr "le daemon s'est terminé" +#: builtin/fsmonitor--daemon.c:1530 msgid "detach from console" msgstr "détacher de la console" +#: builtin/fsmonitor--daemon.c:1533 msgid "use ipc worker threads" msgstr "utiliser fils de travail ipc" +#: builtin/fsmonitor--daemon.c:1536 msgid "max seconds to wait for background daemon startup" msgstr "nombre max de secondes à attendre que le daemon démarre" +#: builtin/fsmonitor--daemon.c:1550 #, c-format msgid "invalid 'ipc-threads' value (%d)" msgstr "valeur invalide de 'ipc-threads' (%d)" +#: builtin/fsmonitor--daemon.c:1582 t/helper/test-cache-tree.c:66 #, c-format msgid "Unhandled subcommand '%s'" msgstr "Sous-commande non-gérée '%s'" +#: builtin/fsmonitor--daemon.c:1595 msgid "fsmonitor--daemon not supported on this platform" msgstr "fsmonitor--daemon non géré sur cette plateforme" +#: builtin/gc.c:48 msgid "git gc []" msgstr "git gc []" +#: builtin/gc.c:106 #, c-format msgid "Failed to fstat %s: %s" msgstr "Échec du stat de %s : %s" +#: builtin/gc.c:142 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "échec de l'analyse de '%s' valeur '%s'" +#: builtin/gc.c:519 setup.c:1745 #, c-format msgid "cannot stat '%s'" msgstr "impossible de faire un stat de '%s'" +#: builtin/gc.c:535 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -6638,48 +8384,64 @@ msgstr "" "\n" "%s" +#: builtin/gc.c:590 msgid "prune unreferenced objects" msgstr "élaguer les objets non référencés" +#: builtin/gc.c:592 msgid "pack unreferenced objects separately" msgstr "empaqueter les objets non référencés séparément" +#: builtin/gc.c:594 builtin/repack.c:1150 +msgid "with --cruft, limit the size of new cruft packs" +msgstr "avec --cruft, limiter la taille des nouveaux paquets déchets" + +#: builtin/gc.c:595 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" +#: builtin/gc.c:596 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" +#: builtin/gc.c:599 msgid "force running gc even if there may be another gc running" msgstr "" "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes " "tourne déjà" +#: builtin/gc.c:602 msgid "repack all other packs except the largest pack" msgstr "recompacter tous les autres paquets excepté le plus gros paquet" +#: builtin/gc.c:618 #, c-format msgid "failed to parse gc.logExpiry value %s" msgstr "impossible d'analyser gc.logExpiry %s" +#: builtin/gc.c:629 #, c-format msgid "failed to parse prune expiry value %s" msgstr "impossible d'analyser la valeur d'expiration d'élagage %s" +#: builtin/gc.c:649 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Compression automatique du dépôt en tâche de fond pour optimiser les " "performances.\n" +#: builtin/gc.c:651 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Compression du dépôt pour optimiser les performances.\n" +#: builtin/gc.c:652 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n" +#: builtin/gc.c:693 #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" @@ -6687,194 +8449,253 @@ msgstr "" "un ramasse-miettes est déjà en cours sur la machine '%s' pid % " "(utilisez --force si ce n'est pas le cas)" +#: builtin/gc.c:762 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les " "supprimer." +#: builtin/gc.c:772 msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=] [--schedule]" msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=] [--schedule]" +#: builtin/gc.c:802 msgid "--no-schedule is not allowed" msgstr "--no-schedule n'est pas accepté" +#: builtin/gc.c:807 #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "argument de --schedule non reconnu, '%s'" +#: builtin/gc.c:926 msgid "failed to write commit-graph" msgstr "échec de l'écriture du graphe de commits" +#: builtin/gc.c:956 msgid "failed to prefetch remotes" msgstr "échec de la pré-récupération des distants" +#: builtin/gc.c:1072 msgid "failed to start 'git pack-objects' process" msgstr "impossible de démarrer le processus 'git pack-objects'" +#: builtin/gc.c:1089 msgid "failed to finish 'git pack-objects' process" msgstr "impossible de finir le processus 'git pack-objects'" +#: builtin/gc.c:1140 msgid "failed to write multi-pack-index" msgstr "échec de l'écriture de l'index de multi-paquet" +#: builtin/gc.c:1156 msgid "'git multi-pack-index expire' failed" msgstr "échec de 'git multi-pack-index expire'" +#: builtin/gc.c:1215 msgid "'git multi-pack-index repack' failed" msgstr "échec de 'git multi-pack-index repack'" +#: builtin/gc.c:1224 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" "tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé" +#: builtin/gc.c:1328 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "le fichier verrou '%s' existe, pas de maintenance" +#: builtin/gc.c:1358 #, c-format msgid "task '%s' failed" msgstr "échec de la tâche '%s'" +#: builtin/gc.c:1440 #, c-format msgid "'%s' is not a valid task" msgstr "'%s' n'est pas une tâche valide" +#: builtin/gc.c:1445 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "la tâche '%s' ne peut pas être sélectionnée plusieurs fois" +#: builtin/gc.c:1460 msgid "run tasks based on the state of the repository" msgstr "lancer les tâches selon l'état du dépôt" +#: builtin/gc.c:1461 msgid "frequency" msgstr "fréquence" +#: builtin/gc.c:1462 msgid "run tasks based on frequency" msgstr "lancer les tâches selon une fréquence" +#: builtin/gc.c:1465 msgid "do not report progress or other information over stderr" msgstr "ne pas afficher le progrès ou d'autres informations sur stderr" +#: builtin/gc.c:1466 msgid "task" msgstr "tâche" +#: builtin/gc.c:1467 msgid "run a specific task" msgstr "lancer une tâche spécifique" +#: builtin/gc.c:1484 msgid "use at most one of --auto and --schedule=" msgstr "--auto et --schedule= sont mutuellement exclusifs" +#: builtin/gc.c:1561 #, c-format msgid "unable to add '%s' value of '%s'" msgstr "impossible d'ajouter la valeur '%s' de '%s'" +#: builtin/gc.c:1581 msgid "return success even if repository was not registered" msgstr "renvoyer un succès même si le dépôt n'était pas enregistré" +#: builtin/gc.c:1630 #, c-format msgid "unable to unset '%s' value of '%s'" msgstr "impossible de retirer la valeur '%s' de '%s'" +#: builtin/gc.c:1633 #, c-format msgid "repository '%s' is not registered" msgstr "le dépôt '%s' n'est pas enregistré" +#: builtin/gc.c:1766 #, c-format msgid "failed to expand path '%s'" msgstr "impossible d'étendre le chemin '%s'" +#: builtin/gc.c:1793 builtin/gc.c:1831 msgid "failed to start launchctl" msgstr "échec de démarrage de launchctl" +#: builtin/gc.c:1908 builtin/gc.c:2361 builtin/gc.c:2434 #, c-format msgid "failed to create directories for '%s'" msgstr "échec de la création des répertoires pour '%s'" +#: builtin/gc.c:1935 #, c-format msgid "failed to bootstrap service %s" msgstr "échec de l'amorçage du service %s" +#: builtin/gc.c:2025 msgid "failed to create temp xml file" msgstr "échec de création du fichier temporaire xml" +#: builtin/gc.c:2118 msgid "failed to start schtasks" msgstr "échec du démarrage de schtasks" +#: builtin/gc.c:2204 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" "echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir " "'cron'" +#: builtin/gc.c:2211 msgid "failed to create crontab temporary file" msgstr "impossible de créer un fichier crontab temporaire" +#: builtin/gc.c:2216 msgid "failed to open temporary file" msgstr "impossible d'ouvrir un fichier temporaire" +#: builtin/gc.c:2266 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" "echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir " "'cron'" +#: builtin/gc.c:2271 msgid "'crontab' died" msgstr "'crontab' est mort" -msgid "failed to start systemctl" -msgstr "échec du démarrage de systemctl" - -msgid "failed to run systemctl" -msgstr "échec pour lancer systemctl" - +#: builtin/gc.c:2322 builtin/gc.c:2335 builtin/gc.c:2531 builtin/worktree.c:152 +#: builtin/worktree.c:1301 #, c-format msgid "failed to delete '%s'" msgstr "échec de la suppression de '%s'" +#: builtin/gc.c:2404 builtin/gc.c:2466 rerere.c:489 #, c-format msgid "failed to flush '%s'" msgstr "échec du flush de '%s'" +#: builtin/gc.c:2507 +msgid "failed to start systemctl" +msgstr "échec du démarrage de systemctl" + +#: builtin/gc.c:2517 +msgid "failed to run systemctl" +msgstr "échec pour lancer systemctl" + +#: builtin/gc.c:2648 #, c-format msgid "unrecognized --scheduler argument '%s'" msgstr "argument '%s' de --scheduler non reconnu" +#: builtin/gc.c:2673 msgid "neither systemd timers nor crontab are available" msgstr "ni les minuteurs systemd ni crontab ne sont disponibles" +#: builtin/gc.c:2688 #, c-format msgid "%s scheduler is not available" msgstr "le planificateur %s n'est pas disponible" +#: builtin/gc.c:2702 msgid "another process is scheduling background maintenance" msgstr "" "un autre processus est en train de programmer une maintenance en tâche de " "fond" +#: builtin/gc.c:2724 msgid "git maintenance start [--scheduler=]" msgstr "git maintenance start [--scheduler=]" +#: builtin/gc.c:2733 msgid "scheduler" msgstr "planificateur" +#: builtin/gc.c:2734 msgid "scheduler to trigger git maintenance run" msgstr "planificateur qui lancera les maintenances git" +#: builtin/gc.c:2749 +msgid "failed to set up maintenance schedule" +msgstr "impossible de mettre en place la planification de maintenance" + +#: builtin/gc.c:2752 msgid "failed to add repo to global config" msgstr "échec de l'ajout du dépôt à la config globale" +#: builtin/gc.c:2774 msgid "git maintenance []" msgstr "git maintenance []" +#: builtin/grep.c:40 msgid "git grep [] [-e] [...] [[--] ...]" msgstr "git grep [] [-e] [...] [[--] ...]" +#: builtin/grep.c:249 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep : échec de création du fil: %s" +#: builtin/grep.c:307 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "nombre de fils spécifié invalide (%d) pour %s" @@ -6884,203 +8705,266 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s" #. variable for tweaking threads, currently #. grep.threads #. +#: builtin/grep.c:315 builtin/index-pack.c:1604 builtin/index-pack.c:1809 +#: builtin/pack-objects.c:3187 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" +#: builtin/grep.c:529 builtin/grep.c:670 builtin/grep.c:710 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" +#: builtin/grep.c:725 #, c-format msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" +#: builtin/grep.c:805 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend une valeur numérique" +#: builtin/grep.c:911 msgid "search in index instead of in the work tree" msgstr "rechercher dans l'index plutôt que dans la copie de travail" +#: builtin/grep.c:913 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" +#: builtin/grep.c:915 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" +#: builtin/grep.c:917 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" +#: builtin/grep.c:919 msgid "recursively search in each submodule" msgstr "rechercher récursivement dans chaque sous-module" +#: builtin/grep.c:922 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" +#: builtin/grep.c:924 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" +#: builtin/grep.c:926 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" +#: builtin/grep.c:928 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" +#: builtin/grep.c:930 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" +#: builtin/grep.c:933 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" +#: builtin/grep.c:935 msgid "search in subdirectories (default)" msgstr "rechercher dans les sous-répertoires (défaut)" -msgid "descend at most levels" -msgstr "descendre au plus de dans l'arborescence" +#: builtin/grep.c:937 +msgid "descend at most levels" +msgstr "descendre au plus de niveaux" +#: builtin/grep.c:940 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" +#: builtin/grep.c:943 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" +#: builtin/grep.c:946 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" +#: builtin/grep.c:949 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" +#: builtin/grep.c:952 msgid "show line numbers" msgstr "afficher les numéros de ligne" +#: builtin/grep.c:953 msgid "show column number of first match" msgstr "afficher le numéro de colonne de la première correspondance" +#: builtin/grep.c:954 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" +#: builtin/grep.c:955 msgid "show filenames" msgstr "afficher les noms de fichier" +#: builtin/grep.c:957 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" +#: builtin/grep.c:959 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" +#: builtin/grep.c:961 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" +#: builtin/grep.c:964 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" +#: builtin/grep.c:966 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" +#: builtin/grep.c:969 msgid "show only matching parts of a line" msgstr "n'afficher que les parties correspondantes d'une ligne" +#: builtin/grep.c:971 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" +#: builtin/grep.c:972 msgid "highlight matches" msgstr "mettre en évidence les correspondances" +#: builtin/grep.c:974 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" +#: builtin/grep.c:976 msgid "show filename only once above matches from same file" msgstr "" "afficher le nom de fichier une fois au dessus des correspondances du même " "fichier" +#: builtin/grep.c:979 msgid "show context lines before and after matches" msgstr "afficher lignes de contexte avant et après les correspondances" +#: builtin/grep.c:982 msgid "show context lines before matches" msgstr "afficher lignes de contexte avant les correspondances" +#: builtin/grep.c:984 msgid "show context lines after matches" msgstr "afficher lignes de contexte après les correspondances" +#: builtin/grep.c:986 msgid "use worker threads" msgstr "utiliser fils de travail" +#: builtin/grep.c:987 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" +#: builtin/grep.c:990 msgid "show a line with the function name before matches" msgstr "" "afficher une ligne avec le nom de la fonction avant les correspondances" +#: builtin/grep.c:992 msgid "show the surrounding function" msgstr "afficher la fonction contenante" +#: builtin/grep.c:995 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" +#: builtin/grep.c:997 msgid "match " msgstr "rechercher " +#: builtin/grep.c:999 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" +#: builtin/grep.c:1011 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" +#: builtin/grep.c:1013 msgid "show only matches from files that match all patterns" msgstr "" "n'afficher que les correspondances de fichiers qui correspondent à tous les " "motifs" +#: builtin/grep.c:1016 msgid "pager" msgstr "pagineur" +#: builtin/grep.c:1016 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" +#: builtin/grep.c:1020 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" +#: builtin/grep.c:1023 msgid "maximum number of results per file" msgstr "nombre maximum de résultats par fichier" +#: builtin/grep.c:1093 msgid "no pattern given" msgstr "aucun motif fourni" +#: builtin/grep.c:1129 msgid "--no-index or --untracked cannot be used with revs" msgstr "" "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions" +#: builtin/grep.c:1137 #, c-format msgid "unable to resolve revision: %s" msgstr "impossible de résoudre la révision : %s" +#: builtin/grep.c:1167 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked non supportée avec --recurse-submodules" +#: builtin/grep.c:1178 msgid "invalid option combination, ignoring --threads" msgstr "option de combinaison invalide, ignore --threads" +#: builtin/grep.c:1181 builtin/pack-objects.c:4387 msgid "no threads support, ignoring --threads" msgstr "pas de support des fils, ignore --threads" +#: builtin/grep.c:1184 builtin/index-pack.c:1601 builtin/pack-objects.c:3184 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" +#: builtin/grep.c:1218 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail" +#: builtin/grep.c:1251 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi" +#: builtin/grep.c:1259 msgid "both --cached and trees are given" msgstr "--cached et des arbres sont fournis en même temps" +#: builtin/hash-object.c:91 msgid "" "git hash-object [-t ] [-w] [--path= | --no-filters]\n" " [--stdin [--literally]] [--] ..." @@ -7088,89 +8972,115 @@ msgstr "" "git hash-object [-t ] [-w] [--path= | --no-filters]\n" " [--stdin [--literally]] [--] ..." +#: builtin/hash-object.c:93 msgid "git hash-object [-t ] [-w] --stdin-paths [--no-filters]" msgstr "git hash-object [-t ] [-w] --stdin-paths [--no-filters]" +#: builtin/hash-object.c:106 msgid "object type" msgstr "type d'objet" +#: builtin/hash-object.c:107 msgid "write the object into the object database" msgstr "écrire l'objet dans la base de donnée d'objets" +#: builtin/hash-object.c:109 msgid "read the object from stdin" msgstr "lire l'objet depuis l'entrée standard" +#: builtin/hash-object.c:111 msgid "store file as is without filters" msgstr "stocker le fichier tel quel sans filtrage" +#: builtin/hash-object.c:112 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "juste hasher n'importe quel contenu pour créer des objets corrompus pour " "debugger Git" +#: builtin/hash-object.c:113 msgid "process file as it were from this path" msgstr "traiter le fichier comme s'il venait de ce chemin" +#: builtin/help.c:62 msgid "print all available commands" msgstr "afficher toutes les commandes disponibles" +#: builtin/help.c:65 msgid "show external commands in --all" msgstr "afficher les commandes externes dans --all" +#: builtin/help.c:66 msgid "show aliases in --all" msgstr "afficher les alias dans --all" +#: builtin/help.c:67 msgid "exclude guides" msgstr "exclure les guides" +#: builtin/help.c:68 msgid "show man page" msgstr "afficher la page de manuel" +#: builtin/help.c:69 msgid "show manual in web browser" msgstr "afficher le manuel dans un navigateur web" +#: builtin/help.c:71 msgid "show info page" msgstr "afficher la page info" +#: builtin/help.c:73 msgid "print command description" msgstr "afficher la description de la commande" +#: builtin/help.c:75 msgid "print list of useful guides" msgstr "afficher une liste de guides utiles" +#: builtin/help.c:78 msgid "print list of user-facing repository, command and file interfaces" msgstr "afficher les liste des dépôts publics, des commandes et des interfaces" +#: builtin/help.c:81 msgid "print list of file formats, protocols and other developer interfaces" msgstr "" "afficher la liste des formats de fichier, des protocoles et des autres " "interfaces pour développeur" +#: builtin/help.c:83 msgid "print all configuration variable names" msgstr "afficher tous les noms de variables de configuration" +#: builtin/help.c:95 msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [|]" msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [|]" +#: builtin/help.c:214 #, c-format msgid "unrecognized help format '%s'" msgstr "format d'aide non reconnu '%s'" +#: builtin/help.c:240 msgid "Failed to start emacsclient." msgstr "Échec de démarrage d'emacsclient." +#: builtin/help.c:253 msgid "Failed to parse emacsclient version." msgstr "Échec d'analyse de la version d'emacsclient." +#: builtin/help.c:261 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la version d'emacsclient '%d' est trop ancienne (<22)." +#: builtin/help.c:279 builtin/help.c:301 builtin/help.c:311 builtin/help.c:319 #, c-format msgid "failed to exec '%s'" msgstr "échec de l'exécution de '%s'" +#: builtin/help.c:357 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -7179,6 +9089,7 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n" "Veuillez utiliser plutôt 'man..cmd'." +#: builtin/help.c:369 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -7187,41 +9098,51 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n" "Veuillez utiliser plutôt 'man..cmd'." +#: builtin/help.c:487 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s' : visualiseur de manuel inconnu." +#: builtin/help.c:503 msgid "no man viewer handled the request" msgstr "aucun visualiseur de manuel n'a pris en charge la demande" +#: builtin/help.c:510 msgid "no info viewer handled the request" msgstr "aucun visualiseur de 'info' n'a pris en charge la demande" +#: builtin/help.c:571 builtin/help.c:582 git.c:357 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' est un alias de '%s'" +#: builtin/help.c:585 git.c:389 #, c-format msgid "bad alias.%s string: %s" msgstr "mauvais chaîne alias.%s : %s" +#: builtin/help.c:627 #, c-format msgid "the '%s' option doesn't take any non-option arguments" msgstr "l'option '%s' n'accepte pas d'argument sans option" +#: builtin/help.c:647 msgid "" "the '--no-[external-commands|aliases]' options can only be used with '--all'" msgstr "" "les options '--no-[external-commands|aliases]' ne peuvent être utilisées " "qu'avec '--all'" +#: builtin/help.c:659 builtin/help.c:695 #, c-format msgid "usage: %s%s" msgstr "usage : %s%s" +#: builtin/help.c:690 msgid "'git help config' for more information" msgstr "'git help config' pour plus d'information" +#: builtin/hook.c:10 msgid "" "git hook run [--ignore-missing] [--to-stdin=] [-- ]" @@ -7229,229 +9150,292 @@ msgstr "" "git hook run [--ignore-missing] [--to-stdin=] [-- " "]" +#: builtin/hook.c:30 msgid "silently ignore missing requested " msgstr "ignorer silencieusement le requis manquant" +#: builtin/hook.c:32 msgid "file to read into hooks' stdin" msgstr "fichier à la lire dans l'entrée standard du crochet" +#: builtin/index-pack.c:231 #, c-format msgid "object type mismatch at %s" msgstr "type d'objet non correspondant à %s" +#: builtin/index-pack.c:251 #, c-format msgid "did not receive expected object %s" msgstr "objet attendu non reçu %s" +#: builtin/index-pack.c:254 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objet %s : type attendu %s, reçu %s" +#: builtin/index-pack.c:304 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "impossible de remplir %d octet" msgstr[1] "impossible de remplir %d octets" +#: builtin/index-pack.c:314 msgid "early EOF" msgstr "fin de fichier prématurée" +#: builtin/index-pack.c:315 msgid "read error on input" msgstr "erreur de lecture sur l'entrée" +#: builtin/index-pack.c:327 msgid "used more bytes than were available" msgstr "plus d'octets utilisés que disponibles" +#: builtin/index-pack.c:334 builtin/pack-objects.c:766 msgid "pack too large for current definition of off_t" msgstr "le paquet est trop grand pour la définition actuelle de off_t" +#: builtin/index-pack.c:339 #, c-format msgid "pack exceeds maximum allowed size (%s)" msgstr "le paquet dépasse la taille maximale permise (%s)" +#: builtin/index-pack.c:372 msgid "pack signature mismatch" msgstr "la signature du paquet ne correspond pas" +#: builtin/index-pack.c:374 #, c-format msgid "pack version % unsupported" msgstr "la version de paquet % non supportée" +#: builtin/index-pack.c:390 #, c-format msgid "pack has bad object at offset %: %s" msgstr "le paquet a un mauvais objet à l'offset % : %s" +#: builtin/index-pack.c:495 #, c-format msgid "inflate returned %d" msgstr "la décompression (inflate) a retourné %d" +#: builtin/index-pack.c:544 msgid "offset value overflow for delta base object" msgstr "dépassement de la valeur d'offset pour l'objet delta de base" +#: builtin/index-pack.c:552 msgid "delta base offset is out of bound" msgstr "l'objet delta de base est hors limite" +#: builtin/index-pack.c:560 #, c-format msgid "unknown object type %d" msgstr "type d'objet inconnu %d" +#: builtin/index-pack.c:591 msgid "cannot pread pack file" msgstr "impossible de lire (pread) le fichier paquet" +#: builtin/index-pack.c:593 #, c-format msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" msgstr[0] "fin prématurée du fichier paquet, % octet lu" msgstr[1] "fin prématurée du fichier paquet, % octets lus" +#: builtin/index-pack.c:619 msgid "serious inflate inconsistency" msgstr "grave incohérence dans la décompression (inflate)" +#: builtin/index-pack.c:764 builtin/index-pack.c:770 builtin/index-pack.c:794 +#: builtin/index-pack.c:834 builtin/index-pack.c:844 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" +#: builtin/index-pack.c:767 builtin/pack-objects.c:299 +#: builtin/pack-objects.c:360 builtin/pack-objects.c:468 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object info %s" msgstr "impossible de lire l'information existante de l'objet %s" +#: builtin/index-pack.c:841 #, c-format msgid "cannot read existing object %s" msgstr "impossible de lire l'objet existant %s" +#: builtin/index-pack.c:855 #, c-format msgid "invalid blob object %s" msgstr "objet blob invalide %s" +#: builtin/index-pack.c:858 builtin/index-pack.c:877 msgid "fsck error in packed object" msgstr "erreur de fsck dans l'objet empaqueté" +#: builtin/index-pack.c:879 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Tous les objets enfants de %s ne sont pas accessibles" +#: builtin/index-pack.c:940 builtin/index-pack.c:987 msgid "failed to apply delta" msgstr "échec d'application du delta" +#: builtin/index-pack.c:1174 msgid "Receiving objects" msgstr "Réception d'objets" +#: builtin/index-pack.c:1174 msgid "Indexing objects" msgstr "Indexation d'objets" +#: builtin/index-pack.c:1210 msgid "pack is corrupted (SHA1 mismatch)" msgstr "le paquet est corrompu (SHA1 ne correspond pas)" +#: builtin/index-pack.c:1215 msgid "cannot fstat packfile" msgstr "impossible d'obtenir le statut (fstat) du fichier paquet" +#: builtin/index-pack.c:1218 msgid "pack has junk at the end" msgstr "le paquet est invalide à la fin" +#: builtin/index-pack.c:1230 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusion extrême dans parse_pack_objects()" +#: builtin/index-pack.c:1253 msgid "Resolving deltas" msgstr "Résolution des deltas" +#: builtin/index-pack.c:1264 builtin/pack-objects.c:2940 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" +#: builtin/index-pack.c:1297 msgid "confusion beyond insanity" msgstr "confusion extrême" +#: builtin/index-pack.c:1303 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "complété avec %d objet local" msgstr[1] "complété avec %d objets locaux" +#: builtin/index-pack.c:1315 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)" +#: builtin/index-pack.c:1319 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "le paquet a %d delta non résolu" msgstr[1] "le paquet a %d deltas non résolus" +#: builtin/index-pack.c:1343 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" +#: builtin/index-pack.c:1439 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" +#: builtin/index-pack.c:1461 #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "le nom de fichier paquet '%s' ne se termine pas par '.%s'" +#: builtin/index-pack.c:1485 #, c-format msgid "cannot write %s file '%s'" msgstr "impossible d'écrire le fichier %s '%s'" +#: builtin/index-pack.c:1493 #, c-format msgid "cannot close written %s file '%s'" msgstr "impossible de fermer le fichier %s écrit '%s'" +#: builtin/index-pack.c:1510 #, c-format msgid "unable to rename temporary '*.%s' file to '%s'" msgstr "impossible de renommer un fichier temporaire '*.%s' en '%s'" +#: builtin/index-pack.c:1535 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" +#: builtin/index-pack.c:1595 builtin/pack-objects.c:3195 #, c-format msgid "bad pack.indexVersion=%" msgstr "mauvais pack.indexVersion=%" +#: builtin/index-pack.c:1665 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" +#: builtin/index-pack.c:1667 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'" +#: builtin/index-pack.c:1715 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "pas un delta : %d objet" msgstr[1] "pas un delta : %d objets" +#: builtin/index-pack.c:1722 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longueur chaînée = %d : %lu objet" msgstr[1] "longueur chaînée = %d : %lu objets" +#: builtin/index-pack.c:1766 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" +#: builtin/index-pack.c:1820 builtin/index-pack.c:1823 +#: builtin/index-pack.c:1843 builtin/index-pack.c:1847 #, c-format msgid "bad %s" msgstr "mauvais %s" +#: builtin/index-pack.c:1853 builtin/init-db.c:158 setup.c:2096 #, c-format msgid "unknown hash algorithm '%s'" msgstr "algorithme d'empreinte inconnu '%s'" +#: builtin/index-pack.c:1874 msgid "--stdin requires a git repository" msgstr "--stdin requiert un dépôt git" +#: builtin/index-pack.c:1891 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" +#: builtin/index-pack.c:1957 builtin/unpack-objects.c:679 msgid "fsck error in pack objects" msgstr "erreur de fsck dans les objets paquets" +#: builtin/init-db.c:58 msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" @@ -7463,29 +9447,37 @@ msgstr "" " [-b | --initial-branch=]\\n\"\n" " [--shared[=]] []" +#: builtin/init-db.c:88 msgid "permissions" msgstr "permissions" +#: builtin/init-db.c:89 msgid "specify that the git repository is to be shared amongst several users" msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs" +#: builtin/init-db.c:95 msgid "override the name of the initial branch" msgstr "outrepasser le nom de la branche initiale" +#: builtin/init-db.c:96 builtin/verify-pack.c:75 msgid "hash" msgstr "empreinte" +#: builtin/init-db.c:97 builtin/show-index.c:25 builtin/verify-pack.c:76 msgid "specify the hash algorithm to use" msgstr "spécifier l'algorithme d'empreinte à utiliser" +#: builtin/init-db.c:135 builtin/init-db.c:140 #, c-format msgid "cannot mkdir %s" msgstr "impossible de créer le répertoire (mkdir) %s" +#: builtin/init-db.c:144 builtin/init-db.c:199 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se déplacer vers le répertoire (chdir) %s" +#: builtin/init-db.c:171 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" @@ -7494,89 +9486,122 @@ msgstr "" "%s (ou --work-tree=) n'est pas autorisé sans spécifier %s (ou --" "git-dir=)" +#: builtin/init-db.c:223 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accéder à l'arbre de travail '%s'" +#: builtin/init-db.c:228 msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir est incompatible avec un dépôt nu" +#: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty]\n" -" [(--trailer [(=|:)])...]\n" +" [(--trailer (|)[(=|:)])...]\n" " [--parse] [...]" msgstr "" "git interpret-trailers [--in-place] [--trim-empty]\n" -" [(--trailer [(=|:)])...]\n" +" [(--trailer (|)" +"[(=|:)])...]\n" " [--parse] [...]" +#: builtin/interpret-trailers.c:100 msgid "edit files in place" msgstr "éditer les fichiers sur place" +#: builtin/interpret-trailers.c:101 msgid "trim empty trailers" msgstr "éliminer les lignes de fin vides" +#: builtin/interpret-trailers.c:103 +msgid "placement" +msgstr "placement" + +#: builtin/interpret-trailers.c:104 msgid "where to place the new trailer" msgstr "où placer les nouvelles lignes terminales" +#: builtin/interpret-trailers.c:106 msgid "action if trailer already exists" msgstr "action si les lignes terminales existent déjà" +#: builtin/interpret-trailers.c:108 msgid "action if trailer is missing" msgstr "action si les lignes terminales manquent" +#: builtin/interpret-trailers.c:110 msgid "output only the trailers" msgstr "éliminer les lignes terminales vides" -msgid "do not apply config rules" -msgstr "ne pas appliquer les règles de la configuration" +#: builtin/interpret-trailers.c:111 +msgid "do not apply trailer.* configuration variables" +msgstr "ne pas appliquer les variables de configuration trailer.*" -msgid "join whitespace-continued values" -msgstr "joindre les valeurs continuées avec des caractères blancs" +#: builtin/interpret-trailers.c:112 +msgid "reformat multiline trailer values as single-line values" +msgstr "" +"reformatter les valeurs de ligne terminales multi-lignes en valeurs sur une " +"seule ligne" -msgid "set parsing options" -msgstr "paramètres d'analyse" +#: builtin/interpret-trailers.c:113 +msgid "alias for --only-trailers --only-input --unfold" +msgstr "alias pour --only-trailers --only-input --unfold" -msgid "do not treat --- specially" -msgstr "ne pas traiter spécialement ---" +#: builtin/interpret-trailers.c:115 +msgid "do not treat \"---\" as the end of input" +msgstr "ne pas traiter \"---\" comme la fin d'entrée" +#: builtin/interpret-trailers.c:117 msgid "trailer(s) to add" msgstr "ligne(s) de fin à ajouter" +#: builtin/interpret-trailers.c:128 msgid "--trailer with --only-input does not make sense" msgstr "--trailer n'a aucune signification avec --only-input" +#: builtin/interpret-trailers.c:138 msgid "no input file given for in-place editing" msgstr "aucun fichier en entrée pour l'éditon sur place" +#: builtin/log.c:72 msgid "git log [] [] [[--] ...]" msgstr "git log [] [] [[--] ...]" +#: builtin/log.c:73 msgid "git show [] ..." msgstr "git show [] ..." +#: builtin/log.c:143 #, c-format msgid "invalid --decorate option: %s" msgstr "option --decorate invalide : %s" +#: builtin/log.c:251 diff.c:5551 msgid "suppress diff output" msgstr "supprimer la sortie des différences" +#: builtin/log.c:252 msgid "show source" msgstr "afficher la source" +#: builtin/log.c:256 msgid "clear all previously-defined decoration filters" msgstr "effacer tous les filtres de décoration précédemment définis" +#: builtin/log.c:260 msgid "only decorate refs that match " msgstr "décorer seulement les références correspondant à " +#: builtin/log.c:262 msgid "do not decorate refs that match " msgstr "ne pas décorer les références correspondant à " +#: builtin/log.c:263 msgid "decorate options" msgstr "décorer les options" +#: builtin/log.c:266 msgid "" "trace the evolution of line range , or function : in " "" @@ -7584,77 +9609,104 @@ msgstr "" "tracer l'évolution d'une plage , ou d'une fonction dans " +#: builtin/log.c:286 builtin/log.c:2110 builtin/shortlog.c:440 bundle.c:528 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" +#: builtin/log.c:289 msgid "-L: cannot be used with pathspec" msgstr "" "-L: ne peut pas être utilisé avec une spécificateur de chemin" +#: builtin/log.c:395 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" +#: builtin/log.c:502 msgid "unable to create temporary object directory" msgstr "impossible de créer un répertoire d'objets temporaire" +#: builtin/log.c:679 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" +#: builtin/log.c:694 builtin/log.c:790 #, c-format msgid "could not read object %s" msgstr "impossible de lire l'objet %s" +#: builtin/log.c:828 #, c-format msgid "unknown type: %d" msgstr "type inconnu : %d" +#: builtin/log.c:979 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s : couverture invalide pour le mode de description" +#: builtin/log.c:987 msgid "format.headers without value" msgstr "format.headers sans valeur" +#: builtin/log.c:1139 #, c-format msgid "cannot open patch file %s" msgstr "impossible d'ouvrir le fichier correctif %s" +#: builtin/log.c:1156 msgid "need exactly one range" msgstr "exactement une plage nécessaire" +#: builtin/log.c:1166 msgid "not a range" msgstr "ceci n'est pas une plage" +#: builtin/log.c:1261 +#, c-format +msgid "unable to read branch description file '%s'" +msgstr "lecture du fichier de description de branche '%s' impossible" + +#: builtin/log.c:1342 msgid "cover letter needs email format" msgstr "la lettre de motivation doit être au format courriel" +#: builtin/log.c:1348 msgid "failed to create cover-letter file" msgstr "échec de création du fichier de lettre de motivation" +#: builtin/log.c:1438 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" +#: builtin/log.c:1465 msgid "git format-patch [] [ | ]" msgstr "git format-patch [] [ | ]" +#: builtin/log.c:1520 msgid "two output directories?" msgstr "deux répertoires de sortie ?" +#: builtin/log.c:1654 builtin/log.c:2509 builtin/log.c:2511 builtin/log.c:2523 #, c-format msgid "unknown commit %s" msgstr "commit inconnu %s" +#: builtin/log.c:1665 builtin/replace.c:66 builtin/replace.c:218 +#: builtin/replace.c:221 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "échec à résoudre '%s' comme une référence valide" +#: builtin/log.c:1676 msgid "could not find exact merge base" msgstr "impossible de trouver la base de fusion exacte" +#: builtin/log.c:1686 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -7667,231 +9719,305 @@ msgstr "" "Ou vous pouvez spécifier le commit de base par --base= " "manuellement" +#: builtin/log.c:1711 msgid "failed to find exact merge base" msgstr "échec à trouver la base de fusion exacte" +#: builtin/log.c:1728 msgid "base commit should be the ancestor of revision list" msgstr "le commit de base devrait être l'ancêtre de la liste de révisions" +#: builtin/log.c:1738 msgid "base commit shouldn't be in revision list" msgstr "le commit de base ne devrait pas faire partie de la liste de révisions" +#: builtin/log.c:1796 msgid "cannot get patch id" msgstr "impossible d'obtenir l'id du patch" +#: builtin/log.c:1859 msgid "failed to infer range-diff origin of current series" msgstr "" "échec d'inférence de l'origine de différence d'intervalles de la série " "actuelle" +#: builtin/log.c:1861 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "" "utilisation de '%s' comme une différence d'intervalle pour la série actuelle" +#: builtin/log.c:1909 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" +#: builtin/log.c:1912 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" +#: builtin/log.c:1916 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" +#: builtin/log.c:1918 msgid "generate a cover letter" msgstr "générer une lettre de motivation" +#: builtin/log.c:1920 msgid "use simple number sequence for output file names" msgstr "" "utiliser une séquence simple de nombres pour les nom des fichiers de sortie" +#: builtin/log.c:1921 msgid "sfx" msgstr "sfx" +#: builtin/log.c:1922 msgid "use instead of '.patch'" msgstr "utiliser au lieu de '.patch'" +#: builtin/log.c:1924 msgid "start numbering patches at instead of 1" msgstr "démarrer la numérotation des patchs à au lieu de 1" +#: builtin/log.c:1925 msgid "reroll-count" msgstr "reroll-count" +#: builtin/log.c:1926 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" +#: builtin/log.c:1928 msgid "max length of output filename" msgstr "taille maximum du nom du fichier de sortie" +#: builtin/log.c:1929 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" +#: builtin/log.c:1931 msgid "cover-from-description-mode" msgstr "cover-from-description-mode" +#: builtin/log.c:1932 msgid "generate parts of a cover letter based on a branch's description" msgstr "" "générer des parties de la lettre d'introduction à partir de la description " "de la branche" +#: builtin/log.c:1934 +msgid "use branch description from file" +msgstr "utiliser la description de branche dans le fichier" + +#: builtin/log.c:1936 msgid "use [] instead of [PATCH]" msgstr "utiliser [] au lieu de [PATCH]" +#: builtin/log.c:1939 msgid "store resulting files in " msgstr "stocker les fichiers résultats dans " +#: builtin/log.c:1942 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" +#: builtin/log.c:1945 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" +#: builtin/log.c:1947 msgid "output all-zero hash in From header" msgstr "écrire une empreinte à zéro dans l'entête From" +#: builtin/log.c:1949 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" +#: builtin/log.c:1951 msgid "show patch format instead of default (patch + stat)" msgstr "afficher le format du patch au lieu du défaut (patch + stat)" +#: builtin/log.c:1953 msgid "Messaging" msgstr "Communication" +#: builtin/log.c:1954 msgid "header" msgstr "en-tête" +#: builtin/log.c:1955 msgid "add email header" msgstr "ajouter l'en-tête de courriel" +#: builtin/log.c:1956 builtin/log.c:1957 msgid "email" msgstr "courriel" +#: builtin/log.c:1956 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" +#: builtin/log.c:1957 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" +#: builtin/log.c:1958 msgid "ident" msgstr "ident" +#: builtin/log.c:1959 msgid "set From address to (or committer ident if absent)" msgstr "" "renseigner l'adresse From à (ou à l'ident du validateur si absent)" +#: builtin/log.c:1961 msgid "message-id" msgstr "id-message" +#: builtin/log.c:1962 msgid "make first mail a reply to " msgstr "répondre dans le premier message à " +#: builtin/log.c:1963 builtin/log.c:1966 msgid "boundary" msgstr "limite" +#: builtin/log.c:1964 msgid "attach the patch" msgstr "attacher le patch" +#: builtin/log.c:1967 msgid "inline the patch" msgstr "patch à l'intérieur" +#: builtin/log.c:1971 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" +#: builtin/log.c:1973 msgid "signature" msgstr "signature" +#: builtin/log.c:1974 msgid "add a signature" msgstr "ajouter une signature" +#: builtin/log.c:1975 msgid "base-commit" msgstr "commit-de-base" +#: builtin/log.c:1976 msgid "add prerequisite tree info to the patch series" msgstr "ajouter un arbre prérequis à la série de patchs" +#: builtin/log.c:1979 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" +#: builtin/log.c:1980 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" +#: builtin/log.c:1982 msgid "show progress while generating patches" msgstr "" "afficher la barre de progression durant la phase de génération des patchs" +#: builtin/log.c:1984 msgid "show changes against in cover letter or single patch" msgstr "" "afficher les modifications par rapport à dans la première page ou une " "rustine" +#: builtin/log.c:1987 msgid "show changes against in cover letter or single patch" msgstr "" "afficher les modifications par rapport à dans la première page ou " "une rustine" +#: builtin/log.c:1989 builtin/range-diff.c:30 msgid "percentage by which creation is weighted" msgstr "pourcentage par lequel la création est pondérée" +#: builtin/log.c:1991 msgid "show in-body From: even if identical to the e-mail header" msgstr "" "montrer les From: inclus même s'ils sont identiques à celui de l'entête du " "courriel" +#: builtin/log.c:2088 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" +#: builtin/log.c:2113 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" +#: builtin/log.c:2115 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" +#: builtin/log.c:2117 msgid "--check does not make sense" msgstr "--check n'a pas de sens" +#: builtin/log.c:2119 msgid "--remerge-diff does not make sense" msgstr "--remerge-diff n'a pas de sens" +#: builtin/log.c:2175 builtin/submodule--helper.c:1686 +#: builtin/submodule--helper.c:1736 rerere.c:873 submodule.c:2304 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le répertoire '%s'" +#: builtin/log.c:2262 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiert --cover-letter ou une rustine unique" +#: builtin/log.c:2266 msgid "Interdiff:" msgstr "Interdiff :" +#: builtin/log.c:2267 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contre v%d :" +#: builtin/log.c:2277 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiert --cover-letter ou une rustine unique" +#: builtin/log.c:2285 msgid "Range-diff:" msgstr "Diff-intervalle :" +#: builtin/log.c:2286 #, c-format msgid "Range-diff against v%d:" msgstr "Diff-intervalle contre v%d :" +#: builtin/log.c:2297 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" +#: builtin/log.c:2335 msgid "Generating patches" msgstr "Génération des patchs" +#: builtin/log.c:2379 msgid "failed to create output files" msgstr "échec de création des fichiers en sortie" +#: builtin/log.c:2444 msgid "git cherry [-v] [ [ []]]" msgstr "git cherry [-v] [ [ []]]" +#: builtin/log.c:2498 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" @@ -7899,109 +10025,142 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spécifier " " manuellement.\n" +#: builtin/ls-files.c:255 builtin/ls-tree.c:31 #, c-format msgid "could not get object info about '%s'" msgstr "impossible d'obtenir l'information d'objet pour '%s'" +#: builtin/ls-files.c:282 #, c-format msgid "bad ls-files format: element '%s' does not start with '('" msgstr "mauvais format ls-files : l'élément '%s' ne commence pas par '('" +#: builtin/ls-files.c:285 #, c-format msgid "bad ls-files format: element '%s' does not end in ')'" msgstr "mauvais format ls-files : l'élément '%s' ne se termine pas par ')'" +#: builtin/ls-files.c:315 #, c-format msgid "bad ls-files format: %%%.*s" msgstr "mauvais format ls-files : %%%.*s" +#: builtin/ls-files.c:532 msgid "git ls-files [] [...]" msgstr "git ls-files [] [...]" +#: builtin/ls-files.c:586 builtin/merge-tree.c:537 msgid "separate paths with the NUL character" msgstr "séparer les chemins par un caractère NUL" +#: builtin/ls-files.c:588 msgid "identify the file status with tags" msgstr "identifier l'état de fichier avec les étiquettes" +#: builtin/ls-files.c:590 msgid "use lowercase letters for 'assume unchanged' files" msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'" +#: builtin/ls-files.c:592 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'" +#: builtin/ls-files.c:594 msgid "show cached files in the output (default)" msgstr "afficher les fichiers mis en cache dans la sortie (défaut)" +#: builtin/ls-files.c:596 msgid "show deleted files in the output" msgstr "afficher les fichiers supprimés dans la sortie" +#: builtin/ls-files.c:598 msgid "show modified files in the output" msgstr "afficher les fichiers modifiés dans la sortie" +#: builtin/ls-files.c:600 msgid "show other files in the output" msgstr "afficher les autres fichiers dans la sortie" +#: builtin/ls-files.c:602 msgid "show ignored files in the output" msgstr "afficher les fichiers ignorés dans la sortie" +#: builtin/ls-files.c:605 msgid "show staged contents' object name in the output" msgstr "afficher les nom des objets indexés dans la sortie" +#: builtin/ls-files.c:607 msgid "show files on the filesystem that need to be removed" msgstr "" "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés" +#: builtin/ls-files.c:609 msgid "show 'other' directories' names only" msgstr "afficher seulement les noms des répertoires 'other'" +#: builtin/ls-files.c:611 msgid "show line endings of files" msgstr "afficher les fins de lignes des fichiers" +#: builtin/ls-files.c:613 msgid "don't show empty directories" msgstr "ne pas afficher les répertoires vides" +#: builtin/ls-files.c:616 msgid "show unmerged files in the output" msgstr "afficher les fichiers non fusionnés dans la sortie" +#: builtin/ls-files.c:618 msgid "show resolve-undo information" msgstr "afficher l'information resolv-undo" +#: builtin/ls-files.c:620 msgid "skip files matching pattern" msgstr "sauter les fichiers correspondant au motif" +#: builtin/ls-files.c:623 msgid "read exclude patterns from " msgstr "lire les motifs d'exclusion depuis " +#: builtin/ls-files.c:626 msgid "read additional per-directory exclude patterns in " msgstr "lire des motifs d'exclusion additionnels par répertoire dans " +#: builtin/ls-files.c:628 msgid "add the standard git exclusions" msgstr "ajouter les exclusions git standard" +#: builtin/ls-files.c:632 msgid "make the output relative to the project top directory" msgstr "afficher en relatif par rapport au répertoire racine du projet" +#: builtin/ls-files.c:637 msgid "if any is not in the index, treat this as an error" msgstr "si un n'est pas dans l'index, traiter cela comme une erreur" +#: builtin/ls-files.c:638 msgid "tree-ish" msgstr "arbre-esque" +#: builtin/ls-files.c:639 msgid "pretend that paths removed since are still present" msgstr "" "considérer que les chemins supprimés depuis sont " "toujours présents" +#: builtin/ls-files.c:641 msgid "show debugging data" msgstr "afficher les données de débogage" +#: builtin/ls-files.c:643 msgid "suppress duplicate entries" msgstr "supprimer les entrées dupliquées" +#: builtin/ls-files.c:645 msgid "show sparse directories in the presence of a sparse index" msgstr "afficher les répertoires clairsemés en présence d'un index clairsemé" +#: builtin/ls-files.c:676 msgid "" "--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " "--eol" @@ -8009,6 +10168,7 @@ msgstr "" "--format ne peut pas être utilisé avec -s, -o, -k, -t, --resolve-undo, --" "deduplicate, --eol" +#: builtin/ls-remote.c:13 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=]\n" @@ -8018,158 +10178,206 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url] [--sort=]\n" " [--symref] [ [...]]" +#: builtin/ls-remote.c:64 msgid "do not print remote URL" msgstr "ne pas afficher les URL distantes" +#: builtin/ls-remote.c:65 builtin/ls-remote.c:67 builtin/rebase.c:1165 msgid "exec" msgstr "exécutable" +#: builtin/ls-remote.c:66 builtin/ls-remote.c:68 msgid "path of git-upload-pack on the remote host" msgstr "chemin vers git-upload-pack sur le serveur distant" +#: builtin/ls-remote.c:70 msgid "limit to tags" msgstr "limiter aux étiquettes" +#: builtin/ls-remote.c:71 msgid "limit to heads" msgstr "limiter aux heads" +#: builtin/ls-remote.c:72 msgid "do not show peeled tags" msgstr "ne pas afficher les étiquettes pelées" +#: builtin/ls-remote.c:74 msgid "take url..insteadOf into account" msgstr "prendre en compte url..insteadOf" +#: builtin/ls-remote.c:77 msgid "exit with exit code 2 if no matching refs are found" msgstr "" "sortir avec un code d'erreur 2 si aucune correspondance de référence n'est " "trouvée" +#: builtin/ls-remote.c:80 msgid "show underlying ref in addition to the object pointed by it" msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle" +#: builtin/ls-tree.c:21 msgid "git ls-tree [] [...]" msgstr "git ls-tree [] [...]" +#: builtin/ls-tree.c:113 #, c-format msgid "bad ls-tree format: element '%s' does not start with '('" msgstr "mauvais format ls-tree : l'élément '%s' ne commence pas par '('" +#: builtin/ls-tree.c:116 #, c-format msgid "bad ls-tree format: element '%s' does not end in ')'" msgstr "mauvais format ls-tree : l'élément '%s' ne se termine pas ')'" +#: builtin/ls-tree.c:140 #, c-format msgid "bad ls-tree format: %%%.*s" msgstr "mauvais format ls-tree : %%%.*s" +#: builtin/ls-tree.c:353 msgid "only show trees" msgstr "afficher seulement les arbres" +#: builtin/ls-tree.c:355 msgid "recurse into subtrees" msgstr "parcourir les sous-arbres" +#: builtin/ls-tree.c:357 msgid "show trees when recursing" msgstr "afficher les arbres en les parcourant" +#: builtin/ls-tree.c:360 msgid "terminate entries with NUL byte" msgstr "terminer les éléments avec un octet NUL" +#: builtin/ls-tree.c:361 msgid "include object size" msgstr "inclure la taille d'objet" +#: builtin/ls-tree.c:363 builtin/ls-tree.c:365 msgid "list only filenames" msgstr "afficher seulement les noms de fichiers" +#: builtin/ls-tree.c:367 msgid "list only objects" msgstr "ne lister que les objets" +#: builtin/ls-tree.c:369 msgid "use full path names" msgstr "utiliser les noms de chemins complets" +#: builtin/ls-tree.c:371 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" "afficher l'arbre entier ; pas seulement le répertoire courant (implique --" "full-name)" +#: builtin/ls-tree.c:407 msgid "--format can't be combined with other format-altering options" msgstr "" "--format ne peut pas être combiné avec d'autres options de modification de " "format" #. TRANSLATORS: keep <> in "<" mail ">" info. +#: builtin/mailinfo.c:16 msgid "git mailinfo [] < mail >info" msgstr "git mailinfo [] < mail >info" +#: builtin/mailinfo.c:60 msgid "keep subject" msgstr "garder le sujet" +#: builtin/mailinfo.c:62 msgid "keep non patch brackets in subject" msgstr "conserver les crochets autres que ceux autour de PATCH dans le sujet" +#: builtin/mailinfo.c:64 msgid "copy Message-ID to the end of commit message" msgstr "copier le Message-ID à la fin du message de validation" +#: builtin/mailinfo.c:66 msgid "re-code metadata to i18n.commitEncoding" msgstr "ré-encoder les méta-données en i18n.commitEncoding" +#: builtin/mailinfo.c:69 msgid "disable charset re-coding of metadata" msgstr "désactiver le ré-encodage de jeu de caractère des méta-données" +#: builtin/mailinfo.c:71 msgid "encoding" msgstr "jeu de caractère" +#: builtin/mailinfo.c:72 msgid "re-code metadata to this encoding" msgstr "ré-encoder les méta-données dans ce jeu de caractère" +#: builtin/mailinfo.c:74 msgid "use scissors" msgstr "utiliser les ciseaux" +#: builtin/mailinfo.c:75 msgid "" msgstr "" +#: builtin/mailinfo.c:76 msgid "action when quoted CR is found" msgstr "action lorsqu'un CR cité est trouvé" +#: builtin/mailinfo.c:79 msgid "use headers in message's body" msgstr "utiliser l'entête dans le corps de message" +#: builtin/mailsplit.c:227 msgid "reading patches from stdin/tty..." msgstr "lecture les mises à jour depuis l'entrée standard/la console..." +#: builtin/mailsplit.c:242 #, c-format msgid "empty mbox: '%s'" msgstr "mbox vide : '%s'" +#: builtin/merge-base.c:35 msgid "git merge-base [-a | --all] ..." msgstr "git merge-base [-a | --all] ..." +#: builtin/merge-base.c:36 msgid "git merge-base [-a | --all] --octopus ..." msgstr "git merge-base [-a | --all] --octopus ..." +#: builtin/merge-base.c:37 msgid "git merge-base --is-ancestor " msgstr "git merge-base --is-ancestor " +#: builtin/merge-base.c:38 msgid "git merge-base --independent ..." msgstr "git merge-base --independent ..." +#: builtin/merge-base.c:39 msgid "git merge-base --fork-point []" msgstr "git merge-base --fork-point []" +#: builtin/merge-base.c:147 msgid "output all common ancestors" msgstr "afficher tous les ancêtres communs" +#: builtin/merge-base.c:149 msgid "find ancestors for a single n-way merge" msgstr "trouver les ancêtres pour une fusion simple à n points" +#: builtin/merge-base.c:151 msgid "list revs not reachable from others" msgstr "afficher les révisions inaccessibles depuis les autres" +#: builtin/merge-base.c:153 msgid "is the first one ancestor of the other?" msgstr "est le premier ancêtre de l'autre ?" +#: builtin/merge-base.c:155 msgid "find where forked from reflog of " msgstr "trouver où a divergé du reflog de " +#: builtin/merge-file.c:14 msgid "" "git merge-file [] [-L [-L [-L ]]] " " " @@ -8177,252 +10385,341 @@ msgstr "" "git merge-file [] [-L [-L [-L ]]] " " " +#: builtin/merge-file.c:40 msgid "send results to standard output" msgstr "envoyer les résultats sur la sortie standard" +#: builtin/merge-file.c:41 +msgid "use object IDs instead of filenames" +msgstr "utiliser les IDs d'objet au lieu de noms de fichier" + +#: builtin/merge-file.c:42 msgid "use a diff3 based merge" msgstr "utiliser une fusion basée sur diff3" +#: builtin/merge-file.c:43 msgid "use a zealous diff3 based merge" msgstr "utiliser une fusion basée sur un diff3 zélée" +#: builtin/merge-file.c:45 msgid "for conflicts, use our version" msgstr "pour les conflits, utiliser notre version (our)" +#: builtin/merge-file.c:47 msgid "for conflicts, use their version" msgstr "pour les conflits, utiliser leur version (their)" +#: builtin/merge-file.c:49 msgid "for conflicts, use a union version" msgstr "pour les conflits, utiliser l'ensemble des versions" +#: builtin/merge-file.c:52 msgid "for conflicts, use this marker size" msgstr "pour les conflits, utiliser cette taille de marqueur" +#: builtin/merge-file.c:53 msgid "do not warn about conflicts" msgstr "ne pas avertir à propos des conflits" +#: builtin/merge-file.c:55 msgid "set labels for file1/orig-file/file2" msgstr "définir les labels pour fichier1/fichier-orig/fichier2" +#: builtin/merge-file.c:93 +#, c-format +msgid "object '%s' does not exist" +msgstr "l'objet '%s' n'existe pas" + +#: builtin/merge-file.c:124 +msgid "Could not write object file" +msgstr "impossible d'écrire le fichier d'objet" + +#: builtin/merge-recursive.c:51 #, c-format msgid "unknown option %s" msgstr "option inconnue %s" +#: builtin/merge-recursive.c:57 #, c-format msgid "could not parse object '%s'" msgstr "impossible d'analyser l'objet '%s'" +#: builtin/merge-recursive.c:61 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "impossible de gérer plus de %d base. %s ignoré." msgstr[1] "impossible de gérer plus de %d bases. %s ignoré." +#: builtin/merge-recursive.c:69 msgid "not handling anything other than two heads merge." msgstr "impossible de gérer autre chose que la fusion de deux têtes." +#: builtin/merge-recursive.c:78 builtin/merge-recursive.c:80 #, c-format msgid "could not resolve ref '%s'" msgstr "impossible de résoudre la référence '%s'" +#: builtin/merge-recursive.c:86 #, c-format msgid "Merging %s with %s\n" msgstr "Fusion de %s avec %s\n" +#: builtin/merge-tree.c:436 builtin/merge-tree.c:441 builtin/merge.c:1212 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" +#: builtin/merge-tree.c:469 builtin/merge.c:1536 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" +#: builtin/merge-tree.c:475 msgid "failure to merge" msgstr "échec de la fusion" +#: builtin/merge-tree.c:524 msgid "git merge-tree [--write-tree] [] " msgstr "git merge-tree [--write-tree] [] " +#: builtin/merge-tree.c:525 msgid "git merge-tree [--trivial-merge] " msgstr "git merge-tree [--trivial-merge] " +#: builtin/merge-tree.c:530 msgid "do a real merge instead of a trivial merge" msgstr "faire une fusion réelle au lieu d'une fusion triviale" +#: builtin/merge-tree.c:533 msgid "do a trivial merge only" msgstr "faire seulement une fusion triviale" +#: builtin/merge-tree.c:535 msgid "also show informational/conflict messages" msgstr "afficher aussi les messages d'information/de conflit" +#: builtin/merge-tree.c:540 msgid "list filenames without modes/oids/stages" msgstr "lister les noms de fichier sans modes/oids/indexation" +#: builtin/merge-tree.c:544 builtin/merge.c:287 builtin/pull.c:191 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" +#: builtin/merge-tree.c:548 msgid "perform multiple merges, one per line of input" msgstr "réaliser des fusions multiples, une par ligne d'entrée" +#: builtin/merge-tree.c:553 msgid "specify a merge-base for the merge" msgstr "spécifier une base de fusion pour la fusion" +#: builtin/merge-tree.c:554 builtin/merge.c:269 builtin/pull.c:183 +msgid "option=value" +msgstr "option=valeur" + +#: builtin/merge-tree.c:555 builtin/merge.c:270 builtin/pull.c:184 +msgid "option for selected merge strategy" +msgstr "option pour la stratégie de fusion sélectionnée" + +#: builtin/merge-tree.c:568 builtin/merge-tree.c:578 builtin/merge-tree.c:643 msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge est incompatible avec d'autres options" +#: builtin/merge-tree.c:571 builtin/merge.c:732 +#, c-format +msgid "unknown strategy option: -X%s" +msgstr "option de stratégie inconnue : -X%s" + +#: builtin/merge-tree.c:580 msgid "--merge-base is incompatible with --stdin" msgstr "--merge-base est incompatible avec --stdin" +#: builtin/merge-tree.c:589 builtin/merge-tree.c:605 builtin/notes.c:385 #, c-format msgid "malformed input line: '%s'." msgstr "ligne en entrée malformée : '%s'." +#: builtin/merge-tree.c:609 #, c-format msgid "merging cannot continue; got unclean result of %d" msgstr "la fusion ne peut pas continuer ; résultat non propre retourné %d" +#: builtin/merge.c:67 msgid "git merge [] [...]" msgstr "git merge [] [...]" +#: builtin/merge.c:132 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" +#: builtin/merge.c:155 #, c-format msgid "option `%s' requires a value" msgstr "le commutateur '%s' a besoin d'une valeur" +#: builtin/merge.c:208 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" +#: builtin/merge.c:209 #, c-format msgid "Available strategies are:" msgstr "Les stratégies disponibles sont :" +#: builtin/merge.c:214 #, c-format msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" +#: builtin/merge.c:246 builtin/pull.c:141 msgid "do not show a diffstat at the end of the merge" msgstr "ne pas afficher un diffstat à la fin de la fusion" +#: builtin/merge.c:248 builtin/pull.c:144 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" +#: builtin/merge.c:249 builtin/pull.c:147 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" +#: builtin/merge.c:251 builtin/pull.c:150 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" "ajouter (au plus ) éléments du journal court au message de validation de " "la fusion" +#: builtin/merge.c:254 builtin/pull.c:156 msgid "create a single commit instead of doing a merge" msgstr "créer une validation unique au lieu de faire une fusion" +#: builtin/merge.c:256 builtin/pull.c:159 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" +#: builtin/merge.c:258 builtin/pull.c:162 msgid "edit message before committing" msgstr "éditer le message avant la validation" +#: builtin/merge.c:260 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" +#: builtin/merge.c:262 builtin/pull.c:169 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" +#: builtin/merge.c:266 builtin/pull.c:175 msgid "verify that the named commit has a valid GPG signature" msgstr "vérifier que le commit nommé a une signature GPG valide" +#: builtin/merge.c:267 builtin/notes.c:888 builtin/pull.c:179 +#: builtin/rebase.c:1178 builtin/revert.c:104 msgid "strategy" msgstr "stratégie" +#: builtin/merge.c:268 builtin/pull.c:180 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -msgid "option=value" -msgstr "option=valeur" - -msgid "option for selected merge strategy" -msgstr "option pour la stratégie de fusion sélectionnée" - +#: builtin/merge.c:272 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "message de validation de la fusion (pour une fusion sans avance rapide)" +#: builtin/merge.c:278 msgid "use instead of the real target" msgstr "utiliser au lieu de la cible réelle" +#: builtin/merge.c:281 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" +#: builtin/merge.c:283 msgid "--abort but leave index and working tree alone" msgstr "--abort mais laisser l'index et l'arbre de travail inchangés" +#: builtin/merge.c:285 msgid "continue the current in-progress merge" msgstr "continuer la fusion en cours" +#: builtin/merge.c:294 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg" +#: builtin/merge.c:318 msgid "could not run stash." msgstr "impossible de lancer le remisage." +#: builtin/merge.c:323 msgid "stash failed" msgstr "échec du remisage" +#: builtin/merge.c:328 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" +#: builtin/merge.c:344 builtin/merge.c:356 msgid "read-tree failed" msgstr "read-tree a échoué" +#: builtin/merge.c:390 msgid "Already up to date. (nothing to squash)" msgstr "Déjà à jour. (rien à compresser)" +#: builtin/merge.c:392 merge-ort-wrappers.c:37 merge-recursive.c:3496 msgid "Already up to date." msgstr "Déjà à jour." +#: builtin/merge.c:404 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressée -- HEAD non mise à jour\n" +#: builtin/merge.c:455 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n" +#: builtin/merge.c:504 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" +#: builtin/merge.c:592 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" +#: builtin/merge.c:707 builtin/merge.c:906 builtin/stash.c:524 +#: merge-recursive.c:3852 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." +#: builtin/merge.c:719 msgid "Not handling anything other than two heads merge." msgstr "Impossible de gérer autre chose que la fusion de deux têtes." -#, c-format -msgid "unknown strategy option: -X%s" -msgstr "option de stratégie inconnue : -X%s" - +#: builtin/merge.c:754 t/helper/test-fast-rebase.c:233 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" +#: builtin/merge.c:806 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" +#: builtin/merge.c:815 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la " "fusion.\n" +#: builtin/merge.c:821 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -8434,9 +10731,11 @@ msgstr "" "branche de sujet.\n" "\n" +#: builtin/merge.c:826 msgid "An empty message aborts the commit.\n" msgstr "Un message vide abandonne la validation.\n" +#: builtin/merge.c:829 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -8445,59 +10744,75 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" +#: builtin/merge.c:892 msgid "Empty commit message." msgstr "Message de validation vide." +#: builtin/merge.c:909 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" +#: builtin/merge.c:970 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "La fusion automatique a échoué ; réglez les conflits et validez le " "résultat.\n" +#: builtin/merge.c:1010 msgid "No current branch." msgstr "Pas de branche courante." +#: builtin/merge.c:1012 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." +#: builtin/merge.c:1014 msgid "No default upstream defined for the current branch." msgstr "Pas de branche amont par défaut définie pour la branche courante." +#: builtin/merge.c:1019 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" +#: builtin/merge.c:1076 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" +#: builtin/merge.c:1151 editor.c:153 read-cache.c:3093 wrapper.c:686 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" +#: builtin/merge.c:1178 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" +#: builtin/merge.c:1325 msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" +#: builtin/merge.c:1329 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)." +#: builtin/merge.c:1347 msgid "--quit expects no arguments" msgstr "--quit n'accepte pas d'argument" +#: builtin/merge.c:1360 msgid "--continue expects no arguments" msgstr "--continue ne supporte aucun argument" +#: builtin/merge.c:1364 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)." +#: builtin/merge.c:1380 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8505,6 +10820,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." +#: builtin/merge.c:1387 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -8512,31 +10828,39 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." +#: builtin/merge.c:1390 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)." +#: builtin/merge.c:1422 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini." +#: builtin/merge.c:1439 msgid "Squash commit into empty head not supported yet" msgstr "La validation compressée vers une tête vide n'est pas encore supportée" +#: builtin/merge.c:1441 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide" +#: builtin/merge.c:1446 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" +#: builtin/merge.c:1448 msgid "Can merge only exactly one commit into empty head" msgstr "" "Possible de fusionner exactement une seule validation dans une tête vide" +#: builtin/merge.c:1557 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" +#: builtin/merge.c:1607 merge-ort-wrappers.c:17 merge-recursive.c:3734 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8546,85 +10870,107 @@ msgstr "" "fusion :\n" " %s" +#: builtin/merge.c:1616 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" +#: builtin/merge.c:1623 #, c-format msgid "Nope.\n" msgstr "Non.\n" +#: builtin/merge.c:1686 builtin/merge.c:1754 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" +#: builtin/merge.c:1690 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" +#: builtin/merge.c:1744 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n" +#: builtin/merge.c:1746 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" +#: builtin/merge.c:1756 #, c-format msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "Utilisation de %s pour préparer la résolution à la main.\n" +#: builtin/merge.c:1770 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "La fusion automatique a réussi ; stoppée avant la validation comme demandé\n" +#: builtin/merge.c:1775 #, c-format msgid "When finished, apply stashed changes with `git stash pop`\n" msgstr "" "Une fois terminé, appliquer les modifications remisées avec `git stash pop`\n" +#: builtin/mktag.c:31 #, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "attention : l'entrée d'étiquette ne passe pas fsck : %s" +#: builtin/mktag.c:42 #, c-format msgid "error: tag input does not pass fsck: %s" msgstr "erreur : l'entrée d'étiquette ne passe pas fsck : %s" +#: builtin/mktag.c:45 #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" msgstr "%d (FSCK_IGNORE?) ne devrait jamais rappeler cette fonction" +#: builtin/mktag.c:61 #, c-format msgid "could not read tagged object '%s'" msgstr "impossible de lire l'objet étiqueté '%s'" +#: builtin/mktag.c:64 #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "l'objet '%s' étiqueté comme '%s', mais est de type '%s'" +#: builtin/mktag.c:93 imap-send.c:1569 trailer.c:777 msgid "could not read from stdin" msgstr "impossible de lire depuis l'entrée standard" +#: builtin/mktag.c:102 msgid "tag on stdin did not pass our strict fsck check" msgstr "l'étiquette sur stdin n'a pas passé le test strict fsck" +#: builtin/mktag.c:105 msgid "tag on stdin did not refer to a valid object" msgstr "l'étiquette sur stdin ne pointe pas sur un objet valide" +#: builtin/mktag.c:108 builtin/tag.c:255 msgid "unable to write tag file" msgstr "impossible d'écrire le fichier d'étiquettes" +#: builtin/mktree.c:164 msgid "input is NUL terminated" msgstr "l'entrée se termine par NUL" +#: builtin/mktree.c:165 builtin/write-tree.c:29 msgid "allow missing objects" msgstr "autoriser les objets manquants" +#: builtin/mktree.c:166 msgid "allow creation of more than one tree" msgstr "autoriser la création de plus d'un arbre" +#: builtin/multi-pack-index.c:13 msgid "" "git multi-pack-index [] write [--preferred-pack=][--refs-" "snapshot=]" @@ -8632,38 +10978,49 @@ msgstr "" "git multi-pack-index [] write [--preferred-pack=][--refs-" "snapshot=]" +#: builtin/multi-pack-index.c:17 msgid "git multi-pack-index [] verify" msgstr "git multi-pack-index [] verify" +#: builtin/multi-pack-index.c:20 msgid "git multi-pack-index [] expire" msgstr "git multi-pack-index [] expire" +#: builtin/multi-pack-index.c:23 msgid "git multi-pack-index [] repack [--batch-size=]" msgstr "git multi-pack-index [] repack [--batch-size=]" +#: builtin/multi-pack-index.c:73 msgid "directory" msgstr "répertoire" +#: builtin/multi-pack-index.c:74 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" "répertoire objet contenant un ensemble de paires de fichiers paquet et " "d'index de paquet" +#: builtin/multi-pack-index.c:125 msgid "preferred-pack" msgstr "paquet-préféré" +#: builtin/multi-pack-index.c:126 msgid "pack for reuse when computing a multi-pack bitmap" msgstr "paquet à réutiliser lors du calcul de bitmap de multi-paquet" +#: builtin/multi-pack-index.c:127 msgid "write multi-pack bitmap" msgstr "écriture du bitmap de multi-paquet" +#: builtin/multi-pack-index.c:132 msgid "write multi-pack index containing only given indexes" msgstr "écrire l'index multi-paquet ne contenant que les index fournis" +#: builtin/multi-pack-index.c:134 msgid "refs snapshot for selecting bitmap commits" msgstr "instantané des réfs pour sélectionner les commits de bitmap" +#: builtin/multi-pack-index.c:236 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -8671,126 +11028,163 @@ msgstr "" "pendant le repaquetage, collecter les fichiers paquet de plus petite taille " "dans un lot plus grand que cette taille" +#: builtin/mv.c:28 msgid "git mv [] ... " msgstr "git mv [] ... " +#: builtin/mv.c:100 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?" +#: builtin/mv.c:102 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Veuillez indexer vos modifications de .gitmodules ou les remiser pour " "continuer" +#: builtin/mv.c:120 #, c-format msgid "%.*s is in index" msgstr "%.*s est dans l'index" +#: builtin/mv.c:175 msgid "force move/rename even if target exists" msgstr "forcer le déplacement/renommage même si la cible existe" +#: builtin/mv.c:177 msgid "skip move/rename errors" msgstr "sauter les erreurs de déplacement/renommage" +#: builtin/mv.c:232 #, c-format msgid "destination '%s' is not a directory" msgstr "la destination '%s' n'est pas un répertoire" +#: builtin/mv.c:260 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Vérification du renommage de '%s' en '%s'\n" +#: builtin/mv.c:277 builtin/mv.c:282 msgid "bad source" msgstr "mauvaise source" +#: builtin/mv.c:295 builtin/mv.c:365 msgid "destination exists" msgstr "la destination existe" +#: builtin/mv.c:303 msgid "can not move directory into itself" msgstr "impossible de déplacer un répertoire dans lui-même" -msgid "cannot move directory over file" -msgstr "impossible de déplacer un répertoire sur un fichier" +#: builtin/mv.c:308 +msgid "destination already exists" +msgstr "la destination existe déjà" +#: builtin/mv.c:323 msgid "source directory is empty" msgstr "le répertoire source est vide" +#: builtin/mv.c:356 msgid "not under version control" msgstr "pas sous le contrôle de version" +#: builtin/mv.c:360 msgid "conflicted" msgstr "en conflit" +#: builtin/mv.c:373 builtin/mv.c:395 #, c-format msgid "overwriting '%s'" msgstr "écrasement de '%s'" +#: builtin/mv.c:376 msgid "Cannot overwrite" msgstr "Impossible d'écraser" +#: builtin/mv.c:381 msgid "multiple sources for the same target" msgstr "multiples sources pour la même destination" +#: builtin/mv.c:385 msgid "destination directory does not exist" msgstr "le répertoire de destination n'existe pas" +#: builtin/mv.c:392 msgid "destination exists in the index" msgstr "la destination existe dans l'index" +#: builtin/mv.c:427 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, source=%s, destination=%s" +#: builtin/mv.c:458 #, c-format msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" +#: builtin/mv.c:466 builtin/remote.c:827 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" +#: builtin/name-rev.c:509 msgid "git name-rev [] ..." msgstr "git name-rev [] ..." +#: builtin/name-rev.c:510 msgid "git name-rev [] --all" msgstr "git name-rev [] --all" +#: builtin/name-rev.c:511 msgid "git name-rev [] --annotate-stdin" msgstr "git name-rev [] --annotate-stdin" +#: builtin/name-rev.c:568 msgid "print only ref-based names (no object names)" msgstr "" "afficher seulement les noms basés sur des références (pas de nom d'objet)" +#: builtin/name-rev.c:569 msgid "only use tags to name the commits" msgstr "utiliser seulement les étiquettes pour nommer les validations" +#: builtin/name-rev.c:571 msgid "only use refs matching " msgstr "utiliser seulement les références correspondant à " +#: builtin/name-rev.c:573 msgid "ignore refs matching " msgstr "ignorer les références correspondant à " +#: builtin/name-rev.c:575 msgid "list all commits reachable from all refs" msgstr "" "afficher toutes les validations accessibles depuis toutes les références" +#: builtin/name-rev.c:579 msgid "deprecated: use --annotate-stdin instead" msgstr "obsolète : utilisez --annotate-stdin à la place" +#: builtin/name-rev.c:581 msgid "annotate text from stdin" msgstr "annoter le texte depuis l'entrée standard" +#: builtin/name-rev.c:582 msgid "allow to print `undefined` names (default)" msgstr "autoriser l'affichage des noms `non définis` (par défaut)" +#: builtin/name-rev.c:586 msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" +#: builtin/notes.c:36 msgid "git notes [--ref ] [list []]" msgstr "git notes [--ref ] [list []]" +#: builtin/notes.c:37 msgid "" "git notes [--ref ] add [-f] [--allow-empty] [--[no-]separator|--" "separator=] [--[no-]stripspace] [-m | -F | (-c " @@ -8800,10 +11194,12 @@ msgstr "" "[no-]separator|--separator=] [--[no-]stripspace] [-m " " | -F | (-c | -C) ] []" +#: builtin/notes.c:38 msgid "git notes [--ref ] copy [-f] " msgstr "" "git notes [--ref ] copy [-f] " +#: builtin/notes.c:39 msgid "" "git notes [--ref ] append [--allow-empty] [--[no-]separator|--" "separator=] [--[no-]stripspace] [-m | -F | (-c " @@ -8813,103 +11209,135 @@ msgstr "" "[no-]separator|--separator=] [--[no-]stripspace]-m " " | -F | (-c | -C) ] []" +#: builtin/notes.c:40 msgid "git notes [--ref ] edit [--allow-empty] []" msgstr "git notes [--ref ] edit [--allow-empty] []" +#: builtin/notes.c:41 msgid "git notes [--ref ] show []" msgstr "git notes [--ref ] show []" +#: builtin/notes.c:42 msgid "" "git notes [--ref ] merge [-v | -q] [-s ] " msgstr "" "git notes [--ref ] merge [-v | -q] [-s ] " "" +#: builtin/notes.c:45 msgid "git notes [--ref ] remove [...]" msgstr "git notes [--ref ] remove [...]" +#: builtin/notes.c:46 msgid "git notes [--ref ] prune [-n] [-v]" msgstr "git notes [--ref ] prune [-n] [-v]" +#: builtin/notes.c:47 msgid "git notes [--ref ] get-ref" msgstr "git notes [--ref ] get-ref" +#: builtin/notes.c:52 msgid "git notes [list []]" msgstr "git notes [list []]" +#: builtin/notes.c:57 msgid "git notes add [] []" msgstr "git notes add [] []" +#: builtin/notes.c:62 msgid "git notes copy [] " msgstr "git notes copy [] " +#: builtin/notes.c:63 msgid "git notes copy --stdin [ ]..." msgstr "git notes copy --stdin [ ]..." +#: builtin/notes.c:68 msgid "git notes append [] []" msgstr "git notes append [] []" +#: builtin/notes.c:73 msgid "git notes edit []" msgstr "git notes edit []" +#: builtin/notes.c:78 msgid "git notes show []" msgstr "git notes show []" +#: builtin/notes.c:83 msgid "git notes merge [] " msgstr "git notes merge [] " +#: builtin/notes.c:84 msgid "git notes merge --commit []" msgstr "git notes merge --commit []" +#: builtin/notes.c:85 msgid "git notes merge --abort []" msgstr "git notes merge --abort []" +#: builtin/notes.c:90 msgid "git notes remove []" msgstr "git notes remove []" +#: builtin/notes.c:95 msgid "git notes prune []" msgstr "git notes prune []" +#: builtin/notes.c:105 msgid "Write/edit the notes for the following object:" msgstr "Écrire/éditer les notes pour l'objet suivant :" +#: builtin/notes.c:179 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "impossible de démarrer 'show' pour l'objet '%s'" +#: builtin/notes.c:183 msgid "could not read 'show' output" msgstr "impossible de lire la sortie de 'show'" +#: builtin/notes.c:191 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "impossible de finir 'show' pour l'objet '%s'" +#: builtin/notes.c:225 msgid "please supply the note contents using either -m or -F option" msgstr "veuillez fournir le contenu de la note en utilisant l'option -m ou -F" +#: builtin/notes.c:235 msgid "unable to write note object" msgstr "impossible d'écrire l'objet note" +#: builtin/notes.c:238 #, c-format msgid "the note contents have been left in %s" msgstr "le contenu de la note a été laissé dans %s" +#: builtin/notes.c:302 builtin/tag.c:594 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" +#: builtin/notes.c:323 builtin/notes.c:389 builtin/notes.c:391 +#: builtin/notes.c:459 builtin/notes.c:525 builtin/notes.c:613 +#: builtin/notes.c:618 builtin/notes.c:707 builtin/notes.c:772 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "impossible de résoudre '%s' comme une référence valide." +#: builtin/notes.c:325 #, c-format msgid "failed to read object '%s'." msgstr "impossible de lire l'objet '%s'." +#: builtin/notes.c:330 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "impossible de lire les informations de note d'un objet non-blob '%s'." +#: builtin/notes.c:400 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "impossible de copier les notes de '%s' vers '%s'" @@ -8917,41 +11345,53 @@ msgstr "impossible de copier les notes de '%s' vers '%s'" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. +#: builtin/notes.c:432 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "refus de faire %s sur des notes dans %s (hors de refs/notes/)" +#: builtin/notes.c:465 builtin/notes.c:778 #, c-format msgid "no note found for object %s." msgstr "pas de note trouvée pour l'objet %s." +#: builtin/notes.c:487 builtin/notes.c:663 msgid "note contents as a string" msgstr "contenu de la note sous forme de chaîne" +#: builtin/notes.c:490 builtin/notes.c:666 msgid "note contents in a file" msgstr "contenu de la note dans un fichier" +#: builtin/notes.c:493 builtin/notes.c:669 msgid "reuse and edit specified note object" msgstr "réutiliser et éditer l'objet de note spécifié" +#: builtin/notes.c:496 builtin/notes.c:672 msgid "reuse specified note object" msgstr "réutiliser l'objet de note spécifié" +#: builtin/notes.c:499 builtin/notes.c:675 msgid "allow storing empty note" msgstr "permettre de stocker une note vide" +#: builtin/notes.c:500 builtin/notes.c:583 msgid "replace existing notes" msgstr "remplacer les notes existantes" +#: builtin/notes.c:502 builtin/notes.c:677 msgid "" msgstr "" +#: builtin/notes.c:503 builtin/notes.c:678 msgid "insert between paragraphs" msgstr "insérer entre les paragraphes" +#: builtin/notes.c:506 builtin/notes.c:681 msgid "remove unnecessary whitespace" msgstr "retirer les espaces inutiles" +#: builtin/notes.c:535 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -8960,24 +11400,30 @@ msgstr "" "Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. " "Utilisez '-f' pour écraser les notes existantes" +#: builtin/notes.c:550 builtin/notes.c:631 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Écrasement des notes existantes pour l'objet %s\n" +#: builtin/notes.c:562 builtin/notes.c:737 builtin/notes.c:1007 #, c-format msgid "Removing note for object %s\n" msgstr "Suppression de la note pour l'objet %s\n" +#: builtin/notes.c:584 msgid "read objects from stdin" msgstr "lire les objets depuis l'entrée standard" +#: builtin/notes.c:586 msgid "load rewriting config for (implies --stdin)" msgstr "" "charger la configuration de réécriture pour (implique --stdin)" +#: builtin/notes.c:604 msgid "too few arguments" msgstr "trop peu d'arguments" +#: builtin/notes.c:625 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -8986,10 +11432,12 @@ msgstr "" "Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. " "Utilisez '-f' pour écraser les notes existantes" +#: builtin/notes.c:637 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "notes manquantes sur l'objet source %s. Impossible de copier." +#: builtin/notes.c:700 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -8998,40 +11446,52 @@ msgstr "" "Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n" "Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n" +#: builtin/notes.c:798 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL" +#: builtin/notes.c:800 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "échec de la suppression de la référence NOTES_MERGE_REF" +#: builtin/notes.c:802 msgid "failed to remove 'git notes merge' worktree" msgstr "échec de la suppression de la copie de travail 'git notes merge'" +#: builtin/notes.c:822 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL" +#: builtin/notes.c:824 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL." +#: builtin/notes.c:826 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL." +#: builtin/notes.c:839 msgid "failed to resolve NOTES_MERGE_REF" msgstr "échec de la résolution de NOTES_MERGE_REF" +#: builtin/notes.c:842 msgid "failed to finalize notes merge" msgstr "impossible de finaliser la fusion de notes" +#: builtin/notes.c:869 #, c-format msgid "unknown notes merge strategy %s" msgstr "stratégie de fusion de notes inconnue %s" +#: builtin/notes.c:885 msgid "General options" msgstr "Options générales" +#: builtin/notes.c:887 msgid "Merge options" msgstr "Options de fusion" +#: builtin/notes.c:889 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -9039,37 +11499,47 @@ msgstr "" "résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/" "theirs/union/cat_sort_uniq)" +#: builtin/notes.c:891 msgid "Committing unmerged notes" msgstr "Validation des notes non fusionnées" +#: builtin/notes.c:893 msgid "finalize notes merge by committing unmerged notes" msgstr "finaliser la fusion de notes en validant les notes non fusionnées" +#: builtin/notes.c:895 msgid "Aborting notes merge resolution" msgstr "Abandon de la résolution de fusion des notes" +#: builtin/notes.c:897 msgid "abort notes merge" msgstr "abandonner la fusion de notes" +#: builtin/notes.c:908 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles" +#: builtin/notes.c:913 msgid "must specify a notes ref to merge" msgstr "vous devez spécifier une référence de notes à fusionner" +#: builtin/notes.c:937 #, c-format msgid "unknown -s/--strategy: %s" msgstr "-s/--strategy inconnu : %s" +#: builtin/notes.c:977 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "une fusion de notes dans %s est déjà en cours avec %s" +#: builtin/notes.c:981 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" "impossible de stocker le lien vers la référence actuelle aux notes (%s)" +#: builtin/notes.c:983 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -9080,48 +11550,60 @@ msgstr "" "validez le résultat avec 'git notes merges --commit', ou abandonnez la " "fusion avec 'git notes merge --abort'.\n" +#: builtin/notes.c:1002 builtin/tag.c:607 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Impossible de résoudre '%s' comme une référence valide." +#: builtin/notes.c:1005 #, c-format msgid "Object %s has no note\n" msgstr "L'objet %s n'a pas de note\n" +#: builtin/notes.c:1017 msgid "attempt to remove non-existent note is not an error" msgstr "" "la tentative de suppression d'une note non existante n'est pas une erreur" +#: builtin/notes.c:1020 msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" +#: builtin/notes.c:1059 builtin/prune.c:155 builtin/worktree.c:237 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" +#: builtin/notes.c:1060 msgid "report pruned notes" msgstr "afficher les notes éliminées" +#: builtin/notes.c:1103 msgid "notes-ref" msgstr "références-notes" +#: builtin/notes.c:1104 msgid "use notes from " msgstr "utiliser les notes depuis " +#: builtin/notes.c:1123 builtin/remote.c:1783 parse-options.c:858 #, c-format msgid "unknown subcommand: `%s'" msgstr "sous-commande inconnue : `%s'" +#: builtin/pack-objects.c:188 msgid "git pack-objects --stdout [] [< | < ]" msgstr "" "git pack-objects --stdout [] [< | < ]" +#: builtin/pack-objects.c:189 msgid "" "git pack-objects [] [< | < ]" msgstr "" "git pack-objects [] [< | < ]" +#: builtin/pack-objects.c:582 #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset % in " @@ -9130,103 +11612,130 @@ msgstr "" "write_reuse_object : impossible de localiser %s, attendu à l'offset " "% dans le paquet %s" +#: builtin/pack-objects.c:590 #, c-format msgid "bad packed object CRC for %s" msgstr "mauvais CRC d'objet empaqueté pour %s" +#: builtin/pack-objects.c:601 #, c-format msgid "corrupt packed object for %s" msgstr "objet empaqueté corrompu pour %s" +#: builtin/pack-objects.c:732 #, c-format msgid "recursive delta detected for object %s" msgstr "delta récursif détecté pour l'objet %s" +#: builtin/pack-objects.c:953 #, c-format msgid "ordered %u objects, expected %" msgstr "%u objets commandés, % attendus" +#: builtin/pack-objects.c:1048 #, c-format msgid "expected object at offset % in pack %s" msgstr "objet attendu à l'offset % dans le paquet %s" +#: builtin/pack-objects.c:1172 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à " "cause de pack.packSizeLimit" +#: builtin/pack-objects.c:1185 msgid "Writing objects" msgstr "Écriture des objets" +#: builtin/pack-objects.c:1257 builtin/update-index.c:109 #, c-format msgid "failed to stat %s" msgstr "échec du stat de %s" +#: builtin/pack-objects.c:1265 object-file.c:2082 #, c-format msgid "failed utime() on %s" msgstr "échec de utime() sur %s" +#: builtin/pack-objects.c:1294 msgid "failed to write bitmap index" msgstr "écrire un index de bitmap" +#: builtin/pack-objects.c:1320 #, c-format msgid "wrote % objects while expecting %" msgstr "% objets écrits, % attendus" +#: builtin/pack-objects.c:1570 builtin/repack.c:1242 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "désactivation de l'écriture en bitmap car certains objets ne sont pas " "compressés" +#: builtin/pack-objects.c:2015 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "dépassement de décalage de base de delta pour %s" +#: builtin/pack-objects.c:2024 #, c-format msgid "delta base offset out of bound for %s" msgstr "décalage de base de delta est hors limite pour %s" +#: builtin/pack-objects.c:2305 msgid "Counting objects" msgstr "Décompte des objets" +#: builtin/pack-objects.c:2455 pack-bitmap.c:1521 pack-bitmap.c:1527 #, c-format msgid "unable to get size of %s" msgstr "impossible de récupérer la taille de %s" +#: builtin/pack-objects.c:2470 #, c-format msgid "unable to parse object header of %s" msgstr "impossible d'analyser l'entête d'objet de %s" +#: builtin/pack-objects.c:2542 builtin/pack-objects.c:2560 +#: builtin/pack-objects.c:2570 #, c-format msgid "object %s cannot be read" msgstr "l'objet %s ne peut être lu" +#: builtin/pack-objects.c:2545 builtin/pack-objects.c:2574 #, c-format msgid "object %s inconsistent object length (% vs %)" msgstr "" "objet %s longueur de l'objet inconsistante (% contre %)" +#: builtin/pack-objects.c:2584 msgid "suboptimal pack - out of memory" msgstr "paquet sous-optimal - mémoire insuffisante" +#: builtin/pack-objects.c:2899 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compression par delta en utilisant jusqu'à %d fils d'exécution" +#: builtin/pack-objects.c:3038 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "impossible d'empaqueter les objets joignables depuis l'étiquette %s" +#: builtin/pack-objects.c:3106 commit-graph.c:1499 #, c-format msgid "unable to get type of object %s" msgstr "impossible d'obtenir le type de l'objet %s" +#: builtin/pack-objects.c:3125 msgid "Compressing objects" msgstr "Compression des objets" +#: builtin/pack-objects.c:3131 msgid "inconsistency with delta count" msgstr "inconsistance dans le compte de delta" +#: builtin/pack-objects.c:3219 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form ' ' ('%s' reçu)" +#: builtin/pack-objects.c:3222 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" @@ -9242,27 +11752,35 @@ msgstr "" "l'objet est déjà configuré dans un autre uploadpack.blobpackfileuri ('%s' " "reçu)" +#: builtin/pack-objects.c:3259 #, c-format msgid "could not get type of object %s in pack %s" msgstr "impossible d'obtenir le type de l'objet %s dans le paquet %s" +#: builtin/pack-objects.c:3389 builtin/pack-objects.c:3402 +#: builtin/pack-objects.c:3526 #, c-format msgid "could not find pack '%s'" msgstr "impossible de trouver le paquet '%s'" +#: builtin/pack-objects.c:3391 #, c-format msgid "packfile %s cannot be accessed" msgstr "le fichier paquet %s ne peut être accédé" +#: builtin/pack-objects.c:3537 builtin/pack-objects.c:3563 msgid "Enumerating cruft objects" msgstr "Énumération des objets déchets" +#: builtin/pack-objects.c:3569 msgid "unable to add cruft objects" msgstr "impossible d'ajouter les objets déchets" +#: builtin/pack-objects.c:3582 msgid "Traversing cruft objects" msgstr "Traversée des objets" +#: builtin/pack-objects.c:3667 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -9271,6 +11789,7 @@ msgstr "" "ID d'objet de bord attendu, reçu des données illisibles :\n" "%s" +#: builtin/pack-objects.c:3673 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -9279,220 +11798,278 @@ msgstr "" "ID d'objet attendu, reçu des données illisibles :\n" "%s" +#: builtin/pack-objects.c:3787 reachable.c:246 msgid "could not load cruft pack .mtimes" msgstr "impossible de charger le paquet déchet des mtimes" +#: builtin/pack-objects.c:3809 builtin/pack-objects.c:3908 msgid "cannot open pack index" msgstr "impossible d'ouvrir l'index de paquet" +#: builtin/pack-objects.c:3818 #, c-format msgid "loose object at %s could not be examined" msgstr "l'objet libre à %s n'a pas pu être examiné" +#: builtin/pack-objects.c:3916 msgid "unable to force loose object" msgstr "impossible de forcer l'objet libre" +#: builtin/pack-objects.c:4045 #, c-format msgid "not a rev '%s'" msgstr "'%s' n'est pas une révision" +#: builtin/pack-objects.c:4048 builtin/rev-parse.c:1095 #, c-format msgid "bad revision '%s'" msgstr "mauvaise révision '%s'" +#: builtin/pack-objects.c:4076 msgid "unable to add recent objects" msgstr "impossible d'ajouter les objets récents" +#: builtin/pack-objects.c:4144 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" +#: builtin/pack-objects.c:4148 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" +#: builtin/pack-objects.c:4201 msgid "show progress meter during object writing phase" msgstr "afficher la barre de progression durant la phase d'écrite des objets" +#: builtin/pack-objects.c:4204 msgid "similar to --all-progress when progress meter is shown" msgstr "similaire à --all-progress quand la barre de progression est affichée" +#: builtin/pack-objects.c:4205 msgid "[,]" msgstr "[,]" +#: builtin/pack-objects.c:4206 msgid "write the pack index file in the specified idx format version" msgstr "" "écrire le fichier d'index du paquet dans le format d'index de version " "spécifié" +#: builtin/pack-objects.c:4209 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" +#: builtin/pack-objects.c:4211 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" +#: builtin/pack-objects.c:4213 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" +#: builtin/pack-objects.c:4215 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" +#: builtin/pack-objects.c:4217 msgid "limit pack window by memory in addition to object limit" msgstr "" "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets" +#: builtin/pack-objects.c:4219 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "longueur maximum de la chaîne de delta autorisée dans le paquet résultant" +#: builtin/pack-objects.c:4221 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" +#: builtin/pack-objects.c:4223 msgid "reuse existing objects" msgstr "réutiliser les objets existants" +#: builtin/pack-objects.c:4225 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" +#: builtin/pack-objects.c:4227 msgid "use threads when searching for best delta matches" msgstr "" "utiliser des fils lors de la recherche pour une meilleure correspondance des " "deltas" +#: builtin/pack-objects.c:4229 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" +#: builtin/pack-objects.c:4231 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" +#: builtin/pack-objects.c:4233 msgid "limit the objects to those that are not yet packed" msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés" +#: builtin/pack-objects.c:4236 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" +#: builtin/pack-objects.c:4239 msgid "include objects referred by reflog entries" msgstr "inclure les objets référencés par les éléments de reflog" +#: builtin/pack-objects.c:4242 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" +#: builtin/pack-objects.c:4245 msgid "read packs from stdin" msgstr "lire les paquets depuis l'entrée standard" +#: builtin/pack-objects.c:4247 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" +#: builtin/pack-objects.c:4249 msgid "include tag objects that refer to objects to be packed" msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter" +#: builtin/pack-objects.c:4251 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" +#: builtin/pack-objects.c:4253 msgid "pack loose unreachable objects" msgstr "empaqueter les objets inaccessibles détachés" +#: builtin/pack-objects.c:4255 msgid "unpack unreachable objects newer than