diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2020-05-17 09:28:44 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2020-05-17 09:28:44 +0800 |
| commit | 722ab588c561032a478c2fdefae7a7cfd1acff51 (patch) | |
| tree | d1428015089d5bde1e0ebd0013b135f28047ac9c | |
| parent | Merge branch 'git-2.27-round-1' of github.com:bitigchi/git-po (diff) | |
| parent | l10n: fr v2.27.0 rnd 1 (diff) | |
| download | tgif-722ab588c561032a478c2fdefae7a7cfd1acff51.tar.xz | |
Merge branch 'fr_2.27.0_rnd1' of github.com:jnavila/git
* 'fr_2.27.0_rnd1' of github.com:jnavila/git:
l10n: fr v2.27.0 rnd 1
| -rw-r--r-- | po/fr.po | 6920 |
1 files changed, 3569 insertions, 3351 deletions
@@ -57,6 +57,7 @@ # revision | révision # shallow | superficiel # shell | interpréteur de commandes +# sparse | clairsemé # stash | remisage # to stash | remiser # tag | étiquette @@ -69,14 +70,14 @@ # upstream | amont # viewer | visualiseur # worktree / | -# work(ing) tree | copie de travail +# work(ing) tree | arbre de travail # msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-03-11 15:26+0800\n" -"PO-Revision-Date: 2020-03-11 21:03+0100\n" +"POT-Creation-Date: 2020-05-15 09:11+0800\n" +"PO-Revision-Date: 2020-05-15 21:35+0200\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -91,9 +92,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "Hein (%s) ?" -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 -#: builtin/rebase.c:2086 builtin/rebase.c:2130 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142 +#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518 +#: builtin/rebase.c:1919 msgid "could not read index" msgstr "impossible de lire l'index" @@ -121,8 +122,7 @@ msgstr "Mise à jour" msgid "could not stage '%s'" msgstr "impossible d'indexer '%s'" -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 -#: builtin/rebase.c:899 +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336 msgid "could not write index" msgstr "impossible d'écrire l'index" @@ -138,8 +138,8 @@ msgstr[1] "%d chemins mis à jour\n" msgid "note: %s is untracked now.\n" msgstr "note : %s n'est plus suivi à présent.\n" -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 -#: builtin/reset.c:144 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294 +#: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" @@ -265,11 +265,11 @@ msgstr "sélectionner un élément par son numéro" msgid "(empty) select nothing" msgstr "(vide) ne rien sélectionner" -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848 msgid "What now" msgstr "Et maintenant ?" @@ -281,12 +281,13 @@ msgstr "indexé" msgid "unstaged" msgstr "non-indexé" -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250 +#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145 +#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 +#: builtin/submodule--helper.c:2148 bugreport.c:129 +#: git-add--interactive.perl:213 msgid "path" msgstr "chemin" @@ -294,27 +295,27 @@ msgstr "chemin" msgid "could not refresh index" msgstr "impossible de rafraîchir l'index" -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765 #, c-format msgid "Bye.\n" msgstr "Au revoir.\n" -#: add-patch.c:33 git-add--interactive.perl:1428 +#: add-patch.c:34 git-add--interactive.perl:1428 #, c-format, perl-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:34 git-add--interactive.perl:1429 +#: add-patch.c:35 git-add--interactive.perl:1429 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? " -#: add-patch.c:35 git-add--interactive.perl:1430 +#: add-patch.c:36 git-add--interactive.perl:1430 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Indexer cette section [y,n,q,a,d%s,?] ? " -#: add-patch.c:37 +#: add-patch.c:38 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." @@ -322,7 +323,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme indexée." -#: add-patch.c:40 +#: add-patch.c:41 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -336,22 +337,22 @@ 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:54 git-add--interactive.perl:1433 +#: add-patch.c:55 git-add--interactive.perl:1433 #, c-format, perl-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:55 git-add--interactive.perl:1434 +#: add-patch.c:56 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? " -#: add-patch.c:56 git-add--interactive.perl:1435 +#: add-patch.c:57 git-add--interactive.perl:1435 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Remiser cette section [y,n,q,a,d%s,?] ? " -#: add-patch.c:58 +#: add-patch.c:59 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." @@ -359,7 +360,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme remisée." -#: add-patch.c:61 +#: add-patch.c:62 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -373,22 +374,22 @@ 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:77 git-add--interactive.perl:1438 +#: add-patch.c:78 git-add--interactive.perl:1438 #, c-format, perl-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:78 git-add--interactive.perl:1439 +#: add-patch.c:79 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? " -#: add-patch.c:79 git-add--interactive.perl:1440 +#: add-patch.c:80 git-add--interactive.perl:1440 #, c-format, perl-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:81 +#: add-patch.c:82 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." @@ -396,7 +397,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme desindexée." -#: add-patch.c:84 +#: add-patch.c:85 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -410,22 +411,22 @@ 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:99 git-add--interactive.perl:1443 +#: add-patch.c:100 git-add--interactive.perl:1443 #, c-format, perl-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:100 git-add--interactive.perl:1444 +#: add-patch.c:101 git-add--interactive.perl:1444 #, c-format, perl-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:101 git-add--interactive.perl:1445 +#: add-patch.c:102 git-add--interactive.perl:1445 #, c-format, perl-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:103 add-patch.c:168 add-patch.c:211 +#: add-patch.c:104 add-patch.c:169 add-patch.c:212 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." @@ -433,7 +434,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme appliquée." -#: add-patch.c:106 +#: add-patch.c:107 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -447,25 +448,25 @@ 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:121 git-add--interactive.perl:1448 +#: add-patch.c:122 git-add--interactive.perl:1448 #: git-add--interactive.perl:1463 #, c-format, perl-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:122 git-add--interactive.perl:1449 +#: add-patch.c:123 git-add--interactive.perl:1449 #: git-add--interactive.perl:1464 #, c-format, perl-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:123 git-add--interactive.perl:1450 +#: add-patch.c:124 git-add--interactive.perl:1450 #: git-add--interactive.perl:1465 #, c-format, perl-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:125 add-patch.c:147 add-patch.c:190 +#: add-patch.c:126 add-patch.c:148 add-patch.c:191 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." @@ -473,7 +474,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme éliminée." -#: add-patch.c:128 add-patch.c:193 +#: add-patch.c:129 add-patch.c:194 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -487,24 +488,24 @@ 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:143 add-patch.c:186 git-add--interactive.perl:1453 +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453 #, c-format, perl-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:144 add-patch.c:187 git-add--interactive.perl:1454 +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454 #, c-format, perl-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:145 add-patch.c:188 git-add--interactive.perl:1455 +#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455 #, c-format, perl-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:150 +#: add-patch.c:151 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -518,27 +519,27 @@ 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:164 add-patch.c:207 git-add--interactive.perl:1458 +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458 #, c-format, perl-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:165 add-patch.c:208 git-add--interactive.perl:1459 +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459 #, c-format, perl-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:166 add-patch.c:209 git-add--interactive.perl:1460 +#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460 #, c-format, perl-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:171 +#: add-patch.c:172 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -552,7 +553,7 @@ 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:214 +#: add-patch.c:215 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -566,34 +567,34 @@ 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:318 +#: add-patch.c:319 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "impossible d'analyser l'entête de section '%.*s'" -#: add-patch.c:337 add-patch.c:341 +#: add-patch.c:338 add-patch.c:342 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "impossible d'analyser l'entête coloré de section '%.*s'" -#: add-patch.c:395 +#: add-patch.c:396 msgid "could not parse diff" msgstr "impossible d'analyser la diff" -#: add-patch.c:414 +#: add-patch.c:415 msgid "could not parse colored diff" msgstr "impossible d'analyser la diff colorée" -#: add-patch.c:428 +#: add-patch.c:429 #, c-format msgid "failed to run '%s'" msgstr "échec pour lancer '%s'" -#: add-patch.c:587 +#: add-patch.c:588 msgid "mismatched output from interactive.diffFilter" msgstr "sortie sans correspondance depuis interactive.diffFilter" -#: add-patch.c:588 +#: add-patch.c:589 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -601,7 +602,7 @@ msgstr "" "Votre filtre doit maintenir une correspondance un-pour-un\n" "entre les lignes en entrée et en sortie." -#: add-patch.c:761 +#: add-patch.c:762 #, c-format msgid "" "expected context line #%d in\n" @@ -610,7 +611,7 @@ msgstr "" "ligne de contexte attendue #%d dans\n" "%.*s" -#: add-patch.c:776 +#: add-patch.c:777 #, c-format msgid "" "hunks do not overlap:\n" @@ -623,12 +624,12 @@ msgstr "" "\tne se termine pas par :\n" "%.*s" -#: add-patch.c:1052 git-add--interactive.perl:1112 +#: add-patch.c:1053 git-add--interactive.perl:1112 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" "Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n" -#: add-patch.c:1056 +#: add-patch.c:1057 #, c-format msgid "" "---\n" @@ -642,7 +643,7 @@ msgstr "" "Les lignes commençant par %c seront éliminées.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1070 git-add--interactive.perl:1126 +#: add-patch.c:1071 git-add--interactive.perl:1126 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -652,11 +653,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:1103 +#: add-patch.c:1104 msgid "could not parse hunk header" msgstr "impossible d'analyser l'entête de section" -#: add-patch.c:1148 +#: add-patch.c:1149 msgid "'git apply --cached' failed" msgstr "'git apply --cached' a échoué" @@ -779,37 +780,44 @@ msgstr "Désolé, impossible d'éditer cette section" msgid "'git apply' failed" msgstr "'git apply' a échoué" -#: advice.c:115 +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "\nDésactivez ce message avec \"git config advice.%s false\"" + +#: advice.c:156 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sastuce: %.*s%s\n" -#: advice.c:168 +#: advice.c:247 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:170 +#: advice.c:249 msgid "Committing is not possible because you have unmerged files." msgstr "Impossible de valider car vous avez des fichiers non fusionnés." -#: advice.c:172 +#: advice.c:251 msgid "Merging is not possible because you have unmerged files." msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés." -#: advice.c:174 +#: advice.c:253 msgid "Pulling is not possible because you have unmerged files." msgstr "Impossible de tirer car vous avez des fichiers non fusionnés." -#: advice.c:176 +#: advice.c:255 msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés." -#: advice.c:178 +#: advice.c:257 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés." -#: advice.c:186 +#: advice.c:265 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -817,23 +825,23 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nécessaire pour marquer la résolution et valider." -#: advice.c:194 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:199 builtin/merge.c:1335 +#: advice.c:278 builtin/merge.c:1353 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: advice.c:201 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "Veuillez valider vos changements avant de fusionner." -#: advice.c:202 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "Abandon à cause d'une fusion non terminée." -#: advice.c:208 +#: advice.c:287 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -1135,7 +1143,7 @@ msgstr "le patch a échoué : %s:%ld" msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" @@ -1336,7 +1344,7 @@ msgstr[1] "Application du patch %%s avec %d rejets..." msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 +#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" @@ -1402,7 +1410,7 @@ msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4973 builtin/am.c:2260 +#: apply.c:4973 builtin/am.c:2259 msgid "num" msgstr "num" @@ -1460,7 +1468,7 @@ 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:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" @@ -1468,9 +1476,9 @@ msgstr "les chemins sont séparés par un caractère NUL" msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 +#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 +#: builtin/pack-objects.c:3458 builtin/rebase.c:1332 msgid "action" msgstr "action" @@ -1501,8 +1509,8 @@ msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" #: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774 +#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "mode verbeux" @@ -1516,7 +1524,7 @@ msgstr "" 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:5032 builtin/am.c:2248 +#: apply.c:5032 builtin/am.c:2247 msgid "root" msgstr "racine" @@ -1524,6 +1532,55 @@ msgstr "racine" msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" +#: archive-tar.c:125 archive-zip.c:351 +#, c-format +msgid "cannot stream blob %s" +msgstr "impossible de transmettre le blob %s en flux" + +#: archive-tar.c:266 archive-zip.c:369 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "mode de fichier non supporté :0%o (SHA1: %s)" + +#: archive-tar.c:293 archive-zip.c:359 +#, c-format +msgid "cannot read %s" +msgstr "impossible de lire %s" + +#: archive-tar.c:465 +#, c-format +msgid "unable to start '%s' filter" +msgstr "impossible de démarrer le filtre '%s'" + +#: archive-tar.c:468 +msgid "unable to redirect descriptor" +msgstr "impossible de rediriger un descripteur" + +#: archive-tar.c:475 +#, c-format +msgid "'%s' filter reported error" +msgstr "le filtre '%s' a retourné une erreur" + +#: archive-zip.c:319 +#, 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:323 +#, 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:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235 +#, c-format +msgid "deflate error (%d)" +msgstr "erreur de compression (%d)" + +#: archive-zip.c:615 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]" @@ -1543,172 +1600,123 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" -#: archive.c:396 +#: archive.c:401 #, c-format msgid "no such ref: %.*s" msgstr "référence inexistante : %.*s" -#: archive.c:401 +#: archive.c:407 #, c-format msgid "not a valid object name: %s" msgstr "nom d'objet invalide : %s" -#: archive.c:414 +#: archive.c:420 #, c-format msgid "not a tree object: %s" msgstr "objet arbre invalide : %s" -#: archive.c:426 +#: archive.c:432 msgid "current working directory is untracked" msgstr "l'arbre de travail actuel est non-suivi" -#: archive.c:457 +#: archive.c:464 msgid "fmt" msgstr "fmt" -#: archive.c:457 +#: archive.c:464 msgid "archive format" msgstr "format d'archive" -#: archive.c:458 builtin/log.c:1653 +#: archive.c:465 builtin/log.c:1674 msgid "prefix" msgstr "préfixe" -#: archive.c:459 +#: archive.c:466 msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 +#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 #: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907 +#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 #: parse-options.h:190 msgid "file" msgstr "fichier" -#: archive.c:461 builtin/archive.c:90 +#: archive.c:468 builtin/archive.c:90 msgid "write the archive to this file" msgstr "écrire l'archive dans ce fichier" -#: archive.c:463 +#: archive.c:470 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le répertoire de travail" -#: archive.c:464 +#: archive.c:471 msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" -#: archive.c:465 +#: archive.c:472 msgid "store only" msgstr "stockage seulement" -#: archive.c:466 +#: archive.c:473 msgid "compress faster" msgstr "compression rapide" -#: archive.c:474 +#: archive.c:481 msgid "compress better" msgstr "compression efficace" -#: archive.c:477 +#: archive.c:484 msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 #: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 msgid "repo" msgstr "dépôt" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:487 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "récupérer l'archive depuis le dépôt distant <dépôt>" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "commande" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:489 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" -#: archive.c:489 +#: archive.c:496 msgid "Unexpected option --remote" msgstr "Option --remote inattendue" -#: archive.c:491 +#: archive.c:498 msgid "Option --exec can only be used together with --remote" msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote" -#: archive.c:493 +#: archive.c:500 msgid "Unexpected option --output" msgstr "Option --output inattendue" -#: archive.c:515 +#: archive.c:522 #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'archive inconnu '%s'" -#: archive.c:522 +#: archive.c:529 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argument non supporté pour le format '%s' : -%d" -#: archive-tar.c:125 archive-zip.c:351 -#, c-format -msgid "cannot stream blob %s" -msgstr "impossible de transmettre le blob %s en flux" - -#: archive-tar.c:266 archive-zip.c:369 -#, c-format -msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "mode de fichier non supporté :0%o (SHA1: %s)" - -#: archive-tar.c:293 archive-zip.c:359 -#, c-format -msgid "cannot read %s" -msgstr "impossible de lire %s" - -#: archive-tar.c:465 -#, c-format -msgid "unable to start '%s' filter" -msgstr "impossible de démarrer le filtre '%s'" - -#: archive-tar.c:468 -msgid "unable to redirect descriptor" -msgstr "impossible de rediriger un descripteur" - -#: archive-tar.c:475 -#, c-format -msgid "'%s' filter reported error" -msgstr "le filtre '%s' a retourné une erreur" - -#: archive-zip.c:319 -#, 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:323 -#, 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:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 -#, c-format -msgid "deflate error (%d)" -msgstr "erreur de compression (%d)" - -#: archive-zip.c:615 -#, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>" - #: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" @@ -1802,12 +1810,12 @@ msgstr "Bissection : une base de fusion doit être testée\n" msgid "a %s revision is needed" msgstr "une révision %s est nécessaire" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" -#: bisect.c:966 builtin/merge.c:149 +#: bisect.c:966 builtin/merge.c:151 #, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" @@ -1847,41 +1855,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bissection : %d révision à tester après ceci %s\n" msgstr[1] "Bissection : %d révisions à tester après ceci %s\n" -#: blame.c:2700 +#: blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "--contents et --reverse ne font pas bon ménage." -#: blame.c:2714 +#: blame.c:2791 msgid "cannot use --contents with final commit object name" msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final" -#: blame.c:2735 +#: blame.c:2812 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:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 +#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 +#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405 +#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235 +#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" -#: blame.c:2762 +#: blame.c:2839 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:2773 +#: blame.c:2850 #, c-format msgid "no such path %s in %s" msgstr "pas de chemin %s dans %s" -#: blame.c:2784 +#: blame.c:2861 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossible de lire le blob %s pour le chemin %s" @@ -2024,12 +2032,12 @@ msgstr "Nom d'objet ambigu : '%s'." msgid "Not a valid branch point: '%s'." msgstr "Point d'embranchement invalide : '%s'." -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' est déjà extrait dans '%s'" -#: branch.c:387 +#: branch.c:388 #, 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" @@ -2044,8 +2052,8 @@ msgstr "'%s' ne semble pas être un fichier bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 -#: builtin/commit.c:815 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -2097,7 +2105,7 @@ msgstr "rev-list a disparu" msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 +#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" @@ -2120,318 +2128,271 @@ msgstr "l'index de groupe a disparu" msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 -#, c-format -msgid "could not parse %s" -msgstr "impossible d'analyser %s" - -#: commit.c:53 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s n'est pas un commit !" - -#: commit.c:193 -msgid "" -"Support for <GIT_DIR>/info/grafts is deprecated\n" -"and will be removed in a future Git version.\n" -"\n" -"Please use \"git replace --convert-graft-file\"\n" -"to convert the grafts into replace refs.\n" -"\n" -"Turn this message off by running\n" -"\"git config advice.graftFileDeprecated false\"" -msgstr "" -"Le support de <GIT_DIR>/info/grafts est déconseillé\n" -"et sera supprimé dans une version future de Git.\n" -"\n" -"Veuillez utiliser \"git replace --convert-graft-file\"\n" -"pour convertir les grafts en référence de remplacement.\n" -"\n" -"Supprimez ce message en lançant\n" -"\"git config advice.graftFileDeprecated false\"" - -#: commit.c:1153 -#, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "La validation %s a une signature GPG non fiable, prétendument par %s." - -#: commit.c:1157 -#, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "La validation %s a une mauvaise signature GPG prétendument par %s." - -#: commit.c:1160 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "La validation %s n'a pas de signature GPG." - -#: commit.c:1163 -#, c-format -msgid "Commit %s has a good GPG signature by %s\n" -msgstr "La validation %s a une signature GPG correcte par %s\n" - -#: commit.c:1417 -msgid "" -"Warning: commit message did not conform to UTF-8.\n" -"You may want to amend it after fixing the message, or set the config\n" -"variable i18n.commitencoding to the encoding your project uses.\n" -msgstr "" -"Avertissement : le message de validation ne se conforme pas à UTF-8.\n" -"Vous souhaitez peut-être le modifier après correction du message ou régler " -"la\n" -"variable de configuration i18n.commitencoding à l'encodage utilisé par votre " -"projet.\n" - -#: commit-graph.c:122 +#: commit-graph.c:183 msgid "commit-graph file is too small" msgstr "le graphe de commit est trop petit" -#: commit-graph.c:189 +#: commit-graph.c:248 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" "la signature du graphe de commit %X ne correspond pas à la signature %X" -#: commit-graph.c:196 +#: commit-graph.c:255 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "la version %X du graphe de commit ne correspond pas à la version %X" -#: commit-graph.c:203 +#: commit-graph.c:262 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" "l'empreinte de la version %X du graphe de commit ne correspond pas à la " "version %X" -#: commit-graph.c:226 +#: commit-graph.c:284 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "entrée de table de consultation de morceaux de graphe de commite manquante ; " "le fichier est peut être incomplet" -#: commit-graph.c:237 +#: commit-graph.c:294 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "décalage de bloc %08x%08x du graphe de commit inadéquat" -#: commit-graph.c:280 +#: commit-graph.c:362 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "l'id de bloc de graphe de commit %08x apparaît des multiples fois" -#: commit-graph.c:343 +#: commit-graph.c:436 msgid "commit-graph has no base graphs chunk" msgstr "le graphe de commit n'a pas de section de graphes de base" -#: commit-graph.c:353 +#: commit-graph.c:446 msgid "commit-graph chain does not match" msgstr "la chaîne de graphe de commit ne correspond pas" -#: commit-graph.c:401 +#: commit-graph.c:494 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" "chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte" -#: commit-graph.c:425 +#: commit-graph.c:518 msgid "unable to find all commit-graph files" msgstr "impossible de trouver tous les fichiers du graphe de commit" -#: commit-graph.c:558 commit-graph.c:618 +#: commit-graph.c:651 commit-graph.c:711 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "position de commit invalide. Le graphe de commit est vraisemblablement " "corrompu" -#: commit-graph.c:579 +#: commit-graph.c:672 #, c-format msgid "could not find commit %s" msgstr "impossible de trouver le commit %s" -#: commit-graph.c:852 builtin/am.c:1292 +#: commit-graph.c:948 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" -#: commit-graph.c:1011 builtin/pack-objects.c:2782 +#: commit-graph.c:1096 +msgid "Writing changed paths Bloom filters index" +msgstr "Écriture de l'index des filtres Bloom des chemins modifiés" + +#: commit-graph.c:1121 +msgid "Writing changed paths Bloom filters data" +msgstr "Écriture des données des filtres Bloom des chemins modifiés" + +#: commit-graph.c:1160 builtin/pack-objects.c:2783 #, c-format msgid "unable to get type of object %s" msgstr "impossible d'obtenir le type de l'objet %s" -#: commit-graph.c:1043 +#: commit-graph.c:1196 msgid "Loading known commits in commit graph" msgstr "Lecture des commits connus dans un graphe de commit" -#: commit-graph.c:1060 +#: commit-graph.c:1213 msgid "Expanding reachable commits in commit graph" msgstr "Expansion des commits joignables dans un graphe de commit" -#: commit-graph.c:1079 +#: commit-graph.c:1233 msgid "Clearing commit marks in commit graph" msgstr "Suppression les marques de commit dans le graphe de commits" -#: commit-graph.c:1098 +#: commit-graph.c:1252 msgid "Computing commit graph generation numbers" msgstr "Calcul des chiffres de génération du graphe de commits" -#: commit-graph.c:1173 +#: commit-graph.c:1300 +msgid "Computing commit changed paths Bloom filters" +msgstr "Calcul des filtres Bloom des chemins modifiés du commit" + +#: commit-graph.c:1359 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet" msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets" -#: commit-graph.c:1186 +#: commit-graph.c:1372 #, c-format msgid "error adding pack %s" msgstr "erreur à l'ajout du packet %s" -#: commit-graph.c:1190 +#: commit-graph.c:1376 #, c-format msgid "error opening index for %s" msgstr "erreur à l'ouverture de l'index pour %s" -#: commit-graph.c:1214 +#: commit-graph.c:1405 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Recherche de commits pour un graphe de commits depuis %d réf" msgstr[1] "Recherche de commits pour un graphe de commits depuis %d réfs" -#: commit-graph.c:1234 +#: commit-graph.c:1426 #, c-format msgid "invalid commit object id: %s" msgstr "identifiant d'objet commit invalide : %s" -#: commit-graph.c:1249 +#: commit-graph.c:1442 msgid "Finding commits for commit graph among packed objects" msgstr "" "Recherche de commits pour un graphe de commits parmi les objets empaquetés" -#: commit-graph.c:1264 +#: commit-graph.c:1457 msgid "Counting distinct commits in commit graph" msgstr "Comptage des commits distincts dans un graphe de commit" -#: commit-graph.c:1294 +#: commit-graph.c:1489 msgid "Finding extra edges in commit graph" msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits" -#: commit-graph.c:1340 +#: commit-graph.c:1538 msgid "failed to write correct number of base graph ids" msgstr "échec à l'écriture le nombre correct d'id de base de fusion" -#: commit-graph.c:1373 midx.c:814 +#: commit-graph.c:1572 midx.c:812 #, c-format msgid "unable to create leading directories of %s" msgstr "impossible de créer les répertoires de premier niveau de %s" -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1585 +msgid "unable to create temporary graph layer" +msgstr "impossible de créer une couche de graphe temporaire" + +#: commit-graph.c:1590 #, c-format -msgid "unable to create '%s'" -msgstr "impossible de créer '%s'" +msgid "unable to adjust shared permissions for '%s'" +msgstr "impossible de régler les droits partagés pour '%s'" -#: commit-graph.c:1445 +#: commit-graph.c:1667 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Écriture le graphe de commits en %d passe" msgstr[1] "Écriture le graphe de commits en %d passes" -#: commit-graph.c:1486 +#: commit-graph.c:1712 msgid "unable to open commit-graph chain file" msgstr "impossible d'ouvrir le fichier de graphe de commit" -#: commit-graph.c:1498 +#: commit-graph.c:1728 msgid "failed to rename base commit-graph file" msgstr "échec du renommage du fichier de graphe de commits" -#: commit-graph.c:1518 +#: commit-graph.c:1748 msgid "failed to rename temporary commit-graph file" msgstr "impossible de renommer le fichier temporaire de graphe de commits" -#: commit-graph.c:1631 +#: commit-graph.c:1874 msgid "Scanning merged commits" msgstr "Analyse des commits de fusion" -#: commit-graph.c:1642 +#: commit-graph.c:1885 #, c-format msgid "unexpected duplicate commit id %s" msgstr "id de commit %s dupliqué inattendu" -#: commit-graph.c:1665 +#: commit-graph.c:1908 msgid "Merging commit-graph" msgstr "fusion du graphe de commits" -#: commit-graph.c:1844 +#: commit-graph.c:2096 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "le graphe de commits ne peut pas écrire %d commits" -#: commit-graph.c:1855 +#: commit-graph.c:2107 msgid "too many commits to write graph" msgstr "trop de commits pour écrire un graphe" -#: commit-graph.c:1944 +#: commit-graph.c:2200 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "le graphe de commit a une somme de contrôle incorrecte et est " "vraisemblablement corrompu" -#: commit-graph.c:1954 +#: commit-graph.c:2210 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s" -#: commit-graph.c:1964 commit-graph.c:1979 +#: commit-graph.c:2220 commit-graph.c:2235 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = " "%u != %u" -#: commit-graph.c:1971 +#: commit-graph.c:2227 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "échec de l'analyse le commit %s depuis le graphe de commits" -#: commit-graph.c:1989 +#: commit-graph.c:2245 msgid "Verifying commits in commit graph" msgstr "Verification des commits dans le graphe de commits" -#: commit-graph.c:2003 +#: commit-graph.c:2259 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "échec de l'analyse du commit %s depuis la base de données d'objets pour le " "graphe de commit" -#: commit-graph.c:2010 +#: commit-graph.c:2266 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != " "%s" -#: commit-graph.c:2020 +#: commit-graph.c:2276 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" "la liste des parents du graphe de commit pour le commit %s est trop longue" -#: commit-graph.c:2029 +#: commit-graph.c:2285 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "le parent du graphe de commit pour %s est %s != %s" -#: commit-graph.c:2042 +#: commit-graph.c:2298 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "la liste de parents du graphe de commit pour le commit %s se termine trop tôt" -#: commit-graph.c:2047 +#: commit-graph.c:2303 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2439,7 +2400,7 @@ msgstr "" "le graphe de commit a un numéro de génération nul pour le commit %s, mais " "non-nul ailleurs" -#: commit-graph.c:2051 +#: commit-graph.c:2307 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2447,23 +2408,86 @@ msgstr "" "le graphe de commit a un numéro de génération non-nul pour le commit %s, " "mais nul ailleurs" -#: commit-graph.c:2066 +#: commit-graph.c:2322 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "la génération du graphe de commit pour le commit %s est %u != %u" -#: commit-graph.c:2072 +#: commit-graph.c:2328 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "la date de validation pour le commit %s dans le graphe de commit est " "%<PRIuMAX> != %<PRIuMAX>" +#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "impossible d'analyser %s" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s n'est pas un commit !" + +#: commit.c:194 +msgid "" +"Support for <GIT_DIR>/info/grafts is deprecated\n" +"and will be removed in a future Git version.\n" +"\n" +"Please use \"git replace --convert-graft-file\"\n" +"to convert the grafts into replace refs.\n" +"\n" +"Turn this message off by running\n" +"\"git config advice.graftFileDeprecated false\"" +msgstr "" +"Le support de <GIT_DIR>/info/grafts est déconseillé\n" +"et sera supprimé dans une version future de Git.\n" +"\n" +"Veuillez utiliser \"git replace --convert-graft-file\"\n" +"pour convertir les grafts en référence de remplacement.\n" +"\n" +"Supprimez ce message en lançant\n" +"\"git config advice.graftFileDeprecated false\"" + +#: commit.c:1168 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "La validation %s a une signature GPG non fiable, prétendument par %s." + +#: commit.c:1172 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "La validation %s a une mauvaise signature GPG prétendument par %s." + +#: commit.c:1175 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "La validation %s n'a pas de signature GPG." + +#: commit.c:1178 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "La validation %s a une signature GPG correcte par %s\n" + +#: commit.c:1432 +msgid "" +"Warning: commit message did not conform to UTF-8.\n" +"You may want to amend it after fixing the message, or set the config\n" +"variable i18n.commitencoding to the encoding your project uses.\n" +msgstr "" +"Avertissement : le message de validation ne se conforme pas à UTF-8.\n" +"Vous souhaitez peut-être le modifier après correction du message ou régler " +"la\n" +"variable de configuration i18n.commitencoding à l'encodage utilisé par votre " +"projet.\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "plus de mémoire" -#: config.c:124 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2478,306 +2502,306 @@ msgstr "" "\t%s\n" "possibilité d'inclusions multiples." -#: config.c:140 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "expansion impossible du chemin d'inclusion '%s'" -#: config.c:151 +#: config.c:152 msgid "relative config includes must come from files" msgstr "les inclusions de configuration relatives doivent venir de fichiers" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "" "les conditions d'inclusion de configuration relative doivent venir de " "fichiers" -#: config.c:376 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "la clé ne contient pas de section: %s" -#: config.c:382 +#: config.c:384 #, c-format msgid "key does not contain variable name: %s" msgstr "la clé ne contient pas de nom de variable : %s" -#: config.c:406 sequencer.c:2444 +#: config.c:408 sequencer.c:2456 #, c-format msgid "invalid key: %s" msgstr "clé invalide : %s" -#: config.c:412 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" msgstr "clé invalide (retour chariot) : %s" -#: config.c:448 config.c:460 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "paramètre de configuration mal formé: %s" -#: config.c:495 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "formatage mal formé dans %s" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "ligne %d de config incorrecte dans le blob %s" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "ligne %d de config incorrecte dans le fichier %s" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "ligne %d de config incorrecte dans l'entrée standard" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ligne %d de config incorrecte dans le blob de sous-module %s" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "ligne %d de config incorrecte dans la ligne de commande %s" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "ligne %d de config incorrecte dans %s" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "hors plage" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "unité invalide" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" -#: config.c:998 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob " "%s : %s" -#: config.c:1001 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier " "%s : %s" -#: config.c:1004 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée " "standard : %s" -#: config.c:1007 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de " "sous-module %s : %s" -#: config.c:1010 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de " "commande %s : %s" -#: config.c:1013 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" -#: config.c:1108 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' pour '%s' n'est pas un horodatage valide" -#: config.c:1208 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" msgstr "longueur d'abbrev hors plage : %d" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:1325 +#: config.c:1340 msgid "core.commentChar should only be one character" msgstr "core.commentChar ne devrait être qu'un unique caractère" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1430 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "valeur mal formée pour %s" -#: config.c:1456 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "valeur mal formée pour %s : %s" -#: config.c:1457 +#: config.c:1472 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "doit être parmi nothing, matching, simple, upstream ou current" -#: config.c:1518 builtin/pack-objects.c:3541 +#: config.c:1533 builtin/pack-objects.c:3542 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" -#: config.c:1639 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "impossible de charger l'objet blob de config '%s'" -#: config.c:1642 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "la référence '%s' ne pointe pas sur un blob" -#: config.c:1659 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "impossible de résoudre le blob de config '%s'" -#: config.c:1689 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "échec de l'analyse de %s" -#: config.c:1743 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:2097 +#: config.c:2113 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:2267 +#: config.c:2283 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: config.c:2312 +#: config.c:2328 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et " "100" -#: config.c:2358 +#: config.c:2374 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "impossible d'analyser '%s' depuis le configuration en ligne de commande" -#: config.c:2360 +#: config.c:2376 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" -#: config.c:2441 +#: config.c:2457 #, c-format msgid "invalid section name '%s'" msgstr "nom de section invalide '%s'" -#: config.c:2473 +#: config.c:2489 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2502 +#: config.c:2518 #, c-format msgid "failed to write new configuration file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2754 config.c:3078 +#: config.c:2770 config.c:3094 #, c-format msgid "could not lock config file %s" msgstr "impossible de verrouiller le fichier de configuration %s" -#: config.c:2765 +#: config.c:2781 #, c-format msgid "opening %s" msgstr "ouverture de %s" -#: config.c:2800 builtin/config.c:344 +#: config.c:2816 builtin/config.c:344 #, c-format msgid "invalid pattern: %s" msgstr "motif invalide : %s" -#: config.c:2825 +#: config.c:2841 #, c-format msgid "invalid config file %s" msgstr "fichier de configuration invalide %s" -#: config.c:2838 config.c:3091 +#: config.c:2854 config.c:3107 #, c-format msgid "fstat on %s failed" msgstr "échec de fstat sur %s" -#: config.c:2849 +#: config.c:2865 #, c-format msgid "unable to mmap '%s'" msgstr "impossible de réaliser un map de '%s'" -#: config.c:2858 config.c:3096 +#: config.c:2874 config.c:3112 #, c-format msgid "chmod on %s failed" msgstr "échec de chmod sur %s" -#: config.c:2943 config.c:3193 +#: config.c:2959 config.c:3209 #, c-format msgid "could not write config file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2977 +#: config.c:2993 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" -#: config.c:3069 +#: config.c:3085 #, c-format msgid "invalid section name: %s" msgstr "nom de section invalide : %s" -#: config.c:3236 +#: config.c:3252 #, c-format msgid "missing value for '%s'" msgstr "valeur manquante pour '%s'" @@ -2943,19 +2967,19 @@ msgstr "chemin étrange '%s' bloqué" msgid "unable to fork" msgstr "fork impossible" -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Vérification de la connectivité" -#: connected.c:110 +#: connected.c:119 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" -#: connected.c:130 +#: connected.c:139 msgid "failed write to rev-list" msgstr "impossible d'écrire dans la rev-list" -#: connected.c:137 +#: connected.c:146 msgid "failed to close rev-list's stdin" msgstr "impossible de fermer l'entrée standard du rev-list" @@ -3058,15 +3082,15 @@ msgstr "la lecture depuis le filtre externe '%s' a échoué" msgid "external filter '%s' failed" msgstr "le filtre externe '%s' a échoué" -#: convert.c:839 +#: convert.c:840 msgid "unexpected filter type" msgstr "type de filtre inattendu" -#: convert.c:850 +#: convert.c:851 msgid "path name too long for external filter" msgstr "nom de chemin trop long pour un filtre externe" -#: convert.c:924 +#: convert.c:943 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3075,20 +3099,48 @@ msgstr "" "le filtre externe '%s' n'est plus disponible bien que tous les chemins " "n'aient pas été filtrés" -#: convert.c:1223 +#: convert.c:1243 msgid "true/false are no valid working-tree-encodings" msgstr "true/false ne sont pas des encodages d'arbre de travail valides" -#: convert.c:1411 convert.c:1445 +#: convert.c:1431 convert.c:1465 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s : le filtre clean '%s' a échoué" -#: convert.c:1489 +#: convert.c:1511 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s : le filtre smudge '%s' a échoué" +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "vérification des informations d'identification sautée pour la clé : credential.%s" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "refus de travailler avec un champ host manquant dans l'identification" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "refus de travailler avec un champ protocol manquant dans l'identification" + +#: credential.c:396 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "L'url contient un retour chariot dans composant %s : %s" + +#: credential.c:440 +#, c-format +msgid "url has no scheme: %s" +msgstr "l'url n'a pas de schéma : %s" + +#: credential.c:513 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "impossible d'analyser l'url d'identification : %s" + #: date.c:138 msgid "in the future" msgstr "dans le futur" @@ -3183,15 +3235,6 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "Marquage de %d îlots, fait.\n" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "impossible de lire le fichier de commande '%s'" - -#: diffcore-rename.c:543 -msgid "Performing inexact rename detection" -msgstr "Détection de renommage inexact en cours" - #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<options>] <chemin> <chemin>" @@ -3256,35 +3299,35 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:4202 +#: diff.c:4238 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:4547 +#: diff.c:4583 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:4550 +#: diff.c:4586 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S et --find-object sont mutuellement exclusifs" -#: diff.c:4628 +#: diff.c:4664 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:4676 +#: diff.c:4712 #, c-format msgid "invalid --stat value: %s" msgstr "valeur invalide de --stat : %s" -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 +#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245 #: parse-options.c:197 parse-options.c:201 #, c-format msgid "%s expects a numerical value" msgstr "%s attend une valeur numérique" -#: diff.c:4713 +#: diff.c:4749 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3293,42 +3336,42 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4798 +#: diff.c:4834 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s" -#: diff.c:4822 +#: diff.c:4858 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valeur inconnue après ws-error-highlight=%.*s" -#: diff.c:4836 +#: diff.c:4872 #, c-format msgid "unable to resolve '%s'" msgstr "impossible de résoudre '%s'" -#: diff.c:4886 diff.c:4892 +#: diff.c:4922 diff.c:4928 #, c-format msgid "%s expects <n>/<m> form" msgstr "forme <n>/<m> attendue par %s" -#: diff.c:4904 +#: diff.c:4940 #, c-format msgid "%s expects a character, got '%s'" msgstr "caractère attendu par %s, '%s' trouvé" -#: diff.c:4925 +#: diff.c:4961 #, c-format msgid "bad --color-moved argument: %s" msgstr "mauvais argument --color-moved : %s" -#: diff.c:4944 +#: diff.c:4980 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode invalide '%s' dans --color-moved-ws" -#: diff.c:4984 +#: diff.c:5020 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3336,155 +3379,155 @@ msgstr "" "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " "\"histogram\"" -#: diff.c:5020 diff.c:5040 +#: diff.c:5056 diff.c:5076 #, c-format msgid "invalid argument to %s" msgstr "argument invalide pour %s" -#: diff.c:5178 +#: diff.c:5214 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'" -#: diff.c:5234 +#: diff.c:5270 #, c-format msgid "bad --word-diff argument: %s" msgstr "mauvais argument pour --word-diff : %s" -#: diff.c:5257 +#: diff.c:5293 msgid "Diff output format options" msgstr "Options de format de sortie de diff" -#: diff.c:5259 diff.c:5265 +#: diff.c:5295 diff.c:5301 msgid "generate patch" msgstr "générer la rustine" -#: diff.c:5262 builtin/log.c:173 +#: diff.c:5298 builtin/log.c:177 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: diff.c:5267 diff.c:5381 diff.c:5388 +#: diff.c:5303 diff.c:5417 diff.c:5424 msgid "<n>" msgstr "<n>" -#: diff.c:5268 diff.c:5271 +#: diff.c:5304 diff.c:5307 msgid "generate diffs with <n> lines context" msgstr "générer les diffs avec <n> lignes de contexte" -#: diff.c:5273 +#: diff.c:5309 msgid "generate the diff in raw format" msgstr "générer le diff en format brut" -#: diff.c:5276 +#: diff.c:5312 msgid "synonym for '-p --raw'" msgstr "synonyme de '-p --raw'" -#: diff.c:5280 +#: diff.c:5316 msgid "synonym for '-p --stat'" msgstr "synonyme de '-p --stat'" -#: diff.c:5284 +#: diff.c:5320 msgid "machine friendly --stat" msgstr "--stat pour traitement automatique" -#: diff.c:5287 +#: diff.c:5323 msgid "output only the last line of --stat" msgstr "afficher seulement la dernière ligne de --stat" -#: diff.c:5289 diff.c:5297 +#: diff.c:5325 diff.c:5333 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5290 +#: diff.c:5326 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "afficher la distribution des quantités de modifications relatives pour " "chaque sous-répertoire" -#: diff.c:5294 +#: diff.c:5330 msgid "synonym for --dirstat=cumulative" msgstr "synonyme pour --dirstat=cumulative" -#: diff.c:5298 +#: diff.c:5334 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonyme pour --dirstat=files,param1,param2..." -#: diff.c:5302 +#: diff.c:5338 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "avertir si les modifications introduisent des marqueurs de conflit ou des " "erreurs d'espace" -#: diff.c:5305 +#: diff.c:5341 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "résumé succinct tel que les créations, les renommages et les modifications " "de mode" -#: diff.c:5308 +#: diff.c:5344 msgid "show only names of changed files" msgstr "n'afficher que les noms de fichiers modifiés" -#: diff.c:5311 +#: diff.c:5347 msgid "show only names and status of changed files" msgstr "n'afficher que les noms et les status des fichiers modifiés" -#: diff.c:5313 +#: diff.c:5349 msgid "<width>[,<name-width>[,<count>]]" msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]" -#: diff.c:5314 +#: diff.c:5350 msgid "generate diffstat" msgstr "générer un diffstat" -#: diff.c:5316 diff.c:5319 diff.c:5322 +#: diff.c:5352 diff.c:5355 diff.c:5358 msgid "<width>" msgstr "<largeur>" -#: diff.c:5317 +#: diff.c:5353 msgid "generate diffstat with a given width" msgstr "générer un diffstat avec la largeur indiquée" -#: diff.c:5320 +#: diff.c:5356 msgid "generate diffstat with a given name width" msgstr "génerer un diffstat avec la largeur de nom indiquée" -#: diff.c:5323 +#: diff.c:5359 msgid "generate diffstat with a given graph width" msgstr "génerer un diffstat avec la largeur de graphe indiquée" -#: diff.c:5325 +#: diff.c:5361 msgid "<count>" msgstr "<compte>" -#: diff.c:5326 +#: diff.c:5362 msgid "generate diffstat with limited lines" msgstr "générer un diffstat avec des lignes limitées" -#: diff.c:5329 +#: diff.c:5365 msgid "generate compact summary in diffstat" msgstr "générer une résumé compact dans le diffstat" -#: diff.c:5332 +#: diff.c:5368 msgid "output a binary diff that can be applied" msgstr "produire un diff binaire qui peut être appliqué" -#: diff.c:5335 +#: diff.c:5371 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "afficher les noms complets des objets pre- et post-image sur les lignes " "\"index\"" -#: diff.c:5337 +#: diff.c:5373 msgid "show colored diff" msgstr "afficher un diff coloré" -#: diff.c:5338 +#: diff.c:5374 msgid "<kind>" msgstr "<sorte>" -#: diff.c:5339 +#: diff.c:5375 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3492,7 +3535,7 @@ msgstr "" "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', " "'nouveau' dans le diff" -#: diff.c:5342 +#: diff.c:5378 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3500,93 +3543,93 @@ msgstr "" "ne pas compresser les chemins et utiliser des NULs comme terminateurs de " "champs dans --raw ou --numstat" -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493 msgid "<prefix>" msgstr "<préfixe>" -#: diff.c:5346 +#: diff.c:5382 msgid "show the given source prefix instead of \"a/\"" msgstr "afficher le préfixe de source indiqué au lieu de \"a/\"" -#: diff.c:5349 +#: diff.c:5385 msgid "show the given destination prefix instead of \"b/\"" msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\"" -#: diff.c:5352 +#: diff.c:5388 msgid "prepend an additional prefix to every line of output" msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée" -#: diff.c:5355 +#: diff.c:5391 msgid "do not show any source or destination prefix" msgstr "n'afficher aucun préfixe, ni de source, ni de destination" -#: diff.c:5358 +#: diff.c:5394 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "afficher le contexte entre les sections à concurrence du nombre de ligne " "indiqué" -#: diff.c:5362 diff.c:5367 diff.c:5372 +#: diff.c:5398 diff.c:5403 diff.c:5408 msgid "<char>" msgstr "<caractère>" -#: diff.c:5363 +#: diff.c:5399 msgid "specify the character to indicate a new line instead of '+'" msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'" -#: diff.c:5368 +#: diff.c:5404 msgid "specify the character to indicate an old line instead of '-'" msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'" -#: diff.c:5373 +#: diff.c:5409 msgid "specify the character to indicate a context instead of ' '" msgstr "" "spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '" -#: diff.c:5376 +#: diff.c:5412 msgid "Diff rename options" msgstr "Options de renommage de diff" -#: diff.c:5377 +#: diff.c:5413 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5378 +#: diff.c:5414 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "casser les modifications d'une réécrire complète en paires de suppression et " "création" -#: diff.c:5382 +#: diff.c:5418 msgid "detect renames" msgstr "détecter les renommages" -#: diff.c:5386 +#: diff.c:5422 msgid "omit the preimage for deletes" msgstr "supprimer la pré-image pour les suppressions" -#: diff.c:5389 +#: diff.c:5425 msgid "detect copies" msgstr "détecter les copies" -#: diff.c:5393 +#: diff.c:5429 msgid "use unmodified files as source to find copies" msgstr "" "utiliser les fichiers non-modifiés comme sources pour trouver des copies" -#: diff.c:5395 +#: diff.c:5431 msgid "disable rename detection" msgstr "désactiver la détection de renommage" -#: diff.c:5398 +#: diff.c:5434 msgid "use empty blobs as rename source" msgstr "utiliser des blobs vides comme source de renommage" -#: diff.c:5400 +#: diff.c:5436 msgid "continue listing the history of a file beyond renames" msgstr "continuer à afficher l'historique d'un fichier au delà des renommages" -#: diff.c:5403 +#: diff.c:5439 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3594,161 +3637,161 @@ msgstr "" "empêcher la détection de renommage/copie si le nombre de cibles de renommage/" "copie excède la limite indiquée" -#: diff.c:5405 +#: diff.c:5441 msgid "Diff algorithm options" msgstr "Options de l'algorithme de diff" -#: diff.c:5407 +#: diff.c:5443 msgid "produce the smallest possible diff" msgstr "produire le diff le plus petit possible" -#: diff.c:5410 +#: diff.c:5446 msgid "ignore whitespace when comparing lines" msgstr "ignorer les espaces lors de la comparaison de ligne" -#: diff.c:5413 +#: diff.c:5449 msgid "ignore changes in amount of whitespace" msgstr "ignorer des modifications du nombre d'espaces" -#: diff.c:5416 +#: diff.c:5452 msgid "ignore changes in whitespace at EOL" msgstr "ignorer des modifications d'espace en fin de ligne" -#: diff.c:5419 +#: diff.c:5455 msgid "ignore carrier-return at the end of line" msgstr "ignore le retour chariot en fin de ligne" -#: diff.c:5422 +#: diff.c:5458 msgid "ignore changes whose lines are all blank" msgstr "ignorer les modifications dont les lignes sont vides" -#: diff.c:5425 +#: diff.c:5461 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "heuristique qui déplace les limites de sections de diff pour faciliter la " "lecture" -#: diff.c:5428 +#: diff.c:5464 msgid "generate diff using the \"patience diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"patience\"" -#: diff.c:5432 +#: diff.c:5468 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" "générer un diff en utilisant l'algorithme de différence \"histogramme\"" -#: diff.c:5434 +#: diff.c:5470 msgid "<algorithm>" msgstr "<algorithme>" -#: diff.c:5435 +#: diff.c:5471 msgid "choose a diff algorithm" msgstr "choisir un algorithme de différence" -#: diff.c:5437 +#: diff.c:5473 msgid "<text>" msgstr "<texte>" -#: diff.c:5438 +#: diff.c:5474 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\"" -#: diff.c:5440 diff.c:5449 diff.c:5452 +#: diff.c:5476 diff.c:5485 diff.c:5488 msgid "<mode>" msgstr "<mode>" -#: diff.c:5441 +#: diff.c:5477 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "afficher des différences par mot, en utilisant <mode> pour délimiter les " "mots modifiés" -#: diff.c:5443 diff.c:5446 diff.c:5491 +#: diff.c:5479 diff.c:5482 diff.c:5527 msgid "<regex>" msgstr "<regex>" -#: diff.c:5444 +#: diff.c:5480 msgid "use <regex> to decide what a word is" msgstr "utiliser <regex> pour décider ce qu'est un mot" -#: diff.c:5447 +#: diff.c:5483 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5450 +#: diff.c:5486 msgid "moved lines of code are colored differently" msgstr "les lignes déplacées sont colorées différemment" -#: diff.c:5453 +#: diff.c:5489 msgid "how white spaces are ignored in --color-moved" msgstr "comment les espaces sont ignorés dans --color-moved" -#: diff.c:5456 +#: diff.c:5492 msgid "Other diff options" msgstr "Autres options diff" -#: diff.c:5458 +#: diff.c:5494 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "lancé depuis un sous-répertoire, exclure les modifications en dehors et " "afficher les chemins relatifs" -#: diff.c:5462 +#: diff.c:5498 msgid "treat all files as text" msgstr "traiter les fichiers comme texte" -#: diff.c:5464 +#: diff.c:5500 msgid "swap two inputs, reverse the diff" msgstr "échanger les entrées, inverser le diff" -#: diff.c:5466 +#: diff.c:5502 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon" -#: diff.c:5468 +#: diff.c:5504 msgid "disable all output of the program" msgstr "désactiver tous les affichages du programme" -#: diff.c:5470 +#: diff.c:5506 msgid "allow an external diff helper to be executed" msgstr "autoriser l'exécution d'un assistant externe de diff" -#: diff.c:5472 +#: diff.c:5508 msgid "run external text conversion filters when comparing binary files" msgstr "" "lancer les filtres externes de conversion en texte lors de la comparaison de " "fichiers binaires" -#: diff.c:5474 +#: diff.c:5510 msgid "<when>" msgstr "<quand>" -#: diff.c:5475 +#: diff.c:5511 msgid "ignore changes to submodules in the diff generation" msgstr "" "ignorer les modifications dans les sous-modules lors de la génération de diff" -#: diff.c:5478 +#: diff.c:5514 msgid "<format>" msgstr "<format>" -#: diff.c:5479 +#: diff.c:5515 msgid "specify how differences in submodules are shown" msgstr "spécifier comment les différences dans les sous-modules sont affichées" -#: diff.c:5483 +#: diff.c:5519 msgid "hide 'git add -N' entries from the index" msgstr "masquer les entrées 'git add -N' de l'index" -#: diff.c:5486 +#: diff.c:5522 msgid "treat 'git add -N' entries as real in the index" msgstr "traiter les entrées 'git add -N' comme réelles dans l'index" -#: diff.c:5488 +#: diff.c:5524 msgid "<string>" msgstr "<chaîne>" -#: diff.c:5489 +#: diff.c:5525 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3756,7 +3799,7 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la " "chaîne spécifiée" -#: diff.c:5492 +#: diff.c:5528 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3764,26 +3807,26 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la regex " "spécifiée" -#: diff.c:5495 +#: diff.c:5531 msgid "show all changes in the changeset with -S or -G" msgstr "" "afficher toutes les modifications dans l'ensemble de modifications avec -S " "ou -G" -#: diff.c:5498 +#: diff.c:5534 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue" -#: diff.c:5501 +#: diff.c:5537 msgid "control the order in which files appear in the output" msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie" -#: diff.c:5502 +#: diff.c:5538 msgid "<object-id>" msgstr "<id-objet>" -#: diff.c:5503 +#: diff.c:5539 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3791,35 +3834,35 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de l'objet " "indiqué" -#: diff.c:5505 +#: diff.c:5541 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5506 +#: diff.c:5542 msgid "select files by diff type" msgstr "sélectionner les fichiers par types de diff" -#: diff.c:5508 +#: diff.c:5544 msgid "<file>" msgstr "<fichier>" -#: diff.c:5509 +#: diff.c:5545 msgid "Output to a specific file" msgstr "Sortie vers un fichier spécifié" -#: diff.c:6164 +#: diff.c:6200 msgid "inexact rename detection was skipped due to too many files." msgstr "" "détection de renommage inexact annulée à cause d'un trop grand nombre de " "fichiers." -#: diff.c:6167 +#: diff.c:6203 msgid "only found copies from modified paths due to too many files." msgstr "" "recherche uniquement des copies par modification de chemin à cause d'un trop " "grand nombre de fichiers." -#: diff.c:6170 +#: diff.c:6206 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3827,6 +3870,15 @@ msgstr "" "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le " "commande." +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "impossible de lire le fichier de commande '%s'" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "Détection de renommage inexact en cours" + #: dir.c:555 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" @@ -3859,35 +3911,35 @@ msgstr "désactivation de la correspondance de motif de cone" msgid "cannot use %s as an exclude file" msgstr "impossible d'utiliser %s comme fichier d'exclusion" -#: dir.c:2144 +#: dir.c:2275 #, c-format msgid "could not open directory '%s'" msgstr "impossible d'ouvrir le répertoire '%s'" -#: dir.c:2479 +#: dir.c:2575 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2603 +#: dir.c:2699 msgid "untracked cache is disabled on this system or location" msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit" -#: dir.c:3407 +#: dir.c:3481 #, c-format msgid "index file corrupt in repo %s" msgstr "fichier d'index corrompu dans le dépôt %s" -#: dir.c:3452 dir.c:3457 +#: dir.c:3526 dir.c:3531 #, c-format msgid "could not create directories for %s" msgstr "impossible de créer les répertoires pour %s" -#: dir.c:3486 +#: dir.c:3560 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" @@ -3898,17 +3950,17 @@ msgstr "" msgid "Filtering content" msgstr "Filtrage du contenu" -#: entry.c:476 +#: entry.c:479 #, c-format msgid "could not stat file '%s'" msgstr "impossible de stat le fichier '%s'" -#: environment.c:149 +#: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "Espaces de nom de Git \"%s\"" -#: environment.c:331 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "impossible de régler GIT_DIR à '%s'" @@ -3918,245 +3970,245 @@ msgstr "impossible de régler GIT_DIR à '%s'" msgid "too many args to run %s" msgstr "trop d'arguments pour lancer %s" -#: fetch-pack.c:150 +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack : liste superficielle attendue" -#: fetch-pack.c:153 +#: fetch-pack.c:154 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" "git fetch-pack : paquet de vidage attendu après une liste superficielle" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu" -#: fetch-pack.c:195 +#: fetch-pack.c:196 msgid "unable to write to remote" msgstr "impossible d'écrire sur un distant" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc nécessite multi_ack_detailed" -#: fetch-pack.c:356 fetch-pack.c:1340 +#: fetch-pack.c:357 fetch-pack.c:1364 #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalide : %s" -#: fetch-pack.c:362 fetch-pack.c:1346 +#: fetch-pack.c:363 fetch-pack.c:1370 #, c-format msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" -#: fetch-pack.c:364 fetch-pack.c:1348 +#: fetch-pack.c:365 fetch-pack.c:1372 #, c-format msgid "object not found: %s" msgstr "objet non trouvé : %s" -#: fetch-pack.c:367 fetch-pack.c:1351 +#: fetch-pack.c:368 fetch-pack.c:1375 #, c-format msgid "error in object: %s" msgstr "Erreur dans l'objet : %s" -#: fetch-pack.c:369 fetch-pack.c:1353 +#: fetch-pack.c:370 fetch-pack.c:1377 #, c-format msgid "no shallow found: %s" msgstr "Pas de superficiel trouvé : %s" -#: fetch-pack.c:372 fetch-pack.c:1357 +#: fetch-pack.c:373 fetch-pack.c:1381 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "superficiel/non superficiel attendu, %s trouvé" -#: fetch-pack.c:414 +#: fetch-pack.c:415 #, c-format msgid "got %s %d %s" msgstr "réponse %s %d %s" -#: fetch-pack.c:431 +#: fetch-pack.c:432 #, c-format msgid "invalid commit %s" msgstr "commit invalide %s" -#: fetch-pack.c:462 +#: fetch-pack.c:463 msgid "giving up" msgstr "abandon" -#: fetch-pack.c:475 progress.c:323 +#: fetch-pack.c:476 progress.c:340 msgid "done" msgstr "fait" -#: fetch-pack.c:487 +#: fetch-pack.c:488 #, c-format msgid "got %s (%d) %s" msgstr "%s trouvé (%d) %s" -#: fetch-pack.c:533 +#: fetch-pack.c:534 #, c-format msgid "Marking %s as complete" msgstr "Marquage de %s comme terminé" -#: fetch-pack.c:754 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "%s déjà possédé (%s)" -#: fetch-pack.c:818 +#: fetch-pack.c:819 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral" -#: fetch-pack.c:826 +#: fetch-pack.c:827 msgid "protocol error: bad pack header" msgstr "erreur de protocole : mauvais entête de paquet" -#: fetch-pack.c:900 +#: fetch-pack.c:901 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack : impossible de dupliquer %s" -#: fetch-pack.c:916 +#: fetch-pack.c:917 #, c-format msgid "%s failed" msgstr "échec de %s" -#: fetch-pack.c:918 +#: fetch-pack.c:919 msgid "error in sideband demultiplexer" msgstr "erreur dans le démultiplexer latéral" -#: fetch-pack.c:965 +#: fetch-pack.c:966 #, c-format msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986 +#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002 +#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018 +#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040 #, c-format msgid "Server supports %s" msgstr "Le serveur supporte %s" -#: fetch-pack.c:972 +#: fetch-pack.c:973 msgid "Server does not support shallow clients" msgstr "Le serveur ne supporte les clients superficiels" -#: fetch-pack.c:1032 +#: fetch-pack.c:1033 msgid "Server does not support --shallow-since" msgstr "Le receveur ne gère pas --shallow-since" -#: fetch-pack.c:1037 +#: fetch-pack.c:1038 msgid "Server does not support --shallow-exclude" msgstr "Le receveur ne gère pas --shallow-exclude" -#: fetch-pack.c:1041 +#: fetch-pack.c:1042 msgid "Server does not support --deepen" msgstr "Le receveur ne gère pas --deepen" -#: fetch-pack.c:1058 +#: fetch-pack.c:1059 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:1070 fetch-pack.c:1536 +#: fetch-pack.c:1071 fetch-pack.c:1563 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." -#: fetch-pack.c:1209 +#: fetch-pack.c:1211 msgid "Server does not support shallow requests" msgstr "Le serveur ne supporte les requêtes superficielles" -#: fetch-pack.c:1216 +#: fetch-pack.c:1218 msgid "Server supports filter" msgstr "Le serveur supporte filter" -#: fetch-pack.c:1239 +#: fetch-pack.c:1242 msgid "unable to write request to remote" msgstr "impossible d'écrire la requête sur le distant" -#: fetch-pack.c:1257 +#: fetch-pack.c:1260 #, c-format msgid "error reading section header '%s'" msgstr "erreur à la lecture de l'entête de section '%s'" -#: fetch-pack.c:1263 +#: fetch-pack.c:1266 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' attendu, '%s' reçu" -#: fetch-pack.c:1303 +#: fetch-pack.c:1327 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "ligne d'acquittement inattendue : '%s'" -#: fetch-pack.c:1308 +#: fetch-pack.c:1332 #, c-format msgid "error processing acks: %d" msgstr "erreur lors du traitement des acquittements : %d" -#: fetch-pack.c:1318 +#: fetch-pack.c:1342 msgid "expected packfile to be sent after 'ready'" msgstr "fichier paquet attendu à envoyer après 'ready'" -#: fetch-pack.c:1320 +#: fetch-pack.c:1344 msgid "expected no other sections to be sent after no 'ready'" msgstr "aucune autre section attendue à envoyer après absence de 'ready'" -#: fetch-pack.c:1362 +#: fetch-pack.c:1386 #, c-format msgid "error processing shallow info: %d" msgstr "erreur lors du traitement de l'information de superficialité : %d" -#: fetch-pack.c:1409 +#: fetch-pack.c:1433 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref attendu, '%s' trouvé" -#: fetch-pack.c:1414 +#: fetch-pack.c:1438 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inattendu : '%s'" -#: fetch-pack.c:1419 +#: fetch-pack.c:1443 #, c-format msgid "error processing wanted refs: %d" msgstr "erreur lors du traitement des références voulues : %d" -#: fetch-pack.c:1762 +#: fetch-pack.c:1789 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1785 builtin/clone.c:689 +#: fetch-pack.c:1812 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: fetch-pack.c:1812 +#: fetch-pack.c:1839 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:1815 +#: fetch-pack.c:1842 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé" -#: gpg-interface.c:408 -msgid "gpg failed to sign the data" -msgstr "gpg n'a pas pu signer les données" - -#: gpg-interface.c:434 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "impossible de créer un fichier temporaire" -#: gpg-interface.c:437 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "impossible d'écrire la signature détachée dans '%s'" +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "gpg n'a pas pu signer les données" + #: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" @@ -4175,7 +4227,7 @@ msgstr "" msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" @@ -4252,7 +4304,7 @@ msgstr "commandes git disponibles depuis un autre endroit de votre $PATH" msgid "These are common Git commands used in various situations:" msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :" -#: help.c:363 git.c:98 +#: help.c:363 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "type de liste de commandes non supporté '%s'" @@ -4261,21 +4313,21 @@ msgstr "type de liste de commandes non supporté '%s'" msgid "The common Git guides are:" msgstr "Les guides Git populaires sont :" -#: help.c:512 +#: help.c:427 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "" "Référez-vous à 'git help <commande>' pour des informations sur une sous-" "commande spécifique" -#: help.c:517 +#: help.c:432 msgid "External commands" msgstr "Commandes externes" -#: help.c:532 +#: help.c:447 msgid "Command aliases" msgstr "Alias de commande" -#: help.c:596 +#: help.c:511 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4284,33 +4336,33 @@ msgstr "" "'%s' semble être une commande git, mais elle n'a pas pu\n" "être exécutée. Peut-être git-%s est-elle cassée ?" -#: help.c:655 +#: help.c:570 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ahem. Votre système n'indique aucune commande Git." -#: help.c:677 +#: help.c:592 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" "ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas." -#: help.c:682 +#: help.c:597 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Continuons en supposant que vous avez voulu dire '%s'." -#: help.c:687 +#: help.c:602 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" "Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'." -#: help.c:695 +#: help.c:610 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'." -#: help.c:699 +#: help.c:614 msgid "" "\n" "The most similar command is" @@ -4324,16 +4376,16 @@ msgstr[1] "" "\n" "Les commandes les plus ressemblantes sont" -#: help.c:714 +#: help.c:653 msgid "git version [<options>]" msgstr "git version [<options>]" -#: help.c:783 +#: help.c:708 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:787 +#: help.c:712 msgid "" "\n" "Did you mean this?" @@ -4401,38 +4453,11 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis" msgid "name consists only of disallowed characters: %s" msgstr "le nom n'est constitué que de caractères interdits : %s" -#: ident.c:436 builtin/commit.c:635 +#: ident.c:436 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" -#: list-objects.c:127 -#, c-format -msgid "entry '%s' in tree %s has tree mode, but is not a tree" -msgstr "" -"l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre" - -#: list-objects.c:140 -#, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" -msgstr "" -"l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob" - -#: list-objects.c:375 -#, c-format -msgid "unable to load root tree for commit %s" -msgstr "impossible de charger l'arbre racine pour le commit %s" - -#: list-objects-filter.c:492 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "impossible d'accéder au blob clairsemé dans '%s'" - -#: list-objects-filter.c:495 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s" - #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "attendu : 'tree:<profondeur>'" @@ -4460,7 +4485,34 @@ msgstr "quelque chose attendu après combine :" msgid "multiple filter-specs cannot be combined" msgstr "impossible de combiner des spécificateurs multiples de filtre" -#: lockfile.c:151 +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "impossible d'accéder au blob clairsemé dans '%s'" + +#: list-objects-filter.c:495 +#, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s" + +#: list-objects.c:127 +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" +msgstr "" +"l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre" + +#: list-objects.c:140 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "" +"l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob" + +#: list-objects.c:375 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "impossible de charger l'arbre racine pour le commit %s" + +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -4479,20 +4531,14 @@ msgstr "" "un processus git peut avoir planté :\n" "supprimez le fichier manuellement pour poursuivre." -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Impossible de créer '%s.lock' : %s" -#: merge.c:41 -msgid "failed to read the cache" -msgstr "impossible de lire le cache" - -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 -#: builtin/stash.c:265 -msgid "unable to write new index file" -msgstr "impossible d'écrire le nouveau fichier d'index" +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" +msgstr "vidage attendu après les arguments ls-refs" #: merge-recursive.c:356 msgid "(bad commit)\n" @@ -4805,7 +4851,7 @@ msgstr "ajout/ajout" msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:3089 git-submodule.sh:1003 +#: merge-recursive.c:3089 git-submodule.sh:985 msgid "submodule" msgstr "sous-module" @@ -4925,10 +4971,20 @@ msgstr "" msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 +#: merge-recursive.c:3774 builtin/merge.c:705 builtin/merge.c:885 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." +#: merge.c:41 +msgid "failed to read the cache" +msgstr "impossible de lire le cache" + +#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912 +#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "impossible d'écrire le nouveau fichier d'index" + #: midx.c:68 #, c-format msgid "multi-pack-index file %s is too small" @@ -4983,58 +5039,62 @@ msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'" -#: midx.c:210 +#: midx.c:208 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mauvais pack-int-id : %u (%u paquets au total)" -#: midx.c:260 +#: midx.c:258 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "multi-pack-index stock un décalage en 64-bit, mais off_t est trop petit" -#: midx.c:288 +#: midx.c:286 msgid "error preparing packfile from multi-pack-index" msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet" -#: midx.c:472 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "échec de l'ajout du fichier paquet '%s'" -#: midx.c:478 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "échec à l'ouverture du fichier paquet '%s'" -#: midx.c:538 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "échec de localisation de l'objet %d dans le fichier paquet" -#: midx.c:842 +#: midx.c:840 msgid "Adding packfiles to multi-pack-index" msgstr "Ajout de fichiers paquet à un index multi-paquet" -#: midx.c:875 +#: midx.c:873 #, c-format msgid "did not see pack-file %s to drop" msgstr "fichier paquet à éliminer %s non trouvé" -#: midx.c:973 +#: midx.c:925 +msgid "no pack files to index." +msgstr "Aucun fichier paquet à l'index." + +#: midx.c:977 msgid "Writing chunks to multi-pack-index" msgstr "Écriture des sections dans l'index multi-paquet" -#: midx.c:1052 +#: midx.c:1056 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "échec du nettoyage de l'index de multi-paquet à %s" -#: midx.c:1108 +#: midx.c:1112 msgid "Looking for referenced packfiles" msgstr "Recherche de fichiers paquets référencés" -#: midx.c:1123 +#: midx.c:1127 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -5042,51 +5102,55 @@ msgstr "" "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = " "étalement[%d]" -#: midx.c:1128 +#: midx.c:1132 +msgid "the midx contains no oid" +msgstr "le midx ne contient aucun oid" + +#: midx.c:1141 msgid "Verifying OID order in multi-pack-index" msgstr "Vérification de l'ordre des OID dans l'index multi-paquet" -#: midx.c:1137 +#: midx.c:1150 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1157 +#: midx.c:1170 msgid "Sorting objects by packfile" msgstr "Classement des objets par fichier paquet" -#: midx.c:1164 +#: midx.c:1177 msgid "Verifying object offsets" msgstr "Vérification des décalages des objets" -#: midx.c:1180 +#: midx.c:1193 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s" -#: midx.c:1186 +#: midx.c:1199 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "impossible de lire le fichier paquet %s" -#: midx.c:1195 +#: midx.c:1208 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>" -#: midx.c:1220 +#: midx.c:1233 msgid "Counting referenced objects" msgstr "Comptage des objets référencés" -#: midx.c:1230 +#: midx.c:1243 msgid "Finding and deleting unreferenced packfiles" msgstr "Recherche et effacement des fichiers paquets non-référencés" -#: midx.c:1388 +#: midx.c:1433 msgid "could not start pack-objects" msgstr "Impossible de démarrer le groupement d'objets" -#: midx.c:1407 +#: midx.c:1452 msgid "could not finish pack-objects" msgstr "Impossible de finir le groupement d'objets" @@ -5169,6 +5233,11 @@ msgstr "impossible d'analyser l'objet : %s" msgid "hash mismatch %s" msgstr "incohérence de hachage %s" +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135 +#, c-format +msgid "unable to get size of %s" +msgstr "impossible de récupérer la taille de %s" + #: packfile.c:629 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" @@ -5184,10 +5253,25 @@ msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)" -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 +#: parse-options-cb.c:20 parse-options-cb.c:24 #, c-format -msgid "unable to get size of %s" -msgstr "impossible de récupérer la taille de %s" +msgid "option `%s' expects a numerical value" +msgstr "l'option '%s' attend une valeur numérique" + +#: parse-options-cb.c:41 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "date d'expiration malformée : '%s'" + +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\"" + +#: parse-options-cb.c:130 parse-options-cb.c:147 +#, c-format +msgid "malformed object name '%s'" +msgstr "nom d'objet malformé '%s'" #: parse-options.c:38 #, c-format @@ -5229,26 +5313,31 @@ msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)" msgid "did you mean `--%s` (with two dashes)?" msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?" -#: parse-options.c:857 +#: parse-options.c:663 parse-options.c:963 +#, c-format +msgid "alias of --%s" +msgstr "alias pour --%s" + +#: parse-options.c:854 #, c-format msgid "unknown option `%s'" msgstr "option inconnue « %s »" -#: parse-options.c:859 +#: parse-options.c:856 #, c-format msgid "unknown switch `%c'" msgstr "bascule inconnue « %c »" -#: parse-options.c:861 +#: parse-options.c:858 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "option non-ascii inconnue dans la chaîne : '%s'" -#: parse-options.c:885 +#: parse-options.c:882 msgid "..." msgstr "..." -#: parse-options.c:904 +#: parse-options.c:901 #, c-format msgid "usage: %s" msgstr "usage : %s" @@ -5256,45 +5345,20 @@ msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:910 +#: parse-options.c:907 #, c-format msgid " or: %s" msgstr " ou : %s" -#: parse-options.c:913 +#: parse-options.c:910 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:952 +#: parse-options.c:949 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:966 -#, c-format -msgid "alias of --%s" -msgstr "alias pour --%s" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "l'option '%s' attend une valeur numérique" - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "date d'expiration malformée : '%s'" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\"" - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -msgid "malformed object name '%s'" -msgstr "nom d'objet malformé '%s'" - #: path.c:915 #, c-format msgid "Could not make %s writable by group" @@ -5357,29 +5421,29 @@ msgstr "Spécificateur magique '%c' non implémenté dans '%s'" msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s : 'literal' et 'glob' sont incompatibles" -#: pathspec.c:442 +#: pathspec.c:445 #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "%s : '%s' est hors du dépôt à '%s'" -#: pathspec.c:517 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (mnémonique : '%c')" -#: pathspec.c:527 +#: pathspec.c:531 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s : le spécificateur magique de chemin n'est pas supporté par cette " "commande : %s" -#: pathspec.c:594 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "le chemin '%s' est au-delà d'un lien symbolique" -#: pathspec.c:639 +#: pathspec.c:643 #, c-format msgid "line is badly quoted: %s" msgstr "la ligne est mal citée : %s" @@ -5446,7 +5510,7 @@ msgstr "Rafraîchissement de l'index" msgid "unable to create threaded lstat: %s" msgstr "impossible de créer le lstat en fil : %s" -#: pretty.c:981 +#: pretty.c:982 msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" @@ -5459,29 +5523,40 @@ msgstr "Dépôt distant sans URL" msgid "promisor remote name cannot begin with '/': %s" msgstr "un nom de prometteur distant ne peut pas commencer par '/' : %s" -#: range-diff.c:75 +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "Suppression des objets dupliqués" + +#: range-diff.c:77 msgid "could not start `log`" msgstr "impossible de démarrer `log`" -#: range-diff.c:77 +#: range-diff.c:79 msgid "could not read `log` output" msgstr "impossible de lire la sortie de `log`" -#: range-diff.c:96 sequencer.c:5020 +#: range-diff.c:98 sequencer.c:5143 #, c-format msgid "could not parse commit '%s'" msgstr "impossible d'analyser le commit '%s'" -#: range-diff.c:122 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "impossible d'analyser la première ligne de la sortie de `log` : ne commence pas par 'commit' : '%s'" + +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "impossible d'analyser l'entête git '%.*s'" -#: range-diff.c:285 +#: range-diff.c:301 msgid "failed to generate diff" msgstr "échec de la génération de diff" -#: range-diff.c:518 range-diff.c:520 +#: range-diff.c:534 range-diff.c:536 #, c-format msgid "could not parse log for '%s'" msgstr "impossible d'analyser le journal pour '%s'" @@ -5599,9 +5674,9 @@ msgstr "entrées de préparation non ordonnées pour '%s'" #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 +#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "fichier d'index corrompu" @@ -5656,12 +5731,12 @@ msgstr "impossible de rafraîchir l'index partagé '%s'" msgid "broken index, expect %s in %s, got %s" msgstr "index cassé, %s attendu dans %s, %s obtenu" -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 +#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 +#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066 #, c-format msgid "could not stat '%s'" msgstr "stat impossible de '%s'" @@ -5794,14 +5869,14 @@ msgstr "" "Cependant, si vous effacez tout, le rebasage sera annulé.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463 +#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258 #, c-format msgid "could not write '%s'" msgstr "impossible d'écrire '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 -#: builtin/rebase.c:234 +#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216 +#: builtin/rebase.c:240 #, c-format msgid "could not write '%s'." msgstr "impossible d'écrire '%s'." @@ -5833,133 +5908,15 @@ msgstr "" "Les comportements disponibles sont : ignore, warn, error.\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 -#: builtin/rebase.c:246 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274 +#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227 +#: builtin/rebase.c:252 #, c-format msgid "could not read '%s'." msgstr "impossible de lire '%s'." -#: refs.c:262 -#, c-format -msgid "%s does not point to a valid object!" -msgstr "%s ne pointe pas sur un objet valide!" - -#: refs.c:667 -#, c-format -msgid "ignoring dangling symref %s" -msgstr "symref pendant %s ignoré" - -#: refs.c:669 ref-filter.c:2098 -#, c-format -msgid "ignoring broken ref %s" -msgstr "réf cassé %s ignoré" - -#: refs.c:804 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "impossible d'ouvrir '%s' en écriture : %s" - -#: refs.c:814 refs.c:865 -#, c-format -msgid "could not read ref '%s'" -msgstr "impossible de lire la réf '%s'" - -#: refs.c:820 -#, c-format -msgid "ref '%s' already exists" -msgstr "la référence '%s' existe déjà" - -#: refs.c:825 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "id d'objet inattendu pendant l'écriture de '%s'" - -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 -#: wrapper.c:620 -#, c-format -msgid "could not write to '%s'" -msgstr "impossible d'écrire dans '%s'" - -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 -#: builtin/rebase.c:1029 -#, c-format -msgid "could not open '%s' for writing" -msgstr "impossible d'ouvrir '%s' en écriture" - -#: refs.c:867 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "id d'objet inattendu pendant la suppression de '%s'" - -#: refs.c:998 -#, c-format -msgid "log for ref %s has gap after %s" -msgstr "le journal pour la réf %s contient un trou après %s" - -#: refs.c:1004 -#, c-format -msgid "log for ref %s unexpectedly ended on %s" -msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s" - -#: refs.c:1063 -#, c-format -msgid "log for %s is empty" -msgstr "le journal pour la réf %s est vide" - -#: refs.c:1155 -#, c-format -msgid "refusing to update ref with bad name '%s'" -msgstr "refus de mettre à jour une réf avec un nom cassé '%s'" - -#: refs.c:1231 -#, c-format -msgid "update_ref failed for ref '%s': %s" -msgstr "échec de update_ref pour la réf '%s' : %s" - -#: refs.c:2023 -#, c-format -msgid "multiple updates for ref '%s' not allowed" -msgstr "mises à jour multiples pour la réf '%s' non permises" - -#: refs.c:2055 -msgid "ref updates forbidden inside quarantine environment" -msgstr "mises à jour des références interdites en environnement de quarantaine" - -#: refs.c:2151 refs.c:2181 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "'%s' existe ; impossible de créer '%s'" - -#: refs.c:2157 refs.c:2192 -#, c-format -msgid "cannot process '%s' and '%s' at the same time" -msgstr "impossible de traiter '%s' et '%s' en même temps" - -#: refs/files-backend.c:1233 -#, c-format -msgid "could not remove reference %s" -msgstr "impossible de supprimer la référence %s" - -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 -#, c-format -msgid "could not delete reference %s: %s" -msgstr "Impossible de supprimer la référence %s : %s" - -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 -#, c-format -msgid "could not delete references: %s" -msgstr "impossible de supprimer les références : %s" - -#: refspec.c:137 -#, c-format -msgid "invalid refspec '%s'" -msgstr "spécificateur de réference invalide : '%s'" - # à priori on parle d'une branche ici -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1936 msgid "gone" msgstr "disparue" @@ -6145,116 +6102,234 @@ msgstr "format : atome %%(end) utilisé sans atome correspondant" msgid "malformed format string %s" msgstr "Chaîne de formatage mal formée %s" -#: ref-filter.c:1488 +#: ref-filter.c:1486 #, c-format msgid "no branch, rebasing %s" msgstr "aucune branche, rebasage de %s" -#: ref-filter.c:1491 +#: ref-filter.c:1489 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "aucune branche, rebasage de la HEAD détachée %s" -#: ref-filter.c:1494 +#: ref-filter.c:1492 #, c-format msgid "no branch, bisect started on %s" msgstr "aucune branche, bisect a démarré sur %s" -#: ref-filter.c:1504 +#: ref-filter.c:1502 msgid "no branch" msgstr "aucune branche" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1538 ref-filter.c:1747 #, c-format msgid "missing object %s for %s" msgstr "objet manquant %s pour %s" -#: ref-filter.c:1550 +#: ref-filter.c:1548 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "échec de parse_object_buffer sur %s pour %s" -#: ref-filter.c:2004 +#: ref-filter.c:2001 #, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" -#: ref-filter.c:2093 +#: ref-filter.c:2090 #, c-format msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:2389 +#: ref-filter.c:2095 refs.c:625 +#, c-format +msgid "ignoring broken ref %s" +msgstr "réf cassé %s ignoré" + +#: ref-filter.c:2395 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:2489 +#: ref-filter.c:2495 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "l'option « %s » est incompatible avec --merged" -#: ref-filter.c:2492 +#: ref-filter.c:2498 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "l'option « %s » est incompatible avec --no-merged" -#: ref-filter.c:2502 +#: ref-filter.c:2508 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: ref-filter.c:2507 +#: ref-filter.c:2513 #, c-format msgid "option `%s' must point to a commit" msgstr "l'option '%s' doit pointer sur un commit" -#: remote.c:366 +#: refs.c:262 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "%s ne pointe pas sur un objet valide!" + +#: refs.c:623 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "symref pendant %s ignoré" + +#: refs.c:760 +#, c-format +msgid "could not open '%s' for writing: %s" +msgstr "impossible d'ouvrir '%s' en écriture : %s" + +#: refs.c:770 refs.c:821 +#, c-format +msgid "could not read ref '%s'" +msgstr "impossible de lire la réf '%s'" + +#: refs.c:776 +#, c-format +msgid "ref '%s' already exists" +msgstr "la référence '%s' existe déjà" + +#: refs.c:781 +#, c-format +msgid "unexpected object ID when writing '%s'" +msgstr "id d'objet inattendu pendant l'écriture de '%s'" + +#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173 +#: wrapper.c:620 +#, c-format +msgid "could not write to '%s'" +msgstr "impossible d'écrire dans '%s'" + +#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719 +#: builtin/rebase.c:852 +#, c-format +msgid "could not open '%s' for writing" +msgstr "impossible d'ouvrir '%s' en écriture" + +#: refs.c:823 +#, c-format +msgid "unexpected object ID when deleting '%s'" +msgstr "id d'objet inattendu pendant la suppression de '%s'" + +#: refs.c:954 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "le journal pour la réf %s contient un trou après %s" + +#: refs.c:960 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "le journal pour la réf %s s'arrête de manière inattendue sur %s" + +#: refs.c:1019 +#, c-format +msgid "log for %s is empty" +msgstr "le journal pour la réf %s est vide" + +#: refs.c:1111 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "refus de mettre à jour une réf avec un nom cassé '%s'" + +#: refs.c:1187 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "échec de update_ref pour la réf '%s' : %s" + +#: refs.c:1979 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "mises à jour multiples pour la réf '%s' non permises" + +#: refs.c:2011 +msgid "ref updates forbidden inside quarantine environment" +msgstr "mises à jour des références interdites en environnement de quarantaine" + +#: refs.c:2107 refs.c:2137 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "'%s' existe ; impossible de créer '%s'" + +#: refs.c:2113 refs.c:2148 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "impossible de traiter '%s' et '%s' en même temps" + +#: refs/files-backend.c:1233 +#, c-format +msgid "could not remove reference %s" +msgstr "impossible de supprimer la référence %s" + +#: refs/files-backend.c:1247 refs/packed-backend.c:1541 +#: refs/packed-backend.c:1551 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "Impossible de supprimer la référence %s : %s" + +#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#, c-format +msgid "could not delete references: %s" +msgstr "impossible de supprimer les références : %s" + +#: refspec.c:137 +#, c-format +msgid "invalid refspec '%s'" +msgstr "spécificateur de réference invalide : '%s'" + +#: remote.c:355 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" "un raccourci de configuration de distant ne peut pas commencer par '/' : %s" -#: remote.c:414 +#: remote.c:403 msgid "more than one receivepack given, using the first" msgstr "plus d'un receivepack fournis, utilisation du premier" -#: remote.c:422 +#: remote.c:411 msgid "more than one uploadpack given, using the first" msgstr "plus d'un uploadpack fournis, utilisation du premier" -#: remote.c:612 +#: remote.c:594 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Impossible de récupérer à la fois %s et %s pour %s" -#: remote.c:616 +#: remote.c:598 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:620 +#: remote.c:602 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#: remote.c:688 +#: remote.c:670 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "la clé '%s' du modèle n'a pas de '*'" -#: remote.c:698 +#: remote.c:680 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "la valeur '%s' du modèle n'a pas de '*'" -#: remote.c:1004 +#: remote.c:986 #, c-format msgid "src refspec %s does not match any" msgstr "" "le spécificateur de référence source %s ne correspond à aucune référence" -#: remote.c:1009 +#: remote.c:991 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -6264,7 +6339,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1024 +#: remote.c:1006 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6288,7 +6363,7 @@ msgstr "" "Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence " "totalement qualifiée." -#: remote.c:1044 +#: remote.c:1026 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6299,7 +6374,7 @@ msgstr "" "Souhaitiez-vous créer une nouvelle branche en poussant sur\n" "'%s:refs/heads/%s' ?" -#: remote.c:1049 +#: remote.c:1031 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6310,7 +6385,7 @@ msgstr "" "Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1054 +#: remote.c:1036 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6321,7 +6396,7 @@ msgstr "" "Souhaitiez-vous créer un nouvel arbre en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1059 +#: remote.c:1041 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6332,119 +6407,119 @@ msgstr "" "Souhaitiez-vous créer un nouveau blob en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1095 +#: remote.c:1077 #, c-format msgid "%s cannot be resolved to branch" msgstr "'%s' ne peut pas être résolue comme une branche" -#: remote.c:1106 +#: remote.c:1088 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "suppression d '%s' impossible : la référence distante n'existe pas" -#: remote.c:1118 +#: remote.c:1100 #, c-format msgid "dst refspec %s matches more than one" msgstr "" "le spécificateur de référence dst %s correspond à plus d'un spécificateur de " "références" -#: remote.c:1125 +#: remote.c:1107 #, c-format msgid "dst ref %s receives from more than one src" msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source" -#: remote.c:1628 remote.c:1729 +#: remote.c:1610 remote.c:1711 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1637 +#: remote.c:1619 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1640 +#: remote.c:1622 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurée pour la branche '%s'" -#: remote.c:1646 +#: remote.c:1628 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi" -#: remote.c:1661 +#: remote.c:1643 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de " "branche locale de suivi" -#: remote.c:1673 +#: remote.c:1655 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branche '%s' n'a aucune branche distante de poussée" -#: remote.c:1683 +#: remote.c:1665 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les références de spec pour '%s' n'incluent pas '%s'" -#: remote.c:1696 +#: remote.c:1678 msgid "push has no destination (push.default is 'nothing')" msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')" -#: remote.c:1718 +#: remote.c:1700 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de résoudre une poussée 'simple' pour une destination unique" -#: remote.c:1844 +#: remote.c:1826 #, c-format msgid "couldn't find remote ref %s" msgstr "impossible de trouver la référence distante %s" -#: remote.c:1857 +#: remote.c:1839 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Référence bizarre '%s' ignorée localement" -#: remote.c:2020 +#: remote.c:2002 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n" -#: remote.c:2024 +#: remote.c:2006 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2027 +#: remote.c:2009 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:2031 +#: remote.c:2013 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Votre branche et '%s' font référence à des commits différents.\n" -#: remote.c:2034 +#: remote.c:2016 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (utilisez \"%s\" pour plus de détails)\n" -#: remote.c:2038 +#: remote.c:2020 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n" msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n" -#: remote.c:2044 +#: remote.c:2026 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2047 +#: remote.c:2029 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6456,11 +6531,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:2055 +#: remote.c:2037 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:2058 +#: remote.c:2040 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6475,12 +6550,12 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:2068 +#: remote.c:2050 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" -#: remote.c:2251 +#: remote.c:2233 #, c-format msgid "cannot parse expected object name '%s'" msgstr "impossible d'analyser le nom attendu d'objet '%s'" @@ -6500,6 +6575,11 @@ msgstr "référence de remplacement dupliquée : %s" msgid "replace depth too high for object %s" msgstr "profondeur de remplacement trop grande pour l'objet %s" +#: repository.c:94 builtin/init-db.c:188 +#, c-format +msgid "The hash algorithm %s is not supported in this build." +msgstr "L'algorithme d'empreinte %s n'est pas pris en charge par cette version." + #: rerere.c:217 rerere.c:226 rerere.c:229 msgid "corrupt MERGE_RR" msgstr "MERGE_RR corrompu" @@ -6558,7 +6638,7 @@ msgstr "impossible de délier '%s' qui est errant" msgid "Recorded preimage for '%s'" msgstr "Pré-image enregistrée pour '%s'" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1891 #: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 #, c-format msgid "could not create directory '%s'" @@ -6593,20 +6673,29 @@ msgstr "Résolution pour '%s' oubliée\n" msgid "unable to open rr-cache directory" msgstr "impossible d'ouvrir le répertoire rr-cache" -#: revision.c:2497 +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "impossible de déterminer la révision HEAD" + +#: reset.c:70 reset.c:76 sequencer.c:3318 +#, c-format +msgid "failed to find tree of %s" +msgstr "impossible de trouver l'arbre de %s" + +#: revision.c:2655 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2500 +#: revision.c:2658 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "votre branche actuelle '%s' ne contient encore aucun commit" -#: revision.c:2708 +#: revision.c:2866 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" -#: revision.c:2712 +#: revision.c:2870 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s" @@ -6629,31 +6718,31 @@ msgstr "" "Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook " "false`." -#: send-pack.c:144 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage " "distant" -#: send-pack.c:146 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "impossible d'analyser l'état de dépaquetage distant : %s" -#: send-pack.c:148 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "le dépaquetage a échoué : %s" -#: send-pack.c:309 +#: send-pack.c:308 msgid "failed to sign the push certificate" msgstr "impossible de signer le certificat de poussée" -#: send-pack.c:423 +#: send-pack.c:399 msgid "the receiving end does not support --signed push" msgstr "Le receveur ne gère pas les poussées avec --signed" -#: send-pack.c:425 +#: send-pack.c:401 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6661,47 +6750,47 @@ msgstr "" "pas d'envoi de certificat de poussée car le receveur ne gère pas les " "poussées avec --signed" -#: send-pack.c:437 +#: send-pack.c:413 msgid "the receiving end does not support --atomic push" msgstr "Le receveur ne gère pas les poussées avec --atomic" -#: send-pack.c:442 +#: send-pack.c:418 msgid "the receiving end does not support push options" msgstr "Le receveur ne gère pas les options de poussées" -#: sequencer.c:191 +#: sequencer.c:192 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mode de nettoyage invalide de message de validation '%s'" -#: sequencer.c:296 +#: sequencer.c:297 #, c-format msgid "could not delete '%s'" msgstr "Impossible de supprimer '%s'" -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 +#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "impossible de supprimer '%s'" -#: sequencer.c:325 +#: sequencer.c:326 msgid "revert" msgstr "revert" -#: sequencer.c:327 +#: sequencer.c:328 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:329 +#: sequencer.c:330 msgid "rebase" msgstr "rebase" -#: sequencer.c:331 +#: sequencer.c:332 #, c-format msgid "unknown action: %d" msgstr "action inconnue : %d" -#: sequencer.c:389 +#: sequencer.c:390 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6709,7 +6798,7 @@ msgstr "" "après résolution des conflits, marquez les chemins corrigés\n" "avec 'git add <chemins>' ou 'git rm <chemins>'" -#: sequencer.c:392 +#: sequencer.c:393 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6719,44 +6808,43 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:405 sequencer.c:2901 +#: sequencer.c:406 sequencer.c:2921 #, c-format msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" -#: sequencer.c:412 +#: sequencer.c:413 #, c-format msgid "could not write eol to '%s'" msgstr "impossible d'écrire la fin de ligne dans '%s'" -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 -#: sequencer.c:3185 +#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941 +#: sequencer.c:3203 #, c-format msgid "failed to finalize '%s'" msgstr "échec lors de la finalisation de '%s'" -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 -#: builtin/rebase.c:593 +#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185 +#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" -#: sequencer.c:466 +#: sequencer.c:457 #, c-format msgid "your local changes would be overwritten by %s." msgstr "vos modifications locales seraient écrasées par %s." -#: sequencer.c:470 +#: sequencer.c:461 msgid "commit your changes or stash them to proceed." msgstr "validez vos modifications ou les remiser pour continuer." -#: sequencer.c:502 +#: sequencer.c:493 #, c-format msgid "%s: fast-forward" msgstr "%s : avance rapide" -#: sequencer.c:541 builtin/tag.c:565 +#: sequencer.c:532 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" @@ -6764,65 +6852,65 @@ msgstr "Mode de nettoyage invalide %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:635 +#: sequencer.c:626 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:652 +#: sequencer.c:643 msgid "unable to update cache tree" msgstr "impossible de mettre à jour l'arbre de cache" -#: sequencer.c:666 +#: sequencer.c:657 msgid "could not resolve HEAD commit" msgstr "impossible de résoudre le commit HEAD" -#: sequencer.c:746 +#: sequencer.c:737 #, c-format msgid "no key present in '%.*s'" msgstr "aucune clé présente dans '%.*s'" -#: sequencer.c:757 +#: sequencer.c:748 #, c-format msgid "unable to dequote value of '%s'" msgstr "Impossible de décoter la valeur de '%s'" -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 +#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: sequencer.c:804 +#: sequencer.c:795 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' déjà fourni" -#: sequencer.c:809 +#: sequencer.c:800 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' déjà fourni" -#: sequencer.c:814 +#: sequencer.c:805 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' déjà fourni" -#: sequencer.c:818 +#: sequencer.c:809 #, c-format msgid "unknown variable '%s'" msgstr "variable inconnue '%s'" -#: sequencer.c:823 +#: sequencer.c:814 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' manquant" -#: sequencer.c:825 +#: sequencer.c:816 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' manquant" -#: sequencer.c:827 +#: sequencer.c:818 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' manquant" -#: sequencer.c:876 +#: sequencer.c:867 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6851,11 +6939,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1148 +#: sequencer.c:1141 msgid "'prepare-commit-msg' hook failed" msgstr "échec du crochet 'prepare-commit-msg'" -#: sequencer.c:1154 +#: sequencer.c:1147 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6884,7 +6972,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1167 +#: sequencer.c:1160 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6910,325 +6998,330 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1209 +#: sequencer.c:1202 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: sequencer.c:1211 +#: sequencer.c:1204 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: sequencer.c:1257 +#: sequencer.c:1250 msgid "unable to resolve HEAD after creating commit" msgstr "impossible de résoudre HEAD après création du commit" -#: sequencer.c:1259 +#: sequencer.c:1252 msgid "detached HEAD" msgstr "HEAD détachée" -#: sequencer.c:1263 +#: sequencer.c:1256 msgid " (root-commit)" msgstr " (commit racine)" -#: sequencer.c:1284 +#: sequencer.c:1277 msgid "could not parse HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:1286 +#: sequencer.c:1279 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s n'est pas un commit !" -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 +#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: sequencer.c:1342 sequencer.c:1968 +#: sequencer.c:1335 sequencer.c:1980 msgid "unable to parse commit author" msgstr "impossible d'analyser l'auteur du commit" -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 +#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: sequencer.c:1386 sequencer.c:1447 +#: sequencer.c:1379 sequencer.c:1450 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 -#: builtin/merge.c:911 +#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894 +#: builtin/merge.c:919 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: sequencer.c:1474 +#: sequencer.c:1433 sequencer.c:4118 +#, c-format +msgid "could not update %s" +msgstr "impossible de mettre à jour %s" + +#: sequencer.c:1481 #, c-format msgid "could not parse commit %s" msgstr "impossible d'analyser le commit %s" -#: sequencer.c:1479 +#: sequencer.c:1486 #, c-format msgid "could not parse parent commit %s" msgstr "impossible d'analyser le commit parent %s" -#: sequencer.c:1562 sequencer.c:1673 +#: sequencer.c:1569 sequencer.c:1680 #, c-format msgid "unknown command: %d" msgstr "commande inconnue : %d" -#: sequencer.c:1620 sequencer.c:1645 +#: sequencer.c:1627 sequencer.c:1652 #, c-format msgid "This is a combination of %d commits." msgstr "Ceci est la combinaison de %d commits." -#: sequencer.c:1630 +#: sequencer.c:1637 msgid "need a HEAD to fixup" msgstr "une HEAD est nécessaire à la correction" -#: sequencer.c:1632 sequencer.c:3212 +#: sequencer.c:1639 sequencer.c:3230 msgid "could not read HEAD" msgstr "Impossible de lire HEAD" -#: sequencer.c:1634 +#: sequencer.c:1641 msgid "could not read HEAD's commit message" msgstr "impossible de lire le message de validation de HEAD" -#: sequencer.c:1640 +#: sequencer.c:1647 #, c-format msgid "cannot write '%s'" msgstr "impossible d'écrire '%s'" -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1654 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Ceci est le premier message de validation :" -#: sequencer.c:1655 +#: sequencer.c:1662 #, c-format msgid "could not read commit message of %s" msgstr "impossible de lire le message de validation de %s" -#: sequencer.c:1662 +#: sequencer.c:1669 #, c-format msgid "This is the commit message #%d:" msgstr "Ceci est le message de validation numéro %d :" -#: sequencer.c:1668 +#: sequencer.c:1675 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Le message de validation %d sera ignoré :" -#: sequencer.c:1756 +#: sequencer.c:1763 msgid "your index file is unmerged." msgstr "votre fichier d'index n'est pas fusionné." -#: sequencer.c:1763 +#: sequencer.c:1770 msgid "cannot fixup root commit" msgstr "impossible de réparer le commit racine" -#: sequencer.c:1782 +#: sequencer.c:1789 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée." -#: sequencer.c:1790 sequencer.c:1798 +#: sequencer.c:1797 sequencer.c:1805 #, c-format msgid "commit %s does not have parent %d" msgstr "le commit %s n'a pas de parent %d" -#: sequencer.c:1804 +#: sequencer.c:1811 #, c-format msgid "cannot get commit message for %s" msgstr "impossible d'obtenir un message de validation pour %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1823 +#: sequencer.c:1830 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:1888 +#: sequencer.c:1895 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossible de renommer '%s' en '%s'" -#: sequencer.c:1943 +#: sequencer.c:1952 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:1944 +#: sequencer.c:1953 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:1961 +#: sequencer.c:1972 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "abandon de %s %s -- le contenu de la rustine déjà en amont\n" -#: sequencer.c:2018 +#: sequencer.c:2030 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:2025 +#: sequencer.c:2037 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:2102 +#: sequencer.c:2114 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s n'accepte pas d'argument : '%s'" -#: sequencer.c:2111 +#: sequencer.c:2123 #, c-format msgid "missing arguments for %s" msgstr "argument manquant pour %s" -#: sequencer.c:2142 +#: sequencer.c:2154 #, c-format msgid "could not parse '%s'" msgstr "impossible d'analyser '%s'" -#: sequencer.c:2203 +#: sequencer.c:2215 #, c-format msgid "invalid line %d: %.*s" msgstr "ligne %d invalide : %.*s" -#: sequencer.c:2214 +#: sequencer.c:2226 #, c-format msgid "cannot '%s' without a previous commit" msgstr "'%s' impossible avec le commit précédent" -#: sequencer.c:2298 +#: sequencer.c:2310 msgid "cancelling a cherry picking in progress" msgstr "annulation d'un picorage en cours" -#: sequencer.c:2305 +#: sequencer.c:2317 msgid "cancelling a revert in progress" msgstr "annulation d'un retour en cours" -#: sequencer.c:2349 +#: sequencer.c:2361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: sequencer.c:2351 +#: sequencer.c:2363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "feuille d'instruction inutilisable : '%s'" -#: sequencer.c:2356 +#: sequencer.c:2368 msgid "no commits parsed." msgstr "aucun commit analysé." -#: sequencer.c:2367 +#: sequencer.c:2379 msgid "cannot cherry-pick during a revert." msgstr "impossible de picorer pendant l'annulation d'un commit." -#: sequencer.c:2369 +#: sequencer.c:2381 msgid "cannot revert during a cherry-pick." msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:2447 +#: sequencer.c:2459 #, c-format msgid "invalid value for %s: %s" msgstr "valeur invalide pour %s : %s" -#: sequencer.c:2540 +#: sequencer.c:2556 msgid "unusable squash-onto" msgstr "\"écrase-sur\" inutilisable" -#: sequencer.c:2556 +#: sequencer.c:2576 #, c-format msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformée : %s" -#: sequencer.c:2644 sequencer.c:4361 +#: sequencer.c:2664 sequencer.c:4469 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:2660 +#: sequencer.c:2680 msgid "revert is already in progress" msgstr "un retour est déjà en cours" -#: sequencer.c:2662 +#: sequencer.c:2682 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "essayez \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2665 +#: sequencer.c:2685 msgid "cherry-pick is already in progress" msgstr "un picorage est déjà en cours" -#: sequencer.c:2667 +#: sequencer.c:2687 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2681 +#: sequencer.c:2701 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossible de créer le répertoire de séquenceur '%s'" -#: sequencer.c:2696 +#: sequencer.c:2716 msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:2756 sequencer.c:4099 +#: sequencer.c:2776 sequencer.c:4206 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:2758 sequencer.c:2769 +#: sequencer.c:2778 sequencer.c:2789 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:2760 sequencer.c:2804 +#: sequencer.c:2780 sequencer.c:2824 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:2790 builtin/grep.c:724 +#: sequencer.c:2810 builtin/grep.c:744 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:2792 +#: sequencer.c:2812 #, c-format msgid "cannot read '%s': %s" msgstr "impossible de lire '%s' : %s" -#: sequencer.c:2793 +#: sequencer.c:2813 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:2799 +#: sequencer.c:2819 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu" -#: sequencer.c:2810 +#: sequencer.c:2830 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !" -#: sequencer.c:2851 +#: sequencer.c:2871 msgid "no revert in progress" msgstr "Pas de retour en cours ?" -#: sequencer.c:2859 +#: sequencer.c:2879 msgid "no cherry-pick in progress" msgstr "aucun picorage en cours" -#: sequencer.c:2869 +#: sequencer.c:2889 msgid "failed to skip the commit" msgstr "échec du saut de commit" -#: sequencer.c:2876 +#: sequencer.c:2896 msgid "there is nothing to skip" msgstr "il n'y a rien à sauter" -#: sequencer.c:2879 +#: sequencer.c:2899 #, c-format msgid "" "have you committed already?\n" @@ -7237,21 +7330,16 @@ msgstr "" "Avez-vous déjà validé ?\n" "essayez \"git %s -continue\"" -#: sequencer.c:3003 sequencer.c:4011 -#, c-format -msgid "could not update %s" -msgstr "impossible de mettre à jour %s" - -#: sequencer.c:3042 sequencer.c:3991 +#: sequencer.c:3060 sequencer.c:4098 msgid "cannot read HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:3059 +#: sequencer.c:3077 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3067 +#: sequencer.c:3085 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7270,22 +7358,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3077 +#: sequencer.c:3095 #, c-format msgid "Could not apply %s... %.*s" msgstr "impossible d'appliquer %s... %.*s" -#: sequencer.c:3084 +#: sequencer.c:3102 #, c-format msgid "Could not merge %.*s" msgstr "Impossible de fusionner %.*s" -#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 +#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3129 +#: sequencer.c:3132 +#, c-format +msgid "Executing: %s\n" +msgstr "Exécution : %s\n" + +#: sequencer.c:3147 #, c-format msgid "" "execution failed: %s\n" @@ -7300,11 +7393,11 @@ msgstr "" "git rebase --continue\n" "\n" -#: sequencer.c:3135 +#: sequencer.c:3153 msgid "and made changes to the index and/or the working tree\n" msgstr "et a mis à jour l'index ou l'arbre de travail\n" -#: sequencer.c:3141 +#: sequencer.c:3159 #, c-format msgid "" "execution succeeded: %s\n" @@ -7321,103 +7414,129 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3202 +#: sequencer.c:3220 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom de label illégal '%.*s'" -#: sequencer.c:3256 +#: sequencer.c:3274 msgid "writing fake root commit" msgstr "écriture d'un commit racine bidon" -#: sequencer.c:3261 +#: sequencer.c:3279 msgid "writing squash-onto" msgstr "écriture de 'écraser-sur'" -#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 -#, c-format -msgid "failed to find tree of %s" -msgstr "impossible de trouver l'arbre de %s" - -#: sequencer.c:3344 +#: sequencer.c:3363 #, c-format msgid "could not resolve '%s'" msgstr "impossible de résoudre '%s'" -#: sequencer.c:3375 +#: sequencer.c:3394 msgid "cannot merge without a current revision" msgstr "impossible de fusionner avec une révision courante" -#: sequencer.c:3397 +#: sequencer.c:3416 #, c-format msgid "unable to parse '%.*s'" msgstr "impossible d'analyser '%.*s'" -#: sequencer.c:3406 +#: sequencer.c:3425 #, c-format msgid "nothing to merge: '%.*s'" msgstr "rien à fusionner : '%.*s'" -#: sequencer.c:3418 +#: sequencer.c:3437 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine" -#: sequencer.c:3434 +#: sequencer.c:3453 #, c-format msgid "could not get commit message of '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:3594 +#: sequencer.c:3613 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "impossible de seulement essayer de fusionner '%.*s'" -#: sequencer.c:3610 +#: sequencer.c:3629 msgid "merge: Unable to write new index file" msgstr "fusion : Impossible d'écrire le nouveau fichier index" -#: sequencer.c:3679 builtin/rebase.c:737 +#: sequencer.c:3703 +msgid "Cannot autostash" +msgstr "Autoremisage impossible" + +#: sequencer.c:3706 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "réponse de remisage inattendue : '%s'" + +#: sequencer.c:3712 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "Impossible de créer le répertoire pour '%s'" + +#: sequencer.c:3715 +#, c-format +msgid "Created autostash: %s\n" +msgstr "Autoremisage créé : %s\n" + +#: sequencer.c:3719 +msgid "could not reset --hard" +msgstr "impossible de réinitialiser --hard" + +#: sequencer.c:3744 #, c-format msgid "Applied autostash.\n" msgstr "Autoremisage appliqué.\n" -#: sequencer.c:3691 +#: sequencer.c:3756 #, c-format msgid "cannot store %s" msgstr "impossible de stocker %s" -#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3759 #, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"L'application de l'autoremisage a provoqué des conflits\n" +"%s\n" "Vos modifications sont à l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" -#: sequencer.c:3755 +#: sequencer.c:3764 +msgid "Applying autostash resulted in conflicts." +msgstr "L'application du remisage automatique a créé des conflits." + +#: sequencer.c:3765 +msgid "Autostash exists; creating a new stash entry." +msgstr "Un remisage automatique existe ; création d'une nouvelle entrée de remisage." + +#: sequencer.c:3857 #, c-format msgid "%s: not a valid OID" msgstr "%s n'est pas un OID valide" -#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3862 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: sequencer.c:3775 +#: sequencer.c:3877 #, c-format msgid "Stopped at HEAD\n" msgstr "arrêt à HEAD\n" -#: sequencer.c:3777 +#: sequencer.c:3879 #, c-format msgid "Stopped at %s\n" msgstr "Arrêté à %s\n" -#: sequencer.c:3785 +#: sequencer.c:3887 #, c-format msgid "" "Could not execute the todo command\n" @@ -7438,48 +7557,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3869 +#: sequencer.c:3931 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "Rebasage (%d/%d)%s" + +#: sequencer.c:3976 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "arrêt à %s... %.*s\n" -#: sequencer.c:3940 +#: sequencer.c:4047 #, c-format msgid "unknown command %d" msgstr "commande inconnue %d" -#: sequencer.c:3999 +#: sequencer.c:4106 msgid "could not read orig-head" msgstr "impossible de lire orig-head" -#: sequencer.c:4004 +#: sequencer.c:4111 msgid "could not read 'onto'" msgstr "impossible de lire 'onto'" -#: sequencer.c:4018 +#: sequencer.c:4125 #, c-format msgid "could not update HEAD to %s" msgstr "impossible de mettre à jour HEAD sur %s" -#: sequencer.c:4111 +#: sequencer.c:4185 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "Rebasage et mise à jour de %s avec succès.\n" + +#: sequencer.c:4218 msgid "cannot rebase: You have unstaged changes." msgstr "impossible de rebaser : vous avez des modifications non indexées." -#: sequencer.c:4120 +#: sequencer.c:4227 msgid "cannot amend non-existing commit" msgstr "impossible de corriger un commit non-existant" -#: sequencer.c:4122 +#: sequencer.c:4229 #, c-format msgid "invalid file: '%s'" msgstr "fichier invalide : '%s'" -#: sequencer.c:4124 +#: sequencer.c:4231 #, c-format msgid "invalid contents: '%s'" msgstr "contenu invalide : '%s'" -#: sequencer.c:4127 +#: sequencer.c:4234 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7489,59 +7618,59 @@ msgstr "" "Vous avez des modifications non validées dans votre copie de travail.\n" "Veuillez les valider d'abord, puis relancer 'git rebase --continue'." -#: sequencer.c:4163 sequencer.c:4202 +#: sequencer.c:4270 sequencer.c:4309 #, c-format msgid "could not write file: '%s'" msgstr "impossible d'écrire le fichier : '%s'" -#: sequencer.c:4217 +#: sequencer.c:4324 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossible de supprimer CHERRY_PICK_HEAD" -#: sequencer.c:4224 +#: sequencer.c:4331 msgid "could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: sequencer.c:4338 +#: sequencer.c:4446 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:4342 +#: sequencer.c:4450 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:4377 +#: sequencer.c:4485 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" -#: sequencer.c:4846 +#: sequencer.c:4962 msgid "make_script: unhandled options" msgstr "make_script : options non gérées" -#: sequencer.c:4849 +#: sequencer.c:4965 msgid "make_script: error preparing revisions" msgstr "make_script : erreur lors de la préparation des révisions" -#: sequencer.c:5083 sequencer.c:5100 +#: sequencer.c:5206 sequencer.c:5223 msgid "nothing to do" msgstr "rien à faire" -#: sequencer.c:5119 +#: sequencer.c:5242 msgid "could not skip unnecessary pick commands" msgstr "impossible d'éviter les commandes de picorage non nécessaires" -#: sequencer.c:5213 +#: sequencer.c:5336 msgid "the script was already rearranged." msgstr "le script a déjà été réarrangé." -#: setup.c:124 +#: setup.c:133 #, c-format msgid "'%s' is outside repository at '%s'" msgstr "'%s' est hors du dépôt à '%s'" -#: setup.c:175 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7551,7 +7680,7 @@ msgstr "" "Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui " "n'existent pas localement." -#: setup.c:188 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7562,14 +7691,14 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:254 +#: setup.c:264 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" "l'option '%s' doit être présente avant les arguments qui ne sont pas des " "options" -#: setup.c:273 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7580,94 +7709,94 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:409 +#: setup.c:419 msgid "unable to set up work tree using invalid config" msgstr "" "impossible de mettre en place le répertoire de travail en utilisant une " "configuration invalide" -#: setup.c:413 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "Cette opération doit être effectuée dans un arbre de travail" -#: setup.c:559 +#: setup.c:569 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Version attendue du dépôt git <= %d, %d trouvée" -#: setup.c:567 +#: setup.c:577 msgid "unknown repository extensions found:" msgstr "extensions de dépôt inconnues trouvées :" -#: setup.c:586 +#: setup.c:596 #, c-format msgid "error opening '%s'" msgstr "erreur à l'ouverture de '%s'" -#: setup.c:588 +#: setup.c:598 #, c-format msgid "too large to be a .git file: '%s'" msgstr "trop gros pour être une fichier .git : '%s'" -#: setup.c:590 +#: setup.c:600 #, c-format msgid "error reading %s" msgstr "erreur à la lecture de %s" -#: setup.c:592 +#: setup.c:602 #, c-format msgid "invalid gitfile format: %s" msgstr "format de fichier git invalide : %s" -#: setup.c:594 +#: setup.c:604 #, c-format msgid "no path in gitfile: %s" msgstr "aucun chemin dans le fichier git : %s" -#: setup.c:596 +#: setup.c:606 #, c-format msgid "not a git repository: %s" msgstr "ce n'est pas un dépôt git : %s" -#: setup.c:695 +#: setup.c:708 #, c-format msgid "'$%s' too big" msgstr "'$%s' trop gros" -#: setup.c:709 +#: setup.c:722 #, c-format msgid "not a git repository: '%s'" msgstr "ce n'est pas un dépôt git : '%s'" -#: setup.c:738 setup.c:740 setup.c:771 +#: setup.c:751 setup.c:753 setup.c:784 #, c-format msgid "cannot chdir to '%s'" msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'" -#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 +#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869 msgid "cannot come back to cwd" msgstr "impossible de revenir au répertoire de travail courant" -#: setup.c:870 +#: setup.c:883 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "échec du stat de '%*s%s%s'" -#: setup.c:1108 +#: setup.c:1121 msgid "Unable to read current working directory" msgstr "Impossible d'accéder au répertoire de travail courant" -#: setup.c:1117 setup.c:1123 +#: setup.c:1130 setup.c:1136 #, c-format msgid "cannot change to '%s'" msgstr "impossible de modifier en '%s'" -#: setup.c:1128 +#: setup.c:1141 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s" -#: setup.c:1134 +#: setup.c:1147 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7678,7 +7807,7 @@ msgstr "" "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "n'est pas défini)." -#: setup.c:1245 +#: setup.c:1258 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7688,272 +7817,272 @@ msgstr "" "Le propriétaire des fichiers doit toujours avoir les droits en lecture et " "écriture." -#: setup.c:1289 +#: setup.c:1304 msgid "open /dev/null or dup failed" msgstr "échec de l'ouverture ou au dup de /dev/null" -#: setup.c:1304 +#: setup.c:1319 msgid "fork failed" msgstr "échec de la bifurcation" -#: setup.c:1309 +#: setup.c:1324 msgid "setsid failed" msgstr "échec du setsid" -#: sha1-file.c:452 +#: sha1-file.c:470 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates" -#: sha1-file.c:503 +#: sha1-file.c:521 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "impossible de normaliser le chemin d'objet alternatif : %s" -#: sha1-file.c:575 +#: sha1-file.c:593 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde" -#: sha1-file.c:582 +#: sha1-file.c:600 #, c-format msgid "unable to normalize object directory: %s" msgstr "impossible de normaliser le répertoire d'objet : %s" -#: sha1-file.c:625 +#: sha1-file.c:643 msgid "unable to fdopen alternates lockfile" msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives" -#: sha1-file.c:643 +#: sha1-file.c:661 msgid "unable to read alternates file" msgstr "lecture du fichier d'alternatives impossible" -#: sha1-file.c:650 +#: sha1-file.c:668 msgid "unable to move new alternates file into place" msgstr "impossible de déplacer le nouveau fichier d'alternative" -#: sha1-file.c:685 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "le chemin '%s' n'existe pas" -#: sha1-file.c:711 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "extraire le dépôt de référence '%s' comme une extraction liée n'est pas " "encore supporté." -#: sha1-file.c:717 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "le dépôt de référence '%s' n'est pas un dépôt local." -#: sha1-file.c:723 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: sha1-file.c:731 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: sha1-file.c:791 +#: sha1-file.c:804 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "ligne invalide pendant l'analyse des refs alternatives : %s" -#: sha1-file.c:943 +#: sha1-file.c:954 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>" -#: sha1-file.c:964 +#: sha1-file.c:975 msgid "mmap failed" msgstr "échec de mmap" -#: sha1-file.c:1128 +#: sha1-file.c:1139 #, c-format msgid "object file %s is empty" msgstr "le fichier objet %s est vide" -#: sha1-file.c:1263 sha1-file.c:2443 +#: sha1-file.c:1274 sha1-file.c:2454 #, c-format msgid "corrupt loose object '%s'" msgstr "objet libre corrompu '%s'" -#: sha1-file.c:1265 sha1-file.c:2447 +#: sha1-file.c:1276 sha1-file.c:2458 #, c-format msgid "garbage at end of loose object '%s'" msgstr "données incorrectes à la fin de l'objet libre '%s'" -#: sha1-file.c:1307 +#: sha1-file.c:1318 msgid "invalid object type" msgstr "type d'objet invalide" -#: sha1-file.c:1391 +#: sha1-file.c:1402 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type" -#: sha1-file.c:1394 +#: sha1-file.c:1405 #, c-format msgid "unable to unpack %s header" msgstr "impossible de dépaqueter l'entête %s" -#: sha1-file.c:1400 +#: sha1-file.c:1411 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type" -#: sha1-file.c:1403 +#: sha1-file.c:1414 #, c-format msgid "unable to parse %s header" msgstr "impossible d'analyser l'entête %s" -#: sha1-file.c:1629 +#: sha1-file.c:1640 #, c-format msgid "failed to read object %s" msgstr "impossible de lire l'objet %s" -#: sha1-file.c:1633 +#: sha1-file.c:1644 #, c-format msgid "replacement %s not found for %s" msgstr "remplacement %s non trouvé pour %s" -#: sha1-file.c:1637 +#: sha1-file.c:1648 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'objet libre %s (stocké dans %s) est corrompu" -#: sha1-file.c:1641 +#: sha1-file.c:1652 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu" -#: sha1-file.c:1746 +#: sha1-file.c:1757 #, c-format msgid "unable to write file %s" msgstr "impossible d'écrire le fichier %s" -#: sha1-file.c:1753 +#: sha1-file.c:1764 #, c-format msgid "unable to set permission to '%s'" msgstr "impossible de régler les droits de '%s'" -#: sha1-file.c:1760 +#: sha1-file.c:1771 msgid "file write error" msgstr "erreur d'écriture d'un fichier" -#: sha1-file.c:1780 +#: sha1-file.c:1791 msgid "error when closing loose object file" msgstr "erreur en fermeture du fichier d'objet esseulé" -#: sha1-file.c:1845 +#: sha1-file.c:1856 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "droits insuffisants pour ajouter un objet à la base de données %s du dépôt" -#: sha1-file.c:1847 +#: sha1-file.c:1858 msgid "unable to create temporary file" msgstr "impossible de créer un fichier temporaire" -#: sha1-file.c:1871 +#: sha1-file.c:1882 msgid "unable to write loose object file" msgstr "impossible d'écrire le fichier d'objet esseulé" -#: sha1-file.c:1877 +#: sha1-file.c:1888 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "impossible de compresser le nouvel objet %s (%d)" -#: sha1-file.c:1881 +#: sha1-file.c:1892 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "échec de deflateEnd sur l'objet %s (%d)" -#: sha1-file.c:1885 +#: sha1-file.c:1896 #, c-format msgid "confused by unstable object source data for %s" msgstr "données de source d'objet instable pour %s" -#: sha1-file.c:1895 builtin/pack-objects.c:1054 +#: sha1-file.c:1906 builtin/pack-objects.c:1055 #, c-format msgid "failed utime() on %s" msgstr "échec de utime() sur %s" -#: sha1-file.c:1972 +#: sha1-file.c:1983 #, c-format msgid "cannot read object for %s" msgstr "impossible de lire l'objet pour %s" -#: sha1-file.c:2011 +#: sha1-file.c:2022 msgid "corrupt commit" msgstr "commit corrompu" -#: sha1-file.c:2019 +#: sha1-file.c:2030 msgid "corrupt tag" msgstr "étiquette corrompue" -#: sha1-file.c:2119 +#: sha1-file.c:2130 #, c-format msgid "read error while indexing %s" msgstr "erreur de lecture à l'indexation de %s" -#: sha1-file.c:2122 +#: sha1-file.c:2133 #, c-format msgid "short read while indexing %s" msgstr "lecture tronquée pendant l'indexation de %s" -#: sha1-file.c:2195 sha1-file.c:2205 +#: sha1-file.c:2206 sha1-file.c:2216 #, c-format msgid "%s: failed to insert into database" msgstr "%s : échec de l'insertion dans la base de données" -#: sha1-file.c:2211 +#: sha1-file.c:2222 #, c-format msgid "%s: unsupported file type" msgstr "%s : type de fichier non supporté" -#: sha1-file.c:2235 +#: sha1-file.c:2246 #, c-format msgid "%s is not a valid object" msgstr "%s n'est pas un objet valide" -#: sha1-file.c:2237 +#: sha1-file.c:2248 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" -#: sha1-file.c:2264 builtin/index-pack.c:155 +#: sha1-file.c:2275 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" -#: sha1-file.c:2454 sha1-file.c:2507 +#: sha1-file.c:2465 sha1-file.c:2518 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "incohérence de hachage pour %s (%s attendu)" -#: sha1-file.c:2478 +#: sha1-file.c:2489 #, c-format msgid "unable to mmap %s" msgstr "impossible de mmap %s" -#: sha1-file.c:2483 +#: sha1-file.c:2494 #, c-format msgid "unable to unpack header of %s" msgstr "impossible de dépaqueter l'entête de %s" -#: sha1-file.c:2489 +#: sha1-file.c:2500 #, c-format msgid "unable to parse header of %s" msgstr "impossible d'analyser l'entête de %s" -#: sha1-file.c:2500 +#: sha1-file.c:2511 #, c-format msgid "unable to unpack contents of %s" msgstr "impossible de dépaqueter le contenu de %s" @@ -8060,43 +8189,43 @@ msgid "invalid object name '%.*s'." msgstr "nom d'objet invalide : '%.*s'." #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:837 +#: strbuf.c:853 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u Gio" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:839 +#: strbuf.c:855 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u Gio/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:847 +#: strbuf.c:863 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u Mio" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:849 +#: strbuf.c:865 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u Mio/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:856 +#: strbuf.c:872 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u Kio" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:858 +#: strbuf.c:874 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u Kio/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:864 +#: strbuf.c:880 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -8104,18 +8233,44 @@ msgstr[0] "%u octet" msgstr[1] "%u octets" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:866 +#: strbuf.c:882 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u octet/s" msgstr[1] "%u octets/s" -#: strbuf.c:1164 +#: strbuf.c:1180 #, c-format msgid "could not edit '%s'" msgstr "impossible d'éditer '%s'" +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "nom de sous-module suspicieux %s ignoré" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs" + +#: submodule-config.c:402 +#, c-format +msgid "ignoring '%s' which may be interpreted as a command-line option: %s" +msgstr "" +"'%s' ignoré et qui peut être interprété comme une option de ligne de " +"commande : %s" + +#: submodule-config.c:499 +#, c-format +msgid "invalid value for %s" +msgstr "Valeur invalide pour %s" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "Impossible de mettre à jour l'élément %s de .gitmodules" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -8180,7 +8335,7 @@ msgstr "" msgid "process for submodule '%s' failed" msgstr "le processus pour le sous-module '%s' a échoué" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 +#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." @@ -8298,41 +8453,15 @@ msgstr "" "'%s' sur\n" "'%s'\n" -#: submodule.c:2209 +#: submodule.c:2210 msgid "could not start ls-files in .." msgstr "impossible de démarrer ls-files dans .." -#: submodule.c:2248 +#: submodule.c:2250 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree a renvoyé un code de retour inattendu %d" -#: submodule-config.c:236 -#, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "nom de sous-module suspicieux %s ignoré" - -#: submodule-config.c:303 -msgid "negative values not allowed for submodule.fetchjobs" -msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs" - -#: submodule-config.c:401 -#, c-format -msgid "ignoring '%s' which may be interpreted as a command-line option: %s" -msgstr "" -"'%s' ignoré et qui peut être interprété comme une option de ligne de " -"commande : %s" - -#: submodule-config.c:498 -#, c-format -msgid "invalid value for %s" -msgstr "Valeur invalide pour %s" - -#: submodule-config.c:765 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "Impossible de mettre à jour l'élément %s de .gitmodules" - #: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" @@ -8387,99 +8516,6 @@ msgstr "impossible de créer un fichier temporaire" msgid "could not rename temporary file to %s" msgstr "impossible de renommer un fichier temporaire en %s" -#: transport.c:116 -#, c-format -msgid "Would set upstream of '%s' to '%s' of '%s'\n" -msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n" - -#: transport.c:145 -#, c-format -msgid "could not read bundle '%s'" -msgstr "impossible de lire la liasse '%s'" - -#: transport.c:214 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "transport : option de profondeur invalide '%s'" - -#: transport.c:266 -msgid "see protocol.version in 'git help config' for more details" -msgstr "voir protocol.version dans 'git help config' pour plus d'information" - -#: transport.c:267 -msgid "server options require protocol version 2 or later" -msgstr "les options de serveur exigent une version 2 ou supérieure" - -#: transport.c:632 -msgid "could not parse transport.color.* config" -msgstr "impossible d'analyser la configuration transport.color.*" - -#: transport.c:705 -msgid "support for protocol v2 not implemented yet" -msgstr "le support du protocole v2 n'est pas encore implanté" - -#: transport.c:831 -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "valeur inconnue pour la config '%s' : %s" - -#: transport.c:897 -#, c-format -msgid "transport '%s' not allowed" -msgstr "transport '%s' non permis" - -#: transport.c:949 -msgid "git-over-rsync is no longer supported" -msgstr "git-over-rsync n'est plus supporté" - -#: transport.c:1044 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -msgstr "" -"Les chemins suivants de sous-module contiennent des modifications\n" -"qui ne peuvent être trouvées sur aucun distant :\n" - -#: transport.c:1048 -#, c-format -msgid "" -"\n" -"Please try\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"or cd to the path and use\n" -"\n" -"\tgit push\n" -"\n" -"to push them to a remote.\n" -"\n" -msgstr "" -"\n" -"Veuillez essayer\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"ou bien changez de répertoire et utilisez\n" -"\n" -"\tgit push\n" -"\n" -"pour les pousser vers un serveur distant.\n" -"\n" - -#: transport.c:1056 -msgid "Aborting." -msgstr "Abandon." - -#: transport.c:1201 -msgid "failed to push all needed submodules" -msgstr "échec de la poussée de tous les sous-modules nécessaires" - -#: transport.c:1345 transport-helper.c:657 -msgid "operation not supported by protocol" -msgstr "option non supportée par le protocole" - #: transport-helper.c:61 transport-helper.c:90 msgid "full write to remote helper failed" msgstr "échec de l'écriture totale sur l'assistant distant" @@ -8525,7 +8561,7 @@ msgstr "impossible de lancer fast-import" msgid "error while running fast-import" msgstr "erreur au lancement de fast-import" -#: transport-helper.c:545 transport-helper.c:1134 +#: transport-helper.c:545 transport-helper.c:1135 #, c-format msgid "could not read ref %s" msgstr "impossible de lire la réf %s" @@ -8545,6 +8581,10 @@ msgstr "" msgid "invalid remote service path" msgstr "chemin de service distant invalide" +#: transport-helper.c:657 transport.c:1339 +msgid "operation not supported by protocol" +msgstr "option non supportée par le protocole" + #: transport-helper.c:660 #, c-format msgid "can't connect to subservice %s" @@ -8585,26 +8625,26 @@ msgstr "l'assistant %s ne gère pas --atomic" msgid "helper %s does not support 'push-option'" msgstr "l'assistant %s ne gère pas 'push-option'" -#: transport-helper.c:965 +#: transport-helper.c:966 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "l'assistant %s ne gère pas push ; un spécificateur de référence est " "nécessaire" -#: transport-helper.c:970 +#: transport-helper.c:971 #, c-format msgid "helper %s does not support 'force'" msgstr "l'assistant %s ne gère pas 'force'" -#: transport-helper.c:1017 +#: transport-helper.c:1018 msgid "couldn't run fast-export" msgstr "impossible de lancer fast-export" -#: transport-helper.c:1022 +#: transport-helper.c:1023 msgid "error while running fast-export" msgstr "erreur au lancement de fast-export" -#: transport-helper.c:1047 +#: transport-helper.c:1048 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8613,50 +8653,139 @@ msgstr "" "Aucune référence en commun et aucune spécfiée ; rien à faire.\n" "Vous devriez peut-être spécifier une branche telle que 'master'.\n" -#: transport-helper.c:1120 +#: transport-helper.c:1121 #, c-format msgid "malformed response in ref list: %s" msgstr "réponse malformée dans le liste de réfs : %s" -#: transport-helper.c:1272 +#: transport-helper.c:1273 #, c-format msgid "read(%s) failed" msgstr "échec de read(%s)" -#: transport-helper.c:1299 +#: transport-helper.c:1300 #, c-format msgid "write(%s) failed" msgstr "échec de write(%s)" -#: transport-helper.c:1348 +#: transport-helper.c:1349 #, c-format msgid "%s thread failed" msgstr "échec du fil d'exécution %s" -#: transport-helper.c:1352 +#: transport-helper.c:1353 #, c-format msgid "%s thread failed to join: %s" msgstr "échec de jonction du fil d'exécution %s : %s" -#: transport-helper.c:1371 transport-helper.c:1375 +#: transport-helper.c:1372 transport-helper.c:1376 #, c-format msgid "can't start thread for copying data: %s" msgstr "impossible de démarrer le fil d'exécution pour copier les données : %s" -#: transport-helper.c:1412 +#: transport-helper.c:1413 #, c-format msgid "%s process failed to wait" msgstr "échec du processus %s pour l'attente" -#: transport-helper.c:1416 +#: transport-helper.c:1417 #, c-format msgid "%s process failed" msgstr "échec du processus %s" -#: transport-helper.c:1434 transport-helper.c:1443 +#: transport-helper.c:1435 transport-helper.c:1444 msgid "can't start thread for copying data" msgstr "impossible de démarrer le fil d'exécution pour copier les données" +#: transport.c:116 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n" + +#: transport.c:145 +#, c-format +msgid "could not read bundle '%s'" +msgstr "impossible de lire la liasse '%s'" + +#: transport.c:214 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "transport : option de profondeur invalide '%s'" + +#: transport.c:266 +msgid "see protocol.version in 'git help config' for more details" +msgstr "voir protocol.version dans 'git help config' pour plus d'information" + +#: transport.c:267 +msgid "server options require protocol version 2 or later" +msgstr "les options de serveur exigent une version 2 ou supérieure" + +#: transport.c:632 +msgid "could not parse transport.color.* config" +msgstr "impossible d'analyser la configuration transport.color.*" + +#: transport.c:705 +msgid "support for protocol v2 not implemented yet" +msgstr "le support du protocole v2 n'est pas encore implanté" + +#: transport.c:839 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "valeur inconnue pour la config '%s' : %s" + +#: transport.c:905 +#, c-format +msgid "transport '%s' not allowed" +msgstr "transport '%s' non permis" + +#: transport.c:957 +msgid "git-over-rsync is no longer supported" +msgstr "git-over-rsync n'est plus supporté" + +#: transport.c:1052 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" +"Les chemins suivants de sous-module contiennent des modifications\n" +"qui ne peuvent être trouvées sur aucun distant :\n" + +#: transport.c:1056 +#, c-format +msgid "" +"\n" +"Please try\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"or cd to the path and use\n" +"\n" +"\tgit push\n" +"\n" +"to push them to a remote.\n" +"\n" +msgstr "" +"\n" +"Veuillez essayer\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"ou bien changez de répertoire et utilisez\n" +"\n" +"\tgit push\n" +"\n" +"pour les pousser vers un serveur distant.\n" +"\n" + +#: transport.c:1064 +msgid "Aborting." +msgstr "Abandon." + +#: transport.c:1209 +msgid "failed to push all needed submodules" +msgstr "échec de la poussée de tous les sous-modules nécessaires" + #: tree-walk.c:32 msgid "too-short tree object" msgstr "objet arbre trop court" @@ -8673,7 +8802,7 @@ msgstr "nom de fichier vide dans une entrée de l'arbre" msgid "too-short tree file" msgstr "fichier arbre trop court" -#: unpack-trees.c:110 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8684,7 +8813,7 @@ msgstr "" "%%sVeuillez valider ou remiser vos modifications avant de basculer de " "branche." -#: unpack-trees.c:112 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8694,7 +8823,7 @@ msgstr "" "l'extraction :\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8704,7 +8833,7 @@ msgstr "" "fusion :\n" "%%sVeuillez valider ou remiser vos modifications avant la fusion." -#: unpack-trees.c:117 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8714,7 +8843,7 @@ msgstr "" "fusion :\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8723,7 +8852,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%sVeuillez valider ou remiser vos modifications avant %s." -#: unpack-trees.c:122 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8732,7 +8861,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%s" -#: unpack-trees.c:127 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -8742,7 +8871,7 @@ msgstr "" "contenus :\n" "%s" -#: unpack-trees.c:131 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8752,7 +8881,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:133 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8761,7 +8890,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par l'extraction :\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8771,7 +8900,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:138 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8780,7 +8909,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par la fusion :\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8790,7 +8919,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:143 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8799,7 +8928,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par %s :\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8810,7 +8939,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:151 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8820,7 +8949,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8830,7 +8959,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:156 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8839,7 +8968,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par la fusion :\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8849,7 +8978,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:161 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8858,62 +8987,66 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par %s :\n" "%%s" -#: unpack-trees.c:169 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible." -#: unpack-trees.c:172 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" msgstr "" -"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont " -"pas à jour :\n" +"Mise à jour impossible pour le sous-module :\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -"Les fichiers suivants de la copie de travail seraient écrasés par la mise à " -"jour par l'extraction creuse :\n" +"Les chemins suivants ne sont pas à jour et ont été laissés malgré les motifs clairsemés :\n" "%s" -#: unpack-trees.c:176 +#: unpack-trees.c:180 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"Les fichiers suivants de la copie de travail seraient supprimés par la mise " -"à jour par extraction creuse :\n" +"Les chemins suivants ne sont pas fusionnés et ont été laissés malgré les motifs clairsemés :\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -"Mise à jour impossible pour le sous-module :\n" +"Les chemins suivants étaient déjà présents et ont été laissés malgré les motifs clairsemés :\n" "%s" -#: unpack-trees.c:255 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "Abandon\n" -#: unpack-trees.c:317 +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "Après correction des chemins ci-dessus, vous voulez peut-être lancer `git sparse-checkout reapply`.\n" + +#: unpack-trees.c:350 msgid "Updating files" msgstr "Mise à jour des fichiers" -#: unpack-trees.c:349 +#: unpack-trees.c:382 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8923,10 +9056,14 @@ msgstr "" "sensibles à la casse dans une système de fichier insensible) et un\n" "seul du groupe en collision est dans l'arbre de travail :\n" -#: unpack-trees.c:1445 +#: unpack-trees.c:1498 msgid "Updating index flags" msgstr "Mise à jour des drapeaux de l'index" +#: upload-pack.c:1337 +msgid "expected flush after fetch arguments" +msgstr "vidage attendu après les arguments de récupération" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant" @@ -8960,35 +9097,35 @@ msgstr "segment de chemin '..' invalide" msgid "Fetching objects" msgstr "Récupération des objets" -#: worktree.c:259 builtin/am.c:2099 +#: worktree.c:262 builtin/am.c:2098 #, c-format msgid "failed to read '%s'" msgstr "échec de la lecture de '%s'" -#: worktree.c:305 +#: worktree.c:309 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" "'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt" -#: worktree.c:316 +#: worktree.c:320 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre " "de travail" -#: worktree.c:328 +#: worktree.c:332 #, c-format msgid "'%s' does not exist" msgstr "'%s' n'existe pas" -#: worktree.c:334 +#: worktree.c:338 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' n'est pas un fichier .git, code d'erreur %d" -#: worktree.c:342 +#: worktree.c:347 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' ne pointe pas en retour sur '%s'" @@ -9040,11 +9177,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1072 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1081 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" @@ -9149,22 +9286,22 @@ msgstr "contenu modifié, " msgid "untracked content, " msgstr "contenu non suivi, " -#: wt-status.c:906 +#: wt-status.c:904 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Votre remisage contient actuellement %d entrée" msgstr[1] "Votre remisage contient actuellement %d entrées" -#: wt-status.c:938 +#: wt-status.c:936 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:940 +#: wt-status.c:938 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:1022 +#: wt-status.c:1020 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9172,7 +9309,7 @@ msgstr "" "Ne touchez pas à la ligne ci-dessus.\n" "Tout ce qui suit sera éliminé." -#: wt-status.c:1114 +#: wt-status.c:1112 #, c-format msgid "" "\n" @@ -9184,107 +9321,107 @@ msgstr "" "de la branche.\n" "Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n" -#: wt-status.c:1144 +#: wt-status.c:1142 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:1147 +#: wt-status.c:1145 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:1149 +#: wt-status.c:1147 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)" -#: wt-status.c:1153 +#: wt-status.c:1151 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée." -#: wt-status.c:1156 +#: wt-status.c:1154 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:1165 +#: wt-status.c:1163 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:1168 +#: wt-status.c:1166 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:1172 +#: wt-status.c:1170 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:1174 +#: wt-status.c:1172 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:1176 +#: wt-status.c:1174 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1309 +#: wt-status.c:1307 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo est manquant." -#: wt-status.c:1311 +#: wt-status.c:1309 msgid "No commands done." msgstr "Aucune commande réalisée." -#: wt-status.c:1314 +#: wt-status.c:1312 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Dernière commande effectuée (%d commande effectuée) :" msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :" -#: wt-status.c:1325 +#: wt-status.c:1323 #, c-format msgid " (see more in file %s)" msgstr " (voir plus dans le fichier %s)" -#: wt-status.c:1330 +#: wt-status.c:1328 msgid "No commands remaining." msgstr "Aucune commande restante." -#: wt-status.c:1333 +#: wt-status.c:1331 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Prochaine commande à effectuer (%d commande restante) :" msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :" -#: wt-status.c:1341 +#: wt-status.c:1339 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)" -#: wt-status.c:1353 +#: wt-status.c:1351 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:1358 +#: wt-status.c:1356 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1371 +#: wt-status.c:1369 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1373 +#: wt-status.c:1371 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1375 +#: wt-status.c:1373 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" -#: wt-status.c:1382 +#: wt-status.c:1380 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1386 +#: wt-status.c:1384 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -9292,144 +9429,144 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1391 +#: wt-status.c:1389 msgid "You are currently splitting a commit during a rebase." msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:1394 +#: wt-status.c:1392 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" -#: wt-status.c:1398 +#: wt-status.c:1396 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la " "branche '%s' sur '%s'." -#: wt-status.c:1403 +#: wt-status.c:1401 msgid "You are currently editing a commit during a rebase." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." -#: wt-status.c:1406 +#: wt-status.c:1404 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1408 +#: wt-status.c:1406 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos " "modifications)" -#: wt-status.c:1419 +#: wt-status.c:1417 msgid "Cherry-pick currently in progress." msgstr "Picorage en cours." -#: wt-status.c:1422 +#: wt-status.c:1420 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1429 +#: wt-status.c:1427 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1432 +#: wt-status.c:1430 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (lancez \"git cherry-pick --continue\" pour continuer)" -#: wt-status.c:1435 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" -#: wt-status.c:1437 +#: wt-status.c:1435 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (utilisez \"git cherry-pick --skip\" pour sauter ce patch)" -#: wt-status.c:1439 +#: wt-status.c:1437 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" -#: wt-status.c:1449 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "Rétablissement en cours." -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1461 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " (lancez \"git revert --continue\" pour continuer)" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1466 +#: wt-status.c:1464 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (utilisez \"git revert --skip\" pour sauter ce patch)" -#: wt-status.c:1468 +#: wt-status.c:1466 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1478 +#: wt-status.c:1476 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1482 +#: wt-status.c:1480 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1485 +#: wt-status.c:1483 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)" -#: wt-status.c:1694 +#: wt-status.c:1692 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1701 +#: wt-status.c:1699 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1703 +#: wt-status.c:1701 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1713 +#: wt-status.c:1711 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1730 +#: wt-status.c:1728 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1731 +#: wt-status.c:1729 msgid "No commits yet" msgstr "Aucun commit" -#: wt-status.c:1745 +#: wt-status.c:1743 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1747 +#: wt-status.c:1745 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1751 +#: wt-status.c:1749 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9441,32 +9578,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1757 +#: wt-status.c:1755 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1759 +#: wt-status.c:1757 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1765 +#: wt-status.c:1763 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1770 +#: wt-status.c:1768 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " "\"git commit -a\")\n" -#: wt-status.c:1773 +#: wt-status.c:1771 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1776 +#: wt-status.c:1774 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9475,71 +9612,71 @@ msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents (utilisez \"git add\" pour les suivre)\n" -#: wt-status.c:1779 +#: wt-status.c:1777 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents\n" -#: wt-status.c:1782 +#: wt-status.c:1780 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les " "suivre)\n" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1783 wt-status.c:1788 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1788 +#: wt-status.c:1786 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n" -#: wt-status.c:1792 +#: wt-status.c:1790 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1905 +#: wt-status.c:1903 msgid "No commits yet on " msgstr "Encore aucun commit sur " -#: wt-status.c:1909 +#: wt-status.c:1907 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1940 +#: wt-status.c:1938 msgid "different" msgstr "différent" -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1940 wt-status.c:1948 msgid "behind " msgstr "derrière " -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1943 wt-status.c:1946 msgid "ahead " msgstr "devant " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2468 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "Impossible de %s : vous avez des modifications non indexées." -#: wt-status.c:2476 +#: wt-status.c:2474 msgid "additionally, your index contains uncommitted changes." msgstr "de plus, votre index contient des modifications non validées." -#: wt-status.c:2478 +#: wt-status.c:2476 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossible : votre index contient des modifications non validées." -#: compat/precompose_utf8.c:58 builtin/clone.c:455 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 #, c-format msgid "failed to unlink '%s'" msgstr "échec pour délier '%s'" @@ -9553,7 +9690,7 @@ msgstr "git add [<options>] [--] <chemin>..." msgid "unexpected diff status %c" msgstr "état de diff inattendu %c" -#: builtin/add.c:93 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" @@ -9566,7 +9703,7 @@ msgstr "suppression de '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:266 builtin/rev-parse.c:899 +#: builtin/add.c:266 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "Impossible de lire l'index" @@ -9602,8 +9739,8 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 +#: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548 #: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 msgid "dry run" msgstr "simuler l'action" @@ -9612,7 +9749,7 @@ msgstr "simuler l'action" msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 +#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308 msgid "select hunks interactively" msgstr "sélection interactive des sections" @@ -9722,7 +9859,7 @@ msgstr "" msgid "adding files failed" msgstr "échec de l'ajout de fichiers" -#: builtin/add.c:447 builtin/commit.c:348 +#: builtin/add.c:447 builtin/commit.c:345 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file est incompatible avec --interactive/--patch" @@ -9744,13 +9881,13 @@ msgstr "" 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:501 builtin/checkout.c:1675 builtin/commit.c:354 -#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 +#: builtin/add.c:501 builtin/checkout.c:1703 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file est incompatible avec pathspec arguments" -#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 -#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 +#: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul nécessite --pathspec-from-file" @@ -9912,34 +10049,35 @@ msgstr "Le corps de la validation est :" 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:1700 builtin/commit.c:398 +#: builtin/am.c:1699 builtin/commit.c:395 msgid "unable to write index file" msgstr "impossible d'écrire le fichier d'index" -#: builtin/am.c:1704 +#: builtin/am.c:1703 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1744 builtin/am.c:1812 +#: builtin/am.c:1743 builtin/am.c:1811 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1761 +#: builtin/am.c:1760 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: builtin/am.c:1767 +#: builtin/am.c:1766 #, c-format msgid "Patch failed at %s %.*s" msgstr "le patch a échoué à %s %.*s" -#: builtin/am.c:1771 +#: builtin/am.c:1770 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" +msgstr "" +"Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec" -#: builtin/am.c:1815 +#: builtin/am.c:1814 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9950,7 +10088,7 @@ msgstr "" "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: builtin/am.c:1822 +#: builtin/am.c:1821 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9963,17 +10101,17 @@ msgstr "" "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour " "accepter son état." -#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 -#: builtin/reset.c:354 +#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:1981 +#: builtin/am.c:1980 msgid "failed to clean index" msgstr "échec du nettoyage de l'index" -#: builtin/am.c:2025 +#: builtin/am.c:2024 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9981,155 +10119,157 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: builtin/am.c:2132 +#: builtin/am.c:2131 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2172 +#: builtin/am.c:2171 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Valeur invalide pour --show-current-patch : %s" -#: builtin/am.c:2176 +#: builtin/am.c:2175 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s est incompatible avec --show-current-patch=%s" -#: builtin/am.c:2207 +#: builtin/am.c:2206 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2208 +#: builtin/am.c:2207 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --skip | --abort)" -#: builtin/am.c:2214 +#: builtin/am.c:2213 msgid "run interactively" msgstr "exécution interactive" -#: builtin/am.c:2216 +#: builtin/am.c:2215 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2218 +#: builtin/am.c:2217 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:812 +#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16 +#: builtin/repack.c:306 builtin/stash.c:816 msgid "be quiet" msgstr "être silencieux" -#: builtin/am.c:2221 +#: builtin/am.c:2220 msgid "add a Signed-off-by line to the commit message" msgstr "ajouter une ligne Signed-off-by au message de validation" -#: builtin/am.c:2224 +#: builtin/am.c:2223 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par défaut)" -#: builtin/am.c:2226 +#: builtin/am.c:2225 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k à git-mailinfo" -#: builtin/am.c:2228 +#: builtin/am.c:2227 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b à git-mailinfo" -#: builtin/am.c:2230 +#: builtin/am.c:2229 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m à git-mailinfo" -#: builtin/am.c:2232 +#: builtin/am.c:2231 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:2235 +#: builtin/am.c:2234 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr" -#: builtin/am.c:2238 +#: builtin/am.c:2237 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 -#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 -#: builtin/am.c:2267 +#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 +#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/am.c:2266 msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" -#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 -#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 -#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 -#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 +#: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321 +#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38 +#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38 +#: bugreport.c:131 msgid "format" msgstr "format" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "format the patch(es) are in" msgstr "format de présentation des patchs" -#: builtin/am.c:2270 +#: builtin/am.c:2269 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:2272 +#: builtin/am.c:2271 msgid "continue applying patches after resolving a conflict" msgstr "continuer à appliquer les patchs après résolution d'un conflit" -#: builtin/am.c:2275 +#: builtin/am.c:2274 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2278 +#: builtin/am.c:2277 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2281 +#: builtin/am.c:2280 msgid "restore the original branch and abort the patching operation." msgstr "" "restaurer la branche originale et abandonner les applications de patch." -#: builtin/am.c:2284 +#: builtin/am.c:2283 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:2288 +#: builtin/am.c:2287 msgid "show the patch being applied" msgstr "afficher le patch en cours d'application" -#: builtin/am.c:2293 +#: builtin/am.c:2292 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2295 +#: builtin/am.c:2294 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 -#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 -#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517 +#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524 +#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "id-clé" -#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 +#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2301 +#: builtin/am.c:2300 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2319 +#: builtin/am.c:2318 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." @@ -10137,17 +10277,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:2326 +#: builtin/am.c:2325 msgid "failed to read the index" msgstr "échec à la lecture de l'index" -#: builtin/am.c:2341 +#: builtin/am.c:2340 #, 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:2365 +#: builtin/am.c:2364 #, c-format msgid "" "Stray %s directory found.\n" @@ -10156,13 +10296,13 @@ msgstr "" "Répertoire abandonné %s trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2371 +#: builtin/am.c:2370 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:2381 +#: builtin/am.c:2380 msgid "interactive mode requires patches on the command line" msgstr "le mode interactif requiert des rustines sur la ligne de commande" @@ -10578,7 +10718,7 @@ msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)" msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:860 builtin/log.c:1702 +#: builtin/blame.c:860 builtin/log.c:1721 msgid "rev" msgstr "rév" @@ -10652,14 +10792,14 @@ msgstr "" msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" -#: builtin/blame.c:1079 +#: builtin/blame.c:1087 #, 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:1125 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "Assignation de blâme aux lignes" @@ -10874,7 +11014,7 @@ msgstr "régler le mode de suivi (voir git-pull(1))" msgid "do not use" msgstr "ne pas utiliser" -#: builtin/branch.c:626 builtin/rebase.c:513 +#: builtin/branch.c:626 builtin/rebase.c:520 msgid "upstream" msgstr "amont" @@ -10966,68 +11106,68 @@ msgstr "afficher seulement les branches qui ne sont pas fusionnées" msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:433 +#: builtin/tag.c:434 msgid "object" msgstr "objet" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "afficher seulement les branches de l'objet" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "le tri et le filtrage sont non-sensibles à la casse" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/branch.c:684 builtin/clone.c:785 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "trop de branches pour une opération de copie" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "trop d'arguments pour une opération de renommage" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "trop d'arguments pour spécifier une branche amont" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -11035,32 +11175,32 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "trop d'arguments pour désactiver un amont" -#: builtin/branch.c:825 +#: builtin/branch.c:823 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." -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:841 +#: builtin/branch.c:839 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11069,7 +11209,7 @@ msgstr "" "branche.\n" "Vouliez-vous plutôt dire -a|-r --list <motif> ?" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11093,19 +11233,19 @@ msgstr "git bundle list-heads <fichier> [<nom-de-ref>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <fichier> [<nom-de-ref>...]" -#: builtin/bundle.c:66 builtin/pack-objects.c:3375 +#: builtin/bundle.c:66 builtin/pack-objects.c:3376 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/bundle.c:68 builtin/pack-objects.c:3377 +#: builtin/bundle.c:68 builtin/pack-objects.c:3378 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/bundle.c:70 builtin/pack-objects.c:3379 +#: builtin/bundle.c:70 builtin/pack-objects.c:3380 msgid "show progress meter during object writing phase" msgstr "afficher la barre de progression durant la phase d'écrite des objets" -#: builtin/bundle.c:73 builtin/pack-objects.c:3382 +#: builtin/bundle.c:73 builtin/pack-objects.c:3383 msgid "similar to --all-progress when progress meter is shown" msgstr "similaire à --all-progress quand la barre de progression est affichée" @@ -11135,7 +11275,7 @@ msgstr "être verbeux : doit être placé avant une sous-commande" msgid "Unknown subcommand: %s" msgstr "Sous-commande inconnue : %s" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11143,7 +11283,7 @@ msgstr "" "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p " "| <type> | --textconv | --filters) [--path=<chemin>] <objet>" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:599 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -11151,74 +11291,74 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:617 +#: builtin/cat-file.c:620 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:635 +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:645 msgid "for blob objects, run textconv on object's content" msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:647 msgid "for blob objects, run filters on object's content" msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet" -#: builtin/cat-file.c:645 git-submodule.sh:1002 +#: builtin/cat-file.c:648 git-submodule.sh:984 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "utiliser un chemin spécifique pour --textconv/--filters" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:651 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:649 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "bufferiser la sortie de --batch" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:654 msgid "show info and content of objects fed from the standard input" msgstr "" "afficher l'information et le contenu des objets passés en entrée standard" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:658 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:662 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "suivre les liens symbolique internes à la copie de travail (utilisé avec --" "batch ou --batch-check)" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "montrer tous les objets avec --batch ou --batch-check" -#: builtin/cat-file.c:663 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "ne pas ordonner la sortie de --batch-all-objects" @@ -11247,8 +11387,8 @@ msgid "terminate input and output records by a NUL character" msgstr "" "terminer les enregistrements en entrée et en sortie par un caractère NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537 +#: builtin/worktree.c:502 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -11342,7 +11482,7 @@ msgstr "écrire le contenu dans des fichiers temporaires" #: builtin/checkout-index.c:178 builtin/column.c:31 #: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 #: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:672 +#: builtin/worktree.c:675 msgid "string" msgstr "chaîne" @@ -11370,100 +11510,100 @@ msgstr "git switch [<options>] <branche>" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<options>] [--source=<branche>] <fichier>..." -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "le chemin '%s' n'a pas notre version" -#: builtin/checkout.c:177 builtin/checkout.c:216 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "le chemin '%s' n'a pas leur version" -#: builtin/checkout.c:193 +#: builtin/checkout.c:206 #, 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:243 +#: builtin/checkout.c:256 #, c-format msgid "path '%s' does not have necessary versions" msgstr "le chemin '%s' n'a pas les versions nécessaires" -#: builtin/checkout.c:261 +#: builtin/checkout.c:274 #, c-format msgid "path '%s': cannot merge" msgstr "chemin '%s' : impossible de fusionner" -#: builtin/checkout.c:277 +#: builtin/checkout.c:290 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" -#: builtin/checkout.c:377 +#: builtin/checkout.c:395 #, 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:382 +#: builtin/checkout.c:400 #, 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:389 +#: builtin/checkout.c:407 #, 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:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 +#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436 +#: builtin/checkout.c:440 #, 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:425 builtin/checkout.c:428 +#: builtin/checkout.c:443 builtin/checkout.c:446 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:432 +#: builtin/checkout.c:450 #, 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:436 +#: builtin/checkout.c:454 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ni '%s', ni '%s' spécifié" -#: builtin/checkout.c:440 +#: builtin/checkout.c:458 #, 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:445 builtin/checkout.c:450 +#: builtin/checkout.c:463 builtin/checkout.c:468 #, 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:509 builtin/checkout.c:516 +#: builtin/checkout.c:527 builtin/checkout.c:534 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 +#: builtin/checkout.c:704 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:734 +#: builtin/checkout.c:758 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11473,50 +11613,50 @@ msgstr "" "suivants :\n" "%s" -#: builtin/checkout.c:837 +#: builtin/checkout.c:861 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:879 +#: builtin/checkout.c:903 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:883 builtin/clone.c:717 +#: builtin/checkout.c:907 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" -#: builtin/checkout.c:887 +#: builtin/checkout.c:911 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:914 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:918 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:896 builtin/checkout.c:1320 +#: builtin/checkout.c:920 builtin/checkout.c:1344 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:898 +#: builtin/checkout.c:922 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:949 +#: builtin/checkout.c:973 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:955 +#: builtin/checkout.c:979 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11539,7 +11679,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:974 +#: builtin/checkout.c:998 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11568,19 +11708,19 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1033 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1037 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:1053 builtin/checkout.c:1315 +#: builtin/checkout.c:1077 builtin/checkout.c:1339 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1152 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11589,7 +11729,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:1135 +#: builtin/checkout.c:1159 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" @@ -11609,51 +11749,51 @@ msgstr "" "ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n" "votre config." -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1169 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1235 msgid "only one reference expected" msgstr "une seule référence attendue" -#: builtin/checkout.c:1228 +#: builtin/checkout.c:1252 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 +#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1287 builtin/checkout.c:1649 +#: builtin/checkout.c:1311 builtin/checkout.c:1677 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1334 +#: builtin/checkout.c:1358 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "branche attendue, mais étiquette '%s' reçue" -#: builtin/checkout.c:1336 +#: builtin/checkout.c:1360 #, 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:1337 builtin/checkout.c:1345 +#: builtin/checkout.c:1361 builtin/checkout.c:1369 #, c-format msgid "a branch is expected, got '%s'" msgstr "une branche est attendue, mais '%s' a été reçue" -#: builtin/checkout.c:1340 +#: builtin/checkout.c:1364 #, 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:1356 +#: builtin/checkout.c:1380 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11661,7 +11801,7 @@ msgstr "" "impossible de basculer de branche pendant une fusion\n" "Envisagez \"git merge --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1360 +#: builtin/checkout.c:1384 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11669,7 +11809,7 @@ msgstr "" "impossible de basculer de branche pendant une session am\n" "Envisagez \"git am --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1388 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11677,7 +11817,7 @@ msgstr "" "impossible de basculer de branche pendant un rebasage\n" "Envisagez \"git rebase --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1392 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11685,7 +11825,7 @@ msgstr "" "impossible de basculer de branche pendant un picorage\n" "Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1396 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11693,144 +11833,146 @@ msgstr "" "impossible de basculer de branche pendant un retour\n" "Envisagez \"git revert --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1400 msgid "you are switching branch while bisecting" msgstr "Vous basculez de branche en cours de bissection" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1407 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 +#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418 #, 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:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 -#: builtin/checkout.c:1409 builtin/checkout.c:1414 +#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428 +#: builtin/checkout.c:1433 builtin/checkout.c:1438 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1435 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' n'accepte pas <point-de-départ>" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1443 #, 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:1426 +#: builtin/checkout.c:1450 msgid "missing branch or commit argument" msgstr "argument de branche ou de commit manquant" -#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 -#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 -#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 -#: builtin/send-pack.c:174 +#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80 +#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" -#: builtin/checkout.c:1469 +#: builtin/checkout.c:1493 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322 msgid "style" msgstr "style" -#: builtin/checkout.c:1471 +#: builtin/checkout.c:1495 msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1483 builtin/worktree.c:496 +#: builtin/checkout.c:1507 builtin/worktree.c:499 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1508 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1486 +#: builtin/checkout.c:1510 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1512 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1512 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1490 builtin/merge.c:289 +#: builtin/checkout.c:1514 builtin/merge.c:292 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1517 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:1506 +#: builtin/checkout.c:1530 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1509 +#: builtin/checkout.c:1533 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1513 +#: builtin/checkout.c:1537 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:1565 -msgid "-b, -B and --orphan are mutually exclusive" -msgstr "-b, -B et --orphan sont mutuellement exclusifs" +#: builtin/checkout.c:1592 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" +msgstr "-%c, -%c et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1568 +#: builtin/checkout.c:1596 msgid "-p and --overlay are mutually exclusive" msgstr "-p et --overlay sont mutuellement exclusifs" -#: builtin/checkout.c:1605 +#: builtin/checkout.c:1633 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1610 -msgid "missing branch name; try -b" -msgstr "nom de branche manquant ; essayez -b" +#: builtin/checkout.c:1638 +#, c-format +msgid "missing branch name; try -%c" +msgstr "nom de branche manquant ; essayez -%c" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1670 #, c-format msgid "could not resolve %s" msgstr "impossible de résoudre %s" -#: builtin/checkout.c:1658 +#: builtin/checkout.c:1686 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1693 #, 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:1669 +#: builtin/checkout.c:1697 #, 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:1678 +#: builtin/checkout.c:1706 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file est incompatible avec --detach" -#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 +#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file est incompatible avec --patch" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1720 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11838,110 +11980,110 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1725 msgid "you must specify path(s) to restore" msgstr "Vous devez spécifier un ou des chemins à restaurer" -#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 -#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 +#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802 +#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1724 +#: builtin/checkout.c:1752 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1726 +#: builtin/checkout.c:1754 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1727 +#: builtin/checkout.c:1755 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1757 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" "essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)" -#: builtin/checkout.c:1730 +#: builtin/checkout.c:1758 msgid "use overlay mode (default)" msgstr "utiliser le mode de superposition (défaut)" -#: builtin/checkout.c:1775 +#: builtin/checkout.c:1803 msgid "create and switch to a new branch" msgstr "créer et basculer sur une nouvelle branche" -#: builtin/checkout.c:1777 +#: builtin/checkout.c:1805 msgid "create/reset and switch to a branch" msgstr "créer/réinitialiser et basculer sur une branche" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1807 msgid "second guess 'git switch <no-such-branch>'" msgstr "interpréter 'git switch <branche-inexistante>'" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1809 msgid "throw away local modifications" msgstr "laisser tomber les modifications locales" -#: builtin/checkout.c:1813 +#: builtin/checkout.c:1843 msgid "which tree-ish to checkout from" msgstr "de quel <arbre-esque> faire l'extraction" -#: builtin/checkout.c:1815 +#: builtin/checkout.c:1845 msgid "restore the index" msgstr "restaurer l'index" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1847 msgid "restore the working tree (default)" msgstr "restaurer l'arbre de travail (par défaut)" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1849 msgid "ignore unmerged entries" msgstr "ignorer les entrées non-fusionnées" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1850 msgid "use overlay mode" msgstr "utiliser le mode de superposition" -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..." -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "Suppression de %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "Supprimerait %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "Ignore le dépôt %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "Ignorerait le dépôt %s\n" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "échec de la suppression de %s" -#: builtin/clean.c:37 +#: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" msgstr "lstat de %s impossible\n" -#: builtin/clean.c:301 git-add--interactive.perl:595 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -11954,7 +12096,7 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" " - (vide) ne rien sélectionner\n" -#: builtin/clean.c:305 git-add--interactive.perl:604 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -11981,27 +12123,27 @@ msgstr "" msgid "Huh (%s)?\n" msgstr "Hein (%s) ?\n" -#: builtin/clean.c:663 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs à ignorer>> " -#: builtin/clean.c:700 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" -#: builtin/clean.c:721 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:795 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12019,56 +12161,56 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:831 +#: builtin/clean.c:825 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:847 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:909 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:911 +#: builtin/clean.c:905 msgid "force" msgstr "forcer" -#: builtin/clean.c:912 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:914 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 -#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "motif" -#: builtin/clean.c:916 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:917 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:919 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:937 +#: builtin/clean.c:931 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" -#: builtin/clean.c:941 +#: builtin/clean.c:935 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -12076,7 +12218,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:944 +#: builtin/clean.c:938 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -12092,7 +12234,7 @@ msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536 msgid "create a bare repository" msgstr "créer un dépôt nu" @@ -12112,11 +12254,11 @@ msgstr "ne pas utiliser de liens durs locaux, toujours copier" msgid "setup as shared repository" msgstr "régler comme dépôt partagé" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "spécificateur de chemin" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" @@ -12124,11 +12266,11 @@ msgstr "initialiser les sous-modules dans le clone" msgid "number of submodules cloned in parallel" msgstr "nombre de sous-modules clonés en parallèle" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:533 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:534 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" @@ -12143,7 +12285,7 @@ msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3441 builtin/repack.c:327 +#: builtin/pack-objects.c:3442 builtin/repack.c:329 msgid "name" msgstr "nom" @@ -12159,8 +12301,8 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 -#: builtin/pull.c:207 +#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848 +#: builtin/pull.c:208 msgid "depth" msgstr "profondeur" @@ -12168,7 +12310,8 @@ msgstr "profondeur" msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 +#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431 +#: builtin/pull.c:211 msgid "time" msgstr "heure" @@ -12176,12 +12319,12 @@ msgstr "heure" msgid "create a shallow clone since a specific time" msgstr "créer un clone superficiel depuis une date spécifique" -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1480 +#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304 msgid "revision" msgstr "révision" -#: builtin/clone.c:130 builtin/fetch.c:173 +#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "" "approfondir l'historique d'un clone superficiel en excluant une révision" @@ -12201,11 +12344,11 @@ msgstr "" msgid "any cloned submodules will be shallow" msgstr "tous les sous-modules clonés seront superficiels" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:542 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:543 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" @@ -12217,23 +12360,23 @@ msgstr "clé=valeur" msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171 msgid "server-specific" msgstr "spécifique au serveur" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172 msgid "option to transmit" msgstr "option à transmettre" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 -#: builtin/push.c:574 +#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234 +#: builtin/push.c:571 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 -#: builtin/push.c:576 +#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237 +#: builtin/push.c:573 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" @@ -12266,32 +12409,32 @@ msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n" msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:430 +#: builtin/clone.c:431 #, c-format msgid "failed to start iterator over '%s'" msgstr "échec du démarrage un itérateur sur '%s'" -#: builtin/clone.c:460 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:464 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:469 +#: builtin/clone.c:471 #, c-format msgid "failed to iterate over '%s'" msgstr "échec de l'itération sur '%s'" -#: builtin/clone.c:494 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:508 +#: builtin/clone.c:512 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12301,102 +12444,102 @@ 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:585 +#: builtin/clone.c:589 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:705 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "impossible de mettre à jour %s" -#: builtin/clone.c:753 +#: builtin/clone.c:756 msgid "failed to initialize sparse-checkout" msgstr "échec lors de l'initialisation l'extraction partielle" -#: builtin/clone.c:776 +#: builtin/clone.c:779 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD distante réfère à une référence non existante, impossible de " "l'extraire.\n" -#: builtin/clone.c:807 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:862 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "impossible d'écrire les paramètres dans le fichier de configuration" -#: builtin/clone.c:925 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" -#: builtin/clone.c:927 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "impossible de délier le fichier temporaire alternates" -#: builtin/clone.c:965 builtin/receive-pack.c:1950 +#: builtin/clone.c:971 builtin/receive-pack.c:1972 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:969 +#: builtin/clone.c:975 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:982 +#: builtin/clone.c:988 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:985 +#: builtin/clone.c:991 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:998 +#: builtin/clone.c:1004 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:1004 builtin/fetch.c:1796 +#: builtin/clone.c:1010 builtin/fetch.c:1789 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:1014 +#: builtin/clone.c:1020 #, 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:1024 +#: builtin/clone.c:1030 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 +#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271 +#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327 #, 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:1044 +#: builtin/clone.c:1050 #, 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:1064 +#: builtin/clone.c:1070 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:1066 +#: builtin/clone.c:1072 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:1090 +#: builtin/clone.c:1096 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12404,41 +12547,41 @@ msgstr "" "clone --recursive n'est pas compatible avec à la fois --reference et --" "reference-if-able" -#: builtin/clone.c:1154 +#: builtin/clone.c:1160 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:1156 +#: builtin/clone.c:1162 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:1158 +#: builtin/clone.c:1164 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:1160 +#: builtin/clone.c:1166 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:1163 +#: builtin/clone.c:1169 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:1168 +#: builtin/clone.c:1174 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:1243 builtin/clone.c:1251 +#: builtin/clone.c:1249 builtin/clone.c:1257 #, 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:1254 +#: builtin/clone.c:1260 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -12474,6 +12617,96 @@ msgstr "Remplissage d'espace entre les colonnes" msgid "--command must be the first argument" msgstr "--command doit être le premier argument" +#: builtin/commit-graph.c:11 builtin/commit-graph.c:19 +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]progress] <split options>" +msgstr "git commit-graph write [--object-dir <répertoire-d'objet>] [--append] [--split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--[no-]progress] <options de division>" + +#: builtin/commit-graph.c:60 +#, c-format +msgid "could not find object directory matching %s" +msgstr "impossible de trouver le répertoire objet correspondant à %s" + +#: builtin/commit-graph.c:76 builtin/commit-graph.c:152 +#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678 +msgid "dir" +msgstr "répertoire" + +#: builtin/commit-graph.c:77 builtin/commit-graph.c:153 +#: builtin/commit-graph.c:258 +msgid "The object directory to store the graph" +msgstr "Le répertoire d'objet où stocker le graphe" + +#: builtin/commit-graph.c:79 +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:102 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "impossible d'ouvrir le graphe de commit '%s'" + +#: builtin/commit-graph.c:136 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "argument de --split non reconnu, %s" + +#: builtin/commit-graph.c:155 +msgid "start walk at all refs" +msgstr "commencer le parcours à toutes les réfs" + +#: builtin/commit-graph.c:157 +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:159 +msgid "start walk at commits listed by stdin" +msgstr "commencer le parcours aux commits listés sur stdin" + +#: builtin/commit-graph.c:161 +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:163 +msgid "enable computation for changed paths" +msgstr "activer le calcul pour les chemins modifiés" + +#: builtin/commit-graph.c:166 +msgid "allow writing an incremental commit-graph file" +msgstr "permettre d'écrire un fichier incrémental de graphe de commit" + +#: builtin/commit-graph.c:170 +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:172 +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:174 +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:190 +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:229 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "ID d'objet non hexadécimal inattendu : %s" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -12487,7 +12720,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "le parent dupliqué %s est ignoré" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:547 #, c-format msgid "not a valid object name %s" msgstr "nom d'objet invalide %s" @@ -12515,13 +12748,13 @@ msgstr "parent" msgid "id of a parent commit object" msgstr "id d'un objet commit parent" -#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 -#: builtin/tag.c:412 +#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474 +#: builtin/tag.c:413 msgid "message" msgstr "message" -#: builtin/commit-tree.c:115 builtin/commit.c:1501 +#: builtin/commit-tree.c:115 builtin/commit.c:1506 msgid "commit message" msgstr "message de validation" @@ -12529,8 +12762,8 @@ msgstr "message de validation" msgid "read commit log message from file" msgstr "lire le message de validation depuis un fichier" -#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 -#: builtin/pull.c:175 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signer la validation avec GPG" @@ -12577,10 +12810,14 @@ msgstr "" "\n" #: builtin/commit.c:63 +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "Sinon, veuillez utiliser 'git rebase --skip'\n" + +#: builtin/commit.c:66 msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "Sinon, veuillez utiliser 'git cherry-pick --skip'\n" -#: builtin/commit.c:66 +#: builtin/commit.c:69 msgid "" "and then use:\n" "\n" @@ -12602,69 +12839,73 @@ msgstr "" " git cherry-pick --skipped\n" "\n" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" -#: builtin/commit.c:351 +#: builtin/commit.c:348 msgid "--pathspec-from-file with -a does not make sense" msgstr "--pathspec-from-file avec l'option -a n'a pas de sens" -#: builtin/commit.c:364 +#: builtin/commit.c:361 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:376 +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "impossible de créer l'index temporaire" -#: builtin/commit.c:385 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "échec de l'ajout interactif" -#: builtin/commit.c:400 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "impossible de mettre à jour l'index temporaire" -#: builtin/commit.c:402 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "Impossible de mettre à jour l'arbre de cache principal" -#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "impossible d'écrire le fichier new_index" -#: builtin/commit.c:479 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." -#: builtin/commit.c:481 +#: builtin/commit.c:478 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." -#: builtin/commit.c:489 +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "impossible de faire une validation partielle pendant un rebasage." + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "impossible de lire l'index" -#: builtin/commit.c:508 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" -#: builtin/commit.c:606 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "entête d'auteur manquant dans le commit '%s'" -#: builtin/commit.c:608 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "le commit '%s' a une ligne d'auteur malformée" -#: builtin/commit.c:627 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" -#: builtin/commit.c:680 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -12672,38 +12913,38 @@ 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:718 builtin/commit.c:751 builtin/commit.c:1097 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:730 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:319 #, 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:732 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" -#: builtin/commit.c:736 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:767 builtin/commit.c:783 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:774 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" -#: builtin/commit.c:834 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:853 +#: builtin/commit.c:852 #, c-format msgid "" "\n" @@ -12718,7 +12959,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:858 +#: builtin/commit.c:857 #, c-format msgid "" "\n" @@ -12733,7 +12974,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:871 +#: builtin/commit.c:870 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12743,7 +12984,7 @@ msgstr "" "commençant par '%c' seront ignorées, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:879 +#: builtin/commit.c:878 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12754,144 +12995,148 @@ 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:896 +#: builtin/commit.c:895 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:904 +#: builtin/commit.c:903 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:911 +#: builtin/commit.c:910 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:929 +#: builtin/commit.c:928 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:997 +#: builtin/commit.c:999 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:1011 builtin/tag.c:275 +#: builtin/commit.c:1013 builtin/tag.c:276 #, 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:1055 +#: builtin/commit.c:1057 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun " "auteur existant" -#: builtin/commit.c:1069 +#: builtin/commit.c:1071 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Mode de fichier ignoré invalide '%s'" -#: builtin/commit.c:1087 builtin/commit.c:1327 +#: builtin/commit.c:1089 builtin/commit.c:1333 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1127 +#: builtin/commit.c:1129 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1171 +#: builtin/commit.c:1173 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens" -#: builtin/commit.c:1180 +#: builtin/commit.c:1182 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1183 +#: builtin/commit.c:1185 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1185 +#: builtin/commit.c:1187 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:1188 +#: builtin/commit.c:1189 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "Vous êtes en plein rebasage -- impossible de corriger (amend)." + +#: builtin/commit.c:1192 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble" -#: builtin/commit.c:1198 +#: builtin/commit.c:1202 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." -#: builtin/commit.c:1200 +#: builtin/commit.c:1204 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F." -#: builtin/commit.c:1208 +#: builtin/commit.c:1213 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:1225 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Une seule option parmi --include/--only/--all/--interactive/--patch peut " "être utilisée." -#: builtin/commit.c:1231 +#: builtin/commit.c:1237 #, 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:1362 builtin/commit.c:1524 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show status concisely" msgstr "afficher l'état avec concision" -#: builtin/commit.c:1364 builtin/commit.c:1526 +#: builtin/commit.c:1370 builtin/commit.c:1531 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1366 +#: builtin/commit.c:1372 msgid "show stash information" msgstr "afficher l'information de remisage" -#: builtin/commit.c:1368 builtin/commit.c:1528 +#: builtin/commit.c:1374 builtin/commit.c:1533 msgid "compute full ahead/behind values" msgstr "calcule les valeurs complètes en avance/en retard" -#: builtin/commit.c:1370 +#: builtin/commit.c:1376 msgid "version" msgstr "version" -#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 -#: builtin/worktree.c:643 +#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 +#: builtin/worktree.c:646 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1373 builtin/commit.c:1532 +#: builtin/commit.c:1379 builtin/commit.c:1537 msgid "show status in long format (default)" msgstr "afficher l'état en format long (par défaut)" -#: builtin/commit.c:1376 builtin/commit.c:1535 +#: builtin/commit.c:1382 builtin/commit.c:1540 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 +#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 +#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336 msgid "mode" msgstr "mode" -#: builtin/commit.c:1379 builtin/commit.c:1538 +#: builtin/commit.c:1385 builtin/commit.c:1543 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:1383 +#: builtin/commit.c:1389 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -12899,11 +13144,11 @@ msgstr "" "afficher les fichiers ignorés, \"mode\" facultatif : traditional " "(traditionnel), matching (correspondant), no. (Défaut : traditional)" -#: builtin/commit.c:1385 parse-options.h:192 +#: builtin/commit.c:1391 parse-options.h:192 msgid "when" msgstr "quand" -#: builtin/commit.c:1386 +#: builtin/commit.c:1392 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -12911,175 +13156,175 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1388 +#: builtin/commit.c:1394 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1389 +#: builtin/commit.c:1395 msgid "do not detect renames" msgstr "ne pas détecter les renommages" -#: builtin/commit.c:1391 +#: builtin/commit.c:1397 msgid "detect renames, optionally set similarity index" msgstr "" "détecter les renommages, en spécifiant optionnellement le facteur de " "similarité" -#: builtin/commit.c:1411 +#: builtin/commit.c:1417 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:1494 +#: builtin/commit.c:1499 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1495 +#: builtin/commit.c:1500 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1497 +#: builtin/commit.c:1502 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 +#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1499 +#: builtin/commit.c:1504 msgid "author" msgstr "auteur" -#: builtin/commit.c:1499 +#: builtin/commit.c:1504 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1500 builtin/gc.c:538 +#: builtin/commit.c:1505 builtin/gc.c:538 msgid "date" msgstr "date" -#: builtin/commit.c:1500 +#: builtin/commit.c:1505 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 -#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509 +#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "commit" -#: builtin/commit.c:1502 +#: builtin/commit.c:1507 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1503 +#: builtin/commit.c:1508 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1504 +#: builtin/commit.c:1509 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "utiliser un message au format autosquash pour corriger le commit spécifié" -#: builtin/commit.c:1505 +#: builtin/commit.c:1510 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:1506 +#: builtin/commit.c:1511 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:1507 builtin/log.c:1634 builtin/merge.c:290 -#: builtin/pull.c:144 builtin/revert.c:110 +#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1508 +#: builtin/commit.c:1513 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1509 +#: builtin/commit.c:1514 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1511 +#: builtin/commit.c:1516 msgid "include status in commit message template" msgstr "inclure l'état dans le modèle de message de validation" -#: builtin/commit.c:1516 +#: builtin/commit.c:1521 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1517 +#: builtin/commit.c:1522 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1518 +#: builtin/commit.c:1523 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1519 +#: builtin/commit.c:1524 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1520 +#: builtin/commit.c:1525 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1521 +#: builtin/commit.c:1526 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1522 +#: builtin/commit.c:1527 msgid "bypass pre-commit and commit-msg hooks" msgstr "éviter d'utiliser les crochets pre-commit et commit-msg" -#: builtin/commit.c:1523 +#: builtin/commit.c:1528 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1536 +#: builtin/commit.c:1541 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1537 +#: builtin/commit.c:1542 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1544 +#: builtin/commit.c:1549 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1546 +#: builtin/commit.c:1551 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1619 +#: builtin/commit.c:1624 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1626 +#: builtin/commit.c:1631 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1645 +#: builtin/commit.c:1652 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1652 +#: builtin/commit.c:1659 #, 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:1657 +#: builtin/commit.c:1664 #, 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:1691 +#: builtin/commit.c:1698 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -13089,80 +13334,6 @@ msgstr "" "new_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/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -msgstr "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" - -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 -msgid "" -"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" -msgstr "" -"git commit-graph write [--object-dir <répertoire-d'objet>] [--append|--" -"split] [--reachable|--stdin-packs|--stdin-commits] [--|no-]progress] " -"<options de division>" - -#: builtin/commit-graph.c:52 -#, c-format -msgid "could not find object directory matching %s" -msgstr "impossible de trouver le répertoire objet correspondant à %s" - -#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 -#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 -msgid "dir" -msgstr "répertoire" - -#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 -#: builtin/commit-graph.c:211 -msgid "The object directory to store the graph" -msgstr "Le répertoire d'objet où stocker le graphe" - -#: builtin/commit-graph.c:71 -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:94 t/helper/test-read-graph.c:23 -#, c-format -msgid "Could not open commit-graph '%s'" -msgstr "impossible d'ouvrir le graphe de commit '%s'" - -#: builtin/commit-graph.c:128 -msgid "start walk at all refs" -msgstr "commencer le parcours à toutes les réfs" - -#: builtin/commit-graph.c:130 -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:132 -msgid "start walk at commits listed by stdin" -msgstr "commencer le parcours aux commits listés sur stdin" - -#: builtin/commit-graph.c:134 -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:137 -msgid "allow writing an incremental commit-graph file" -msgstr "permettre d'écrire un fichier incrémental de graphe de commit" - -#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 -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:141 -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:159 -msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" -msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs" - #: builtin/config.c:11 msgid "git config [<options>]" msgstr "git config [<options>]" @@ -13492,51 +13663,46 @@ msgstr "git describe [<options>] <commit ou apparenté>*" msgid "git describe [<options>] --dirty" msgstr "git describe [<options>] --dirty" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "tête" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "léger" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "annoté" -#: builtin/describe.c:275 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "l'étiquette annotée %s n'est pas disponible" -#: builtin/describe.c:279 -#, c-format -msgid "annotated tag %s has no embedded name" -msgstr "l'étiquette annotée %s n'a pas de nom embarqué" - #: builtin/describe.c:281 #, c-format -msgid "tag '%s' is really '%s' here" -msgstr "l'étiquette '%s' est en fait '%s'" +msgid "tag '%s' is externally known as '%s'" +msgstr "l'étiquette '%s' est connue à l'extérieur comme '%s'" -#: builtin/describe.c:325 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "aucune étiquette ne correspond parfaitement à '%s'" -#: builtin/describe.c:327 +#: builtin/describe.c:330 #, 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:394 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "recherche terminée à %s\n" -#: builtin/describe.c:421 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -13545,7 +13711,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:425 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -13554,12 +13720,12 @@ msgstr "" "Aucune étiquette ne peut décrire '%s'.\n" "Essayez --always, ou créez des étiquettes." -#: builtin/describe.c:455 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits parcourus\n" -#: builtin/describe.c:458 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -13569,92 +13735,92 @@ msgstr "" "affichées\n" "abandon de la recherche à %s\n" -#: builtin/describe.c:526 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "décrire %s\n" -#: builtin/describe.c:529 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "%s n'est pas un nom d'objet valide" -#: builtin/describe.c:537 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s n'est ni un commit ni un blob" -#: builtin/describe.c:551 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "rechercher l'étiquette qui suit le commit" -#: builtin/describe.c:552 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "déboguer la stratégie de recherche sur stderr" -#: builtin/describe.c:553 +#: builtin/describe.c:556 msgid "use any ref" msgstr "utiliser n'importe quelle référence" -#: builtin/describe.c:554 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "utiliser n'importe quelle étiquette, même non-annotée" -#: builtin/describe.c:555 +#: builtin/describe.c:558 msgid "always use long format" msgstr "toujours utiliser le format long" -#: builtin/describe.c:556 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "ne suivre que le premier parent" -#: builtin/describe.c:559 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "n'afficher que les correspondances exactes" -#: builtin/describe.c:561 +#: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" msgstr "" "considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)" -#: builtin/describe.c:563 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "ne considérer que les étiquettes correspondant à <motif>" -#: builtin/describe.c:565 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "ne pas considérer les étiquettes correspondant à <motif>" -#: builtin/describe.c:567 builtin/name-rev.c:535 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrégés en dernier recours" -#: builtin/describe.c:568 builtin/describe.c:571 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "marque" -#: builtin/describe.c:569 +#: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")" -#: builtin/describe.c:572 +#: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")" -#: builtin/describe.c:590 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "--long et --abbrev=0 sont incompatibles" -#: builtin/describe.c:619 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit." -#: builtin/describe.c:670 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty est incompatible avec la spécification de commits ou assimilés" -#: builtin/describe.c:672 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "--broken est incompatible avec les commits ou assimilés" @@ -13891,7 +14057,7 @@ msgstr "Utiliser la fonction \"done\" pour terminer le flux" msgid "Skip output of blob data" msgstr "Sauter l'affichage de données de blob" -#: builtin/fast-export.c:1177 builtin/log.c:1705 +#: builtin/fast-export.c:1177 builtin/log.c:1724 msgid "refspec" msgstr "spécificateur de référence" @@ -13922,107 +14088,108 @@ msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "" "Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists" -#: builtin/fetch.c:34 +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/fetch.c:35 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -#: builtin/fetch.c:36 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" -#: builtin/fetch.c:37 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:116 +#: builtin/fetch.c:117 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel ne peut pas être négatif" -#: builtin/fetch.c:139 builtin/pull.c:184 +#: builtin/fetch.c:140 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "récupérer depuis tous les dépôts distants" -#: builtin/fetch.c:141 builtin/pull.c:228 +#: builtin/fetch.c:142 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "définir la branche amont pour git pull/fetch" -#: builtin/fetch.c:143 builtin/pull.c:187 +#: builtin/fetch.c:144 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:145 builtin/pull.c:190 +#: builtin/fetch.c:146 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:146 +#: builtin/fetch.c:147 msgid "force overwrite of local reference" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:148 +#: builtin/fetch.c:149 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:150 builtin/pull.c:194 +#: builtin/fetch.c:151 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:152 +#: builtin/fetch.c:153 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:154 +#: builtin/fetch.c:155 msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules récupérés en parallèle" -#: builtin/fetch.c:156 builtin/pull.c:197 +#: builtin/fetch.c:157 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "" "éliminer les branches de suivi distant si la branche n'existe plus dans le " "dépôt distant" -#: builtin/fetch.c:158 +#: builtin/fetch.c:159 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "éliminer les étiquettes locales qui ont disparu du dépôt distant et qui " "encombrent les étiquettes modifiées" -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 +#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:160 +#: builtin/fetch.c:161 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:164 builtin/pull.c:205 +#: builtin/fetch.c:165 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:166 +#: builtin/fetch.c:167 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 +#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:171 +#: builtin/fetch.c:172 builtin/pull.c:212 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:177 builtin/pull.c:211 +#: builtin/fetch.c:178 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:180 +#: builtin/fetch.c:181 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:183 +#: builtin/fetch.c:184 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14030,95 +14197,95 @@ 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:187 builtin/pull.c:214 +#: builtin/fetch.c:188 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:188 builtin/pull.c:216 +#: builtin/fetch.c:189 builtin/pull.c:226 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:189 builtin/pull.c:217 +#: builtin/fetch.c:190 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:196 +#: builtin/fetch.c:197 builtin/pull.c:240 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:199 +#: builtin/fetch.c:200 msgid "run 'gc --auto' after fetching" msgstr "lancer 'gc --auto' après la récupération" -#: builtin/fetch.c:201 builtin/pull.c:226 +#: builtin/fetch.c:202 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "vérifier les mises à jour forcées sur toutes les branches mises à jour" -#: builtin/fetch.c:203 +#: builtin/fetch.c:204 msgid "write the commit-graph after fetching" msgstr "écrire le graphe de commits après le rapatriement" -#: builtin/fetch.c:513 +#: builtin/fetch.c:514 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:653 +#: builtin/fetch.c:654 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" "le paramètre de configuration fetch.output contient une valeur invalide %s" -#: builtin/fetch.c:751 +#: builtin/fetch.c:752 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:755 +#: builtin/fetch.c:756 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 +#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:769 +#: builtin/fetch.c:770 msgid "can't fetch in current branch" msgstr "impossible de récupérer dans la branche actuelle" -#: builtin/fetch.c:779 +#: builtin/fetch.c:780 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 +#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840 +#: builtin/fetch.c:852 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:784 +#: builtin/fetch.c:785 msgid "would clobber existing tag" msgstr "écraserait l'étiquette existante" -#: builtin/fetch.c:806 +#: builtin/fetch.c:807 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:810 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:812 +#: builtin/fetch.c:813 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:851 +#: builtin/fetch.c:852 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:856 +#: builtin/fetch.c:857 msgid "non-fast-forward" msgstr "pas en avance rapide" -#: builtin/fetch.c:877 +#: builtin/fetch.c:878 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" @@ -14128,7 +14295,7 @@ msgstr "" "mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n" "'--show-forced-update' ou lancez 'git config fetch.showForcedUpdates true'." -#: builtin/fetch.c:881 +#: builtin/fetch.c:882 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14140,23 +14307,23 @@ msgstr "" "Vous pouvez utiliser '--no-show-forced-update' ou lancer\n" "'git config fetch.showForcedUpdates false' pour éviter ceci.\n" -#: builtin/fetch.c:920 +#: builtin/fetch.c:914 #, 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:941 +#: builtin/fetch.c:935 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "%s rejeté parce que les racines superficielles ne sont pas mises à jour" -#: builtin/fetch.c:1026 builtin/fetch.c:1164 +#: builtin/fetch.c:1020 builtin/fetch.c:1158 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1031 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14165,56 +14332,56 @@ 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:1134 +#: builtin/fetch.c:1128 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:1135 +#: builtin/fetch.c:1129 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1161 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:1168 builtin/remote.c:1112 +#: builtin/fetch.c:1162 builtin/remote.c:1112 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:1191 +#: builtin/fetch.c:1185 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu" -#: builtin/fetch.c:1210 +#: builtin/fetch.c:1204 #, 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:1213 +#: builtin/fetch.c:1207 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:1421 +#: builtin/fetch.c:1415 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "branches multiples détectées, imcompatible avec --set-upstream" -#: builtin/fetch.c:1436 +#: builtin/fetch.c:1430 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:1438 +#: builtin/fetch.c:1432 msgid "not setting upstream for a remote tag" msgstr "dépôt amont non défini pour l'étiquette distante" -#: builtin/fetch.c:1440 +#: builtin/fetch.c:1434 msgid "unknown branch type" msgstr "type de branche inconnu" -#: builtin/fetch.c:1442 +#: builtin/fetch.c:1436 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14222,22 +14389,22 @@ msgstr "" "Aucune branche source trouvée.\n" "Vous devez spécifier exactement une branche avec l'option --set-upstream." -#: builtin/fetch.c:1568 builtin/fetch.c:1631 +#: builtin/fetch.c:1562 builtin/fetch.c:1625 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 +#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1590 +#: builtin/fetch.c:1584 #, 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:1693 +#: builtin/fetch.c:1687 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14245,46 +14412,46 @@ msgstr "" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" "distant depuis lesquels les nouvelles révisions devraient être récupérées." -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1724 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1773 msgid "Negative depth in --deepen is not supported" msgstr "Une profondeur négative dans --deepen n'est pas supportée" -#: builtin/fetch.c:1782 +#: builtin/fetch.c:1775 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen et --depth sont mutuellement exclusifs" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1780 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1789 +#: builtin/fetch.c:1782 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:1805 +#: builtin/fetch.c:1798 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1800 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:1816 +#: builtin/fetch.c:1809 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1823 +#: builtin/fetch.c:1816 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "La récupération d'un groupe et les spécifications de référence n'ont pas de " "sens" -#: builtin/fetch.c:1841 +#: builtin/fetch.c:1834 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14292,29 +14459,29 @@ msgstr "" "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans " "extensions.partialClone" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:18 msgid "populate log with at most <n> entries from shortlog" msgstr "peupler le journal avec au plus <n> éléments depuis le journal court" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "alias pour --log (obsolète)" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "texte" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "utiliser <texte> comme début de message" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "fichier d'où lire" @@ -14354,7 +14521,7 @@ msgstr "échapper les champs réservés pour compatibilité avec Tcl" msgid "show only <n> matched refs" msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "respecter les couleurs de formatage" @@ -14600,7 +14767,7 @@ msgstr "activer une vérification plus strict" msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:786 builtin/prune.c:132 +#: builtin/fsck.c:786 builtin/prune.c:134 msgid "show progress" msgstr "afficher la progression" @@ -14636,12 +14803,12 @@ msgstr "Échec du stat de %s : %s" msgid "failed to parse '%s' value '%s'" msgstr "échec de l'analyse de '%s' valeur '%s'" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "impossible de faire un stat de '%s'" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" @@ -14744,266 +14911,266 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 -#: builtin/pack-objects.c:2854 +#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730 +#: builtin/pack-objects.c:2855 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" -#: builtin/grep.c:633 +#: builtin/grep.c:655 #, 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:704 +#: builtin/grep.c:724 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend une valeur numérique" -#: builtin/grep.c:803 +#: builtin/grep.c:823 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:805 +#: builtin/grep.c:825 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:807 +#: builtin/grep.c:827 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:809 +#: builtin/grep.c:829 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" -#: builtin/grep.c:811 +#: builtin/grep.c:831 msgid "recursively search in each submodule" msgstr "rechercher récursivement dans chaque sous-module" -#: builtin/grep.c:814 +#: builtin/grep.c:834 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:816 +#: builtin/grep.c:836 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" -#: builtin/grep.c:818 +#: builtin/grep.c:838 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:820 +#: builtin/grep.c:840 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:822 +#: builtin/grep.c:842 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:825 +#: builtin/grep.c:845 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:827 +#: builtin/grep.c:847 msgid "search in subdirectories (default)" msgstr "rechercher dans les sous-répertoires (défaut)" -#: builtin/grep.c:829 +#: builtin/grep.c:849 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:833 +#: builtin/grep.c:853 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:836 +#: builtin/grep.c:856 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:839 +#: builtin/grep.c:859 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:842 +#: builtin/grep.c:862 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:845 +#: builtin/grep.c:865 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:846 +#: builtin/grep.c:866 msgid "show column number of first match" msgstr "afficher le numéro de colonne de la première correspondance" -#: builtin/grep.c:847 +#: builtin/grep.c:867 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:848 +#: builtin/grep.c:868 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:850 +#: builtin/grep.c:870 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:852 +#: builtin/grep.c:872 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:854 +#: builtin/grep.c:874 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:857 +#: builtin/grep.c:877 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:859 +#: builtin/grep.c:879 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:862 +#: builtin/grep.c:882 msgid "show only matching parts of a line" msgstr "n'afficher que les parties correspondantes d'une ligne" -#: builtin/grep.c:864 +#: builtin/grep.c:884 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:865 +#: builtin/grep.c:885 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:867 +#: builtin/grep.c:887 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:869 +#: builtin/grep.c:889 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:872 +#: builtin/grep.c:892 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:875 +#: builtin/grep.c:895 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:877 +#: builtin/grep.c:897 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:879 +#: builtin/grep.c:899 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:880 +#: builtin/grep.c:900 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:883 +#: builtin/grep.c:903 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:885 +#: builtin/grep.c:905 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:888 +#: builtin/grep.c:908 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:890 +#: builtin/grep.c:910 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:892 +#: builtin/grep.c:912 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:904 +#: builtin/grep.c:924 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:906 +#: builtin/grep.c:926 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:908 +#: builtin/grep.c:928 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:912 +#: builtin/grep.c:932 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:912 +#: builtin/grep.c:932 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:916 +#: builtin/grep.c:936 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:983 +#: builtin/grep.c:1003 msgid "no pattern given" msgstr "aucun motif fourni" -#: builtin/grep.c:1019 +#: builtin/grep.c:1039 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:1027 +#: builtin/grep.c:1047 #, c-format msgid "unable to resolve revision: %s" msgstr "impossible de résoudre la révision : %s" -#: builtin/grep.c:1057 +#: builtin/grep.c:1077 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked non supportée avec --recurse-submodules" -#: builtin/grep.c:1061 +#: builtin/grep.c:1081 msgid "invalid option combination, ignoring --threads" msgstr "option de combinaison invalide, ignore --threads" -#: builtin/grep.c:1064 builtin/pack-objects.c:3547 +#: builtin/grep.c:1084 builtin/pack-objects.c:3548 msgid "no threads support, ignoring --threads" msgstr "pas de support des fils, ignore --threads" -#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 +#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/grep.c:1101 +#: builtin/grep.c:1121 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:1127 +#: builtin/grep.c:1147 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index" -#: builtin/grep.c:1133 +#: builtin/grep.c:1153 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:1141 +#: builtin/grep.c:1161 msgid "both --cached and trees are given" msgstr "--cached et des arbres sont fournis en même temps" @@ -15046,66 +15213,66 @@ msgstr "" msgid "process file as it were from this path" msgstr "traiter le fichier comme s'il venait de ce chemin" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "afficher toutes les commandes disponibles" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "exclure les guides" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "afficher une liste de guides utiles" -#: builtin/help.c:49 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "afficher tous les noms de variables de configuration" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "afficher la page de manuel" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "afficher le manuel dans un navigateur web" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "afficher la page info" -#: builtin/help.c:56 +#: builtin/help.c:57 msgid "print command description" msgstr "afficher la description de la commande" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<commande>]" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "format d'aide non reconnu '%s'" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "échec de démarrage d'emacsclient." -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "échec d'analyse de la version d'emacsclient." -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la version d'emacsclient '%d' est trop ancienne (<22)." -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "échec de l'exécution de '%s'" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -15114,7 +15281,7 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n" "Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -15123,35 +15290,35 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n" "Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s' : visualiseur de manuel inconnu." -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "aucun visualiseur de manuel n'a pris en charge la demande" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "aucun visualiseur de 'info' n'a pris en charge la demande" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' est un alias de '%s'" -#: builtin/help.c:448 git.c:365 +#: builtin/help.c:534 git.c:367 #, c-format msgid "bad alias.%s string: %s" msgstr "Mauvais chaîne alias.%s : %s" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "usage : %s%s" -#: builtin/help.c:491 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "'git help config' pour plus d'information" @@ -15189,7 +15356,7 @@ msgstr "erreur de lecture sur l'entrée" msgid "used more bytes than were available" msgstr "plus d'octets utilisés que disponibles" -#: builtin/index-pack.c:288 builtin/pack-objects.c:606 +#: builtin/index-pack.c:288 builtin/pack-objects.c:607 msgid "pack too large for current definition of off_t" msgstr "le paquet est trop grand pour la définition actuelle de off_t" @@ -15197,6 +15364,11 @@ msgstr "le paquet est trop grand pour la définition actuelle de off_t" msgid "pack exceeds maximum allowed size" msgstr "le paquet dépasse la taille maximale permise" +#: builtin/index-pack.c:306 builtin/repack.c:250 +#, c-format +msgid "unable to create '%s'" +msgstr "impossible de créer '%s'" + #: builtin/index-pack.c:312 #, c-format msgid "cannot open packfile '%s'" @@ -15255,8 +15427,8 @@ msgstr "grave incohérence dans la décompression (inflate)" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:158 -#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 +#: builtin/index-pack.c:738 builtin/pack-objects.c:159 +#: builtin/pack-objects.c:219 builtin/pack-objects.c:314 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" @@ -15317,7 +15489,7 @@ msgstr "confusion extrême dans parse_pack_objects()" msgid "Resolving deltas" msgstr "Résolution des deltas" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" @@ -15351,169 +15523,178 @@ msgstr[1] "le paquet a %d deltas non résolus" msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1392 +#: builtin/index-pack.c:1391 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1405 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1430 #, c-format msgid "cannot write %s file '%s'" msgstr "impossible d'écrire le fichier %s '%s'" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1438 #, c-format msgid "cannot close written %s file '%s'" msgstr "impossible de fermer le fichier %s écrit '%s'" -#: builtin/index-pack.c:1463 +#: builtin/index-pack.c:1462 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1476 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1484 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 +#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1597 +#: builtin/index-pack.c:1596 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1599 +#: builtin/index-pack.c:1598 #, 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:1647 +#: builtin/index-pack.c:1646 #, 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:1654 +#: builtin/index-pack.c:1653 #, 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:1693 +#: builtin/index-pack.c:1692 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 -#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 +#: builtin/index-pack.c:1741 builtin/index-pack.c:1744 +#: builtin/index-pack.c:1760 builtin/index-pack.c:1764 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1781 +#: builtin/index-pack.c:1780 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1783 +#: builtin/index-pack.c:1782 msgid "--stdin requires a git repository" msgstr "--stdin requiert un dépôt git" -#: builtin/index-pack.c:1789 +#: builtin/index-pack.c:1788 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" -#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "erreur de fsck dans les objets paquets" -#: builtin/init-db.c:61 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "impossible de faire un stat du modèle '%s'" -#: builtin/init-db.c:66 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "impossible d'ouvrir le répertoire '%s'" -#: builtin/init-db.c:78 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "impossible de lire le lien '%s'" -#: builtin/init-db.c:80 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "impossible de créer un lien symbolique de '%s' '%s'" -#: builtin/init-db.c:86 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: builtin/init-db.c:90 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "modèle %s ignoré" -#: builtin/init-db.c:121 +#: builtin/init-db.c:123 #, c-format msgid "templates not found in %s" msgstr "modèles non trouvés dans %s" -#: builtin/init-db.c:136 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "pas de copie des modèles depuis '%s' : %s" -#: builtin/init-db.c:334 +#: builtin/init-db.c:356 #, c-format msgid "unable to handle file type %d" msgstr "impossible de traiter le fichier de type %d" -#: builtin/init-db.c:337 +#: builtin/init-db.c:359 #, c-format msgid "unable to move %s to %s" msgstr "impossible de déplacer %s vers %s" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:374 +msgid "attempt to reinitialize repository with different hash" +msgstr "essai de réinitialisation du dépôt avec une empreinte différente" + +#: builtin/init-db.c:380 builtin/init-db.c:601 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "algorithme d'empreinte inconnu '%s'" + +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s existe déjà" -#: builtin/init-db.c:413 +#: builtin/init-db.c:458 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n" -#: builtin/init-db.c:414 +#: builtin/init-db.c:459 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Dépôt Git existant réinitialisé dans %s%s\n" -#: builtin/init-db.c:418 +#: builtin/init-db.c:463 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Dépôt Git vide partagé initialisé dans %s%s\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:464 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Dépôt Git vide initialisé dans %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:513 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -15521,25 +15702,33 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--" "shared[=<permissions>]] [<répertoire>]" -#: builtin/init-db.c:491 +#: builtin/init-db.c:538 msgid "permissions" msgstr "permissions" -#: builtin/init-db.c:492 +#: builtin/init-db.c:539 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:529 builtin/init-db.c:534 +#: builtin/init-db.c:544 +msgid "hash" +msgstr "empreinte" + +#: builtin/init-db.c:545 +msgid "specify the hash algorithm to use" +msgstr "spécifier l'algorithme d'empreinte à utiliser" + +#: builtin/init-db.c:578 builtin/init-db.c:583 #, c-format msgid "cannot mkdir %s" msgstr "impossible de créer le répertoire (mkdir) %s" -#: builtin/init-db.c:538 +#: builtin/init-db.c:587 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se déplacer vers le répertoire (chdir) %s" -#: builtin/init-db.c:559 +#: builtin/init-db.c:614 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -15548,7 +15737,7 @@ msgstr "" "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --" "git-dir=<répertoire>)" -#: builtin/init-db.c:587 +#: builtin/init-db.c:642 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accéder à l'arbre de travail '%s'" @@ -15617,128 +15806,128 @@ msgstr "--trailer n'a aucune signification avec --only-input" msgid "no input file given for in-place editing" msgstr "aucun fichier en entrée pour l'éditon sur place" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]" -#: builtin/log.c:57 +#: builtin/log.c:58 msgid "git show [<options>] <object>..." msgstr "git show [<options>] <objet>..." -#: builtin/log.c:110 +#: builtin/log.c:111 #, c-format msgid "invalid --decorate option: %s" msgstr "option --decorate invalide : %s" -#: builtin/log.c:174 +#: builtin/log.c:178 msgid "show source" msgstr "afficher la source" -#: builtin/log.c:175 +#: builtin/log.c:179 msgid "Use mail map file" msgstr "Utiliser le fichier de correspondance de mail" -#: builtin/log.c:177 +#: builtin/log.c:182 msgid "only decorate refs that match <pattern>" msgstr "décorer seulement les références correspondant à <motif>" -#: builtin/log.c:179 +#: builtin/log.c:184 msgid "do not decorate refs that match <pattern>" msgstr "ne pas décorer les références correspondant à <motif>" -#: builtin/log.c:180 +#: builtin/log.c:185 msgid "decorate options" msgstr "décorer les options" -#: builtin/log.c:183 +#: builtin/log.c:188 msgid "Process line range n,m in file, counting from 1" msgstr "" "Traiter seulement l'intervalle de lignes n,m du fichier en commençant le " "compte à 1" -#: builtin/log.c:281 +#: builtin/log.c:298 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:535 +#: builtin/log.c:556 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:550 builtin/log.c:645 +#: builtin/log.c:571 builtin/log.c:666 #, c-format msgid "could not read object %s" msgstr "impossible de lire l'objet %s" -#: builtin/log.c:670 +#: builtin/log.c:691 #, c-format msgid "unknown type: %d" msgstr "type inconnu : %d" -#: builtin/log.c:814 +#: builtin/log.c:835 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s : couverture invalide pour le mode de description" -#: builtin/log.c:821 +#: builtin/log.c:842 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:936 +#: builtin/log.c:957 msgid "name of output directory is too long" msgstr "le nom du répertoire de sortie est trop long" -#: builtin/log.c:952 +#: builtin/log.c:973 #, c-format msgid "cannot open patch file %s" msgstr "impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:969 +#: builtin/log.c:990 msgid "need exactly one range" msgstr "exactement une plage nécessaire" -#: builtin/log.c:979 +#: builtin/log.c:1000 msgid "not a range" msgstr "ceci n'est pas une plage" -#: builtin/log.c:1143 +#: builtin/log.c:1164 msgid "cover letter needs email format" msgstr "la lettre de motivation doit être au format courriel" -#: builtin/log.c:1149 +#: builtin/log.c:1170 msgid "failed to create cover-letter file" msgstr "échec de création du fichier de lettre de motivation" -#: builtin/log.c:1228 +#: builtin/log.c:1249 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1255 +#: builtin/log.c:1276 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1313 +#: builtin/log.c:1334 msgid "two output directories?" msgstr "deux répertoires de sortie ?" -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 +#: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231 #, c-format msgid "unknown commit %s" msgstr "commit inconnu %s" -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1455 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "échec à résoudre '%s' comme une référence valide" -#: builtin/log.c:1439 +#: builtin/log.c:1460 msgid "could not find exact merge base" msgstr "impossible de trouver la base de fusion exacte" -#: builtin/log.c:1443 +#: builtin/log.c:1464 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" @@ -15751,285 +15940,285 @@ msgstr "" "Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> " "manuellement" -#: builtin/log.c:1463 +#: builtin/log.c:1484 msgid "failed to find exact merge base" msgstr "échec à trouver la base de fusion exacte" -#: builtin/log.c:1474 +#: builtin/log.c:1495 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:1478 +#: builtin/log.c:1499 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:1531 +#: builtin/log.c:1552 msgid "cannot get patch id" msgstr "impossible d'obtenir l'id du patch" -#: builtin/log.c:1583 +#: builtin/log.c:1604 msgid "failed to infer range-diff ranges" msgstr "échec d'inférence d'intervalles de différence d'intervalles" -#: builtin/log.c:1629 +#: builtin/log.c:1650 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1632 +#: builtin/log.c:1653 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1636 +#: builtin/log.c:1657 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1638 +#: builtin/log.c:1659 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1640 +#: builtin/log.c:1661 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:1641 +#: builtin/log.c:1662 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1642 +#: builtin/log.c:1663 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1644 +#: builtin/log.c:1665 msgid "start numbering patches at <n> instead of 1" msgstr "démarrer la numérotation des patchs à <n> au lieu de 1" -#: builtin/log.c:1646 +#: builtin/log.c:1667 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1648 +#: builtin/log.c:1669 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" -#: builtin/log.c:1651 +#: builtin/log.c:1672 msgid "cover-from-description-mode" msgstr "cover-from-description-mode" -#: builtin/log.c:1652 +#: builtin/log.c:1673 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:1654 +#: builtin/log.c:1675 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1657 +#: builtin/log.c:1678 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1660 +#: builtin/log.c:1681 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1663 +#: builtin/log.c:1684 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1665 +#: builtin/log.c:1686 msgid "output all-zero hash in From header" msgstr "écrire une empreinte à zéro dans l'entête From" -#: builtin/log.c:1667 +#: builtin/log.c:1688 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1669 +#: builtin/log.c:1690 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:1671 +#: builtin/log.c:1692 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1672 +#: builtin/log.c:1693 msgid "header" msgstr "en-tête" -#: builtin/log.c:1673 +#: builtin/log.c:1694 msgid "add email header" msgstr "ajouter l'en-tête de courriel" -#: builtin/log.c:1674 builtin/log.c:1676 +#: builtin/log.c:1695 builtin/log.c:1696 msgid "email" msgstr "courriel" -#: builtin/log.c:1674 +#: builtin/log.c:1695 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1676 +#: builtin/log.c:1696 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1678 +#: builtin/log.c:1697 msgid "ident" msgstr "ident" -#: builtin/log.c:1679 +#: builtin/log.c:1698 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" -#: builtin/log.c:1681 +#: builtin/log.c:1700 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1682 +#: builtin/log.c:1701 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1683 builtin/log.c:1686 +#: builtin/log.c:1702 builtin/log.c:1705 msgid "boundary" msgstr "limite" -#: builtin/log.c:1684 +#: builtin/log.c:1703 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1687 +#: builtin/log.c:1706 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1691 +#: builtin/log.c:1710 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1693 +#: builtin/log.c:1712 msgid "signature" msgstr "signature" -#: builtin/log.c:1694 +#: builtin/log.c:1713 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1695 +#: builtin/log.c:1714 msgid "base-commit" msgstr "commit-de-base" -#: builtin/log.c:1696 +#: builtin/log.c:1715 msgid "add prerequisite tree info to the patch series" msgstr "Ajouter un arbre prérequis à la série de patchs" -#: builtin/log.c:1698 +#: builtin/log.c:1717 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1699 +#: builtin/log.c:1718 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1701 +#: builtin/log.c:1720 msgid "show progress while generating patches" msgstr "" "afficher la barre de progression durant la phase de génération des patchs" -#: builtin/log.c:1703 +#: builtin/log.c:1722 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "afficher les modifications par rapport à <rév> dans la première page ou une " "rustine" -#: builtin/log.c:1706 +#: builtin/log.c:1725 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "afficher les modifications par rapport à <refspec> dans la première page ou " "une rustine" -#: builtin/log.c:1708 +#: builtin/log.c:1727 msgid "percentage by which creation is weighted" msgstr "pourcentage par lequel la création est pondérée" -#: builtin/log.c:1792 +#: builtin/log.c:1812 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/log.c:1807 +#: builtin/log.c:1827 msgid "-n and -k are mutually exclusive" msgstr "-n et -k sont mutuellement exclusifs" -#: builtin/log.c:1809 +#: builtin/log.c:1829 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs" -#: builtin/log.c:1817 +#: builtin/log.c:1837 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1819 +#: builtin/log.c:1839 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1821 +#: builtin/log.c:1841 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1854 +#: builtin/log.c:1874 msgid "standard output, or directory, which one?" msgstr "sortie standard, ou répertoire, lequel ?" -#: builtin/log.c:1958 +#: builtin/log.c:1978 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:1962 +#: builtin/log.c:1982 msgid "Interdiff:" msgstr "Interdiff :" -#: builtin/log.c:1963 +#: builtin/log.c:1983 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contre v%d :" -#: builtin/log.c:1969 +#: builtin/log.c:1989 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiert --range-diff" -#: builtin/log.c:1973 +#: builtin/log.c:1993 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:1981 +#: builtin/log.c:2001 msgid "Range-diff:" msgstr "Diff-intervalle :" -#: builtin/log.c:1982 +#: builtin/log.c:2002 #, c-format msgid "Range-diff against v%d:" msgstr "Diff-intervalle contre v%d :" -#: builtin/log.c:1993 +#: builtin/log.c:2013 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:2029 +#: builtin/log.c:2049 msgid "Generating patches" msgstr "Génération des patchs" -#: builtin/log.c:2073 +#: builtin/log.c:2093 msgid "failed to create output files" msgstr "échec de création des fichiers en sortie" -#: builtin/log.c:2132 +#: builtin/log.c:2152 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:2186 +#: builtin/log.c:2206 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16037,110 +16226,110 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spécifier " "<branche_amont> manuellement.\n" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<options>] [<fichier>...]" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "identifier l'état de fichier avec les étiquettes" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "afficher les fichiers mis en cache dans la sortie (défaut)" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "afficher les fichiers supprimés dans la sortie" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "afficher les fichiers modifiés dans la sortie" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "afficher les autres fichiers dans la sortie" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "afficher les fichiers ignorés dans la sortie" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "afficher les nom des objets indexés dans la sortie" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 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:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "afficher seulement les noms des répertoires 'other'" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "afficher les fins de lignes des fichiers" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "ne pas afficher les répertoires vides" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "afficher les fichiers non fusionnés dans la sortie" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "afficher l'information resolv-undo" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "sauter les fichiers correspondant au motif" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "les motifs d'exclusion sont lus depuis <fichier>" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "ajouter les exclusions git standard" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 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:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "arbre ou apparenté" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "considérer que les chemins supprimés depuis <arbre ou apparenté> sont " "toujours présents" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "afficher les données de débogage" @@ -16158,7 +16347,7 @@ msgstr "" msgid "do not print remote URL" msgstr "ne pas afficher les URL distantes" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384 msgid "exec" msgstr "exécutable" @@ -16235,194 +16424,305 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "mbox vide : '%s'" -#: builtin/merge.c:55 +#: builtin/merge-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <commit> <commit>..." + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <commit>..." + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <validation>..." + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <validation> <validation>" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <référence> [<validation>]" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "afficher tous les ancêtres communs" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "trouver les ancêtres pour une fusion simple à n points" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "afficher les révisions inaccessibles depuis les autres" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "est le premier ancêtre de l'autre ?" + +#: builtin/merge-base.c:151 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "trouver où <validation> a divergé du reflog de <référence>" + +#: builtin/merge-file.c:9 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" +"git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> " +"<fichier-orig> <fichier2>" + +#: builtin/merge-file.c:35 +msgid "send results to standard output" +msgstr "envoyer les résultats sur la sortie standard" + +#: builtin/merge-file.c:36 +msgid "use a diff3 based merge" +msgstr "utiliser une fusion basée sur diff3" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use our version" +msgstr "pour les conflits, utiliser notre version (our)" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use their version" +msgstr "pour les conflits, utiliser leur version (their)" + +#: builtin/merge-file.c:41 +msgid "for conflicts, use a union version" +msgstr "pour les conflits, utiliser l'ensemble des versions" + +#: builtin/merge-file.c:44 +msgid "for conflicts, use this marker size" +msgstr "pour les conflits, utiliser cette taille de marqueur" + +#: builtin/merge-file.c:45 +msgid "do not warn about conflicts" +msgstr "ne pas avertir à propos des conflits" + +#: builtin/merge-file.c:47 +msgid "set labels for file1/orig-file/file2" +msgstr "définir les labels pour fichier1/fichier-orig/fichier2" + +#: builtin/merge-recursive.c:47 +#, c-format +msgid "unknown option %s" +msgstr "option inconnue %s" + +#: builtin/merge-recursive.c:53 +#, c-format +msgid "could not parse object '%s'" +msgstr "Impossible d'analyser l'objet '%s'" + +#: builtin/merge-recursive.c:57 +#, c-format +msgid "cannot handle more than %d base. Ignoring %s." +msgid_plural "cannot handle more than %d bases. Ignoring %s." +msgstr[0] "impossible de gérer plus de %d base. %s ignoré." +msgstr[1] "impossible de gérer plus de %d bases. %s ignoré." + +#: builtin/merge-recursive.c:65 +msgid "not handling anything other than two heads merge." +msgstr "impossible de gérer autre chose que la fusion de deux têtes." + +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "impossible de résoudre la référence '%s'" + +#: builtin/merge-recursive.c:82 +#, c-format +msgid "Merging %s with %s\n" +msgstr "Fusion de %s avec %s\n" + +#: builtin/merge.c:56 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<options>] [<commit>...]" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:119 +#: builtin/merge.c:121 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:142 +#: builtin/merge.c:144 #, c-format msgid "option `%s' requires a value" msgstr "le commutateur '%s' a besoin d'une valeur" -#: builtin/merge.c:188 +#: builtin/merge.c:190 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" -#: builtin/merge.c:189 +#: builtin/merge.c:191 #, c-format msgid "Available strategies are:" msgstr "Les stratégies disponibles sont :" -#: builtin/merge.c:194 +#: builtin/merge.c:196 #, c-format msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:245 builtin/pull.c:132 +#: builtin/merge.c:247 builtin/pull.c:133 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:135 +#: builtin/merge.c:250 builtin/pull.c:136 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:138 +#: builtin/merge.c:251 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:251 builtin/pull.c:141 +#: builtin/merge.c:253 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "ajouter (au plus <n>) éléments du journal court au message de validation de " "la fusion" -#: builtin/merge.c:254 builtin/pull.c:147 +#: builtin/merge.c:256 builtin/pull.c:148 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:150 +#: builtin/merge.c:258 builtin/pull.c:151 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:153 +#: builtin/merge.c:260 builtin/pull.c:154 msgid "edit message before committing" msgstr "éditer le message avant la validation" -#: builtin/merge.c:260 +#: builtin/merge.c:262 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:262 builtin/pull.c:160 +#: builtin/merge.c:264 builtin/pull.c:161 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:163 +#: builtin/merge.c:268 builtin/pull.c:164 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:787 builtin/pull.c:167 -#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 +#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:268 builtin/pull.c:168 +#: builtin/merge.c:270 builtin/pull.c:169 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:269 builtin/pull.c:171 +#: builtin/merge.c:271 builtin/pull.c:172 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:272 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:272 +#: builtin/merge.c:274 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:279 +#: builtin/merge.c:281 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:281 +#: 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:283 +#: builtin/merge.c:285 msgid "continue the current in-progress merge" msgstr "continuer la fusion en cours" -#: builtin/merge.c:285 builtin/pull.c:179 +#: builtin/merge.c:287 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" -#: builtin/merge.c:291 +#: 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:308 +#: builtin/merge.c:311 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:313 +#: builtin/merge.c:316 msgid "stash failed" msgstr "échec du remisage" -#: builtin/merge.c:318 +#: builtin/merge.c:321 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:340 builtin/merge.c:357 +#: builtin/merge.c:343 builtin/merge.c:360 msgid "read-tree failed" msgstr "read-tree a échoué" -#: builtin/merge.c:387 +#: builtin/merge.c:390 msgid " (nothing to squash)" msgstr " (rien à compresser)" -#: builtin/merge.c:398 +#: builtin/merge.c:401 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressée -- HEAD non mise à jour\n" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, 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:499 +#: builtin/merge.c:502 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:586 +#: builtin/merge.c:589 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:708 +#: builtin/merge.c:716 msgid "Not handling anything other than two heads merge." msgstr "Impossible de gérer autre chose que la fusion de deux têtes." -#: builtin/merge.c:722 +#: builtin/merge.c:730 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:745 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:789 +#: builtin/merge.c:797 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:798 +#: builtin/merge.c:806 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la " "fusion.\n" -#: builtin/merge.c:804 +#: builtin/merge.c:812 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" @@ -16434,11 +16734,11 @@ msgstr "" "branche de sujet.\n" "\n" -#: builtin/merge.c:809 +#: builtin/merge.c:817 msgid "An empty message aborts the commit.\n" msgstr "Un message vide abandonne la validation.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:820 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -16447,74 +16747,74 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:865 +#: builtin/merge.c:873 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:880 +#: builtin/merge.c:888 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:941 +#: builtin/merge.c:949 #, 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:980 +#: builtin/merge.c:988 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:982 +#: builtin/merge.c:990 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:984 +#: builtin/merge.c:992 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:989 +#: builtin/merge.c:997 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1046 +#: builtin/merge.c:1054 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1149 +#: builtin/merge.c:1157 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" -#: builtin/merge.c:1183 +#: builtin/merge.c:1191 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" -#: builtin/merge.c:1286 +#: builtin/merge.c:1295 msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" -#: builtin/merge.c:1290 +#: builtin/merge.c:1299 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:1299 +#: builtin/merge.c:1317 msgid "--quit expects no arguments" msgstr "--quit n'accepte pas d'argument" -#: builtin/merge.c:1312 +#: builtin/merge.c:1330 msgid "--continue expects no arguments" msgstr "--continue ne supporte aucun argument" -#: builtin/merge.c:1316 +#: builtin/merge.c:1334 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:1332 +#: builtin/merge.c:1350 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16522,7 +16822,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1339 +#: builtin/merge.c:1357 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16530,214 +16830,103 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1342 +#: builtin/merge.c:1360 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:1356 +#: builtin/merge.c:1374 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1358 +#: builtin/merge.c:1376 msgid "You cannot combine --squash with --commit." msgstr "Vous ne pouvez pas combiner --squash avec --commit." -#: builtin/merge.c:1374 +#: builtin/merge.c:1392 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:1391 +#: builtin/merge.c:1409 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:1393 +#: builtin/merge.c:1411 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:1398 +#: builtin/merge.c:1416 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1400 +#: builtin/merge.c:1418 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:1481 +#: builtin/merge.c:1499 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1490 +#: builtin/merge.c:1508 msgid "Already up to date." msgstr "Déjà à jour." -#: builtin/merge.c:1500 +#: builtin/merge.c:1518 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1564 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1571 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1574 +#: builtin/merge.c:1596 msgid "Already up to date. Yeeah!" msgstr "Déjà à jour. Ouais !" -#: builtin/merge.c:1580 +#: builtin/merge.c:1602 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1603 builtin/merge.c:1668 +#: builtin/merge.c:1630 builtin/merge.c:1695 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1607 +#: builtin/merge.c:1634 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1659 +#: builtin/merge.c:1686 #, 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:1661 +#: builtin/merge.c:1688 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1670 +#: builtin/merge.c:1697 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Utilisation de %s pour préparer la résolution à la main.\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1711 #, 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-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "git merge-base [-a | --all] <commit> <commit>..." - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "git merge-base [-a | --all] --octopus <commit>..." - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <validation>..." - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "git merge-base --is-ancestor <validation> <validation>" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "git merge-base --fork-point <référence> [<validation>]" - -#: builtin/merge-base.c:153 -msgid "output all common ancestors" -msgstr "afficher tous les ancêtres communs" - -#: builtin/merge-base.c:155 -msgid "find ancestors for a single n-way merge" -msgstr "trouver les ancêtres pour une fusion simple à n points" - -#: builtin/merge-base.c:157 -msgid "list revs not reachable from others" -msgstr "afficher les révisions inaccessibles depuis les autres" - -#: builtin/merge-base.c:159 -msgid "is the first one ancestor of the other?" -msgstr "est le premier ancêtre de l'autre ?" - -#: builtin/merge-base.c:161 -msgid "find where <commit> forked from reflog of <ref>" -msgstr "trouver où <validation> a divergé du reflog de <référence>" - -#: builtin/merge-file.c:9 -msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" -msgstr "" -"git merge-file [<options>] [-L <nom1> [-L <orig> [-L <nom2>]]] <fichier1> " -"<fichier-orig> <fichier2>" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "envoyer les résultats sur la sortie standard" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "utiliser une fusion basée sur diff3" - -#: builtin/merge-file.c:37 -msgid "for conflicts, use our version" -msgstr "pour les conflits, utiliser notre version (our)" - -#: builtin/merge-file.c:39 -msgid "for conflicts, use their version" -msgstr "pour les conflits, utiliser leur version (their)" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use a union version" -msgstr "pour les conflits, utiliser l'ensemble des versions" - -#: builtin/merge-file.c:44 -msgid "for conflicts, use this marker size" -msgstr "pour les conflits, utiliser cette taille de marqueur" - -#: builtin/merge-file.c:45 -msgid "do not warn about conflicts" -msgstr "ne pas avertir à propos des conflits" - -#: builtin/merge-file.c:47 -msgid "set labels for file1/orig-file/file2" -msgstr "définir les labels pour fichier1/fichier-orig/fichier2" - -#: builtin/merge-recursive.c:47 -#, c-format -msgid "unknown option %s" -msgstr "option inconnue %s" - -#: builtin/merge-recursive.c:53 -#, c-format -msgid "could not parse object '%s'" -msgstr "Impossible d'analyser l'objet '%s'" - -#: builtin/merge-recursive.c:57 -#, c-format -msgid "cannot handle more than %d base. Ignoring %s." -msgid_plural "cannot handle more than %d bases. Ignoring %s." -msgstr[0] "impossible de gérer plus de %d base. %s ignoré." -msgstr[1] "impossible de gérer plus de %d bases. %s ignoré." - -#: builtin/merge-recursive.c:65 -msgid "not handling anything other than two heads merge." -msgstr "impossible de gérer autre chose que la fusion de deux têtes." - -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 -#, c-format -msgid "could not resolve ref '%s'" -msgstr "impossible de résoudre la référence '%s'" - -#: builtin/merge-recursive.c:82 -#, c-format -msgid "Merging %s with %s\n" -msgstr "Fusion de %s avec %s\n" - #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -16776,7 +16965,7 @@ msgstr "" "pendant le repaquetage, collecter les fichiers paquet de plus petite taille " "dans un lot plus grand que cette taille" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 msgid "too many arguments" msgstr "trop d'arguments" @@ -16878,7 +17067,7 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" @@ -17071,7 +17260,7 @@ msgstr "impossible d'écrire l'objet note" msgid "the note contents have been left in %s" msgstr "le contenu de la note a été laissé dans %s" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" @@ -17305,7 +17494,7 @@ msgstr "" "validez le résultat avec 'git notes merges --commit', ou abandonnez la " "fusion avec 'git notes merge --abort'.\n" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Impossible de résoudre '%s' comme une référence valide." @@ -17324,7 +17513,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" @@ -17340,125 +17529,125 @@ msgstr "références-notes" msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" -#: builtin/notes.c:1034 builtin/stash.c:1643 +#: builtin/notes.c:1034 builtin/stash.c:1608 #, c-format msgid "unknown subcommand: %s" msgstr "sous-commande inconnue : %s" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:53 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [options...] [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [options...] base-name [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:430 +#: builtin/pack-objects.c:431 #, c-format msgid "bad packed object CRC for %s" msgstr "mauvais CRC d'objet empaqueté pour %s" -#: builtin/pack-objects.c:441 +#: builtin/pack-objects.c:442 #, c-format msgid "corrupt packed object for %s" msgstr "objet empaqueté corrompu pour %s" -#: builtin/pack-objects.c:572 +#: builtin/pack-objects.c:573 #, c-format msgid "recursive delta detected for object %s" msgstr "delta récursif détecté pour l'objet %s" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:784 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objets commandés, %<PRIu32> attendus" -#: builtin/pack-objects.c:972 +#: builtin/pack-objects.c:973 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:985 +#: builtin/pack-objects.c:986 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1046 builtin/update-index.c:90 +#: builtin/pack-objects.c:1047 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "échec du stat de %s" -#: builtin/pack-objects.c:1099 +#: builtin/pack-objects.c:1100 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus" -#: builtin/pack-objects.c:1297 +#: builtin/pack-objects.c:1298 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:1724 +#: builtin/pack-objects.c:1725 #, 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:1733 +#: builtin/pack-objects.c:1734 #, 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:2004 +#: builtin/pack-objects.c:2005 msgid "Counting objects" msgstr "Décompte des objets" -#: builtin/pack-objects.c:2149 +#: builtin/pack-objects.c:2150 #, 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:2219 builtin/pack-objects.c:2235 -#: builtin/pack-objects.c:2245 +#: builtin/pack-objects.c:2220 builtin/pack-objects.c:2236 +#: builtin/pack-objects.c:2246 #, c-format msgid "object %s cannot be read" msgstr "l'objet %s ne peut être lu" -#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 +#: builtin/pack-objects.c:2223 builtin/pack-objects.c:2250 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)" -#: builtin/pack-objects.c:2259 +#: builtin/pack-objects.c:2260 msgid "suboptimal pack - out of memory" msgstr "paquet sous-optimal - mémoire insuffisante" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2575 #, 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:2713 +#: builtin/pack-objects.c:2714 #, 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:2801 +#: builtin/pack-objects.c:2802 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2808 msgid "inconsistency with delta count" msgstr "inconsistance dans le compte de delta" -#: builtin/pack-objects.c:2888 +#: builtin/pack-objects.c:2889 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -17467,7 +17656,7 @@ msgstr "" "ID d'objet de bord attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:2894 +#: builtin/pack-objects.c:2895 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -17476,236 +17665,236 @@ msgstr "" "ID d'objet attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:2993 msgid "invalid value for --missing" msgstr "valeur invalide pour --missing" -#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 +#: builtin/pack-objects.c:3052 builtin/pack-objects.c:3160 msgid "cannot open pack index" msgstr "impossible d'ouvrir l'index de paquet" -#: builtin/pack-objects.c:3082 +#: builtin/pack-objects.c:3083 #, 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:3167 +#: builtin/pack-objects.c:3168 msgid "unable to force loose object" msgstr "impossible de forcer l'objet libre" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3261 #, c-format msgid "not a rev '%s'" msgstr "'%s' n'est pas une révision" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3264 #, c-format msgid "bad revision '%s'" msgstr "mauvaise révision '%s'" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3289 msgid "unable to add recent objects" msgstr "impossible d'ajouter les objets récents" -#: builtin/pack-objects.c:3341 +#: builtin/pack-objects.c:3342 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3346 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3384 msgid "<version>[,<offset>]" msgstr "<version>[,<décalage>]" -#: builtin/pack-objects.c:3384 +#: builtin/pack-objects.c:3385 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:3387 +#: builtin/pack-objects.c:3388 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:3389 +#: builtin/pack-objects.c:3390 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:3391 +#: builtin/pack-objects.c:3392 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3394 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:3395 +#: builtin/pack-objects.c:3396 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:3397 +#: builtin/pack-objects.c:3398 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:3399 +#: builtin/pack-objects.c:3400 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:3401 +#: builtin/pack-objects.c:3402 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:3403 +#: builtin/pack-objects.c:3404 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:3405 +#: builtin/pack-objects.c:3406 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:3407 +#: builtin/pack-objects.c:3408 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3410 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3412 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:3414 +#: builtin/pack-objects.c:3415 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3418 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:3420 +#: builtin/pack-objects.c:3421 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3424 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3426 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:3427 +#: builtin/pack-objects.c:3428 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:3429 +#: builtin/pack-objects.c:3430 msgid "pack loose unreachable objects" msgstr "empaqueter les objets inaccessibles détachés" -#: builtin/pack-objects.c:3431 +#: builtin/pack-objects.c:3432 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:3434 +#: builtin/pack-objects.c:3435 msgid "use the sparse reachability algorithm" msgstr "utiliser l'algorithme de joignabilité creuse" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3437 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:3438 +#: builtin/pack-objects.c:3439 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:3440 +#: builtin/pack-objects.c:3441 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:3442 +#: builtin/pack-objects.c:3443 msgid "ignore this pack" msgstr "ignorer ce paquet" -#: builtin/pack-objects.c:3444 +#: builtin/pack-objects.c:3445 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3447 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:3448 +#: builtin/pack-objects.c:3449 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "utiliser un index en bitmap si disponible pour accélerer le décompte des " "objets" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3451 msgid "write a bitmap index together with the pack index" msgstr "écrire un index en bitmap associé à l'index de paquet" -#: builtin/pack-objects.c:3454 +#: builtin/pack-objects.c:3455 msgid "write a bitmap index if possible" msgstr "écrire un index de bitmap si possible" -#: builtin/pack-objects.c:3458 +#: builtin/pack-objects.c:3459 msgid "handling for missing objects" msgstr "gestion des objets manquants" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3462 msgid "do not pack objects in promisor packfiles" msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs" -#: builtin/pack-objects.c:3463 +#: builtin/pack-objects.c:3464 msgid "respect islands during delta compression" msgstr "respecter les îlots pendant la compression des deltas" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3493 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "la profondeur %d de chaîne de delta est trop grande, forcée à %d" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3498 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit est trop grand, forcé à %d" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3552 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size ne peut pas être utilisé pour construire un paquet à " "transférer" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3554 msgid "minimum pack size limit is 1 MiB" msgstr "la taille limite minimale d'un paquet est 1 MiB" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3559 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin ne peut pas être utilisé pour construire un paquet indexable" -#: builtin/pack-objects.c:3561 +#: builtin/pack-objects.c:3562 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles" -#: builtin/pack-objects.c:3567 +#: builtin/pack-objects.c:3568 msgid "cannot use --filter without --stdout" msgstr "impossible d'utiliser --filter sans --stdout" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3628 msgid "Enumerating objects" msgstr "Énumération des objets" -#: builtin/pack-objects.c:3657 +#: builtin/pack-objects.c:3658 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -17726,31 +17915,27 @@ msgstr "empaqueter tout" msgid "prune loose refs (default)" msgstr "éliminer les références perdues (défaut)" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:42 -msgid "Removing duplicate objects" -msgstr "Suppression des objets dupliqués" - -#: builtin/prune.c:12 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>…]" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "afficher les objets éliminés" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "faire expirer les objets plus vieux que <heure>" -#: builtin/prune.c:136 +#: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" msgstr "limiter la traversée aux objets hors des fichiers paquets prometteurs" -#: builtin/prune.c:150 +#: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" msgstr "impossible de nettoyer dans un dépôt d'objets précieux" @@ -17763,44 +17948,73 @@ msgstr "Valeur invalide pour %s : %s" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/pull.c:122 +#: builtin/pull.c:123 msgid "control for recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/pull.c:126 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "Options relatives à la fusion" -#: builtin/pull.c:129 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" -#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:478 builtin/revert.c:126 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" -#: builtin/pull.c:166 -msgid "automatically stash/stash pop before and after rebase" -msgstr "remiser avant et réappliquer après le rebasage automatiquement" +#: builtin/pull.c:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" +msgstr "remiser et réappliquer automatiquement avant et après" -#: builtin/pull.c:182 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "Options relatives au rapatriement" -#: builtin/pull.c:192 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/pull.c:200 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "nombre de sous-modules tirés en parallèle" -#: builtin/pull.c:300 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valeur invalide pour pull.ff : %s" -#: builtin/pull.c:426 +#: builtin/pull.c:349 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"Tirer sans spécifier comment réconcilier les branches divergentes\n" +"est découragé. Vous pouvez éliminer ce message en lançant une des\n" +"commandes suivantes avant votre prochain tirage :\n" +"\n" +" git config pull.rebase false # fusion (stratégie par défaut)\n" +" git config pull.rebase true # rebasage\n" +" git config pull.ff only # avance rapide seulement\n" +"\n" +"Vous pouvez remplacer \"git config\" par \"git config --global\" pour que\n" +"ce soit l'option par défaut pour tous les dépôts. Vous pouvez aussi\n" +"passer --rebase, --no-rebase ou --ff-only sur la ligne de commande pour\n" +"remplacer à l'invocation la valeur par défaut configurée.\n" + +#: builtin/pull.c:459 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -17808,14 +18022,14 @@ msgstr "" "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous " "venez de récupérer." -#: builtin/pull.c:428 +#: builtin/pull.c:461 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Il n'y a pas de candidate avec laquelle fusionner parmi les références que " "vous venez de récupérer." -#: builtin/pull.c:429 +#: builtin/pull.c:462 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17823,7 +18037,7 @@ msgstr "" "Généralement, cela signifie que vous avez indiqué un spécificateur\n" "de référence joker qui n'a pas eu de correspondance sur le serveur distant." -#: builtin/pull.c:432 +#: builtin/pull.c:465 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17835,44 +18049,44 @@ msgstr "" "configuration\n" "pour la branche actuelle, vous devez spécifier la branche avec la commande." -#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 +#: builtin/pull.c:470 builtin/rebase.c:1234 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Vous n'êtes actuellement sur aucune branche." -#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 +#: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser." -#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 +#: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Veuillez spécifier une branche avec laquelle fusionner." -#: builtin/pull.c:442 builtin/pull.c:457 +#: builtin/pull.c:475 builtin/pull.c:490 msgid "See git-pull(1) for details." msgstr "Référez-vous à git-pull(1) pour de plus amples détails." -#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 -#: builtin/rebase.c:1415 git-parse-remote.sh:64 +#: builtin/pull.c:477 builtin/pull.c:483 builtin/pull.c:492 +#: builtin/rebase.c:1240 git-parse-remote.sh:64 msgid "<remote>" msgstr "<distant>" -#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 +#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branche>" -#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 +#: builtin/pull.c:485 builtin/rebase.c:1232 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Pas d'information de suivi distant pour la branche actuelle." -#: builtin/pull.c:461 git-parse-remote.sh:95 +#: builtin/pull.c:494 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si vous souhaitez indiquer l'information de suivi distant pour cette " "branche, vous pouvez le faire avec :" -#: builtin/pull.c:466 +#: builtin/pull.c:499 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17882,34 +18096,30 @@ msgstr "" "'%s'\n" "du serveur distant, mais cette référence n'a pas été récupérée." -#: builtin/pull.c:576 +#: builtin/pull.c:610 #, c-format msgid "unable to access commit %s" msgstr "impossible d'accéder le commit %s" -#: builtin/pull.c:857 +#: builtin/pull.c:895 msgid "ignoring --verify-signatures for rebase" msgstr "--verify-signatures est ignoré pour un rebasage" -#: builtin/pull.c:912 -msgid "--[no-]autostash option is only valid with --rebase." -msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase." - -#: builtin/pull.c:920 +#: builtin/pull.c:955 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Mise à jour d'une branche non encore créée avec les changements ajoutés dans " "l'index." -#: builtin/pull.c:924 +#: builtin/pull.c:959 msgid "pull with rebase" msgstr "tirer avec un rebasage" -#: builtin/pull.c:925 +#: builtin/pull.c:960 msgid "please commit or stash them." msgstr "veuillez les valider ou les remiser." -#: builtin/pull.c:950 +#: builtin/pull.c:985 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17920,7 +18130,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:956 +#: builtin/pull.c:991 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17937,15 +18147,15 @@ msgstr "" "$ git reset --hard\n" "pour régénérer." -#: builtin/pull.c:971 +#: builtin/pull.c:1006 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tête vide." -#: builtin/pull.c:975 +#: builtin/pull.c:1010 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." -#: builtin/pull.c:982 +#: builtin/pull.c:1018 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossible de rebaser avec des modifications de sous-modules enregistrées " @@ -18116,12 +18326,12 @@ msgstr "" "pointer\n" "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" -#: builtin/push.c:360 +#: builtin/push.c:361 #, c-format msgid "Pushing to %s\n" msgstr "Poussée vers %s\n" -#: builtin/push.c:367 +#: builtin/push.c:368 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" @@ -18151,65 +18361,65 @@ msgstr "" msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:552 builtin/send-pack.c:181 +#: builtin/push.c:551 builtin/send-pack.c:179 msgid "<refname>:<expect>" msgstr "<nom-de-ref>:<attendu>" -#: builtin/push.c:553 builtin/send-pack.c:182 +#: builtin/push.c:552 builtin/send-pack.c:180 msgid "require old value of ref to be at this value" msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur" -#: builtin/push.c:556 +#: builtin/push.c:555 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:558 builtin/send-pack.c:175 +#: builtin/push.c:556 builtin/send-pack.c:174 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 +#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:561 +#: builtin/push.c:559 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:564 +#: builtin/push.c:562 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:566 +#: builtin/push.c:564 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:567 +#: builtin/push.c:565 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:570 builtin/send-pack.c:169 +#: builtin/push.c:567 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "signer la poussée avec GPG" -#: builtin/push.c:572 builtin/send-pack.c:176 +#: builtin/push.c:569 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "demande une transaction atomique sur le serveur distant" -#: builtin/push.c:590 +#: builtin/push.c:587 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:592 +#: builtin/push.c:589 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" -#: builtin/push.c:612 +#: builtin/push.c:609 #, c-format msgid "bad repository '%s'" msgstr "mauvais dépôt '%s'" -#: builtin/push.c:613 +#: builtin/push.c:610 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -18231,27 +18441,27 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:628 +#: builtin/push.c:625 msgid "--all and --tags are incompatible" msgstr "--all et --tags sont incompatibles" -#: builtin/push.c:630 +#: builtin/push.c:627 msgid "--all can't be combined with refspecs" msgstr "--all ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:634 +#: builtin/push.c:631 msgid "--mirror and --tags are incompatible" msgstr "--mirror et --tags sont incompatibles" -#: builtin/push.c:636 +#: builtin/push.c:633 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:639 +#: builtin/push.c:636 msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:643 +#: builtin/push.c:640 msgid "push options must not have new line characters" msgstr "" "les options de poussée ne peuvent pas contenir de caractères de nouvelle " @@ -18383,7 +18593,7 @@ msgstr "supprimer les messages d'information de suivi" msgid "You need to resolve your current index first" msgstr "Vous devez d'abord résoudre votre index courant" -#: builtin/rebase.c:32 +#: builtin/rebase.c:35 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " "[<upstream> [<branch>]]" @@ -18391,218 +18601,204 @@ msgstr "" "git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base> | --keep-" "base] [<amont> [<branche>]]" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base>] --root " "[<branche>]" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 +#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232 #, c-format msgid "unusable todo list: '%s'" msgstr "liste à faire inutilisable : '%s'" -#: builtin/rebase.c:292 +#: builtin/rebase.c:298 #, c-format msgid "could not create temporary %s" msgstr "impossible de créer un fichier temporaire %s" -#: builtin/rebase.c:298 +#: builtin/rebase.c:304 msgid "could not mark as interactive" msgstr "impossible de marquer comme interactif" -#: builtin/rebase.c:352 +#: builtin/rebase.c:358 msgid "could not generate todo list" msgstr "impossible de générer la liste à-faire" -#: builtin/rebase.c:391 +#: builtin/rebase.c:399 msgid "a base commit must be provided with --upstream or --onto" msgstr "un commit de base doit être fourni avec --upstream ou --onto" -#: builtin/rebase.c:461 +#: builtin/rebase.c:468 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<options>]" -#: builtin/rebase.c:474 builtin/rebase.c:1550 -msgid "(DEPRECATED) keep empty commits" -msgstr "(OBSOLÈTE) garder les validations vides" +#: builtin/rebase.c:481 builtin/rebase.c:1374 +msgid "keep commits which start empty" +msgstr "conserver les commits qui commencent vides" -#: builtin/rebase.c:478 builtin/revert.c:128 +#: builtin/rebase.c:485 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "autoriser les validations avec des messages vides" -#: builtin/rebase.c:480 +#: builtin/rebase.c:487 msgid "rebase merge commits" msgstr "rebaser les commits de fusion" -#: builtin/rebase.c:482 +#: builtin/rebase.c:489 msgid "keep original branch points of cousins" msgstr "conserver les points de branchement de cousins originaux" -#: builtin/rebase.c:484 +#: builtin/rebase.c:491 msgid "move commits that begin with squash!/fixup!" msgstr "déplacer les commits qui commencent par squash!/fixup!" -#: builtin/rebase.c:485 +#: builtin/rebase.c:492 msgid "sign commits" msgstr "signer les commits" -#: builtin/rebase.c:487 builtin/rebase.c:1490 +#: builtin/rebase.c:494 builtin/rebase.c:1314 msgid "display a diffstat of what changed upstream" msgstr "afficher un diffstat de ce qui a changé en amont" -#: builtin/rebase.c:489 +#: builtin/rebase.c:496 msgid "continue rebase" msgstr "continuer le rebasage" -#: builtin/rebase.c:491 +#: builtin/rebase.c:498 msgid "skip commit" msgstr "sauter le commit" -#: builtin/rebase.c:492 +#: builtin/rebase.c:499 msgid "edit the todo list" msgstr "éditer la liste à-faire" -#: builtin/rebase.c:494 +#: builtin/rebase.c:501 msgid "show the current patch" msgstr "afficher le patch courant" -#: builtin/rebase.c:497 +#: builtin/rebase.c:504 msgid "shorten commit ids in the todo list" msgstr "raccourcir les identifiants de commits dans la liste à-faire" -#: builtin/rebase.c:499 +#: builtin/rebase.c:506 msgid "expand commit ids in the todo list" msgstr "étendre les identifiants de commit dans la liste à-faire" -#: builtin/rebase.c:501 +#: builtin/rebase.c:508 msgid "check the todo list" msgstr "vérifier la liste à-faire" -#: builtin/rebase.c:503 +#: builtin/rebase.c:510 msgid "rearrange fixup/squash lines" msgstr "réarranger les lignes fixup/squash" -#: builtin/rebase.c:505 +#: builtin/rebase.c:512 msgid "insert exec commands in todo list" msgstr "insérer les commandes exec dans la liste à-faire" -#: builtin/rebase.c:506 +#: builtin/rebase.c:513 msgid "onto" msgstr "sur" -#: builtin/rebase.c:509 +#: builtin/rebase.c:516 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:509 +#: builtin/rebase.c:516 msgid "restrict revision" msgstr "restreindre la révision" -#: builtin/rebase.c:511 +#: builtin/rebase.c:518 msgid "squash-onto" msgstr "écraser-sur" -#: builtin/rebase.c:512 +#: builtin/rebase.c:519 msgid "squash onto" msgstr "écraser sur" -#: builtin/rebase.c:514 +#: builtin/rebase.c:521 msgid "the upstream commit" msgstr "le commit amont" -#: builtin/rebase.c:516 +#: builtin/rebase.c:523 msgid "head-name" msgstr "nom du head" -#: builtin/rebase.c:516 +#: builtin/rebase.c:523 msgid "head name" msgstr "nom du head" -#: builtin/rebase.c:521 +#: builtin/rebase.c:528 msgid "rebase strategy" msgstr "stratégie de rebasage" -#: builtin/rebase.c:522 +#: builtin/rebase.c:529 msgid "strategy-opts" msgstr "options de stratégie" -#: builtin/rebase.c:523 +#: builtin/rebase.c:530 msgid "strategy options" msgstr "options de stratégie" -#: builtin/rebase.c:524 +#: builtin/rebase.c:531 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:525 +#: builtin/rebase.c:532 msgid "the branch or commit to checkout" msgstr "la branche ou le commit à extraire" -#: builtin/rebase.c:526 +#: builtin/rebase.c:533 msgid "onto-name" msgstr "sur-le-nom" -#: builtin/rebase.c:526 +#: builtin/rebase.c:533 msgid "onto name" msgstr "sur le nom" -#: builtin/rebase.c:527 +#: builtin/rebase.c:534 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:527 +#: builtin/rebase.c:534 msgid "the command to run" msgstr "la commande à lancer" -#: builtin/rebase.c:530 builtin/rebase.c:1584 +#: builtin/rebase.c:537 builtin/rebase.c:1407 msgid "automatically re-schedule any `exec` that fails" msgstr "re-planifier automatiquement tout `exec` qui échoue" -#: builtin/rebase.c:546 +#: builtin/rebase.c:553 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges" -#: builtin/rebase.c:562 +#: builtin/rebase.c:569 #, c-format -msgid "%s requires an interactive rebase" -msgstr "%s requiert un rebasage interactif" +msgid "%s requires the merge backend" +msgstr "%s requiert un moteur de fusion" #: builtin/rebase.c:612 #, c-format msgid "could not get 'onto': '%s'" msgstr "impossible d'accéder 'onto' : '%s'" -#: builtin/rebase.c:627 +#: builtin/rebase.c:629 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head invalide : '%s'" -#: builtin/rebase.c:652 +#: builtin/rebase.c:654 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "allow_rerere_autoupdate invalide ignoré : '%s'" -#: builtin/rebase.c:728 -#, c-format -msgid "Could not read '%s'" -msgstr "Impossible de lire '%s'" - -#: builtin/rebase.c:746 -#, c-format -msgid "Cannot store %s" -msgstr "Impossible de stocker %s" - -#: builtin/rebase.c:853 -msgid "could not determine HEAD revision" -msgstr "impossible de déterminer la révision HEAD" - -#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:799 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -18616,7 +18812,7 @@ msgstr "" "arrêter\n" "et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"." -#: builtin/rebase.c:1058 +#: builtin/rebase.c:882 #, c-format msgid "" "\n" @@ -18635,7 +18831,7 @@ msgstr "" "\n" "Résultat, git ne peut pas les rebaser." -#: builtin/rebase.c:1383 +#: builtin/rebase.c:1208 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -18644,7 +18840,7 @@ msgstr "" "type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), " "\"keep\" (garder) et \"ask\" (demander)." -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1226 #, c-format msgid "" "%s\n" @@ -18661,7 +18857,7 @@ msgstr "" " git rebase '<branche>'\n" "\n" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1242 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18675,136 +18871,136 @@ msgstr "" " git branch --set-upstream-to=%s/<branche> %s\n" "\n" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1272 msgid "exec commands cannot contain newlines" msgstr "les commandes exec ne peut pas contenir de retour à la ligne" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1276 msgid "empty exec command" msgstr "commande exec vide" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1305 msgid "rebase onto given branch instead of upstream" msgstr "rebaser sur la branche %s au lieu de la branche amont" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1307 msgid "use the merge-base of upstream and branch as the current base" msgstr "" "utiliser la base de fusion de l'amont et la branche comme base actuelle" -#: builtin/rebase.c:1485 +#: builtin/rebase.c:1309 msgid "allow pre-rebase hook to run" msgstr "permettre le lancement du crochet pre-rebase" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1311 msgid "be quiet. implies --no-stat" msgstr "être silencieux. implique --no-stat" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1317 msgid "do not show diffstat of what changed upstream" msgstr "ne pas afficher un diffstat de ce qui a changé en amont" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1320 msgid "add a Signed-off-by: line to each commit" msgstr "ajouter une ligne Signed-off-by à chaque message de validation" -#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 +#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328 msgid "passed to 'git am'" msgstr "passé jusqu'à 'git am'" -#: builtin/rebase.c:1506 builtin/rebase.c:1508 +#: builtin/rebase.c:1330 builtin/rebase.c:1332 msgid "passed to 'git apply'" msgstr "passé jusqu'à git-apply" -#: builtin/rebase.c:1510 builtin/rebase.c:1513 +#: builtin/rebase.c:1334 builtin/rebase.c:1337 msgid "cherry-pick all commits, even if unchanged" msgstr "picorer tous les commits, même sans modifiant" -#: builtin/rebase.c:1515 +#: builtin/rebase.c:1339 msgid "continue" msgstr "continuer" -#: builtin/rebase.c:1518 +#: builtin/rebase.c:1342 msgid "skip current patch and continue" msgstr "sauter le patch courant et continuer" -#: builtin/rebase.c:1520 +#: builtin/rebase.c:1344 msgid "abort and check out the original branch" msgstr "abandonner et extraire la branche d'origine" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1347 msgid "abort but keep HEAD where it is" msgstr "abandonne mais garde HEAD où il est" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1348 msgid "edit the todo list during an interactive rebase" msgstr "éditer la liste à faire lors d'un rebasage interactif" -#: builtin/rebase.c:1527 +#: builtin/rebase.c:1351 msgid "show the patch file being applied or merged" msgstr "afficher le patch en cours d'application ou de fusion" -#: builtin/rebase.c:1530 +#: builtin/rebase.c:1354 msgid "use apply strategies to rebase" msgstr "utiliser des stratégies d'application pour rebaser" -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1358 msgid "use merging strategies to rebase" msgstr "utiliser des stratégies de fusion pour rebaser" -#: builtin/rebase.c:1538 +#: builtin/rebase.c:1362 msgid "let the user edit the list of commits to rebase" msgstr "laisser l'utilisateur éditer la liste des commits à rebaser" -#: builtin/rebase.c:1542 +#: builtin/rebase.c:1366 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer" -#: builtin/rebase.c:1547 +#: builtin/rebase.c:1371 msgid "how to handle commits that become empty" msgstr "comment gérer les commits qui deviennent vides" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1378 msgid "move commits that begin with squash!/fixup! under -i" msgstr "déplace les commits qui commencent par squash!/fixup! sous -i" -#: builtin/rebase.c:1560 -msgid "automatically stash/stash pop before and after" -msgstr "remiser et réappliquer automatiquement avant et après" - -#: builtin/rebase.c:1562 +#: builtin/rebase.c:1385 msgid "add exec lines after each commit of the editable list" msgstr "ajouter les lignes exec après chaque commit de la liste éditable" -#: builtin/rebase.c:1566 +#: builtin/rebase.c:1389 msgid "allow rebasing commits with empty messages" msgstr "autoriser les commits de rebasage avec des messages vides" -#: builtin/rebase.c:1570 +#: builtin/rebase.c:1393 msgid "try to rebase merges instead of skipping them" msgstr "essayer de rebaser les fusions au lieu de les garder" -#: builtin/rebase.c:1573 +#: builtin/rebase.c:1396 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont" -#: builtin/rebase.c:1575 +#: builtin/rebase.c:1398 msgid "use the given merge strategy" msgstr "utiliser la stratégie de fusion indiquée" -#: builtin/rebase.c:1577 builtin/revert.c:115 +#: builtin/rebase.c:1400 builtin/revert.c:115 msgid "option" msgstr "option" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1401 msgid "pass the argument through to the merge strategy" msgstr "passer les arguments jusqu'à la stratégie de fusion" -#: builtin/rebase.c:1581 +#: builtin/rebase.c:1404 msgid "rebase all reachable commits up to the root(s)" msgstr "rebaser tous les objets inatteignables depuis les racines" -#: builtin/rebase.c:1598 +#: builtin/rebase.c:1409 +msgid "apply all changes, even those already present upstream" +msgstr "appliquer toutes les modifications, même celles déjà présentes en amont" + +#: builtin/rebase.c:1426 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -18812,40 +19008,44 @@ msgstr "" "les support de rebase.useBuiltin a été supprimé !\n" "Voir son entrée dans 'git help config' pour plus de détails." -#: builtin/rebase.c:1604 +#: builtin/rebase.c:1432 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser." -#: builtin/rebase.c:1645 +#: builtin/rebase.c:1473 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges est déconseillé. Utilisez --rebase-merges à la " "place." -#: builtin/rebase.c:1650 +#: builtin/rebase.c:1478 msgid "cannot combine '--keep-base' with '--onto'" msgstr "impossible de combiner '--keep-base' avec '--onto'" -#: builtin/rebase.c:1652 +#: builtin/rebase.c:1480 msgid "cannot combine '--keep-base' with '--root'" msgstr "impossible de combiner '--keep-base' avec '--root'" -#: builtin/rebase.c:1656 +#: builtin/rebase.c:1484 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "impossible de combiner '--root' avec '--fork-point'" + +#: builtin/rebase.c:1487 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: builtin/rebase.c:1660 +#: builtin/rebase.c:1491 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'action --edit-todo peut seulement être utilisée lors d'un rebasage " "interactif." -#: builtin/rebase.c:1683 +#: builtin/rebase.c:1514 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: builtin/rebase.c:1695 +#: builtin/rebase.c:1526 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18853,16 +19053,16 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: builtin/rebase.c:1714 +#: builtin/rebase.c:1545 msgid "could not discard worktree changes" msgstr "Impossible de supprimer les changements de l'arbre de travail" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1564 #, c-format msgid "could not move back to %s" msgstr "Impossible de revenir à %s" -#: builtin/rebase.c:1778 +#: builtin/rebase.c:1610 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18884,168 +19084,145 @@ msgstr "" "chose\n" "d'important ici.\n" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1638 msgid "switch `C' expects a numerical value" msgstr "l'option `C' attend un valeur numérique" -#: builtin/rebase.c:1847 +#: builtin/rebase.c:1680 #, c-format msgid "Unknown mode: %s" msgstr "mode inconnu : %s" -#: builtin/rebase.c:1869 +#: builtin/rebase.c:1702 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiert --merge ou --interactive" -#: builtin/rebase.c:1899 +#: builtin/rebase.c:1732 msgid "cannot combine apply options with merge options" msgstr "" "impossible de combiner les options d'application avec les options de fusion" -#: builtin/rebase.c:1912 +#: builtin/rebase.c:1745 #, c-format msgid "Unknown rebase backend: %s" msgstr "backend de rebasage inconnu : %s" -#: builtin/rebase.c:1937 +#: builtin/rebase.c:1770 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec requiert --exec ou --interactive" -#: builtin/rebase.c:1957 +#: builtin/rebase.c:1790 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'" -#: builtin/rebase.c:1961 +#: builtin/rebase.c:1794 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "erreur : impossible de combiner '--preserve-merges' avec '--reschedule-" "failed-exec'" -#: builtin/rebase.c:1985 +#: builtin/rebase.c:1818 #, c-format msgid "invalid upstream '%s'" msgstr "amont invalide '%s'" -#: builtin/rebase.c:1991 +#: builtin/rebase.c:1824 msgid "Could not create new root commit" msgstr "Impossible de créer un nouveau commit racine" -#: builtin/rebase.c:2017 +#: builtin/rebase.c:1850 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s': exactement une base de fusion nécessaire avec une branche" -#: builtin/rebase.c:2020 +#: builtin/rebase.c:1853 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': exactement une base de fusion nécessaire" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:1861 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "ne pointe pas sur une validation valide : '%s'" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:1887 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal : pas de branche ou commit '%s'" -#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 +#: builtin/rebase.c:1895 builtin/submodule--helper.c:40 #: builtin/submodule--helper.c:1990 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:1906 msgid "Could not resolve HEAD to a revision" msgstr "Impossible de résoudre le commit HEAD vers un révision" -#: builtin/rebase.c:2111 -msgid "Cannot autostash" -msgstr "Autoremisage impossible" - -#: builtin/rebase.c:2114 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "réponse de remisage inattendue : '%s'" - -#: builtin/rebase.c:2120 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "Impossible de créer le répertoire pour '%s'" - -#: builtin/rebase.c:2123 -#, c-format -msgid "Created autostash: %s\n" -msgstr "Autoremisage créé : %s\n" - -#: builtin/rebase.c:2126 -msgid "could not reset --hard" -msgstr "impossible de réinitialiser --hard" - -#: builtin/rebase.c:2135 +#: builtin/rebase.c:1927 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: builtin/rebase.c:2169 +#: builtin/rebase.c:1963 #, c-format msgid "could not switch to %s" msgstr "Impossible de basculer vers %s" -#: builtin/rebase.c:2180 +#: builtin/rebase.c:1974 msgid "HEAD is up to date." msgstr "HEAD est à jour." -#: builtin/rebase.c:2182 +#: builtin/rebase.c:1976 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La branche courante %s est à jour.\n" -#: builtin/rebase.c:2190 +#: builtin/rebase.c:1984 msgid "HEAD is up to date, rebase forced." msgstr "HEAD est à jour, rebasage forcé." -#: builtin/rebase.c:2192 +#: builtin/rebase.c:1986 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "La branche courante %s est à jour, rebasage forcé.\n" -#: builtin/rebase.c:2200 +#: builtin/rebase.c:1994 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: builtin/rebase.c:2207 +#: builtin/rebase.c:2001 #, c-format msgid "Changes to %s:\n" msgstr "Changements vers %s :\n" -#: builtin/rebase.c:2210 +#: builtin/rebase.c:2004 #, c-format msgid "Changes from %s to %s:\n" msgstr "Changements de %s sur %s :\n" -#: builtin/rebase.c:2235 +#: builtin/rebase.c:2029 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Rembobinage préalable de head pour pouvoir rejouer votre travail par-" "dessus...\n" -#: builtin/rebase.c:2244 +#: builtin/rebase.c:2038 msgid "Could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: builtin/rebase.c:2253 +#: builtin/rebase.c:2047 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rapide de %s sur %s.\n" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <répertoire-git>" -#: builtin/receive-pack.c:821 +#: builtin/receive-pack.c:843 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -19075,7 +19252,7 @@ msgstr "" "Pour éliminer ce message et conserver le comportement par défaut,\n" "réglez « receive.denyCurrentBranch » à 'refuse'." -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:863 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -19095,11 +19272,11 @@ msgstr "" "\n" "Pour éliminer ce message, réglez-le à 'refuse'." -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:1960 msgid "quiet" msgstr "quiet" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:1974 msgid "You must specify a directory." msgstr "Vous devez spécifier un répertoire." @@ -19688,11 +19865,11 @@ msgstr "Pas d'URL trouvée : %s" msgid "Will not delete all non-push URLs" msgstr "Pas de suppression de toutes les URLs non-push" -#: builtin/repack.c:23 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "git repack [<options>]" -#: builtin/repack.c:28 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -19701,117 +19878,117 @@ msgstr "" "Utilisez\n" "--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps." -#: builtin/repack.c:191 +#: builtin/repack.c:193 msgid "could not start pack-objects to repack promisor objects" msgstr "" "ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur" -#: builtin/repack.c:230 builtin/repack.c:416 +#: builtin/repack.c:232 builtin/repack.c:418 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack : attente de lignes d'Id d'objets en hexa complet seulement depuis " "les objects de paquet." -#: builtin/repack.c:254 +#: builtin/repack.c:256 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "impossible de terminer pack-objects pour ré-empaqueter les objets de " "prometteur" -#: builtin/repack.c:292 +#: builtin/repack.c:294 msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" -#: builtin/repack.c:294 +#: builtin/repack.c:296 msgid "same as -a, and turn unreachable objects loose" msgstr "identique à -a et transformer les objets inaccessibles en suspens" -#: builtin/repack.c:297 +#: builtin/repack.c:299 msgid "remove redundant packs, and run git-prune-packed" msgstr "supprimer les paquets redondants et lancer git-prune-packed" -#: builtin/repack.c:299 +#: builtin/repack.c:301 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passer --no-reuse-delta à git-pack-objects" -#: builtin/repack.c:301 +#: builtin/repack.c:303 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passer --no-reuse-object à git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:305 msgid "do not run git-update-server-info" msgstr "ne pas lancer git update-server-info" -#: builtin/repack.c:306 +#: builtin/repack.c:308 msgid "pass --local to git-pack-objects" msgstr "passer --local à git-pack-objects" -#: builtin/repack.c:308 +#: builtin/repack.c:310 msgid "write bitmap index" msgstr "écrire un index en bitmap" -#: builtin/repack.c:310 +#: builtin/repack.c:312 msgid "pass --delta-islands to git-pack-objects" msgstr "passer --delta-islands à git-pack-objects" -#: builtin/repack.c:311 +#: builtin/repack.c:313 msgid "approxidate" msgstr "date approximative" -#: builtin/repack.c:312 +#: builtin/repack.c:314 msgid "with -A, do not loosen objects older than this" msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci" -#: builtin/repack.c:314 +#: builtin/repack.c:316 msgid "with -a, repack unreachable objects" msgstr "avec -a, repaquétiser les objets inaccessibles" -#: builtin/repack.c:316 +#: builtin/repack.c:318 msgid "size of the window used for delta compression" msgstr "taille de la fenêtre utilisée pour la compression des deltas" -#: builtin/repack.c:317 builtin/repack.c:323 +#: builtin/repack.c:319 builtin/repack.c:325 msgid "bytes" msgstr "octets" -#: builtin/repack.c:318 +#: builtin/repack.c:320 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments" -#: builtin/repack.c:320 +#: builtin/repack.c:322 msgid "limits the maximum delta depth" msgstr "limite la profondeur maximale des deltas" -#: builtin/repack.c:322 +#: builtin/repack.c:324 msgid "limits the maximum number of threads" msgstr "limite le nombre maximal de fils" -#: builtin/repack.c:324 +#: builtin/repack.c:326 msgid "maximum size of each packfile" msgstr "taille maximum de chaque fichier paquet" -#: builtin/repack.c:326 +#: builtin/repack.c:328 msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:328 +#: builtin/repack.c:330 msgid "do not repack this pack" msgstr "ne pas rempaqueter ce paquet" -#: builtin/repack.c:338 +#: builtin/repack.c:340 msgid "cannot delete packs in a precious-objects repo" msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux" -#: builtin/repack.c:342 +#: builtin/repack.c:344 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable et -A sont incompatibles" -#: builtin/repack.c:425 +#: builtin/repack.c:427 msgid "Nothing new to pack." msgstr "Rien de neuf à empaqueter." -#: builtin/repack.c:486 +#: builtin/repack.c:488 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -19830,7 +20007,7 @@ msgstr "" "ALERTE : aussi échoué.\n" "ALERTE : Veuillez les renommer manuellement dans %s :\n" -#: builtin/repack.c:534 +#: builtin/repack.c:536 #, c-format msgid "failed to remove '%s'" msgstr "échec de la suppression de '%s'" @@ -20142,95 +20319,95 @@ msgstr "merge" msgid "keep" msgstr "keep" -#: builtin/reset.c:82 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "Vous n'avez pas une HEAD valide." -#: builtin/reset.c:84 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "Impossible de trouver l'arbre pour HEAD." -#: builtin/reset.c:90 +#: builtin/reset.c:91 #, c-format msgid "Failed to find tree of %s." msgstr "Impossible de trouver l'arbre pour %s." -#: builtin/reset.c:115 +#: builtin/reset.c:116 #, c-format msgid "HEAD is now at %s" msgstr "HEAD est maintenant à %s" -#: builtin/reset.c:194 +#: builtin/reset.c:195 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion." -#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 #: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "être silencieux, afficher seulement les erreurs" -#: builtin/reset.c:296 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "réinitialiser HEAD et l'index" -#: builtin/reset.c:297 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "réinitialiser seulement HEAD" -#: builtin/reset.c:299 builtin/reset.c:301 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "réinitialiser HEAD, l'index et la copie de travail" -#: builtin/reset.c:303 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "réinitialiser HEAD mais garder les changements locaux" -#: builtin/reset.c:309 +#: builtin/reset.c:310 msgid "record only the fact that removed paths will be added later" msgstr "" "enregistrer seulement le fait que les chemins effacés seront ajoutés plus " "tard" -#: builtin/reset.c:343 +#: builtin/reset.c:344 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Échec de résolution de '%s' comme une révision valide." -#: builtin/reset.c:351 +#: builtin/reset.c:352 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Échec de résolution de '%s' comme un arbre valide." -#: builtin/reset.c:360 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch est incompatible avec --{hard,mixed,soft}" -#: builtin/reset.c:370 +#: builtin/reset.c:371 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la " "place." -#: builtin/reset.c:372 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "Impossible de faire un \"%s reset\" avec des chemins." -#: builtin/reset.c:387 +#: builtin/reset.c:388 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu" -#: builtin/reset.c:391 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "-N ne peut être utilisé qu'avec --mixed" -#: builtin/reset.c:412 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "Modifications non indexées après reset :" -#: builtin/reset.c:415 +#: builtin/reset.c:416 #, c-format msgid "" "\n" @@ -20245,12 +20422,12 @@ msgstr "" "de\n" "config reset.quiet à true pour avoir ce comportement en permanence.\n" -#: builtin/reset.c:425 +#: builtin/reset.c:434 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'." -#: builtin/reset.c:429 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." @@ -20270,23 +20447,23 @@ msgstr "rev-list ne supporte l'affichage des notes" msgid "marked counting is incompatible with --objects" msgstr "le comptage marqué est incompatible avec --objects" -#: builtin/rev-parse.c:408 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "garder le `--` passé en argument" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "sortie en forme longue fixée" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -20455,7 +20632,8 @@ msgstr "sortir avec un état zéro même si rien ne correspondait" #: builtin/rm.c:282 msgid "No pathspec was given. Which files should I remove?" -msgstr "Aucun spécificateur de chemin fourni. Quel fichier doit être supprimé ?" +msgstr "" +"Aucun spécificateur de chemin fourni. Quel fichier doit être supprimé ?" #: builtin/rm.c:305 msgid "please stage your changes to .gitmodules or stash them to proceed" @@ -20490,15 +20668,15 @@ msgstr "" msgid "remote name" msgstr "nom distant" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:176 msgid "use stateless RPC protocol" msgstr "utiliser un protocole RPC sans état" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:177 msgid "read refs from stdin" msgstr "lire les références depuis l'entrée standard" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:178 msgid "print status from remote helper" msgstr "afficher les messages du greffon de protocole distant" @@ -20728,8 +20906,8 @@ msgstr "" "local" #: builtin/sparse-checkout.c:21 -msgid "git sparse-checkout (init|list|set|add|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|disable) <options>" +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <options>" #: builtin/sparse-checkout.c:64 msgid "this worktree is not sparse (sparse-checkout file may not exist)" @@ -20737,63 +20915,51 @@ msgstr "" "cet arbre de travail n'est pas partiel (le fichier sparse-checkout pourrait " "ne pas exister)" -#: builtin/sparse-checkout.c:225 +#: builtin/sparse-checkout.c:212 msgid "failed to create directory for sparse-checkout file" msgstr "" "échec de la création du répertoire pour le fichier d'extraction partielle" -#: builtin/sparse-checkout.c:266 +#: builtin/sparse-checkout.c:253 msgid "failed to set extensions.worktreeConfig setting" msgstr "échec de paramétrage extensions.worktreeConfig" -#: builtin/sparse-checkout.c:283 +#: builtin/sparse-checkout.c:270 msgid "git sparse-checkout init [--cone]" msgstr "git sparse-checkout init [--cone]" -#: builtin/sparse-checkout.c:302 +#: builtin/sparse-checkout.c:289 msgid "initialize the sparse-checkout in cone mode" msgstr "initialiser l'extraction partielle en mode cone" -#: builtin/sparse-checkout.c:308 -msgid "initialize sparse-checkout" -msgstr "initialiser l'extraction partielle" - -#: builtin/sparse-checkout.c:341 +#: builtin/sparse-checkout.c:326 #, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" -#: builtin/sparse-checkout.c:398 +#: builtin/sparse-checkout.c:383 #, c-format msgid "could not normalize path %s" msgstr "impossible de normaliser le chemin '%s'" -#: builtin/sparse-checkout.c:410 +#: builtin/sparse-checkout.c:395 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)" -#: builtin/sparse-checkout.c:435 +#: builtin/sparse-checkout.c:420 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "Impossible de décoter la chaîne en style C '%s'" -#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 +#: builtin/sparse-checkout.c:474 builtin/sparse-checkout.c:498 msgid "unable to load existing sparse-checkout patterns" msgstr "impossible de charger les motifs de l'extraction partielle existants" -#: builtin/sparse-checkout.c:558 +#: builtin/sparse-checkout.c:543 msgid "read patterns from standard in" msgstr "lire les motifs depuis l'entrée standard" -#: builtin/sparse-checkout.c:564 -msgid "set sparse-checkout patterns" -msgstr "indiquer les motifs de l'extraction partielle" - -#: builtin/sparse-checkout.c:581 -msgid "disable sparse-checkout" -msgstr "désactiver d'extraction partielle" - -#: builtin/sparse-checkout.c:593 +#: builtin/sparse-checkout.c:580 msgid "error while refreshing working directory" msgstr "erreur lors du rafraîchissement du répertoire de travail" @@ -20873,7 +21039,7 @@ msgstr "'%s' n'est pas une validation de type remisage" msgid "Too many revisions specified:%s" msgstr "Trop de révisions spécifiées : %s" -#: builtin/stash.c:162 git-legacy-stash.sh:549 +#: builtin/stash.c:162 msgid "No stash entries found." msgstr "Aucune entrée de remisage trouvée." @@ -20882,7 +21048,7 @@ msgstr "Aucune entrée de remisage trouvée." msgid "%s is not a valid reference" msgstr "%s n'est pas une référence valide" -#: builtin/stash.c:225 git-legacy-stash.sh:75 +#: builtin/stash.c:225 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear avec des paramètres n'est pas implémenté" @@ -20912,7 +21078,7 @@ msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage" msgid "Merging %s with %s" msgstr "Fusion de %s avec %s" -#: builtin/stash.c:461 git-legacy-stash.sh:681 +#: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "L'index n'a pas été sorti de remise." @@ -20935,107 +21101,109 @@ msgstr "%s : Impossible de supprimer l'élément de stash" msgid "'%s' is not a stash reference" msgstr "'%s' n'est pas une référence de remisage" -#: builtin/stash.c:633 git-legacy-stash.sh:695 +#: builtin/stash.c:633 msgid "The stash entry is kept in case you need it again." msgstr "" "L'entrée de remisage est conservée au cas où vous en auriez encore besoin." -#: builtin/stash.c:656 git-legacy-stash.sh:713 +#: builtin/stash.c:656 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:800 builtin/stash.c:837 #, c-format msgid "Cannot update %s with %s" msgstr "Impossible de mettre à jour %s avec %s" -#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 +#: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540 msgid "stash message" msgstr "message pour le remisage" -#: builtin/stash.c:824 +#: builtin/stash.c:828 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" exige un argument <commit>" -#: builtin/stash.c:1049 git-legacy-stash.sh:218 +#: builtin/stash.c:1046 msgid "No changes selected" msgstr "Aucun changement sélectionné" -#: builtin/stash.c:1149 git-legacy-stash.sh:150 +#: builtin/stash.c:1146 msgid "You do not have the initial commit yet" msgstr "Vous n'avez pas encore la validation initiale" -#: builtin/stash.c:1176 git-legacy-stash.sh:165 +#: builtin/stash.c:1173 msgid "Cannot save the current index state" msgstr "Impossible de sauver l'état courant de l'index" -#: builtin/stash.c:1185 git-legacy-stash.sh:180 +#: builtin/stash.c:1182 msgid "Cannot save the untracked files" msgstr "Impossible de sauver les fichiers non-suivis" -#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 +#: builtin/stash.c:1193 builtin/stash.c:1202 msgid "Cannot save the current worktree state" msgstr "Impossible de sauver l'état courant de la copie de travail" -#: builtin/stash.c:1233 git-legacy-stash.sh:234 +#: builtin/stash.c:1230 msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'état de la copie de travail" -#: builtin/stash.c:1282 git-legacy-stash.sh:338 +#: builtin/stash.c:1279 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Impossible d'utiliser --patch et --include-untracked ou --all en même temps" -#: builtin/stash.c:1298 +#: builtin/stash.c:1295 msgid "Did you forget to 'git add'?" msgstr "Vous avez sûrement oublié 'git add' ?" -#: builtin/stash.c:1313 git-legacy-stash.sh:346 +#: builtin/stash.c:1310 msgid "No local changes to save" msgstr "Pas de modifications locales à sauver" -#: builtin/stash.c:1320 git-legacy-stash.sh:351 +#: builtin/stash.c:1317 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: builtin/stash.c:1335 git-legacy-stash.sh:355 +#: builtin/stash.c:1332 msgid "Cannot save the current status" msgstr "Impossible de sauver l'état courant" -#: builtin/stash.c:1340 +#: builtin/stash.c:1337 #, c-format msgid "Saved working directory and index state %s" msgstr "Arbre de travail et état de l'index sauvegardés dans %s" -#: builtin/stash.c:1430 git-legacy-stash.sh:385 +#: builtin/stash.c:1427 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1466 builtin/stash.c:1531 msgid "keep index" msgstr "conserver l'index" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1468 builtin/stash.c:1533 msgid "stash in patch mode" msgstr "remiser une mode rustine" -#: builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "quiet mode" msgstr "mode silencieux" -#: builtin/stash.c:1474 builtin/stash.c:1539 +#: builtin/stash.c:1471 builtin/stash.c:1536 msgid "include untracked files in stash" msgstr "inclure les fichiers non suivis dans la remise" -#: builtin/stash.c:1476 builtin/stash.c:1541 +#: builtin/stash.c:1473 builtin/stash.c:1538 msgid "include ignore files" msgstr "inclure les fichiers ignorés" -#: builtin/stash.c:1600 -#, c-format -msgid "could not exec %s" -msgstr "impossible d'exécuter %s" +#: builtin/stash.c:1573 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"la prise en charge de stash.useBuiltin a été supprimée !\n" +"Voir son entrée dans 'git help config' pour plus de détails." #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" @@ -21494,18 +21662,26 @@ msgstr "git submodule--helper config --unset <nom>" msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2241 git-submodule.sh:174 +#: builtin/submodule--helper.c:2241 git-submodule.sh:176 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail" -#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2257 +msgid "Suppress output for setting url of a submodule" +msgstr "Supprimer la sortie lors du paramétrage de l'url d'un sous-module" + +#: builtin/submodule--helper.c:2261 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "git submodule--helper sync [--quiet] <chemin> <nouvelle-url>" + +#: builtin/submodule--helper.c:2323 git.c:436 git.c:683 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ne gère pas --super-prefix" -#: builtin/submodule--helper.c:2297 +#: builtin/submodule--helper.c:2329 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" @@ -21531,11 +21707,11 @@ msgstr "supprimer la référence symbolique" msgid "shorten ref output" msgstr "raccourcir l'affichage de la référence" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "raison" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "raison de la mise à jour" @@ -21630,135 +21806,135 @@ msgstr "" msgid "bad object type." msgstr "mauvais type d'objet." -#: builtin/tag.c:284 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "pas de message pour l'étiquette ?" -#: builtin/tag.c:291 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "Le message pour l'étiquette a été laissé dans %s\n" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "list tag names" msgstr "afficher les noms des étiquettes" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "affiche <n> lignes de chaque message d'étiquette" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "delete tags" msgstr "supprimer des étiquettes" -#: builtin/tag.c:407 +#: builtin/tag.c:408 msgid "verify tags" msgstr "vérifier des étiquettes" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "Options de création de l'étiquette" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "étiquette annotée, nécessite un message" -#: builtin/tag.c:413 +#: builtin/tag.c:414 msgid "tag message" msgstr "message pour l'étiquette" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "forcer l'édition du message d'étiquetage" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "étiquette annotée et signée avec GPG" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "utiliser une autre clé pour signer l'étiquette" -#: builtin/tag.c:420 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "remplacer l'étiquette si elle existe" -#: builtin/tag.c:421 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "créer un reflog" -#: builtin/tag.c:423 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "Options d'affichage des étiquettes" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "afficher la liste des étiquettes sous forme de colonnes" -#: builtin/tag.c:425 builtin/tag.c:427 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "afficher seulement les étiquettes qui contiennent la validation" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation" -#: builtin/tag.c:429 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "afficher seulement les étiquettes qui sont fusionnées" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées" -#: builtin/tag.c:434 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "afficher seulement les étiquettes de l'objet" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "--column et -n sont incompatibles" -#: builtin/tag.c:504 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "l'option -n est autorisée seulement en mode de liste" -#: builtin/tag.c:506 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "l'option --contains est autorisée seulement en mode de liste" -#: builtin/tag.c:508 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "l'option --contains est autorisée seulement en mode liste" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "l'option --points-at est autorisée seulement en mode liste" -#: builtin/tag.c:512 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" "les options --merged et --no-merged ne sont autorisées qu'en mode liste" -#: builtin/tag.c:523 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "une seule option -F ou -m est autorisée." -#: builtin/tag.c:542 +#: builtin/tag.c:543 msgid "too many params" msgstr "trop de paramètres" -#: builtin/tag.c:548 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' n'est pas un nom d'étiquette valide." -#: builtin/tag.c:553 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "l'étiquette '%s' existe déjà" -#: builtin/tag.c:584 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" @@ -22050,19 +22226,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<options>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "supprimer la référence" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "mettre à jour <nomréférence> et non la référence pointée par lui" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" msgstr "l'entrée standard a des arguments qui se terminent par NUL" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "lire les mises à jour depuis l'entrée standard" @@ -22089,8 +22265,7 @@ msgstr "Sortir immédiatement après l'annonce initiale des références" #: builtin/upload-pack.c:27 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" -"nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire " -"Git" +"ne pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire Git" #: builtin/upload-pack.c:29 msgid "interrupt transfer after <n> seconds of inactivity" @@ -22156,7 +22331,7 @@ msgstr "git worktree remove [<options>] <arbre-de-travail>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <chemin>" -#: builtin/worktree.c:60 builtin/worktree.c:891 +#: builtin/worktree.c:60 builtin/worktree.c:894 #, c-format msgid "failed to delete '%s'" msgstr "échec de la suppression de '%s'" @@ -22240,124 +22415,124 @@ msgstr "" msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:435 builtin/worktree.c:441 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')" -#: builtin/worktree.c:434 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" "Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; " "précédemment sur %s)" -#: builtin/worktree.c:443 +#: builtin/worktree.c:446 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Préparation de l'arbre de travail (extraction de '%s')" -#: builtin/worktree.c:449 +#: builtin/worktree.c:452 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Préparation de l'arbre de travail (HEAD détachée %s)" -#: builtin/worktree.c:490 +#: builtin/worktree.c:493 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "extraire la <branche> même si elle est déjà extraite dans une autre copie de " "travail" -#: builtin/worktree.c:493 +#: builtin/worktree.c:496 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:495 +#: builtin/worktree.c:498 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:497 +#: builtin/worktree.c:500 msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" -#: builtin/worktree.c:498 +#: builtin/worktree.c:501 msgid "keep the new working tree locked" msgstr "conserver le verrou sur le nouvel arbre de travail" -#: builtin/worktree.c:501 +#: builtin/worktree.c:504 msgid "set up tracking mode (see git-branch(1))" msgstr "régler le mode de suivi (voir git-branch(1))" -#: builtin/worktree.c:504 +#: builtin/worktree.c:507 msgid "try to match the new branch name with a remote-tracking branch" msgstr "essayer de nommer la nouvelle branche comme la branche amont" -#: builtin/worktree.c:512 +#: builtin/worktree.c:515 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/worktree.c:573 +#: builtin/worktree.c:576 msgid "--[no-]track can only be used if a new branch is created" msgstr "" "--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche" -#: builtin/worktree.c:673 +#: builtin/worktree.c:676 msgid "reason for locking" msgstr "raison du verrouillage" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:688 builtin/worktree.c:721 builtin/worktree.c:795 +#: builtin/worktree.c:922 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:690 builtin/worktree.c:723 msgid "The main working tree cannot be locked or unlocked" msgstr "" "La copie de travail principale ne peut pas être verrouillée ou déverrouillée" -#: builtin/worktree.c:692 +#: builtin/worktree.c:695 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:694 +#: builtin/worktree.c:697 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:722 +#: builtin/worktree.c:725 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" -#: builtin/worktree.c:763 +#: builtin/worktree.c:766 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "les arbres de travail contenant des sous-modules ne peuvent pas être " "déplacés ou supprimés" -#: builtin/worktree.c:771 +#: builtin/worktree.c:774 msgid "force move even if worktree is dirty or locked" msgstr "" "forcer le déplacement même si l'arbre de travail est sale ou verrouillé" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:797 builtin/worktree.c:924 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' est un arbre de travail principal" -#: builtin/worktree.c:799 +#: builtin/worktree.c:802 #, c-format msgid "could not figure out destination name from '%s'" msgstr "impossible de trouver le nom de la destination à partir de '%s'" -#: builtin/worktree.c:805 +#: builtin/worktree.c:808 #, c-format msgid "target '%s' already exists" msgstr "la cible '%s' existe déjà" -#: builtin/worktree.c:813 +#: builtin/worktree.c:816 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -22367,7 +22542,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:815 +#: builtin/worktree.c:818 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -22375,39 +22550,39 @@ msgstr "" "impossible de déplacer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:818 +#: builtin/worktree.c:821 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "la validation a échoué, impossible de déplacer l'arbre de travail : %s" -#: builtin/worktree.c:823 +#: builtin/worktree.c:826 #, c-format msgid "failed to move '%s' to '%s'" msgstr "échec au déplacement de '%s' vers '%s'" -#: builtin/worktree.c:871 +#: builtin/worktree.c:874 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "échec du lancement de 'git status' sur '%s'" -#: builtin/worktree.c:875 +#: builtin/worktree.c:878 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "'%s' contient des fichiers modifiés ou non-suivis, utilisez --force pour le " "supprimer" -#: builtin/worktree.c:880 +#: builtin/worktree.c:883 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "impossible de lancer 'git status' sur '%s', code %d" -#: builtin/worktree.c:903 +#: builtin/worktree.c:906 msgid "force removal even if worktree is dirty or locked" msgstr "" "forcer la suppression même si l'arbre de travail est sale ou verrouillé" -#: builtin/worktree.c:926 +#: builtin/worktree.c:929 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -22417,7 +22592,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:928 +#: builtin/worktree.c:931 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22425,7 +22600,7 @@ msgstr "" "impossible de supprimer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:931 +#: builtin/worktree.c:934 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" @@ -22447,17 +22622,121 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le débogage" -#: fast-import.c:3125 +#: bugreport.c:14 +msgid "git version:\n" +msgstr "version git ::\n" + +#: bugreport.c:20 +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "échec de uname() avec l'erreur '%s' (%d)\n" + +#: bugreport.c:30 +msgid "compiler info: " +msgstr "info compilateur : " + +#: bugreport.c:32 +msgid "libc info: " +msgstr "info libc : " + +#: bugreport.c:74 +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" + +#: bugreport.c:84 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "git bugreport [-o|--output-directory <fichier>] [-s|--suffix <format>]" + +#: bugreport.c:91 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"Merci de remplir le rapport de bogue Git !\n" +"Veuillez répondre aux questions suivantes pour nous aider à comprendre votre problème.\n" +"\n" +"Qu'avez-vous fait avant l'apparition du bogue ? (Étapes pour reproduire votre problème)\n" +"\n" +"Quel était le résultat attendu ? (comportement attendu)\n" +"\n" +"Que s'est-il passé à la place ? (comportement observé)\n" +"\n" +"Quelle différence y a-t-il entre ce que vous attendiez et ce qu'il s'est passé ?\n" +"\n" +"Autres remarques :\n" +"\n" +"Veuillez relire le rapport de bogue ci-dessous.\n" +"Vous pouvez supprimer toute ligne que vous ne souhaitez pas envoyer.\n" + +#: bugreport.c:130 +msgid "specify a destination for the bugreport file" +msgstr "spécifier la destination du fichier de rapport de bogue" + +#: bugreport.c:132 +msgid "specify a strftime format suffix for the filename" +msgstr "spécifier une suffixe au format strftime pour le nom de fichier" + +#: bugreport.c:156 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "impossible de créer les répertoires de premier niveau pour '%s'" + +#: bugreport.c:163 +msgid "System Info" +msgstr "Info système" + +#: bugreport.c:166 +msgid "Enabled Hooks" +msgstr "Crochets activés" + +#: bugreport.c:174 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "impossible de créer un fichier nouveau à '%s'" + +#: bugreport.c:186 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "Nouveau rapport créé à '%s'.\n" + +#: fast-import.c:3085 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "Champs from manquants pour le sous-module '%s'" + +#: fast-import.c:3087 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "champs to manquants pour le sous-module '%s'" + +#: fast-import.c:3222 #, c-format msgid "Expected 'mark' command, got %s" msgstr "commande 'mark' attendue, %s trouvé" -#: fast-import.c:3130 +#: fast-import.c:3227 #, c-format msgid "Expected 'to' command, got %s" msgstr "commande 'to' attendue, %s trouvé" -#: fast-import.c:3254 +#: fast-import.c:3317 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "Format attendu nom:<nom de fichier> pour l'option de réécriture de sous-module" + +#: fast-import.c:3371 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "" @@ -22497,7 +22776,7 @@ msgstr "test-tool serve-v2 [<options>]" msgid "exit immediately after advertising capabilities" msgstr "sortir immédiatement après l'annonce des capacités" -#: git.c:27 +#: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -22514,7 +22793,7 @@ msgstr "" " [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n" " <commande> [<args>]" -#: git.c:34 +#: git.c:35 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -22526,47 +22805,47 @@ msgstr "" "pour en lire plus à propos d'une commande spécifique ou d'un concept.\n" "Voir 'git help git' pour un survol du système." -#: git.c:186 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "aucun répertoire fourni pour --git-dir\n" -#: git.c:200 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "aucun espace de nom fournit pour --namespace\n" -#: git.c:214 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "aucun répertoire fourni pour --work-tree\n" -#: git.c:228 +#: git.c:229 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "aucun préfixe fourni pour --super-prefix\n" -#: git.c:250 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "-c requiert une chaîne de configuration\n" -#: git.c:288 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "aucun répertoire fourni pour -C\n" -#: git.c:314 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "option inconnue : %s\n" -#: git.c:360 +#: git.c:362 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "lors de l'expansion de l'alias '%s' : '%s'" -#: git.c:369 +#: git.c:371 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -22575,39 +22854,39 @@ msgstr "" "l'alias '%s' modifie les variables d'environnement.\n" "Vous pouvez utiliser '!git' dans l'alias pour le faire" -#: git.c:376 +#: git.c:378 #, c-format msgid "empty alias for %s" msgstr "alias vide pour %s" -#: git.c:379 +#: git.c:381 #, c-format msgid "recursive alias: %s" msgstr "alias recursif : %s" -#: git.c:459 +#: git.c:463 msgid "write failure on standard output" msgstr "échec d'écriture sur la sortie standard" -#: git.c:461 +#: git.c:465 msgid "unknown write failure on standard output" msgstr "échec inconnu d'écriture sur la sortie standard" -#: git.c:463 +#: git.c:467 msgid "close failed on standard output" msgstr "échec de fermeture de la sortie standard" -#: git.c:793 +#: git.c:792 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "boucle d'alias détectée : l'expansion de '%s' ne finit jamais : %s" -#: git.c:843 +#: git.c:842 #, c-format msgid "cannot handle %s as a builtin" msgstr "impossible d'utiliser %s comme une fonction intégrée" -#: git.c:856 +#: git.c:855 #, c-format msgid "" "usage: %s\n" @@ -22616,57 +22895,57 @@ msgstr "" "usage : %s\n" "\n" -#: git.c:876 +#: git.c:875 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n" -#: git.c:888 +#: git.c:887 #, c-format msgid "failed to run command '%s': %s\n" msgstr "échec au lancement de la commande '%s' : %s\n" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" "valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0" -#: http.c:876 +#: http.c:914 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REMOVE n'est pas supporté avec cuRL < 7.44.0" -#: http.c:949 +#: http.c:993 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Les restrictions de protocole ne sont pas supportés avec cuRL < 7.19.4" -#: http.c:1086 +#: http.c:1139 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Dorsale SSL '%s' non supportée. Dorsales SSL supportées :" -#: http.c:1093 +#: http.c:1146 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "Impossible de régler la dorsale SSL à '%s' : cURL a été construit sans " "dorsale SSL" -#: http.c:1097 +#: http.c:1150 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Impossible de spécifier le dorsal SSL à '%s' : déjà spécifié" -#: http.c:1966 +#: http.c:2032 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -22788,6 +23067,14 @@ msgstr "remote-curl : récupération tentée sans dépôt local" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl : commande inconnue '%s' depuis git" +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "aucune information de compilateur disponible\n" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "aucune information de libc disponible\n" + #: list-objects-filter-options.h:85 msgid "args" msgstr "args" @@ -22844,11 +23131,11 @@ msgid "update the index with reused conflict resolution if possible" msgstr "" "met à jour l'index avec les résolutions de conflit réutilisées si possible" -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "HEAD détachée depuis " @@ -22891,642 +23178,646 @@ msgid "List, create, or delete branches" msgstr "Lister, créer ou supprimer des branches" #: command-list.h:59 +msgid "Collect information for user to file a bug report" +msgstr "Collecter l'information pour l'utilisateur pour remplir un rapport de bogue" + +#: command-list.h:60 msgid "Move objects and refs by archive" msgstr "Déplacer les objets et références par archive" -#: command-list.h:60 +#: command-list.h:61 msgid "Provide content or type and size information for repository objects" msgstr "" -"Fournir les contenu ou l'information de type et taille pour les objets du " +"Fournir le contenu ou l'information de type et taille pour les objets du " "dépôt" -#: command-list.h:61 +#: command-list.h:62 msgid "Display gitattributes information" msgstr "Afficher les informations gitattributes" -#: command-list.h:62 +#: command-list.h:63 msgid "Debug gitignore / exclude files" msgstr "Déboguer gitignore / les fichiers d'exclusion" -#: command-list.h:63 +#: command-list.h:64 msgid "Show canonical names and email addresses of contacts" msgstr "Afficher les noms canoniques et les adresses courriel des contacts" -#: command-list.h:64 +#: command-list.h:65 msgid "Switch branches or restore working tree files" msgstr "Basculer de branche ou restaurer la copie de travail" -#: command-list.h:65 +#: command-list.h:66 msgid "Copy files from the index to the working tree" msgstr "Copier les fichiers depuis l'index dans la copie de travail" -#: command-list.h:66 +#: command-list.h:67 msgid "Ensures that a reference name is well formed" -msgstr "Assure qu'un nom de référence est bien formé" +msgstr "S'assurer qu'un nom de référence est bien formé" -#: command-list.h:67 +#: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "Trouver les commits à appliquer en amont" -#: command-list.h:68 +#: command-list.h:69 msgid "Apply the changes introduced by some existing commits" msgstr "Appliquer les modifications introduites par des commits existants" -#: command-list.h:69 +#: command-list.h:70 msgid "Graphical alternative to git-commit" msgstr "Alternative graphique à git-commit" -#: command-list.h:70 +#: command-list.h:71 msgid "Remove untracked files from the working tree" msgstr "Supprimer les fichiers non-suivis de l'arbre de travail" -#: command-list.h:71 +#: command-list.h:72 msgid "Clone a repository into a new directory" msgstr "Cloner un dépôt dans un nouveau répertoire" -#: command-list.h:72 +#: command-list.h:73 msgid "Display data in columns" msgstr "Afficher les données en colonnes" -#: command-list.h:73 +#: command-list.h:74 msgid "Record changes to the repository" msgstr "Enregistrer les modifications dans le dépôt" -#: command-list.h:74 +#: command-list.h:75 msgid "Write and verify Git commit-graph files" msgstr "Écrire et vérifier les fichiers de graphe de commit Git" -#: command-list.h:75 +#: command-list.h:76 msgid "Create a new commit object" msgstr "Créer un nouvel objet commit" -#: command-list.h:76 +#: command-list.h:77 msgid "Get and set repository or global options" msgstr "voir et régler les options globales ou de dépôt" -#: command-list.h:77 +#: command-list.h:78 msgid "Count unpacked number of objects and their disk consumption" msgstr "" "Compter le nombre d'objets non-empaquetés et leur consommation d'espace " "disque" -#: command-list.h:78 +#: command-list.h:79 msgid "Retrieve and store user credentials" msgstr "Récupérer et sauvegarder les certificats d'utilisateur" -#: command-list.h:79 +#: command-list.h:80 msgid "Helper to temporarily store passwords in memory" msgstr "Assistant pour maintenir temporairement en mémoire les mots de passe" -#: command-list.h:80 +#: command-list.h:81 msgid "Helper to store credentials on disk" msgstr "Assistant pour sauvegarder les certificats sur disque" -#: command-list.h:81 +#: command-list.h:82 msgid "Export a single commit to a CVS checkout" msgstr "Exporter un commit unique en extraction CVS" -#: command-list.h:82 +#: command-list.h:83 msgid "Salvage your data out of another SCM people love to hate" msgstr "Sauver vos données depuis un autre SCM qu'on aime à haïr" -#: command-list.h:83 +#: command-list.h:84 msgid "A CVS server emulator for Git" msgstr "Un émulateur de serveur CVS pour Git" -#: command-list.h:84 +#: command-list.h:85 msgid "A really simple server for Git repositories" msgstr "Un serveur vraiment simple pour les dépôts Git" -#: command-list.h:85 +#: command-list.h:86 msgid "Give an object a human readable name based on an available ref" msgstr "" "Baptiser un objet avec un nom lisible à partir d'une référence disponible" -#: command-list.h:86 +#: command-list.h:87 msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Afficher les changements entre les validations, entre validation et copie de " "travail, etc" -#: command-list.h:87 +#: command-list.h:88 msgid "Compares files in the working tree and the index" msgstr "Compare des fichiers de l'arbre de travail et de l'index" -#: command-list.h:88 +#: command-list.h:89 msgid "Compare a tree to the working tree or index" msgstr "Comparer un arbre avec l'arbre de travail ou l'index" -#: command-list.h:89 +#: command-list.h:90 msgid "Compares the content and mode of blobs found via two tree objects" -msgstr "Compare le contenu et la mode des blobs trouvés via deux objets arbre" +msgstr "Compare le contenu et le mode des blobs trouvés via deux objets arbre" -#: command-list.h:90 +#: command-list.h:91 msgid "Show changes using common diff tools" msgstr "Afficher les modifications en utilisant les outils habituel de diff" -#: command-list.h:91 +#: command-list.h:92 msgid "Git data exporter" msgstr "Exporteur de données Git" -#: command-list.h:92 +#: command-list.h:93 msgid "Backend for fast Git data importers" msgstr "Moteur pour les importateurs rapides de données Git" -#: command-list.h:93 +#: command-list.h:94 msgid "Download objects and refs from another repository" msgstr "Télécharger les objets et références depuis un autre dépôt" -#: command-list.h:94 +#: command-list.h:95 msgid "Receive missing objects from another repository" msgstr "Télécharger les objets manquants depuis un autre dépôt" -#: command-list.h:95 +#: command-list.h:96 msgid "Rewrite branches" msgstr "Réécrire les branches" -#: command-list.h:96 +#: command-list.h:97 msgid "Produce a merge commit message" msgstr "Produire un message de validation de fusion" -#: command-list.h:97 +#: command-list.h:98 msgid "Output information on each ref" -msgstr "Afficher l'information de chaque référence" +msgstr "Afficher de l'information sur chaque référence" -#: command-list.h:98 +#: command-list.h:99 msgid "Prepare patches for e-mail submission" msgstr "Préparer les patchs pour soumission par courriel" -#: command-list.h:99 +#: command-list.h:100 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "" "Vérifier la connectivité et la validité des objets dans la base de données" -#: command-list.h:100 +#: command-list.h:101 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "Effacer les fichiers non-nécessaires et optimiser le dépôt local" -#: command-list.h:101 +#: command-list.h:102 msgid "Extract commit ID from an archive created using git-archive" msgstr "Extraire l'ID du commit depuis une archive créée par git-archive" -#: command-list.h:102 +#: command-list.h:103 msgid "Print lines matching a pattern" msgstr "Afficher les lignes correspondant à un motif" -#: command-list.h:103 +#: command-list.h:104 msgid "A portable graphical interface to Git" msgstr "Une interface graphique portable pour Git" -#: command-list.h:104 +#: command-list.h:105 msgid "Compute object ID and optionally creates a blob from a file" msgstr "" "Calculer l'ID d'objet et créer optionnellement un blob depuis un fichier" -#: command-list.h:105 +#: command-list.h:106 msgid "Display help information about Git" msgstr "Afficher l'information d'aide à propos de Git" -#: command-list.h:106 +#: command-list.h:107 msgid "Server side implementation of Git over HTTP" msgstr "Implantation côté serveur de Git sur HTTP" -#: command-list.h:107 +#: command-list.h:108 msgid "Download from a remote Git repository via HTTP" msgstr "Télécharger depuis un dépôt Git distant via HTTP" -#: command-list.h:108 +#: command-list.h:109 msgid "Push objects over HTTP/DAV to another repository" msgstr "Pousser les objets sur un autre dépôt via HTTP/DAV" -#: command-list.h:109 +#: command-list.h:110 msgid "Send a collection of patches from stdin to an IMAP folder" -msgstr "Envoyer un ensemble de patchs depuis stdin vers un répertoire IMAP" +msgstr "Envoyer un ensemble de rustines depuis stdin vers un répertoire IMAP" -#: command-list.h:110 +#: command-list.h:111 msgid "Build pack index file for an existing packed archive" msgstr "" "Construire un fichier d'index pack depuis une archive compactée existante" -#: command-list.h:111 +#: command-list.h:112 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Créer un dépôt Git vide ou réinitialiser un existant" -#: command-list.h:112 +#: command-list.h:113 msgid "Instantly browse your working repository in gitweb" msgstr "Naviguer instantanément votre dépôt de travail dans gitweb" -#: command-list.h:113 +#: command-list.h:114 msgid "Add or parse structured information in commit messages" msgstr "" "Ajouter ou analyser l'information structurée dans les messages de validation" -#: command-list.h:114 +#: command-list.h:115 msgid "The Git repository browser" msgstr "Le navigateur de dépôt Git" -#: command-list.h:115 +#: command-list.h:116 msgid "Show commit logs" msgstr "Afficher l'historique des validations" -#: command-list.h:116 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" msgstr "" "Afficher l'information à propos des fichiers dans l'index ou l'arbre de " "travail" -#: command-list.h:117 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "Lister les références dans un dépôt distant" -#: command-list.h:118 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "Afficher le contenu d'un objet arbre" -#: command-list.h:119 +#: command-list.h:120 msgid "Extracts patch and authorship from a single e-mail message" msgstr "" "Extraire le patch et l'information de d'auteur depuis un simple message de " "courriel" -#: command-list.h:120 +#: command-list.h:121 msgid "Simple UNIX mbox splitter program" msgstr "Programme simple de découpage de mbox UNIX" -#: command-list.h:121 +#: command-list.h:122 msgid "Join two or more development histories together" msgstr "Fusionner deux ou plusieurs historiques de développement ensemble" -#: command-list.h:122 +#: command-list.h:123 msgid "Find as good common ancestors as possible for a merge" msgstr "Trouver un ancêtre aussi bon que possible pour une fusion" -#: command-list.h:123 +#: command-list.h:124 msgid "Run a three-way file merge" msgstr "Lancer une fusion à 3 points" -#: command-list.h:124 +#: command-list.h:125 msgid "Run a merge for files needing merging" msgstr "Lancer une fusion à 3 points pour les fichiers à fusionner" -#: command-list.h:125 +#: command-list.h:126 msgid "The standard helper program to use with git-merge-index" msgstr "Le programme assistant standard à utiliser avec git-merge-index" -#: command-list.h:126 +#: command-list.h:127 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" "Lancer les outils de résolution de conflit de fusion pour résoudre les " "conflits de fusion" -#: command-list.h:127 +#: command-list.h:128 msgid "Show three-way merge without touching index" msgstr "Afficher la fusion à trois points sans modifier l'index" -#: command-list.h:128 +#: command-list.h:129 msgid "Write and verify multi-pack-indexes" msgstr "Écrire et vérifier les index multi-paquet" -#: command-list.h:129 +#: command-list.h:130 msgid "Creates a tag object" msgstr "Créer un objet étiquette" -#: command-list.h:130 +#: command-list.h:131 msgid "Build a tree-object from ls-tree formatted text" msgstr "Construire un objet arbre depuis une texte formaté comme ls-tree" -#: command-list.h:131 +#: command-list.h:132 msgid "Move or rename a file, a directory, or a symlink" msgstr "Déplacer ou renommer un fichier, un répertoire, ou un lien symbolique" -#: command-list.h:132 +#: command-list.h:133 msgid "Find symbolic names for given revs" msgstr "Trouver les noms symboliques pour des révisions données" -#: command-list.h:133 +#: command-list.h:134 msgid "Add or inspect object notes" -msgstr "Ajouter ou inspecter les notes d'un objets" +msgstr "Ajouter ou inspecter les notes d'un objet" -#: command-list.h:134 +#: command-list.h:135 msgid "Import from and submit to Perforce repositories" msgstr "Importer et soumettre à des dépôt Perforce" -#: command-list.h:135 +#: command-list.h:136 msgid "Create a packed archive of objects" msgstr "Créer une archive compactée d'objets" -#: command-list.h:136 +#: command-list.h:137 msgid "Find redundant pack files" msgstr "Trouver les fichiers pack redondants" -#: command-list.h:137 +#: command-list.h:138 msgid "Pack heads and tags for efficient repository access" msgstr "Empaqueter les têtes et les étiquettes pour un accès efficace au dépôt" -#: command-list.h:138 +#: command-list.h:139 msgid "Routines to help parsing remote repository access parameters" msgstr "" "Routines pour aider à analyser les paramètres d'accès aux dépôts distants" -#: command-list.h:139 +#: command-list.h:140 msgid "Compute unique ID for a patch" msgstr "Calculer l'ID unique d'un patch" -#: command-list.h:140 +#: command-list.h:141 msgid "Prune all unreachable objects from the object database" msgstr "" "Éliminer les objets inatteignables depuis la base de données des objets" -#: command-list.h:141 +#: command-list.h:142 msgid "Remove extra objects that are already in pack files" msgstr "Éliminer les objets qui sont déjà présents dans les fichiers pack" -#: command-list.h:142 +#: command-list.h:143 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Rapatrier et intégrer un autre dépôt ou une branche locale" -#: command-list.h:143 +#: command-list.h:144 msgid "Update remote refs along with associated objects" msgstr "Mettre à jour les références distantes ainsi que les objets associés" -#: command-list.h:144 +#: command-list.h:145 msgid "Applies a quilt patchset onto the current branch" msgstr "Appliquer un patchset quilt sur la branche courante" -#: command-list.h:145 +#: command-list.h:146 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "" "Comparer deux plages de commits (par exemple deux versions d'une branche)" -#: command-list.h:146 +#: command-list.h:147 msgid "Reads tree information into the index" msgstr "Lire l'information d'arbre dans l'index" -#: command-list.h:147 +#: command-list.h:148 msgid "Reapply commits on top of another base tip" msgstr "Réapplication des commits sur le sommet de l'autre base" -#: command-list.h:148 +#: command-list.h:149 msgid "Receive what is pushed into the repository" msgstr "Recevoir ce qui est poussé dans le dépôt" -#: command-list.h:149 +#: command-list.h:150 msgid "Manage reflog information" msgstr "Gérer l'information de reflog" -#: command-list.h:150 +#: command-list.h:151 msgid "Manage set of tracked repositories" msgstr "Gérer un ensemble de dépôts suivis" -#: command-list.h:151 +#: command-list.h:152 msgid "Pack unpacked objects in a repository" msgstr "Empaqueter les objets non-empaquetés d'un dépôt" -#: command-list.h:152 +#: command-list.h:153 msgid "Create, list, delete refs to replace objects" msgstr "Créer, lister, supprimer des référence pour remplacer des objets" -#: command-list.h:153 +#: command-list.h:154 msgid "Generates a summary of pending changes" msgstr "Générer une résumé des modifications en attentes" -#: command-list.h:154 +#: command-list.h:155 msgid "Reuse recorded resolution of conflicted merges" msgstr "Réutiliser une résolution enregistrée de fusions conflictuelles" -#: command-list.h:155 +#: command-list.h:156 msgid "Reset current HEAD to the specified state" msgstr "Réinitialiser la HEAD courante à l'état spécifié" -#: command-list.h:156 +#: command-list.h:157 msgid "Restore working tree files" msgstr "restaurer les fichiers l'arbre de travail" -#: command-list.h:157 +#: command-list.h:158 msgid "Revert some existing commits" msgstr "Inverser des commits existants" -#: command-list.h:158 +#: command-list.h:159 msgid "Lists commit objects in reverse chronological order" msgstr "Afficher les objets commit dans l'ordre chronologique inverse" -#: command-list.h:159 +#: command-list.h:160 msgid "Pick out and massage parameters" msgstr "Analyser et préparer les paramètres" -#: command-list.h:160 +#: command-list.h:161 msgid "Remove files from the working tree and from the index" msgstr "Supprimer des fichiers de la copie de travail et de l'index" -#: command-list.h:161 +#: command-list.h:162 msgid "Send a collection of patches as emails" msgstr "Envoyer un ensemble de patchs comme courriels" -#: command-list.h:162 +#: command-list.h:163 msgid "Push objects over Git protocol to another repository" msgstr "Pousser les objets sur un autre dépôt via le protocole Git" -#: command-list.h:163 +#: command-list.h:164 msgid "Restricted login shell for Git-only SSH access" msgstr "shell de login restreint pour un accès SSH vers Git seulement" -#: command-list.h:164 +#: command-list.h:165 msgid "Summarize 'git log' output" msgstr "Résumer la sortie de 'git log'" -#: command-list.h:165 +#: command-list.h:166 msgid "Show various types of objects" msgstr "Afficher différents types d'objets" -#: command-list.h:166 +#: command-list.h:167 msgid "Show branches and their commits" msgstr "Afficher les branches et leurs commits" -#: command-list.h:167 +#: command-list.h:168 msgid "Show packed archive index" msgstr "Afficher l'index de l'archive empaquetée" -#: command-list.h:168 +#: command-list.h:169 msgid "List references in a local repository" msgstr "Lister les références du dépôt local" -#: command-list.h:169 +#: command-list.h:170 msgid "Git's i18n setup code for shell scripts" msgstr "Le code d'initialisation i18n pour les scripts shell" -#: command-list.h:170 +#: command-list.h:171 msgid "Common Git shell script setup code" msgstr "Le code d'initialisation commun aux scripts shell Git" -#: command-list.h:171 +#: command-list.h:172 msgid "Initialize and modify the sparse-checkout" msgstr "Initialiser et modifier l'extraction partielle" -#: command-list.h:172 +#: command-list.h:173 msgid "Stash the changes in a dirty working directory away" msgstr "Remiser les modifications d'un répertoire de travail sale" -#: command-list.h:173 +#: command-list.h:174 msgid "Add file contents to the staging area" msgstr "Ajouter le contenu de fichiers à l'index" -#: command-list.h:174 +#: command-list.h:175 msgid "Show the working tree status" msgstr "Afficher l'état de la copie de travail" -#: command-list.h:175 +#: command-list.h:176 msgid "Remove unnecessary whitespace" msgstr "Retirer les espaces inutiles" -#: command-list.h:176 +#: command-list.h:177 msgid "Initialize, update or inspect submodules" msgstr "Initialiser, mettre à jour et inspecter les sous-modules" -#: command-list.h:177 +#: command-list.h:178 msgid "Bidirectional operation between a Subversion repository and Git" -msgstr "Opération Bidirectionnelles entre un dépôt Subversion et Git" +msgstr "Opération Bidirectionnelle entre un dépôt Subversion et Git" -#: command-list.h:178 +#: command-list.h:179 msgid "Switch branches" msgstr "Basculer de branche" -#: command-list.h:179 +#: command-list.h:180 msgid "Read, modify and delete symbolic refs" msgstr "Lire, modifier et supprimer les références symboliques" -#: command-list.h:180 +#: command-list.h:181 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" "Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG" -#: command-list.h:181 +#: command-list.h:182 msgid "Creates a temporary file with a blob's contents" msgstr "Créer un fichier temporaire avec le contenu d'un blob" -#: command-list.h:182 +#: command-list.h:183 msgid "Unpack objects from a packed archive" msgstr "Dépaqueter les objets depuis une archive empaquetée" -#: command-list.h:183 +#: command-list.h:184 msgid "Register file contents in the working tree to the index" msgstr "Enregistrer le contenu d'un fichier de l'arbre de travail dans l'index" -#: command-list.h:184 +#: command-list.h:185 msgid "Update the object name stored in a ref safely" msgstr "" "Mettre à jour le nom d'objet stocké dans une référence en toute sécurité" -#: command-list.h:185 +#: command-list.h:186 msgid "Update auxiliary info file to help dumb servers" msgstr "" "Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs " "idiots" -#: command-list.h:186 +#: command-list.h:187 msgid "Send archive back to git-archive" msgstr "Renvoyer une archive dans git-archive" -#: command-list.h:187 +#: command-list.h:188 msgid "Send objects packed back to git-fetch-pack" msgstr "Renvoyer des objets empaquetés dans git-fetch-pack" -#: command-list.h:188 +#: command-list.h:189 msgid "Show a Git logical variable" msgstr "Afficher un variable logique de Git" -#: command-list.h:189 +#: command-list.h:190 msgid "Check the GPG signature of commits" msgstr "Vérifier la signature GPG de commits" -#: command-list.h:190 +#: command-list.h:191 msgid "Validate packed Git archive files" msgstr "Valider des fichiers d'archive Git empaquetés" -#: command-list.h:191 +#: command-list.h:192 msgid "Check the GPG signature of tags" msgstr "Vérifier la signature GPG d'étiquettes" -#: command-list.h:192 +#: command-list.h:193 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interface web de Git" -#: command-list.h:193 +#: command-list.h:194 msgid "Show logs with difference each commit introduces" msgstr "Afficher les journaux avec la différence que chaque commit introduit" -#: command-list.h:194 +#: command-list.h:195 msgid "Manage multiple working trees" -msgstr "Gère de arbres de travail multiples" +msgstr "Gérer des arbres de travail multiples" -#: command-list.h:195 +#: command-list.h:196 msgid "Create a tree object from the current index" msgstr "Créer un objet arbre depuis l'index courant" -#: command-list.h:196 +#: command-list.h:197 msgid "Defining attributes per path" msgstr "Définition des attributs par chemin" -#: command-list.h:197 +#: command-list.h:198 msgid "Git command-line interface and conventions" msgstr "interface en ligne de commande et conventions de Git" -#: command-list.h:198 +#: command-list.h:199 msgid "A Git core tutorial for developers" msgstr "Tutoriel du cœur de Git pour les développeurs" -#: command-list.h:199 +#: command-list.h:200 msgid "Git for CVS users" msgstr "Git pour les utilisateurs de CVS" -#: command-list.h:200 +#: command-list.h:201 msgid "Tweaking diff output" msgstr "Bidouillage de la sortie diff" -#: command-list.h:201 +#: command-list.h:202 msgid "A useful minimum set of commands for Everyday Git" msgstr "Un ensemble minimal utile des commandes de Git pour tous les jours" -#: command-list.h:202 +#: command-list.h:203 msgid "A Git Glossary" msgstr "Un glossaire Git" -#: command-list.h:203 +#: command-list.h:204 msgid "Hooks used by Git" msgstr "Crochets utilisés par Git" -#: command-list.h:204 +#: command-list.h:205 msgid "Specifies intentionally untracked files to ignore" msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement" -#: command-list.h:205 +#: command-list.h:206 msgid "Defining submodule properties" msgstr "Définition des propriétés de sous-module" -#: command-list.h:206 +#: command-list.h:207 msgid "Git namespaces" msgstr "Espaces de nom de Git" -#: command-list.h:207 +#: command-list.h:208 msgid "Git Repository Layout" msgstr "Disposition d'un dépôt Git" -#: command-list.h:208 +#: command-list.h:209 msgid "Specifying revisions and ranges for Git" msgstr "Spécification des révisions et portées pour Git" -#: command-list.h:209 +#: command-list.h:210 msgid "Mounting one repository inside another" msgstr "Montage d'un dépôt dans un autre dépôt" -#: command-list.h:210 +#: command-list.h:211 msgid "A tutorial introduction to Git: part two" msgstr "Une introduction pratique à Git : deuxième partie" -#: command-list.h:211 +#: command-list.h:212 msgid "A tutorial introduction to Git" msgstr "Une introduction pratique à Git" -#: command-list.h:212 +#: command-list.h:213 msgid "An overview of recommended workflows with Git" msgstr "Un aperçu des flux de travail recommandés avec Git" @@ -23570,20 +23861,20 @@ msgstr "Pas de fichier de log donné" msgid "cannot read $file for replaying" msgstr "impossible de lire $file pour rejouer" -#: git-bisect.sh:232 +#: git-bisect.sh:233 msgid "?? what are you talking about?" msgstr "?? de quoi parlez-vous ?" -#: git-bisect.sh:241 +#: git-bisect.sh:243 msgid "bisect run failed: no command provided." msgstr "la bissection a échoué : aucune commande fournie." -#: git-bisect.sh:246 +#: git-bisect.sh:248 #, sh-format msgid "running $command" msgstr "lancement de $command" -#: git-bisect.sh:253 +#: git-bisect.sh:255 #, sh-format msgid "" "bisect run failed:\n" @@ -23592,11 +23883,11 @@ msgstr "" "la bissection a échoué :\n" "le code retour $res de '$command' est < 0 ou >= 128" -#: git-bisect.sh:279 +#: git-bisect.sh:281 msgid "bisect run cannot continue any more" msgstr "la bissection ne peut plus continuer" -#: git-bisect.sh:285 +#: git-bisect.sh:287 #, sh-format msgid "" "bisect run failed:\n" @@ -23605,11 +23896,11 @@ msgstr "" "la bissection a échoué :\n" "'bisect_state $state' a retourné le code erreur $res" -#: git-bisect.sh:292 +#: git-bisect.sh:294 msgid "bisect run success" msgstr "succès de la bissection" -#: git-bisect.sh:300 +#: git-bisect.sh:302 msgid "We are not bisecting." msgstr "Pas de bissection en cours." @@ -23653,133 +23944,50 @@ msgstr "Essai de fusion simple avec $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "La fusion simple a échoué, essai avec la fusion automatique." -#: git-legacy-stash.sh:221 -msgid "Cannot remove temporary index (can't happen)" -msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)" - -#: git-legacy-stash.sh:272 -#, sh-format -msgid "Cannot update $ref_stash with $w_commit" -msgstr "Impossible de mettre à jour $ref_stash avec $w_commit" - -#: git-legacy-stash.sh:324 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "erreur : option inconnue pour 'stash push' : $option" - -#: git-legacy-stash.sh:356 -#, sh-format -msgid "Saved working directory and index state $stash_msg" -msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg" - -#: git-legacy-stash.sh:536 -#, sh-format -msgid "unknown option: $opt" -msgstr "option inconnue : $opt" - -#: git-legacy-stash.sh:556 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "Trop de révisions spécifiées : $REV" - -#: git-legacy-stash.sh:571 -#, sh-format -msgid "$reference is not a valid reference" -msgstr "$reference n'est pas une référence valide" - -#: git-legacy-stash.sh:599 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "'$args' n'est pas une validation de type remisage" - -#: git-legacy-stash.sh:610 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "'$args' n'est pas une référence de remisage" - -#: git-legacy-stash.sh:618 -msgid "unable to refresh index" -msgstr "impossible de rafraîchir l'index" - -#: git-legacy-stash.sh:622 -msgid "Cannot apply a stash in the middle of a merge" -msgstr "Impossible d'appliquer un remisage en cours de fusion" - -#: git-legacy-stash.sh:630 -msgid "Conflicts in index. Try without --index." -msgstr "Conflits dans l'index. Essayez sans --index." - -#: git-legacy-stash.sh:632 -msgid "Could not save index tree" -msgstr "Impossible de sauvegarder l'arbre d'index" - -#: git-legacy-stash.sh:641 -msgid "Could not restore untracked files from stash entry" -msgstr "" -"Impossible de restaurer les fichiers non-suivis depuis l'entrée de remisage" - -#: git-legacy-stash.sh:666 -msgid "Cannot unstage modified files" -msgstr "Impossible de désindexer les fichiers modifiés" - -#: git-legacy-stash.sh:704 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "${REV} supprimé ($s)" - -#: git-legacy-stash.sh:705 -#, sh-format -msgid "${REV}: Could not drop stash entry" -msgstr "${REV}: Impossible de supprimer l'entrée de stash" - -#: git-legacy-stash.sh:792 -msgid "(To restore them type \"git stash apply\")" -msgstr "(Pour les restaurer tapez \"git stash apply\")" - -#: git-submodule.sh:203 +#: git-submodule.sh:205 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Un chemin relatif ne peut être utilisé que depuis la racine de la copie de " "travail" -#: git-submodule.sh:213 +#: git-submodule.sh:215 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../" -#: git-submodule.sh:232 +#: git-submodule.sh:234 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' existe déjà dans l'index" -#: git-submodule.sh:235 +#: git-submodule.sh:237 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module" -#: git-submodule.sh:242 +#: git-submodule.sh:244 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' n'a pas de commit extrait" -#: git-submodule.sh:273 +#: git-submodule.sh:275 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Ajout du dépôt existant à '$sm_path' dans l'index" -#: git-submodule.sh:275 +#: git-submodule.sh:277 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide" -#: git-submodule.sh:283 +#: git-submodule.sh:285 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) " "distant(s) :" -#: git-submodule.sh:285 +#: git-submodule.sh:287 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23796,39 +24004,39 @@ msgstr "" "correct\n" "ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'." -#: git-submodule.sh:291 +#: git-submodule.sh:293 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'." -#: git-submodule.sh:303 +#: git-submodule.sh:305 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Impossible d'extraire le sous-module '$sm_path'" -#: git-submodule.sh:308 +#: git-submodule.sh:310 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Échec d'ajout du sous-module '$sm_path'" -#: git-submodule.sh:317 +#: git-submodule.sh:319 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Échec d'enregistrement du sous-module '$sm_path'" -#: git-submodule.sh:590 +#: git-submodule.sh:592 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Impossible de trouver la révision courante dans le chemin de sous-module " "'$displaypath'" -#: git-submodule.sh:600 +#: git-submodule.sh:602 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'" -#: git-submodule.sh:605 +#: git-submodule.sh:607 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -23837,7 +24045,7 @@ msgstr "" "Impossible de trouver la révision courante ${remote_name}/${branch} dans le " "chemin de sous-module '$sm_path'" -#: git-submodule.sh:623 +#: git-submodule.sh:625 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -23846,7 +24054,7 @@ msgstr "" "Impossible de rapatrier dans le chemin de sous-module '$displaypath' ; essai " "de rapatriement direct de $sha1 :" -#: git-submodule.sh:629 +#: git-submodule.sh:631 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23855,76 +24063,76 @@ msgstr "" "Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas " "$sha1. La récupération directe de ce commit a échoué." -#: git-submodule.sh:636 +#: git-submodule.sh:638 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:637 +#: git-submodule.sh:639 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" -#: git-submodule.sh:641 +#: git-submodule.sh:643 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:642 +#: git-submodule.sh:644 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'" -#: git-submodule.sh:647 +#: git-submodule.sh:649 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:648 +#: git-submodule.sh:650 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'" -#: git-submodule.sh:653 +#: git-submodule.sh:655 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "L'exécution de '$command $sha1' a échoué dans le chemin de sous-module " "'$displaypath'" -#: git-submodule.sh:654 +#: git-submodule.sh:656 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'" -#: git-submodule.sh:685 +#: git-submodule.sh:687 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" -#: git-submodule.sh:896 +#: git-submodule.sh:878 msgid "The --cached option cannot be used with the --files option" msgstr "L'option --cached ne peut pas être utilisée avec l'option --files" -#: git-submodule.sh:948 +#: git-submodule.sh:930 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode $mod_dst inattendu" -#: git-submodule.sh:968 +#: git-submodule.sh:950 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Attention : $display_name ne contient pas la validation $sha1_src" -#: git-submodule.sh:971 +#: git-submodule.sh:953 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Attention : $display_name ne contient pas la validation $sha1_dst" -#: git-submodule.sh:974 +#: git-submodule.sh:956 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -23945,6 +24153,16 @@ msgstr "Autoremisage appliqué." msgid "Cannot store $stash_sha1" msgstr "Impossible de stocker $stash_sha1" +#: git-rebase--preserve-merges.sh:113 +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" +"L'application de l'autoremisage a provoqué des conflits\n" +"Vos modifications sont à l'abri dans la remise.\n" +"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" + #: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" |