diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-07-26 09:48:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-26 09:48:11 -0700 |
| commit | 5c06d60fc55d2213c089f63c282468080f812686 (patch) | |
| tree | a01f1695283b80dc8c4328b20fce8dd471655bfd /po/fr.po | |
| parent | Merge branch 'ps/ref-transaction-hook' into master (diff) | |
| parent | Merge branch 'master' of github.com:Softcatala/git-po (diff) | |
| download | tgif-5c06d60fc55d2213c089f63c282468080f812686.tar.xz | |
Merge tag 'l10n-2.28.0-rnd1' of https://www.github.com/git-l10n/git-po into master
l10n-2.28.0-rnd1
* tag 'l10n-2.28.0-rnd1' of https://www.github.com/git-l10n/git-po:
l10n: es: 2.28.0 round 1
l10n: de.po: Update German translation for Git v2.28.0
l10n: de.po: fix grammar
l10n: zh_CN: for git v2.28.0 l10n round 1
l10n: zh_TW.po: v2.28.0 round 1 (0 untranslated)
l10n: vi.po: correct "ident line" translation
l10n: vi.po(4931t): Updated translation for v2.28.0
l10n: fr v2.28.0 round 1
l10n: sv.po: Update Swedish translation (4931t0f0u)
l10n: it.po: update the Italian translation for Git 2.28.0 round 1
l10n: tr: v2.28.0 round 1
l10n: git.pot: v2.28.0 round 1 (70 new, 14 removed)
l10n: Update Catalan translation
Diffstat (limited to 'po/fr.po')
| -rw-r--r-- | po/fr.po | 2552 |
1 files changed, 1408 insertions, 1144 deletions
@@ -76,8 +76,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-05-27 07:23+0800\n" -"PO-Revision-Date: 2020-05-27 11:04+0200\n" +"POT-Creation-Date: 2020-07-10 09:53+0800\n" +"PO-Revision-Date: 2020-07-12 18:00+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" @@ -180,21 +180,21 @@ msgstr[1] "%d chemins ajoutés\n" msgid "ignoring unmerged: %s" msgstr "fichier non-fusionné ignoré : %s" -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 +#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368 #, c-format msgid "Only binary files changed.\n" msgstr "Seuls des fichiers binaires ont changé.\n" -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 +#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370 #, c-format msgid "No changes.\n" msgstr "Aucune modification.\n" -#: add-interactive.c:935 git-add--interactive.perl:1376 +#: add-interactive.c:935 git-add--interactive.perl:1378 msgid "Patch update" msgstr "Mise à jour par patch" -#: add-interactive.c:974 git-add--interactive.perl:1754 +#: add-interactive.c:974 git-add--interactive.perl:1771 msgid "Review diff" msgstr "Réviser la différence" @@ -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:816 git-add--interactive.perl:1851 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865 msgid "What now" msgstr "Et maintenant ?" @@ -286,7 +286,7 @@ msgstr "non-indexé" #: 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 bugreport.c:129 +#: builtin/submodule--helper.c:2148 bugreport.c:135 #: git-add--interactive.perl:213 msgid "path" msgstr "chemin" @@ -295,27 +295,32 @@ msgstr "chemin" msgid "could not refresh index" msgstr "impossible de rafraîchir l'index" -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782 #, c-format msgid "Bye.\n" msgstr "Au revoir.\n" -#: add-patch.c:34 git-add--interactive.perl:1428 +#: add-patch.c:34 git-add--interactive.perl:1430 #, 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:35 git-add--interactive.perl:1429 +#: add-patch.c:35 git-add--interactive.perl:1431 #, 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:36 git-add--interactive.perl:1430 +#: add-patch.c:36 git-add--interactive.perl:1432 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "Indexer l'ajout [y,n,q,a,d%s,?] ? " + +#: add-patch.c:37 git-add--interactive.perl:1433 #, 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:38 +#: add-patch.c:39 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." @@ -323,7 +328,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme indexée." -#: add-patch.c:41 +#: add-patch.c:42 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -337,22 +342,27 @@ msgstr "" "a - indexer cette section et toutes les suivantes de ce fichier\n" "d - ne pas indexer cette section ni les suivantes de ce fichier\n" -#: add-patch.c:55 git-add--interactive.perl:1433 +#: add-patch.c:56 git-add--interactive.perl:1436 #, 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:56 git-add--interactive.perl:1434 +#: add-patch.c:57 git-add--interactive.perl:1437 #, 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:57 git-add--interactive.perl:1435 +#: add-patch.c:58 git-add--interactive.perl:1438 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "Remiser l'ajout [y,n,q,a,d%s,?] ? " + +#: add-patch.c:59 git-add--interactive.perl:1439 #, 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:59 +#: add-patch.c:61 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." @@ -360,7 +370,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme remisée." -#: add-patch.c:62 +#: add-patch.c:64 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -374,22 +384,27 @@ msgstr "" "a - remiser cette section et toutes les suivantes de ce fichier\n" "d - ne pas remiser cette section ni les suivantes de ce fichier\n" -#: add-patch.c:78 git-add--interactive.perl:1438 +#: add-patch.c:80 git-add--interactive.perl:1442 #, 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:79 git-add--interactive.perl:1439 +#: add-patch.c:81 git-add--interactive.perl:1443 #, 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:80 git-add--interactive.perl:1440 +#: add-patch.c:82 git-add--interactive.perl:1444 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "Désindexer l'ajout [y,n,q,a,d%s,?] ? " + +#: add-patch.c:83 git-add--interactive.perl:1445 #, 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:82 +#: add-patch.c:85 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." @@ -397,7 +412,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme desindexée." -#: add-patch.c:85 +#: add-patch.c:88 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -411,22 +426,27 @@ msgstr "" "a - désindexer cette section et toutes les suivantes de ce fichier\n" "d - ne pas désindexer cette section ni les suivantes de ce fichier\n" -#: add-patch.c:100 git-add--interactive.perl:1443 +#: add-patch.c:103 git-add--interactive.perl:1448 #, 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:101 git-add--interactive.perl:1444 +#: add-patch.c:104 git-add--interactive.perl:1449 #, 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:102 git-add--interactive.perl:1445 +#: add-patch.c:105 git-add--interactive.perl:1450 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "Appliquer l'ajout à l'index [y,n,q,a,d%s,?] ? " + +#: add-patch.c:106 git-add--interactive.perl:1451 #, 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:104 add-patch.c:169 add-patch.c:212 +#: add-patch.c:108 add-patch.c:176 add-patch.c:221 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." @@ -434,7 +454,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme appliquée." -#: add-patch.c:107 +#: add-patch.c:111 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -448,25 +468,31 @@ 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:122 git-add--interactive.perl:1448 -#: git-add--interactive.perl:1463 +#: add-patch.c:126 git-add--interactive.perl:1454 +#: git-add--interactive.perl:1472 #, 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:123 git-add--interactive.perl:1449 -#: git-add--interactive.perl:1464 +#: add-patch.c:127 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 #, 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:124 git-add--interactive.perl:1450 -#: git-add--interactive.perl:1465 +#: add-patch.c:128 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "Abandonner l'ajout dans l'arbre [y,n,q,a,d%s,?] ? " + +#: add-patch.c:129 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, 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:126 add-patch.c:148 add-patch.c:191 +#: add-patch.c:131 add-patch.c:154 add-patch.c:199 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." @@ -474,7 +500,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera immédiatement " "marquée comme éliminée." -#: add-patch.c:129 add-patch.c:194 +#: add-patch.c:134 add-patch.c:202 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -488,24 +514,29 @@ msgstr "" "a - supprimer cette section et toutes les suivantes de ce fichier\n" "d - ne pas supprimer cette section ni les suivantes de ce fichier\n" -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460 #, 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:145 add-patch.c:188 git-add--interactive.perl:1454 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461 #, 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:146 add-patch.c:189 git-add--interactive.perl:1455 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Abandonner l'ajout de l'index et de l'arbre [y,n,q,a,d%s,?] ? " + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463 #, 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:151 +#: add-patch.c:157 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -519,27 +550,32 @@ 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:165 add-patch.c:208 git-add--interactive.perl:1458 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466 #, 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:166 add-patch.c:209 git-add--interactive.perl:1459 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467 #, 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:167 add-patch.c:210 git-add--interactive.perl:1460 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Appliquer l'ajout dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469 #, 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:172 +#: add-patch.c:179 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -553,7 +589,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:215 +#: add-patch.c:224 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -567,34 +603,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:319 +#: add-patch.c:328 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "impossible d'analyser l'entête de section '%.*s'" -#: add-patch.c:338 add-patch.c:342 +#: add-patch.c:347 add-patch.c:351 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "impossible d'analyser l'entête coloré de section '%.*s'" -#: add-patch.c:396 +#: add-patch.c:405 msgid "could not parse diff" msgstr "impossible d'analyser la diff" -#: add-patch.c:415 +#: add-patch.c:424 msgid "could not parse colored diff" msgstr "impossible d'analyser la diff colorée" -#: add-patch.c:429 +#: add-patch.c:438 #, c-format msgid "failed to run '%s'" msgstr "échec pour lancer '%s'" -#: add-patch.c:588 +#: add-patch.c:602 msgid "mismatched output from interactive.diffFilter" msgstr "sortie sans correspondance depuis interactive.diffFilter" -#: add-patch.c:589 +#: add-patch.c:603 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -602,7 +638,7 @@ msgstr "" "Votre filtre doit maintenir une correspondance un-pour-un\n" "entre les lignes en entrée et en sortie." -#: add-patch.c:762 +#: add-patch.c:776 #, c-format msgid "" "expected context line #%d in\n" @@ -611,7 +647,7 @@ msgstr "" "ligne de contexte attendue #%d dans\n" "%.*s" -#: add-patch.c:777 +#: add-patch.c:791 #, c-format msgid "" "hunks do not overlap:\n" @@ -624,12 +660,12 @@ msgstr "" "\tne se termine pas par :\n" "%.*s" -#: add-patch.c:1053 git-add--interactive.perl:1112 +#: add-patch.c:1067 git-add--interactive.perl:1114 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:1057 +#: add-patch.c:1071 #, c-format msgid "" "---\n" @@ -643,7 +679,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:1071 git-add--interactive.perl:1126 +#: add-patch.c:1085 git-add--interactive.perl:1128 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" @@ -653,11 +689,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:1104 +#: add-patch.c:1118 msgid "could not parse hunk header" msgstr "impossible d'analyser l'entête de section" -#: add-patch.c:1149 +#: add-patch.c:1163 msgid "'git apply --cached' failed" msgstr "'git apply --cached' a échoué" @@ -673,26 +709,26 @@ msgstr "'git apply --cached' a échoué" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1218 git-add--interactive.perl:1239 +#: add-patch.c:1232 git-add--interactive.perl:1241 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" " "l'élimine !) [y|n] ? " -#: add-patch.c:1261 +#: add-patch.c:1275 msgid "The selected hunks do not apply to the index!" msgstr "Les sections sélectionnées ne s'applique pas à l'index !" -#: add-patch.c:1262 git-add--interactive.perl:1343 +#: add-patch.c:1276 git-add--interactive.perl:1345 msgid "Apply them to the worktree anyway? " msgstr "Les appliquer quand même à l'arbre de travail ? " -#: add-patch.c:1269 git-add--interactive.perl:1346 +#: add-patch.c:1283 git-add--interactive.perl:1348 msgid "Nothing was applied.\n" msgstr "Rien n'a été appliqué.\n" -#: add-patch.c:1326 +#: add-patch.c:1340 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -714,69 +750,69 @@ msgstr "" "e - éditer manuellement la section actuelle\n" "? - afficher l'aide\n" -#: add-patch.c:1447 add-patch.c:1457 +#: add-patch.c:1463 add-patch.c:1473 msgid "No previous hunk" msgstr "Pas de section précédente" -#: add-patch.c:1452 add-patch.c:1462 +#: add-patch.c:1468 add-patch.c:1478 msgid "No next hunk" msgstr "Pas de section suivante" -#: add-patch.c:1468 +#: add-patch.c:1484 msgid "No other hunks to goto" msgstr "Aucune autre section à atteindre" -#: add-patch.c:1479 git-add--interactive.perl:1577 +#: add-patch.c:1495 git-add--interactive.perl:1594 msgid "go to which hunk (<ret> to see more)? " msgstr "aller à quelle section (<ret> pour voir plus) ? " -#: add-patch.c:1480 git-add--interactive.perl:1579 +#: add-patch.c:1496 git-add--interactive.perl:1596 msgid "go to which hunk? " msgstr "aller à quelle section ? " -#: add-patch.c:1491 +#: add-patch.c:1507 #, c-format msgid "Invalid number: '%s'" msgstr "Numéro invalide : '%s'" -#: add-patch.c:1496 +#: add-patch.c:1512 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "Désolé, %d seule section disponible." msgstr[1] "Désolé, Seulement %d sections disponibles." -#: add-patch.c:1505 +#: add-patch.c:1521 msgid "No other hunks to search" msgstr "aucune autre section à rechercher" -#: add-patch.c:1511 git-add--interactive.perl:1623 +#: add-patch.c:1527 git-add--interactive.perl:1640 msgid "search for regex? " msgstr "rechercher la regex ? " -#: add-patch.c:1526 +#: add-patch.c:1542 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Regex de recherche malformée %s : %s" -#: add-patch.c:1543 +#: add-patch.c:1559 msgid "No hunk matches the given pattern" msgstr "Aucune section ne correspond au motif donné" -#: add-patch.c:1550 +#: add-patch.c:1566 msgid "Sorry, cannot split this hunk" msgstr "Désolé, impossible de découper cette section" -#: add-patch.c:1554 +#: add-patch.c:1570 #, c-format msgid "Split into %d hunks." msgstr "Découpée en %d sections." -#: add-patch.c:1558 +#: add-patch.c:1574 msgid "Sorry, cannot edit this hunk" msgstr "Désolé, impossible d'éditer cette section" -#: add-patch.c:1609 +#: add-patch.c:1625 msgid "'git apply' failed" msgstr "'git apply' a échoué" @@ -785,7 +821,9 @@ msgstr "'git apply' a échoué" msgid "" "\n" "Disable this message with \"git config advice.%s false\"" -msgstr "\nDésactivez ce message avec \"git config advice.%s false\"" +msgstr "" +"\n" +"Désactivez ce message avec \"git config advice.%s false\"" #: advice.c:156 #, c-format @@ -1478,7 +1516,7 @@ msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" #: 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:3458 builtin/rebase.c:1332 +#: builtin/pack-objects.c:3530 builtin/rebase.c:1332 msgid "action" msgstr "action" @@ -1571,7 +1609,7 @@ msgstr "le chemin n'est pas codé en UTF-8 valide : %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s" -#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235 +#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" @@ -1641,8 +1679,8 @@ msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" #: 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:907 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208 +#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 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 @@ -1869,10 +1907,10 @@ msgstr "" "--reverse et --first-parent ensemble nécessitent la spécification d'un " "dernier commit" -#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 +#: blame.c:2821 bundle.c:187 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/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" @@ -2042,84 +2080,88 @@ msgstr "'%s' est déjà extrait dans '%s'" msgid "HEAD of working tree %s is not updated" msgstr "la HEAD de la copie de travail %s n'est pas mise à jour" -#: bundle.c:36 +#: bundle.c:47 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ne semble pas être un fichier bundle v2" -#: bundle.c:64 +#: bundle.c:69 +msgid "unknown hash algorithm length" +msgstr "longueur d'algorithme d'empreinte inconnue" + +#: bundle.c:84 #, c-format 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:2270 sequencer.c:3034 +#: bundle.c:110 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'" -#: bundle.c:143 +#: bundle.c:163 msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" -#: bundle.c:146 +#: bundle.c:166 msgid "need a repository to verify a bundle" msgstr "la vérification d'un colis requiert un dépôt" -#: bundle.c:197 +#: bundle.c:217 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Le colis contient cette référence :" msgstr[1] "Le colis contient ces %d références :" -#: bundle.c:204 +#: bundle.c:224 msgid "The bundle records a complete history." msgstr "Le colis enregistre l'historique complet." -#: bundle.c:206 +#: bundle.c:226 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Le colis exige cette référence :" msgstr[1] "Le colis exige ces %d références :" -#: bundle.c:273 +#: bundle.c:293 msgid "unable to dup bundle descriptor" msgstr "impossible de dupliquer le descripteur de liasse" -#: bundle.c:280 +#: bundle.c:300 msgid "Could not spawn pack-objects" msgstr "Impossible de créer des objets groupés" -#: bundle.c:291 +#: bundle.c:311 msgid "pack-objects died" msgstr "les objets groupés ont disparu" -#: bundle.c:333 +#: bundle.c:353 msgid "rev-list died" msgstr "rev-list a disparu" -#: bundle.c:382 +#: bundle.c:402 #, c-format 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:208 builtin/log.c:1834 builtin/shortlog.c:306 +#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:469 +#: bundle.c:489 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:479 +#: bundle.c:499 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:504 +#: bundle.c:524 msgid "index-pack died" msgstr "l'index de groupe a disparu" @@ -2128,271 +2170,263 @@ msgstr "l'index de groupe a disparu" msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit-graph.c:183 +#: commit-graph.c:238 msgid "commit-graph file is too small" msgstr "le graphe de commit est trop petit" -#: commit-graph.c:248 +#: commit-graph.c:303 #, 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:255 +#: commit-graph.c:310 #, 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:262 +#: commit-graph.c:317 #, 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:284 +#: commit-graph.c:339 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:294 +#: commit-graph.c:349 #, 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:362 +#: commit-graph.c:417 #, 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:436 +#: commit-graph.c:491 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:446 +#: commit-graph.c:501 msgid "commit-graph chain does not match" msgstr "la chaîne de graphe de commit ne correspond pas" -#: commit-graph.c:494 +#: commit-graph.c:549 #, 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:518 +#: commit-graph.c:573 msgid "unable to find all commit-graph files" msgstr "impossible de trouver tous les fichiers du graphe de commit" -#: commit-graph.c:651 commit-graph.c:711 +#: commit-graph.c:706 commit-graph.c:770 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "position de commit invalide. Le graphe de commit est vraisemblablement " "corrompu" -#: commit-graph.c:672 +#: commit-graph.c:727 #, c-format msgid "could not find commit %s" msgstr "impossible de trouver le commit %s" -#: commit-graph.c:948 builtin/am.c:1292 +#: commit-graph.c:1009 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" -#: commit-graph.c:1096 +#: commit-graph.c:1157 msgid "Writing changed paths Bloom filters index" msgstr "Écriture de l'index des filtres Bloom des chemins modifiés" -#: commit-graph.c:1121 +#: commit-graph.c:1182 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 +#: commit-graph.c:1221 builtin/pack-objects.c:2832 #, c-format msgid "unable to get type of object %s" msgstr "impossible d'obtenir le type de l'objet %s" -#: commit-graph.c:1196 +#: commit-graph.c:1257 msgid "Loading known commits in commit graph" msgstr "Lecture des commits connus dans un graphe de commit" -#: commit-graph.c:1213 +#: commit-graph.c:1274 msgid "Expanding reachable commits in commit graph" msgstr "Expansion des commits joignables dans un graphe de commit" -#: commit-graph.c:1233 +#: commit-graph.c:1294 msgid "Clearing commit marks in commit graph" msgstr "Suppression les marques de commit dans le graphe de commits" -#: commit-graph.c:1252 +#: commit-graph.c:1313 msgid "Computing commit graph generation numbers" msgstr "Calcul des chiffres de génération du graphe de commits" -#: commit-graph.c:1300 +#: commit-graph.c:1367 msgid "Computing commit changed paths Bloom filters" msgstr "Calcul des filtres Bloom des chemins modifiés du commit" -#: commit-graph.c:1359 +#: commit-graph.c:1423 +msgid "Collecting referenced commits" +msgstr "Collecte des commits référencés" + +#: commit-graph.c:1447 #, 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:1372 +#: commit-graph.c:1460 #, c-format msgid "error adding pack %s" msgstr "erreur à l'ajout du packet %s" -#: commit-graph.c:1376 +#: commit-graph.c:1464 #, c-format msgid "error opening index for %s" msgstr "erreur à l'ouverture de l'index pour %s" -#: 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:1426 -#, c-format -msgid "invalid commit object id: %s" -msgstr "identifiant d'objet commit invalide : %s" - -#: commit-graph.c:1442 +#: commit-graph.c:1503 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:1457 +#: commit-graph.c:1518 msgid "Counting distinct commits in commit graph" msgstr "Comptage des commits distincts dans un graphe de commit" -#: commit-graph.c:1489 +#: commit-graph.c:1550 msgid "Finding extra edges in commit graph" msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits" -#: commit-graph.c:1538 +#: commit-graph.c:1599 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:1572 midx.c:812 +#: commit-graph.c:1633 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:1585 +#: commit-graph.c:1646 msgid "unable to create temporary graph layer" msgstr "impossible de créer une couche de graphe temporaire" -#: commit-graph.c:1590 +#: commit-graph.c:1651 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "impossible de régler les droits partagés pour '%s'" -#: commit-graph.c:1667 +#: commit-graph.c:1728 #, 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:1712 +#: commit-graph.c:1773 msgid "unable to open commit-graph chain file" msgstr "impossible d'ouvrir le fichier de graphe de commit" -#: commit-graph.c:1728 +#: commit-graph.c:1789 msgid "failed to rename base commit-graph file" msgstr "échec du renommage du fichier de graphe de commits" -#: commit-graph.c:1748 +#: commit-graph.c:1809 msgid "failed to rename temporary commit-graph file" msgstr "impossible de renommer le fichier temporaire de graphe de commits" -#: commit-graph.c:1874 +#: commit-graph.c:1935 msgid "Scanning merged commits" msgstr "Analyse des commits de fusion" -#: commit-graph.c:1885 +#: commit-graph.c:1946 #, c-format msgid "unexpected duplicate commit id %s" msgstr "id de commit %s dupliqué inattendu" -#: commit-graph.c:1908 +#: commit-graph.c:1969 msgid "Merging commit-graph" msgstr "fusion du graphe de commits" -#: commit-graph.c:2096 +#: commit-graph.c:2156 #, 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:2107 +#: commit-graph.c:2167 msgid "too many commits to write graph" msgstr "trop de commits pour écrire un graphe" -#: commit-graph.c:2200 +#: commit-graph.c:2260 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:2210 +#: commit-graph.c:2270 #, 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:2220 commit-graph.c:2235 +#: commit-graph.c:2280 commit-graph.c:2295 #, 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:2227 +#: commit-graph.c:2287 #, 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:2245 +#: commit-graph.c:2305 msgid "Verifying commits in commit graph" msgstr "Verification des commits dans le graphe de commits" -#: commit-graph.c:2259 +#: commit-graph.c:2320 #, 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:2266 +#: commit-graph.c:2327 #, 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:2276 +#: commit-graph.c:2337 #, 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:2285 +#: commit-graph.c:2346 #, 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:2298 +#: commit-graph.c:2360 #, 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:2303 +#: commit-graph.c:2365 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2400,7 +2434,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:2307 +#: commit-graph.c:2369 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2408,12 +2442,12 @@ 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:2322 +#: commit-graph.c:2385 #, 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:2328 +#: commit-graph.c:2391 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -2451,27 +2485,27 @@ msgstr "" "Supprimez ce message en lançant\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1168 +#: commit.c:1172 #, 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 +#: commit.c:1176 #, 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 +#: commit.c:1179 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: commit.c:1178 +#: commit.c:1182 #, 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 +#: commit.c:1436 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" @@ -2674,7 +2708,7 @@ msgstr "valeur mal formée pour %s : %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "doit être parmi nothing, matching, simple, upstream ou current" -#: config.c:1533 builtin/pack-objects.c:3542 +#: config.c:1533 builtin/pack-objects.c:3617 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" @@ -2827,72 +2861,81 @@ msgstr "" msgid "server doesn't support '%s'" msgstr "Le serveur ne supporte pas '%s'" -#: connect.c:103 +#: connect.c:118 #, c-format msgid "server doesn't support feature '%s'" msgstr "Le serveur ne supporte pas la fonctionnalité '%s'" -#: connect.c:114 +#: connect.c:129 msgid "expected flush after capabilities" msgstr "vidage attendu après les capacités" -#: connect.c:233 +#: connect.c:263 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "capacités ignorées après la première ligne '%s'" -#: connect.c:252 +#: connect.c:284 msgid "protocol error: unexpected capabilities^{}" msgstr "erreur de protocole : capabilities^{} inattendu" -#: connect.c:273 +#: connect.c:306 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "erreur de protocole : shallow sha-1 attendu, '%s' trouvé" -#: connect.c:275 +#: connect.c:308 msgid "repository on the other end cannot be shallow" msgstr "le dépôt distant ne peut pas être superficiel" -#: connect.c:313 +#: connect.c:347 msgid "invalid packet" msgstr "paquet invalide" -#: connect.c:333 +#: connect.c:367 #, c-format msgid "protocol error: unexpected '%s'" msgstr "erreur de protocole : '%s' attendu" -#: connect.c:441 +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "format d'objet spécifié par le serveur inconnu '%s'" + +#: connect.c:500 #, c-format msgid "invalid ls-refs response: %s" msgstr "réponse à ls-ref invalide : %s" -#: connect.c:445 +#: connect.c:504 msgid "expected flush after ref listing" msgstr "vidage attendu après le listage de références" -#: connect.c:544 +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "paquet de fin de réponse attendu après le listage de références" + +#: connect.c:640 #, c-format msgid "protocol '%s' is not supported" msgstr "le protocole '%s' n'est pas supporté" -#: connect.c:595 +#: connect.c:691 msgid "unable to set SO_KEEPALIVE on socket" msgstr "impossible de positionner SO_KEEPALIVE sur la socket" -#: connect.c:635 connect.c:698 +#: connect.c:731 connect.c:794 #, c-format msgid "Looking up %s ... " msgstr "Recherche de %s… " -#: connect.c:639 +#: connect.c:735 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "impossible de rechercher %s (port %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:643 connect.c:714 +#: connect.c:739 connect.c:810 #, c-format msgid "" "done.\n" @@ -2901,7 +2944,7 @@ msgstr "" "fait.\n" "Connexion à %s (port %s)… " -#: connect.c:665 connect.c:742 +#: connect.c:761 connect.c:838 #, c-format msgid "" "unable to connect to %s:\n" @@ -2911,75 +2954,75 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 +#: connect.c:767 connect.c:844 msgid "done." msgstr "fait." -#: connect.c:702 +#: connect.c:798 #, c-format msgid "unable to look up %s (%s)" msgstr "impossible de rechercher %s (%s)" -#: connect.c:708 +#: connect.c:804 #, c-format msgid "unknown port %s" msgstr "port inconnu %s" -#: connect.c:845 connect.c:1175 +#: connect.c:941 connect.c:1271 #, c-format msgid "strange hostname '%s' blocked" msgstr "nom d'hôte étrange '%s' bloqué" -#: connect.c:847 +#: connect.c:943 #, c-format msgid "strange port '%s' blocked" msgstr "port étrange '%s' bloqué" -#: connect.c:857 +#: connect.c:953 #, c-format msgid "cannot start proxy %s" msgstr "impossible de démarrer un proxy %s" -#: connect.c:928 +#: connect.c:1024 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe " "d'URL valide" -#: connect.c:1123 +#: connect.c:1219 msgid "ssh variant 'simple' does not support -4" msgstr "la variante ssh 'simple' ne supporte pas -4" -#: connect.c:1135 +#: connect.c:1231 msgid "ssh variant 'simple' does not support -6" msgstr "la variante ssh 'simple' ne supporte pas -6" -#: connect.c:1152 +#: connect.c:1248 msgid "ssh variant 'simple' does not support setting port" msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port" -#: connect.c:1264 +#: connect.c:1360 #, c-format msgid "strange pathname '%s' blocked" msgstr "chemin étrange '%s' bloqué" -#: connect.c:1311 +#: connect.c:1407 msgid "unable to fork" msgstr "fork impossible" -#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Vérification de la connectivité" -#: connected.c:119 +#: connected.c:121 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" -#: connected.c:139 +#: connected.c:141 msgid "failed write to rev-list" msgstr "impossible d'écrire dans la rev-list" -#: connected.c:146 +#: connected.c:148 msgid "failed to close rev-list's stdin" msgstr "impossible de fermer l'entrée standard du rev-list" @@ -3116,7 +3159,9 @@ 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" +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" @@ -3124,7 +3169,8 @@ 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" +msgstr "" +"refus de travailler avec un champ protocol manquant dans l'identification" #: credential.c:396 #, c-format @@ -3247,18 +3293,18 @@ msgstr "" "Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un " "arbre de travail" -#: diff.c:155 +#: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Impossible d'analyser le pourcentage de modification de dirstat '%s'\n" -#: diff.c:160 +#: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Paramètre dirstat inconnu '%s'\n" -#: diff.c:296 +#: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -3266,7 +3312,7 @@ msgstr "" "le paramètre de couleur de déplacement doit être parmi 'no', 'default', " "'blocks', 'zebra', 'dimmed_zebra' ou 'plain'" -#: diff.c:324 +#: diff.c:325 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -3276,7 +3322,7 @@ msgstr "" "space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-" "change'" -#: diff.c:332 +#: diff.c:333 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -3284,13 +3330,13 @@ msgstr "" "color-moved-ws : allow-indentation-change ne peut pas être combiné avec " "d'autres modes d'espace" -#: diff.c:405 +#: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" -#: diff.c:465 +#: diff.c:470 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -3299,35 +3345,35 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:4238 +#: diff.c:4243 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:4583 +#: diff.c:4589 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:4586 +#: diff.c:4592 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S et --find-object sont mutuellement exclusifs" -#: diff.c:4664 +#: diff.c:4670 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:4712 +#: diff.c:4718 #, c-format msgid "invalid --stat value: %s" msgstr "valeur invalide de --stat : %s" -#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245 +#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250 #: 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:4749 +#: diff.c:4755 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3336,42 +3382,42 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4834 +#: diff.c:4840 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s" -#: diff.c:4858 +#: diff.c:4864 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valeur inconnue après ws-error-highlight=%.*s" -#: diff.c:4872 +#: diff.c:4878 #, c-format msgid "unable to resolve '%s'" msgstr "impossible de résoudre '%s'" -#: diff.c:4922 diff.c:4928 +#: diff.c:4928 diff.c:4934 #, c-format msgid "%s expects <n>/<m> form" msgstr "forme <n>/<m> attendue par %s" -#: diff.c:4940 +#: diff.c:4946 #, c-format msgid "%s expects a character, got '%s'" msgstr "caractère attendu par %s, '%s' trouvé" -#: diff.c:4961 +#: diff.c:4967 #, c-format msgid "bad --color-moved argument: %s" msgstr "mauvais argument --color-moved : %s" -#: diff.c:4980 +#: diff.c:4986 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode invalide '%s' dans --color-moved-ws" -#: diff.c:5020 +#: diff.c:5026 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3379,155 +3425,155 @@ msgstr "" "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " "\"histogram\"" -#: diff.c:5056 diff.c:5076 +#: diff.c:5062 diff.c:5082 #, c-format msgid "invalid argument to %s" msgstr "argument invalide pour %s" -#: diff.c:5214 +#: diff.c:5219 #, 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:5270 +#: diff.c:5275 #, c-format msgid "bad --word-diff argument: %s" msgstr "mauvais argument pour --word-diff : %s" -#: diff.c:5293 +#: diff.c:5298 msgid "Diff output format options" msgstr "Options de format de sortie de diff" -#: diff.c:5295 diff.c:5301 +#: diff.c:5300 diff.c:5306 msgid "generate patch" msgstr "générer la rustine" -#: diff.c:5298 builtin/log.c:177 +#: diff.c:5303 builtin/log.c:177 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: diff.c:5303 diff.c:5417 diff.c:5424 +#: diff.c:5308 diff.c:5422 diff.c:5429 msgid "<n>" msgstr "<n>" -#: diff.c:5304 diff.c:5307 +#: diff.c:5309 diff.c:5312 msgid "generate diffs with <n> lines context" msgstr "générer les diffs avec <n> lignes de contexte" -#: diff.c:5309 +#: diff.c:5314 msgid "generate the diff in raw format" msgstr "générer le diff en format brut" -#: diff.c:5312 +#: diff.c:5317 msgid "synonym for '-p --raw'" msgstr "synonyme de '-p --raw'" -#: diff.c:5316 +#: diff.c:5321 msgid "synonym for '-p --stat'" msgstr "synonyme de '-p --stat'" -#: diff.c:5320 +#: diff.c:5325 msgid "machine friendly --stat" msgstr "--stat pour traitement automatique" -#: diff.c:5323 +#: diff.c:5328 msgid "output only the last line of --stat" msgstr "afficher seulement la dernière ligne de --stat" -#: diff.c:5325 diff.c:5333 +#: diff.c:5330 diff.c:5338 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5326 +#: diff.c:5331 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:5330 +#: diff.c:5335 msgid "synonym for --dirstat=cumulative" msgstr "synonyme pour --dirstat=cumulative" -#: diff.c:5334 +#: diff.c:5339 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonyme pour --dirstat=files,param1,param2..." -#: diff.c:5338 +#: diff.c:5343 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:5341 +#: diff.c:5346 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:5344 +#: diff.c:5349 msgid "show only names of changed files" msgstr "n'afficher que les noms de fichiers modifiés" -#: diff.c:5347 +#: diff.c:5352 msgid "show only names and status of changed files" msgstr "n'afficher que les noms et les status des fichiers modifiés" -#: diff.c:5349 +#: diff.c:5354 msgid "<width>[,<name-width>[,<count>]]" msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]" -#: diff.c:5350 +#: diff.c:5355 msgid "generate diffstat" msgstr "générer un diffstat" -#: diff.c:5352 diff.c:5355 diff.c:5358 +#: diff.c:5357 diff.c:5360 diff.c:5363 msgid "<width>" msgstr "<largeur>" -#: diff.c:5353 +#: diff.c:5358 msgid "generate diffstat with a given width" msgstr "générer un diffstat avec la largeur indiquée" -#: diff.c:5356 +#: diff.c:5361 msgid "generate diffstat with a given name width" msgstr "génerer un diffstat avec la largeur de nom indiquée" -#: diff.c:5359 +#: diff.c:5364 msgid "generate diffstat with a given graph width" msgstr "génerer un diffstat avec la largeur de graphe indiquée" -#: diff.c:5361 +#: diff.c:5366 msgid "<count>" msgstr "<compte>" -#: diff.c:5362 +#: diff.c:5367 msgid "generate diffstat with limited lines" msgstr "générer un diffstat avec des lignes limitées" -#: diff.c:5365 +#: diff.c:5370 msgid "generate compact summary in diffstat" msgstr "générer une résumé compact dans le diffstat" -#: diff.c:5368 +#: diff.c:5373 msgid "output a binary diff that can be applied" msgstr "produire un diff binaire qui peut être appliqué" -#: diff.c:5371 +#: diff.c:5376 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:5373 +#: diff.c:5378 msgid "show colored diff" msgstr "afficher un diff coloré" -#: diff.c:5374 +#: diff.c:5379 msgid "<kind>" msgstr "<sorte>" -#: diff.c:5375 +#: diff.c:5380 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3535,7 +3581,7 @@ msgstr "" "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', " "'nouveau' dans le diff" -#: diff.c:5378 +#: diff.c:5383 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3543,93 +3589,93 @@ msgstr "" "ne pas compresser les chemins et utiliser des NULs comme terminateurs de " "champs dans --raw ou --numstat" -#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493 +#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498 msgid "<prefix>" msgstr "<préfixe>" -#: diff.c:5382 +#: diff.c:5387 msgid "show the given source prefix instead of \"a/\"" msgstr "afficher le préfixe de source indiqué au lieu de \"a/\"" -#: diff.c:5385 +#: diff.c:5390 msgid "show the given destination prefix instead of \"b/\"" msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\"" -#: diff.c:5388 +#: diff.c:5393 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:5391 +#: diff.c:5396 msgid "do not show any source or destination prefix" msgstr "n'afficher aucun préfixe, ni de source, ni de destination" -#: diff.c:5394 +#: diff.c:5399 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:5398 diff.c:5403 diff.c:5408 +#: diff.c:5403 diff.c:5408 diff.c:5413 msgid "<char>" msgstr "<caractère>" -#: diff.c:5399 +#: diff.c:5404 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:5404 +#: diff.c:5409 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:5409 +#: diff.c:5414 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:5412 +#: diff.c:5417 msgid "Diff rename options" msgstr "Options de renommage de diff" -#: diff.c:5413 +#: diff.c:5418 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5414 +#: diff.c:5419 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:5418 +#: diff.c:5423 msgid "detect renames" msgstr "détecter les renommages" -#: diff.c:5422 +#: diff.c:5427 msgid "omit the preimage for deletes" msgstr "supprimer la pré-image pour les suppressions" -#: diff.c:5425 +#: diff.c:5430 msgid "detect copies" msgstr "détecter les copies" -#: diff.c:5429 +#: diff.c:5434 msgid "use unmodified files as source to find copies" msgstr "" "utiliser les fichiers non-modifiés comme sources pour trouver des copies" -#: diff.c:5431 +#: diff.c:5436 msgid "disable rename detection" msgstr "désactiver la détection de renommage" -#: diff.c:5434 +#: diff.c:5439 msgid "use empty blobs as rename source" msgstr "utiliser des blobs vides comme source de renommage" -#: diff.c:5436 +#: diff.c:5441 msgid "continue listing the history of a file beyond renames" msgstr "continuer à afficher l'historique d'un fichier au delà des renommages" -#: diff.c:5439 +#: diff.c:5444 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3637,161 +3683,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:5441 +#: diff.c:5446 msgid "Diff algorithm options" msgstr "Options de l'algorithme de diff" -#: diff.c:5443 +#: diff.c:5448 msgid "produce the smallest possible diff" msgstr "produire le diff le plus petit possible" -#: diff.c:5446 +#: diff.c:5451 msgid "ignore whitespace when comparing lines" msgstr "ignorer les espaces lors de la comparaison de ligne" -#: diff.c:5449 +#: diff.c:5454 msgid "ignore changes in amount of whitespace" msgstr "ignorer des modifications du nombre d'espaces" -#: diff.c:5452 +#: diff.c:5457 msgid "ignore changes in whitespace at EOL" msgstr "ignorer des modifications d'espace en fin de ligne" -#: diff.c:5455 +#: diff.c:5460 msgid "ignore carrier-return at the end of line" msgstr "ignore le retour chariot en fin de ligne" -#: diff.c:5458 +#: diff.c:5463 msgid "ignore changes whose lines are all blank" msgstr "ignorer les modifications dont les lignes sont vides" -#: diff.c:5461 +#: diff.c:5466 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:5464 +#: diff.c:5469 msgid "generate diff using the \"patience diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"patience\"" -#: diff.c:5468 +#: diff.c:5473 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" "générer un diff en utilisant l'algorithme de différence \"histogramme\"" -#: diff.c:5470 +#: diff.c:5475 msgid "<algorithm>" msgstr "<algorithme>" -#: diff.c:5471 +#: diff.c:5476 msgid "choose a diff algorithm" msgstr "choisir un algorithme de différence" -#: diff.c:5473 +#: diff.c:5478 msgid "<text>" msgstr "<texte>" -#: diff.c:5474 +#: diff.c:5479 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\"" -#: diff.c:5476 diff.c:5485 diff.c:5488 +#: diff.c:5481 diff.c:5490 diff.c:5493 msgid "<mode>" msgstr "<mode>" -#: diff.c:5477 +#: diff.c:5482 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:5479 diff.c:5482 diff.c:5527 +#: diff.c:5484 diff.c:5487 diff.c:5532 msgid "<regex>" msgstr "<regex>" -#: diff.c:5480 +#: diff.c:5485 msgid "use <regex> to decide what a word is" msgstr "utiliser <regex> pour décider ce qu'est un mot" -#: diff.c:5483 +#: diff.c:5488 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5486 +#: diff.c:5491 msgid "moved lines of code are colored differently" msgstr "les lignes déplacées sont colorées différemment" -#: diff.c:5489 +#: diff.c:5494 msgid "how white spaces are ignored in --color-moved" msgstr "comment les espaces sont ignorés dans --color-moved" -#: diff.c:5492 +#: diff.c:5497 msgid "Other diff options" msgstr "Autres options diff" -#: diff.c:5494 +#: diff.c:5499 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:5498 +#: diff.c:5503 msgid "treat all files as text" msgstr "traiter les fichiers comme texte" -#: diff.c:5500 +#: diff.c:5505 msgid "swap two inputs, reverse the diff" msgstr "échanger les entrées, inverser le diff" -#: diff.c:5502 +#: diff.c:5507 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:5504 +#: diff.c:5509 msgid "disable all output of the program" msgstr "désactiver tous les affichages du programme" -#: diff.c:5506 +#: diff.c:5511 msgid "allow an external diff helper to be executed" msgstr "autoriser l'exécution d'un assistant externe de diff" -#: diff.c:5508 +#: diff.c:5513 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:5510 +#: diff.c:5515 msgid "<when>" msgstr "<quand>" -#: diff.c:5511 +#: diff.c:5516 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:5514 +#: diff.c:5519 msgid "<format>" msgstr "<format>" -#: diff.c:5515 +#: diff.c:5520 msgid "specify how differences in submodules are shown" msgstr "spécifier comment les différences dans les sous-modules sont affichées" -#: diff.c:5519 +#: diff.c:5524 msgid "hide 'git add -N' entries from the index" msgstr "masquer les entrées 'git add -N' de l'index" -#: diff.c:5522 +#: diff.c:5527 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:5524 +#: diff.c:5529 msgid "<string>" msgstr "<chaîne>" -#: diff.c:5525 +#: diff.c:5530 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3799,7 +3845,7 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la " "chaîne spécifiée" -#: diff.c:5528 +#: diff.c:5533 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3807,26 +3853,26 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la regex " "spécifiée" -#: diff.c:5531 +#: diff.c:5536 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:5534 +#: diff.c:5539 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue" -#: diff.c:5537 +#: diff.c:5542 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:5538 +#: diff.c:5543 msgid "<object-id>" msgstr "<id-objet>" -#: diff.c:5539 +#: diff.c:5544 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3834,35 +3880,35 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de l'objet " "indiqué" -#: diff.c:5541 +#: diff.c:5546 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5542 +#: diff.c:5547 msgid "select files by diff type" msgstr "sélectionner les fichiers par types de diff" -#: diff.c:5544 +#: diff.c:5549 msgid "<file>" msgstr "<fichier>" -#: diff.c:5545 +#: diff.c:5550 msgid "Output to a specific file" msgstr "Sortie vers un fichier spécifié" -#: diff.c:6200 +#: diff.c:6205 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:6203 +#: diff.c:6208 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:6206 +#: diff.c:6211 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3879,62 +3925,62 @@ msgstr "impossible de lire le fichier de commande '%s'" msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" -#: dir.c:555 +#: dir.c:573 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git" -#: dir.c:695 dir.c:724 dir.c:737 +#: dir.c:713 dir.c:742 dir.c:755 #, c-format msgid "unrecognized pattern: '%s'" msgstr "motif non reconnu : '%s'" -#: dir.c:754 dir.c:768 +#: dir.c:772 dir.c:786 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "motif négatif non reconnu : '%s'" -#: dir.c:786 +#: dir.c:804 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" "votre fichier d'extraction partielle pourrait présenter des problèmes : le " "motif '%s' est répété" -#: dir.c:796 +#: dir.c:814 msgid "disabling cone pattern matching" msgstr "désactivation de la correspondance de motif de cone" -#: dir.c:1173 +#: dir.c:1191 #, c-format msgid "cannot use %s as an exclude file" msgstr "impossible d'utiliser %s comme fichier d'exclusion" -#: dir.c:2275 +#: dir.c:2296 #, c-format msgid "could not open directory '%s'" msgstr "impossible d'ouvrir le répertoire '%s'" -#: dir.c:2575 +#: dir.c:2596 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2699 +#: dir.c:2720 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:3481 +#: dir.c:3502 #, c-format msgid "index file corrupt in repo %s" msgstr "fichier d'index corrompu dans le dépôt %s" -#: dir.c:3526 dir.c:3531 +#: dir.c:3547 dir.c:3552 #, c-format msgid "could not create directories for %s" msgstr "impossible de créer les répertoires pour %s" -#: dir.c:3560 +#: dir.c:3581 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" @@ -3946,11 +3992,11 @@ msgstr "" "suggestion : en attente de la fermeture du fichier par votre éditeur de " "texte…%c" -#: entry.c:178 +#: entry.c:177 msgid "Filtering content" msgstr "Filtrage du contenu" -#: entry.c:479 +#: entry.c:478 #, c-format msgid "could not stat file '%s'" msgstr "impossible de stat le fichier '%s'" @@ -3970,228 +4016,246 @@ 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:151 +#: fetch-pack.c:152 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack : liste superficielle attendue" -#: fetch-pack.c:154 +#: fetch-pack.c:155 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:165 +#: fetch-pack.c:166 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:185 +#: fetch-pack.c:186 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu" -#: fetch-pack.c:196 +#: fetch-pack.c:197 msgid "unable to write to remote" msgstr "impossible d'écrire sur un distant" -#: fetch-pack.c:258 +#: fetch-pack.c:259 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc nécessite multi_ack_detailed" -#: fetch-pack.c:357 fetch-pack.c:1364 +#: fetch-pack.c:358 fetch-pack.c:1408 #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalide : %s" -#: fetch-pack.c:363 fetch-pack.c:1370 +#: fetch-pack.c:364 fetch-pack.c:1414 #, c-format msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" -#: fetch-pack.c:365 fetch-pack.c:1372 +#: fetch-pack.c:366 fetch-pack.c:1416 #, c-format msgid "object not found: %s" msgstr "objet non trouvé : %s" -#: fetch-pack.c:368 fetch-pack.c:1375 +#: fetch-pack.c:369 fetch-pack.c:1419 #, c-format msgid "error in object: %s" msgstr "Erreur dans l'objet : %s" -#: fetch-pack.c:370 fetch-pack.c:1377 +#: fetch-pack.c:371 fetch-pack.c:1421 #, c-format msgid "no shallow found: %s" msgstr "Pas de superficiel trouvé : %s" -#: fetch-pack.c:373 fetch-pack.c:1381 +#: fetch-pack.c:374 fetch-pack.c:1425 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "superficiel/non superficiel attendu, %s trouvé" -#: fetch-pack.c:415 +#: fetch-pack.c:416 #, c-format msgid "got %s %d %s" msgstr "réponse %s %d %s" -#: fetch-pack.c:432 +#: fetch-pack.c:433 #, c-format msgid "invalid commit %s" msgstr "commit invalide %s" -#: fetch-pack.c:463 +#: fetch-pack.c:464 msgid "giving up" msgstr "abandon" -#: fetch-pack.c:476 progress.c:336 +#: fetch-pack.c:477 progress.c:336 msgid "done" msgstr "fait" -#: fetch-pack.c:488 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "%s trouvé (%d) %s" -#: fetch-pack.c:534 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "Marquage de %s comme terminé" -#: fetch-pack.c:755 +#: fetch-pack.c:756 #, c-format msgid "already have %s (%s)" msgstr "%s déjà possédé (%s)" -#: fetch-pack.c:819 +#: fetch-pack.c:821 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral" -#: fetch-pack.c:827 +#: fetch-pack.c:829 msgid "protocol error: bad pack header" msgstr "erreur de protocole : mauvais entête de paquet" -#: fetch-pack.c:901 +#: fetch-pack.c:910 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack : impossible de dupliquer %s" -#: fetch-pack.c:917 +#: fetch-pack.c:927 #, c-format msgid "%s failed" msgstr "échec de %s" -#: fetch-pack.c:919 +#: fetch-pack.c:929 msgid "error in sideband demultiplexer" msgstr "erreur dans le démultiplexer latéral" -#: fetch-pack.c:966 +#: fetch-pack.c:976 #, c-format msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: 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 +#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996 +#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012 +#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028 +#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050 #, c-format msgid "Server supports %s" msgstr "Le serveur supporte %s" -#: fetch-pack.c:973 +#: fetch-pack.c:983 msgid "Server does not support shallow clients" msgstr "Le serveur ne supporte les clients superficiels" -#: fetch-pack.c:1033 +#: fetch-pack.c:1043 msgid "Server does not support --shallow-since" msgstr "Le receveur ne gère pas --shallow-since" -#: fetch-pack.c:1038 +#: fetch-pack.c:1048 msgid "Server does not support --shallow-exclude" msgstr "Le receveur ne gère pas --shallow-exclude" -#: fetch-pack.c:1042 +#: fetch-pack.c:1052 msgid "Server does not support --deepen" msgstr "Le receveur ne gère pas --deepen" -#: fetch-pack.c:1059 +#: fetch-pack.c:1054 +msgid "Server does not support this repository's object format" +msgstr "Le serveur ne supporte pas ce format d'objets de ce dépôt" + +#: fetch-pack.c:1071 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:1071 fetch-pack.c:1563 +#: fetch-pack.c:1083 fetch-pack.c:1639 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." #: fetch-pack.c:1211 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "non-correspondance des algorithmes : client %s ; serveur %s" + +#: fetch-pack.c:1215 +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "Le serveur ne supporte pas l'algorithme '%s'" + +#: fetch-pack.c:1235 msgid "Server does not support shallow requests" -msgstr "Le serveur ne supporte les requêtes superficielles" +msgstr "Le serveur ne supporte pas les requêtes superficielles" -#: fetch-pack.c:1218 +#: fetch-pack.c:1242 msgid "Server supports filter" msgstr "Le serveur supporte filter" -#: fetch-pack.c:1242 +#: fetch-pack.c:1286 msgid "unable to write request to remote" msgstr "impossible d'écrire la requête sur le distant" -#: fetch-pack.c:1260 +#: fetch-pack.c:1304 #, c-format msgid "error reading section header '%s'" msgstr "erreur à la lecture de l'entête de section '%s'" -#: fetch-pack.c:1266 +#: fetch-pack.c:1310 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' attendu, '%s' reçu" -#: fetch-pack.c:1327 +#: fetch-pack.c:1371 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "ligne d'acquittement inattendue : '%s'" -#: fetch-pack.c:1332 +#: fetch-pack.c:1376 #, c-format msgid "error processing acks: %d" msgstr "erreur lors du traitement des acquittements : %d" -#: fetch-pack.c:1342 +#: fetch-pack.c:1386 msgid "expected packfile to be sent after 'ready'" msgstr "fichier paquet attendu à envoyer après 'ready'" -#: fetch-pack.c:1344 +#: fetch-pack.c:1388 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:1386 +#: fetch-pack.c:1430 #, c-format msgid "error processing shallow info: %d" msgstr "erreur lors du traitement de l'information de superficialité : %d" -#: fetch-pack.c:1433 +#: fetch-pack.c:1477 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref attendu, '%s' trouvé" -#: fetch-pack.c:1438 +#: fetch-pack.c:1482 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inattendu : '%s'" -#: fetch-pack.c:1443 +#: fetch-pack.c:1487 #, c-format msgid "error processing wanted refs: %d" msgstr "erreur lors du traitement des références voulues : %d" -#: fetch-pack.c:1789 +#: fetch-pack.c:1517 +msgid "git fetch-pack: expected response end packet" +msgstr "git fetch-pack : paquet de fin de réponse attendu" + +#: fetch-pack.c:1921 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1812 builtin/clone.c:692 +#: fetch-pack.c:1944 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:1839 +#: fetch-pack.c:1971 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:1842 +#: fetch-pack.c:1974 #, 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é" @@ -4227,7 +4291,7 @@ msgstr "" msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" @@ -4376,16 +4440,16 @@ msgstr[1] "" "\n" "Les commandes les plus ressemblantes sont" -#: help.c:653 +#: help.c:654 msgid "git version [<options>]" msgstr "git version [<options>]" -#: help.c:708 +#: help.c:709 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:712 +#: help.c:713 msgid "" "\n" "Did you mean this?" @@ -4485,6 +4549,10 @@ msgstr "quelque chose attendu après combine :" msgid "multiple filter-specs cannot be combined" msgstr "impossible de combiner des spécificateurs multiples de filtre" +#: list-objects-filter-options.c:330 +msgid "unable to upgrade repository format to support partial clone" +msgstr "impossible de mettre à jour le format de dépôt pour supporter les clones partiels" + #: list-objects-filter.c:492 #, c-format msgid "unable to access sparse blob in '%s'" @@ -4851,7 +4919,7 @@ msgstr "ajout/ajout" msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:3101 git-submodule.sh:985 +#: merge-recursive.c:3101 git-submodule.sh:959 msgid "submodule" msgstr "sous-module" @@ -4980,7 +5048,7 @@ 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/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" @@ -5233,21 +5301,21 @@ 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 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184 #, c-format msgid "unable to get size of %s" msgstr "impossible de récupérer la taille de %s" -#: packfile.c:629 +#: packfile.c:630 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" -#: packfile.c:1899 +#: packfile.c:1900 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)" -#: packfile.c:1903 +#: packfile.c:1904 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -5457,46 +5525,50 @@ msgid "unable to write delim packet" msgstr "impossible d'écrire le paquet de délimitation" #: pkt-line.c:106 +msgid "unable to write stateless separator packet" +msgstr "impossible d'écrire le paquet de séparateur sans état" + +#: pkt-line.c:113 msgid "flush packet write failed" msgstr "échec de l'écriture du vidage de paquet" -#: pkt-line.c:146 pkt-line.c:232 +#: pkt-line.c:153 pkt-line.c:239 msgid "protocol error: impossibly long line" msgstr "erreur de protocole : ligne impossiblement trop longue" -#: pkt-line.c:162 pkt-line.c:164 +#: pkt-line.c:169 pkt-line.c:171 msgid "packet write with format failed" msgstr "échec de l'écriture d'un paquet avec format" -#: pkt-line.c:196 +#: pkt-line.c:203 msgid "packet write failed - data exceeds max packet size" msgstr "" "échec de l'écriture d'un paquet ‑ les données dépassent la taille maximale " "d'un paquet" -#: pkt-line.c:203 pkt-line.c:210 +#: pkt-line.c:210 pkt-line.c:217 msgid "packet write failed" msgstr "échec de l'écriture d'un paquet" -#: pkt-line.c:295 +#: pkt-line.c:302 msgid "read error" msgstr "erreur de lecture" -#: pkt-line.c:303 +#: pkt-line.c:310 msgid "the remote end hung up unexpectedly" msgstr "L'hôte distant a fermé la connexion de manière inattendue" -#: pkt-line.c:331 +#: pkt-line.c:338 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s" -#: pkt-line.c:341 pkt-line.c:346 +#: pkt-line.c:352 pkt-line.c:357 #, c-format msgid "protocol error: bad line length %d" msgstr "erreur de protocole : mauvaise longueur de ligne %d" -#: pkt-line.c:362 +#: pkt-line.c:373 #, c-format msgid "remote error: %s" msgstr "erreur distante : %s" @@ -5545,7 +5617,9 @@ msgstr "impossible d'analyser le commit '%s'" 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'" +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 @@ -5674,7 +5748,7 @@ 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:488 builtin/checkout.c:676 builtin/clean.c:961 +#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991 #: 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 @@ -5731,7 +5805,7 @@ 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:1176 wrapper.c:622 builtin/merge.c:1130 +#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" @@ -5916,7 +5990,7 @@ msgid "could not read '%s'." msgstr "impossible de lire '%s'." # à priori on parle d'une branche ici -#: ref-filter.c:42 wt-status.c:1936 +#: ref-filter.c:42 wt-status.c:1977 msgid "gone" msgstr "disparue" @@ -6141,7 +6215,7 @@ msgstr "objet malformé à '%s'" msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:2095 refs.c:625 +#: ref-filter.c:2095 refs.c:657 #, c-format msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" @@ -6171,94 +6245,108 @@ msgstr "nom d'objet malformé %s" msgid "option `%s' must point to a commit" msgstr "l'option '%s' doit pointer sur un commit" -#: refs.c:262 +#: refs.c:264 #, c-format msgid "%s does not point to a valid object!" msgstr "%s ne pointe pas sur un objet valide!" -#: refs.c:623 +#: refs.c:572 +#, c-format +msgid "could not retrieve `%s`" +msgstr "impossible de récupérer `%s`" + +#: refs.c:579 +#, c-format +msgid "invalid branch name: %s = %s" +msgstr "Nom de branche invalide : %s = %s" + +#: refs.c:655 #, c-format msgid "ignoring dangling symref %s" msgstr "symref pendant %s ignoré" -#: refs.c:760 +#: refs.c:792 #, c-format msgid "could not open '%s' for writing: %s" msgstr "impossible d'ouvrir '%s' en écriture : %s" -#: refs.c:770 refs.c:821 +#: refs.c:802 refs.c:853 #, c-format msgid "could not read ref '%s'" msgstr "impossible de lire la réf '%s'" -#: refs.c:776 +#: refs.c:808 #, c-format msgid "ref '%s' already exists" msgstr "la référence '%s' existe déjà" -#: refs.c:781 +#: refs.c:813 #, 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 +#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168 +#: wrapper.c:628 #, 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 +#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 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 +#: refs.c:855 #, c-format msgid "unexpected object ID when deleting '%s'" msgstr "id d'objet inattendu pendant la suppression de '%s'" -#: refs.c:954 +#: refs.c:986 #, 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 +#: refs.c:992 #, 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 +#: refs.c:1051 #, c-format msgid "log for %s is empty" msgstr "le journal pour la réf %s est vide" -#: refs.c:1111 +#: refs.c:1143 #, 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 +#: refs.c:1219 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "échec de update_ref pour la réf '%s' : %s" -#: refs.c:1979 +#: refs.c:2011 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "mises à jour multiples pour la réf '%s' non permises" -#: refs.c:2011 +#: refs.c:2098 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 +#: refs.c:2109 +msgid "ref updates aborted by hook" +msgstr "mises à jour des références annulées par le crochet" + +#: refs.c:2209 refs.c:2239 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe ; impossible de créer '%s'" -#: refs.c:2113 refs.c:2148 +#: refs.c:2215 refs.c:2250 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "impossible de traiter '%s' et '%s' en même temps" @@ -6555,7 +6643,7 @@ 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:2233 +#: remote.c:2241 #, c-format msgid "cannot parse expected object name '%s'" msgstr "impossible d'analyser le nom attendu d'objet '%s'" @@ -6578,7 +6666,8 @@ 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." +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" @@ -6682,20 +6771,20 @@ msgstr "impossible de déterminer la révision HEAD" msgid "failed to find tree of %s" msgstr "impossible de trouver l'arbre de %s" -#: revision.c:2655 +#: revision.c:2661 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2658 +#: revision.c:2664 #, 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:2866 +#: revision.c:2873 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" -#: revision.c:2870 +#: revision.c:2877 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" @@ -6738,11 +6827,15 @@ msgstr "le dépaquetage a échoué : %s" msgid "failed to sign the push certificate" msgstr "impossible de signer le certificat de poussée" -#: send-pack.c:399 +#: send-pack.c:394 +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "Le receveur ne gère pas l'algorithme d'empreinte de ce dépôt" + +#: send-pack.c:403 msgid "the receiving end does not support --signed push" msgstr "Le receveur ne gère pas les poussées avec --signed" -#: send-pack.c:401 +#: send-pack.c:405 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6750,11 +6843,11 @@ msgstr "" "pas d'envoi de certificat de poussée car le receveur ne gère pas les " "poussées avec --signed" -#: send-pack.c:413 +#: send-pack.c:417 msgid "the receiving end does not support --atomic push" msgstr "Le receveur ne gère pas les poussées avec --atomic" -#: send-pack.c:418 +#: send-pack.c:422 msgid "the receiving end does not support push options" msgstr "Le receveur ne gère pas les options de poussées" @@ -6875,7 +6968,7 @@ msgstr "aucune clé présente dans '%.*s'" msgid "unable to dequote value of '%s'" msgstr "Impossible de décoter la valeur de '%s'" -#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710 +#: sequencer.c:785 wrapper.c:198 wrapper.c:368 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" @@ -7515,7 +7608,8 @@ 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." +msgstr "" +"Un remisage automatique existe ; création d'une nouvelle entrée de remisage." #: sequencer.c:3857 #, c-format @@ -7719,84 +7813,84 @@ msgstr "" 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:569 +#: setup.c:604 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Version attendue du dépôt git <= %d, %d trouvée" -#: setup.c:577 +#: setup.c:612 msgid "unknown repository extensions found:" msgstr "extensions de dépôt inconnues trouvées :" -#: setup.c:596 +#: setup.c:631 #, c-format msgid "error opening '%s'" msgstr "erreur à l'ouverture de '%s'" -#: setup.c:598 +#: setup.c:633 #, c-format msgid "too large to be a .git file: '%s'" msgstr "trop gros pour être une fichier .git : '%s'" -#: setup.c:600 +#: setup.c:635 #, c-format msgid "error reading %s" msgstr "erreur à la lecture de %s" -#: setup.c:602 +#: setup.c:637 #, c-format msgid "invalid gitfile format: %s" msgstr "format de fichier git invalide : %s" -#: setup.c:604 +#: setup.c:639 #, c-format msgid "no path in gitfile: %s" msgstr "aucun chemin dans le fichier git : %s" -#: setup.c:606 +#: setup.c:641 #, c-format msgid "not a git repository: %s" msgstr "ce n'est pas un dépôt git : %s" -#: setup.c:708 +#: setup.c:743 #, c-format msgid "'$%s' too big" msgstr "'$%s' trop gros" -#: setup.c:722 +#: setup.c:757 #, c-format msgid "not a git repository: '%s'" msgstr "ce n'est pas un dépôt git : '%s'" -#: setup.c:751 setup.c:753 setup.c:784 +#: setup.c:786 setup.c:788 setup.c:819 #, c-format msgid "cannot chdir to '%s'" msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'" -#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869 +#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904 msgid "cannot come back to cwd" msgstr "impossible de revenir au répertoire de travail courant" -#: setup.c:883 +#: setup.c:918 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "échec du stat de '%*s%s%s'" -#: setup.c:1121 +#: setup.c:1156 msgid "Unable to read current working directory" msgstr "Impossible d'accéder au répertoire de travail courant" -#: setup.c:1130 setup.c:1136 +#: setup.c:1165 setup.c:1171 #, c-format msgid "cannot change to '%s'" msgstr "impossible de modifier en '%s'" -#: setup.c:1141 +#: setup.c:1176 #, 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:1147 +#: setup.c:1182 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7807,7 +7901,7 @@ msgstr "" "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "n'est pas défini)." -#: setup.c:1258 +#: setup.c:1293 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7817,15 +7911,15 @@ msgstr "" "Le propriétaire des fichiers doit toujours avoir les droits en lecture et " "écriture." -#: setup.c:1304 +#: setup.c:1340 msgid "open /dev/null or dup failed" msgstr "échec de l'ouverture ou au dup de /dev/null" -#: setup.c:1319 +#: setup.c:1355 msgid "fork failed" msgstr "échec de la bifurcation" -#: setup.c:1324 +#: setup.c:1360 msgid "setsid failed" msgstr "échec du setsid" @@ -8009,7 +8103,7 @@ msgstr "échec de deflateEnd sur l'objet %s (%d)" msgid "confused by unstable object source data for %s" msgstr "données de source d'objet instable pour %s" -#: sha1-file.c:1906 builtin/pack-objects.c:1055 +#: sha1-file.c:1906 builtin/pack-objects.c:1085 #, c-format msgid "failed utime() on %s" msgstr "échec de utime() sur %s" @@ -8189,43 +8283,43 @@ msgid "invalid object name '%.*s'." msgstr "nom d'objet invalide : '%.*s'." #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:853 +#: strbuf.c:848 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u Gio" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:855 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u Gio/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:863 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u Mio" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:865 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u Mio/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:872 +#: strbuf.c:867 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u Kio" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:874 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u Kio/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:880 +#: strbuf.c:875 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -8233,14 +8327,14 @@ msgstr[0] "%u octet" msgstr[1] "%u octets" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:882 +#: strbuf.c:877 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u octet/s" msgstr[1] "%u octets/s" -#: strbuf.c:1180 +#: strbuf.c:1175 #, c-format msgid "could not edit '%s'" msgstr "impossible d'éditer '%s'" @@ -8492,7 +8586,7 @@ msgstr "impossible de lire le fichier d'entrée '%s'" msgid "could not read from stdin" msgstr "Impossible de lire depuis l'entrée standard" -#: trailer.c:1011 wrapper.c:665 +#: trailer.c:1011 wrapper.c:673 #, c-format msgid "could not stat %s" msgstr "stat impossible de %s" @@ -8516,21 +8610,21 @@ 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-helper.c:61 transport-helper.c:90 +#: transport-helper.c:62 transport-helper.c:91 msgid "full write to remote helper failed" msgstr "échec de l'écriture totale sur l'assistant distant" -#: transport-helper.c:144 +#: transport-helper.c:145 #, c-format msgid "unable to find remote helper for '%s'" msgstr "Impossible de trouver un assistant distant pour '%s'" -#: transport-helper.c:160 transport-helper.c:571 +#: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" msgstr "" "impossible de dupliquer le descripteur de flux de sortie de l'assistant" -#: transport-helper.c:211 +#: transport-helper.c:214 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -8539,161 +8633,166 @@ msgstr "" "capacité obligatoire inconnue %s ; cet assistant distant requiert " "probablement une une nouvelle version de Git" -#: transport-helper.c:217 +#: transport-helper.c:220 msgid "this remote helper should implement refspec capability" msgstr "cet assistant distant devrait supporter la capacité refspec" -#: transport-helper.c:284 transport-helper.c:425 +#: transport-helper.c:287 transport-helper.c:429 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s a dit de manière inattendue : '%s'" -#: transport-helper.c:414 +#: transport-helper.c:417 #, c-format msgid "%s also locked %s" msgstr "%s a aussi verrouillé %s" -#: transport-helper.c:493 +#: transport-helper.c:497 msgid "couldn't run fast-import" msgstr "impossible de lancer fast-import" -#: transport-helper.c:516 +#: transport-helper.c:520 msgid "error while running fast-import" msgstr "erreur au lancement de fast-import" -#: transport-helper.c:545 transport-helper.c:1135 +#: transport-helper.c:549 transport-helper.c:1156 #, c-format msgid "could not read ref %s" msgstr "impossible de lire la réf %s" -#: transport-helper.c:590 +#: transport-helper.c:594 #, c-format msgid "unknown response to connect: %s" msgstr "réponse inconnue à connect : %s" -#: transport-helper.c:612 +#: transport-helper.c:616 msgid "setting remote service path not supported by protocol" msgstr "" "la spécification du chemin de service distant n'est pas supportée par le " "protocole" -#: transport-helper.c:614 +#: transport-helper.c:618 msgid "invalid remote service path" msgstr "chemin de service distant invalide" -#: transport-helper.c:657 transport.c:1339 +#: transport-helper.c:661 transport.c:1347 msgid "operation not supported by protocol" msgstr "option non supportée par le protocole" -#: transport-helper.c:660 +#: transport-helper.c:664 #, c-format msgid "can't connect to subservice %s" msgstr "impossible de se connecter au sous-service %s" -#: transport-helper.c:736 +#: transport-helper.c:740 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "ok/error attendu, l'assistant a dit '%s'" -#: transport-helper.c:789 +#: transport-helper.c:793 #, c-format msgid "helper reported unexpected status of %s" msgstr "l'assistant a renvoyé un statut de retour inattendu %s" -#: transport-helper.c:850 +#: transport-helper.c:854 #, c-format msgid "helper %s does not support dry-run" msgstr "l'assistant %s ne gère pas dry-run" -#: transport-helper.c:853 +#: transport-helper.c:857 #, c-format msgid "helper %s does not support --signed" msgstr "l'assistant %s ne gère pas --signed" -#: transport-helper.c:856 +#: transport-helper.c:860 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "l'assistant %s ne gère pas --signed=if-asked" -#: transport-helper.c:861 +#: transport-helper.c:865 #, c-format msgid "helper %s does not support --atomic" msgstr "l'assistant %s ne gère pas --atomic" -#: transport-helper.c:867 +#: transport-helper.c:871 #, c-format msgid "helper %s does not support 'push-option'" msgstr "l'assistant %s ne gère pas 'push-option'" -#: transport-helper.c:966 +#: transport-helper.c:970 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:971 +#: transport-helper.c:975 #, c-format msgid "helper %s does not support 'force'" msgstr "l'assistant %s ne gère pas 'force'" -#: transport-helper.c:1018 +#: transport-helper.c:1022 msgid "couldn't run fast-export" msgstr "impossible de lancer fast-export" -#: transport-helper.c:1023 +#: transport-helper.c:1027 msgid "error while running fast-export" msgstr "erreur au lancement de fast-export" -#: transport-helper.c:1048 +#: transport-helper.c:1052 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" +"Perhaps you should specify a branch.\n" 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" +"Vous devriez peut-être spécifier une branche.\n" + +#: transport-helper.c:1133 +#, c-format +msgid "unsupported object format '%s'" +msgstr "format d'objet non géré '%s'" -#: transport-helper.c:1121 +#: transport-helper.c:1142 #, c-format msgid "malformed response in ref list: %s" msgstr "réponse malformée dans le liste de réfs : %s" -#: transport-helper.c:1273 +#: transport-helper.c:1294 #, c-format msgid "read(%s) failed" msgstr "échec de read(%s)" -#: transport-helper.c:1300 +#: transport-helper.c:1321 #, c-format msgid "write(%s) failed" msgstr "échec de write(%s)" -#: transport-helper.c:1349 +#: transport-helper.c:1370 #, c-format msgid "%s thread failed" msgstr "échec du fil d'exécution %s" -#: transport-helper.c:1353 +#: transport-helper.c:1374 #, c-format msgid "%s thread failed to join: %s" msgstr "échec de jonction du fil d'exécution %s : %s" -#: transport-helper.c:1372 transport-helper.c:1376 +#: transport-helper.c:1393 transport-helper.c:1397 #, 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:1413 +#: transport-helper.c:1434 #, c-format msgid "%s process failed to wait" msgstr "échec du processus %s pour l'attente" -#: transport-helper.c:1417 +#: transport-helper.c:1438 #, c-format msgid "%s process failed" msgstr "échec du processus %s" -#: transport-helper.c:1435 transport-helper.c:1444 +#: transport-helper.c:1456 transport-helper.c:1465 msgid "can't start thread for copying data" msgstr "impossible de démarrer le fil d'exécution pour copier les données" @@ -8707,33 +8806,33 @@ msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n" msgid "could not read bundle '%s'" msgstr "impossible de lire la liasse '%s'" -#: transport.c:214 +#: transport.c:220 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport : option de profondeur invalide '%s'" -#: transport.c:266 +#: transport.c:272 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 +#: transport.c:273 msgid "server options require protocol version 2 or later" msgstr "les options de serveur exigent une version 2 ou supérieure" -#: transport.c:632 +#: transport.c:631 msgid "could not parse transport.color.* config" msgstr "impossible d'analyser la configuration transport.color.*" -#: transport.c:705 +#: transport.c:704 msgid "support for protocol v2 not implemented yet" msgstr "le support du protocole v2 n'est pas encore implanté" -#: transport.c:839 +#: transport.c:838 #, c-format msgid "unknown value for config '%s': %s" msgstr "valeur inconnue pour la config '%s' : %s" -#: transport.c:905 +#: transport.c:904 #, c-format msgid "transport '%s' not allowed" msgstr "transport '%s' non permis" @@ -8742,7 +8841,7 @@ msgstr "transport '%s' non permis" msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync n'est plus supporté" -#: transport.c:1052 +#: transport.c:1059 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8751,7 +8850,7 @@ msgstr "" "Les chemins suivants de sous-module contiennent des modifications\n" "qui ne peuvent être trouvées sur aucun distant :\n" -#: transport.c:1056 +#: transport.c:1063 #, c-format msgid "" "\n" @@ -8778,11 +8877,11 @@ msgstr "" "pour les pousser vers un serveur distant.\n" "\n" -#: transport.c:1064 +#: transport.c:1071 msgid "Aborting." msgstr "Abandon." -#: transport.c:1209 +#: transport.c:1216 msgid "failed to push all needed submodules" msgstr "échec de la poussée de tous les sous-modules nécessaires" @@ -9008,7 +9107,8 @@ msgid "" "patterns:\n" "%s" msgstr "" -"Les chemins suivants ne sont pas à jour et ont été laissés malgré les motifs clairsemés :\n" +"Les chemins suivants ne sont pas à jour et ont été laissés malgré les motifs " +"clairsemés :\n" "%s" #: unpack-trees.c:180 @@ -9017,7 +9117,8 @@ msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -"Les chemins suivants ne sont pas fusionnés et ont été laissés malgré les motifs clairsemés :\n" +"Les chemins suivants ne sont pas fusionnés et ont été laissés malgré les " +"motifs clairsemés :\n" "%s" #: unpack-trees.c:182 @@ -9027,7 +9128,8 @@ msgid "" "patterns:\n" "%s" msgstr "" -"Les chemins suivants étaient déjà présents et ont été laissés malgré les motifs clairsemés :\n" +"Les chemins suivants étaient déjà présents et ont été laissés malgré les " +"motifs clairsemés :\n" "%s" #: unpack-trees.c:262 @@ -9040,7 +9142,9 @@ msgstr "Abandon\n" 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" +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" @@ -9060,7 +9164,7 @@ msgstr "" msgid "Updating index flags" msgstr "Mise à jour des drapeaux de l'index" -#: upload-pack.c:1337 +#: upload-pack.c:1415 msgid "expected flush after fetch arguments" msgstr "vidage attendu après les arguments de récupération" @@ -9097,50 +9201,50 @@ msgstr "segment de chemin '..' invalide" msgid "Fetching objects" msgstr "Récupération des objets" -#: worktree.c:262 builtin/am.c:2098 +#: worktree.c:248 builtin/am.c:2098 #, c-format msgid "failed to read '%s'" msgstr "échec de la lecture de '%s'" -#: worktree.c:309 +#: worktree.c:295 #, 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:320 +#: worktree.c:306 #, 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:332 +#: worktree.c:318 #, c-format msgid "'%s' does not exist" msgstr "'%s' n'existe pas" -#: worktree.c:338 +#: worktree.c:324 #, 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:347 +#: worktree.c:333 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' ne pointe pas en retour sur '%s'" -#: wrapper.c:186 wrapper.c:356 +#: wrapper.c:194 wrapper.c:364 #, c-format msgid "could not open '%s' for reading and writing" msgstr "impossible d'ouvrir '%s' en lecture/écriture" -#: wrapper.c:387 wrapper.c:588 +#: wrapper.c:395 wrapper.c:596 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accéder à '%s'" -#: wrapper.c:596 +#: wrapper.c:604 msgid "unable to get current working directory" msgstr "impossible d'accéder au répertoire de travail courant" @@ -9534,39 +9638,44 @@ msgstr "Vous êtes en cours de bissection." 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:1692 +#: wt-status.c:1494 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "Vous êtes dans une extraction partielle avec %d %% de fichiers suivis présents." + +#: wt-status.c:1733 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1699 +#: wt-status.c:1740 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1701 +#: wt-status.c:1742 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1711 +#: wt-status.c:1752 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1728 +#: wt-status.c:1769 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1729 +#: wt-status.c:1770 msgid "No commits yet" msgstr "Aucun commit" -#: wt-status.c:1743 +#: wt-status.c:1784 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1745 +#: wt-status.c:1786 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1749 +#: wt-status.c:1790 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9578,32 +9687,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1755 +#: wt-status.c:1796 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1757 +#: wt-status.c:1798 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1763 +#: wt-status.c:1804 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1768 +#: wt-status.c:1809 #, 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:1771 +#: wt-status.c:1812 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1774 +#: wt-status.c:1815 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9612,66 +9721,66 @@ 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:1777 +#: wt-status.c:1818 #, 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:1780 +#: wt-status.c:1821 #, 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:1783 wt-status.c:1788 +#: wt-status.c:1824 wt-status.c:1829 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1786 +#: wt-status.c:1827 #, 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:1790 +#: wt-status.c:1831 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1903 +#: wt-status.c:1944 msgid "No commits yet on " msgstr "Encore aucun commit sur " -#: wt-status.c:1907 +#: wt-status.c:1948 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1938 +#: wt-status.c:1979 msgid "different" msgstr "différent" -#: wt-status.c:1940 wt-status.c:1948 +#: wt-status.c:1981 wt-status.c:1989 msgid "behind " msgstr "derrière " -#: wt-status.c:1943 wt-status.c:1946 +#: wt-status.c:1984 wt-status.c:1987 msgid "ahead " msgstr "devant " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2468 +#: wt-status.c:2509 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "Impossible de %s : vous avez des modifications non indexées." -#: wt-status.c:2474 +#: wt-status.c:2515 msgid "additionally, your index contains uncommitted changes." msgstr "de plus, votre index contient des modifications non validées." -#: wt-status.c:2476 +#: wt-status.c:2517 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossible : votre index contient des modifications non validées." @@ -9749,7 +9858,7 @@ msgstr "simuler l'action" msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308 +#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308 msgid "select hunks interactively" msgstr "sélection interactive des sections" @@ -9881,12 +9990,12 @@ 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:1703 builtin/commit.c:351 +#: builtin/add.c:501 builtin/checkout.c:1701 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:1715 builtin/commit.c:357 +#: builtin/add.c:508 builtin/checkout.c:1713 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" @@ -10154,7 +10263,7 @@ msgstr "option historique -- no-op" msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16 +#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16 #: builtin/repack.c:306 builtin/stash.c:816 msgid "be quiet" msgstr "être silencieux" @@ -10210,7 +10319,7 @@ msgstr "n" #: 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 +#: bugreport.c:137 msgid "format" msgstr "format" @@ -10511,112 +10620,116 @@ msgstr "" "Les options supportées sont : --term-good|--term-old et --term-bad|--term-" "new." -#: builtin/bisect--helper.c:478 +#: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473 +msgid "'' is not a valid term" +msgstr "'' n'est pas un terme valide" + +#: builtin/bisect--helper.c:483 #, c-format msgid "unrecognized option: '%s'" -msgstr "option non reconnue : %s" +msgstr "option non reconnue : '%s'" -#: builtin/bisect--helper.c:482 +#: builtin/bisect--helper.c:487 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' ne semble être une révision valide" -#: builtin/bisect--helper.c:514 +#: builtin/bisect--helper.c:519 msgid "bad HEAD - I need a HEAD" msgstr "mauvaise HEAD - j'ai besoin d'une HEAD" -#: builtin/bisect--helper.c:529 +#: builtin/bisect--helper.c:534 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "L'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'." -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:555 msgid "won't bisect on cg-seek'ed tree" msgstr "refus de bissecter sur un arbre 'cg-seeked'" -#: builtin/bisect--helper.c:553 +#: builtin/bisect--helper.c:558 msgid "bad HEAD - strange symbolic ref" msgstr "mauvaise HEAD - référence symbolique douteuse" -#: builtin/bisect--helper.c:577 +#: builtin/bisect--helper.c:582 #, c-format msgid "invalid ref: '%s'" msgstr "réference invalide : '%s'" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:638 msgid "perform 'git bisect next'" msgstr "effectuer 'git bisect next'" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:640 msgid "write the terms to .git/BISECT_TERMS" msgstr "écrire les termes dans .git/BISECT_TERMS" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:642 msgid "cleanup the bisection state" msgstr "vérifier l'état de la bissection" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:644 msgid "check for expected revs" msgstr "vérifier si des révisions sont attendues" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:646 msgid "reset the bisection state" msgstr "réinitialiser l'état de la bissection" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:648 msgid "write out the bisection state in BISECT_LOG" msgstr "écrire l'état de la bissection dans BISECT_LOG" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:650 msgid "check and set terms in a bisection state" msgstr "vérifier et régler les termes dans un état de la bissection" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:652 msgid "check whether bad or good terms exist" msgstr "vérifier si les termes bons ou mauvais existent" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:654 msgid "print out the bisect terms" msgstr "afficher les termes de bissection" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:656 msgid "start the bisect session" msgstr "démarrer une session de bissection" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:658 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel" -#: builtin/bisect--helper.c:655 +#: builtin/bisect--helper.c:660 msgid "no log for BISECT_WRITE" msgstr "pas de journal pour BISECT_WRITE" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:678 msgid "--write-terms requires two arguments" msgstr "--write-terms exige deux arguments" -#: builtin/bisect--helper.c:677 +#: builtin/bisect--helper.c:682 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state ne supporte aucun argument" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:689 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset supporte soit aucun argument, soit un commit" -#: builtin/bisect--helper.c:688 +#: builtin/bisect--helper.c:693 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write supporte soit 4 arguments, soit 5 arguments" -#: builtin/bisect--helper.c:694 +#: builtin/bisect--helper.c:699 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms exige 3 arguments" -#: builtin/bisect--helper.c:700 +#: builtin/bisect--helper.c:705 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check exige 2 ou 3 arguments" -#: builtin/bisect--helper.c:706 +#: builtin/bisect--helper.c:711 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms exige 0 ou 1 argument" @@ -11233,19 +11346,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:3376 +#: builtin/bundle.c:66 builtin/pack-objects.c:3448 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/bundle.c:68 builtin/pack-objects.c:3378 +#: builtin/bundle.c:68 builtin/pack-objects.c:3450 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/bundle.c:70 builtin/pack-objects.c:3380 +#: builtin/bundle.c:70 builtin/pack-objects.c:3452 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:3383 +#: builtin/bundle.c:73 builtin/pack-objects.c:3455 msgid "similar to --all-progress when progress meter is shown" msgstr "similaire à --all-progress quand la barre de progression est affichée" @@ -11285,11 +11398,9 @@ msgstr "" #: builtin/cat-file.c:599 msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" -msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" +msgstr "git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-symlinks] [--textconv | --filters]" #: builtin/cat-file.c:620 msgid "only one batch option may be specified" @@ -11323,7 +11434,7 @@ msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" 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:648 git-submodule.sh:984 +#: builtin/cat-file.c:648 git-submodule.sh:958 msgid "blob" msgstr "blob" @@ -11387,8 +11498,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:1488 builtin/gc.c:537 -#: builtin/worktree.c:502 +#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537 +#: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -11482,7 +11593,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:675 +#: builtin/worktree.c:754 msgid "string" msgstr "chaîne" @@ -11599,11 +11710,11 @@ msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s" msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:704 +#: builtin/checkout.c:702 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:758 +#: builtin/checkout.c:756 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11613,50 +11724,50 @@ msgstr "" "suivants :\n" "%s" -#: builtin/checkout.c:861 +#: builtin/checkout.c:859 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:903 +#: builtin/checkout.c:901 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:907 builtin/clone.c:720 +#: builtin/checkout.c:905 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" -#: builtin/checkout.c:911 +#: builtin/checkout.c:909 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:914 +#: builtin/checkout.c:912 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:918 +#: builtin/checkout.c:916 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:920 builtin/checkout.c:1344 +#: builtin/checkout.c:918 builtin/checkout.c:1342 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:922 +#: builtin/checkout.c:920 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:973 +#: builtin/checkout.c:971 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:979 +#: builtin/checkout.c:977 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11679,7 +11790,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:998 +#: builtin/checkout.c:996 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11708,19 +11819,19 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:1033 +#: builtin/checkout.c:1031 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:1037 +#: builtin/checkout.c:1035 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:1077 builtin/checkout.c:1339 +#: builtin/checkout.c:1075 builtin/checkout.c:1337 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1150 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11729,7 +11840,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:1159 +#: builtin/checkout.c:1157 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" @@ -11749,51 +11860,51 @@ msgstr "" "ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n" "votre config." -#: builtin/checkout.c:1169 +#: builtin/checkout.c:1167 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance" -#: builtin/checkout.c:1235 +#: builtin/checkout.c:1233 msgid "only one reference expected" msgstr "une seule référence attendue" -#: builtin/checkout.c:1252 +#: builtin/checkout.c:1250 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451 +#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1311 builtin/checkout.c:1677 +#: builtin/checkout.c:1309 builtin/checkout.c:1675 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1358 +#: builtin/checkout.c:1356 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "branche attendue, mais étiquette '%s' reçue" -#: builtin/checkout.c:1360 +#: builtin/checkout.c:1358 #, 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:1361 builtin/checkout.c:1369 +#: builtin/checkout.c:1359 builtin/checkout.c:1367 #, c-format msgid "a branch is expected, got '%s'" msgstr "une branche est attendue, mais '%s' a été reçue" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1362 #, 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:1380 +#: builtin/checkout.c:1378 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11801,7 +11912,7 @@ msgstr "" "impossible de basculer de branche pendant une fusion\n" "Envisagez \"git merge --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1384 +#: builtin/checkout.c:1382 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11809,7 +11920,7 @@ msgstr "" "impossible de basculer de branche pendant une session am\n" "Envisagez \"git am --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1386 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11817,7 +11928,7 @@ msgstr "" "impossible de basculer de branche pendant un rebasage\n" "Envisagez \"git rebase --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1390 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11825,7 +11936,7 @@ msgstr "" "impossible de basculer de branche pendant un picorage\n" "Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1394 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11833,146 +11944,146 @@ msgstr "" "impossible de basculer de branche pendant un retour\n" "Envisagez \"git revert --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1400 +#: builtin/checkout.c:1398 msgid "you are switching branch while bisecting" msgstr "Vous basculez de branche en cours de bissection" -#: builtin/checkout.c:1407 +#: builtin/checkout.c:1405 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418 +#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416 #, 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:1422 builtin/checkout.c:1425 builtin/checkout.c:1428 -#: builtin/checkout.c:1433 builtin/checkout.c:1438 +#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426 +#: builtin/checkout.c:1431 builtin/checkout.c:1436 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1435 +#: builtin/checkout.c:1433 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' n'accepte pas <point-de-départ>" -#: builtin/checkout.c:1443 +#: builtin/checkout.c:1441 #, 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:1450 +#: builtin/checkout.c:1448 msgid "missing branch or commit argument" msgstr "argument de branche ou de commit manquant" -#: 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/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82 +#: builtin/commit-graph.c:189 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:1493 +#: builtin/checkout.c:1491 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322 +#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322 msgid "style" msgstr "style" -#: builtin/checkout.c:1495 +#: builtin/checkout.c:1493 msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1507 builtin/worktree.c:499 +#: builtin/checkout.c:1505 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" -#: builtin/checkout.c:1508 +#: builtin/checkout.c:1506 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1510 +#: builtin/checkout.c:1508 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1512 +#: builtin/checkout.c:1510 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1512 +#: builtin/checkout.c:1510 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1514 builtin/merge.c:292 +#: builtin/checkout.c:1512 builtin/merge.c:292 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1517 +#: builtin/checkout.c:1515 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:1530 +#: builtin/checkout.c:1528 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1533 +#: builtin/checkout.c:1531 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1535 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:1592 +#: builtin/checkout.c:1590 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1596 +#: builtin/checkout.c:1594 msgid "-p and --overlay are mutually exclusive" msgstr "-p et --overlay sont mutuellement exclusifs" -#: builtin/checkout.c:1633 +#: builtin/checkout.c:1631 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1636 #, c-format msgid "missing branch name; try -%c" msgstr "nom de branche manquant ; essayez -%c" -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1668 #, c-format msgid "could not resolve %s" msgstr "impossible de résoudre %s" -#: builtin/checkout.c:1686 +#: builtin/checkout.c:1684 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1693 +#: builtin/checkout.c:1691 #, 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:1697 +#: builtin/checkout.c:1695 #, 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:1706 +#: builtin/checkout.c:1704 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file est incompatible avec --detach" -#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503 +#: builtin/checkout.c:1707 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:1720 +#: builtin/checkout.c:1718 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11980,70 +12091,71 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." -#: builtin/checkout.c:1725 +#: builtin/checkout.c:1723 msgid "you must specify path(s) to restore" msgstr "Vous devez spécifier un ou des chemins à restaurer" -#: 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 +#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800 +#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554 +#: builtin/worktree.c:556 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1752 +#: builtin/checkout.c:1750 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1752 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1755 +#: builtin/checkout.c:1753 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1757 +#: builtin/checkout.c:1755 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" "essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)" -#: builtin/checkout.c:1758 +#: builtin/checkout.c:1756 msgid "use overlay mode (default)" msgstr "utiliser le mode de superposition (défaut)" -#: builtin/checkout.c:1803 +#: builtin/checkout.c:1801 msgid "create and switch to a new branch" msgstr "créer et basculer sur une nouvelle branche" -#: builtin/checkout.c:1805 +#: builtin/checkout.c:1803 msgid "create/reset and switch to a branch" msgstr "créer/réinitialiser et basculer sur une branche" -#: builtin/checkout.c:1807 +#: builtin/checkout.c:1805 msgid "second guess 'git switch <no-such-branch>'" msgstr "interpréter 'git switch <branche-inexistante>'" -#: builtin/checkout.c:1809 +#: builtin/checkout.c:1807 msgid "throw away local modifications" msgstr "laisser tomber les modifications locales" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1841 msgid "which tree-ish to checkout from" msgstr "de quel <arbre-esque> faire l'extraction" -#: builtin/checkout.c:1845 +#: builtin/checkout.c:1843 msgid "restore the index" msgstr "restaurer l'index" -#: builtin/checkout.c:1847 +#: builtin/checkout.c:1845 msgid "restore the working tree (default)" msgstr "restaurer l'arbre de travail (par défaut)" -#: builtin/checkout.c:1849 +#: builtin/checkout.c:1847 msgid "ignore unmerged entries" msgstr "ignorer les entrées non-fusionnées" -#: builtin/checkout.c:1850 +#: builtin/checkout.c:1848 msgid "use overlay mode" msgstr "utiliser le mode de superposition" @@ -12206,11 +12318,7 @@ msgstr "supprimer les fichiers ignorés, aussi" msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: 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:935 +#: builtin/clean.c:929 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -12218,7 +12326,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:938 +#: builtin/clean.c:932 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -12226,6 +12334,10 @@ msgstr "" "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " "nettoyer" +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "-x et -X ne peuvent pas être utilisés ensemble" + #: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" @@ -12234,7 +12346,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:536 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554 msgid "create a bare repository" msgstr "créer un dépôt nu" @@ -12266,11 +12378,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:533 +#: builtin/clone.c:111 builtin/init-db.c:551 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:112 builtin/init-db.c:534 +#: builtin/clone.c:112 builtin/init-db.c:552 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" @@ -12284,8 +12396,8 @@ msgstr "dépôt de référence" 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:3442 builtin/repack.c:329 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329 msgid "name" msgstr "nom" @@ -12310,7 +12422,7 @@ 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:171 builtin/pack-objects.c:3431 +#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503 #: builtin/pull.c:211 msgid "time" msgstr "heure" @@ -12344,11 +12456,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:542 +#: builtin/clone.c:137 builtin/init-db.c:560 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:138 builtin/init-db.c:543 +#: builtin/clone.c:138 builtin/init-db.c:561 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" @@ -12480,7 +12592,7 @@ msgstr "impossible de remballer pour nettoyer" msgid "cannot unlink temporary alternates file" msgstr "impossible de délier le fichier temporaire alternates" -#: builtin/clone.c:971 builtin/receive-pack.c:1972 +#: builtin/clone.c:971 builtin/receive-pack.c:1982 msgid "Too many arguments." msgstr "Trop d'arguments." @@ -12497,49 +12609,49 @@ msgstr "les options --bare et --origin %s sont incompatibles." msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:1004 +#: builtin/clone.c:1007 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:1010 builtin/fetch.c:1789 +#: builtin/clone.c:1011 builtin/fetch.c:1794 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:1020 +#: builtin/clone.c:1021 #, 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:1030 +#: builtin/clone.c:1033 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271 -#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327 +#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271 +#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386 #, 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:1050 +#: builtin/clone.c:1053 #, 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:1070 +#: builtin/clone.c:1073 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:1072 +#: builtin/clone.c:1075 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:1096 +#: builtin/clone.c:1099 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12547,41 +12659,41 @@ msgstr "" "clone --recursive n'est pas compatible avec à la fois --reference et --" "reference-if-able" -#: builtin/clone.c:1160 +#: builtin/clone.c:1164 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:1162 +#: builtin/clone.c:1166 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:1164 +#: builtin/clone.c:1168 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:1166 +#: builtin/clone.c:1170 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:1169 +#: builtin/clone.c:1173 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:1174 +#: builtin/clone.c:1178 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:1249 builtin/clone.c:1257 +#: builtin/clone.c:1262 builtin/clone.c:1270 #, 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:1260 +#: builtin/clone.c:1273 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -12617,95 +12729,107 @@ 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 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:21 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 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:26 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>" +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 +#: builtin/commit-graph.c:62 #, 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 +#: builtin/commit-graph.c:78 builtin/commit-graph.c:177 +#: builtin/commit-graph.c:276 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 +#: builtin/commit-graph.c:79 builtin/commit-graph.c:178 +#: builtin/commit-graph.c:277 msgid "The object directory to store the graph" msgstr "Le répertoire d'objet où stocker le graphe" -#: builtin/commit-graph.c:79 +#: builtin/commit-graph.c:81 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 +#: builtin/commit-graph.c:104 #, c-format msgid "Could not open commit-graph '%s'" msgstr "impossible d'ouvrir le graphe de commit '%s'" -#: builtin/commit-graph.c:136 +#: builtin/commit-graph.c:138 #, c-format msgid "unrecognized --split argument, %s" msgstr "argument de --split non reconnu, %s" -#: builtin/commit-graph.c:155 +#: builtin/commit-graph.c:151 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "ID d'objet non hexadécimal inattendu : %s" + +#: builtin/commit-graph.c:156 +#, c-format +msgid "invalid object: %s" +msgstr "objet invalide : %s" + +#: builtin/commit-graph.c:180 msgid "start walk at all refs" msgstr "commencer le parcours à toutes les réfs" -#: builtin/commit-graph.c:157 +#: builtin/commit-graph.c:182 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 +#: builtin/commit-graph.c:184 msgid "start walk at commits listed by stdin" msgstr "commencer le parcours aux commits listés sur stdin" -#: builtin/commit-graph.c:161 +#: builtin/commit-graph.c:186 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 +#: builtin/commit-graph.c:188 msgid "enable computation for changed paths" msgstr "activer le calcul pour les chemins modifiés" -#: builtin/commit-graph.c:166 +#: builtin/commit-graph.c:191 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 +#: builtin/commit-graph.c:195 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 +#: builtin/commit-graph.c:197 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 +#: builtin/commit-graph.c:199 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 +#: builtin/commit-graph.c:215 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-graph.c:245 +msgid "Collecting commits from input" +msgstr "Collecte des commits depuis l'entrée" #: builtin/commit-tree.c:18 msgid "" @@ -13112,7 +13236,7 @@ msgid "version" msgstr "version" #: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 -#: builtin/worktree.c:646 +#: builtin/worktree.c:722 msgid "machine-readable output" msgstr "sortie pour traitement automatique" @@ -13125,8 +13249,8 @@ msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" #: 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:1392 parse-options.h:336 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336 msgid "mode" msgstr "mode" @@ -13824,35 +13948,45 @@ msgstr "--dirty est incompatible avec la spécification de commits ou assimilés msgid "--broken is incompatible with commit-ishes" msgstr "--broken est incompatible avec les commits ou assimilés" -#: builtin/diff.c:84 +#: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique" -#: builtin/diff.c:235 +#: builtin/diff.c:242 #, c-format msgid "invalid option: %s" msgstr "option invalide : %s" -#: builtin/diff.c:350 +#: builtin/diff.c:359 +#, c-format +msgid "%s...%s: no merge base" +msgstr "%s..%s: pas de base de fusion" + +#: builtin/diff.c:469 msgid "Not a git repository" msgstr "Ce n'est pas un dépôt git !" -#: builtin/diff.c:394 +#: builtin/diff.c:514 #, c-format msgid "invalid object '%s' given." msgstr "objet spécifié '%s' invalide." -#: builtin/diff.c:403 +#: builtin/diff.c:525 #, c-format msgid "more than two blobs given: '%s'" msgstr "plus de deux blobs spécifiés : '%s'" -#: builtin/diff.c:408 +#: builtin/diff.c:530 #, c-format msgid "unhandled object '%s' given." msgstr "objet non géré '%s' spécifié." +#: builtin/diff.c:564 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "\"%s...%s\" : bases multiples de fusion, utilisation de %s" + #: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]" @@ -14004,90 +14138,111 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [options-de-liste-de-révisions]" -#: builtin/fast-export.c:853 +#: builtin/fast-export.c:868 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" "Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-" "tags ne soit spécifié." -#: builtin/fast-export.c:1152 +#: builtin/fast-export.c:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "le jeton --anonymize-map ne peut pas être vide" + +#: builtin/fast-export.c:1198 msgid "show progress after <n> objects" msgstr "afficher la progression après <n> objets" -#: builtin/fast-export.c:1154 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "sélectionner la gestion des étiquettes signées" -#: builtin/fast-export.c:1157 +#: builtin/fast-export.c:1203 msgid "select handling of tags that tag filtered objects" msgstr "" "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés" -#: builtin/fast-export.c:1160 +#: builtin/fast-export.c:1206 msgid "select handling of commit messages in an alternate encoding" msgstr "" "sélectionner la gestion des messages de validation dans un encodage " "alternatif" -#: builtin/fast-export.c:1163 +#: builtin/fast-export.c:1209 msgid "Dump marks to this file" msgstr "Enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:1165 +#: builtin/fast-export.c:1211 msgid "Import marks from this file" msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:1169 +#: builtin/fast-export.c:1215 msgid "Import marks from this file if it exists" msgstr "importer les marques depuis ce fichier s'il existe" -#: builtin/fast-export.c:1171 +#: builtin/fast-export.c:1217 msgid "Fake a tagger when tags lack one" msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas" -#: builtin/fast-export.c:1173 +#: builtin/fast-export.c:1219 msgid "Output full tree for each commit" msgstr "Afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:1175 +#: builtin/fast-export.c:1221 msgid "Use the done feature to terminate the stream" msgstr "Utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:1176 +#: builtin/fast-export.c:1222 msgid "Skip output of blob data" msgstr "Sauter l'affichage de données de blob" -#: builtin/fast-export.c:1177 builtin/log.c:1724 +#: builtin/fast-export.c:1223 builtin/log.c:1724 msgid "refspec" msgstr "spécificateur de référence" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1224 msgid "Apply refspec to exported refs" msgstr "Appliquer le spécificateur de référence aux références exportées" -#: builtin/fast-export.c:1179 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fast-export.c:1181 +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "depuis:vers" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "convertit <depuis> en <vers> dans la sortie anonymisée" + +#: builtin/fast-export.c:1230 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "les parents références qui ne sont pas dans le flux d'export rapide par id " "d'objet" -#: builtin/fast-export.c:1183 +#: builtin/fast-export.c:1232 msgid "Show original object ids of blobs/commits" msgstr "Afficher les ids d'objet originaux des blobs/commits" -#: builtin/fast-export.c:1185 +#: builtin/fast-export.c:1234 msgid "Label tags with mark ids" msgstr "Marquer les étiquettes avec des ids de marque" -#: builtin/fast-export.c:1220 +#: builtin/fast-export.c:1257 +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "--anonymize-map n'a aucune signification sans --anonymize" + +#: builtin/fast-export.c:1272 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-pack.c:245 +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "Fichier verrou créé mais non reporté : %s" + #: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" @@ -14416,42 +14571,42 @@ msgstr "" msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1773 +#: builtin/fetch.c:1778 msgid "Negative depth in --deepen is not supported" msgstr "Une profondeur négative dans --deepen n'est pas supportée" -#: builtin/fetch.c:1775 +#: builtin/fetch.c:1780 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen et --depth sont mutuellement exclusifs" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1785 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1782 +#: builtin/fetch.c:1787 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:1798 +#: builtin/fetch.c:1800 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1800 +#: builtin/fetch.c:1802 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:1809 +#: builtin/fetch.c:1811 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1816 +#: builtin/fetch.c:1818 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:1834 +#: builtin/fetch.c:1836 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14911,8 +15066,8 @@ 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:1537 builtin/index-pack.c:1730 -#: builtin/pack-objects.c:2855 +#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2904 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" @@ -15149,11 +15304,11 @@ msgstr "--untracked non supportée avec --recurse-submodules" msgid "invalid option combination, ignoring --threads" msgstr "option de combinaison invalide, ignore --threads" -#: builtin/grep.c:1084 builtin/pack-objects.c:3548 +#: builtin/grep.c:1084 builtin/pack-objects.c:3623 msgid "no threads support, ignoring --threads" msgstr "pas de support des fils, ignore --threads" -#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852 +#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" @@ -15356,7 +15511,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:607 +#: builtin/index-pack.c:288 builtin/pack-objects.c:618 msgid "pack too large for current definition of off_t" msgstr "le paquet est trop grand pour la définition actuelle de off_t" @@ -15427,8 +15582,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:159 -#: builtin/pack-objects.c:219 builtin/pack-objects.c:314 +#: builtin/index-pack.c:738 builtin/pack-objects.c:170 +#: builtin/pack-objects.c:230 builtin/pack-objects.c:325 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" @@ -15489,7 +15644,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:2616 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" @@ -15555,58 +15710,67 @@ msgstr "impossible de stocker le fichier paquet" msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863 +#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1596 +#: builtin/index-pack.c:1592 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1598 +#: builtin/index-pack.c:1594 #, 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:1646 +#: builtin/index-pack.c:1642 #, 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:1653 +#: builtin/index-pack.c:1649 #, 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:1692 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1741 builtin/index-pack.c:1744 -#: builtin/index-pack.c:1760 builtin/index-pack.c:1764 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1780 +#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "algorithme d'empreinte inconnu '%s'" + +#: builtin/index-pack.c:1782 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1782 +#: builtin/index-pack.c:1784 msgid "--stdin requires a git repository" msgstr "--stdin requiert un dépôt git" -#: builtin/index-pack.c:1788 +#: builtin/index-pack.c:1786 +msgid "--object-format cannot be used with --stdin" +msgstr "--object-format ne peut pas être utilisé avec --stdin" + +#: builtin/index-pack.c:1792 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" -#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "erreur de fsck dans les objets paquets" @@ -15650,51 +15814,56 @@ msgstr "modèles non trouvés dans %s" msgid "not copying templates from '%s': %s" msgstr "pas de copie des modèles depuis '%s' : %s" -#: builtin/init-db.c:356 +#: builtin/init-db.c:276 +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "Nom de branche initiale invalide : '%s'" + +#: builtin/init-db.c:368 #, c-format msgid "unable to handle file type %d" msgstr "impossible de traiter le fichier de type %d" -#: builtin/init-db.c:359 +#: builtin/init-db.c:371 #, c-format msgid "unable to move %s to %s" msgstr "impossible de déplacer %s vers %s" -#: builtin/init-db.c:374 +#: builtin/init-db.c:386 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 +#: builtin/init-db.c:410 builtin/init-db.c:413 #, c-format msgid "%s already exists" msgstr "%s existe déjà" -#: builtin/init-db.c:458 +#: builtin/init-db.c:444 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-initialisation : --initial-branch=%s ignoré" + +#: builtin/init-db.c:475 #, 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:459 +#: builtin/init-db.c:476 #, 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:463 +#: builtin/init-db.c:480 #, 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:464 +#: builtin/init-db.c:481 #, 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:513 +#: builtin/init-db.c:530 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -15702,33 +15871,37 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--" "shared[=<permissions>]] [<répertoire>]" -#: builtin/init-db.c:538 +#: builtin/init-db.c:556 msgid "permissions" msgstr "permissions" -#: builtin/init-db.c:539 +#: builtin/init-db.c:557 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:544 +#: builtin/init-db.c:563 +msgid "override the name of the initial branch" +msgstr "outrepasser le nom de la branche initiale" + +#: builtin/init-db.c:564 msgid "hash" msgstr "empreinte" -#: builtin/init-db.c:545 +#: builtin/init-db.c:565 builtin/show-index.c:22 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 +#: builtin/init-db.c:598 builtin/init-db.c:603 #, c-format msgid "cannot mkdir %s" msgstr "impossible de créer le répertoire (mkdir) %s" -#: builtin/init-db.c:587 +#: builtin/init-db.c:607 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se déplacer vers le répertoire (chdir) %s" -#: builtin/init-db.c:614 +#: builtin/init-db.c:634 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -15737,7 +15910,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:642 +#: builtin/init-db.c:662 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accéder à l'arbre de travail '%s'" @@ -17513,7 +17686,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:132 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" @@ -17548,106 +17721,119 @@ msgstr "" "git pack-objects [options...] base-name [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:431 +#: builtin/pack-objects.c:442 #, c-format msgid "bad packed object CRC for %s" msgstr "mauvais CRC d'objet empaqueté pour %s" -#: builtin/pack-objects.c:442 +#: builtin/pack-objects.c:453 #, c-format msgid "corrupt packed object for %s" msgstr "objet empaqueté corrompu pour %s" -#: builtin/pack-objects.c:573 +#: builtin/pack-objects.c:584 #, c-format msgid "recursive delta detected for object %s" msgstr "delta récursif détecté pour l'objet %s" -#: builtin/pack-objects.c:784 +#: builtin/pack-objects.c:795 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objets commandés, %<PRIu32> attendus" -#: builtin/pack-objects.c:973 +#: builtin/pack-objects.c:1003 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:986 +#: builtin/pack-objects.c:1016 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1047 builtin/update-index.c:90 +#: builtin/pack-objects.c:1077 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "échec du stat de %s" -#: builtin/pack-objects.c:1100 +#: builtin/pack-objects.c:1130 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus" -#: builtin/pack-objects.c:1298 +#: builtin/pack-objects.c:1347 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:1725 +#: builtin/pack-objects.c:1774 #, 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:1734 +#: builtin/pack-objects.c:1783 #, 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:2005 +#: builtin/pack-objects.c:2054 msgid "Counting objects" msgstr "Décompte des objets" -#: builtin/pack-objects.c:2150 +#: builtin/pack-objects.c:2199 #, 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:2220 builtin/pack-objects.c:2236 -#: builtin/pack-objects.c:2246 +#: builtin/pack-objects.c:2269 builtin/pack-objects.c:2285 +#: builtin/pack-objects.c:2295 #, c-format msgid "object %s cannot be read" msgstr "l'objet %s ne peut être lu" -#: builtin/pack-objects.c:2223 builtin/pack-objects.c:2250 +#: builtin/pack-objects.c:2272 builtin/pack-objects.c:2299 #, 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:2260 +#: builtin/pack-objects.c:2309 msgid "suboptimal pack - out of memory" msgstr "paquet sous-optimal - mémoire insuffisante" -#: builtin/pack-objects.c:2575 +#: builtin/pack-objects.c:2624 #, 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:2714 +#: builtin/pack-objects.c:2763 #, 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:2802 +#: builtin/pack-objects.c:2851 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2808 +#: builtin/pack-objects.c:2857 msgid "inconsistency with delta count" msgstr "inconsistance dans le compte de delta" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2929 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "la valeur de uploadpack.blobpackfileuri doit être de la forme '<empreinte-d-objet> <empreinte-de-pack> <uri>' ('%s' reçu)" + +#: builtin/pack-objects.c:2932 +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "l'objet est déjà configuré dans un autre uploadpack.blobpackfileuri ('%s' reçu)" + +#: builtin/pack-objects.c:2961 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -17656,7 +17842,7 @@ msgstr "" "ID d'objet de bord attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2967 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -17665,236 +17851,244 @@ msgstr "" "ID d'objet attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:2993 +#: builtin/pack-objects.c:3065 msgid "invalid value for --missing" msgstr "valeur invalide pour --missing" -#: builtin/pack-objects.c:3052 builtin/pack-objects.c:3160 +#: builtin/pack-objects.c:3124 builtin/pack-objects.c:3232 msgid "cannot open pack index" msgstr "impossible d'ouvrir l'index de paquet" -#: builtin/pack-objects.c:3083 +#: builtin/pack-objects.c:3155 #, 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:3168 +#: builtin/pack-objects.c:3240 msgid "unable to force loose object" msgstr "impossible de forcer l'objet libre" -#: builtin/pack-objects.c:3261 +#: builtin/pack-objects.c:3333 #, c-format msgid "not a rev '%s'" msgstr "'%s' n'est pas une révision" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3336 #, c-format msgid "bad revision '%s'" msgstr "mauvaise révision '%s'" -#: builtin/pack-objects.c:3289 +#: builtin/pack-objects.c:3361 msgid "unable to add recent objects" msgstr "impossible d'ajouter les objets récents" -#: builtin/pack-objects.c:3342 +#: builtin/pack-objects.c:3414 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:3346 +#: builtin/pack-objects.c:3418 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:3384 +#: builtin/pack-objects.c:3456 msgid "<version>[,<offset>]" msgstr "<version>[,<décalage>]" -#: builtin/pack-objects.c:3385 +#: builtin/pack-objects.c:3457 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:3388 +#: builtin/pack-objects.c:3460 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:3390 +#: builtin/pack-objects.c:3462 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:3392 +#: builtin/pack-objects.c:3464 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:3394 +#: builtin/pack-objects.c:3466 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:3396 +#: builtin/pack-objects.c:3468 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:3398 +#: builtin/pack-objects.c:3470 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:3400 +#: builtin/pack-objects.c:3472 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:3402 +#: builtin/pack-objects.c:3474 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:3404 +#: builtin/pack-objects.c:3476 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:3406 +#: builtin/pack-objects.c:3478 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:3408 +#: builtin/pack-objects.c:3480 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:3410 +#: builtin/pack-objects.c:3482 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:3412 +#: builtin/pack-objects.c:3484 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:3415 +#: builtin/pack-objects.c:3487 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:3418 +#: builtin/pack-objects.c:3490 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:3421 +#: builtin/pack-objects.c:3493 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:3424 +#: builtin/pack-objects.c:3496 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:3426 +#: builtin/pack-objects.c:3498 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:3428 +#: builtin/pack-objects.c:3500 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:3430 +#: builtin/pack-objects.c:3502 msgid "pack loose unreachable objects" msgstr "empaqueter les objets inaccessibles détachés" -#: builtin/pack-objects.c:3432 +#: builtin/pack-objects.c:3504 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:3435 +#: builtin/pack-objects.c:3507 msgid "use the sparse reachability algorithm" msgstr "utiliser l'algorithme de joignabilité creuse" -#: builtin/pack-objects.c:3437 +#: builtin/pack-objects.c:3509 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:3439 +#: builtin/pack-objects.c:3511 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:3441 +#: builtin/pack-objects.c:3513 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:3443 +#: builtin/pack-objects.c:3515 msgid "ignore this pack" msgstr "ignorer ce paquet" -#: builtin/pack-objects.c:3445 +#: builtin/pack-objects.c:3517 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:3447 +#: builtin/pack-objects.c:3519 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:3449 +#: builtin/pack-objects.c:3521 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:3451 +#: builtin/pack-objects.c:3523 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:3455 +#: builtin/pack-objects.c:3527 msgid "write a bitmap index if possible" msgstr "écrire un index de bitmap si possible" -#: builtin/pack-objects.c:3459 +#: builtin/pack-objects.c:3531 msgid "handling for missing objects" msgstr "gestion des objets manquants" -#: builtin/pack-objects.c:3462 +#: builtin/pack-objects.c:3534 msgid "do not pack objects in promisor packfiles" msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs" -#: builtin/pack-objects.c:3464 +#: builtin/pack-objects.c:3536 msgid "respect islands during delta compression" msgstr "respecter les îlots pendant la compression des deltas" -#: builtin/pack-objects.c:3493 +#: builtin/pack-objects.c:3538 +msgid "protocol" +msgstr "protocole" + +#: builtin/pack-objects.c:3539 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "exclure tout uploadpack.blobpackfileuri configuré avec ce protocole" + +#: builtin/pack-objects.c:3568 #, 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:3498 +#: builtin/pack-objects.c:3573 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit est trop grand, forcé à %d" -#: builtin/pack-objects.c:3552 +#: builtin/pack-objects.c:3627 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:3554 +#: builtin/pack-objects.c:3629 msgid "minimum pack size limit is 1 MiB" msgstr "la taille limite minimale d'un paquet est 1 MiB" -#: builtin/pack-objects.c:3559 +#: builtin/pack-objects.c:3634 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:3562 +#: builtin/pack-objects.c:3637 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3643 msgid "cannot use --filter without --stdout" msgstr "impossible d'utiliser --filter sans --stdout" -#: builtin/pack-objects.c:3628 +#: builtin/pack-objects.c:3703 msgid "Enumerating objects" msgstr "Énumération des objets" -#: builtin/pack-objects.c:3658 +#: builtin/pack-objects.c:3734 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18998,7 +19192,8 @@ msgstr "rebaser tous les objets inatteignables depuis les racines" #: 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" +msgstr "" +"appliquer toutes les modifications, même celles déjà présentes en amont" #: builtin/rebase.c:1426 msgid "" @@ -19222,7 +19417,7 @@ msgstr "Avance rapide de %s sur %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <répertoire-git>" -#: builtin/receive-pack.c:843 +#: builtin/receive-pack.c:844 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" @@ -19252,7 +19447,7 @@ msgstr "" "Pour éliminer ce message et conserver le comportement par défaut,\n" "réglez « receive.denyCurrentBranch » à 'refuse'." -#: builtin/receive-pack.c:863 +#: builtin/receive-pack.c:864 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" @@ -19272,11 +19467,11 @@ msgstr "" "\n" "Pour éliminer ce message, réglez-le à 'refuse'." -#: builtin/receive-pack.c:1960 +#: builtin/receive-pack.c:1970 msgid "quiet" msgstr "quiet" -#: builtin/receive-pack.c:1974 +#: builtin/receive-pack.c:1984 msgid "You must specify a directory." msgstr "Vous devez spécifier un répertoire." @@ -20856,6 +21051,14 @@ msgstr "'%s' n'est pas une référence valide." msgid "cannot find commit %s (%s)" msgstr "impossible de trouver le commit %s (%s)" +#: builtin/show-index.c:21 +msgid "hash-algorithm" +msgstr "algorithme d'empreinte" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "Algorithme d'empreinte inconnu" + #: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -20915,51 +21118,55 @@ msgstr "" "cet arbre de travail n'est pas partiel (le fichier sparse-checkout pourrait " "ne pas exister)" -#: builtin/sparse-checkout.c:212 +#: builtin/sparse-checkout.c:216 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:253 +#: builtin/sparse-checkout.c:257 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "impossible de mettre à jour le format de dépôt pour activer worktreeConfig" + +#: builtin/sparse-checkout.c:259 msgid "failed to set extensions.worktreeConfig setting" msgstr "échec de paramétrage extensions.worktreeConfig" -#: builtin/sparse-checkout.c:270 +#: builtin/sparse-checkout.c:276 msgid "git sparse-checkout init [--cone]" msgstr "git sparse-checkout init [--cone]" -#: builtin/sparse-checkout.c:289 +#: builtin/sparse-checkout.c:295 msgid "initialize the sparse-checkout in cone mode" msgstr "initialiser l'extraction partielle en mode cone" -#: builtin/sparse-checkout.c:326 +#: builtin/sparse-checkout.c:332 #, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" -#: builtin/sparse-checkout.c:383 +#: builtin/sparse-checkout.c:389 #, c-format msgid "could not normalize path %s" msgstr "impossible de normaliser le chemin '%s'" -#: builtin/sparse-checkout.c:395 +#: builtin/sparse-checkout.c:401 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)" -#: builtin/sparse-checkout.c:420 +#: builtin/sparse-checkout.c:426 #, 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:474 builtin/sparse-checkout.c:498 +#: builtin/sparse-checkout.c:480 builtin/sparse-checkout.c:504 msgid "unable to load existing sparse-checkout patterns" msgstr "impossible de charger les motifs de l'extraction partielle existants" -#: builtin/sparse-checkout.c:543 +#: builtin/sparse-checkout.c:549 msgid "read patterns from standard in" msgstr "lire les motifs depuis l'entrée standard" -#: builtin/sparse-checkout.c:580 +#: builtin/sparse-checkout.c:586 msgid "error while refreshing working directory" msgstr "erreur lors du rafraîchissement du répertoire de travail" @@ -21676,12 +21883,37 @@ msgstr "Supprimer la sortie lors du paramétrage de l'url d'un sous-module" 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 +#: builtin/submodule--helper.c:2294 +msgid "set the default tracking branch to master" +msgstr "régler la branche de suivi par défaut à master" + +#: builtin/submodule--helper.c:2296 +msgid "set the default tracking branch" +msgstr "régler la branche de suivi par défaut" + +#: builtin/submodule--helper.c:2300 +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <chemin>" + +#: builtin/submodule--helper.c:2301 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branche> <chemin>" + +#: builtin/submodule--helper.c:2308 +msgid "--branch or --default required" +msgstr "--branch ou --default requis" + +#: builtin/submodule--helper.c:2311 +msgid "--branch and --default are mutually exclusive" +msgstr "--branch et --default sont mutuellement exclusifs" + +#: builtin/submodule--helper.c:2367 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:2329 +#: builtin/submodule--helper.c:2373 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" @@ -22331,208 +22563,196 @@ 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:894 +#: builtin/worktree.c:60 builtin/worktree.c:972 #, c-format msgid "failed to delete '%s'" msgstr "échec de la suppression de '%s'" -#: builtin/worktree.c:79 -#, c-format -msgid "Removing worktrees/%s: not a valid directory" -msgstr "Suppression de worktrees/%s : répertoire invalide" - #: builtin/worktree.c:85 -#, c-format -msgid "Removing worktrees/%s: gitdir file does not exist" -msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas" +msgid "not a valid directory" +msgstr "pas un répertoire valide" -#: builtin/worktree.c:90 builtin/worktree.c:99 -#, c-format -msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -msgstr "" -"Suppression de worktrees/%s : échec de la lecture du fichier gitdir (%s)" +#: builtin/worktree.c:91 +msgid "gitdir file does not exist" +msgstr "le fichier gitdir n'existe pas" -#: builtin/worktree.c:109 +#: builtin/worktree.c:96 builtin/worktree.c:105 #, c-format -msgid "" -"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " -"%<PRIuMAX>)" -msgstr "" -"Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets " -"attendus, %<PRIuMAX> octets lus)" +msgid "unable to read gitdir file (%s)" +msgstr "impossible de lire le fichier gitdir (%s)" -#: builtin/worktree.c:117 +#: builtin/worktree.c:115 #, c-format -msgid "Removing worktrees/%s: invalid gitdir file" -msgstr "Suppression de worktrees/%s : fichier gitdir invalide" +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)" + +#: builtin/worktree.c:123 +msgid "invalid gitdir file" +msgstr "fichier gitdir invalide" + +#: builtin/worktree.c:131 +msgid "gitdir file points to non-existent location" +msgstr "le fichier gitdir pointe sur un endroit inexistant" -#: builtin/worktree.c:126 +#: builtin/worktree.c:146 #, c-format -msgid "Removing worktrees/%s: gitdir file points to non-existent location" -msgstr "" -"Suppression de worktrees/%s : le fichier gitdir point sur un endroit " -"inexistant" +msgid "Removing %s/%s: %s" +msgstr "Suppression de %s/%s : %s" -#: builtin/worktree.c:165 +#: builtin/worktree.c:221 msgid "report pruned working trees" msgstr "afficher les arbres de travail éliminés" -#: builtin/worktree.c:167 +#: builtin/worktree.c:223 msgid "expire working trees older than <time>" msgstr "faire expirer les arbres de travail plus vieux que <temps>" -#: builtin/worktree.c:234 +#: builtin/worktree.c:293 #, c-format msgid "'%s' already exists" msgstr "'%s' existe déjà" -#: builtin/worktree.c:244 +#: builtin/worktree.c:302 #, c-format -msgid "unable to re-add worktree '%s'" -msgstr "impossible de ré-ajouter l'arbre de travail '%s'" +msgid "unusable worktree destination '%s'" +msgstr "arbre de travail destination '%s' inutilisable" -#: builtin/worktree.c:249 +#: builtin/worktree.c:307 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" -"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" "'%s' est un arbre de travail manquant mais verrouillé ;\n" -"utilisez 'add -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' " -"pour corriger" +"utilisez '%s -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' pour corriger" -#: builtin/worktree.c:251 +#: builtin/worktree.c:309 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" +"use '%s -f' to override, or 'prune' or 'remove' to clear" msgstr "" "'%s' est un arbre de travail manquant mais déjà enregistré ;\n" -"utilisez 'add -f' pour passer outre, ou 'prune' ou 'remove' pour corriger" +"utilisez '%s -f' pour passer outre, ou 'prune' ou 'remove' pour corriger" -#: builtin/worktree.c:301 +#: builtin/worktree.c:360 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:435 builtin/worktree.c:441 +#: builtin/worktree.c:494 builtin/worktree.c:500 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')" -#: builtin/worktree.c:437 +#: builtin/worktree.c:496 #, 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:446 +#: builtin/worktree.c:505 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Préparation de l'arbre de travail (extraction de '%s')" -#: builtin/worktree.c:452 +#: builtin/worktree.c:511 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Préparation de l'arbre de travail (HEAD détachée %s)" -#: builtin/worktree.c:493 +#: builtin/worktree.c:552 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:496 +#: builtin/worktree.c:555 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:498 +#: builtin/worktree.c:557 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:500 +#: builtin/worktree.c:559 msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" -#: builtin/worktree.c:501 +#: builtin/worktree.c:560 msgid "keep the new working tree locked" msgstr "conserver le verrou sur le nouvel arbre de travail" -#: builtin/worktree.c:504 +#: builtin/worktree.c:563 msgid "set up tracking mode (see git-branch(1))" msgstr "régler le mode de suivi (voir git-branch(1))" -#: builtin/worktree.c:507 +#: builtin/worktree.c:566 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:515 +#: builtin/worktree.c:574 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/worktree.c:576 +#: builtin/worktree.c:635 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:676 +#: builtin/worktree.c:755 msgid "reason for locking" msgstr "raison du verrouillage" -#: builtin/worktree.c:688 builtin/worktree.c:721 builtin/worktree.c:795 -#: builtin/worktree.c:922 +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:1000 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:690 builtin/worktree.c:723 +#: builtin/worktree.c:769 builtin/worktree.c:802 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:695 +#: builtin/worktree.c:774 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:697 +#: builtin/worktree.c:776 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:725 +#: builtin/worktree.c:804 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" -#: builtin/worktree.c:766 +#: builtin/worktree.c:845 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:774 +#: builtin/worktree.c:853 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:797 builtin/worktree.c:924 +#: builtin/worktree.c:876 builtin/worktree.c:1002 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' est un arbre de travail principal" -#: builtin/worktree.c:802 +#: builtin/worktree.c:881 #, 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:808 -#, c-format -msgid "target '%s' already exists" -msgstr "la cible '%s' existe déjà" - -#: builtin/worktree.c:816 +#: builtin/worktree.c:894 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -22542,7 +22762,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:818 +#: builtin/worktree.c:896 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -22550,39 +22770,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:821 +#: builtin/worktree.c:899 #, 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:826 +#: builtin/worktree.c:904 #, c-format msgid "failed to move '%s' to '%s'" msgstr "échec au déplacement de '%s' vers '%s'" -#: builtin/worktree.c:874 +#: builtin/worktree.c:952 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "échec du lancement de 'git status' sur '%s'" -#: builtin/worktree.c:878 +#: builtin/worktree.c:956 #, 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:883 +#: builtin/worktree.c:961 #, 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:906 +#: builtin/worktree.c:984 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:929 +#: builtin/worktree.c:1007 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -22592,7 +22812,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:931 +#: builtin/worktree.c:1009 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22600,7 +22820,7 @@ msgstr "" "impossible de supprimer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:934 +#: builtin/worktree.c:1012 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" @@ -22622,32 +22842,32 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le débogage" -#: bugreport.c:14 +#: bugreport.c:15 msgid "git version:\n" msgstr "version git ::\n" -#: bugreport.c:20 +#: bugreport.c:21 #, c-format msgid "uname() failed with error '%s' (%d)\n" msgstr "échec de uname() avec l'erreur '%s' (%d)\n" -#: bugreport.c:30 +#: bugreport.c:31 msgid "compiler info: " msgstr "info compilateur : " -#: bugreport.c:32 +#: bugreport.c:34 msgid "libc info: " msgstr "info libc : " -#: bugreport.c:74 +#: bugreport.c:80 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 +#: bugreport.c:90 msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" msgstr "git bugreport [-o|--output-directory <fichier>] [-s|--suffix <format>]" -#: bugreport.c:91 +#: bugreport.c:97 msgid "" "Thank you for filling out a Git bug report!\n" "Please answer the following questions to help us understand your issue.\n" @@ -22666,82 +22886,97 @@ msgid "" "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" +"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" +"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" +"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 +#: bugreport.c:136 msgid "specify a destination for the bugreport file" msgstr "spécifier la destination du fichier de rapport de bogue" -#: bugreport.c:132 +#: bugreport.c:138 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 +#: bugreport.c:162 #, 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 +#: bugreport.c:169 msgid "System Info" msgstr "Info système" -#: bugreport.c:166 +#: bugreport.c:172 msgid "Enabled Hooks" msgstr "Crochets activés" -#: bugreport.c:174 +#: bugreport.c:180 #, c-format msgid "couldn't create a new file at '%s'" msgstr "impossible de créer un fichier nouveau à '%s'" -#: bugreport.c:186 +#: bugreport.c:184 +#, c-format +msgid "unable to write to %s" +msgstr "impossible d'écrire dans %s" + +#: bugreport.c:194 #, c-format msgid "Created new report at '%s'.\n" msgstr "Nouveau rapport créé à '%s'.\n" -#: fast-import.c:3085 +#: fast-import.c:3100 #, c-format msgid "Missing from marks for submodule '%s'" msgstr "Champs from manquants pour le sous-module '%s'" -#: fast-import.c:3087 +#: fast-import.c:3102 #, c-format msgid "Missing to marks for submodule '%s'" msgstr "champs to manquants pour le sous-module '%s'" -#: fast-import.c:3222 +#: fast-import.c:3237 #, c-format msgid "Expected 'mark' command, got %s" msgstr "commande 'mark' attendue, %s trouvé" -#: fast-import.c:3227 +#: fast-import.c:3242 #, c-format msgid "Expected 'to' command, got %s" msgstr "commande 'to' attendue, %s trouvé" -#: fast-import.c:3317 +#: fast-import.c:3334 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" +msgstr "" +"Format attendu nom:<nom de fichier> pour l'option de réécriture de sous-" +"module" -#: fast-import.c:3371 +#: fast-import.c:3388 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "" "la fonctionnalité '%s' est interdite en entrée sans --allow-unsafe-features" +#: http-fetch.c:111 +#, c-format +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "l'argument de --packfile doit être une empreinte valide ('%s' reçu)" + #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -22920,32 +23155,32 @@ msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0" 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:914 +#: http.c:910 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:993 +#: http.c:989 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:1139 +#: http.c:1132 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Dorsale SSL '%s' non supportée. Dorsales SSL supportées :" -#: http.c:1146 +#: http.c:1139 #, 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:1150 +#: http.c:1143 #, 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:2032 +#: http.c:2025 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -22956,113 +23191,136 @@ msgstr "" " demandé : %s\n" " redirection : %s" -#: remote-curl.c:166 +#: remote-curl.c:168 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "citation invalide dans la valeur push-option : '%s'" -#: remote-curl.c:263 +#: remote-curl.c:295 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs n'est pas valide : est-ce bien un dépôt git ?" -#: remote-curl.c:364 +#: remote-curl.c:396 msgid "invalid server response; expected service, got flush packet" msgstr "réponse du serveur invalide ; service attendu, paquet de vidage reçu" -#: remote-curl.c:395 +#: remote-curl.c:427 #, c-format msgid "invalid server response; got '%s'" msgstr "réponse du serveur invalide ; '%s' reçu" -#: remote-curl.c:455 +#: remote-curl.c:487 #, c-format msgid "repository '%s' not found" msgstr "dépôt '%s' non trouvé" -#: remote-curl.c:459 +#: remote-curl.c:491 #, c-format msgid "Authentication failed for '%s'" msgstr "Échec d'authentification pour '%s'" -#: remote-curl.c:463 +#: remote-curl.c:495 #, c-format msgid "unable to access '%s': %s" msgstr "impossible d'accéder à '%s' : %s" -#: remote-curl.c:469 +#: remote-curl.c:501 #, c-format msgid "redirecting to %s" msgstr "redirection vers %s" -#: remote-curl.c:593 +#: remote-curl.c:630 msgid "shouldn't have EOF when not gentle on EOF" msgstr "ne devrait pas recevoir OEF quand on n'est pas gentil sur EOF" -#: remote-curl.c:673 +#: remote-curl.c:642 +msgid "remote server sent stateless separator" +msgstr "le serveur distant a envoyé un séparateur sans état" + +#: remote-curl.c:712 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" "impossible de rembobiner le données post rpc - essayer d'augmenter http." "postBuffer" -#: remote-curl.c:733 +#: remote-curl.c:742 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "remote-curl : mauvais caractère de longueur de ligne : %.4s" + +#: remote-curl.c:744 +msgid "remote-curl: unexpected response end packet" +msgstr "remote-curl : paquet de fin de réponse inattendu" + +#: remote-curl.c:820 #, c-format msgid "RPC failed; %s" msgstr "échec RPC ; %s" -#: remote-curl.c:773 +#: remote-curl.c:860 msgid "cannot handle pushes this big" msgstr "impossible de gérer des poussées aussi grosses" -#: remote-curl.c:888 +#: remote-curl.c:975 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "impossible de compresser la requête ; erreur de compression zlib %d" -#: remote-curl.c:892 +#: remote-curl.c:979 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "impossible de compresser la requête ; erreur de fin zlib %d" -#: remote-curl.c:1023 +#: remote-curl.c:1029 +#, c-format +msgid "%d bytes of length header were received" +msgstr "%d octets de longueur d'entête ont été reçus" + +#: remote-curl.c:1031 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "%d octets de corps sont encore attendus" + +#: remote-curl.c:1120 msgid "dumb http transport does not support shallow capabilities" msgstr "le protocole http idiot ne supporte la capacité superficielle" -#: remote-curl.c:1038 +#: remote-curl.c:1135 msgid "fetch failed." msgstr "échec du récupération." -#: remote-curl.c:1086 +#: remote-curl.c:1183 msgid "cannot fetch by sha1 over smart http" msgstr "impossible de récupérer par sha1 sur http intelligent" -#: remote-curl.c:1130 remote-curl.c:1136 +#: remote-curl.c:1227 remote-curl.c:1233 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé" -#: remote-curl.c:1148 remote-curl.c:1263 +#: remote-curl.c:1245 remote-curl.c:1360 #, c-format msgid "http transport does not support %s" msgstr "le transport http ne supporte pas %s" -#: remote-curl.c:1184 +#: remote-curl.c:1281 msgid "git-http-push failed" msgstr "échec de git-http-push" -#: remote-curl.c:1369 +#: remote-curl.c:1466 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: usage: git remote-curl <distant> [<url>]" -#: remote-curl.c:1401 +#: remote-curl.c:1498 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl : erreur de lecture du flux de commande depuis git" -#: remote-curl.c:1408 +#: remote-curl.c:1505 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl : récupération tentée sans dépôt local" -#: remote-curl.c:1448 +#: remote-curl.c:1546 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl : commande inconnue '%s' depuis git" @@ -23179,7 +23437,8 @@ 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" +msgstr "" +"Collecter l'information pour l'utilisateur pour remplir un rapport de bogue" #: command-list.h:60 msgid "Move objects and refs by archive" @@ -24117,26 +24376,26 @@ msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'" msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" -#: git-submodule.sh:878 +#: git-submodule.sh:852 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:930 +#: git-submodule.sh:904 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode $mod_dst inattendu" -#: git-submodule.sh:950 +#: git-submodule.sh:924 #, 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:953 +#: git-submodule.sh:927 #, 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:956 +#: git-submodule.sh:930 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -24556,7 +24815,7 @@ msgid_plural "touched %d paths\n" msgstr[0] "%d chemin touché\n" msgstr[1] "%d chemins touchés\n" -#: git-add--interactive.perl:1053 +#: git-add--interactive.perl:1055 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -24564,7 +24823,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme indexée." -#: git-add--interactive.perl:1056 +#: git-add--interactive.perl:1058 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -24572,7 +24831,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme remisée." -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1061 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -24580,8 +24839,8 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme desindexée." -#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 -#: git-add--interactive.perl:1077 +#: git-add--interactive.perl:1064 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -24589,8 +24848,8 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme appliquée." -#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1067 git-add--interactive.perl:1070 +#: git-add--interactive.perl:1076 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -24598,12 +24857,12 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme éliminée." -#: git-add--interactive.perl:1111 +#: git-add--interactive.perl:1113 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s" -#: git-add--interactive.perl:1118 +#: git-add--interactive.perl:1120 #, perl-format msgid "" "---\n" @@ -24616,12 +24875,12 @@ msgstr "" "Pour éliminer les lignes '%s', effacez-les.\n" "Les lignes commençant par %s seront éliminées.\n" -#: git-add--interactive.perl:1140 +#: git-add--interactive.perl:1142 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s" -#: git-add--interactive.perl:1248 +#: git-add--interactive.perl:1250 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -24635,7 +24894,7 @@ 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" -#: git-add--interactive.perl:1254 +#: git-add--interactive.perl:1256 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -24649,7 +24908,7 @@ 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" -#: git-add--interactive.perl:1260 +#: git-add--interactive.perl:1262 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -24663,7 +24922,7 @@ 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" -#: git-add--interactive.perl:1266 +#: git-add--interactive.perl:1268 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -24677,7 +24936,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" -#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 +#: git-add--interactive.perl:1274 git-add--interactive.perl:1292 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -24691,7 +24950,7 @@ 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" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1280 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -24705,7 +24964,7 @@ 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" -#: git-add--interactive.perl:1284 +#: git-add--interactive.perl:1286 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -24719,7 +24978,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" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1298 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -24733,7 +24992,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" -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1313 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -24755,86 +25014,91 @@ msgstr "" "e - éditer manuellement la section actuelle\n" "? - afficher l'aide\n" -#: git-add--interactive.perl:1342 +#: git-add--interactive.perl:1344 msgid "The selected hunks do not apply to the index!\n" msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n" -#: git-add--interactive.perl:1357 +#: git-add--interactive.perl:1359 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "fichier non-fusionné ignoré : %s\n" -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1478 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1469 +#: git-add--interactive.perl:1479 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1470 +#: git-add--interactive.perl:1480 +#, perl-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "Appliquer l'ajout dans l'arbre de travail [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1481 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Appliquer la section à l'arbre de travail [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1570 +#: git-add--interactive.perl:1587 msgid "No other hunks to goto\n" msgstr "Aucune autre section à atteindre\n" -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1605 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Nombre invalide : '%s'\n" -#: git-add--interactive.perl:1593 +#: git-add--interactive.perl:1610 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Désolé, %d seule section disponible.\n" msgstr[1] "Désolé, Seulement %d sections disponibles.\n" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1636 msgid "No other hunks to search\n" msgstr "aucune autre section à rechercher\n" -#: git-add--interactive.perl:1636 +#: git-add--interactive.perl:1653 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regex de recherche malformée %s : %s\n" -#: git-add--interactive.perl:1646 +#: git-add--interactive.perl:1663 msgid "No hunk matches the given pattern\n" msgstr "Aucune section ne correspond au motif donné\n" -#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 +#: git-add--interactive.perl:1675 git-add--interactive.perl:1697 msgid "No previous hunk\n" msgstr "Pas de section précédente\n" -#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 +#: git-add--interactive.perl:1684 git-add--interactive.perl:1703 msgid "No next hunk\n" msgstr "Pas de section suivante\n" -#: git-add--interactive.perl:1692 +#: git-add--interactive.perl:1709 msgid "Sorry, cannot split this hunk\n" msgstr "Désolé, impossible de découper cette section\n" -#: git-add--interactive.perl:1698 +#: git-add--interactive.perl:1715 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Découpée en %d section.\n" msgstr[1] "Découpée en %d sections.\n" -#: git-add--interactive.perl:1708 +#: git-add--interactive.perl:1725 msgid "Sorry, cannot edit this hunk\n" msgstr "Désolé, impossible d'éditer cette section\n" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1773 +#: git-add--interactive.perl:1790 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -24852,19 +25116,19 @@ msgstr "" "diff - visualiser les diff entre HEAD et l'index\n" "add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n" -#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 -#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 -#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 -#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 +#: git-add--interactive.perl:1807 git-add--interactive.perl:1812 +#: git-add--interactive.perl:1815 git-add--interactive.perl:1822 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1832 +#: git-add--interactive.perl:1836 git-add--interactive.perl:1842 msgid "missing --" msgstr "-- manquant" -#: git-add--interactive.perl:1821 +#: git-add--interactive.perl:1838 #, perl-format msgid "unknown --patch mode: %s" msgstr "mode de --patch inconnu : %s" -#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 +#: git-add--interactive.perl:1844 git-add--interactive.perl:1850 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argument invalide %s, -- attendu" @@ -25183,56 +25447,56 @@ msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n" msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1718 +#: git-send-email.perl:1722 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1753 +#: git-send-email.perl:1757 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1864 +#: git-send-email.perl:1868 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Impossible d'exécuter '%s'" -#: git-send-email.perl:1871 +#: git-send-email.perl:1875 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Ajout de %s : %s depuis : '%s'\n" -#: git-send-email.perl:1875 +#: git-send-email.perl:1879 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) échec de la fermeture du pipe vers '%s'" -#: git-send-email.perl:1905 +#: git-send-email.perl:1909 msgid "cannot send message as 7bit" msgstr "impossible d'envoyer un message comme 7bit" -#: git-send-email.perl:1913 +#: git-send-email.perl:1917 msgid "invalid transfer encoding" msgstr "codage de transfert invalide" -#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 +#: git-send-email.perl:1958 git-send-email.perl:2010 git-send-email.perl:2020 #, perl-format msgid "unable to open %s: %s\n" msgstr "impossible d'ouvrir %s :%s\n" -#: git-send-email.perl:1957 +#: git-send-email.perl:1961 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s : le patch contient une ligne plus longue que 998 caractères" -#: git-send-email.perl:1974 +#: git-send-email.perl:1978 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1978 +#: git-send-email.perl:1982 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " |