diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2022-01-13 09:11:17 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2022-01-13 09:11:17 +0800 |
| commit | 14a38adf53033553da085549be989f02ca9d4ee4 (patch) | |
| tree | 758ca18500483a2c0b60ce25720ff6f0a0a0fafc /po | |
| parent | l10n: po-id for 2.35 (round 1) (diff) | |
| parent | l10n: fr: v2.35.0 round 1 (diff) | |
| download | tgif-14a38adf53033553da085549be989f02ca9d4ee4.tar.xz | |
Merge branch 'fr_2.35.0_rnd1' of github.com:jnavila/git
* 'fr_2.35.0_rnd1' of github.com:jnavila/git:
l10n: fr: v2.35.0 round 1
Diffstat (limited to 'po')
| -rw-r--r-- | po/fr.po | 6626 |
1 files changed, 3504 insertions, 3122 deletions
@@ -77,8 +77,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2021-11-10 08:55+0800\n" -"PO-Revision-Date: 2021-11-10 22:00+0100\n" +"POT-Creation-Date: 2022-01-11 09:38+0800\n" +"PO-Revision-Date: 2022-01-12 21:11+0100\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -86,15 +86,15 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" -"X-Generator: Poedit 2.4.2\n" +"X-Generator: Poedit 3.0.1\n" #: add-interactive.c:380 #, c-format msgid "Huh (%s)?" msgstr "Hein (%s) ?" -#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512 -#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509 +#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233 #: builtin/rebase.c:1642 msgid "could not read index" msgstr "impossible de lire l'index" @@ -123,7 +123,7 @@ msgstr "Mise à jour" msgid "could not stage '%s'" msgstr "impossible d'indexer '%s'" -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713 msgid "could not write index" msgstr "impossible d'écrire l'index" @@ -139,8 +139,8 @@ msgstr[1] "%d chemins mis à jour\n" msgid "note: %s is untracked now.\n" msgstr "note : %s n'est plus suivi à présent.\n" -#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298 -#: builtin/reset.c:151 +#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306 +#: builtin/reset.c:167 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" @@ -181,21 +181,21 @@ msgstr[1] "%d chemins ajoutés\n" msgid "ignoring unmerged: %s" msgstr "fichier non-fusionné ignoré : %s" -#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371 #, c-format msgid "Only binary files changed.\n" msgstr "Seuls des fichiers binaires ont changé.\n" -#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373 #, c-format msgid "No changes.\n" msgstr "Aucune modification.\n" -#: add-interactive.c:947 git-add--interactive.perl:1379 +#: add-interactive.c:947 git-add--interactive.perl:1381 msgid "Patch update" msgstr "Mise à jour par patch" -#: add-interactive.c:986 git-add--interactive.perl:1792 +#: add-interactive.c:986 git-add--interactive.perl:1794 msgid "Review diff" msgstr "Réviser la différence" @@ -266,11 +266,11 @@ msgstr "sélectionner un élément par son numéro" msgid "(empty) select nothing" msgstr "(vide) ne rien sélectionner" -#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896 +#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893 +#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895 msgid "What now" msgstr "Et maintenant" @@ -282,13 +282,13 @@ msgstr "indexé" msgid "unstaged" msgstr "non-indexé" -#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311 -#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128 -#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857 -#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503 -#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573 -#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811 +#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367 +#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128 +#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504 +#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574 +#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812 #: git-add--interactive.perl:213 msgid "path" msgstr "chemin" @@ -297,27 +297,27 @@ msgstr "chemin" msgid "could not refresh index" msgstr "impossible de rafraîchir l'index" -#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803 +#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805 #, c-format msgid "Bye.\n" msgstr "Au revoir.\n" -#: add-patch.c:34 git-add--interactive.perl:1431 +#: add-patch.c:34 git-add--interactive.perl:1433 #, 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:1432 +#: add-patch.c:35 git-add--interactive.perl:1434 #, 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:1433 +#: add-patch.c:36 git-add--interactive.perl:1435 #, 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:1434 +#: add-patch.c:37 git-add--interactive.perl:1436 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Indexer cette section [y,n,q,a,d%s,?] ? " @@ -344,22 +344,22 @@ msgstr "" "a - indexer cette section et toutes les suivantes de ce fichier\n" "d - ne pas indexer cette section ni les suivantes de ce fichier\n" -#: add-patch.c:56 git-add--interactive.perl:1437 +#: add-patch.c:56 git-add--interactive.perl:1439 #, 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:57 git-add--interactive.perl:1438 +#: add-patch.c:57 git-add--interactive.perl:1440 #, 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:58 git-add--interactive.perl:1439 +#: add-patch.c:58 git-add--interactive.perl:1441 #, 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:1440 +#: add-patch.c:59 git-add--interactive.perl:1442 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Remiser cette section [y,n,q,a,d%s,?] ? " @@ -386,22 +386,22 @@ msgstr "" "a - remiser cette section et toutes les suivantes de ce fichier\n" "d - ne pas remiser cette section ni les suivantes de ce fichier\n" -#: add-patch.c:80 git-add--interactive.perl:1443 +#: add-patch.c:80 git-add--interactive.perl:1445 #, 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:81 git-add--interactive.perl:1444 +#: add-patch.c:81 git-add--interactive.perl:1446 #, 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:82 git-add--interactive.perl:1445 +#: add-patch.c:82 git-add--interactive.perl:1447 #, 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:1446 +#: add-patch.c:83 git-add--interactive.perl:1448 #, 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,?] ? " @@ -428,22 +428,22 @@ msgstr "" "a - désindexer cette section et toutes les suivantes de ce fichier\n" "d - ne pas désindexer cette section ni les suivantes de ce fichier\n" -#: add-patch.c:103 git-add--interactive.perl:1449 +#: add-patch.c:103 git-add--interactive.perl:1451 #, 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:104 git-add--interactive.perl:1450 +#: add-patch.c:104 git-add--interactive.perl:1452 #, 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:105 git-add--interactive.perl:1451 +#: add-patch.c:105 git-add--interactive.perl:1453 #, 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:1452 +#: add-patch.c:106 git-add--interactive.perl:1454 #, 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,?] ? " @@ -470,26 +470,26 @@ 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:126 git-add--interactive.perl:1455 -#: git-add--interactive.perl:1473 +#: add-patch.c:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, 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:127 git-add--interactive.perl:1456 -#: git-add--interactive.perl:1474 +#: add-patch.c:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, 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:128 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 #, 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:1458 -#: git-add--interactive.perl:1476 +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 #, 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,?] ? " @@ -516,23 +516,23 @@ 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:149 add-patch.c:194 git-add--interactive.perl:1461 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 #, 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:150 add-patch.c:195 git-add--interactive.perl:1462 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 #, 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:151 add-patch.c:196 git-add--interactive.perl:1463 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 #, 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:1464 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -552,27 +552,27 @@ msgstr "" "a - éliminer cette section et toutes les suivantes de ce fichier\n" "d - ne pas éliminer cette section ni les suivantes de ce fichier\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 #, 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:172 add-patch.c:217 git-add--interactive.perl:1468 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 #, 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:173 add-patch.c:218 git-add--interactive.perl:1469 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 #, 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:1470 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -712,7 +712,7 @@ 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:1247 git-add--interactive.perl:1242 +#: add-patch.c:1247 git-add--interactive.perl:1244 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -723,11 +723,11 @@ msgstr "" 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:1291 git-add--interactive.perl:1346 +#: add-patch.c:1291 git-add--interactive.perl:1348 msgid "Apply them to the worktree anyway? " msgstr "Les appliquer quand même à l'arbre de travail ? " -#: add-patch.c:1298 git-add--interactive.perl:1349 +#: add-patch.c:1298 git-add--interactive.perl:1351 msgid "Nothing was applied.\n" msgstr "Rien n'a été appliqué.\n" @@ -765,11 +765,11 @@ msgstr "Pas de section suivante" msgid "No other hunks to goto" msgstr "Aucune autre section à atteindre" -#: add-patch.c:1549 git-add--interactive.perl:1606 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk (<ret> to see more)? " msgstr "aller à quelle section (<ret> pour voir plus) ? " -#: add-patch.c:1550 git-add--interactive.perl:1608 +#: add-patch.c:1550 git-add--interactive.perl:1610 msgid "go to which hunk? " msgstr "aller à quelle section ? " @@ -789,7 +789,7 @@ msgstr[1] "Désolé, Seulement %d sections disponibles." msgid "No other hunks to search" msgstr "Aucune autre section à rechercher" -#: add-patch.c:1581 git-add--interactive.perl:1661 +#: add-patch.c:1581 git-add--interactive.perl:1663 msgid "search for regex? " msgstr "rechercher la regex ? " @@ -870,7 +870,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:209 builtin/merge.c:1379 +#: advice.c:209 builtin/merge.c:1382 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." @@ -971,21 +971,33 @@ msgstr "option d'espace non reconnue '%s'" msgid "unrecognized whitespace ignore option '%s'" msgstr "option d'ignorance d'espace non reconnue '%s'" -#: apply.c:136 -msgid "--reject and --3way cannot be used together." -msgstr "--reject et --3way ne peuvent pas être utilisés ensemble." - -#: apply.c:139 -msgid "--3way outside a repository" -msgstr "--3way hors d'un dépôt" - -#: apply.c:150 -msgid "--index outside a repository" -msgstr "--index hors d'un dépôt" - -#: apply.c:153 -msgid "--cached outside a repository" -msgstr "--cached hors d'un dépôt" +#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307 +#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870 +#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885 +#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541 +#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470 +#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757 +#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361 +#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155 +#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033 +#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560 +#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778 +#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073 +#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 +#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199 +#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426 +#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710 +#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316 +#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572 +#: builtin/worktree.c:702 +#, c-format +msgid "options '%s' and '%s' cannot be used together" +msgstr "les options '%s' et '%s' ne peuvent pas être utilisées ensemble" + +#: apply.c:139 apply.c:150 apply.c:153 +#, c-format +msgid "'%s' outside a repository" +msgstr "'%s' hors d'un dépôt" #: apply.c:800 #, c-format @@ -1206,8 +1218,8 @@ msgstr "le patch a échoué : %s:%ld" msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214 -#: setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214 +#: setup.c:309 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" @@ -1217,392 +1229,390 @@ msgstr "échec de la lecture de %s" msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" -#: apply.c:3442 apply.c:3709 +#: apply.c:3442 apply.c:3711 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: apply.c:3549 apply.c:3724 +#: apply.c:3549 apply.c:3726 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: apply.c:3558 apply.c:3732 apply.c:3976 +#: apply.c:3558 apply.c:3734 apply.c:3978 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: apply.c:3593 +#: apply.c:3595 msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "" "le dépôt n'a pas les blobs nécessaires pour effectuer une fusion à 3 points." -#: apply.c:3596 +#: apply.c:3598 #, c-format msgid "Performing three-way merge...\n" msgstr "Application d'une fusion à 3 points…\n" -#: apply.c:3612 apply.c:3616 +#: apply.c:3614 apply.c:3618 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossible de lire le contenu actuel de '%s'" -#: apply.c:3628 +#: apply.c:3630 #, c-format msgid "Failed to perform three-way merge...\n" msgstr "Échec de l'application de la fusion à 3 points…\n" -#: apply.c:3642 +#: apply.c:3644 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch %s appliqué avec des conflits.\n" -#: apply.c:3647 +#: apply.c:3649 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch %s appliqué proprement.\n" -#: apply.c:3664 +#: apply.c:3666 #, c-format msgid "Falling back to direct application...\n" msgstr "Retour à une application directe…\n" -#: apply.c:3676 +#: apply.c:3678 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: apply.c:3749 +#: apply.c:3751 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: apply.c:3751 +#: apply.c:3753 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905 -#: read-cache.c:1368 +#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918 +#: read-cache.c:1381 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: apply.c:3974 +#: apply.c:3976 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: apply.c:3978 +#: apply.c:3980 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: apply.c:3998 +#: apply.c:4000 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" -#: apply.c:4003 +#: apply.c:4005 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" -#: apply.c:4023 +#: apply.c:4025 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique" -#: apply.c:4027 +#: apply.c:4029 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: apply.c:4042 +#: apply.c:4044 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: apply.c:4134 +#: apply.c:4136 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "l'information sha1 est manquante ou inutilisable pour le sous-module %s" -#: apply.c:4141 +#: apply.c:4143 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle" -#: apply.c:4144 +#: apply.c:4146 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "l'information de sha1 est manquante ou inutilisable (%s)." -#: apply.c:4153 +#: apply.c:4155 #, c-format msgid "could not add %s to temporary index" msgstr "impossible d'ajouter %s à l'index temporaire" -#: apply.c:4163 +#: apply.c:4165 #, c-format msgid "could not write temporary index to %s" msgstr "impossible d'écrire l'index temporaire dans %s" -#: apply.c:4301 +#: apply.c:4303 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: apply.c:4335 +#: apply.c:4337 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: apply.c:4341 +#: apply.c:4343 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: apply.c:4349 +#: apply.c:4351 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "création du magasin de stockage pour le fichier nouvellement créé %s " "impossible" -#: apply.c:4355 apply.c:4500 +#: apply.c:4357 apply.c:4502 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241 -#: builtin/gc.c:2276 +#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258 +#: builtin/gc.c:2293 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" -#: apply.c:4402 +#: apply.c:4404 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: apply.c:4472 +#: apply.c:4474 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: apply.c:4570 +#: apply.c:4572 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: apply.c:4578 +#: apply.c:4580 msgid "internal error" msgstr "erreur interne" -#: apply.c:4581 +#: apply.c:4583 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." -#: apply.c:4592 +#: apply.c:4594 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408 +#: apply.c:4602 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" -#: apply.c:4614 +#: apply.c:4616 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: apply.c:4618 +#: apply.c:4620 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: apply.c:4747 +#: apply.c:4749 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traité." -#: apply.c:4755 -msgid "unrecognized input" -msgstr "entrée non reconnue" +#: apply.c:4758 +msgid "No valid patches in input (allow with \"--allow-empty\")" +msgstr "Pas de rustine valide sur l'entrée (permis avec \"--allow-empty\")" -#: apply.c:4775 +#: apply.c:4779 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: apply.c:4932 +#: apply.c:4936 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s' :%s" -#: apply.c:4959 +#: apply.c:4963 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erreur d'espace ignorée" msgstr[1] "%d erreurs d'espace ignorées" -#: apply.c:4965 apply.c:4980 +#: apply.c:4969 apply.c:4984 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ligne a ajouté des erreurs d'espace." msgstr[1] "%d lignes ont ajouté des erreurs d'espace." -#: apply.c:4973 +#: apply.c:4977 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace." msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace." -#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429 +#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: apply.c:5017 +#: apply.c:5021 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: apply.c:5020 +#: apply.c:5024 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:5022 builtin/am.c:2320 +#: apply.c:5026 builtin/am.c:2376 msgid "num" msgstr "num" -#: apply.c:5023 +#: apply.c:5027 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: apply.c:5026 +#: apply.c:5030 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: apply.c:5028 +#: apply.c:5032 msgid "instead of applying the patch, output diffstat for the input" msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" -#: apply.c:5032 +#: apply.c:5036 msgid "show number of added and deleted lines in decimal notation" msgstr "" "afficher le nombre de lignes ajoutées et supprimées en notation décimale" -#: apply.c:5034 +#: apply.c:5038 msgid "instead of applying the patch, output a summary for the input" msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée" -#: apply.c:5036 +#: apply.c:5040 msgid "instead of applying the patch, see if the patch is applicable" msgstr "au lieu d'appliquer le patch, voir si le patch est applicable" -#: apply.c:5038 +#: apply.c:5042 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" -#: apply.c:5040 +#: apply.c:5044 msgid "mark new files with `git add --intent-to-add`" msgstr "marquer les nouveaux fichiers `git add --intent-to-add`" -#: apply.c:5042 +#: apply.c:5046 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: apply.c:5044 +#: apply.c:5048 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: apply.c:5047 +#: apply.c:5051 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)" -#: apply.c:5049 +#: apply.c:5053 msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "" "tenter une fusion à 3 points, revenir à un rustinage normal en cas d'échec" -#: apply.c:5051 +#: apply.c:5055 msgid "build a temporary index based on embedded index information" msgstr "" "construire un index temporaire fondé sur l'information de l'index embarqué" -#: apply.c:5054 builtin/checkout-index.c:196 +#: apply.c:5058 builtin/checkout-index.c:196 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: apply.c:5056 +#: apply.c:5060 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299 +#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960 #: builtin/rebase.c:1051 msgid "action" msgstr "action" -#: apply.c:5058 +#: apply.c:5062 msgid "detect new or modified lines that have whitespace errors" msgstr "" "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs " "d'espace" -#: apply.c:5061 apply.c:5064 +#: apply.c:5065 apply.c:5068 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: apply.c:5067 +#: apply.c:5071 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: apply.c:5069 +#: apply.c:5073 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: apply.c:5071 +#: apply.c:5075 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: apply.c:5073 +#: apply.c:5077 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22 -#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120 -msgid "be verbose" -msgstr "mode verbeux" - -#: apply.c:5076 +#: apply.c:5080 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolérer des erreurs de détection de retours chariot manquants en fin de " "fichier" -#: apply.c:5079 +#: apply.c:5083 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au compte de lignes dans les en-têtes de section" -#: apply.c:5081 builtin/am.c:2308 +#: apply.c:5085 builtin/am.c:2364 msgid "root" msgstr "racine" -#: apply.c:5082 +#: apply.c:5086 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" +#: apply.c:5089 +msgid "don't return error for empty patches" +msgstr "ne pas renvoyer d'erreur pour les rustines vides" + #: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" @@ -1613,16 +1623,16 @@ msgstr "impossible de transmettre le blob %s en flux" msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "mode de fichier non supporté :0%o (SHA1: %s)" -#: archive-tar.c:450 +#: archive-tar.c:447 #, c-format msgid "unable to start '%s' filter" msgstr "impossible de démarrer le filtre '%s'" -#: archive-tar.c:453 +#: archive-tar.c:450 msgid "unable to redirect descriptor" msgstr "impossible de rediriger un descripteur" -#: archive-tar.c:460 +#: archive-tar.c:457 #, c-format msgid "'%s' filter reported error" msgstr "le filtre '%s' a retourné une erreur" @@ -1666,19 +1676,13 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:188 +#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238 +#: builtin/tag.c:578 #, c-format -msgid "cannot read %s" -msgstr "impossible de lire %s" - -#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114 -#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834 -#: builtin/merge.c:1145 -#, c-format -msgid "could not read '%s'" +msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334 +#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" @@ -1720,7 +1724,7 @@ msgstr "fmt" msgid "archive format" msgstr "format d'archive" -#: archive.c:552 builtin/log.c:1775 +#: archive.c:552 builtin/log.c:1790 msgid "prefix" msgstr "préfixe" @@ -1730,9 +1734,9 @@ msgstr "préfixer chaque chemin de fichier dans l'archive" #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 -#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103 -#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410 +#: builtin/fast-export.c:1181 builtin/fast-export.c:1183 +#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103 +#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190 msgid "file" msgstr "fichier" @@ -1762,7 +1766,7 @@ msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121 -#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512 +#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513 msgid "repo" msgstr "dépôt" @@ -1770,7 +1774,7 @@ msgstr "dépôt" msgid "retrieve the archive from remote repository <repo>" msgstr "récupérer l'archive depuis le dépôt distant <dépôt>" -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708 #: builtin/notes.c:496 msgid "command" msgstr "commande" @@ -1783,19 +1787,20 @@ msgstr "chemin vers la commande distante git-upload-archive" msgid "Unexpected option --remote" msgstr "Option --remote inattendue" -#: archive.c:580 -msgid "Option --exec can only be used together with --remote" -msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote" +#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544 +#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370 +#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115 +#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281 +#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144 +#: http-fetch.c:153 +#, c-format +msgid "the option '%s' requires '%s'" +msgstr "l'option '%s' requiert '%s'" #: archive.c:582 msgid "Unexpected option --output" msgstr "Option --output inattendue" -#: archive.c:584 -msgid "Options --add-file and --remote cannot be used together" -msgstr "" -"Les options --add-file et --remote ne peuvent pas être utilisées ensemble" - #: archive.c:606 #, c-format msgid "Unknown archive format '%s'" @@ -1904,7 +1909,7 @@ msgstr "une révision %s est nécessaire" msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" -#: bisect.c:985 builtin/merge.c:154 +#: bisect.c:985 builtin/merge.c:155 #, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" @@ -1958,10 +1963,10 @@ msgstr "" "--reverse et --first-parent ensemble nécessitent la spécification d'un " "dernier commit" -#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041 -#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114 -#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 -#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373 +#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158 +#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114 +#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071 +#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790 #: builtin/shortlog.c:255 msgid "revision walk setup failed" @@ -1984,110 +1989,94 @@ msgstr "pas de chemin %s dans %s" msgid "cannot read blob %s for path %s" msgstr "impossible de lire le blob %s pour le chemin %s" -#: branch.c:53 -#, c-format +#: branch.c:77 msgid "" -"\n" -"After fixing the error cause you may try to fix up\n" -"the remote tracking information by invoking\n" -"\"git branch --set-upstream-to=%s%s%s\"." +"cannot inherit upstream tracking configuration of multiple refs when " +"rebasing is requested" msgstr "" -"\n" -"Après correction de la cause de l'erreur, vous pouvez essayer de corriger\n" -"l'information de suivi distant en invoquant\n" -"\"git branch --set-upstream-to=%s%s%s\"." +"impossible d'hériter la configuration de suivi de référence amont depuis " +"plusieurs références quand un rebasage est demandé" -#: branch.c:67 +#: branch.c:88 #, c-format -msgid "Not setting branch %s as its own upstream." -msgstr "La branche %s ne peut pas être sa propre branche amont." +msgid "not setting branch '%s' as its own upstream" +msgstr "la branche %s ne peut pas être sa propre branche amont" -#: branch.c:93 +#: branch.c:144 #, c-format -msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." -msgstr "" -"La branche '%s' est paramétrée pour suivre la branche distante '%s' de '%s' " -"en rebasant." +msgid "branch '%s' set up to track '%s' by rebasing." +msgstr "la branche '%s' est paramétrée pour suivre '%s' en rebasant." -#: branch.c:94 +#: branch.c:145 #, c-format -msgid "Branch '%s' set up to track remote branch '%s' from '%s'." -msgstr "" -"La branche '%s' est paramétrée pour suivre la branche distante '%s' depuis " -"'%s'." +msgid "branch '%s' set up to track '%s'." +msgstr "la branche '%s' est paramétrée pour suivre '%s'." -#: branch.c:98 +#: branch.c:148 #, c-format -msgid "Branch '%s' set up to track local branch '%s' by rebasing." -msgstr "" -"La branche '%s' est paramétrée pour suivre la branche locale '%'s en " -"rebasant." +msgid "branch '%s' set up to track:" +msgstr "la branche '%s' est paramétrée pour suivre :" -#: branch.c:99 -#, c-format -msgid "Branch '%s' set up to track local branch '%s'." -msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'." +#: branch.c:160 +msgid "unable to write upstream branch configuration" +msgstr "échec de l'écriture de la configuration de branche amont" -#: branch.c:104 -#, c-format -msgid "Branch '%s' set up to track remote ref '%s' by rebasing." +#: branch.c:162 +msgid "" +"\n" +"After fixing the error cause you may try to fix up\n" +"the remote tracking information by invoking:" msgstr "" -"La branche '%s' est paramétrée pour suivre la référence distante '%s' en " -"rebasant." +"\n" +"Après correction de la cause de l'erreur, vous pouvez essayer\n" +"de corriger l'information de suivi distant en invoquant :" -#: branch.c:105 +#: branch.c:203 #, c-format -msgid "Branch '%s' set up to track remote ref '%s'." -msgstr "La branche '%s' est paramétrée pour suivre la référence distante '%s'." +msgid "asked to inherit tracking from '%s', but no remote is set" +msgstr "héritage de suivi depuis '%s' demandé, mais pas de distant configuré" -#: branch.c:109 +#: branch.c:209 #, c-format -msgid "Branch '%s' set up to track local ref '%s' by rebasing." +msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "" -"La branche '%s' est paramétrée pour suivre la référence locale '%s' en " -"rebasant." +"héritage de suivi depuis '%s' demandé, mais pas de configuration de fusion " +"renseignée" -#: branch.c:110 +#: branch.c:252 #, c-format -msgid "Branch '%s' set up to track local ref '%s'." -msgstr "La branche '%s' est paramétrée pour suivre la référence locale '%s'." - -#: branch.c:119 -msgid "Unable to write upstream branch configuration" -msgstr "Échec de l'écriture de la configuration de branche amont" +msgid "not tracking: ambiguous information for ref %s" +msgstr "pas de suivi : information ambiguë pour la référence %s" -#: branch.c:156 +#: branch.c:287 #, c-format -msgid "Not tracking: ambiguous information for ref %s" -msgstr "Pas de suivi : information ambiguë pour la référence %s" +msgid "'%s' is not a valid branch name" +msgstr "'%s' n'est pas un nom de branche valide" -#: branch.c:189 +#: branch.c:307 #, c-format -msgid "'%s' is not a valid branch name." -msgstr "'%s' n'est pas un nom de branche valide." +msgid "a branch named '%s' already exists" +msgstr "Une branche nommée '%s' existe déjà" -#: branch.c:208 +#: branch.c:313 #, c-format -msgid "A branch named '%s' already exists." -msgstr "Une branche nommée '%s' existe déjà." - -#: branch.c:213 -msgid "Cannot force update the current branch." -msgstr "Impossible de forcer la mise à jour de la branche courante." +msgid "cannot force update the branch '%s'checked out at '%s'" +msgstr "" +"impossible de forcer la mise à jour de la branche '%s' extraite dans '%s'" -#: branch.c:233 +#: branch.c:336 #, c-format -msgid "Cannot setup tracking information; starting point '%s' is not a branch." +msgid "cannot set up tracking information; starting point '%s' is not a branch" msgstr "" -"Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est " -"pas une branche." +"Impossible de configurer le suivi de branche ; le point de départ '%s' n'est " +"pas une branche" -#: branch.c:235 +#: branch.c:338 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la branche amont demandée '%s' n'existe pas" -#: branch.c:237 +#: branch.c:340 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -2107,27 +2096,28 @@ msgstr "" "sa jumelle distante, vous pouvez utiliser \"git push -u\"\n" "pour paramétrer le suivi distant en même temps que vous poussez." -#: branch.c:281 +#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377 +#: builtin/replace.c:423 builtin/replace.c:453 #, c-format -msgid "Not a valid object name: '%s'." -msgstr "Nom d'objet invalide : '%s'." +msgid "not a valid object name: '%s'" +msgstr "nom d'objet invalide : '%s'" -#: branch.c:301 +#: branch.c:404 #, c-format -msgid "Ambiguous object name: '%s'." -msgstr "Nom d'objet ambigu : '%s'." +msgid "ambiguous object name: '%s'" +msgstr "Nom d'objet ambigu : '%s'" -#: branch.c:306 +#: branch.c:409 #, c-format -msgid "Not a valid branch point: '%s'." -msgstr "Point d'embranchement invalide : '%s'." +msgid "not a valid branch point: '%s'" +msgstr "point d'embranchement invalide : '%s'" -#: branch.c:366 +#: branch.c:469 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' est déjà extrait dans '%s'" -#: branch.c:389 +#: branch.c:494 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "la HEAD de la copie de travail %s n'est pas mise à jour" @@ -2152,7 +2142,7 @@ msgstr "'%s' ne semble pas être un fichier colis v2 our v3" msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406 #: builtin/commit.c:862 #, c-format msgid "could not open '%s'" @@ -2211,7 +2201,7 @@ msgstr "version de colis non supportée %d" msgid "cannot write bundle version %d with algorithm %s" msgstr "impossible d'écrire une version de colis %d avec l'algorithme %s" -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" @@ -2248,7 +2238,7 @@ msgstr "ID de section dupliqué %<PRIx32>" msgid "final chunk has non-zero id %<PRIx32>" msgstr "la section finale a un id non nul %<PRIx32>" -#: color.c:329 +#: color.c:354 #, c-format msgid "invalid color value: %.*s" msgstr "valeur invalide de couleur : %.*s" @@ -2302,200 +2292,200 @@ msgstr "" msgid "unable to find all commit-graph files" msgstr "impossible de trouver tous les fichiers du graphe de commit" -#: commit-graph.c:746 commit-graph.c:783 +#: commit-graph.c:749 commit-graph.c:786 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "position de commit invalide. Le graphe de commit est vraisemblablement " "corrompu" -#: commit-graph.c:767 +#: commit-graph.c:770 #, c-format msgid "could not find commit %s" msgstr "impossible de trouver le commit %s" -#: commit-graph.c:800 +#: commit-graph.c:803 msgid "commit-graph requires overflow generation data but has none" msgstr "" "le graphe de commits requiert des données de génération de débordement mais " "n'en contient pas" -#: commit-graph.c:1105 builtin/am.c:1342 +#: commit-graph.c:1108 builtin/am.c:1369 #, c-format msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" -#: commit-graph.c:1367 builtin/pack-objects.c:3070 +#: commit-graph.c:1370 builtin/pack-objects.c:3070 #, c-format msgid "unable to get type of object %s" msgstr "impossible d'obtenir le type de l'objet %s" -#: commit-graph.c:1398 +#: commit-graph.c:1401 msgid "Loading known commits in commit graph" msgstr "Lecture des commits connus dans un graphe de commit" -#: commit-graph.c:1415 +#: commit-graph.c:1418 msgid "Expanding reachable commits in commit graph" msgstr "Expansion des commits joignables dans un graphe de commit" -#: commit-graph.c:1435 +#: commit-graph.c:1438 msgid "Clearing commit marks in commit graph" msgstr "Suppression les marques de commit dans le graphe de commits" -#: commit-graph.c:1454 +#: commit-graph.c:1457 msgid "Computing commit graph topological levels" msgstr "Calcul des niveaux topologiques du graphe de commits" -#: commit-graph.c:1507 +#: commit-graph.c:1510 msgid "Computing commit graph generation numbers" msgstr "Calcul des chiffres de génération du graphe de commits" -#: commit-graph.c:1588 +#: commit-graph.c:1591 msgid "Computing commit changed paths Bloom filters" msgstr "Calcul des filtres Bloom des chemins modifiés du commit" -#: commit-graph.c:1665 +#: commit-graph.c:1668 msgid "Collecting referenced commits" msgstr "Collecte des commits référencés" -#: commit-graph.c:1690 +#: commit-graph.c:1693 #, 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:1703 +#: commit-graph.c:1706 #, c-format msgid "error adding pack %s" msgstr "erreur à l'ajout du packet %s" -#: commit-graph.c:1707 +#: commit-graph.c:1710 #, c-format msgid "error opening index for %s" msgstr "erreur à l'ouverture de l'index pour %s" -#: commit-graph.c:1744 +#: commit-graph.c:1747 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:1762 +#: commit-graph.c:1765 msgid "Finding extra edges in commit graph" msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits" -#: commit-graph.c:1811 +#: commit-graph.c:1814 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:1842 midx.c:1146 +#: commit-graph.c:1845 midx.c:1149 #, 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:1855 +#: commit-graph.c:1858 msgid "unable to create temporary graph layer" msgstr "impossible de créer une couche de graphe temporaire" -#: commit-graph.c:1860 +#: commit-graph.c:1863 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "impossible de régler les droits partagés pour '%s'" -#: commit-graph.c:1917 +#: commit-graph.c:1920 #, 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:1953 +#: commit-graph.c:1956 msgid "unable to open commit-graph chain file" msgstr "impossible d'ouvrir le fichier de graphe de commit" -#: commit-graph.c:1969 +#: commit-graph.c:1972 msgid "failed to rename base commit-graph file" msgstr "échec du renommage du fichier de graphe de commits" -#: commit-graph.c:1989 +#: commit-graph.c:1992 msgid "failed to rename temporary commit-graph file" msgstr "impossible de renommer le fichier temporaire de graphe de commits" -#: commit-graph.c:2122 +#: commit-graph.c:2125 msgid "Scanning merged commits" msgstr "Analyse des commits de fusion" -#: commit-graph.c:2166 +#: commit-graph.c:2169 msgid "Merging commit-graph" msgstr "Fusion du graphe de commits" -#: commit-graph.c:2274 +#: commit-graph.c:2277 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé" -#: commit-graph.c:2381 +#: commit-graph.c:2384 msgid "too many commits to write graph" msgstr "trop de commits pour écrire un graphe" -#: commit-graph.c:2479 +#: commit-graph.c:2482 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:2489 +#: commit-graph.c:2492 #, 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:2499 commit-graph.c:2514 +#: commit-graph.c:2502 commit-graph.c:2517 #, 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:2506 +#: commit-graph.c:2509 #, 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:2524 +#: commit-graph.c:2527 msgid "Verifying commits in commit graph" msgstr "Verification des commits dans le graphe de commits" -#: commit-graph.c:2539 +#: commit-graph.c:2542 #, 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:2546 +#: commit-graph.c:2549 #, 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:2556 +#: commit-graph.c:2559 #, 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:2565 +#: commit-graph.c:2568 #, 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:2579 +#: commit-graph.c:2582 #, 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:2584 +#: commit-graph.c:2587 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2503,7 +2493,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:2588 +#: commit-graph.c:2591 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2511,22 +2501,22 @@ 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:2605 +#: commit-graph.c:2608 #, c-format msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" "la génération du graphe de commit pour le commit %s est %<PRIuMAX> < " "%<PRIuMAX>" -#: commit-graph.c:2611 +#: commit-graph.c:2614 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "la date de validation pour le commit %s dans le graphe de commit est " "%<PRIuMAX> != %<PRIuMAX>" -#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418 -#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457 +#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444 +#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" @@ -2556,27 +2546,27 @@ msgstr "" "Supprimez ce message en lançant\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1239 +#: commit.c:1241 #, 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:1243 +#: commit.c:1245 #, 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:1246 +#: commit.c:1248 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: commit.c:1249 +#: commit.c:1251 #, 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:1503 +#: commit.c:1505 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" @@ -2647,7 +2637,7 @@ msgstr "la clé ne contient pas de section: %s" msgid "key does not contain variable name: %s" msgstr "la clé ne contient pas de nom de variable : %s" -#: config.c:470 sequencer.c:2804 +#: config.c:470 sequencer.c:2806 #, c-format msgid "invalid key: %s" msgstr "clé invalide : %s" @@ -2809,148 +2799,148 @@ msgstr "core.commentChar ne devrait être qu'un unique caractère" msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1581 +#: config.c:1584 #, c-format msgid "malformed value for %s" msgstr "valeur mal formée pour %s" -#: config.c:1607 +#: config.c:1610 #, c-format msgid "malformed value for %s: %s" msgstr "valeur mal formée pour %s : %s" -#: config.c:1608 +#: config.c:1611 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "doit être parmi nothing, matching, simple, upstream ou current" -#: config.c:1669 builtin/pack-objects.c:4053 +#: config.c:1672 builtin/pack-objects.c:4053 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" -#: config.c:1792 +#: config.c:1795 #, c-format msgid "unable to load config blob object '%s'" msgstr "impossible de charger l'objet blob de config '%s'" -#: config.c:1795 +#: config.c:1798 #, c-format msgid "reference '%s' does not point to a blob" msgstr "la référence '%s' ne pointe pas sur un blob" -#: config.c:1813 +#: config.c:1816 #, c-format msgid "unable to resolve config blob '%s'" msgstr "impossible de résoudre le blob de config '%s'" -#: config.c:1858 +#: config.c:1861 #, c-format msgid "failed to parse %s" msgstr "échec de l'analyse de %s" -#: config.c:1914 +#: config.c:1917 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:2282 +#: config.c:2285 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:2456 +#: config.c:2459 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: config.c:2501 +#: config.c:2504 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et " "100" -#: config.c:2547 +#: config.c:2550 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "impossible d'analyser '%s' depuis le configuration en ligne de commande" -#: config.c:2549 +#: config.c:2552 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" -#: config.c:2633 +#: config.c:2637 #, c-format msgid "invalid section name '%s'" msgstr "nom de section invalide '%s'" -#: config.c:2665 +#: config.c:2669 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2694 +#: config.c:2698 #, c-format msgid "failed to write new configuration file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2946 config.c:3273 +#: config.c:2950 config.c:3277 #, c-format msgid "could not lock config file %s" msgstr "impossible de verrouiller le fichier de configuration %s" -#: config.c:2957 +#: config.c:2961 #, c-format msgid "opening %s" msgstr "ouverture de %s" -#: config.c:2994 builtin/config.c:361 +#: config.c:2998 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "motif invalide : %s" -#: config.c:3019 +#: config.c:3023 #, c-format msgid "invalid config file %s" msgstr "fichier de configuration invalide %s" -#: config.c:3032 config.c:3286 +#: config.c:3036 config.c:3290 #, c-format msgid "fstat on %s failed" msgstr "échec de fstat sur %s" -#: config.c:3043 +#: config.c:3047 #, c-format msgid "unable to mmap '%s'%s" msgstr "impossible de réaliser un mmap de '%s'%s" -#: config.c:3053 config.c:3291 +#: config.c:3057 config.c:3295 #, c-format msgid "chmod on %s failed" msgstr "échec de chmod sur %s" -#: config.c:3138 config.c:3388 +#: config.c:3142 config.c:3392 #, c-format msgid "could not write config file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:3172 +#: config.c:3176 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 +#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" -#: config.c:3264 +#: config.c:3268 #, c-format msgid "invalid section name: %s" msgstr "nom de section invalide : %s" -#: config.c:3431 +#: config.c:3435 #, c-format msgid "missing value for '%s'" msgstr "valeur manquante pour '%s'" @@ -3130,7 +3120,7 @@ msgstr "chemin étrange '%s' bloqué" msgid "unable to fork" msgstr "fork impossible" -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57 msgid "Checking connectivity" msgstr "Vérification de la connectivité" @@ -3438,18 +3428,18 @@ msgstr "" "Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un " "arbre de travail" -#: diff.c:157 +#: diff.c:158 #, 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:162 +#: diff.c:163 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Paramètre dirstat inconnu '%s'\n" -#: diff.c:298 +#: diff.c:299 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -3457,7 +3447,7 @@ msgstr "" "le paramètre de couleur de déplacement doit être parmi 'no', 'default', " "'blocks', 'zebra', 'dimmed-zebra' ou 'plain'" -#: diff.c:326 +#: diff.c:327 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -3467,7 +3457,7 @@ msgstr "" "space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-" "change'" -#: diff.c:334 +#: diff.c:335 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -3475,13 +3465,13 @@ msgstr "" "color-moved-ws : allow-indentation-change ne peut pas être combiné avec " "d'autres modes d'espace" -#: diff.c:411 +#: diff.c:412 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" -#: diff.c:471 +#: diff.c:472 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -3490,50 +3480,53 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:4290 +#: diff.c:4237 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:4642 -msgid "--name-only, --name-status, --check and -s are mutually exclusive" -msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" +#: diff.c:4589 +#, c-format +msgid "options '%s', '%s', '%s', and '%s' cannot be used together" +msgstr "" +"les options '%s', '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble" -#: diff.c:4645 -msgid "-G, -S and --find-object are mutually exclusive" -msgstr "-G, -S et --find-object sont mutuellement exclusifs" +#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506 +#, c-format +msgid "options '%s', '%s', and '%s' cannot be used together" +msgstr "les options '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble" -#: diff.c:4648 -msgid "" -"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +#: diff.c:4597 +#, c-format +msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" msgstr "" -"-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-regex " -"avec -S" +"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez " +"'%s' avec '%s'" -#: diff.c:4651 +#: diff.c:4601 +#, c-format msgid "" -"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " -"with -G and -S" +"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" msgstr "" -"--pickaxe-all et --find-object sont mutuellement exclusifs, utilisez --" -"pickaxe-all avec -G et -S" +"les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez " +"'%s' avec '%s' et '%s'" -#: diff.c:4730 +#: diff.c:4681 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:4778 +#: diff.c:4729 #, c-format msgid "invalid --stat value: %s" msgstr "valeur invalide de --stat : %s" -#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326 +#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277 #: parse-options.c:217 parse-options.c:221 #, c-format msgid "%s expects a numerical value" msgstr "%s attend une valeur numérique" -#: diff.c:4815 +#: diff.c:4766 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3542,42 +3535,42 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4900 +#: diff.c:4851 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de modification inconnue '%c' dans --diff-filter=%s" -#: diff.c:4924 +#: diff.c:4875 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valeur inconnue après ws-error-highlight=%.*s" -#: diff.c:4938 +#: diff.c:4889 #, c-format msgid "unable to resolve '%s'" msgstr "impossible de résoudre '%s'" -#: diff.c:4988 diff.c:4994 +#: diff.c:4939 diff.c:4945 #, c-format msgid "%s expects <n>/<m> form" msgstr "forme <n>/<m> attendue par %s" -#: diff.c:5006 +#: diff.c:4957 #, c-format msgid "%s expects a character, got '%s'" msgstr "caractère attendu par %s, '%s' trouvé" -#: diff.c:5027 +#: diff.c:4978 #, c-format msgid "bad --color-moved argument: %s" msgstr "mauvais argument --color-moved : %s" -#: diff.c:5046 +#: diff.c:4997 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode invalide '%s' dans --color-moved-ws" -#: diff.c:5086 +#: diff.c:5037 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3585,160 +3578,160 @@ msgstr "" "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " "\"histogram\"" -#: diff.c:5122 diff.c:5142 +#: diff.c:5073 diff.c:5093 #, c-format msgid "invalid argument to %s" msgstr "argument invalide pour %s" -#: diff.c:5246 +#: diff.c:5197 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "regex invalide fournie à -I : '%s'" -#: diff.c:5295 +#: diff.c:5246 #, 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:5351 +#: diff.c:5302 #, c-format msgid "bad --word-diff argument: %s" msgstr "mauvais argument pour --word-diff : %s" -#: diff.c:5387 +#: diff.c:5338 msgid "Diff output format options" msgstr "Options de format de sortie de diff" -#: diff.c:5389 diff.c:5395 +#: diff.c:5340 diff.c:5346 msgid "generate patch" msgstr "générer la rustine" -#: diff.c:5392 builtin/log.c:179 +#: diff.c:5343 builtin/log.c:179 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: diff.c:5397 diff.c:5511 diff.c:5518 +#: diff.c:5348 diff.c:5462 diff.c:5469 msgid "<n>" msgstr "<n>" -#: diff.c:5398 diff.c:5401 +#: diff.c:5349 diff.c:5352 msgid "generate diffs with <n> lines context" msgstr "générer les diffs avec <n> lignes de contexte" -#: diff.c:5403 +#: diff.c:5354 msgid "generate the diff in raw format" msgstr "générer le diff en format brut" -#: diff.c:5406 +#: diff.c:5357 msgid "synonym for '-p --raw'" msgstr "synonyme de '-p --raw'" -#: diff.c:5410 +#: diff.c:5361 msgid "synonym for '-p --stat'" msgstr "synonyme de '-p --stat'" -#: diff.c:5414 +#: diff.c:5365 msgid "machine friendly --stat" msgstr "--stat pour traitement automatique" -#: diff.c:5417 +#: diff.c:5368 msgid "output only the last line of --stat" msgstr "afficher seulement la dernière ligne de --stat" -#: diff.c:5419 diff.c:5427 +#: diff.c:5370 diff.c:5378 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5420 +#: diff.c:5371 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:5424 +#: diff.c:5375 msgid "synonym for --dirstat=cumulative" msgstr "synonyme pour --dirstat=cumulative" -#: diff.c:5428 +#: diff.c:5379 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonyme pour --dirstat=files,param1,param2..." -#: diff.c:5432 +#: diff.c:5383 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:5435 +#: diff.c:5386 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:5438 +#: diff.c:5389 msgid "show only names of changed files" msgstr "n'afficher que les noms de fichiers modifiés" -#: diff.c:5441 +#: diff.c:5392 msgid "show only names and status of changed files" msgstr "n'afficher que les noms et les status des fichiers modifiés" -#: diff.c:5443 +#: diff.c:5394 msgid "<width>[,<name-width>[,<count>]]" msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]" -#: diff.c:5444 +#: diff.c:5395 msgid "generate diffstat" msgstr "générer un diffstat" -#: diff.c:5446 diff.c:5449 diff.c:5452 +#: diff.c:5397 diff.c:5400 diff.c:5403 msgid "<width>" msgstr "<largeur>" -#: diff.c:5447 +#: diff.c:5398 msgid "generate diffstat with a given width" msgstr "générer un diffstat avec la largeur indiquée" -#: diff.c:5450 +#: diff.c:5401 msgid "generate diffstat with a given name width" msgstr "génerer un diffstat avec la largeur de nom indiquée" -#: diff.c:5453 +#: diff.c:5404 msgid "generate diffstat with a given graph width" msgstr "génerer un diffstat avec la largeur de graphe indiquée" -#: diff.c:5455 +#: diff.c:5406 msgid "<count>" msgstr "<compte>" -#: diff.c:5456 +#: diff.c:5407 msgid "generate diffstat with limited lines" msgstr "générer un diffstat avec des lignes limitées" -#: diff.c:5459 +#: diff.c:5410 msgid "generate compact summary in diffstat" msgstr "générer une résumé compact dans le diffstat" -#: diff.c:5462 +#: diff.c:5413 msgid "output a binary diff that can be applied" msgstr "produire un diff binaire qui peut être appliqué" -#: diff.c:5465 +#: diff.c:5416 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:5467 +#: diff.c:5418 msgid "show colored diff" msgstr "afficher un diff coloré" -#: diff.c:5468 +#: diff.c:5419 msgid "<kind>" msgstr "<sorte>" -#: diff.c:5469 +#: diff.c:5420 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3746,7 +3739,7 @@ msgstr "" "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', " "'nouveau' dans le diff" -#: diff.c:5472 +#: diff.c:5423 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3754,93 +3747,93 @@ msgstr "" "ne pas compresser les chemins et utiliser des NULs comme terminateurs de " "champs dans --raw ou --numstat" -#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590 +#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541 msgid "<prefix>" msgstr "<préfixe>" -#: diff.c:5476 +#: diff.c:5427 msgid "show the given source prefix instead of \"a/\"" msgstr "afficher le préfixe de source indiqué au lieu de \"a/\"" -#: diff.c:5479 +#: diff.c:5430 msgid "show the given destination prefix instead of \"b/\"" msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\"" -#: diff.c:5482 +#: diff.c:5433 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:5485 +#: diff.c:5436 msgid "do not show any source or destination prefix" msgstr "n'afficher aucun préfixe, ni de source, ni de destination" -#: diff.c:5488 +#: diff.c:5439 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:5492 diff.c:5497 diff.c:5502 +#: diff.c:5443 diff.c:5448 diff.c:5453 msgid "<char>" msgstr "<caractère>" -#: diff.c:5493 +#: diff.c:5444 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:5498 +#: diff.c:5449 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:5503 +#: diff.c:5454 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:5506 +#: diff.c:5457 msgid "Diff rename options" msgstr "Options de renommage de diff" -#: diff.c:5507 +#: diff.c:5458 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5508 +#: diff.c:5459 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:5512 +#: diff.c:5463 msgid "detect renames" msgstr "détecter les renommages" -#: diff.c:5516 +#: diff.c:5467 msgid "omit the preimage for deletes" msgstr "supprimer la pré-image pour les suppressions" -#: diff.c:5519 +#: diff.c:5470 msgid "detect copies" msgstr "détecter les copies" -#: diff.c:5523 +#: diff.c:5474 msgid "use unmodified files as source to find copies" msgstr "" "utiliser les fichiers non-modifiés comme sources pour trouver des copies" -#: diff.c:5525 +#: diff.c:5476 msgid "disable rename detection" msgstr "désactiver la détection de renommage" -#: diff.c:5528 +#: diff.c:5479 msgid "use empty blobs as rename source" msgstr "utiliser des blobs vides comme source de renommage" -#: diff.c:5530 +#: diff.c:5481 msgid "continue listing the history of a file beyond renames" msgstr "continuer à afficher l'historique d'un fichier au delà des renommages" -#: diff.c:5533 +#: diff.c:5484 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3848,165 +3841,165 @@ 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:5535 +#: diff.c:5486 msgid "Diff algorithm options" msgstr "Options de l'algorithme de diff" -#: diff.c:5537 +#: diff.c:5488 msgid "produce the smallest possible diff" msgstr "produire le diff le plus petit possible" -#: diff.c:5540 +#: diff.c:5491 msgid "ignore whitespace when comparing lines" msgstr "ignorer les espaces lors de la comparaison de ligne" -#: diff.c:5543 +#: diff.c:5494 msgid "ignore changes in amount of whitespace" msgstr "ignorer des modifications du nombre d'espaces" -#: diff.c:5546 +#: diff.c:5497 msgid "ignore changes in whitespace at EOL" msgstr "ignorer des modifications d'espace en fin de ligne" -#: diff.c:5549 +#: diff.c:5500 msgid "ignore carrier-return at the end of line" msgstr "ignore le retour chariot en fin de ligne" -#: diff.c:5552 +#: diff.c:5503 msgid "ignore changes whose lines are all blank" msgstr "ignorer les modifications dont les lignes sont vides" -#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624 +#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575 msgid "<regex>" msgstr "<regex>" -#: diff.c:5555 +#: diff.c:5506 msgid "ignore changes whose all lines match <regex>" msgstr "ignorer les modifications dont les lignes correspondent à <regex>" -#: diff.c:5558 +#: diff.c:5509 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:5561 +#: diff.c:5512 msgid "generate diff using the \"patience diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"patience\"" -#: diff.c:5565 +#: diff.c:5516 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" "générer un diff en utilisant l'algorithme de différence \"histogramme\"" -#: diff.c:5567 +#: diff.c:5518 msgid "<algorithm>" msgstr "<algorithme>" -#: diff.c:5568 +#: diff.c:5519 msgid "choose a diff algorithm" msgstr "choisir un algorithme de différence" -#: diff.c:5570 +#: diff.c:5521 msgid "<text>" msgstr "<texte>" -#: diff.c:5571 +#: diff.c:5522 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\"" -#: diff.c:5573 diff.c:5582 diff.c:5585 +#: diff.c:5524 diff.c:5533 diff.c:5536 msgid "<mode>" msgstr "<mode>" -#: diff.c:5574 +#: diff.c:5525 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:5577 +#: diff.c:5528 msgid "use <regex> to decide what a word is" msgstr "utiliser <regex> pour décider ce qu'est un mot" -#: diff.c:5580 +#: diff.c:5531 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5583 +#: diff.c:5534 msgid "moved lines of code are colored differently" msgstr "les lignes déplacées sont colorées différemment" -#: diff.c:5586 +#: diff.c:5537 msgid "how white spaces are ignored in --color-moved" msgstr "comment les espaces sont ignorés dans --color-moved" -#: diff.c:5589 +#: diff.c:5540 msgid "Other diff options" msgstr "Autres options diff" -#: diff.c:5591 +#: diff.c:5542 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:5595 +#: diff.c:5546 msgid "treat all files as text" msgstr "traiter les fichiers comme texte" -#: diff.c:5597 +#: diff.c:5548 msgid "swap two inputs, reverse the diff" msgstr "échanger les entrées, inverser le diff" -#: diff.c:5599 +#: diff.c:5550 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:5601 +#: diff.c:5552 msgid "disable all output of the program" msgstr "désactiver tous les affichages du programme" -#: diff.c:5603 +#: diff.c:5554 msgid "allow an external diff helper to be executed" msgstr "autoriser l'exécution d'un assistant externe de diff" -#: diff.c:5605 +#: diff.c:5556 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:5607 +#: diff.c:5558 msgid "<when>" msgstr "<quand>" -#: diff.c:5608 +#: diff.c:5559 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:5611 +#: diff.c:5562 msgid "<format>" msgstr "<format>" -#: diff.c:5612 +#: diff.c:5563 msgid "specify how differences in submodules are shown" msgstr "spécifier comment les différences dans les sous-modules sont affichées" -#: diff.c:5616 +#: diff.c:5567 msgid "hide 'git add -N' entries from the index" msgstr "masquer les entrées 'git add -N' de l'index" -#: diff.c:5619 +#: diff.c:5570 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:5621 +#: diff.c:5572 msgid "<string>" msgstr "<chaîne>" -#: diff.c:5622 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -4014,7 +4007,7 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la " "chaîne spécifiée" -#: diff.c:5625 +#: diff.c:5576 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -4022,38 +4015,38 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la regex " "spécifiée" -#: diff.c:5628 +#: diff.c:5579 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:5631 +#: diff.c:5582 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue" -#: diff.c:5634 +#: diff.c:5585 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:5635 diff.c:5638 +#: diff.c:5586 diff.c:5589 msgid "<path>" msgstr "<chemin>" -#: diff.c:5636 +#: diff.c:5587 msgid "show the change in the specified path first" msgstr "afficher la modification dans le chemin spécifié en premier" -#: diff.c:5639 +#: diff.c:5590 msgid "skip the output to the specified path" msgstr "sauter la sortie pour le chemin spécifié" -#: diff.c:5641 +#: diff.c:5592 msgid "<object-id>" msgstr "<id-objet>" -#: diff.c:5642 +#: diff.c:5593 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -4061,35 +4054,35 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de l'objet " "indiqué" -#: diff.c:5644 +#: diff.c:5595 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5645 +#: diff.c:5596 msgid "select files by diff type" msgstr "sélectionner les fichiers par types de diff" -#: diff.c:5647 +#: diff.c:5598 msgid "<file>" msgstr "<fichier>" -#: diff.c:5648 +#: diff.c:5599 msgid "Output to a specific file" msgstr "Sortie vers un fichier spécifié" -#: diff.c:6306 +#: diff.c:6257 msgid "exhaustive rename detection was skipped due to too many files." msgstr "" "détection exhaustive de renommage annulée à cause d'un trop grand nombre de " "fichiers." -#: diff.c:6309 +#: diff.c:6260 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:6312 +#: diff.c:6263 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -4134,29 +4127,29 @@ msgstr "" "votre fichier d'extraction partielle pourrait présenter des problèmes : le " "motif '%s' est répété" -#: dir.c:830 +#: dir.c:828 msgid "disabling cone pattern matching" msgstr "désactivation de la correspondance de motif de cone" -#: dir.c:1214 +#: dir.c:1212 #, c-format msgid "cannot use %s as an exclude file" msgstr "impossible d'utiliser %s comme fichier d'exclusion" -#: dir.c:2464 +#: dir.c:2418 #, c-format msgid "could not open directory '%s'" msgstr "impossible d'ouvrir le répertoire '%s'" -#: dir.c:2766 +#: dir.c:2720 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2890 +#: dir.c:2844 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:3158 +#: dir.c:3112 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -4164,38 +4157,38 @@ msgstr "" "Aucun nom de répertoire n'a pu être deviné\n" "Veuillez spécifier un répertoire dans la ligne de commande" -#: dir.c:3837 +#: dir.c:3800 #, c-format msgid "index file corrupt in repo %s" msgstr "fichier d'index corrompu dans le dépôt %s" -#: dir.c:3884 dir.c:3889 +#: dir.c:3847 dir.c:3852 #, c-format msgid "could not create directories for %s" msgstr "impossible de créer les répertoires pour %s" -#: dir.c:3918 +#: dir.c:3881 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" -#: editor.c:77 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" "suggestion : en attente de la fermeture du fichier par votre éditeur de " "texte…%c" -#: entry.c:177 +#: entry.c:179 msgid "Filtering content" msgstr "Filtrage du contenu" -#: entry.c:498 +#: entry.c:500 #, c-format msgid "could not stat file '%s'" msgstr "impossible de stat le fichier '%s'" -#: environment.c:143 +#: environment.c:145 #, c-format msgid "bad git namespace path \"%s\"" msgstr "espaces de nom de Git \"%s\"" @@ -4205,273 +4198,269 @@ msgstr "espaces de nom de Git \"%s\"" msgid "too many args to run %s" msgstr "trop d'arguments pour lancer %s" -#: fetch-pack.c:193 +#: fetch-pack.c:194 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack : liste superficielle attendue" -#: fetch-pack.c:196 +#: fetch-pack.c:197 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:207 +#: fetch-pack.c:208 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:227 +#: fetch-pack.c:228 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu" -#: fetch-pack.c:238 +#: fetch-pack.c:239 msgid "unable to write to remote" msgstr "impossible d'écrire sur un distant" -#: fetch-pack.c:299 -msgid "--stateless-rpc requires multi_ack_detailed" -msgstr "--stateless-rpc nécessite multi_ack_detailed" - -#: fetch-pack.c:394 fetch-pack.c:1434 +#: fetch-pack.c:395 fetch-pack.c:1439 #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalide : %s" -#: fetch-pack.c:400 fetch-pack.c:1440 +#: fetch-pack.c:401 fetch-pack.c:1445 #, c-format msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" -#: fetch-pack.c:402 fetch-pack.c:1442 +#: fetch-pack.c:403 fetch-pack.c:1447 #, c-format msgid "object not found: %s" msgstr "objet non trouvé : %s" -#: fetch-pack.c:405 fetch-pack.c:1445 +#: fetch-pack.c:406 fetch-pack.c:1450 #, c-format msgid "error in object: %s" msgstr "erreur dans l'objet : %s" -#: fetch-pack.c:407 fetch-pack.c:1447 +#: fetch-pack.c:408 fetch-pack.c:1452 #, c-format msgid "no shallow found: %s" msgstr "pas de superficiel trouvé : %s" -#: fetch-pack.c:410 fetch-pack.c:1451 +#: fetch-pack.c:411 fetch-pack.c:1456 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "superficiel/non superficiel attendu, %s trouvé" -#: fetch-pack.c:450 +#: fetch-pack.c:451 #, c-format msgid "got %s %d %s" msgstr "réponse %s %d %s" -#: fetch-pack.c:467 +#: fetch-pack.c:468 #, c-format msgid "invalid commit %s" msgstr "commit invalide %s" -#: fetch-pack.c:498 +#: fetch-pack.c:499 msgid "giving up" msgstr "abandon" -#: fetch-pack.c:511 progress.c:339 +#: fetch-pack.c:512 progress.c:339 msgid "done" msgstr "fait" -#: fetch-pack.c:523 +#: fetch-pack.c:524 #, c-format msgid "got %s (%d) %s" msgstr "%s trouvé (%d) %s" -#: fetch-pack.c:559 +#: fetch-pack.c:560 #, c-format msgid "Marking %s as complete" msgstr "Marquage de %s comme terminé" -#: fetch-pack.c:774 +#: fetch-pack.c:775 #, c-format msgid "already have %s (%s)" msgstr "%s déjà possédé (%s)" -#: fetch-pack.c:860 +#: fetch-pack.c:861 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral" -#: fetch-pack.c:868 +#: fetch-pack.c:869 msgid "protocol error: bad pack header" msgstr "erreur de protocole : mauvais entête de paquet" -#: fetch-pack.c:962 +#: fetch-pack.c:965 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack : impossible de dupliquer %s" -#: fetch-pack.c:968 +#: fetch-pack.c:971 msgid "fetch-pack: invalid index-pack output" msgstr "fetch-pack : sortie d'index de pack invalide" -#: fetch-pack.c:985 +#: fetch-pack.c:988 #, c-format msgid "%s failed" msgstr "échec de %s" -#: fetch-pack.c:987 +#: fetch-pack.c:990 msgid "error in sideband demultiplexer" msgstr "erreur dans le démultiplexer latéral" -#: fetch-pack.c:1030 +#: fetch-pack.c:1035 #, c-format msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053 -#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069 -#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085 -#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074 +#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090 +#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112 #, c-format msgid "Server supports %s" msgstr "Le serveur supporte %s" -#: fetch-pack.c:1040 +#: fetch-pack.c:1045 msgid "Server does not support shallow clients" msgstr "Le serveur ne supporte les clients superficiels" -#: fetch-pack.c:1100 +#: fetch-pack.c:1105 msgid "Server does not support --shallow-since" msgstr "Le receveur ne gère pas --shallow-since" -#: fetch-pack.c:1105 +#: fetch-pack.c:1110 msgid "Server does not support --shallow-exclude" msgstr "Le receveur ne gère pas --shallow-exclude" -#: fetch-pack.c:1109 +#: fetch-pack.c:1114 msgid "Server does not support --deepen" msgstr "Le receveur ne gère pas --deepen" -#: fetch-pack.c:1111 +#: fetch-pack.c:1116 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:1124 +#: fetch-pack.c:1129 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130 +#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130 msgid "source repository is shallow, reject to clone." msgstr "le dépôt source est superficiel, clonage rejeté." -#: fetch-pack.c:1139 fetch-pack.c:1671 +#: fetch-pack.c:1144 fetch-pack.c:1681 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." -#: fetch-pack.c:1253 +#: fetch-pack.c:1258 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "non-correspondance des algorithmes : client %s ; serveur %s" -#: fetch-pack.c:1257 +#: fetch-pack.c:1262 #, c-format msgid "the server does not support algorithm '%s'" msgstr "le serveur ne supporte pas l'algorithme '%s'" -#: fetch-pack.c:1290 +#: fetch-pack.c:1295 msgid "Server does not support shallow requests" msgstr "Le serveur ne supporte pas les requêtes superficielles" -#: fetch-pack.c:1297 +#: fetch-pack.c:1302 msgid "Server supports filter" msgstr "Le serveur supporte filter" -#: fetch-pack.c:1340 fetch-pack.c:2053 +#: fetch-pack.c:1345 fetch-pack.c:2063 msgid "unable to write request to remote" msgstr "impossible d'écrire la requête sur le distant" -#: fetch-pack.c:1358 +#: fetch-pack.c:1363 #, c-format msgid "error reading section header '%s'" msgstr "erreur à la lecture de l'entête de section '%s'" -#: fetch-pack.c:1364 +#: fetch-pack.c:1369 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' attendu, '%s' reçu" -#: fetch-pack.c:1398 +#: fetch-pack.c:1403 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "ligne d'acquittement inattendue : '%s'" -#: fetch-pack.c:1403 +#: fetch-pack.c:1408 #, c-format msgid "error processing acks: %d" msgstr "erreur lors du traitement des acquittements : %d" -#: fetch-pack.c:1413 +#: fetch-pack.c:1418 msgid "expected packfile to be sent after 'ready'" msgstr "fichier paquet attendu à envoyer après 'ready'" -#: fetch-pack.c:1415 +#: fetch-pack.c:1420 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:1456 +#: fetch-pack.c:1461 #, c-format msgid "error processing shallow info: %d" msgstr "erreur lors du traitement de l'information de superficialité : %d" -#: fetch-pack.c:1505 +#: fetch-pack.c:1510 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref attendu, '%s' trouvé" -#: fetch-pack.c:1510 +#: fetch-pack.c:1515 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inattendu : '%s'" -#: fetch-pack.c:1515 +#: fetch-pack.c:1520 #, c-format msgid "error processing wanted refs: %d" msgstr "erreur lors du traitement des références voulues : %d" -#: fetch-pack.c:1545 +#: fetch-pack.c:1550 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack : paquet de fin de réponse attendu" -#: fetch-pack.c:1949 +#: fetch-pack.c:1959 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1972 builtin/clone.c:581 +#: fetch-pack.c:1982 builtin/clone.c:581 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: fetch-pack.c:2075 +#: fetch-pack.c:2085 msgid "unexpected 'ready' from remote" msgstr "'ready' inattendu depuis le distant" -#: fetch-pack.c:2098 +#: fetch-pack.c:2108 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:2101 +#: fetch-pack.c:2111 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé" -#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902 -#: gpg-interface.c:918 +#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974 +#: gpg-interface.c:990 msgid "could not create temporary file" msgstr "impossible de créer un fichier temporaire" -#: gpg-interface.c:332 gpg-interface.c:454 +#: gpg-interface.c:332 gpg-interface.c:460 #, c-format msgid "failed writing detached signature to '%s'" msgstr "impossible d'écrire la signature détachée dans '%s'" -#: gpg-interface.c:445 +#: gpg-interface.c:451 msgid "" "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " "signature verification" @@ -4479,7 +4468,7 @@ msgstr "" "gpg.ssh.allowedSignersFile doit exister et être configuré pour la " "vérification de signature ssh" -#: gpg-interface.c:469 +#: gpg-interface.c:480 msgid "" "ssh-keygen -Y find-principals/verify is needed for ssh signature " "verification (available in openssh version 8.2p1+)" @@ -4487,56 +4476,56 @@ msgstr "" "ssh-keygen -Y -find-principals/verify est nécessaire pour la vérification de " "signature ssh (disponible depuis openssh version 8.2p1+)" -#: gpg-interface.c:523 +#: gpg-interface.c:536 #, c-format msgid "ssh signing revocation file configured but not found: %s" msgstr "fichier de révocation de signature ssh configuré mais non trouvé : %s" -#: gpg-interface.c:576 +#: gpg-interface.c:624 #, c-format msgid "bad/incompatible signature '%s'" msgstr "signature incompatible ou mauvaise '%s'" -#: gpg-interface.c:735 gpg-interface.c:740 +#: gpg-interface.c:801 gpg-interface.c:806 #, c-format msgid "failed to get the ssh fingerprint for key '%s'" msgstr "échec d'obtention de l'empreinte ssh pour la clé '%s'" -#: gpg-interface.c:762 +#: gpg-interface.c:829 msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "soit user.signingkey ou gpg.ssh.defaultKeyCommand doit être configuré" -#: gpg-interface.c:780 +#: gpg-interface.c:851 #, c-format msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" msgstr "" "gpg.ssh.defaultKeyCommand a réussi mais n'a retourné aucune clé : %s %s" -#: gpg-interface.c:786 +#: gpg-interface.c:857 #, c-format msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand a échoué : %s %s" -#: gpg-interface.c:874 +#: gpg-interface.c:945 msgid "gpg failed to sign the data" msgstr "gpg n'a pas pu signer les données" -#: gpg-interface.c:895 +#: gpg-interface.c:967 msgid "user.signingkey needs to be set for ssh signing" msgstr "user.signingkey doit être configuré pour pour signer avec ssh" -#: gpg-interface.c:906 +#: gpg-interface.c:978 #, c-format msgid "failed writing ssh signing key to '%s'" msgstr "impossible d'écrire la clé de signature ssh dans '%s'" -#: gpg-interface.c:924 +#: gpg-interface.c:996 #, c-format msgid "failed writing ssh signing key buffer to '%s'" msgstr "impossible d'écrire le tampon de la clé de signature ssh dans '%s'" -#: gpg-interface.c:942 +#: gpg-interface.c:1014 msgid "" "ssh-keygen -Y sign is needed for ssh signing (available in openssh version " "8.2p1+)" @@ -4544,7 +4533,7 @@ msgstr "" "ssh-keygen -Y signe est nécessaire pour pouvoir signer avec ssh (disponible " "dans openssh version 8.2p1+)" -#: gpg-interface.c:954 +#: gpg-interface.c:1026 #, c-format msgid "failed reading ssh signing data buffer from '%s'" msgstr "impossible de lire le tampon de données de signature ssh depuis '%s'" @@ -4554,7 +4543,7 @@ msgstr "impossible de lire le tampon de données de signature ssh depuis '%s'" msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "couleur invalide '%.*s' ignorée dans log.graphColors" -#: grep.c:533 +#: grep.c:531 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4562,18 +4551,18 @@ msgstr "" "le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est " "supporté qu'avec -P avec PCRE v2" -#: grep.c:1928 +#: grep.c:1942 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90 +#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: grep.c:1956 +#: grep.c:1970 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquée" @@ -4698,8 +4687,8 @@ msgstr "Continuons en supposant que vous avez voulu dire '%s'." #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" -msgstr "Lancer '%s' à la place ? (y/N)" +msgid "Run '%s' instead [y/N]? " +msgstr "Lancer '%s' à la place [y/N] ? " #: help.c:654 #, c-format @@ -4928,7 +4917,7 @@ msgstr "vidage attendu après les arguments ls-refs" msgid "quoted CRLF detected" msgstr "CRLF citées détectées" -#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46 +#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46 #, c-format msgid "bad action '%s' for '%s'" msgstr "action invalide '%s' pour '%s'" @@ -5166,7 +5155,7 @@ msgstr "sous-module" msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-ort.c:3856 +#: merge-ort.c:3869 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " @@ -5175,7 +5164,7 @@ msgstr "" "CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. " "Version %s de %s laissée dans l'arbre." -#: merge-ort.c:4152 +#: merge-ort.c:4165 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " @@ -5187,7 +5176,7 @@ msgstr "" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. -#: merge-ort.c:4521 +#: merge-ort.c:4534 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "échec de collecte l'information de fusion pour les arbres %s, %s, %s" @@ -5202,7 +5191,7 @@ msgstr "" "fusion :\n" " %s" -#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405 msgid "Already up to date." msgstr "Déjà à jour." @@ -5483,7 +5472,7 @@ msgstr "la fusion n'a pas retourné de commit" msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904 +#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906 #: builtin/stash.c:489 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -5492,8 +5481,8 @@ msgstr "Impossible d'écrire l'index." msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967 -#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706 +#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022 +#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706 #: builtin/stash.c:269 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" @@ -5502,164 +5491,164 @@ msgstr "impossible d'écrire le nouveau fichier d'index" msgid "multi-pack-index OID fanout is of the wrong size" msgstr "l'étalement de l'OID d'index multi-paquet n'a pas la bonne taille" -#: midx.c:109 +#: midx.c:111 #, c-format msgid "multi-pack-index file %s is too small" msgstr "le fichier d'index multi-paquet %s est trop petit" -#: midx.c:125 +#: midx.c:127 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" "la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature " "0x%08x" -#: midx.c:130 +#: midx.c:132 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "la version d'index multi-paquet %d n'est pas reconnue" -#: midx.c:135 +#: midx.c:137 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "" "la version d'empreinte d'index multi-paquet %u ne correspond pas à la " "version %u" -#: midx.c:152 +#: midx.c:154 msgid "multi-pack-index missing required pack-name chunk" msgstr "index multi-paquet manque de tronçon de nom de paquet" -#: midx.c:154 +#: midx.c:156 msgid "multi-pack-index missing required OID fanout chunk" msgstr "index multi-paquet manque de tronçon de d'étalement OID requis" -#: midx.c:156 +#: midx.c:158 msgid "multi-pack-index missing required OID lookup chunk" msgstr "index multi-paquet manque de tronçon de recherche OID requis" -#: midx.c:158 +#: midx.c:160 msgid "multi-pack-index missing required object offsets chunk" msgstr "index multi-paquet manque de tronçon de décalage d'objet requis" -#: midx.c:174 +#: midx.c:176 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'" -#: midx.c:221 +#: midx.c:224 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mauvais pack-int-id : %u (%u paquets au total)" -#: midx.c:271 +#: midx.c:274 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "l'index multi-paquet stock un décalage en 64-bit, mais off_t est trop petit" -#: midx.c:502 +#: midx.c:505 #, c-format msgid "failed to add packfile '%s'" msgstr "échec de l'ajout du fichier paquet '%s'" -#: midx.c:508 +#: midx.c:511 #, c-format msgid "failed to open pack-index '%s'" msgstr "échec à l'ouverture du fichier paquet '%s'" -#: midx.c:576 +#: midx.c:579 #, c-format msgid "failed to locate object %d in packfile" msgstr "échec de localisation de l'objet %d dans le fichier paquet" -#: midx.c:892 +#: midx.c:895 msgid "cannot store reverse index file" msgstr "impossible de stocker le fichier d'index inversé" -#: midx.c:990 +#: midx.c:993 #, c-format msgid "could not parse line: %s" msgstr "impossible d'analyser la ligne : %s" -#: midx.c:992 +#: midx.c:995 #, c-format msgid "malformed line: %s" msgstr "ligne malformée : %s" -#: midx.c:1159 +#: midx.c:1162 msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "" "index multi-paquet existant ignoré ; non-concordance de la somme de contrôle" -#: midx.c:1184 +#: midx.c:1187 msgid "could not load pack" msgstr "impossible de charger le paquet" -#: midx.c:1190 +#: midx.c:1193 #, c-format msgid "could not open index for %s" msgstr "impossible d'ouvrir l'index pour %s" -#: midx.c:1201 +#: midx.c:1204 msgid "Adding packfiles to multi-pack-index" msgstr "Ajout de fichiers paquet à un index multi-paquet" -#: midx.c:1244 +#: midx.c:1247 #, c-format msgid "unknown preferred pack: '%s'" msgstr "paquet préféré inconnu : %s" -#: midx.c:1289 +#: midx.c:1292 #, c-format msgid "cannot select preferred pack %s with no objects" msgstr "impossible de sélectionner le paquet préféré %s avec aucun objet" -#: midx.c:1321 +#: midx.c:1324 #, c-format msgid "did not see pack-file %s to drop" msgstr "fichier paquet à éliminer %s non trouvé" -#: midx.c:1367 +#: midx.c:1370 #, c-format msgid "preferred pack '%s' is expired" msgstr "le paquet préféré '%s' est expiré" -#: midx.c:1380 +#: midx.c:1383 msgid "no pack files to index." msgstr "aucun fichier paquet à l'index." -#: midx.c:1417 +#: midx.c:1420 msgid "could not write multi-pack bitmap" msgstr "impossible d'écrire le bitmap multi-paquet" -#: midx.c:1427 +#: midx.c:1430 msgid "could not write multi-pack-index" msgstr "échec de l'écriture de l'index de multi-paquet" -#: midx.c:1486 builtin/clean.c:37 +#: midx.c:1489 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "échec de la suppression de %s" -#: midx.c:1517 +#: midx.c:1522 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "échec du nettoyage de l'index de multi-paquet à %s" -#: midx.c:1577 +#: midx.c:1585 msgid "multi-pack-index file exists, but failed to parse" msgstr "le fichier d'index multi-paquet existe mais n'a pu être analysé" -#: midx.c:1585 +#: midx.c:1593 msgid "incorrect checksum" msgstr "somme de contrôle incorrecte" -#: midx.c:1588 +#: midx.c:1596 msgid "Looking for referenced packfiles" msgstr "Recherche de fichiers paquets référencés" -#: midx.c:1603 +#: midx.c:1611 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -5667,55 +5656,55 @@ msgstr "" "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = " "étalement[%d]" -#: midx.c:1608 +#: midx.c:1616 msgid "the midx contains no oid" msgstr "le midx ne contient aucun oid" -#: midx.c:1617 +#: midx.c:1625 msgid "Verifying OID order in multi-pack-index" msgstr "Vérification de l'ordre des OID dans l'index multi-paquet" -#: midx.c:1626 +#: midx.c:1634 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1646 +#: midx.c:1654 msgid "Sorting objects by packfile" msgstr "Classement des objets par fichier paquet" -#: midx.c:1653 +#: midx.c:1661 msgid "Verifying object offsets" msgstr "Vérification des décalages des objets" -#: midx.c:1669 +#: midx.c:1677 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s" -#: midx.c:1675 +#: midx.c:1683 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "impossible de lire le fichier paquet %s" -#: midx.c:1684 +#: midx.c:1692 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>" -#: midx.c:1709 +#: midx.c:1719 msgid "Counting referenced objects" msgstr "Comptage des objets référencés" -#: midx.c:1719 +#: midx.c:1729 msgid "Finding and deleting unreferenced packfiles" msgstr "Recherche et effacement des fichiers paquets non-référencés" -#: midx.c:1911 +#: midx.c:1921 msgid "could not start pack-objects" msgstr "impossible de démarrer le groupement d'objets" -#: midx.c:1931 +#: midx.c:1941 msgid "could not finish pack-objects" msgstr "impossible de finir le groupement d'objets" @@ -5773,261 +5762,261 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Mauvaise valeur de %s : '%s'" -#: object-file.c:459 +#: object-file.c:456 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates" -#: object-file.c:517 +#: object-file.c:514 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "impossible de normaliser le chemin d'objet alternatif : %s" -#: object-file.c:591 +#: object-file.c:588 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde" -#: object-file.c:598 +#: object-file.c:595 #, c-format msgid "unable to normalize object directory: %s" msgstr "impossible de normaliser le répertoire d'objet : %s" -#: object-file.c:641 +#: object-file.c:638 msgid "unable to fdopen alternates lockfile" msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives" -#: object-file.c:659 +#: object-file.c:656 msgid "unable to read alternates file" msgstr "lecture du fichier d'alternatives impossible" -#: object-file.c:666 +#: object-file.c:663 msgid "unable to move new alternates file into place" msgstr "impossible de déplacer le nouveau fichier d'alternative" -#: object-file.c:701 +#: object-file.c:741 #, c-format msgid "path '%s' does not exist" msgstr "le chemin '%s' n'existe pas" -#: object-file.c:722 +#: object-file.c:762 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "extraire le dépôt de référence '%s' comme une extraction liée n'est pas " "encore supporté." -#: object-file.c:728 +#: object-file.c:768 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "le dépôt de référence '%s' n'est pas un dépôt local." -#: object-file.c:734 +#: object-file.c:774 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: object-file.c:742 +#: object-file.c:782 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: object-file.c:773 +#: object-file.c:813 #, c-format msgid "could not find object directory matching %s" msgstr "impossible de trouver le répertoire objet correspondant à %s" -#: object-file.c:823 +#: object-file.c:863 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "ligne invalide pendant l'analyse des refs alternatives : %s" -#: object-file.c:973 +#: object-file.c:1013 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>" -#: object-file.c:1008 +#: object-file.c:1048 #, c-format msgid "mmap failed%s" msgstr "échec de mmap%s" -#: object-file.c:1174 +#: object-file.c:1214 #, c-format msgid "object file %s is empty" msgstr "le fichier objet %s est vide" -#: object-file.c:1293 object-file.c:2499 +#: object-file.c:1333 object-file.c:2542 #, c-format msgid "corrupt loose object '%s'" msgstr "objet libre corrompu '%s'" -#: object-file.c:1295 object-file.c:2503 +#: object-file.c:1335 object-file.c:2546 #, c-format msgid "garbage at end of loose object '%s'" msgstr "données incorrectes à la fin de l'objet libre '%s'" -#: object-file.c:1417 +#: object-file.c:1457 #, c-format msgid "unable to parse %s header" msgstr "impossible d'analyser l'entête %s" -#: object-file.c:1419 +#: object-file.c:1459 msgid "invalid object type" msgstr "type d'objet invalide" -#: object-file.c:1430 +#: object-file.c:1470 #, c-format msgid "unable to unpack %s header" msgstr "impossible de dépaqueter l'entête %s" -#: object-file.c:1434 +#: object-file.c:1474 #, c-format msgid "header for %s too long, exceeds %d bytes" msgstr "entête de %s trop long, attendu %d octets" -#: object-file.c:1664 +#: object-file.c:1704 #, c-format msgid "failed to read object %s" msgstr "impossible de lire l'objet %s" -#: object-file.c:1668 +#: object-file.c:1708 #, c-format msgid "replacement %s not found for %s" msgstr "remplacement %s non trouvé pour %s" -#: object-file.c:1672 +#: object-file.c:1712 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'objet libre %s (stocké dans %s) est corrompu" -#: object-file.c:1676 +#: object-file.c:1716 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu" -#: object-file.c:1781 +#: object-file.c:1821 #, c-format msgid "unable to write file %s" msgstr "impossible d'écrire le fichier %s" -#: object-file.c:1788 +#: object-file.c:1828 #, c-format msgid "unable to set permission to '%s'" msgstr "impossible de régler les droits de '%s'" -#: object-file.c:1795 +#: object-file.c:1835 msgid "file write error" msgstr "erreur d'écriture d'un fichier" -#: object-file.c:1815 +#: object-file.c:1858 msgid "error when closing loose object file" msgstr "erreur en fermeture du fichier d'objet esseulé" -#: object-file.c:1882 +#: object-file.c:1925 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "droits insuffisants pour ajouter un objet à la base de données %s du dépôt" -#: object-file.c:1884 +#: object-file.c:1927 msgid "unable to create temporary file" msgstr "impossible de créer un fichier temporaire" -#: object-file.c:1908 +#: object-file.c:1951 msgid "unable to write loose object file" msgstr "impossible d'écrire le fichier d'objet esseulé" -#: object-file.c:1914 +#: object-file.c:1957 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "impossible de compresser le nouvel objet %s (%d)" -#: object-file.c:1918 +#: object-file.c:1961 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "échec de deflateEnd sur l'objet %s (%d)" -#: object-file.c:1922 +#: object-file.c:1965 #, c-format msgid "confused by unstable object source data for %s" msgstr "données de source d'objet instable pour %s" -#: object-file.c:1933 builtin/pack-objects.c:1243 +#: object-file.c:1976 builtin/pack-objects.c:1243 #, c-format msgid "failed utime() on %s" msgstr "échec de utime() sur %s" -#: object-file.c:2011 +#: object-file.c:2054 #, c-format msgid "cannot read object for %s" msgstr "impossible de lire l'objet pour %s" -#: object-file.c:2062 +#: object-file.c:2105 msgid "corrupt commit" msgstr "commit corrompu" -#: object-file.c:2070 +#: object-file.c:2113 msgid "corrupt tag" msgstr "étiquette corrompue" -#: object-file.c:2170 +#: object-file.c:2213 #, c-format msgid "read error while indexing %s" msgstr "erreur de lecture à l'indexation de %s" -#: object-file.c:2173 +#: object-file.c:2216 #, c-format msgid "short read while indexing %s" msgstr "lecture tronquée pendant l'indexation de %s" -#: object-file.c:2246 object-file.c:2256 +#: object-file.c:2289 object-file.c:2299 #, c-format msgid "%s: failed to insert into database" msgstr "%s : échec de l'insertion dans la base de données" -#: object-file.c:2262 +#: object-file.c:2305 #, c-format msgid "%s: unsupported file type" msgstr "%s : type de fichier non supporté" -#: object-file.c:2286 builtin/fetch.c:1445 +#: object-file.c:2329 builtin/fetch.c:1448 #, c-format msgid "%s is not a valid object" msgstr "%s n'est pas un objet valide" -#: object-file.c:2288 +#: object-file.c:2331 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" -#: object-file.c:2315 +#: object-file.c:2358 #, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" -#: object-file.c:2510 +#: object-file.c:2553 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "incohérence de hachage pour %s (%s attendu)" -#: object-file.c:2533 +#: object-file.c:2576 #, c-format msgid "unable to mmap %s" msgstr "impossible de mmap %s" -#: object-file.c:2539 +#: object-file.c:2582 #, c-format msgid "unable to unpack header of %s" msgstr "impossible de dépaqueter l'entête de %s" -#: object-file.c:2544 +#: object-file.c:2587 #, c-format msgid "unable to parse header of %s" msgstr "impossible d'analyser l'entête de %s" -#: object-file.c:2555 +#: object-file.c:2598 #, c-format msgid "unable to unpack contents of %s" msgstr "impossible de dépaqueter le contenu de %s" @@ -6158,25 +6147,25 @@ msgstr "impossible d'analyser l'objet : %s" msgid "hash mismatch %s" msgstr "incohérence de hachage %s" -#: pack-bitmap.c:348 +#: pack-bitmap.c:353 msgid "multi-pack bitmap is missing required reverse index" msgstr "l'index inverse requis manque dans l'index multi-paquet" -#: pack-bitmap.c:424 +#: pack-bitmap.c:429 msgid "load_reverse_index: could not open pack" msgstr "load_reverse_index : impossible d'ouvrir le paquet" -#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424 +#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424 #, c-format msgid "unable to get size of %s" msgstr "impossible de récupérer la taille de %s" -#: pack-bitmap.c:1916 +#: pack-bitmap.c:1935 #, c-format msgid "could not find %s in pack %s at offset %<PRIuMAX>" msgstr "impossible de trouver %s dans le paquet %s à l'offset %<PRIuMAX>" -#: pack-bitmap.c:1952 builtin/rev-list.c:92 +#: pack-bitmap.c:1971 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "impossible de récupérer l'utilisation du disque de %s" @@ -6225,46 +6214,51 @@ msgstr "échec de rendre %s lisible" msgid "could not write '%s' promisor file" msgstr "impossible d'écrire le fichier de prometteur '%s'" -#: packfile.c:626 +#: packfile.c:627 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" -#: packfile.c:656 +#: packfile.c:657 #, c-format msgid "packfile %s cannot be mapped%s" msgstr "le fichier paquet %s ne peut être mmap%s" -#: packfile.c:1923 +#: packfile.c:1924 #, 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:1927 +#: packfile.c:1928 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)" -#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175 +#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175 #, c-format msgid "option `%s' expects a numerical value" msgstr "l'option '%s' attend une valeur numérique" -#: parse-options-cb.c:41 +#: parse-options-cb.c:42 #, c-format msgid "malformed expiration date '%s'" msgstr "date d'expiration malformée : '%s'" -#: parse-options-cb.c:54 +#: parse-options-cb.c:55 #, c-format msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\"" -#: parse-options-cb.c:132 parse-options-cb.c:149 +#: parse-options-cb.c:133 parse-options-cb.c:150 #, c-format msgid "malformed object name '%s'" msgstr "nom d'objet malformé '%s'" +#: parse-options-cb.c:307 +#, c-format +msgid "option `%s' expects \"%s\" or \"%s\"" +msgstr "l'option '%s' attend \"%s\" ou \"%s\"" + #: parse-options.c:58 #, c-format msgid "%s requires a value" @@ -6300,36 +6294,36 @@ msgstr "%s attend une valeur entière non négative avec une suffixe k/m/g" msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)" -#: parse-options.c:427 parse-options.c:435 +#: parse-options.c:428 parse-options.c:436 #, c-format msgid "did you mean `--%s` (with two dashes)?" msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?" -#: parse-options.c:677 parse-options.c:1053 +#: parse-options.c:678 parse-options.c:1054 #, c-format msgid "alias of --%s" msgstr "alias pour --%s" -#: parse-options.c:891 +#: parse-options.c:892 #, c-format msgid "unknown option `%s'" msgstr "option inconnue « %s »" -#: parse-options.c:893 +#: parse-options.c:894 #, c-format msgid "unknown switch `%c'" msgstr "bascule inconnue « %c »" -#: parse-options.c:895 +#: parse-options.c:896 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "option non-ascii inconnue dans la chaîne : '%s'" -#: parse-options.c:919 +#: parse-options.c:920 msgid "..." msgstr "..." -#: parse-options.c:933 +#: parse-options.c:934 #, c-format msgid "usage: %s" msgstr "usage : %s" @@ -6337,7 +6331,7 @@ msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:948 +#: parse-options.c:949 #, c-format msgid " or: %s" msgstr " ou : %s" @@ -6361,17 +6355,17 @@ msgstr " ou : %s" #. translated) N_() usage string, which contained embedded #. newlines before we split it up. #. -#: parse-options.c:969 +#: parse-options.c:970 #, c-format msgid "%*s%s" msgstr "%*s%s" -#: parse-options.c:992 +#: parse-options.c:993 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:1039 +#: parse-options.c:1040 msgid "-NUM" msgstr "-NUM" @@ -6507,17 +6501,17 @@ msgstr "erreur de lecture" msgid "the remote end hung up unexpectedly" msgstr "l'hôte distant a fermé la connexion de manière inattendue" -#: pkt-line.c:390 pkt-line.c:392 +#: pkt-line.c:417 pkt-line.c:419 #, 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:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417 +#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444 #, c-format msgid "protocol error: bad line length %d" msgstr "erreur de protocole : mauvaise longueur de ligne %d" -#: pkt-line.c:434 sideband.c:165 +#: pkt-line.c:472 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "erreur distante : %s" @@ -6572,7 +6566,7 @@ msgstr "impossible de démarrer `log`" msgid "could not read `log` output" msgstr "impossible de lire la sortie de `log`" -#: range-diff.c:97 sequencer.c:5605 +#: range-diff.c:97 sequencer.c:5602 #, c-format msgid "could not parse commit '%s'" msgstr "impossible d'analyser le commit '%s'" @@ -6595,61 +6589,57 @@ msgstr "impossible d'analyser l'entête git '%.*s'" msgid "failed to generate diff" msgstr "échec de la génération de diff" -#: range-diff.c:559 -msgid "--left-only and --right-only are mutually exclusive" -msgstr "--left-only et --right-only sont mutuellement exclusifs" - #: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "impossible d'analyser le journal pour '%s'" -#: read-cache.c:710 +#: read-cache.c:723 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "pas d'ajout d'alias de fichier '%s'(« %s » existe déjà dans l'index)" -#: read-cache.c:726 +#: read-cache.c:739 msgid "cannot create an empty blob in the object database" msgstr "impossible de créer un blob vide dans la base de donnée d'objets" -#: read-cache.c:748 +#: read-cache.c:761 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s : ne peut ajouter que des fichiers normaux, des liens symboliques ou des " "répertoires git" -#: read-cache.c:753 builtin/submodule--helper.c:3241 +#: read-cache.c:766 builtin/submodule--helper.c:3242 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' n'a pas de commit extrait" -#: read-cache.c:805 +#: read-cache.c:818 #, c-format msgid "unable to index file '%s'" msgstr "indexation du fichier '%s' impossible" -#: read-cache.c:824 +#: read-cache.c:837 #, c-format msgid "unable to add '%s' to index" msgstr "impossible d'ajouter '%s' à l'index" -#: read-cache.c:835 +#: read-cache.c:848 #, c-format msgid "unable to stat '%s'" msgstr "fstat de '%s' impossible" -#: read-cache.c:1373 +#: read-cache.c:1386 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' existe à la fois comme un fichier et un répertoire" -#: read-cache.c:1588 +#: read-cache.c:1601 msgid "Refresh index" msgstr "Rafraîchir l'index" -#: read-cache.c:1720 +#: read-cache.c:1733 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -6658,7 +6648,7 @@ msgstr "" "index.version renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1730 +#: read-cache.c:1743 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -6667,143 +6657,143 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1786 +#: read-cache.c:1799 #, c-format msgid "bad signature 0x%08x" msgstr "signature incorrecte 0x%08x" -#: read-cache.c:1789 +#: read-cache.c:1802 #, c-format msgid "bad index version %d" msgstr "mauvaise version d'index %d" -#: read-cache.c:1798 +#: read-cache.c:1811 msgid "bad index file sha1 signature" msgstr "mauvaise signature sha1 d'index" -#: read-cache.c:1832 +#: read-cache.c:1845 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "l'index utilise l'extension %.4s qui n'est pas comprise" -#: read-cache.c:1834 +#: read-cache.c:1847 #, c-format msgid "ignoring %.4s extension" msgstr "extension %.4s ignorée" -#: read-cache.c:1871 +#: read-cache.c:1884 #, c-format msgid "unknown index entry format 0x%08x" msgstr "format d'entrée d'index inconnu 0x%08x" -#: read-cache.c:1887 +#: read-cache.c:1900 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "champ de nom malformé dans l'index, près du chemin '%s'" -#: read-cache.c:1944 +#: read-cache.c:1957 msgid "unordered stage entries in index" msgstr "entrées de préparation non ordonnées dans l'index" -#: read-cache.c:1947 +#: read-cache.c:1960 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "entrées multiples de préparation pour le fichier fusionné '%s'" -#: read-cache.c:1950 +#: read-cache.c:1963 #, c-format msgid "unordered stage entries for '%s'" msgstr "entrées de préparation non ordonnées pour '%s'" -#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095 -#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183 -#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987 +#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183 +#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519 -#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293 -#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201 +#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293 +#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: read-cache.c:2209 +#: read-cache.c:2222 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "impossible de créer le fil load_cache_entries : %s" -#: read-cache.c:2222 +#: read-cache.c:2235 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "impossible de joindre le fil load_cache_entries : %s" -#: read-cache.c:2255 +#: read-cache.c:2268 #, c-format msgid "%s: index file open failed" msgstr "%s : l'ouverture du fichier d'index a échoué" -#: read-cache.c:2259 +#: read-cache.c:2272 #, c-format msgid "%s: cannot stat the open index" msgstr "%s : impossible de faire un stat sur l'index ouvert" -#: read-cache.c:2263 +#: read-cache.c:2276 #, c-format msgid "%s: index file smaller than expected" msgstr "%s : fichier d'index plus petit qu'attendu" -#: read-cache.c:2267 +#: read-cache.c:2280 #, c-format msgid "%s: unable to map index file%s" msgstr "%s : impossible de mapper le fichier d'index%s" -#: read-cache.c:2310 +#: read-cache.c:2323 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "impossible de créer le fil load_index_extensions : %s" -#: read-cache.c:2337 +#: read-cache.c:2350 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "impossible de joindre le fil load_index_extensions : %s" -#: read-cache.c:2375 +#: read-cache.c:2396 #, c-format msgid "could not freshen shared index '%s'" msgstr "impossible de rafraîchir l'index partagé '%s'" -#: read-cache.c:2434 +#: read-cache.c:2455 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "index cassé, %s attendu dans %s, %s obtenu" -#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147 +#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: read-cache.c:3108 +#: read-cache.c:3129 msgid "failed to convert to a sparse-index" msgstr "échec de conversion d'un index clairsemé" -#: read-cache.c:3179 +#: read-cache.c:3200 #, c-format msgid "could not stat '%s'" msgstr "impossible de stat '%s'" -#: read-cache.c:3192 +#: read-cache.c:3213 #, c-format msgid "unable to open git dir: %s" msgstr "impossible d'ouvrir le répertoire git : %s" -#: read-cache.c:3204 +#: read-cache.c:3225 #, c-format msgid "unable to unlink: %s" msgstr "échec lors de l'unlink : %s" -#: read-cache.c:3233 +#: read-cache.c:3254 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "impossible de régler les bits de droit de '%s'" -#: read-cache.c:3390 +#: read-cache.c:3411 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s : impossible de revenir à l'étape 0" @@ -6925,8 +6915,8 @@ msgstr "" "Cependant, si vous effacez tout, le rebasage sera annulé.\n" "\n" -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888 -#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883 +#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791 #: builtin/rebase.c:190 #, c-format msgid "could not write '%s'" @@ -6970,7 +6960,7 @@ msgid "%s: 'preserve' superseded by 'merges'" msgstr "%s : 'preserve' a été remplacé par 'merges'" # à priori on parle d'une branche ici -#: ref-filter.c:42 wt-status.c:2036 +#: ref-filter.c:42 wt-status.c:2048 msgid "gone" msgstr "disparue" @@ -7009,7 +6999,8 @@ msgstr "Valeur entière attendue refname:lstrip=%s" msgid "Integer value expected refname:rstrip=%s" msgstr "Valeur entière attendue refname:rstrip=%s" -#: ref-filter.c:265 +#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431 +#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argument %%(%s) non reconnu : %s" @@ -7019,11 +7010,6 @@ msgstr "argument %%(%s) non reconnu : %s" msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) n'accepte pas d'argument" -#: ref-filter.c:344 -#, c-format -msgid "unrecognized %%(objectsize) argument: %s" -msgstr "argument %%(objectsize) non reconnu : %s" - #: ref-filter.c:352 #, c-format msgid "%%(deltabase) does not take arguments" @@ -7034,11 +7020,6 @@ msgstr "%%(deltabase) n'accepte pas d'argument" msgid "%%(body) does not take arguments" msgstr "%%(body) n'accepte pas d'argument" -#: ref-filter.c:377 -#, c-format -msgid "unrecognized %%(subject) argument: %s" -msgstr "argument %%(subject) non reconnu : %s" - #: ref-filter.c:396 #, c-format msgid "expected %%(trailers:key=<value>)" @@ -7054,26 +7035,11 @@ msgstr "argument %%(trailers) inconnu : %s" msgid "positive value expected contents:lines=%s" msgstr "valeur positive attendue contents:lines=%s" -#: ref-filter.c:431 -#, c-format -msgid "unrecognized %%(contents) argument: %s" -msgstr "argument %%(contents) non reconnu : %s" - -#: ref-filter.c:443 -#, c-format -msgid "unrecognized %%(raw) argument: %s" -msgstr "argument %%(raw) non reconnu : %s" - #: ref-filter.c:458 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "valeur positive attendue '%s' dans %%(%s)" -#: ref-filter.c:462 -#, c-format -msgid "unrecognized argument '%s' in %%(%s)" -msgstr "argument '%s' non reconnu dans %%(%s)" - #: ref-filter.c:476 #, c-format msgid "unrecognized email option: %s" @@ -7094,21 +7060,11 @@ msgstr "position non reconnue : %s" msgid "unrecognized width:%s" msgstr "largeur non reconnue : %s" -#: ref-filter.c:534 -#, c-format -msgid "unrecognized %%(align) argument: %s" -msgstr "argument %%(align) non reconnu : %s" - #: ref-filter.c:542 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "valeur positive attendue avec l'atome %%(align)" -#: ref-filter.c:560 -#, c-format -msgid "unrecognized %%(if) argument: %s" -msgstr "argument %%(if) non reconnu : %s" - #: ref-filter.c:568 #, c-format msgid "%%(rest) does not take arguments" @@ -7131,15 +7087,10 @@ msgid "" msgstr "" "pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet" -#: ref-filter.c:844 +#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948 #, c-format -msgid "format: %%(if) atom used without a %%(then) atom" -msgstr "format : atome %%(if) utilisé sans un atome %%(then)" - -#: ref-filter.c:910 -#, c-format -msgid "format: %%(then) atom used without an %%(if) atom" -msgstr "format : atome %%(then) utilisé sans un atome %%(if)" +msgid "format: %%(%s) atom used without a %%(%s) atom" +msgstr "format : atome %%(%s) utilisé sans un atome %%(%s)" #: ref-filter.c:912 #, c-format @@ -7151,16 +7102,6 @@ msgstr "format : atome %%(then) utilisé plus d'une fois" msgid "format: %%(then) atom used after %%(else)" msgstr "format: atome %%(then) utilisé après %%(else)" -#: ref-filter.c:946 -#, c-format -msgid "format: %%(else) atom used without an %%(if) atom" -msgstr "format : atome %%(else) utilisé sans un atome %%(if)" - -#: ref-filter.c:948 -#, c-format -msgid "format: %%(else) atom used without a %%(then) atom" -msgstr "format : atome %%(else) utilisé sans un atome %%(then)" - #: ref-filter.c:950 #, c-format msgid "format: %%(else) atom used more than once" @@ -7235,22 +7176,22 @@ msgstr "objet malformé à '%s'" msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:2250 refs.c:673 +#: ref-filter.c:2250 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" -#: ref-filter.c:2623 +#: ref-filter.c:2629 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:2726 +#: ref-filter.c:2740 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: ref-filter.c:2731 +#: ref-filter.c:2745 #, c-format msgid "option `%s' must point to a commit" msgstr "l'option '%s' doit pointer sur un commit" @@ -7295,71 +7236,71 @@ msgstr "impossible de récupérer `%s`" msgid "invalid branch name: %s = %s" msgstr "nom de branche invalide : %s = %s" -#: refs.c:671 +#: refs.c:674 #, c-format msgid "ignoring dangling symref %s" msgstr "symref pendant %s ignoré" -#: refs.c:920 +#: refs.c:925 #, 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:927 +#: refs.c:932 #, 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:992 +#: refs.c:997 #, c-format msgid "log for %s is empty" msgstr "le journal pour la réf %s est vide" -#: refs.c:1084 +#: refs.c:1090 #, 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:1155 +#: refs.c:1168 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "échec de update_ref pour la réf '%s' : %s" -#: refs.c:2062 +#: refs.c:2069 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "mises à jour multiples pour la réf '%s' non permises" -#: refs.c:2142 +#: refs.c:2152 msgid "ref updates forbidden inside quarantine environment" msgstr "mises à jour des références interdites en environnement de quarantaine" -#: refs.c:2153 +#: refs.c:2163 msgid "ref updates aborted by hook" msgstr "mises à jour des références annulées par le crochet" -#: refs.c:2253 refs.c:2283 +#: refs.c:2271 refs.c:2301 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe ; impossible de créer '%s'" -#: refs.c:2259 refs.c:2294 +#: refs.c:2277 refs.c:2312 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "impossible de traiter '%s' et '%s' en même temps" -#: refs/files-backend.c:1271 +#: refs/files-backend.c:1268 #, c-format msgid "could not remove reference %s" msgstr "impossible de supprimer la référence %s" -#: refs/files-backend.c:1285 refs/packed-backend.c:1549 +#: refs/files-backend.c:1282 refs/packed-backend.c:1549 #: refs/packed-backend.c:1559 #, c-format msgid "could not delete reference %s: %s" msgstr "impossible de supprimer la référence %s : %s" -#: refs/files-backend.c:1288 refs/packed-backend.c:1562 +#: refs/files-backend.c:1285 refs/packed-backend.c:1562 #, c-format msgid "could not delete references: %s" msgstr "impossible de supprimer les références : %s" @@ -7369,52 +7310,52 @@ msgstr "impossible de supprimer les références : %s" msgid "invalid refspec '%s'" msgstr "spécificateur de réference invalide : '%s'" -#: remote.c:351 +#: remote.c:402 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" "un raccourci de configuration de distant ne peut pas commencer par '/' : %s" -#: remote.c:399 +#: remote.c:450 msgid "more than one receivepack given, using the first" msgstr "plus d'un receivepack fournis, utilisation du premier" -#: remote.c:407 +#: remote.c:458 msgid "more than one uploadpack given, using the first" msgstr "plus d'un uploadpack fournis, utilisation du premier" -#: remote.c:590 +#: remote.c:699 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Impossible de récupérer à la fois %s et %s pour %s" -#: remote.c:594 +#: remote.c:703 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:598 +#: remote.c:707 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#: remote.c:666 +#: remote.c:775 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "la clé '%s' du modèle n'a pas de '*'" -#: remote.c:676 +#: remote.c:785 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "la valeur '%s' du modèle n'a pas de '*'" -#: remote.c:1083 +#: remote.c:1192 #, c-format msgid "src refspec %s does not match any" msgstr "" "le spécificateur de référence source %s ne correspond à aucune référence" -#: remote.c:1088 +#: remote.c:1197 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -7424,7 +7365,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1103 +#: remote.c:1212 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -7448,7 +7389,7 @@ msgstr "" "Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence " "totalement qualifiée." -#: remote.c:1123 +#: remote.c:1232 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -7459,7 +7400,7 @@ msgstr "" "Souhaitiez-vous créer une nouvelle branche en poussant sur\n" "'%s:refs/heads/%s' ?" -#: remote.c:1128 +#: remote.c:1237 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -7470,7 +7411,7 @@ msgstr "" "Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1133 +#: remote.c:1242 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -7481,7 +7422,7 @@ msgstr "" "Souhaitiez-vous créer un nouvel arbre en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1138 +#: remote.c:1247 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -7492,119 +7433,119 @@ msgstr "" "Souhaitiez-vous créer un nouveau blob en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1174 +#: remote.c:1283 #, c-format msgid "%s cannot be resolved to branch" msgstr "'%s' ne peut pas être résolue comme une branche" -#: remote.c:1185 +#: remote.c:1294 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "suppression de '%s' impossible : la référence distante n'existe pas" -#: remote.c:1197 +#: remote.c:1306 #, c-format msgid "dst refspec %s matches more than one" msgstr "" "le spécificateur de référence dst %s correspond à plus d'un spécificateur de " "références" -#: remote.c:1204 +#: remote.c:1313 #, c-format msgid "dst ref %s receives from more than one src" msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source" -#: remote.c:1724 remote.c:1825 +#: remote.c:1834 remote.c:1941 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1733 +#: remote.c:1843 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1736 +#: remote.c:1846 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurée pour la branche '%s'" -#: remote.c:1742 +#: remote.c:1852 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi" -#: remote.c:1757 +#: remote.c:1867 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de " "branche locale de suivi" -#: remote.c:1769 +#: remote.c:1882 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branche '%s' n'a aucune branche distante de poussée" -#: remote.c:1779 +#: remote.c:1892 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les références de spec pour '%s' n'incluent pas '%s'" -#: remote.c:1792 +#: remote.c:1905 msgid "push has no destination (push.default is 'nothing')" msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')" -#: remote.c:1814 +#: remote.c:1927 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de résoudre une poussée 'simple' pour une destination unique" -#: remote.c:1943 +#: remote.c:2060 #, c-format msgid "couldn't find remote ref %s" msgstr "impossible de trouver la référence distante %s" -#: remote.c:1956 +#: remote.c:2073 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Référence bizarre '%s' ignorée localement" -#: remote.c:2119 +#: remote.c:2236 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n" -#: remote.c:2123 +#: remote.c:2240 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2126 +#: remote.c:2243 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:2130 +#: remote.c:2247 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Votre branche et '%s' font référence à des commits différents.\n" -#: remote.c:2133 +#: remote.c:2250 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (utilisez \"%s\" pour plus de détails)\n" -#: remote.c:2137 +#: remote.c:2254 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n" msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n" -#: remote.c:2143 +#: remote.c:2260 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2146 +#: remote.c:2263 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -7616,11 +7557,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:2154 +#: remote.c:2271 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:2157 +#: remote.c:2274 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -7635,12 +7576,12 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:2167 +#: remote.c:2284 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:2359 +#: remote.c:2476 #, c-format msgid "cannot parse expected object name '%s'" msgstr "impossible d'analyser le nom attendu d'objet '%s'" @@ -7673,7 +7614,7 @@ msgstr "impossible d'écrire l'enregistrement rerere" msgid "there were errors while writing '%s' (%s)" msgstr "il y a eu des erreurs à l'écriture de '%s' (%s)" -#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281 +#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298 #, c-format msgid "failed to flush '%s'" msgstr "échec du flush de '%s'" @@ -7718,8 +7659,8 @@ msgstr "impossible de délier '%s' qui est errant" msgid "Recorded preimage for '%s'" msgstr "Pré-image enregistrée pour '%s'" -#: rerere.c:865 submodule.c:2121 builtin/log.c:2002 -#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819 +#: rerere.c:865 submodule.c:2121 builtin/log.c:2017 +#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le répertoire '%s'" @@ -7757,37 +7698,29 @@ msgstr "impossible d'ouvrir le répertoire rr-cache" msgid "could not determine HEAD revision" msgstr "impossible de déterminer la révision HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3705 +#: reset.c:70 reset.c:76 sequencer.c:3700 #, c-format msgid "failed to find tree of %s" msgstr "impossible de trouver l'arbre de %s" -#: revision.c:2259 -msgid "--unsorted-input is incompatible with --no-walk" -msgstr "--unsorted-input est incompatible avec --no-walk" - -#: revision.c:2346 +#: revision.c:2347 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<fichier-paquet> n'est plus géré" -#: revision.c:2655 revision.c:2659 -msgid "--no-walk is incompatible with --unsorted-input" -msgstr "--no-walk est incompatible avec --unsorted-input" - -#: revision.c:2690 +#: revision.c:2686 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2693 +#: revision.c:2689 #, 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:2895 +#: revision.c:2891 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" -#: run-command.c:1278 +#: run-command.c:1262 #, c-format msgid "cannot create async thread: %s" msgstr "impossible de créer un fil asynchrone : %s" @@ -7855,8 +7788,8 @@ msgstr "mode de nettoyage invalide de message de validation '%s'" msgid "could not delete '%s'" msgstr "impossible de supprimer '%s'" -#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297 -#: builtin/rm.c:408 +#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297 +#: builtin/rm.c:409 #, c-format msgid "could not remove '%s'" msgstr "impossible de supprimer '%s'" @@ -7918,13 +7851,13 @@ msgstr "" "Pour arrêter et revenir à l'état antérieur à \"git revert\",,\n" "lancez \"git revert --abort\"." -#: sequencer.c:448 sequencer.c:3290 +#: sequencer.c:448 sequencer.c:3292 #, c-format msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" -#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308 -#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639 +#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310 +#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639 #, c-format msgid "could not write to '%s'" msgstr "impossible d'écrire dans '%s'" @@ -7934,12 +7867,18 @@ msgstr "impossible d'écrire dans '%s'" msgid "could not write eol to '%s'" msgstr "impossible d'écrire la fin de ligne dans '%s'" -#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310 -#: sequencer.c:3574 +#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312 +#: sequencer.c:3569 #, c-format msgid "failed to finalize '%s'" msgstr "échec lors de la finalisation de '%s'" +#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551 +#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148 +#, c-format +msgid "could not read '%s'" +msgstr "impossible de lire '%s'" + #: sequencer.c:499 #, c-format msgid "your local changes would be overwritten by %s." @@ -7954,7 +7893,7 @@ msgstr "validez vos modifications ou les remiser pour continuer." msgid "%s: fast-forward" msgstr "%s : avance rapide" -#: sequencer.c:574 builtin/tag.c:610 +#: sequencer.c:574 builtin/tag.c:614 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" @@ -7985,8 +7924,8 @@ 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:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730 -#: builtin/am.c:822 builtin/rebase.c:694 +#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756 +#: builtin/am.c:848 builtin/rebase.c:694 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" @@ -8049,11 +7988,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1229 +#: sequencer.c:1225 msgid "'prepare-commit-msg' hook failed" msgstr "échec du crochet 'prepare-commit-msg'" -#: sequencer.c:1235 +#: sequencer.c:1231 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -8082,7 +8021,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1248 +#: sequencer.c:1244 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -8108,349 +8047,349 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1290 +#: sequencer.c:1288 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: sequencer.c:1292 +#: sequencer.c:1290 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: sequencer.c:1338 +#: sequencer.c:1339 msgid "unable to resolve HEAD after creating commit" msgstr "impossible de résoudre HEAD après création du commit" -#: sequencer.c:1340 +#: sequencer.c:1342 msgid "detached HEAD" msgstr "HEAD détachée" -#: sequencer.c:1344 +#: sequencer.c:1346 msgid " (root-commit)" msgstr " (commit racine)" -#: sequencer.c:1365 +#: sequencer.c:1367 msgid "could not parse HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:1367 +#: sequencer.c:1369 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s n'est pas un commit !" -#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707 +#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: sequencer.c:1427 sequencer.c:2312 +#: sequencer.c:1429 sequencer.c:2314 msgid "unable to parse commit author" msgstr "impossible d'analyser l'auteur du commit" -#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708 +#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: sequencer.c:1471 sequencer.c:1591 +#: sequencer.c:1473 sequencer.c:1593 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:1502 sequencer.c:1534 +#: sequencer.c:1504 sequencer.c:1536 #, c-format msgid "invalid author identity '%s'" msgstr "identité d'auteur invalide '%s'" -#: sequencer.c:1508 +#: sequencer.c:1510 msgid "corrupt author: missing date information" msgstr "auteur corrompu : information de date manquante" -#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913 -#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915 +#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199 +#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199 #: t/helper/test-fast-rebase.c:217 #, c-format msgid "could not update %s" msgstr "impossible de mettre à jour %s" -#: sequencer.c:1623 +#: sequencer.c:1625 #, c-format msgid "could not parse commit %s" msgstr "impossible d'analyser le commit %s" -#: sequencer.c:1628 +#: sequencer.c:1630 #, c-format msgid "could not parse parent commit %s" msgstr "impossible d'analyser le commit parent %s" -#: sequencer.c:1711 sequencer.c:1992 +#: sequencer.c:1713 sequencer.c:1994 #, c-format msgid "unknown command: %d" msgstr "commande inconnue : %d" -#: sequencer.c:1753 +#: sequencer.c:1755 msgid "This is the 1st commit message:" msgstr "Ceci est le premier message de validation :" -#: sequencer.c:1754 +#: sequencer.c:1756 #, c-format msgid "This is the commit message #%d:" msgstr "Ceci est le message de validation numéro %d :" -#: sequencer.c:1755 +#: sequencer.c:1757 msgid "The 1st commit message will be skipped:" msgstr "Le premier message de validation sera ignoré :" -#: sequencer.c:1756 +#: sequencer.c:1758 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Le message de validation %d sera ignoré :" -#: sequencer.c:1757 +#: sequencer.c:1759 #, c-format msgid "This is a combination of %d commits." msgstr "Ceci est la combinaison de %d commits." -#: sequencer.c:1904 sequencer.c:1961 +#: sequencer.c:1906 sequencer.c:1963 #, c-format msgid "cannot write '%s'" msgstr "impossible d'écrire '%s'" -#: sequencer.c:1951 +#: sequencer.c:1953 msgid "need a HEAD to fixup" msgstr "une HEAD est nécessaire à la correction" -#: sequencer.c:1953 sequencer.c:3601 +#: sequencer.c:1955 sequencer.c:3596 msgid "could not read HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:1955 +#: sequencer.c:1957 msgid "could not read HEAD's commit message" msgstr "impossible de lire le message de validation de HEAD" -#: sequencer.c:1979 +#: sequencer.c:1981 #, c-format msgid "could not read commit message of %s" msgstr "impossible de lire le message de validation de %s" -#: sequencer.c:2089 +#: sequencer.c:2091 msgid "your index file is unmerged." msgstr "votre fichier d'index n'est pas fusionné." -#: sequencer.c:2096 +#: sequencer.c:2098 msgid "cannot fixup root commit" msgstr "impossible de réparer le commit racine" -#: sequencer.c:2115 +#: sequencer.c:2117 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée." -#: sequencer.c:2123 sequencer.c:2131 +#: sequencer.c:2125 sequencer.c:2133 #, c-format msgid "commit %s does not have parent %d" msgstr "le commit %s n'a pas de parent %d" -#: sequencer.c:2137 +#: sequencer.c:2139 #, c-format msgid "cannot get commit message for %s" msgstr "impossible d'obtenir un message de validation pour %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:2156 +#: sequencer.c:2158 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:2222 +#: sequencer.c:2224 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossible de renommer '%s' en '%s'" -#: sequencer.c:2282 +#: sequencer.c:2284 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:2283 +#: sequencer.c:2285 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:2304 +#: sequencer.c:2306 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "abandon de %s %s -- le contenu de la rustine déjà en amont\n" -#: sequencer.c:2362 +#: sequencer.c:2364 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:2370 +#: sequencer.c:2372 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:2450 +#: sequencer.c:2452 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s n'accepte pas d'argument : '%s'" -#: sequencer.c:2459 +#: sequencer.c:2461 #, c-format msgid "missing arguments for %s" msgstr "argument manquant pour %s" -#: sequencer.c:2502 +#: sequencer.c:2504 #, c-format msgid "could not parse '%s'" msgstr "impossible d'analyser '%s'" -#: sequencer.c:2563 +#: sequencer.c:2565 #, c-format msgid "invalid line %d: %.*s" msgstr "ligne %d invalide : %.*s" -#: sequencer.c:2574 +#: sequencer.c:2576 #, c-format msgid "cannot '%s' without a previous commit" msgstr "'%s' impossible avec le commit précédent" -#: sequencer.c:2622 builtin/rebase.c:184 +#: sequencer.c:2624 builtin/rebase.c:184 #, c-format msgid "could not read '%s'." msgstr "impossible de lire '%s'." -#: sequencer.c:2660 +#: sequencer.c:2662 msgid "cancelling a cherry picking in progress" msgstr "annulation d'un picorage en cours" -#: sequencer.c:2669 +#: sequencer.c:2671 msgid "cancelling a revert in progress" msgstr "annulation d'un retour en cours" -#: sequencer.c:2709 +#: sequencer.c:2711 msgid "please fix this using 'git rebase --edit-todo'." msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: sequencer.c:2711 +#: sequencer.c:2713 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "feuille d'instruction inutilisable : '%s'" -#: sequencer.c:2716 +#: sequencer.c:2718 msgid "no commits parsed." msgstr "aucun commit analysé." -#: sequencer.c:2727 +#: sequencer.c:2729 msgid "cannot cherry-pick during a revert." msgstr "impossible de picorer pendant l'annulation d'un commit." -#: sequencer.c:2729 +#: sequencer.c:2731 msgid "cannot revert during a cherry-pick." msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:2807 +#: sequencer.c:2809 #, c-format msgid "invalid value for %s: %s" msgstr "valeur invalide pour %s : %s" -#: sequencer.c:2916 +#: sequencer.c:2918 msgid "unusable squash-onto" msgstr "\"écrase-sur\" inutilisable" -#: sequencer.c:2936 +#: sequencer.c:2938 #, c-format msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformée : %s" -#: sequencer.c:3031 sequencer.c:4905 +#: sequencer.c:3033 sequencer.c:4902 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:3048 +#: sequencer.c:3050 msgid "revert is already in progress" msgstr "un retour est déjà en cours" -#: sequencer.c:3050 +#: sequencer.c:3052 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "essayez \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:3053 +#: sequencer.c:3055 msgid "cherry-pick is already in progress" msgstr "un picorage est déjà en cours" -#: sequencer.c:3055 +#: sequencer.c:3057 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:3069 +#: sequencer.c:3071 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossible de créer le répertoire de séquenceur '%s'" -#: sequencer.c:3084 +#: sequencer.c:3086 msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:3144 sequencer.c:4615 +#: sequencer.c:3146 sequencer.c:4612 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:3146 sequencer.c:3157 +#: sequencer.c:3148 sequencer.c:3159 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:3148 sequencer.c:3192 +#: sequencer.c:3150 sequencer.c:3194 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:3178 builtin/grep.c:772 +#: sequencer.c:3180 builtin/fetch.c:999 builtin/fetch.c:1411 builtin/grep.c:772 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:3180 +#: sequencer.c:3182 #, c-format msgid "cannot read '%s': %s" msgstr "impossible de lire '%s' : %s" -#: sequencer.c:3181 +#: sequencer.c:3183 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:3187 +#: sequencer.c:3189 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu" -#: sequencer.c:3198 +#: sequencer.c:3200 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !" -#: sequencer.c:3239 +#: sequencer.c:3241 msgid "no revert in progress" msgstr "pas de retour en cours" -#: sequencer.c:3248 +#: sequencer.c:3250 msgid "no cherry-pick in progress" msgstr "aucun picorage en cours" -#: sequencer.c:3258 +#: sequencer.c:3260 msgid "failed to skip the commit" msgstr "échec du saut de commit" -#: sequencer.c:3265 +#: sequencer.c:3267 msgid "there is nothing to skip" msgstr "il n'y a rien à sauter" -#: sequencer.c:3268 +#: sequencer.c:3270 #, c-format msgid "" "have you committed already?\n" @@ -8459,16 +8398,16 @@ msgstr "" "avez-vous déjà validé ?\n" "essayez \"git %s --continue\"" -#: sequencer.c:3430 sequencer.c:4506 +#: sequencer.c:3432 sequencer.c:4503 msgid "cannot read HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:3447 +#: sequencer.c:3449 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3455 +#: sequencer.c:3457 #, c-format msgid "" "You can amend the commit now, with\n" @@ -8487,27 +8426,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3465 +#: sequencer.c:3467 #, c-format msgid "Could not apply %s... %.*s" msgstr "Impossible d'appliquer %s... %.*s" -#: sequencer.c:3472 +#: sequencer.c:3474 #, c-format msgid "Could not merge %.*s" msgstr "Impossible de fusionner %.*s" -#: sequencer.c:3486 sequencer.c:3490 builtin/difftool.c:639 +#: sequencer.c:3488 sequencer.c:3492 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3502 +#: sequencer.c:3503 #, c-format msgid "Executing: %s\n" msgstr "Exécution : %s\n" -#: sequencer.c:3517 +#: sequencer.c:3514 #, c-format msgid "" "execution failed: %s\n" @@ -8522,11 +8461,11 @@ msgstr "" "git rebase --continue\n" "\n" -#: sequencer.c:3523 +#: sequencer.c:3520 msgid "and made changes to the index and/or the working tree\n" msgstr "et a mis à jour l'index ou l'arbre de travail\n" -#: sequencer.c:3529 +#: sequencer.c:3526 #, c-format msgid "" "execution succeeded: %s\n" @@ -8543,91 +8482,91 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3591 +#: sequencer.c:3586 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom de label illégal '%.*s'" -#: sequencer.c:3664 +#: sequencer.c:3659 msgid "writing fake root commit" msgstr "écriture d'un commit racine bidon" -#: sequencer.c:3669 +#: sequencer.c:3664 msgid "writing squash-onto" msgstr "écriture de 'écraser-sur'" -#: sequencer.c:3748 +#: sequencer.c:3743 #, c-format msgid "could not resolve '%s'" msgstr "impossible de résoudre '%s'" -#: sequencer.c:3780 +#: sequencer.c:3775 msgid "cannot merge without a current revision" msgstr "impossible de fusionner avec une révision courante" -#: sequencer.c:3802 +#: sequencer.c:3797 #, c-format msgid "unable to parse '%.*s'" msgstr "impossible d'analyser '%.*s'" -#: sequencer.c:3811 +#: sequencer.c:3806 #, c-format msgid "nothing to merge: '%.*s'" msgstr "rien à fusionner : '%.*s'" -#: sequencer.c:3823 +#: sequencer.c:3818 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine" -#: sequencer.c:3878 +#: sequencer.c:3873 #, c-format msgid "could not get commit message of '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:4024 +#: sequencer.c:4019 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "impossible de seulement essayer de fusionner '%.*s'" -#: sequencer.c:4040 +#: sequencer.c:4035 msgid "merge: Unable to write new index file" msgstr "fusion : Impossible d'écrire le nouveau fichier index" -#: sequencer.c:4121 +#: sequencer.c:4116 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: sequencer.c:4124 +#: sequencer.c:4119 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Réponse de remisage inattendue : '%s'" -#: sequencer.c:4130 +#: sequencer.c:4125 #, c-format msgid "Could not create directory for '%s'" msgstr "Impossible de créer le répertoire pour '%s'" -#: sequencer.c:4133 +#: sequencer.c:4128 #, c-format msgid "Created autostash: %s\n" msgstr "Autoremisage créé : %s\n" -#: sequencer.c:4137 +#: sequencer.c:4132 msgid "could not reset --hard" msgstr "impossible de réinitialiser --hard" -#: sequencer.c:4162 +#: sequencer.c:4157 #, c-format msgid "Applied autostash.\n" msgstr "Autoremisage appliqué.\n" -#: sequencer.c:4174 +#: sequencer.c:4169 #, c-format msgid "cannot store %s" msgstr "impossible de stocker %s" -#: sequencer.c:4177 +#: sequencer.c:4172 #, c-format msgid "" "%s\n" @@ -8638,30 +8577,30 @@ msgstr "" "Vos modifications sont à l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" -#: sequencer.c:4182 +#: sequencer.c:4177 msgid "Applying autostash resulted in conflicts." msgstr "L'application du remisage automatique a créé des conflits." -#: sequencer.c:4183 +#: sequencer.c:4178 msgid "Autostash exists; creating a new stash entry." msgstr "" "Un remisage automatique existe ; création d'une nouvelle entrée de remisage." -#: sequencer.c:4255 +#: sequencer.c:4252 msgid "could not detach HEAD" msgstr "impossible de détacher HEAD" -#: sequencer.c:4270 +#: sequencer.c:4267 #, c-format msgid "Stopped at HEAD\n" msgstr "Arrêt à HEAD\n" -#: sequencer.c:4272 +#: sequencer.c:4269 #, c-format msgid "Stopped at %s\n" msgstr "Arrêté à %s\n" -#: sequencer.c:4304 +#: sequencer.c:4301 #, c-format msgid "" "Could not execute the todo command\n" @@ -8682,58 +8621,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4350 +#: sequencer.c:4347 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Rebasage (%d/%d)%s" -#: sequencer.c:4396 +#: sequencer.c:4393 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Arrêt à %s... %.*s\n" -#: sequencer.c:4466 +#: sequencer.c:4463 #, c-format msgid "unknown command %d" msgstr "commande inconnue %d" -#: sequencer.c:4514 +#: sequencer.c:4511 msgid "could not read orig-head" msgstr "impossible de lire orig-head" -#: sequencer.c:4519 +#: sequencer.c:4516 msgid "could not read 'onto'" msgstr "impossible de lire 'onto'" -#: sequencer.c:4533 +#: sequencer.c:4530 #, c-format msgid "could not update HEAD to %s" msgstr "impossible de mettre à jour HEAD sur %s" -#: sequencer.c:4593 +#: sequencer.c:4590 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Rebasage et mise à jour de %s avec succès.\n" -#: sequencer.c:4645 +#: sequencer.c:4642 msgid "cannot rebase: You have unstaged changes." msgstr "impossible de rebaser : vous avez des modifications non indexées." -#: sequencer.c:4654 +#: sequencer.c:4651 msgid "cannot amend non-existing commit" msgstr "impossible de corriger un commit non-existant" -#: sequencer.c:4656 +#: sequencer.c:4653 #, c-format msgid "invalid file: '%s'" msgstr "fichier invalide : '%s'" -#: sequencer.c:4658 +#: sequencer.c:4655 #, c-format msgid "invalid contents: '%s'" msgstr "contenu invalide : '%s'" -#: sequencer.c:4661 +#: sequencer.c:4658 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -8743,68 +8682,68 @@ msgstr "" "Vous avez des modifications non validées dans votre copie de travail.\n" "Veuillez les valider d'abord, puis relancer 'git rebase --continue'." -#: sequencer.c:4697 sequencer.c:4736 +#: sequencer.c:4694 sequencer.c:4733 #, c-format msgid "could not write file: '%s'" msgstr "impossible d'écrire le fichier : '%s'" -#: sequencer.c:4752 +#: sequencer.c:4749 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossible de supprimer CHERRY_PICK_HEAD" -#: sequencer.c:4762 +#: sequencer.c:4759 msgid "could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: sequencer.c:4882 +#: sequencer.c:4879 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:4886 +#: sequencer.c:4883 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:4921 +#: sequencer.c:4918 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" -#: sequencer.c:5192 sequencer.c:5421 +#: sequencer.c:5189 sequencer.c:5418 #, c-format msgid "skipped previously applied commit %s" msgstr "le commit %s appliqué précédemment a été sauté" -#: sequencer.c:5262 sequencer.c:5437 +#: sequencer.c:5259 sequencer.c:5434 msgid "use --reapply-cherry-picks to include skipped commits" msgstr "utilisez --reapply-cherry-picks pour inclure les commits sautés" -#: sequencer.c:5408 +#: sequencer.c:5405 msgid "make_script: unhandled options" msgstr "make_script : options non gérées" -#: sequencer.c:5411 +#: sequencer.c:5408 msgid "make_script: error preparing revisions" msgstr "make_script : erreur lors de la préparation des révisions" -#: sequencer.c:5669 sequencer.c:5686 +#: sequencer.c:5666 sequencer.c:5683 msgid "nothing to do" msgstr "rien à faire" -#: sequencer.c:5705 +#: sequencer.c:5702 msgid "could not skip unnecessary pick commands" msgstr "impossible d'éviter les commandes de picorage non nécessaires" -#: sequencer.c:5805 +#: sequencer.c:5802 msgid "the script was already rearranged." msgstr "le script a déjà été réarrangé." -#: setup.c:133 +#: setup.c:134 #, c-format msgid "'%s' is outside repository at '%s'" msgstr "'%s' est hors du dépôt à '%s'" -#: setup.c:185 +#: setup.c:186 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -8814,7 +8753,7 @@ msgstr "" "Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui " "n'existent pas localement." -#: setup.c:198 +#: setup.c:199 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -8825,14 +8764,14 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:264 +#: setup.c:265 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" "l'option '%s' doit être présente avant les arguments qui ne sont pas des " "options" -#: setup.c:283 +#: setup.c:284 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -8843,28 +8782,28 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:419 +#: setup.c:420 msgid "unable to set up work tree using invalid config" msgstr "" "impossible de mettre en place le répertoire de travail en utilisant une " "configuration invalide" -#: setup.c:423 builtin/rev-parse.c:895 +#: setup.c:424 builtin/rev-parse.c:895 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:658 +#: setup.c:722 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Version attendue du dépôt git <= %d, %d trouvée" -#: setup.c:666 +#: setup.c:730 msgid "unknown repository extension found:" msgid_plural "unknown repository extensions found:" msgstr[0] "extension de dépôt inconnue trouvée :" msgstr[1] "extensions de dépôt inconnues trouvées :" -#: setup.c:680 +#: setup.c:744 msgid "repo version is 0, but v1-only extension found:" msgid_plural "repo version is 0, but v1-only extensions found:" msgstr[0] "" @@ -8872,75 +8811,75 @@ msgstr[0] "" msgstr[1] "" "la version du dépôt est 0, mais des extensions uniquement v1 trouvées :" -#: setup.c:701 +#: setup.c:765 #, c-format msgid "error opening '%s'" msgstr "erreur à l'ouverture de '%s'" -#: setup.c:703 +#: setup.c:767 #, c-format msgid "too large to be a .git file: '%s'" msgstr "trop gros pour être une fichier .git : '%s'" -#: setup.c:705 +#: setup.c:769 #, c-format msgid "error reading %s" msgstr "erreur à la lecture de %s" -#: setup.c:707 +#: setup.c:771 #, c-format msgid "invalid gitfile format: %s" msgstr "format de fichier git invalide : %s" -#: setup.c:709 +#: setup.c:773 #, c-format msgid "no path in gitfile: %s" msgstr "aucun chemin dans le fichier git : %s" -#: setup.c:711 +#: setup.c:775 #, c-format msgid "not a git repository: %s" msgstr "ce n'est pas un dépôt git : %s" -#: setup.c:813 +#: setup.c:877 #, c-format msgid "'$%s' too big" msgstr "'$%s' trop gros" -#: setup.c:827 +#: setup.c:891 #, c-format msgid "not a git repository: '%s'" msgstr "ce n'est pas un dépôt git : '%s'" -#: setup.c:856 setup.c:858 setup.c:889 +#: setup.c:920 setup.c:922 setup.c:953 #, c-format msgid "cannot chdir to '%s'" msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'" -#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974 +#: setup.c:925 setup.c:981 setup.c:991 setup.c:1030 setup.c:1038 msgid "cannot come back to cwd" msgstr "impossible de revenir au répertoire de travail courant" -#: setup.c:988 +#: setup.c:1052 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "échec du stat de '%*s%s%s'" -#: setup.c:1231 +#: setup.c:1295 msgid "Unable to read current working directory" msgstr "Impossible d'accéder au répertoire de travail courant" -#: setup.c:1240 setup.c:1246 +#: setup.c:1304 setup.c:1310 #, c-format msgid "cannot change to '%s'" msgstr "impossible de modifier en '%s'" -#: setup.c:1251 +#: setup.c:1315 #, 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:1257 +#: setup.c:1321 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -8951,7 +8890,7 @@ msgstr "" "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "n'est pas défini)." -#: setup.c:1381 +#: setup.c:1446 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -8961,15 +8900,15 @@ msgstr "" "Le propriétaire des fichiers doit toujours avoir les droits en lecture et " "écriture." -#: setup.c:1443 +#: setup.c:1508 msgid "fork failed" msgstr "échec de la bifurcation" -#: setup.c:1448 +#: setup.c:1513 msgid "setsid failed" msgstr "échec du setsid" -#: sparse-index.c:273 +#: sparse-index.c:289 #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "l'entrée d'index est un répertoire, mais pas clairsemé (%08x)" @@ -9026,13 +8965,13 @@ msgid_plural "%u bytes/s" msgstr[0] "%u octet/s" msgstr[1] "%u octets/s" -#: strbuf.c:1174 wrapper.c:207 wrapper.c:377 builtin/am.c:739 +#: strbuf.c:1186 wrapper.c:207 wrapper.c:377 builtin/am.c:765 #: builtin/rebase.c:650 #, c-format msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" -#: strbuf.c:1183 +#: strbuf.c:1195 #, c-format msgid "could not edit '%s'" msgstr "impossible d'éditer '%s'" @@ -9127,7 +9066,7 @@ msgstr "" msgid "process for submodule '%s' failed" msgstr "le processus pour le sous-module '%s' a échoué" -#: submodule.c:1194 builtin/branch.c:692 builtin/submodule--helper.c:2713 +#: submodule.c:1194 builtin/branch.c:699 builtin/submodule--helper.c:2714 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." @@ -9379,7 +9318,7 @@ msgstr "" msgid "invalid remote service path" msgstr "chemin de service distant invalide" -#: transport-helper.c:661 transport.c:1475 +#: transport-helper.c:661 transport.c:1474 msgid "operation not supported by protocol" msgstr "option non supportée par le protocole" @@ -9602,7 +9541,7 @@ msgstr "" msgid "Aborting." msgstr "Abandon." -#: transport.c:1344 +#: transport.c:1343 msgid "failed to push all needed submodules" msgstr "échec de la poussée de tous les sous-modules nécessaires" @@ -9622,7 +9561,7 @@ msgstr "nom de fichier vide dans une entrée de l'arbre" msgid "too-short tree file" msgstr "fichier arbre trop court" -#: unpack-trees.c:115 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9633,7 +9572,7 @@ msgstr "" "%%sVeuillez valider ou remiser vos modifications avant de basculer de " "branche." -#: unpack-trees.c:117 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -9643,7 +9582,7 @@ msgstr "" "l'extraction :\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9653,7 +9592,7 @@ msgstr "" "fusion :\n" "%%sVeuillez valider ou remiser vos modifications avant la fusion." -#: unpack-trees.c:122 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -9663,7 +9602,7 @@ msgstr "" "fusion :\n" "%%s" -#: unpack-trees.c:125 +#: unpack-trees.c:128 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9672,7 +9611,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%sVeuillez valider ou remiser vos modifications avant %s." -#: unpack-trees.c:127 +#: unpack-trees.c:130 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -9681,7 +9620,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%s" -#: unpack-trees.c:132 +#: unpack-trees.c:135 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -9691,7 +9630,16 @@ msgstr "" "contenus :\n" "%s" -#: unpack-trees.c:136 +#: unpack-trees.c:138 +#, c-format +msgid "" +"Refusing to remove the current working directory:\n" +"%s" +msgstr "" +"impossible de supprimer le répertoire de travail actuel :\n" +"%s" + +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9701,7 +9649,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:138 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -9710,7 +9658,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par l'extraction :\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9720,7 +9668,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:143 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -9729,7 +9677,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par la fusion :\n" "%%s" -#: unpack-trees.c:146 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9739,7 +9687,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:148 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -9748,7 +9696,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par %s :\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9759,7 +9707,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:156 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -9769,7 +9717,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:165 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9779,7 +9727,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:161 +#: unpack-trees.c:167 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -9788,7 +9736,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par la fusion :\n" "%%s" -#: unpack-trees.c:164 +#: unpack-trees.c:170 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9798,7 +9746,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:166 +#: unpack-trees.c:172 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -9807,12 +9755,12 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par %s :\n" "%%s" -#: unpack-trees.c:174 +#: unpack-trees.c:180 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible." -#: unpack-trees.c:177 +#: unpack-trees.c:183 #, c-format msgid "" "Cannot update submodule:\n" @@ -9821,7 +9769,7 @@ msgstr "" "Mise à jour impossible pour le sous-module :\n" "%s" -#: unpack-trees.c:180 +#: unpack-trees.c:186 #, c-format msgid "" "The following paths are not up to date and were left despite sparse " @@ -9832,7 +9780,7 @@ msgstr "" "clairsemés :\n" "%s" -#: unpack-trees.c:182 +#: unpack-trees.c:188 #, c-format msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" @@ -9842,7 +9790,7 @@ msgstr "" "motifs clairsemés :\n" "%s" -#: unpack-trees.c:184 +#: unpack-trees.c:190 #, c-format msgid "" "The following paths were already present and thus not updated despite sparse " @@ -9853,12 +9801,12 @@ msgstr "" "motifs clairsemés :\n" "%s" -#: unpack-trees.c:264 +#: unpack-trees.c:270 #, c-format msgid "Aborting\n" msgstr "Abandon\n" -#: unpack-trees.c:291 +#: unpack-trees.c:297 #, c-format msgid "" "After fixing the above paths, you may want to run `git sparse-checkout " @@ -9867,11 +9815,11 @@ msgstr "" "Après correction des chemins ci-dessus, vous voulez peut-être lancer `git " "sparse-checkout reapply`.\n" -#: unpack-trees.c:352 +#: unpack-trees.c:358 msgid "Updating files" msgstr "Mise à jour des fichiers" -#: unpack-trees.c:384 +#: unpack-trees.c:390 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -9881,17 +9829,17 @@ msgstr "" "sensibles à la casse dans une système de fichier insensible) et un\n" "seul du groupe en collision est dans l'arbre de travail :\n" -#: unpack-trees.c:1620 +#: unpack-trees.c:1636 msgid "Updating index flags" msgstr "Mise à jour des drapeaux de l'index" -#: unpack-trees.c:2772 +#: unpack-trees.c:2803 #, c-format msgid "worktree and untracked commit have duplicate entries: %s" msgstr "" "l'arbre de travail et le commit non suivi ont des entrées dupliquées : %s" -#: upload-pack.c:1561 +#: upload-pack.c:1565 msgid "expected flush after fetch arguments" msgstr "vidage attendu après les arguments de récupération" @@ -9928,104 +9876,104 @@ msgstr "segment de chemin '..' invalide" msgid "Fetching objects" msgstr "Récupération des objets" -#: worktree.c:236 builtin/am.c:2154 builtin/bisect--helper.c:156 +#: worktree.c:238 builtin/am.c:2209 builtin/bisect--helper.c:156 #, c-format msgid "failed to read '%s'" msgstr "échec de la lecture de '%s'" -#: worktree.c:303 +#: worktree.c:305 #, 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:314 +#: worktree.c:316 #, 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:326 +#: worktree.c:328 #, c-format msgid "'%s' does not exist" msgstr "'%s' n'existe pas" -#: worktree.c:332 +#: worktree.c:334 #, 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:341 +#: worktree.c:343 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' ne pointe pas en retour sur '%s'" -#: worktree.c:603 +#: worktree.c:604 msgid "not a directory" msgstr "pas un répertoire" -#: worktree.c:612 +#: worktree.c:613 msgid ".git is not a file" msgstr ".git n'est pas un fichier" -#: worktree.c:614 +#: worktree.c:615 msgid ".git file broken" msgstr "fichier .git cassé" -#: worktree.c:616 +#: worktree.c:617 msgid ".git file incorrect" msgstr "fichier .git incorrect" -#: worktree.c:722 +#: worktree.c:723 msgid "not a valid path" msgstr "pas un chemin valide" -#: worktree.c:728 +#: worktree.c:729 msgid "unable to locate repository; .git is not a file" msgstr "impossible de localiser le dépôt ; .git n'est pas un fichier" -#: worktree.c:732 +#: worktree.c:733 msgid "unable to locate repository; .git file does not reference a repository" msgstr "" "impossible de localiser le dépôt ; .git ne fait pas référence à un dépôt" -#: worktree.c:736 +#: worktree.c:737 msgid "unable to locate repository; .git file broken" msgstr "impossible de localiser le dépôt ; fichier .git cassé" -#: worktree.c:742 +#: worktree.c:743 msgid "gitdir unreadable" msgstr "gitdir non lisible" -#: worktree.c:746 +#: worktree.c:747 msgid "gitdir incorrect" msgstr "gitdir incorrect" -#: worktree.c:771 +#: worktree.c:772 msgid "not a valid directory" msgstr "pas un répertoire valide" -#: worktree.c:777 +#: worktree.c:778 msgid "gitdir file does not exist" msgstr "le fichier gitdir n'existe pas" -#: worktree.c:782 worktree.c:791 +#: worktree.c:783 worktree.c:792 #, c-format msgid "unable to read gitdir file (%s)" msgstr "impossible de lire le fichier gitdir (%s)" -#: worktree.c:801 +#: worktree.c:802 #, c-format msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "" "lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)" -#: worktree.c:809 +#: worktree.c:810 msgid "invalid gitdir file" msgstr "fichier gitdir invalide" -#: worktree.c:817 +#: worktree.c:818 msgid "gitdir file points to non-existent location" msgstr "le fichier gitdir pointe sur un endroit inexistant" @@ -10086,11 +10034,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:211 wt-status.c:1125 +#: wt-status.c:211 wt-status.c:1131 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:234 wt-status.c:1134 +#: wt-status.c:234 wt-status.c:1140 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" @@ -10195,22 +10143,22 @@ msgstr "contenu modifié, " msgid "untracked content, " msgstr "contenu non suivi, " -#: wt-status.c:958 +#: wt-status.c:964 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Votre remisage contient actuellement %d entrée" msgstr[1] "Votre remisage contient actuellement %d entrées" -#: wt-status.c:989 +#: wt-status.c:995 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:991 +#: wt-status.c:997 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:1073 +#: wt-status.c:1079 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -10218,7 +10166,7 @@ msgstr "" "Ne touchez pas à la ligne ci-dessus.\n" "Tout ce qui suit sera éliminé." -#: wt-status.c:1165 +#: wt-status.c:1171 #, c-format msgid "" "\n" @@ -10230,107 +10178,114 @@ msgstr "" "de la branche.\n" "Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n" -#: wt-status.c:1195 +#: wt-status.c:1201 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:1198 +#: wt-status.c:1204 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:1200 +#: wt-status.c:1206 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)" -#: wt-status.c:1204 +#: wt-status.c:1210 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée." -#: wt-status.c:1207 +#: wt-status.c:1213 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:1216 +#: wt-status.c:1224 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:1219 +#: wt-status.c:1227 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:1223 +#: wt-status.c:1232 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:1225 +#: wt-status.c:1234 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:1227 +#: wt-status.c:1237 +msgid "" +" (use \"git am --allow-empty\" to record this patch as an empty commit)" +msgstr "" +" (utilisez \"git am --allow-empty\" pour enregistrer la rustine comme un " +"commit vide)" + +#: wt-status.c:1239 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1360 +#: wt-status.c:1372 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo est manquant." -#: wt-status.c:1362 +#: wt-status.c:1374 msgid "No commands done." msgstr "Aucune commande réalisée." -#: wt-status.c:1365 +#: wt-status.c:1377 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Dernière commande effectuée (%d commande effectuée) :" msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :" -#: wt-status.c:1376 +#: wt-status.c:1388 #, c-format msgid " (see more in file %s)" msgstr " (voir plus dans le fichier %s)" -#: wt-status.c:1381 +#: wt-status.c:1393 msgid "No commands remaining." msgstr "Aucune commande restante." -#: wt-status.c:1384 +#: wt-status.c:1396 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Prochaine commande à effectuer (%d commande restante) :" msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :" -#: wt-status.c:1392 +#: wt-status.c:1404 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)" -#: wt-status.c:1404 +#: wt-status.c:1416 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:1409 +#: wt-status.c:1421 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1422 +#: wt-status.c:1434 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1424 +#: wt-status.c:1436 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1426 +#: wt-status.c:1438 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" -#: wt-status.c:1433 +#: wt-status.c:1445 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1437 +#: wt-status.c:1449 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -10338,163 +10293,163 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1442 +#: wt-status.c:1454 msgid "You are currently splitting a commit during a rebase." msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:1445 +#: wt-status.c:1457 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" -#: wt-status.c:1449 +#: wt-status.c:1461 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la " "branche '%s' sur '%s'." -#: wt-status.c:1454 +#: wt-status.c:1466 msgid "You are currently editing a commit during a rebase." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." -#: wt-status.c:1457 +#: wt-status.c:1469 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1459 +#: wt-status.c:1471 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos " "modifications)" -#: wt-status.c:1470 +#: wt-status.c:1482 msgid "Cherry-pick currently in progress." msgstr "Picorage en cours." -#: wt-status.c:1473 +#: wt-status.c:1485 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1480 +#: wt-status.c:1492 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1483 +#: wt-status.c:1495 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (lancez \"git cherry-pick --continue\" pour continuer)" -#: wt-status.c:1486 +#: wt-status.c:1498 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" -#: wt-status.c:1488 +#: wt-status.c:1500 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (utilisez \"git cherry-pick --skip\" pour sauter ce patch)" -#: wt-status.c:1490 +#: wt-status.c:1502 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" -#: wt-status.c:1500 +#: wt-status.c:1512 msgid "Revert currently in progress." msgstr "Rétablissement en cours." -#: wt-status.c:1503 +#: wt-status.c:1515 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1509 +#: wt-status.c:1521 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1512 +#: wt-status.c:1524 msgid " (run \"git revert --continue\" to continue)" msgstr " (lancez \"git revert --continue\" pour continuer)" -#: wt-status.c:1515 +#: wt-status.c:1527 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1517 +#: wt-status.c:1529 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (utilisez \"git revert --skip\" pour sauter ce patch)" -#: wt-status.c:1519 +#: wt-status.c:1531 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1529 +#: wt-status.c:1541 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1533 +#: wt-status.c:1545 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1536 +#: wt-status.c:1548 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:1547 +#: wt-status.c:1559 msgid "You are in a sparse checkout." msgstr "Vous êtes dans une extraction clairsemée." -#: wt-status.c:1550 +#: wt-status.c:1562 #, 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:1794 +#: wt-status.c:1806 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1801 +#: wt-status.c:1813 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1803 +#: wt-status.c:1815 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1808 +#: wt-status.c:1820 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1810 +#: wt-status.c:1822 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1813 +#: wt-status.c:1825 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1830 +#: wt-status.c:1842 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1831 +#: wt-status.c:1843 msgid "No commits yet" msgstr "Aucun commit" -#: wt-status.c:1845 +#: wt-status.c:1857 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1847 +#: wt-status.c:1859 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1851 +#: wt-status.c:1863 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -10506,32 +10461,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1857 +#: wt-status.c:1869 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1859 +#: wt-status.c:1871 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1865 +#: wt-status.c:1877 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1870 +#: wt-status.c:1882 #, 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:1874 +#: wt-status.c:1886 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1878 +#: wt-status.c:1890 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -10540,84 +10495,84 @@ 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:1882 +#: wt-status.c:1894 #, 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:1886 +#: wt-status.c:1898 #, 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:1890 wt-status.c:1896 +#: wt-status.c:1902 wt-status.c:1908 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1893 +#: wt-status.c:1905 #, 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:1898 +#: wt-status.c:1910 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:2003 +#: wt-status.c:2015 msgid "No commits yet on " msgstr "Encore aucun commit sur " -#: wt-status.c:2007 +#: wt-status.c:2019 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:2038 +#: wt-status.c:2050 msgid "different" msgstr "différent" -#: wt-status.c:2040 wt-status.c:2048 +#: wt-status.c:2052 wt-status.c:2060 msgid "behind " msgstr "derrière " -#: wt-status.c:2043 wt-status.c:2046 +#: wt-status.c:2055 wt-status.c:2058 msgid "ahead " msgstr "devant " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2569 +#: wt-status.c:2596 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "impossible de %s : vous avez des modifications non indexées." -#: wt-status.c:2575 +#: wt-status.c:2602 msgid "additionally, your index contains uncommitted changes." msgstr "de plus, votre index contient des modifications non validées." -#: wt-status.c:2577 +#: wt-status.c:2604 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossible : votre index contient des modifications non validées." -#: compat/simple-ipc/ipc-unix-socket.c:183 +#: compat/simple-ipc/ipc-unix-socket.c:205 msgid "could not send IPC command" msgstr "impossible de trouver le commit %" -#: compat/simple-ipc/ipc-unix-socket.c:190 +#: compat/simple-ipc/ipc-unix-socket.c:212 msgid "could not read IPC response" msgstr "impossible de lire la réponse IPC" -#: compat/simple-ipc/ipc-unix-socket.c:870 +#: compat/simple-ipc/ipc-unix-socket.c:892 #, c-format msgid "could not start accept_thread '%s'" msgstr "impossible de démarrer accept_thread '%s'" -#: compat/simple-ipc/ipc-unix-socket.c:882 +#: compat/simple-ipc/ipc-unix-socket.c:904 #, c-format msgid "could not start worker[0] for '%s'" msgstr "impossible de démarrer worker[0] pour '%s'" @@ -10654,113 +10609,119 @@ msgstr "suppression de '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:317 builtin/rev-parse.c:993 +#: builtin/add.c:313 builtin/rev-parse.c:993 msgid "Could not read the index" msgstr "Impossible de lire l'index" -#: builtin/add.c:330 +#: builtin/add.c:326 msgid "Could not write patch" msgstr "Impossible d'écrire le patch" -#: builtin/add.c:333 +#: builtin/add.c:329 msgid "editing patch failed" msgstr "échec de l'édition du patch" -#: builtin/add.c:336 +#: builtin/add.c:332 #, c-format msgid "Could not stat '%s'" msgstr "Stat de '%s' impossible" -#: builtin/add.c:338 +#: builtin/add.c:334 msgid "Empty patch. Aborted." msgstr "Patch vide. Abandon." -#: builtin/add.c:343 +#: builtin/add.c:340 #, c-format msgid "Could not apply '%s'" msgstr "Impossible d'appliquer '%s'" -#: builtin/add.c:351 +#: builtin/add.c:348 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c:371 builtin/clean.c:901 builtin/fetch.c:173 builtin/mv.c:124 +#: builtin/add.c:368 builtin/clean.c:927 builtin/fetch.c:174 builtin/mv.c:124 #: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550 #: builtin/remote.c:1429 builtin/rm.c:244 builtin/send-pack.c:194 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:374 +#: builtin/add.c:369 builtin/check-ignore.c:22 builtin/commit.c:1484 +#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2313 +#: builtin/mv.c:123 builtin/read-tree.c:120 +msgid "be verbose" +msgstr "mode verbeux" + +#: builtin/add.c:371 msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:375 builtin/checkout.c:1560 builtin/reset.c:314 +#: builtin/add.c:372 builtin/checkout.c:1581 builtin/reset.c:409 msgid "select hunks interactively" msgstr "sélection interactive des sections" -#: builtin/add.c:376 +#: builtin/add.c:373 msgid "edit current diff and apply" msgstr "édition du diff actuel et application" -#: builtin/add.c:377 +#: builtin/add.c:374 msgid "allow adding otherwise ignored files" msgstr "permettre l'ajout de fichiers ignorés" -#: builtin/add.c:378 +#: builtin/add.c:375 msgid "update tracked files" msgstr "mettre à jour les fichiers suivis" -#: builtin/add.c:379 +#: builtin/add.c:376 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)" -#: builtin/add.c:380 +#: builtin/add.c:377 msgid "record only the fact that the path will be added later" msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard" -#: builtin/add.c:381 +#: builtin/add.c:378 msgid "add changes from all tracked and untracked files" msgstr "ajouter les modifications de tous les fichiers suivis et non suivis" -#: builtin/add.c:384 +#: builtin/add.c:381 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignorer les chemins effacés dans la copie de travail (identique à --no-all)" -#: builtin/add.c:386 +#: builtin/add.c:383 msgid "don't add, only refresh the index" msgstr "ne pas ajouter, juste rafraîchir l'index" -#: builtin/add.c:387 +#: builtin/add.c:384 msgid "just skip files which cannot be added because of errors" msgstr "" "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait " "d'erreurs" -#: builtin/add.c:388 +#: builtin/add.c:385 msgid "check if - even missing - files are ignored in dry run" msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide" -#: builtin/add.c:389 builtin/mv.c:128 builtin/rm.c:251 +#: builtin/add.c:386 builtin/mv.c:128 builtin/rm.c:251 msgid "allow updating entries outside of the sparse-checkout cone" msgstr "" "permettre la mise à jour des entrées hors du cone d'extraction clairsemée" -#: builtin/add.c:391 builtin/update-index.c:1004 +#: builtin/add.c:388 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exécutable pour les fichiers listés" -#: builtin/add.c:393 +#: builtin/add.c:390 msgid "warn when adding an embedded repository" msgstr "avertir lors de l'ajout d'un dépôt embarqué" -#: builtin/add.c:395 +#: builtin/add.c:392 msgid "backend for `git stash -p`" msgstr "backend pour `git stash -p`" -#: builtin/add.c:413 +#: builtin/add.c:410 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10791,12 +10752,12 @@ msgstr "" "\n" "Référez-vous à \"git help submodule\" pour plus d'information." -#: builtin/add.c:442 +#: builtin/add.c:439 #, c-format msgid "adding embedded git repository: %s" msgstr "dépôt git embarqué ajouté : %s" -#: builtin/add.c:462 +#: builtin/add.c:459 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10806,52 +10767,29 @@ msgstr "" "Éliminez ce message en lançant\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:477 +#: builtin/add.c:474 msgid "adding files failed" msgstr "échec de l'ajout de fichiers" -#: builtin/add.c:513 -msgid "--dry-run is incompatible with --interactive/--patch" -msgstr "--dry-run est incompatible avec --interactive/--patch" - -#: builtin/add.c:515 builtin/commit.c:358 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--pathspec-from-file est incompatible avec --interactive/--patch" - -#: builtin/add.c:532 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--pathspec-from-file est incompatible avec --edit" - -#: builtin/add.c:544 -msgid "-A and -u are mutually incompatible" -msgstr "-A et -u sont mutuellement incompatibles" - -#: builtin/add.c:547 -msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "" -"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run" - -#: builtin/add.c:551 +#: builtin/add.c:548 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x" -#: builtin/add.c:572 builtin/checkout.c:1731 builtin/commit.c:364 -#: builtin/reset.c:334 builtin/rm.c:275 builtin/stash.c:1650 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "--pathspec-from-file est incompatible avec pathspec arguments" - -#: builtin/add.c:579 builtin/checkout.c:1743 builtin/commit.c:370 -#: builtin/reset.c:340 builtin/rm.c:281 builtin/stash.c:1656 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "--pathspec-file-nul nécessite --pathspec-from-file" +#: builtin/add.c:569 builtin/checkout.c:1751 builtin/commit.c:364 +#: builtin/reset.c:429 builtin/rm.c:275 builtin/stash.c:1713 +#, c-format +msgid "'%s' and pathspec arguments cannot be used together" +msgstr "" +"'%s' et les arguments de spécificateur de chemin ne peuvent pas être " +"utilisés ensemble" -#: builtin/add.c:583 +#: builtin/add.c:580 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Rien de spécifié, rien n'a été ajouté.\n" -#: builtin/add.c:585 +#: builtin/add.c:582 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10861,112 +10799,120 @@ msgstr "" "Éliminez ce message en lançant\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:366 +#: builtin/am.c:202 +#, c-format +msgid "Invalid value for --empty: %s" +msgstr "Valeur invalide pour --empty : %s" + +#: builtin/am.c:392 msgid "could not parse author script" msgstr "impossible d'analyser l'auteur du script" -#: builtin/am.c:456 +#: builtin/am.c:482 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' a été effacé par le crochet applypatch-msg" -#: builtin/am.c:498 +#: builtin/am.c:524 #, c-format msgid "Malformed input line: '%s'." msgstr "Ligne en entrée malformée : '%s'." -#: builtin/am.c:536 +#: builtin/am.c:562 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Impossible de copier les notes de '%s' vers '%s'" -#: builtin/am.c:562 +#: builtin/am.c:588 msgid "fseek failed" msgstr "échec de fseek" -#: builtin/am.c:750 +#: builtin/am.c:776 #, c-format msgid "could not parse patch '%s'" msgstr "impossible d'analyser le patch '%s'" -#: builtin/am.c:815 +#: builtin/am.c:841 msgid "Only one StGIT patch series can be applied at once" msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois" -#: builtin/am.c:863 +#: builtin/am.c:889 msgid "invalid timestamp" msgstr "horodatage invalide" -#: builtin/am.c:868 builtin/am.c:880 +#: builtin/am.c:894 builtin/am.c:906 msgid "invalid Date line" msgstr "ligne de Date invalide" -#: builtin/am.c:875 +#: builtin/am.c:901 msgid "invalid timezone offset" msgstr "décalage horaire invalide" -#: builtin/am.c:968 +#: builtin/am.c:994 msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: builtin/am.c:973 builtin/clone.c:300 +#: builtin/am.c:999 builtin/clone.c:300 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/am.c:978 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "Échec de découpage des patchs." -#: builtin/am.c:1127 +#: builtin/am.c:1153 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"." -#: builtin/am.c:1128 +#: builtin/am.c:1154 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"." -#: builtin/am.c:1129 +#: builtin/am.c:1159 +#, c-format +msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." +msgstr "" +"Pour enregistrer la rustine vide comme un commit vide, lancez \"%s --allow-" +"empty\"." + +#: builtin/am.c:1161 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --" "abort\"." -#: builtin/am.c:1224 +#: builtin/am.c:1256 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent " "être perdus." -#: builtin/am.c:1252 -msgid "Patch is empty." -msgstr "Le patch actuel est vide." - -#: builtin/am.c:1317 +#: builtin/am.c:1344 #, c-format msgid "missing author line in commit %s" msgstr "ligne d'auteur manquante dans le commit %s" -#: builtin/am.c:1320 +#: builtin/am.c:1347 #, c-format msgid "invalid ident line: %.*s" msgstr "ligne d'identification invalide : %.*s" -#: builtin/am.c:1539 +#: builtin/am.c:1566 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " "points." -#: builtin/am.c:1541 +#: builtin/am.c:1568 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilisation de l'information de l'index pour reconstruire un arbre de base..." -#: builtin/am.c:1560 +#: builtin/am.c:1587 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10974,24 +10920,24 @@ msgstr "" "Avez-vous édité le patch à la main ?\n" "Il ne s'applique pas aux blobs enregistrés dans son index." -#: builtin/am.c:1566 +#: builtin/am.c:1593 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour à un patch de la base et fusion à 3 points..." -#: builtin/am.c:1592 +#: builtin/am.c:1619 msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." -#: builtin/am.c:1624 +#: builtin/am.c:1651 msgid "applying to an empty history" msgstr "application à un historique vide" -#: builtin/am.c:1676 builtin/am.c:1680 +#: builtin/am.c:1703 builtin/am.c:1707 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." -#: builtin/am.c:1698 +#: builtin/am.c:1725 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -10999,40 +10945,58 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1708 +#: builtin/am.c:1735 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : " -#: builtin/am.c:1754 builtin/commit.c:409 +#: builtin/am.c:1781 builtin/commit.c:409 msgid "unable to write index file" msgstr "impossible d'écrire le fichier d'index" -#: builtin/am.c:1758 +#: builtin/am.c:1785 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1798 builtin/am.c:1865 +#: builtin/am.c:1827 +#, c-format +msgid "Skipping: %.*s" +msgstr "Ignoré : %.*s" + +#: builtin/am.c:1832 +#, c-format +msgid "Creating an empty commit: %.*s" +msgstr "Création d'un commit vide : %.*s" + +#: builtin/am.c:1836 +msgid "Patch is empty." +msgstr "Le patch actuel est vide." + +#: builtin/am.c:1847 builtin/am.c:1916 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1815 +#: builtin/am.c:1864 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: builtin/am.c:1821 +#: builtin/am.c:1870 #, c-format msgid "Patch failed at %s %.*s" msgstr "l'application de la rustine a échoué à %s %.*s" -#: builtin/am.c:1825 +#: builtin/am.c:1874 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" "Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec" -#: builtin/am.c:1868 +#: builtin/am.c:1920 +msgid "No changes - recorded it as an empty commit." +msgstr "aucune modification - enregistré comme un commit vide." + +#: builtin/am.c:1922 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -11043,7 +11007,7 @@ msgstr "" "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: builtin/am.c:1875 +#: builtin/am.c:1930 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -11056,17 +11020,17 @@ msgstr "" "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour " "accepter son état." -#: builtin/am.c:1983 builtin/am.c:1987 builtin/am.c:1999 builtin/reset.c:353 -#: builtin/reset.c:361 +#: builtin/am.c:2038 builtin/am.c:2042 builtin/am.c:2054 builtin/reset.c:448 +#: builtin/reset.c:456 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:2035 builtin/am.c:2111 +#: builtin/am.c:2090 builtin/am.c:2166 msgid "failed to clean index" msgstr "échec du nettoyage de l'index" -#: builtin/am.c:2079 +#: builtin/am.c:2134 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -11074,160 +11038,168 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: builtin/am.c:2187 +#: builtin/am.c:2242 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2229 +#: builtin/am.c:2285 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Valeur invalide pour --show-current-patch : %s" -#: builtin/am.c:2233 +#: builtin/am.c:2289 #, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "--show-current-patch=%s est incompatible avec --show-current-patch=%s" +msgid "options '%s=%s' and '%s=%s' cannot be used together" +msgstr "les options '%s=%s' et '%s=%s' ne peuvent pas être utilisées ensemble" -#: builtin/am.c:2264 +#: builtin/am.c:2320 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2265 +#: builtin/am.c:2321 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --skip | --abort)" -#: builtin/am.c:2271 +#: builtin/am.c:2327 msgid "run interactively" msgstr "exécution interactive" -#: builtin/am.c:2273 +#: builtin/am.c:2329 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2275 +#: builtin/am.c:2331 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2276 builtin/init-db.c:547 builtin/prune-packed.c:16 -#: builtin/repack.c:640 builtin/stash.c:961 +#: builtin/am.c:2332 builtin/init-db.c:547 builtin/prune-packed.c:16 +#: builtin/repack.c:642 builtin/stash.c:962 msgid "be quiet" msgstr "être silencieux" -#: builtin/am.c:2278 +#: builtin/am.c:2334 msgid "add a Signed-off-by trailer to the commit message" msgstr "ajouter une ligne terminale Signed-off-by au message de validation" -#: builtin/am.c:2281 +#: builtin/am.c:2337 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par défaut)" -#: builtin/am.c:2283 +#: builtin/am.c:2339 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k à git-mailinfo" -#: builtin/am.c:2285 +#: builtin/am.c:2341 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b à git-mailinfo" -#: builtin/am.c:2287 +#: builtin/am.c:2343 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m à git-mailinfo" -#: builtin/am.c:2289 +#: builtin/am.c:2345 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox" -#: builtin/am.c:2292 +#: builtin/am.c:2348 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr" -#: builtin/am.c:2295 +#: builtin/am.c:2351 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: builtin/am.c:2297 +#: builtin/am.c:2353 msgid "pass it through git-mailinfo" msgstr "le passer à travers git-mailinfo" -#: builtin/am.c:2300 builtin/am.c:2303 builtin/am.c:2306 builtin/am.c:2309 -#: builtin/am.c:2312 builtin/am.c:2315 builtin/am.c:2318 builtin/am.c:2321 -#: builtin/am.c:2327 +#: builtin/am.c:2356 builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 +#: builtin/am.c:2368 builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 +#: builtin/am.c:2383 msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" -#: builtin/am.c:2317 builtin/commit.c:1514 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:919 builtin/merge.c:262 +#: builtin/am.c:2373 builtin/commit.c:1515 builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:21 builtin/grep.c:919 builtin/merge.c:263 #: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221 -#: builtin/rebase.c:1046 builtin/repack.c:651 builtin/repack.c:655 -#: builtin/repack.c:657 builtin/show-branch.c:649 builtin/show-ref.c:172 +#: builtin/rebase.c:1046 builtin/repack.c:653 builtin/repack.c:657 +#: builtin/repack.c:659 builtin/show-branch.c:649 builtin/show-ref.c:172 #: builtin/tag.c:445 parse-options.h:154 parse-options.h:175 -#: parse-options.h:315 +#: parse-options.h:317 msgid "n" msgstr "n" -#: builtin/am.c:2323 builtin/branch.c:673 builtin/bugreport.c:109 -#: builtin/for-each-ref.c:40 builtin/replace.c:556 builtin/tag.c:479 +#: builtin/am.c:2379 builtin/branch.c:680 builtin/bugreport.c:109 +#: builtin/for-each-ref.c:41 builtin/replace.c:555 builtin/tag.c:479 #: builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2324 +#: builtin/am.c:2380 msgid "format the patch(es) are in" msgstr "format de présentation des patchs" -#: builtin/am.c:2330 +#: builtin/am.c:2386 msgid "override error message when patch failure occurs" msgstr "surcharger le message d'erreur lors d'un échec d'application de patch" -#: builtin/am.c:2332 +#: builtin/am.c:2388 msgid "continue applying patches after resolving a conflict" msgstr "continuer à appliquer les patchs après résolution d'un conflit" -#: builtin/am.c:2335 +#: builtin/am.c:2391 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2338 +#: builtin/am.c:2394 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2341 +#: builtin/am.c:2397 msgid "restore the original branch and abort the patching operation" msgstr "restaurer la branche originale et abandonner les applications de patch" -#: builtin/am.c:2344 +#: builtin/am.c:2400 msgid "abort the patching operation but keep HEAD where it is" msgstr "abandonne l'opération de patch mais garde HEAD où il est" -#: builtin/am.c:2348 +#: builtin/am.c:2404 msgid "show the patch being applied" msgstr "afficher le patch en cours d'application" -#: builtin/am.c:2353 +#: builtin/am.c:2408 +msgid "record the empty patch as an empty commit" +msgstr "enregistrer la rustine vide comme un commit vide" + +#: builtin/am.c:2412 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2355 +#: builtin/am.c:2414 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2357 builtin/commit-tree.c:118 builtin/commit.c:1642 -#: builtin/merge.c:299 builtin/pull.c:179 builtin/rebase.c:1099 +#: builtin/am.c:2416 builtin/commit-tree.c:118 builtin/commit.c:1643 +#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1099 #: builtin/revert.c:117 builtin/tag.c:460 msgid "key-id" msgstr "id-clé" -#: builtin/am.c:2358 builtin/rebase.c:1100 +#: builtin/am.c:2417 builtin/rebase.c:1100 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2361 +#: builtin/am.c:2420 +msgid "how to handle empty patches" +msgstr "comment gérer les rustines vides" + +#: builtin/am.c:2423 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2379 +#: builtin/am.c:2441 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -11235,17 +11207,17 @@ msgstr "" "L'option -b/--binary ne fait plus rien depuis longtemps,\n" "et elle sera supprimée. Veuillez ne plus l'utiliser." -#: builtin/am.c:2386 +#: builtin/am.c:2448 msgid "failed to read the index" msgstr "échec à la lecture de l'index" -#: builtin/am.c:2401 +#: builtin/am.c:2463 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "le répertoire précédent de rebasage %s existe toujours mais mbox donnée." -#: builtin/am.c:2425 +#: builtin/am.c:2487 #, c-format msgid "" "Stray %s directory found.\n" @@ -11254,13 +11226,13 @@ msgstr "" "Répertoire abandonné %s trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2431 +#: builtin/am.c:2493 msgid "Resolve operation not in progress, we are not resuming." msgstr "" "Pas de résolution de l'opération en cours, nous ne sommes pas dans une " "reprise." -#: builtin/am.c:2441 +#: builtin/am.c:2503 msgid "interactive mode requires patches on the command line" msgstr "le mode interactif requiert des rustines sur la ligne de commande" @@ -11724,11 +11696,11 @@ msgstr "" msgid "show work cost statistics" msgstr "montrer les statistiques de coût d'activité" -#: builtin/blame.c:867 builtin/checkout.c:1517 builtin/clone.c:94 -#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:179 -#: builtin/merge.c:298 builtin/multi-pack-index.c:103 -#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:178 -#: builtin/multi-pack-index.c:204 builtin/pull.c:120 builtin/push.c:566 +#: builtin/blame.c:867 builtin/checkout.c:1536 builtin/clone.c:94 +#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:180 +#: builtin/merge.c:301 builtin/multi-pack-index.c:103 +#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180 +#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566 #: builtin/send-pack.c:202 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" @@ -11777,7 +11749,7 @@ msgstr "afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)" msgid "ignore whitespace differences" msgstr "ignorer les différences d'espace" -#: builtin/blame.c:879 builtin/log.c:1823 +#: builtin/blame.c:879 builtin/log.c:1838 msgid "rev" msgstr "rév" @@ -11834,7 +11806,7 @@ msgstr "" "traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-" "de-fonction>" -#: builtin/blame.c:944 +#: builtin/blame.c:947 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress ne peut pas être utilisé avec --incremental ou les formats " @@ -11848,18 +11820,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:995 +#: builtin/blame.c:998 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" -#: builtin/blame.c:1111 +#: builtin/blame.c:1114 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "le fichier %s n'a qu'%lu ligne" msgstr[1] "le fichier %s n'a que %lu lignes" -#: builtin/blame.c:1156 +#: builtin/blame.c:1159 msgid "Blaming lines" msgstr "Assignation de blâme aux lignes" @@ -11893,7 +11865,7 @@ msgstr "git branch [<options>] [-r | -a] [--points-at]" msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<options>] [-r | -a] [--format]" -#: builtin/branch.c:154 +#: builtin/branch.c:153 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -11902,7 +11874,7 @@ msgstr "" "suppression de la branche '%s' qui a été fusionnée dans\n" " '%s', mais pas dans HEAD." -#: builtin/branch.c:158 +#: builtin/branch.c:157 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -11911,12 +11883,12 @@ msgstr "" "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n" " '%s', même si elle est fusionnée dans HEAD." -#: builtin/branch.c:172 +#: builtin/branch.c:171 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Impossible de rechercher l'objet commit pour '%s'" -#: builtin/branch.c:176 +#: builtin/branch.c:175 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -11925,7 +11897,7 @@ msgstr "" "La branche '%s' n'est pas totalement fusionnée.\n" "Si vous souhaitez réellement la supprimer, lancez 'git branch -D %s'." -#: builtin/branch.c:189 +#: builtin/branch.c:188 msgid "Update of config-file failed" msgstr "Échec de la mise à jour du fichier de configuration" @@ -11937,103 +11909,103 @@ msgstr "impossible d'utiliser -a avec -d" msgid "Couldn't look up commit object for HEAD" msgstr "Impossible de rechercher l'objet commit pour HEAD" -#: builtin/branch.c:244 +#: builtin/branch.c:247 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'" -#: builtin/branch.c:259 +#: builtin/branch.c:262 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "branche de suivi '%s' non trouvée." -#: builtin/branch.c:260 +#: builtin/branch.c:263 #, c-format msgid "branch '%s' not found." msgstr "branche '%s' non trouvée." -#: builtin/branch.c:291 +#: builtin/branch.c:294 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Branche de suivi %s supprimée (précédemment %s).\n" -#: builtin/branch.c:292 +#: builtin/branch.c:295 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branche %s supprimée (précédemment %s).\n" -#: builtin/branch.c:441 builtin/tag.c:63 +#: builtin/branch.c:445 builtin/tag.c:63 msgid "unable to parse format string" msgstr "impossible d'analyser la chaîne de format" -#: builtin/branch.c:472 +#: builtin/branch.c:476 msgid "could not resolve HEAD" msgstr "impossible de résoudre HEAD" -#: builtin/branch.c:478 +#: builtin/branch.c:482 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) pointe hors de refs/heads/" -#: builtin/branch.c:493 +#: builtin/branch.c:497 #, c-format msgid "Branch %s is being rebased at %s" msgstr "La branche %s est en cours de rebasage sur %s" -#: builtin/branch.c:497 +#: builtin/branch.c:501 #, c-format msgid "Branch %s is being bisected at %s" msgstr "La branche %s est en cours de bissection sur %s" -#: builtin/branch.c:514 +#: builtin/branch.c:518 msgid "cannot copy the current branch while not on any." msgstr "impossible de copier la branche actuelle, il n'y en a pas." -#: builtin/branch.c:516 +#: builtin/branch.c:520 msgid "cannot rename the current branch while not on any." msgstr "impossible de renommer la branche actuelle, il n'y en a pas." -#: builtin/branch.c:527 +#: builtin/branch.c:531 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:556 +#: builtin/branch.c:560 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:558 +#: builtin/branch.c:562 msgid "Branch copy failed" msgstr "Échec de copie de la branche" -#: builtin/branch.c:562 +#: builtin/branch.c:566 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Création d'une copie d'une branche mal nommée '%s'" -#: builtin/branch.c:565 +#: builtin/branch.c:569 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'une branche mal nommée '%s'" -#: builtin/branch.c:571 +#: builtin/branch.c:575 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !" -#: builtin/branch.c:580 +#: builtin/branch.c:584 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branche est renommée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:582 +#: builtin/branch.c:586 msgid "Branch is copied, but update of config-file failed" msgstr "" "La branche est copiée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:598 +#: builtin/branch.c:602 #, c-format msgid "" "Please edit the description for the branch\n" @@ -12044,180 +12016,176 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/branch.c:632 +#: builtin/branch.c:637 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:634 +#: builtin/branch.c:639 msgid "show hash and subject, give twice for upstream branch" msgstr "afficher le hachage et le sujet, doublé pour la branche amont" -#: builtin/branch.c:635 +#: builtin/branch.c:640 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:636 -msgid "set up tracking mode (see git-pull(1))" -msgstr "régler le mode de suivi (voir git-pull(1))" +#: builtin/branch.c:642 +msgid "set branch tracking configuration" +msgstr "règler la configuration des branches de suivi" -#: builtin/branch.c:638 +#: builtin/branch.c:645 msgid "do not use" msgstr "ne pas utiliser" -#: builtin/branch.c:640 +#: builtin/branch.c:647 msgid "upstream" msgstr "amont" -#: builtin/branch.c:640 +#: builtin/branch.c:647 msgid "change the upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:641 +#: builtin/branch.c:648 msgid "unset the upstream info" msgstr "désactiver l'information amont" -#: builtin/branch.c:642 +#: builtin/branch.c:649 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:643 +#: builtin/branch.c:650 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:645 builtin/branch.c:647 +#: builtin/branch.c:652 builtin/branch.c:654 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:646 builtin/branch.c:648 +#: builtin/branch.c:653 builtin/branch.c:655 msgid "print only branches that don't contain the commit" msgstr "afficher seulement les branches qui ne contiennent pas le commit" -#: builtin/branch.c:651 +#: builtin/branch.c:658 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:652 +#: builtin/branch.c:659 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:654 +#: builtin/branch.c:661 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:655 +#: builtin/branch.c:662 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:656 +#: builtin/branch.c:663 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:657 +#: builtin/branch.c:664 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:658 +#: builtin/branch.c:665 msgid "copy a branch and its reflog" msgstr "copier une branche et son reflog" -#: builtin/branch.c:659 +#: builtin/branch.c:666 msgid "copy a branch, even if target exists" msgstr "copier une branche, même si la cible existe" -#: builtin/branch.c:660 +#: builtin/branch.c:667 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:661 +#: builtin/branch.c:668 msgid "show current branch name" msgstr "afficher le nom de la branche courante" -#: builtin/branch.c:662 +#: builtin/branch.c:669 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:664 +#: builtin/branch.c:671 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:665 +#: builtin/branch.c:672 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:666 +#: builtin/branch.c:673 msgid "print only branches that are merged" msgstr "afficher seulement les branches qui sont fusionnées" -#: builtin/branch.c:667 +#: builtin/branch.c:674 msgid "print only branches that are not merged" msgstr "afficher seulement les branches qui ne sont pas fusionnées" -#: builtin/branch.c:668 +#: builtin/branch.c:675 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:670 builtin/for-each-ref.c:44 builtin/notes.c:413 +#: builtin/branch.c:677 builtin/for-each-ref.c:45 builtin/notes.c:413 #: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582 #: builtin/tag.c:475 msgid "object" msgstr "objet" -#: builtin/branch.c:671 +#: builtin/branch.c:678 msgid "print only branches of the object" msgstr "afficher seulement les branches de l'objet" -#: builtin/branch.c:672 builtin/for-each-ref.c:50 builtin/tag.c:482 +#: builtin/branch.c:679 builtin/for-each-ref.c:51 builtin/tag.c:482 msgid "sorting and filtering are case insensitive" msgstr "le tri et le filtrage sont non-sensibles à la casse" -#: builtin/branch.c:673 builtin/for-each-ref.c:40 builtin/tag.c:480 +#: builtin/branch.c:680 builtin/for-each-ref.c:41 builtin/tag.c:480 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/branch.c:696 builtin/clone.c:678 +#: builtin/branch.c:703 builtin/clone.c:678 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:720 -msgid "--column and --verbose are incompatible" -msgstr "--column et --verbose sont incompatibles" - -#: builtin/branch.c:735 builtin/branch.c:792 builtin/branch.c:801 +#: builtin/branch.c:742 builtin/branch.c:798 builtin/branch.c:807 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:768 +#: builtin/branch.c:774 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:773 +#: builtin/branch.c:779 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:780 +#: builtin/branch.c:786 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:783 +#: builtin/branch.c:789 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:798 +#: builtin/branch.c:804 msgid "too many branches for a copy operation" msgstr "trop de branches pour une opération de copie" -#: builtin/branch.c:807 +#: builtin/branch.c:813 msgid "too many arguments for a rename operation" msgstr "trop d'arguments pour une opération de renommage" -#: builtin/branch.c:812 +#: builtin/branch.c:818 msgid "too many arguments to set new upstream" msgstr "trop d'arguments pour spécifier une branche amont" -#: builtin/branch.c:816 +#: builtin/branch.c:822 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -12225,32 +12193,32 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:819 builtin/branch.c:842 +#: builtin/branch.c:825 builtin/branch.c:848 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:823 +#: builtin/branch.c:829 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:836 +#: builtin/branch.c:842 msgid "too many arguments to unset upstream" msgstr "trop d'arguments pour désactiver un amont" -#: builtin/branch.c:840 +#: builtin/branch.c:846 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur " "aucune branche." -#: builtin/branch.c:846 +#: builtin/branch.c:852 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:856 +#: builtin/branch.c:862 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -12259,7 +12227,7 @@ msgstr "" "branche.\n" "Vouliez-vous plutôt dire -a|-r --list <motif> ?" -#: builtin/branch.c:860 +#: builtin/branch.c:866 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -12415,7 +12383,7 @@ msgstr "Le dépaquetage d'un colis requiert un dépôt." #: builtin/bundle.c:185 msgid "Unbundling objects" -msgstr "dépaquetage d'objets depuis un colis" +msgstr "Dépaquetage d'objets" #: builtin/bundle.c:219 builtin/remote.c:1733 #, c-format @@ -12534,8 +12502,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:1513 builtin/gc.c:549 -#: builtin/worktree.c:494 +#: builtin/check-ignore.c:21 builtin/checkout.c:1532 builtin/gc.c:550 +#: builtin/worktree.c:493 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -12593,10 +12561,10 @@ msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<options>]" #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201 -#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1863 -#: builtin/submodule--helper.c:1866 builtin/submodule--helper.c:1874 -#: builtin/submodule--helper.c:2510 builtin/submodule--helper.c:2576 -#: builtin/worktree.c:492 builtin/worktree.c:729 +#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1867 builtin/submodule--helper.c:1875 +#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577 +#: builtin/worktree.c:491 builtin/worktree.c:728 msgid "string" msgstr "chaîne" @@ -12662,100 +12630,95 @@ msgstr "git switch [<options>] <branche>" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<options>] [--source=<branche>] <fichier>..." -#: builtin/checkout.c:190 builtin/checkout.c:229 +#: builtin/checkout.c:198 builtin/checkout.c:237 #, c-format msgid "path '%s' does not have our version" msgstr "le chemin '%s' n'a pas notre version" -#: builtin/checkout.c:192 builtin/checkout.c:231 +#: builtin/checkout.c:200 builtin/checkout.c:239 #, c-format msgid "path '%s' does not have their version" msgstr "le chemin '%s' n'a pas leur version" -#: builtin/checkout.c:208 +#: builtin/checkout.c:216 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "le chemin '%s' n'a aucune des versions nécessaires" -#: builtin/checkout.c:261 +#: builtin/checkout.c:269 #, c-format msgid "path '%s' does not have necessary versions" msgstr "le chemin '%s' n'a pas les versions nécessaires" -#: builtin/checkout.c:278 +#: builtin/checkout.c:286 #, c-format msgid "path '%s': cannot merge" msgstr "chemin '%s' : impossible de fusionner" -#: builtin/checkout.c:294 +#: builtin/checkout.c:302 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" -#: builtin/checkout.c:411 +#: builtin/checkout.c:419 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "%d conflit du fusion recréé" msgstr[1] "%d conflits du fusion recréés" -#: builtin/checkout.c:416 +#: builtin/checkout.c:424 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d chemin mis à jour depuis %s" msgstr[1] "%d chemins mis à jour depuis %s" -#: builtin/checkout.c:423 +#: builtin/checkout.c:431 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "%d chemin mis à jour depuis l'index" msgstr[1] "%d chemins mis à jour depuis l'index" -#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452 -#: builtin/checkout.c:456 +#: builtin/checkout.c:454 builtin/checkout.c:457 builtin/checkout.c:460 +#: builtin/checkout.c:464 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins" -#: builtin/checkout.c:459 builtin/checkout.c:462 -#, c-format -msgid "'%s' cannot be used with %s" -msgstr "'%s' ne peut pas être utilisé avec %s" - -#: builtin/checkout.c:466 +#: builtin/checkout.c:474 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en " "même temps." -#: builtin/checkout.c:470 +#: builtin/checkout.c:478 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ni '%s', ni '%s' spécifié" -#: builtin/checkout.c:474 +#: builtin/checkout.c:482 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié" -#: builtin/checkout.c:479 builtin/checkout.c:484 +#: builtin/checkout.c:487 builtin/checkout.c:492 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:558 builtin/checkout.c:565 +#: builtin/checkout.c:566 builtin/checkout.c:573 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:736 +#: builtin/checkout.c:747 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:786 +#: builtin/checkout.c:797 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12765,50 +12728,50 @@ msgstr "" "suivants :\n" "%s" -#: builtin/checkout.c:879 +#: builtin/checkout.c:890 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:921 +#: builtin/checkout.c:934 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:925 builtin/clone.c:609 t/helper/test-fast-rebase.c:203 +#: builtin/checkout.c:938 builtin/clone.c:609 t/helper/test-fast-rebase.c:203 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" -#: builtin/checkout.c:929 +#: builtin/checkout.c:942 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:932 +#: builtin/checkout.c:945 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:936 +#: builtin/checkout.c:949 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:938 builtin/checkout.c:1369 +#: builtin/checkout.c:951 builtin/checkout.c:1388 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:940 +#: builtin/checkout.c:953 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:991 +#: builtin/checkout.c:1004 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:997 +#: builtin/checkout.c:1010 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12831,7 +12794,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1016 +#: builtin/checkout.c:1029 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12860,19 +12823,19 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:1051 +#: builtin/checkout.c:1064 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:1055 +#: builtin/checkout.c:1068 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:1095 builtin/checkout.c:1364 +#: builtin/checkout.c:1114 builtin/checkout.c:1383 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:1177 +#: builtin/checkout.c:1196 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12881,7 +12844,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:1184 +#: builtin/checkout.c:1203 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" @@ -12901,51 +12864,51 @@ msgstr "" "ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n" "votre config." -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1213 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance" -#: builtin/checkout.c:1260 +#: builtin/checkout.c:1279 msgid "only one reference expected" msgstr "une seule référence attendue" -#: builtin/checkout.c:1277 +#: builtin/checkout.c:1296 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:1323 builtin/worktree.c:269 builtin/worktree.c:437 +#: builtin/checkout.c:1342 builtin/worktree.c:269 builtin/worktree.c:436 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1336 builtin/checkout.c:1705 +#: builtin/checkout.c:1355 builtin/checkout.c:1725 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1402 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "branche attendue, mais étiquette '%s' reçue" -#: builtin/checkout.c:1385 +#: builtin/checkout.c:1404 #, 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:1386 builtin/checkout.c:1394 +#: builtin/checkout.c:1405 builtin/checkout.c:1413 #, c-format msgid "a branch is expected, got '%s'" msgstr "une branche est attendue, mais '%s' a été reçue" -#: builtin/checkout.c:1389 +#: builtin/checkout.c:1408 #, 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:1405 +#: builtin/checkout.c:1424 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12953,7 +12916,7 @@ msgstr "" "impossible de basculer de branche pendant une fusion\n" "Envisagez \"git merge --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1409 +#: builtin/checkout.c:1428 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12961,7 +12924,7 @@ msgstr "" "impossible de basculer de branche pendant une session am\n" "Envisagez \"git am --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1413 +#: builtin/checkout.c:1432 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12969,7 +12932,7 @@ msgstr "" "impossible de basculer de branche pendant un rebasage\n" "Envisagez \"git rebase --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1417 +#: builtin/checkout.c:1436 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12977,7 +12940,7 @@ msgstr "" "impossible de basculer de branche pendant un picorage\n" "Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1421 +#: builtin/checkout.c:1440 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12985,139 +12948,128 @@ msgstr "" "impossible de basculer de branche pendant un retour\n" "Envisagez \"git revert --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1425 +#: builtin/checkout.c:1444 msgid "you are switching branch while bisecting" msgstr "vous basculez de branche en cours de bissection" -#: builtin/checkout.c:1432 +#: builtin/checkout.c:1451 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1435 builtin/checkout.c:1439 builtin/checkout.c:1443 +#: builtin/checkout.c:1454 builtin/checkout.c:1458 builtin/checkout.c:1462 #, 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:1447 builtin/checkout.c:1450 builtin/checkout.c:1453 -#: builtin/checkout.c:1458 builtin/checkout.c:1463 +#: builtin/checkout.c:1466 builtin/checkout.c:1469 builtin/checkout.c:1472 +#: builtin/checkout.c:1477 builtin/checkout.c:1482 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1460 +#: builtin/checkout.c:1479 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' n'accepte pas <point-de-départ>" -#: builtin/checkout.c:1468 +#: builtin/checkout.c:1487 #, 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:1475 +#: builtin/checkout.c:1494 msgid "missing branch or commit argument" msgstr "argument de branche ou de commit manquant" -#: builtin/checkout.c:1518 +#: builtin/checkout.c:1537 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1519 builtin/log.c:1810 parse-options.h:321 +#: builtin/checkout.c:1538 builtin/log.c:1825 parse-options.h:323 msgid "style" msgstr "style" -#: builtin/checkout.c:1520 -msgid "conflict style (merge or diff3)" -msgstr "style de conflit (merge (fusion) ou diff3)" +#: builtin/checkout.c:1539 +msgid "conflict style (merge, diff3, or zdiff3)" +msgstr "style de conflit (merge (fusion), diff3 ou zdiff3)" -#: builtin/checkout.c:1532 builtin/worktree.c:489 +#: builtin/checkout.c:1551 builtin/worktree.c:488 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" -#: builtin/checkout.c:1533 -msgid "set upstream info for new branch" -msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" +#: builtin/checkout.c:1553 +msgid "set up tracking mode (see git-pull(1))" +msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/checkout.c:1535 +#: builtin/checkout.c:1556 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1558 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1558 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1539 builtin/merge.c:302 +#: builtin/checkout.c:1560 builtin/merge.c:305 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1563 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:1555 +#: builtin/checkout.c:1576 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1558 +#: builtin/checkout.c:1579 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1562 +#: builtin/checkout.c:1583 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:1620 +#: builtin/checkout.c:1640 #, c-format -msgid "-%c, -%c and --orphan are mutually exclusive" -msgstr "-%c, -%c et --orphan sont mutuellement exclusifs" - -#: builtin/checkout.c:1624 -msgid "-p and --overlay are mutually exclusive" -msgstr "-p et --overlay sont mutuellement exclusifs" +msgid "options '-%c', '-%c', and '%s' cannot be used together" +msgstr "" +"les options '-%c', '-%c' et '%s' ne peuvent pas être utilisées ensemble" -#: builtin/checkout.c:1661 +#: builtin/checkout.c:1681 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1666 +#: builtin/checkout.c:1686 #, c-format msgid "missing branch name; try -%c" msgstr "nom de branche manquant ; essayez -%c" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1718 #, c-format msgid "could not resolve %s" msgstr "impossible de résoudre %s" -#: builtin/checkout.c:1714 +#: builtin/checkout.c:1734 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1741 #, 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:1725 +#: builtin/checkout.c:1745 #, 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:1734 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--pathspec-from-file est incompatible avec --detach" - -#: builtin/checkout.c:1737 builtin/reset.c:331 builtin/stash.c:1647 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--pathspec-from-file est incompatible avec --patch" - -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1770 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -13125,72 +13077,72 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." -#: builtin/checkout.c:1755 +#: builtin/checkout.c:1775 msgid "you must specify path(s) to restore" msgstr "vous devez spécifier un ou des chemins à restaurer" -#: builtin/checkout.c:1781 builtin/checkout.c:1783 builtin/checkout.c:1832 -#: builtin/checkout.c:1834 builtin/clone.c:126 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2958 -#: builtin/submodule--helper.c:3252 builtin/worktree.c:485 -#: builtin/worktree.c:487 +#: builtin/checkout.c:1800 builtin/checkout.c:1802 builtin/checkout.c:1854 +#: builtin/checkout.c:1856 builtin/clone.c:126 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2959 +#: builtin/submodule--helper.c:3253 builtin/worktree.c:484 +#: builtin/worktree.c:486 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1782 +#: builtin/checkout.c:1801 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1784 +#: builtin/checkout.c:1803 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1785 +#: builtin/checkout.c:1804 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1787 +#: builtin/checkout.c:1806 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" "essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1807 msgid "use overlay mode (default)" msgstr "utiliser le mode de superposition (défaut)" -#: builtin/checkout.c:1833 +#: builtin/checkout.c:1855 msgid "create and switch to a new branch" msgstr "créer et basculer sur une nouvelle branche" -#: builtin/checkout.c:1835 +#: builtin/checkout.c:1857 msgid "create/reset and switch to a branch" msgstr "créer/réinitialiser et basculer sur une branche" -#: builtin/checkout.c:1837 +#: builtin/checkout.c:1859 msgid "second guess 'git switch <no-such-branch>'" msgstr "interpréter 'git switch <branche-inexistante>'" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1861 msgid "throw away local modifications" msgstr "laisser tomber les modifications locales" -#: builtin/checkout.c:1873 +#: builtin/checkout.c:1897 msgid "which tree-ish to checkout from" msgstr "de quel <arbre-esque> faire l'extraction" -#: builtin/checkout.c:1875 +#: builtin/checkout.c:1899 msgid "restore the index" msgstr "restaurer l'index" -#: builtin/checkout.c:1877 +#: builtin/checkout.c:1901 msgid "restore the working tree (default)" msgstr "restaurer l'arbre de travail (par défaut)" -#: builtin/checkout.c:1879 +#: builtin/checkout.c:1903 msgid "ignore unmerged entries" msgstr "ignorer les entrées non-fusionnées" -#: builtin/checkout.c:1880 +#: builtin/checkout.c:1904 msgid "use overlay mode" msgstr "utiliser le mode de superposition" @@ -13225,7 +13177,15 @@ msgstr "Ignorerait le dépôt %s\n" msgid "could not lstat %s\n" msgstr "lstat de %s impossible\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:39 +msgid "Refusing to remove current working directory\n" +msgstr "Refus de supprimer le répertoire de travail actuel\n" + +#: builtin/clean.c:40 +msgid "Would refuse to remove current working directory\n" +msgstr "Refuserait de supprimer le répertoire de travail actuel\n" + +#: builtin/clean.c:326 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -13238,7 +13198,7 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" " - (vide) ne rien sélectionner\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:330 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -13259,33 +13219,33 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection\n" -#: builtin/clean.c:519 git-add--interactive.perl:568 +#: builtin/clean.c:545 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hein (%s) ?\n" -#: builtin/clean.c:659 +#: builtin/clean.c:685 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs à ignorer>> " -#: builtin/clean.c:693 +#: builtin/clean.c:719 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" -#: builtin/clean.c:714 +#: builtin/clean.c:740 msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:755 +#: builtin/clean.c:781 #, c-format msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:786 +#: builtin/clean.c:812 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -13303,52 +13263,52 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:822 +#: builtin/clean.c:848 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Supprimerait l'élément suivant :" msgstr[1] "Supprimerait les éléments suivants :" -#: builtin/clean.c:838 +#: builtin/clean.c:864 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:900 +#: builtin/clean.c:926 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:902 +#: builtin/clean.c:928 msgid "force" msgstr "forcer" -#: builtin/clean.c:903 +#: builtin/clean.c:929 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:905 +#: builtin/clean.c:931 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:906 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567 #: builtin/grep.c:937 builtin/log.c:184 builtin/log.c:186 -#: builtin/ls-files.c:648 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/ls-files.c:651 builtin/name-rev.c:535 builtin/name-rev.c:537 #: builtin/show-ref.c:179 msgid "pattern" msgstr "motif" -#: builtin/clean.c:907 +#: builtin/clean.c:933 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:908 +#: builtin/clean.c:934 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:910 +#: builtin/clean.c:936 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:925 +#: builtin/clean.c:951 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -13356,7 +13316,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:928 +#: builtin/clean.c:954 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -13364,7 +13324,7 @@ msgstr "" "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:940 +#: builtin/clean.c:966 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" @@ -13420,19 +13380,20 @@ msgstr "répertoire-modèle" msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1870 -#: builtin/submodule--helper.c:2513 builtin/submodule--helper.c:3259 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1871 +#: builtin/submodule--helper.c:2514 builtin/submodule--helper.c:3260 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:123 builtin/submodule--helper.c:1872 -#: builtin/submodule--helper.c:2515 +#: builtin/clone.c:123 builtin/submodule--helper.c:1873 +#: builtin/submodule--helper.c:2516 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" -#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3944 builtin/repack.c:663 -#: builtin/submodule--helper.c:3261 t/helper/test-simple-ipc.c:595 +#: builtin/clone.c:124 builtin/column.c:27 builtin/fmt-merge-msg.c:27 +#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290 +#: builtin/pack-objects.c:3944 builtin/repack.c:665 +#: builtin/submodule--helper.c:3262 t/helper/test-simple-ipc.c:595 #: t/helper/test-simple-ipc.c:597 msgid "name" msgstr "nom" @@ -13449,7 +13410,7 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:876 +#: builtin/clone.c:130 builtin/fetch.c:181 builtin/grep.c:876 #: builtin/pull.c:212 msgid "depth" msgstr "profondeur" @@ -13458,7 +13419,7 @@ msgstr "profondeur" msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3933 +#: builtin/clone.c:132 builtin/fetch.c:183 builtin/pack-objects.c:3933 #: builtin/pull.c:215 msgid "time" msgstr "heure" @@ -13467,18 +13428,18 @@ msgstr "heure" msgid "create a shallow clone since a specific time" msgstr "créer un clone superficiel depuis une date spécifique" -#: builtin/clone.c:134 builtin/fetch.c:184 builtin/fetch.c:207 +#: builtin/clone.c:134 builtin/fetch.c:185 builtin/fetch.c:208 #: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1022 msgid "revision" msgstr "révision" -#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:219 +#: builtin/clone.c:135 builtin/fetch.c:186 builtin/pull.c:219 msgid "deepen history of shallow clone, excluding rev" msgstr "" "approfondir l'historique d'un clone superficiel en excluant une révision" -#: builtin/clone.c:137 builtin/submodule--helper.c:1882 -#: builtin/submodule--helper.c:2529 +#: builtin/clone.c:137 builtin/submodule--helper.c:1883 +#: builtin/submodule--helper.c:2530 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" @@ -13508,22 +13469,22 @@ msgstr "clé=valeur" msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77 #: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200 msgid "server-specific" msgstr "spécifique au serveur" -#: builtin/clone.c:147 builtin/fetch.c:202 builtin/ls-remote.c:77 +#: builtin/clone.c:147 builtin/fetch.c:203 builtin/ls-remote.c:77 #: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201 msgid "option to transmit" msgstr "option à transmettre" -#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:238 +#: builtin/clone.c:148 builtin/fetch.c:204 builtin/pull.c:238 #: builtin/push.c:576 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:241 +#: builtin/clone.c:150 builtin/fetch.c:206 builtin/pull.c:241 #: builtin/push.c:578 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" @@ -13620,29 +13581,25 @@ msgstr "impossible de remballer pour nettoyer" msgid "cannot unlink temporary alternates file" msgstr "impossible de délier le fichier temporaire alternates" -#: builtin/clone.c:886 builtin/receive-pack.c:2493 +#: builtin/clone.c:886 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:890 +#: builtin/clone.c:890 contrib/scalar/scalar.c:414 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." #: builtin/clone.c:903 #, c-format -msgid "--bare and --origin %s options are incompatible." -msgstr "les options --bare et --origin %s sont incompatibles." - -#: builtin/clone.c:906 -msgid "--bare and --separate-git-dir are incompatible." -msgstr "--bare et --separate-git-dir sont incompatibles." +msgid "options '%s' and '%s %s' cannot be used together" +msgstr "les options '%s' et '%s %s' ne peuvent pas être utilisées ensemble" #: builtin/clone.c:920 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:924 builtin/fetch.c:2029 +#: builtin/clone.c:924 builtin/fetch.c:2047 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" @@ -13663,8 +13620,8 @@ msgstr "le chemin du dépôt '%s' existe déjà et n'est pas un répertoire vide msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:262 -#: builtin/log.c:1997 builtin/worktree.c:281 builtin/worktree.c:313 +#: builtin/clone.c:969 builtin/clone.c:990 builtin/difftool.c:256 +#: builtin/log.c:2012 builtin/worktree.c:281 builtin/worktree.c:313 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" @@ -13787,7 +13744,7 @@ msgstr "" "split[=<stratégie>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <options de division>" -#: builtin/commit-graph.c:51 builtin/fetch.c:191 builtin/log.c:1779 +#: builtin/commit-graph.c:51 builtin/fetch.c:192 builtin/log.c:1794 msgid "dir" msgstr "répertoire" @@ -13870,7 +13827,7 @@ msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs" msgid "Collecting commits from input" msgstr "Collecte des commits depuis l'entrée" -#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:255 +#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259 #, c-format msgid "unrecognized subcommand: %s" msgstr "sous-commande non reconnue : %s" @@ -13888,7 +13845,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "le parent dupliqué %s est ignoré" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:562 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:577 #, c-format msgid "not a valid object name %s" msgstr "nom d'objet invalide %s" @@ -13911,13 +13868,13 @@ msgstr "parent" msgid "id of a parent commit object" msgstr "id d'un objet commit parent" -#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:283 -#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1618 +#: builtin/commit-tree.c:112 builtin/commit.c:1627 builtin/merge.c:284 +#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1677 #: builtin/tag.c:454 msgid "message" msgstr "message" -#: builtin/commit-tree.c:113 builtin/commit.c:1626 +#: builtin/commit-tree.c:113 builtin/commit.c:1627 msgid "commit message" msgstr "message de validation" @@ -13925,7 +13882,7 @@ msgstr "message de validation" msgid "read commit log message from file" msgstr "lire le message de validation depuis un fichier" -#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:300 +#: builtin/commit-tree.c:119 builtin/commit.c:1644 builtin/merge.c:303 #: builtin/pull.c:180 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signer la validation avec GPG" @@ -14006,10 +13963,6 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" -#: builtin/commit.c:361 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "--pathspec-from-file avec l'option -a n'a pas de sens" - #: builtin/commit.c:375 msgid "No paths with --include/--only does not make sense." msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." @@ -14097,8 +14050,8 @@ msgstr "impossible de lire le fichier de journal '%s'" #: builtin/commit.c:802 #, c-format -msgid "cannot combine -m with --fixup:%s" -msgstr "impossible de combiner -m avec --fixup:%s" +msgid "options '%s' and '%s:%s' cannot be used together" +msgstr "les options '%s' et '%s.%s' ne peuvent pas être utilisées ensemble" #: builtin/commit.c:814 builtin/commit.c:830 msgid "could not read SQUASH_MSG" @@ -14208,7 +14161,7 @@ msgstr "impossible de passer les lignes finales à --trailers" msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:1080 builtin/tag.c:317 +#: builtin/commit.c:1080 builtin/tag.c:316 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" @@ -14225,15 +14178,11 @@ msgstr "" msgid "Invalid ignored mode '%s'" msgstr "Mode de fichier ignoré invalide '%s'" -#: builtin/commit.c:1156 builtin/commit.c:1450 +#: builtin/commit.c:1156 builtin/commit.c:1451 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1196 -msgid "--long and -z are incompatible" -msgstr "--long et -z sont incompatibles" - #: builtin/commit.c:1227 msgid "You are in the middle of a merge -- cannot reword." msgstr "Vous êtes en pleine fusion -- impossible de reformuler." @@ -14244,115 +14193,116 @@ msgstr "Vous êtes en plein picorage -- impossible de reformuler." #: builtin/commit.c:1232 #, c-format -msgid "cannot combine reword option of --fixup with path '%s'" -msgstr "impossible de combiner l'option reword de --fixup avec le chemin '%s'" +msgid "reword option of '%s' and path '%s' cannot be used together" +msgstr "" +"l'option de reformulation de '%s' et le chemin '%s' ne peuvent pas être " +"utilisés ensemble" #: builtin/commit.c:1234 -msgid "" -"reword option of --fixup is mutually exclusive with --patch/--interactive/--" -"all/--include/--only" +#, c-format +msgid "reword option of '%s' and '%s' cannot be used together" msgstr "" -"l'option reword de --fixup est mutuellement exclusive avec --patch/--" -"interactive/--all/--include/--only" +"l'option de reformulation de '%s' et '%s' ne peuvent pas être utilisés " +"ensemble" -#: builtin/commit.c:1253 +#: builtin/commit.c:1254 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens" -#: builtin/commit.c:1260 +#: builtin/commit.c:1261 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1263 +#: builtin/commit.c:1264 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1265 +#: builtin/commit.c:1266 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." -#: builtin/commit.c:1267 +#: builtin/commit.c:1268 msgid "You are in the middle of a rebase -- cannot amend." msgstr "Vous êtes en plein rebasage -- impossible de corriger (amend)." -#: builtin/commit.c:1270 +#: builtin/commit.c:1271 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble" -#: builtin/commit.c:1280 +#: builtin/commit.c:1281 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." -#: builtin/commit.c:1282 +#: builtin/commit.c:1283 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F." -#: builtin/commit.c:1291 +#: builtin/commit.c:1292 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." -#: builtin/commit.c:1309 +#: builtin/commit.c:1310 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Une seule option parmi --include/--only/--all/--interactive/--patch peut " "être utilisée." -#: builtin/commit.c:1337 +#: builtin/commit.c:1338 #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "option inconnue : --fixup=%s:%s" -#: builtin/commit.c:1354 +#: builtin/commit.c:1355 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "des chemins '%s ...' avec l'option -a n'a pas de sens" -#: builtin/commit.c:1485 builtin/commit.c:1654 +#: builtin/commit.c:1486 builtin/commit.c:1655 msgid "show status concisely" msgstr "afficher l'état avec concision" -#: builtin/commit.c:1487 builtin/commit.c:1656 +#: builtin/commit.c:1488 builtin/commit.c:1657 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1489 +#: builtin/commit.c:1490 msgid "show stash information" msgstr "afficher l'information de remisage" -#: builtin/commit.c:1491 builtin/commit.c:1658 +#: builtin/commit.c:1492 builtin/commit.c:1659 msgid "compute full ahead/behind values" msgstr "calcule les valeurs complètes en avance/en retard" -#: builtin/commit.c:1493 +#: builtin/commit.c:1494 msgid "version" msgstr "version" -#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551 -#: builtin/worktree.c:691 +#: builtin/commit.c:1494 builtin/commit.c:1661 builtin/push.c:551 +#: builtin/worktree.c:690 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1496 builtin/commit.c:1662 +#: builtin/commit.c:1497 builtin/commit.c:1663 msgid "show status in long format (default)" msgstr "afficher l'état en format long (par défaut)" -#: builtin/commit.c:1499 builtin/commit.c:1665 +#: builtin/commit.c:1500 builtin/commit.c:1666 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668 -#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1111 parse-options.h:335 +#: builtin/commit.c:1502 builtin/commit.c:1506 builtin/commit.c:1669 +#: builtin/fast-export.c:1172 builtin/fast-export.c:1175 +#: builtin/fast-export.c:1178 builtin/rebase.c:1111 parse-options.h:337 msgid "mode" msgstr "mode" -#: builtin/commit.c:1502 builtin/commit.c:1668 +#: builtin/commit.c:1503 builtin/commit.c:1669 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " "no. (Défaut : all)" -#: builtin/commit.c:1506 +#: builtin/commit.c:1507 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -14360,11 +14310,11 @@ msgstr "" "afficher les fichiers ignorés, \"mode\" facultatif : traditional " "(traditionnel), matching (correspondant), no. (Défaut : traditional)" -#: builtin/commit.c:1508 parse-options.h:192 +#: builtin/commit.c:1509 parse-options.h:192 msgid "when" msgstr "quand" -#: builtin/commit.c:1509 +#: builtin/commit.c:1510 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -14372,198 +14322,198 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1511 +#: builtin/commit.c:1512 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1512 +#: builtin/commit.c:1513 msgid "do not detect renames" msgstr "ne pas détecter les renommages" -#: builtin/commit.c:1514 +#: builtin/commit.c:1515 msgid "detect renames, optionally set similarity index" msgstr "" "détecter les renommages, en spécifiant optionnellement le facteur de " "similarité" -#: builtin/commit.c:1537 +#: builtin/commit.c:1538 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis" -#: builtin/commit.c:1619 +#: builtin/commit.c:1620 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1620 +#: builtin/commit.c:1621 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1622 +#: builtin/commit.c:1623 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1623 builtin/merge.c:287 builtin/tag.c:456 +#: builtin/commit.c:1624 builtin/merge.c:288 builtin/tag.c:456 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1624 +#: builtin/commit.c:1625 msgid "author" msgstr "auteur" -#: builtin/commit.c:1624 +#: builtin/commit.c:1625 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1625 builtin/gc.c:550 +#: builtin/commit.c:1626 builtin/gc.c:551 msgid "date" msgstr "date" -#: builtin/commit.c:1625 +#: builtin/commit.c:1626 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634 -#: parse-options.h:327 ref-filter.h:92 +#: builtin/commit.c:1628 builtin/commit.c:1629 builtin/commit.c:1635 +#: parse-options.h:329 ref-filter.h:89 msgid "commit" msgstr "commit" -#: builtin/commit.c:1627 +#: builtin/commit.c:1628 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1628 +#: builtin/commit.c:1629 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1633 +#: builtin/commit.c:1634 msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" -#: builtin/commit.c:1633 +#: builtin/commit.c:1634 msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "" "utiliser un message au format autosquash pour corriger ou reformuler le " "commit spécifié" -#: builtin/commit.c:1634 +#: builtin/commit.c:1635 msgid "use autosquash formatted message to squash specified commit" msgstr "" "utiliser un message au format autosquash pour compresser le commit spécifié" -#: builtin/commit.c:1635 +#: builtin/commit.c:1636 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)" -#: builtin/commit.c:1636 builtin/interpret-trailers.c:111 +#: builtin/commit.c:1637 builtin/interpret-trailers.c:111 msgid "trailer" msgstr "ligne de fin" -#: builtin/commit.c:1636 +#: builtin/commit.c:1637 msgid "add custom trailer(s)" msgstr "ajouter des lignes terminales personnaliser" -#: builtin/commit.c:1637 builtin/log.c:1754 builtin/merge.c:303 +#: builtin/commit.c:1638 builtin/log.c:1769 builtin/merge.c:306 #: builtin/pull.c:146 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "ajouter une ligne terminale Signed-off-by" -#: builtin/commit.c:1638 +#: builtin/commit.c:1639 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1639 +#: builtin/commit.c:1640 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1641 +#: builtin/commit.c:1642 msgid "include status in commit message template" msgstr "inclure l'état dans le modèle de message de validation" -#: builtin/commit.c:1646 +#: builtin/commit.c:1647 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1647 +#: builtin/commit.c:1648 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1648 +#: builtin/commit.c:1649 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1649 +#: builtin/commit.c:1650 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1650 +#: builtin/commit.c:1651 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1651 +#: builtin/commit.c:1652 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1652 +#: builtin/commit.c:1653 msgid "bypass pre-commit and commit-msg hooks" msgstr "éviter d'utiliser les crochets pre-commit et commit-msg" -#: builtin/commit.c:1653 +#: builtin/commit.c:1654 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1666 +#: builtin/commit.c:1667 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1667 +#: builtin/commit.c:1668 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1674 +#: builtin/commit.c:1675 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1676 +#: builtin/commit.c:1677 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1752 +#: builtin/commit.c:1753 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1759 +#: builtin/commit.c:1760 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1780 +#: builtin/commit.c:1781 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1787 +#: builtin/commit.c:1788 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abandon de la validation dû à un message de validation vide.\n" -#: builtin/commit.c:1792 +#: builtin/commit.c:1793 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" -#: builtin/commit.c:1803 +#: builtin/commit.c:1804 #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "" "Abandon de la validation dû à un corps de message de validation vide.\n" -#: builtin/commit.c:1839 +#: builtin/commit.c:1840 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -15078,7 +15028,7 @@ msgstr "ne considérer que les étiquettes correspondant à <motif>" msgid "do not consider tags matching <pattern>" msgstr "ne pas considérer les étiquettes correspondant à <motif>" -#: builtin/describe.c:570 builtin/name-rev.c:535 +#: builtin/describe.c:570 builtin/name-rev.c:544 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrégés en dernier recours" @@ -15095,25 +15045,15 @@ msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")" -#: builtin/describe.c:593 -msgid "--long is incompatible with --abbrev=0" -msgstr "--long et --abbrev=0 sont incompatibles" - #: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "Aucun nom trouvé, impossible de décrire quoi que ce soit." -#: builtin/describe.c:673 -msgid "--dirty is incompatible with commit-ishes" -msgstr "--dirty est incompatible avec la spécification de commits ou assimilés" - -#: builtin/describe.c:675 -msgid "--broken is incompatible with commit-ishes" -msgstr "--broken est incompatible avec les commits ou assimilés" - -#: builtin/diff-tree.c:155 -msgid "--stdin and --merge-base are mutually exclusive" -msgstr "--stdin et --merge-base sont mutuellement exclusifs" +#: builtin/describe.c:673 builtin/describe.c:675 +#, c-format +msgid "option '%s' and commit-ishes cannot be used together" +msgstr "" +"l'option '%s' et des commit-esques ne peuvent pas être utilisées ensemble" #: builtin/diff-tree.c:157 msgid "--merge-base only works with two commits" @@ -15134,26 +15074,26 @@ msgstr "option invalide : %s" msgid "%s...%s: no merge base" msgstr "%s..%s: pas de base de fusion" -#: builtin/diff.c:486 +#: builtin/diff.c:491 msgid "Not a git repository" msgstr "Ce n'est pas un dépôt git" -#: builtin/diff.c:532 builtin/grep.c:698 +#: builtin/diff.c:537 builtin/grep.c:698 #, c-format msgid "invalid object '%s' given." msgstr "objet spécifié '%s' invalide." -#: builtin/diff.c:543 +#: builtin/diff.c:548 #, c-format msgid "more than two blobs given: '%s'" msgstr "plus de deux blobs spécifiés : '%s'" -#: builtin/diff.c:548 +#: builtin/diff.c:553 #, c-format msgid "unhandled object '%s' given." msgstr "objet non géré '%s' spécifié." -#: builtin/diff.c:582 +#: builtin/diff.c:587 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "\"%s...%s\" : bases multiples de fusion, utilisation de %s" @@ -15162,22 +15102,22 @@ msgstr "\"%s...%s\" : bases multiples de fusion, utilisation de %s" msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]" -#: builtin/difftool.c:293 +#: builtin/difftool.c:287 #, c-format msgid "could not read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: builtin/difftool.c:295 +#: builtin/difftool.c:289 #, c-format msgid "could not read symlink file %s" msgstr "impossible de lire le fichier symlink %s" -#: builtin/difftool.c:303 +#: builtin/difftool.c:297 #, c-format msgid "could not read object %s for symlink %s" msgstr "impossible de lire l'objet %s pour le symlink %s" -#: builtin/difftool.c:427 +#: builtin/difftool.c:421 msgid "" "combined diff formats ('-c' and '--cc') are not supported in\n" "directory diff mode ('-d' and '--dir-diff')." @@ -15185,58 +15125,58 @@ msgstr "" "les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n" "dans le mode de diff de répertoire ('-d' et '--dir-diff')." -#: builtin/difftool.c:632 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "les deux fichiers sont modifiés : '%s' et '%s'." -#: builtin/difftool.c:634 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "le fichier dans l'arbre de travail a été laissé." -#: builtin/difftool.c:645 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "des fichiers temporaires existent dans '%s'." -#: builtin/difftool.c:646 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "vous pourriez souhaiter les nettoyer ou les récupérer." -#: builtin/difftool.c:651 +#: builtin/difftool.c:645 #, c-format msgid "failed: %d" msgstr "échec : %d" -#: builtin/difftool.c:696 +#: builtin/difftool.c:690 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utiliser `diff.guitool` au lieu de `diff.tool`" -#: builtin/difftool.c:698 +#: builtin/difftool.c:692 msgid "perform a full-directory diff" msgstr "réalise un diff de répertoire complet" -#: builtin/difftool.c:700 +#: builtin/difftool.c:694 msgid "do not prompt before launching a diff tool" msgstr "ne pas confirmer avant de lancer l'outil de diff" -#: builtin/difftool.c:705 +#: builtin/difftool.c:699 msgid "use symlinks in dir-diff mode" msgstr "utiliser les liens symboliques en mode de diff de répertoire" -#: builtin/difftool.c:706 +#: builtin/difftool.c:700 msgid "tool" msgstr "outil" -#: builtin/difftool.c:707 +#: builtin/difftool.c:701 msgid "use the specified diff tool" msgstr "utiliser l'outil de diff spécifié" -#: builtin/difftool.c:709 +#: builtin/difftool.c:703 msgid "print a list of diff tools that may be used with `--tool`" msgstr "afficher une liste des outils de diff utilisables avec `--tool`" -#: builtin/difftool.c:712 +#: builtin/difftool.c:706 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit " "code" @@ -15244,31 +15184,23 @@ msgstr "" "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code " "de sortie non-nul" -#: builtin/difftool.c:715 +#: builtin/difftool.c:709 msgid "specify a custom command for viewing diffs" msgstr "spécifier une commande personnalisée pour visualiser les différences" -#: builtin/difftool.c:716 +#: builtin/difftool.c:710 msgid "passed to `diff`" msgstr "passé à `diff`" -#: builtin/difftool.c:732 +#: builtin/difftool.c:726 msgid "difftool requires worktree or --no-index" msgstr "difftool exige un arbre de travail ou --no-index" -#: builtin/difftool.c:739 -msgid "--dir-diff is incompatible with --no-index" -msgstr "--dir-diff est incompatible avec --no-index" - -#: builtin/difftool.c:742 -msgid "--gui, --tool and --extcmd are mutually exclusive" -msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs" - -#: builtin/difftool.c:750 +#: builtin/difftool.c:744 msgid "no <tool> given for --tool=<tool>" msgstr "pas d'<outil> spécifié pour --tool=<outil>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:751 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "pas de <commande> spécifié pour --extcmd=<commande>" @@ -15309,133 +15241,124 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [options-de-liste-de-révisions]" -#: builtin/fast-export.c:869 +#: builtin/fast-export.c:843 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:1178 +#: builtin/fast-export.c:1152 msgid "--anonymize-map token cannot be empty" msgstr "le jeton --anonymize-map ne peut pas être vide" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c:1171 msgid "show progress after <n> objects" msgstr "afficher la progression après <n> objets" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c:1173 msgid "select handling of signed tags" msgstr "sélectionner la gestion des étiquettes signées" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c:1176 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:1206 +#: builtin/fast-export.c:1179 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:1209 +#: builtin/fast-export.c:1182 msgid "dump marks to this file" msgstr "enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:1211 +#: builtin/fast-export.c:1184 msgid "import marks from this file" msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:1215 +#: builtin/fast-export.c:1188 msgid "import marks from this file if it exists" msgstr "importer les marques depuis ce fichier s'il existe" -#: builtin/fast-export.c:1217 +#: builtin/fast-export.c:1190 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:1219 +#: builtin/fast-export.c:1192 msgid "output full tree for each commit" msgstr "afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:1221 +#: builtin/fast-export.c:1194 msgid "use the done feature to terminate the stream" msgstr "utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:1222 +#: builtin/fast-export.c:1195 msgid "skip output of blob data" msgstr "sauter l'affichage de données de blob" -#: builtin/fast-export.c:1223 builtin/log.c:1826 +#: builtin/fast-export.c:1196 builtin/log.c:1841 msgid "refspec" msgstr "spécificateur de référence" -#: builtin/fast-export.c:1224 +#: builtin/fast-export.c:1197 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:1225 +#: builtin/fast-export.c:1198 msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1199 msgid "from:to" msgstr "depuis:vers" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c:1200 msgid "convert <from> to <to> in anonymized output" msgstr "convertit <depuis> en <vers> dans la sortie anonymisée" -#: builtin/fast-export.c:1230 +#: builtin/fast-export.c:1203 msgid "reference parents which are not in fast-export stream by object id" msgstr "" "référencer les parents qui ne sont pas dans le flux d'export rapide par id " "d'objet" -#: builtin/fast-export.c:1232 +#: builtin/fast-export.c:1205 msgid "show original object ids of blobs/commits" msgstr "afficher les ids d'objet originaux des blobs/commits" -#: builtin/fast-export.c:1234 +#: builtin/fast-export.c:1207 msgid "label tags with mark ids" msgstr "marquer les étiquettes avec des ids de marque" -#: 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/fast-import.c:3088 +#: builtin/fast-import.c:3090 #, c-format msgid "Missing from marks for submodule '%s'" msgstr "Champs from manquants pour le sous-module '%s'" -#: builtin/fast-import.c:3090 +#: builtin/fast-import.c:3092 #, c-format msgid "Missing to marks for submodule '%s'" msgstr "Champs 'to' manquants pour le sous-module '%s'" -#: builtin/fast-import.c:3225 +#: builtin/fast-import.c:3227 #, c-format msgid "Expected 'mark' command, got %s" msgstr "Commande 'mark' attendue, %s trouvé" -#: builtin/fast-import.c:3230 +#: builtin/fast-import.c:3232 #, c-format msgid "Expected 'to' command, got %s" msgstr "Commande 'to' attendue, %s trouvé" -#: builtin/fast-import.c:3322 +#: builtin/fast-import.c:3324 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" -#: builtin/fast-import.c:3377 +#: builtin/fast-import.c:3379 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "" @@ -15446,122 +15369,122 @@ msgstr "" msgid "Lockfile created but not reported: %s" msgstr "Fichier verrou créé mais non reporté : %s" -#: builtin/fetch.c:35 +#: builtin/fetch.c:36 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/fetch.c:36 +#: builtin/fetch.c:37 msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -#: builtin/fetch.c:37 +#: builtin/fetch.c:38 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" -#: builtin/fetch.c:38 +#: builtin/fetch.c:39 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:122 +#: builtin/fetch.c:123 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel ne peut pas être négatif" -#: builtin/fetch.c:145 builtin/pull.c:189 +#: builtin/fetch.c:146 builtin/pull.c:189 msgid "fetch from all remotes" msgstr "récupérer depuis tous les dépôts distants" -#: builtin/fetch.c:147 builtin/pull.c:249 +#: builtin/fetch.c:148 builtin/pull.c:249 msgid "set upstream for git pull/fetch" msgstr "définir la branche amont pour git pull/fetch" -#: builtin/fetch.c:149 builtin/pull.c:192 +#: builtin/fetch.c:150 builtin/pull.c:192 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:151 +#: builtin/fetch.c:152 msgid "use atomic transaction to update references" msgstr "utiliser une transaction atomique pour mettre à jour les références" -#: builtin/fetch.c:153 builtin/pull.c:195 +#: builtin/fetch.c:154 builtin/pull.c:195 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:154 +#: builtin/fetch.c:155 msgid "force overwrite of local reference" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:156 +#: builtin/fetch.c:157 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:158 builtin/pull.c:199 +#: builtin/fetch.c:159 builtin/pull.c:199 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:160 +#: builtin/fetch.c:161 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:162 +#: builtin/fetch.c:163 msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules récupérés en parallèle" -#: builtin/fetch.c:164 +#: builtin/fetch.c:165 msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "" "modifier le spécificateur de référence pour placer les références dans refs/" "prefetch/" -#: builtin/fetch.c:166 builtin/pull.c:202 +#: builtin/fetch.c:167 builtin/pull.c:202 msgid "prune remote-tracking branches no longer on remote" msgstr "" "éliminer les branches de suivi distant si la branche n'existe plus dans le " "dépôt distant" -#: builtin/fetch.c:168 +#: builtin/fetch.c:169 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "éliminer les étiquettes locales qui ont disparu du dépôt distant et qui " "encombrent les étiquettes modifiées" -#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:123 +#: builtin/fetch.c:170 builtin/fetch.c:195 builtin/pull.c:123 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:170 +#: builtin/fetch.c:171 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:175 +#: builtin/fetch.c:176 msgid "write fetched references to the FETCH_HEAD file" msgstr "écrire les références récupérées dans le fichier FETCH_HEAD" -#: builtin/fetch.c:176 builtin/pull.c:210 +#: builtin/fetch.c:177 builtin/pull.c:210 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:178 +#: builtin/fetch.c:179 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:213 +#: builtin/fetch.c:182 builtin/fetch.c:188 builtin/pull.c:213 #: builtin/pull.c:222 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:183 builtin/pull.c:216 +#: builtin/fetch.c:184 builtin/pull.c:216 msgid "deepen history of shallow repository based on time" msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date" -#: builtin/fetch.c:189 builtin/pull.c:225 +#: builtin/fetch.c:190 builtin/pull.c:225 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:192 +#: builtin/fetch.c:193 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:195 +#: builtin/fetch.c:196 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -15569,51 +15492,51 @@ msgstr "" "par défaut pour la récupération récursive de sous-modules (priorité plus " "basse que les fichiers de config)" -#: builtin/fetch.c:199 builtin/pull.c:228 +#: builtin/fetch.c:200 builtin/pull.c:228 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:200 builtin/pull.c:230 +#: builtin/fetch.c:201 builtin/pull.c:230 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:201 builtin/pull.c:231 +#: builtin/fetch.c:202 builtin/pull.c:231 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:208 builtin/pull.c:244 +#: builtin/fetch.c:209 builtin/pull.c:244 msgid "report that we have only objects reachable from this object" msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet" -#: builtin/fetch.c:210 +#: builtin/fetch.c:211 msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "" "ne pas récupérer le fichier paquet ; à la place, afficher les ancêtres des " "sommets de négociation" -#: builtin/fetch.c:213 builtin/fetch.c:215 +#: builtin/fetch.c:214 builtin/fetch.c:216 msgid "run 'maintenance --auto' after fetching" msgstr "lancer 'maintenance --auto' après la récupération" -#: builtin/fetch.c:217 builtin/pull.c:247 +#: builtin/fetch.c:218 builtin/pull.c:247 msgid "check for forced-updates on all updated branches" msgstr "" "vérifier les mises à jour forcées (forced-updates) sur toutes les branches " "mises à jour" -#: builtin/fetch.c:219 +#: builtin/fetch.c:220 msgid "write the commit-graph after fetching" msgstr "écrire le graphe de commits après le rapatriement" -#: builtin/fetch.c:221 +#: builtin/fetch.c:222 msgid "accept refspecs from stdin" msgstr "lire les spécificateurs de référence depuis l'entrée standard" -#: builtin/fetch.c:586 -msgid "Couldn't find remote ref HEAD" +#: builtin/fetch.c:587 +msgid "couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:760 +#: builtin/fetch.c:761 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" @@ -15628,7 +15551,7 @@ msgstr "objet %s non trouvé" msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:879 builtin/fetch.c:895 builtin/fetch.c:967 +#: builtin/fetch.c:878 builtin/fetch.c:896 builtin/fetch.c:968 msgid "[rejected]" msgstr "[rejeté]" @@ -15636,79 +15559,83 @@ msgstr "[rejeté]" msgid "can't fetch in current branch" msgstr "impossible de récupérer dans la branche actuelle" -#: builtin/fetch.c:890 +#: builtin/fetch.c:881 +msgid "checked out in another worktree" +msgstr "extrait dans un autre arbre de travail" + +#: builtin/fetch.c:891 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:891 builtin/fetch.c:928 builtin/fetch.c:950 -#: builtin/fetch.c:962 +#: builtin/fetch.c:892 builtin/fetch.c:929 builtin/fetch.c:951 +#: builtin/fetch.c:963 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:895 +#: builtin/fetch.c:896 msgid "would clobber existing tag" msgstr "écraserait l'étiquette existante" -#: builtin/fetch.c:917 +#: builtin/fetch.c:918 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:920 +#: builtin/fetch.c:921 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:923 +#: builtin/fetch.c:924 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:962 +#: builtin/fetch.c:963 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:967 +#: builtin/fetch.c:968 msgid "non-fast-forward" msgstr "pas en avance rapide" -#: builtin/fetch.c:1070 +#: builtin/fetch.c:1071 msgid "" -"Fetch normally indicates which branches had a forced update,\n" -"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" -"flag or run 'git config fetch.showForcedUpdates true'." +"fetch normally indicates which branches had a forced update,\n" +"but that check has been disabled; to re-enable, use '--show-forced-updates'\n" +"flag or run 'git config fetch.showForcedUpdates true'" msgstr "" -"Fetch indique normalement quelles branches ont subi une mise à jour forcée,\n" +"fetch indique normalement quelles branches ont subi une mise à jour forcée,\n" "mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n" -"'--show-forced-updates' ou lancez 'git config fetch.showForcedUpdates true'." +"'--show-forced-updates' ou lancez 'git config fetch.showForcedUpdates true'" -#: builtin/fetch.c:1074 +#: builtin/fetch.c:1075 #, c-format msgid "" -"It took %.2f seconds to check forced updates. You can use\n" +"it took %.2f seconds to check forced updates; you can use\n" "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " "false'\n" -" to avoid this check.\n" +"to avoid this check\n" msgstr "" -"%.2f secondes ont été nécessaires pour vérifier les mises à jour forcées.\n" +"%.2f secondes ont été nécessaires pour vérifier les mises à jour forcées ;\n" "Vous pouvez utiliser '--no-show-forced-updates' ou lancer\n" -"'git config fetch.showForcedUpdates false' pour éviter ceci.\n" +"'git config fetch.showForcedUpdates false' pour éviter cette vérification\n" -#: builtin/fetch.c:1105 +#: builtin/fetch.c:1107 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1136 #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "" "%s rejeté parce que les mises à jour de racines superficielles ne sont pas " "permises" -#: builtin/fetch.c:1223 builtin/fetch.c:1371 +#: builtin/fetch.c:1226 builtin/fetch.c:1374 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:1244 +#: builtin/fetch.c:1247 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -15717,143 +15644,144 @@ msgstr "" "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n" " 'git remote prune %s' pour supprimer des branches anciennes en conflit" -#: builtin/fetch.c:1341 +#: builtin/fetch.c:1344 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:1342 +#: builtin/fetch.c:1345 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:1374 +#: builtin/fetch.c:1377 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:1375 builtin/remote.c:1128 +#: builtin/fetch.c:1378 builtin/remote.c:1128 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:1398 +#: builtin/fetch.c:1400 #, c-format -msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu" +msgid "refusing to fetch into branch '%s' checked out at '%s'" +msgstr "refus de récupérer dans la branche '%s' extraite dans '%s'" -#: builtin/fetch.c:1417 +#: builtin/fetch.c:1420 #, c-format -msgid "Option \"%s\" value \"%s\" is not valid for %s" -msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" +msgid "option \"%s\" value \"%s\" is not valid for %s" +msgstr "la valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" -#: builtin/fetch.c:1420 +#: builtin/fetch.c:1423 #, c-format -msgid "Option \"%s\" is ignored for %s\n" -msgstr "L'option \"%s\" est ignorée pour %s\n" +msgid "option \"%s\" is ignored for %s\n" +msgstr "l'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:1447 +#: builtin/fetch.c:1450 #, c-format msgid "the object %s does not exist" msgstr "l'objet %s n'existe pas" -#: builtin/fetch.c:1633 +#: builtin/fetch.c:1638 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "branches multiples détectées, imcompatible avec --set-upstream" -#: builtin/fetch.c:1648 +#: builtin/fetch.c:1650 +#, c-format +msgid "" +"could not set upstream of HEAD to '%s' from '%s' when it does not point to " +"any branch." +msgstr "" +"impossible de régler la branche amont de HEAD à '%s' depuis '%s' qui ne " +"pointe sur aucune branche." + +#: builtin/fetch.c:1663 msgid "not setting upstream for a remote remote-tracking branch" msgstr "dépôt amont non défini pour la branche de suivi à distance" -#: builtin/fetch.c:1650 +#: builtin/fetch.c:1665 msgid "not setting upstream for a remote tag" msgstr "dépôt amont non défini pour l'étiquette distante" -#: builtin/fetch.c:1652 +#: builtin/fetch.c:1667 msgid "unknown branch type" msgstr "type de branche inconnu" -#: builtin/fetch.c:1654 +#: builtin/fetch.c:1669 msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." +"no source branch found;\n" +"you need to specify exactly one branch with the --set-upstream option" msgstr "" "aucune branche source trouvée.\n" -"Vous devez spécifier exactement une branche avec l'option --set-upstream." +"Vous devez spécifier exactement une branche avec l'option --set-upstream" -#: builtin/fetch.c:1783 builtin/fetch.c:1846 +#: builtin/fetch.c:1799 builtin/fetch.c:1862 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1793 builtin/fetch.c:1848 builtin/remote.c:101 +#: builtin/fetch.c:1809 builtin/fetch.c:1864 #, c-format -msgid "Could not fetch %s" -msgstr "Impossible de récupérer %s" +msgid "could not fetch %s" +msgstr "impossible de récupérer %s" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1821 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "impossible de récupérer '%s' (code de sortie : %d)\n" -#: builtin/fetch.c:1909 +#: builtin/fetch.c:1925 msgid "" -"No remote repository specified. Please, specify either a URL or a\n" -"remote name from which new revisions should be fetched." +"no remote repository specified; please specify either a URL or a\n" +"remote name from which new revisions should be fetched" msgstr "" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" -"distant depuis lesquels les nouvelles révisions devraient être récupérées." +"distant depuis lesquels les nouvelles révisions devraient être récupérées" -#: builtin/fetch.c:1945 -msgid "You need to specify a tag name." -msgstr "Vous devez spécifier un nom d'étiquette." +#: builtin/fetch.c:1961 +msgid "you need to specify a tag name" +msgstr "Vous devez spécifier un nom d'étiquette" -#: builtin/fetch.c:2009 +#: builtin/fetch.c:2027 msgid "--negotiate-only needs one or more --negotiate-tip=*" msgstr "--negotiate-only nécessite au moins un --negotiate-tip=*" -#: builtin/fetch.c:2013 -msgid "Negative depth in --deepen is not supported" -msgstr "Une profondeur négative dans --deepen n'est pas supportée" +#: builtin/fetch.c:2031 +msgid "negative depth in --deepen is not supported" +msgstr "une profondeur négative dans --deepen n'est pas supportée" -#: builtin/fetch.c:2015 -msgid "--deepen and --depth are mutually exclusive" -msgstr "--deepen et --depth sont mutuellement exclusifs" - -#: builtin/fetch.c:2020 -msgid "--depth and --unshallow cannot be used together" -msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" - -#: builtin/fetch.c:2022 +#: builtin/fetch.c:2040 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:2039 +#: builtin/fetch.c:2057 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:2041 +#: builtin/fetch.c:2059 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:2050 +#: builtin/fetch.c:2068 #, c-format -msgid "No such remote or remote group: %s" -msgstr "Distant ou groupe distant inexistant : %s" +msgid "no such remote or remote group: %s" +msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:2057 -msgid "Fetching a group and specifying refspecs does not make sense" +#: builtin/fetch.c:2076 +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 " +"la récupération d'un groupe avec des spécifications de référence n'a pas de " "sens" -#: builtin/fetch.c:2073 +#: builtin/fetch.c:2092 msgid "must supply remote when using --negotiate-only" msgstr "le distant doit être fourni lors de l'utilisation de --negotiate-only" -#: builtin/fetch.c:2078 -msgid "Protocol does not support --negotiate-only, exiting." -msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon." - #: builtin/fetch.c:2097 +msgid "protocol does not support --negotiate-only, exiting" +msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon" + +#: builtin/fetch.c:2116 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -15861,11 +15789,11 @@ msgstr "" "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans " "extensions.partialclone" -#: builtin/fetch.c:2101 +#: builtin/fetch.c:2120 msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic ne peut être utilisée qu'en récupérant depuis un seul distant" -#: builtin/fetch.c:2105 +#: builtin/fetch.c:2124 msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin ne peut être utilisée qu'en récupérant depuis un seul distant" @@ -15875,23 +15803,27 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:19 msgid "populate log with at most <n> entries from shortlog" msgstr "peupler le journal avec au plus <n> éléments depuis le journal court" -#: builtin/fmt-merge-msg.c:21 +#: builtin/fmt-merge-msg.c:22 msgid "alias for --log (deprecated)" msgstr "alias pour --log (obsolète)" -#: builtin/fmt-merge-msg.c:24 +#: builtin/fmt-merge-msg.c:25 msgid "text" msgstr "texte" -#: builtin/fmt-merge-msg.c:25 +#: builtin/fmt-merge-msg.c:26 msgid "use <text> as start of message" msgstr "utiliser <texte> comme début de message" -#: builtin/fmt-merge-msg.c:26 +#: builtin/fmt-merge-msg.c:28 +msgid "use <name> instead of the real target branch" +msgstr "utiliser <nom> au lieu de la branche cible reélle" + +#: builtin/fmt-merge-msg.c:29 msgid "file to read from" msgstr "fichier d'où lire" @@ -15911,47 +15843,47 @@ msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -#: builtin/for-each-ref.c:30 +#: builtin/for-each-ref.c:31 msgid "quote placeholders suitably for shells" msgstr "échapper les champs réservés pour les interpréteurs de commandes" -#: builtin/for-each-ref.c:32 +#: builtin/for-each-ref.c:33 msgid "quote placeholders suitably for perl" msgstr "échapper les champs réservés pour perl" -#: builtin/for-each-ref.c:34 +#: builtin/for-each-ref.c:35 msgid "quote placeholders suitably for python" msgstr "échapper les champs réservés pour python" -#: builtin/for-each-ref.c:36 +#: builtin/for-each-ref.c:37 msgid "quote placeholders suitably for Tcl" msgstr "échapper les champs réservés pour compatibilité avec Tcl" -#: builtin/for-each-ref.c:39 +#: builtin/for-each-ref.c:40 msgid "show only <n> matched refs" msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:41 builtin/tag.c:481 +#: builtin/for-each-ref.c:42 builtin/tag.c:481 msgid "respect format colors" msgstr "respecter les couleurs de formatage" -#: builtin/for-each-ref.c:44 +#: builtin/for-each-ref.c:45 msgid "print only refs which points at the given object" msgstr "afficher seulement les références pointant sur l'objet" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:47 msgid "print only refs that are merged" msgstr "afficher seulement les références qui sont fusionnées" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:48 msgid "print only refs that are not merged" msgstr "afficher seulement les références qui ne sont pas fusionnées" -#: builtin/for-each-ref.c:48 +#: builtin/for-each-ref.c:49 msgid "print only refs which contain the commit" msgstr "afficher seulement les références qui contiennent le commit" -#: builtin/for-each-ref.c:49 +#: builtin/for-each-ref.c:50 msgid "print only refs which don't contain the commit" msgstr "afficher seulement les références qui ne contiennent pas le commit" @@ -16102,125 +16034,125 @@ msgstr "%s : objet corrompu ou manquant : %s" msgid "%s: object is of unknown type '%s': %s" msgstr "%s : l'objet a un type '%s' inconnu : %s" -#: builtin/fsck.c:644 +#: builtin/fsck.c:645 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s : impossible d'analyser : %s" -#: builtin/fsck.c:664 +#: builtin/fsck.c:665 #, c-format msgid "bad sha1 file: %s" msgstr "mauvais fichier de sha1 : %s" -#: builtin/fsck.c:685 +#: builtin/fsck.c:686 msgid "Checking object directory" msgstr "Vérification du répertoire d'objet" -#: builtin/fsck.c:688 +#: builtin/fsck.c:689 msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" -#: builtin/fsck.c:704 +#: builtin/fsck.c:705 #, c-format msgid "Checking %s link" msgstr "Vérification du lien %s" -#: builtin/fsck.c:709 builtin/index-pack.c:859 +#: builtin/fsck.c:710 builtin/index-pack.c:859 #, c-format msgid "invalid %s" msgstr "%s invalide" -#: builtin/fsck.c:716 +#: builtin/fsck.c:717 #, c-format msgid "%s points to something strange (%s)" msgstr "%s pointe sur quelque chose bizarre (%s)" -#: builtin/fsck.c:722 +#: builtin/fsck.c:723 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s : la HEAD détachée ne pointe sur rien" -#: builtin/fsck.c:726 +#: builtin/fsck.c:727 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "note : %s pointe sur une branche non-née (%s)" -#: builtin/fsck.c:738 +#: builtin/fsck.c:739 msgid "Checking cache tree" msgstr "Vérification de l'arbre cache" -#: builtin/fsck.c:743 +#: builtin/fsck.c:744 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s : pointer sha1 invalide dans l'arbre de cache" -#: builtin/fsck.c:752 +#: builtin/fsck.c:753 msgid "non-tree in cache-tree" msgstr "non-arbre dans l'arbre de cache" -#: builtin/fsck.c:783 +#: builtin/fsck.c:784 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<options>] [<objet>...]" -#: builtin/fsck.c:789 +#: builtin/fsck.c:790 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:790 +#: builtin/fsck.c:791 msgid "show dangling objects" msgstr "afficher les objets en suspens" -#: builtin/fsck.c:791 +#: builtin/fsck.c:792 msgid "report tags" msgstr "afficher les étiquettes" -#: builtin/fsck.c:792 +#: builtin/fsck.c:793 msgid "report root nodes" msgstr "signaler les nœuds racines" -#: builtin/fsck.c:793 +#: builtin/fsck.c:794 msgid "make index objects head nodes" msgstr "considérer les objets de l'index comme nœuds tête" # translated from man page -#: builtin/fsck.c:794 +#: builtin/fsck.c:795 msgid "make reflogs head nodes (default)" msgstr "considérer les reflogs comme nœuds tête (par défaut)" -#: builtin/fsck.c:795 +#: builtin/fsck.c:796 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:796 +#: builtin/fsck.c:797 msgid "check only connectivity" msgstr "ne vérifier que la connectivité" -#: builtin/fsck.c:797 builtin/mktag.c:76 +#: builtin/fsck.c:798 builtin/mktag.c:76 msgid "enable more strict checking" msgstr "activer une vérification plus strict" -#: builtin/fsck.c:799 +#: builtin/fsck.c:800 msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:800 builtin/prune.c:134 +#: builtin/fsck.c:801 builtin/prune.c:146 msgid "show progress" msgstr "afficher la progression" -#: builtin/fsck.c:801 +#: builtin/fsck.c:802 msgid "show verbose names for reachable objects" msgstr "afficher les noms étendus pour les objets inaccessibles" -#: builtin/fsck.c:861 builtin/index-pack.c:261 +#: builtin/fsck.c:862 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Vérification des objets" -#: builtin/fsck.c:889 +#: builtin/fsck.c:890 #, c-format msgid "%s: object missing" msgstr "%s : objet manquant" -#: builtin/fsck.c:900 +#: builtin/fsck.c:901 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé" @@ -16239,17 +16171,12 @@ msgstr "Échec du stat de %s : %s" msgid "failed to parse '%s' value '%s'" msgstr "échec de l'analyse de '%s' valeur '%s'" -#: builtin/gc.c:487 builtin/init-db.c:57 +#: builtin/gc.c:488 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "impossible de faire un stat de '%s'" -#: builtin/gc.c:496 builtin/notes.c:238 builtin/tag.c:574 -#, c-format -msgid "cannot read '%s'" -msgstr "impossible de lire '%s'" - -#: builtin/gc.c:503 +#: builtin/gc.c:504 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -16265,56 +16192,56 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:551 +#: builtin/gc.c:552 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:553 +#: builtin/gc.c:554 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:554 +#: builtin/gc.c:555 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:557 +#: builtin/gc.c:558 msgid "force running gc even if there may be another gc running" msgstr "" "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes " "tourne déjà" -#: builtin/gc.c:560 +#: builtin/gc.c:561 msgid "repack all other packs except the largest pack" msgstr "recompacter tous les autres paquets excepté le plus gros paquet" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "impossible d'analyser gc.logexpiry %s" -#: builtin/gc.c:587 +#: builtin/gc.c:588 #, c-format msgid "failed to parse prune expiry value %s" msgstr "impossible d'analyser la valeur d'expiration d'élagage %s" -#: builtin/gc.c:607 +#: builtin/gc.c:608 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Compression automatique du dépôt en tâche de fond pour optimiser les " "performances.\n" -#: builtin/gc.c:609 +#: builtin/gc.c:610 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Compression du dépôt pour optimiser les performances.\n" -#: builtin/gc.c:610 +#: builtin/gc.c:611 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n" -#: builtin/gc.c:650 +#: builtin/gc.c:652 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -16322,216 +16249,216 @@ msgstr "" "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> " "(utilisez --force si ce n'est pas le cas)" -#: builtin/gc.c:705 +#: builtin/gc.c:707 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les " "supprimer." -#: builtin/gc.c:715 +#: builtin/gc.c:717 msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=<tâche>] [--schedule]" -#: builtin/gc.c:745 +#: builtin/gc.c:747 msgid "--no-schedule is not allowed" msgstr "--no-schedule n'est pas accepté" -#: builtin/gc.c:750 +#: builtin/gc.c:752 #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "argument de --schedule non reconnu, '%s'" -#: builtin/gc.c:868 +#: builtin/gc.c:870 msgid "failed to write commit-graph" msgstr "échec de l'écriture du graphe de commits" -#: builtin/gc.c:904 +#: builtin/gc.c:906 msgid "failed to prefetch remotes" msgstr "échec de la pré-récupération des distants" -#: builtin/gc.c:1020 +#: builtin/gc.c:1022 msgid "failed to start 'git pack-objects' process" msgstr "impossible de démarrer le processus 'git pack-objects'" -#: builtin/gc.c:1037 +#: builtin/gc.c:1039 msgid "failed to finish 'git pack-objects' process" msgstr "impossible de finir le processus 'git pack-objects'" -#: builtin/gc.c:1088 +#: builtin/gc.c:1090 msgid "failed to write multi-pack-index" msgstr "échec de l'écriture de l'index de multi-paquet" -#: builtin/gc.c:1104 +#: builtin/gc.c:1106 msgid "'git multi-pack-index expire' failed" msgstr "échec de 'git multi-pack-index expire'" -#: builtin/gc.c:1163 +#: builtin/gc.c:1165 msgid "'git multi-pack-index repack' failed" msgstr "échec de 'git multi-pack-index repack'" -#: builtin/gc.c:1172 +#: builtin/gc.c:1174 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" "tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé" -#: builtin/gc.c:1276 +#: builtin/gc.c:1278 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "le fichier verrou '%s' existe, pas de maintenance" -#: builtin/gc.c:1306 +#: builtin/gc.c:1308 #, c-format msgid "task '%s' failed" msgstr "échec de la tâche '%s'" -#: builtin/gc.c:1388 +#: builtin/gc.c:1390 #, c-format msgid "'%s' is not a valid task" msgstr "'%s' n'est pas une tâche valide" -#: builtin/gc.c:1393 +#: builtin/gc.c:1395 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "la tâche '%s' ne peut pas être sélectionnée plusieurs fois" -#: builtin/gc.c:1408 +#: builtin/gc.c:1410 msgid "run tasks based on the state of the repository" msgstr "lancer les tâches selon l'état du dépôt" -#: builtin/gc.c:1409 +#: builtin/gc.c:1411 msgid "frequency" msgstr "fréquence" -#: builtin/gc.c:1410 +#: builtin/gc.c:1412 msgid "run tasks based on frequency" msgstr "lancer les tâches selon une fréquence" -#: builtin/gc.c:1413 +#: builtin/gc.c:1415 msgid "do not report progress or other information over stderr" msgstr "ne pas afficher le progrès ou d'autres informations sur stderr" -#: builtin/gc.c:1414 +#: builtin/gc.c:1416 msgid "task" msgstr "tâche" -#: builtin/gc.c:1415 +#: builtin/gc.c:1417 msgid "run a specific task" msgstr "lancer une tâche spécifique" -#: builtin/gc.c:1432 +#: builtin/gc.c:1434 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "--auto et --schedule=<fréquence> sont mutuellement exclusifs" -#: builtin/gc.c:1475 +#: builtin/gc.c:1477 msgid "failed to run 'git config'" msgstr "échec du lancement de 'git config'" -#: builtin/gc.c:1627 +#: builtin/gc.c:1629 #, c-format msgid "failed to expand path '%s'" msgstr "impossible d'étendre le chemin '%s'" -#: builtin/gc.c:1654 builtin/gc.c:1692 +#: builtin/gc.c:1656 builtin/gc.c:1694 msgid "failed to start launchctl" msgstr "échec de démarrage de launchctl" -#: builtin/gc.c:1767 builtin/gc.c:2220 +#: builtin/gc.c:1769 builtin/gc.c:2237 #, c-format msgid "failed to create directories for '%s'" msgstr "échec de la création des répertoires pour '%s'" -#: builtin/gc.c:1794 +#: builtin/gc.c:1796 #, c-format msgid "failed to bootstrap service %s" msgstr "échec de l'amorçage du service %s" -#: builtin/gc.c:1887 +#: builtin/gc.c:1889 msgid "failed to create temp xml file" msgstr "échec de création du fichier temporaire xml" -#: builtin/gc.c:1977 +#: builtin/gc.c:1979 msgid "failed to start schtasks" msgstr "échec du démarrage de schtasks" -#: builtin/gc.c:2046 +#: builtin/gc.c:2063 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" "echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir " "'cron'" -#: builtin/gc.c:2063 +#: builtin/gc.c:2080 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" "echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir " "'cron'" -#: builtin/gc.c:2067 +#: builtin/gc.c:2084 msgid "failed to open stdin of 'crontab'" msgstr "échec à l'ouverture de stdin de 'crontab'" -#: builtin/gc.c:2109 +#: builtin/gc.c:2126 msgid "'crontab' died" msgstr "'crontab' est mort" -#: builtin/gc.c:2174 +#: builtin/gc.c:2191 msgid "failed to start systemctl" msgstr "échec du démarrage de systemctl" -#: builtin/gc.c:2184 +#: builtin/gc.c:2201 msgid "failed to run systemctl" msgstr "échec pour lancer systemctl" -#: builtin/gc.c:2193 builtin/gc.c:2198 builtin/worktree.c:62 -#: builtin/worktree.c:945 +#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:62 +#: builtin/worktree.c:944 #, c-format msgid "failed to delete '%s'" msgstr "échec de la suppression de '%s'" -#: builtin/gc.c:2378 +#: builtin/gc.c:2395 #, c-format msgid "unrecognized --scheduler argument '%s'" msgstr "argument '%s' de --scheduler non reconnu" -#: builtin/gc.c:2403 +#: builtin/gc.c:2420 msgid "neither systemd timers nor crontab are available" msgstr "ni les minuteurs systemd ni crontab ne sont disponibles" -#: builtin/gc.c:2418 +#: builtin/gc.c:2435 #, c-format msgid "%s scheduler is not available" msgstr "le planificateur %s n'est pas disponible" -#: builtin/gc.c:2432 +#: builtin/gc.c:2449 msgid "another process is scheduling background maintenance" msgstr "" "un autre processus est en train de programmer une maintenance en tâche de " "fond" -#: builtin/gc.c:2454 +#: builtin/gc.c:2471 msgid "git maintenance start [--scheduler=<scheduler>]" msgstr "git maintenance start [--scheduler=<planificateur>]" -#: builtin/gc.c:2463 +#: builtin/gc.c:2480 msgid "scheduler" msgstr "planificateur" -#: builtin/gc.c:2464 +#: builtin/gc.c:2481 msgid "scheduler to trigger git maintenance run" msgstr "planificateur qui lancera les maintenances git" -#: builtin/gc.c:2478 +#: builtin/gc.c:2495 msgid "failed to add repo to global config" msgstr "échec de l'ajout du dépôt à la config globale" -#: builtin/gc.c:2487 +#: builtin/gc.c:2504 msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <subcommand> [<options>]" -#: builtin/gc.c:2506 +#: builtin/gc.c:2523 #, c-format msgid "invalid subcommand: %s" msgstr "sous-commande invalide : %s" @@ -16909,25 +16836,25 @@ msgstr "git help [-c|--config]" msgid "unrecognized help format '%s'" msgstr "format d'aide non reconnu '%s'" -#: builtin/help.c:223 +#: builtin/help.c:222 msgid "Failed to start emacsclient." msgstr "Échec de démarrage d'emacsclient." -#: builtin/help.c:236 +#: builtin/help.c:235 msgid "Failed to parse emacsclient version." msgstr "Échec d'analyse de la version d'emacsclient." -#: builtin/help.c:244 +#: builtin/help.c:243 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la version d'emacsclient '%d' est trop ancienne (<22)." -#: builtin/help.c:262 builtin/help.c:284 builtin/help.c:294 builtin/help.c:302 +#: builtin/help.c:261 builtin/help.c:283 builtin/help.c:293 builtin/help.c:301 #, c-format msgid "failed to exec '%s'" msgstr "échec de l'exécution de '%s'" -#: builtin/help.c:340 +#: builtin/help.c:339 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -16936,7 +16863,7 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n" "Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:352 +#: builtin/help.c:351 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -16945,39 +16872,39 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n" "Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:467 +#: builtin/help.c:466 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s' : visualiseur de manuel inconnu." -#: builtin/help.c:483 +#: builtin/help.c:482 msgid "no man viewer handled the request" msgstr "aucun visualiseur de manuel n'a pris en charge la demande" -#: builtin/help.c:490 +#: builtin/help.c:489 msgid "no info viewer handled the request" msgstr "aucun visualiseur de 'info' n'a pris en charge la demande" -#: builtin/help.c:551 builtin/help.c:562 git.c:348 +#: builtin/help.c:550 builtin/help.c:561 git.c:348 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' est un alias de '%s'" -#: builtin/help.c:565 git.c:380 +#: builtin/help.c:564 git.c:380 #, c-format msgid "bad alias.%s string: %s" msgstr "mauvais chaîne alias.%s : %s" -#: builtin/help.c:581 +#: builtin/help.c:580 msgid "this option doesn't take any other arguments" -msgstr "Cette option n'accepte pas d'autre argument" +msgstr "cette option n'accepte pas d'autre argument" -#: builtin/help.c:602 builtin/help.c:629 +#: builtin/help.c:601 builtin/help.c:628 #, c-format msgid "usage: %s%s" msgstr "usage : %s%s" -#: builtin/help.c:624 +#: builtin/help.c:623 msgid "'git help config' for more information" msgstr "'git help config' pour plus d'information" @@ -17245,18 +17172,10 @@ msgstr "mauvais %s" msgid "unknown hash algorithm '%s'" msgstr "algorithme d'empreinte inconnu '%s'" -#: builtin/index-pack.c:1848 -msgid "--fix-thin cannot be used without --stdin" -msgstr "--fix-thin ne peut pas être utilisé sans --stdin" - #: builtin/index-pack.c:1850 msgid "--stdin requires a git repository" msgstr "--stdin requiert un dépôt git" -#: builtin/index-pack.c:1852 -msgid "--object-format cannot be used with --stdin" -msgstr "--object-format ne peut pas être utilisé avec --stdin" - #: builtin/index-pack.c:1867 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" @@ -17382,10 +17301,6 @@ msgstr "empreinte" msgid "specify the hash algorithm to use" msgstr "spécifier l'algorithme d'empreinte à utiliser" -#: builtin/init-db.c:560 -msgid "--separate-git-dir and --bare are mutually exclusive" -msgstr "--separate-git-dir et --bare sont mutuellement exclusifs" - #: builtin/init-db.c:591 builtin/init-db.c:596 #, c-format msgid "cannot mkdir %s" @@ -17520,85 +17435,85 @@ msgid "-L<range>:<file> cannot be used with pathspec" msgstr "" "-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin" -#: builtin/log.c:306 +#: builtin/log.c:321 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:571 +#: builtin/log.c:586 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:586 builtin/log.c:676 +#: builtin/log.c:601 builtin/log.c:691 #, c-format msgid "could not read object %s" msgstr "impossible de lire l'objet %s" -#: builtin/log.c:701 +#: builtin/log.c:716 #, c-format msgid "unknown type: %d" msgstr "type inconnu : %d" -#: builtin/log.c:846 +#: builtin/log.c:861 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s : couverture invalide pour le mode de description" -#: builtin/log.c:853 +#: builtin/log.c:868 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:982 +#: builtin/log.c:997 #, c-format msgid "cannot open patch file %s" msgstr "impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:999 +#: builtin/log.c:1014 msgid "need exactly one range" msgstr "exactement une plage nécessaire" -#: builtin/log.c:1009 +#: builtin/log.c:1024 msgid "not a range" msgstr "ceci n'est pas une plage" -#: builtin/log.c:1173 +#: builtin/log.c:1188 msgid "cover letter needs email format" msgstr "la lettre de motivation doit être au format courriel" -#: builtin/log.c:1179 +#: builtin/log.c:1194 msgid "failed to create cover-letter file" msgstr "échec de création du fichier de lettre de motivation" -#: builtin/log.c:1266 +#: builtin/log.c:1281 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1293 +#: builtin/log.c:1308 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1351 +#: builtin/log.c:1366 msgid "two output directories?" msgstr "deux répertoires de sortie ?" -#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342 +#: builtin/log.c:1517 builtin/log.c:2344 builtin/log.c:2346 builtin/log.c:2358 #, c-format msgid "unknown commit %s" msgstr "commit inconnu %s" -#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1528 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "échec à résoudre '%s' comme une référence valide" -#: builtin/log.c:1522 +#: builtin/log.c:1537 msgid "could not find exact merge base" msgstr "impossible de trouver la base de fusion exacte" -#: builtin/log.c:1532 +#: builtin/log.c:1547 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -17611,301 +17526,285 @@ msgstr "" "Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> " "manuellement" -#: builtin/log.c:1555 +#: builtin/log.c:1570 msgid "failed to find exact merge base" msgstr "échec à trouver la base de fusion exacte" -#: builtin/log.c:1572 +#: builtin/log.c:1587 msgid "base commit should be the ancestor of revision list" msgstr "le commit de base devrait être l'ancêtre de la liste de révisions" -#: builtin/log.c:1582 +#: builtin/log.c:1597 msgid "base commit shouldn't be in revision list" msgstr "le commit de base ne devrait pas faire partie de la liste de révisions" -#: builtin/log.c:1640 +#: builtin/log.c:1655 msgid "cannot get patch id" msgstr "impossible d'obtenir l'id du patch" -#: builtin/log.c:1703 +#: builtin/log.c:1718 msgid "failed to infer range-diff origin of current series" msgstr "" "échec d'inférence de l'origine de différence d'intervalles de la série " "actuelle" -#: builtin/log.c:1705 +#: builtin/log.c:1720 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "" "utilisation de '%s' comme une différence d'intervalle pour la série actuelle" -#: builtin/log.c:1749 +#: builtin/log.c:1764 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1752 +#: builtin/log.c:1767 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1756 +#: builtin/log.c:1771 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1758 +#: builtin/log.c:1773 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1760 +#: builtin/log.c:1775 msgid "use simple number sequence for output file names" msgstr "" "utiliser une séquence simple de nombres pour les nom des fichiers de sortie" -#: builtin/log.c:1761 +#: builtin/log.c:1776 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1762 +#: builtin/log.c:1777 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1764 +#: builtin/log.c:1779 msgid "start numbering patches at <n> instead of 1" msgstr "démarrer la numérotation des patchs à <n> au lieu de 1" -#: builtin/log.c:1765 +#: builtin/log.c:1780 msgid "reroll-count" msgstr "reroll-count" -#: builtin/log.c:1766 +#: builtin/log.c:1781 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1768 +#: builtin/log.c:1783 msgid "max length of output filename" msgstr "taille maximum du nom du fichier de sortie" -#: builtin/log.c:1770 +#: builtin/log.c:1785 msgid "use [RFC PATCH] instead of [PATCH]" msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" -#: builtin/log.c:1773 +#: builtin/log.c:1788 msgid "cover-from-description-mode" msgstr "cover-from-description-mode" -#: builtin/log.c:1774 +#: builtin/log.c:1789 msgid "generate parts of a cover letter based on a branch's description" msgstr "" "générer des parties de la lettre d'introduction à partir de la description " "de la branche" -#: builtin/log.c:1776 +#: builtin/log.c:1791 msgid "use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1779 +#: builtin/log.c:1794 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1782 +#: builtin/log.c:1797 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1785 +#: builtin/log.c:1800 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1787 +#: builtin/log.c:1802 msgid "output all-zero hash in From header" msgstr "écrire une empreinte à zéro dans l'entête From" -#: builtin/log.c:1789 +#: builtin/log.c:1804 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1791 +#: builtin/log.c:1806 msgid "show patch format instead of default (patch + stat)" msgstr "afficher le format du patch au lieu du défaut (patch + stat)" -#: builtin/log.c:1793 +#: builtin/log.c:1808 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1794 +#: builtin/log.c:1809 msgid "header" msgstr "en-tête" -#: builtin/log.c:1795 +#: builtin/log.c:1810 msgid "add email header" msgstr "ajouter l'en-tête de courriel" -#: builtin/log.c:1796 builtin/log.c:1797 +#: builtin/log.c:1811 builtin/log.c:1812 msgid "email" msgstr "courriel" -#: builtin/log.c:1796 +#: builtin/log.c:1811 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1797 +#: builtin/log.c:1812 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1798 +#: builtin/log.c:1813 msgid "ident" msgstr "ident" -#: builtin/log.c:1799 +#: builtin/log.c:1814 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" -#: builtin/log.c:1801 +#: builtin/log.c:1816 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1802 +#: builtin/log.c:1817 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1803 builtin/log.c:1806 +#: builtin/log.c:1818 builtin/log.c:1821 msgid "boundary" msgstr "limite" -#: builtin/log.c:1804 +#: builtin/log.c:1819 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1807 +#: builtin/log.c:1822 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1811 +#: builtin/log.c:1826 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1813 +#: builtin/log.c:1828 msgid "signature" msgstr "signature" -#: builtin/log.c:1814 +#: builtin/log.c:1829 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1815 +#: builtin/log.c:1830 msgid "base-commit" msgstr "commit-de-base" -#: builtin/log.c:1816 +#: builtin/log.c:1831 msgid "add prerequisite tree info to the patch series" msgstr "ajouter un arbre prérequis à la série de patchs" -#: builtin/log.c:1819 +#: builtin/log.c:1834 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1820 +#: builtin/log.c:1835 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1822 +#: builtin/log.c:1837 msgid "show progress while generating patches" msgstr "" "afficher la barre de progression durant la phase de génération des patchs" -#: builtin/log.c:1824 +#: builtin/log.c:1839 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "afficher les modifications par rapport à <rév> dans la première page ou une " "rustine" -#: builtin/log.c:1827 +#: builtin/log.c:1842 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "afficher les modifications par rapport à <refspec> dans la première page ou " "une rustine" -#: builtin/log.c:1829 builtin/range-diff.c:28 +#: builtin/log.c:1844 builtin/range-diff.c:28 msgid "percentage by which creation is weighted" msgstr "pourcentage par lequel la création est pondérée" -#: builtin/log.c:1916 +#: builtin/log.c:1931 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/log.c:1931 -msgid "-n and -k are mutually exclusive" -msgstr "-n et -k sont mutuellement exclusifs" - -#: builtin/log.c:1933 -msgid "--subject-prefix/--rfc and -k are mutually exclusive" -msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs" - -#: builtin/log.c:1941 +#: builtin/log.c:1956 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1943 +#: builtin/log.c:1958 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1945 +#: builtin/log.c:1960 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1967 -msgid "--stdout, --output, and --output-directory are mutually exclusive" -msgstr "--stdout, --output, et --output-directory sont mutuellement exclusifs" - -#: builtin/log.c:2089 +#: builtin/log.c:2104 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:2093 +#: builtin/log.c:2108 msgid "Interdiff:" msgstr "Interdiff :" -#: builtin/log.c:2094 +#: builtin/log.c:2109 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contre v%d :" -#: builtin/log.c:2100 -msgid "--creation-factor requires --range-diff" -msgstr "--creation-factor requiert --range-diff" - -#: builtin/log.c:2104 +#: builtin/log.c:2119 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:2112 +#: builtin/log.c:2127 msgid "Range-diff:" msgstr "Diff-intervalle :" -#: builtin/log.c:2113 +#: builtin/log.c:2128 #, c-format msgid "Range-diff against v%d:" msgstr "Diff-intervalle contre v%d :" -#: builtin/log.c:2124 +#: builtin/log.c:2139 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:2160 +#: builtin/log.c:2175 msgid "Generating patches" msgstr "Génération des patchs" -#: builtin/log.c:2204 +#: builtin/log.c:2219 msgid "failed to create output files" msgstr "échec de création des fichiers en sortie" -#: builtin/log.c:2263 +#: builtin/log.c:2279 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:2317 +#: builtin/log.c:2333 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -17913,121 +17812,125 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spécifier " "<branche_amont> manuellement.\n" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:564 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<options>] [<fichier>...]" -#: builtin/ls-files.c:615 +#: builtin/ls-files.c:618 msgid "separate paths with the NUL character" msgstr "séparer les chemins par un caractère NUL" -#: builtin/ls-files.c:617 +#: builtin/ls-files.c:620 msgid "identify the file status with tags" msgstr "identifier l'état de fichier avec les étiquettes" -#: builtin/ls-files.c:619 +#: builtin/ls-files.c:622 msgid "use lowercase letters for 'assume unchanged' files" msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'" -#: builtin/ls-files.c:621 +#: builtin/ls-files.c:624 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'" -#: builtin/ls-files.c:623 +#: builtin/ls-files.c:626 msgid "show cached files in the output (default)" msgstr "afficher les fichiers mis en cache dans la sortie (défaut)" -#: builtin/ls-files.c:625 +#: builtin/ls-files.c:628 msgid "show deleted files in the output" msgstr "afficher les fichiers supprimés dans la sortie" -#: builtin/ls-files.c:627 +#: builtin/ls-files.c:630 msgid "show modified files in the output" msgstr "afficher les fichiers modifiés dans la sortie" -#: builtin/ls-files.c:629 +#: builtin/ls-files.c:632 msgid "show other files in the output" msgstr "afficher les autres fichiers dans la sortie" -#: builtin/ls-files.c:631 +#: builtin/ls-files.c:634 msgid "show ignored files in the output" msgstr "afficher les fichiers ignorés dans la sortie" -#: builtin/ls-files.c:634 +#: builtin/ls-files.c:637 msgid "show staged contents' object name in the output" msgstr "afficher les nom des objets indexés dans la sortie" -#: builtin/ls-files.c:636 +#: builtin/ls-files.c:639 msgid "show files on the filesystem that need to be removed" msgstr "" "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés" -#: builtin/ls-files.c:638 +#: builtin/ls-files.c:641 msgid "show 'other' directories' names only" msgstr "afficher seulement les noms des répertoires 'other'" -#: builtin/ls-files.c:640 +#: builtin/ls-files.c:643 msgid "show line endings of files" msgstr "afficher les fins de lignes des fichiers" -#: builtin/ls-files.c:642 +#: builtin/ls-files.c:645 msgid "don't show empty directories" msgstr "ne pas afficher les répertoires vides" -#: builtin/ls-files.c:645 +#: builtin/ls-files.c:648 msgid "show unmerged files in the output" msgstr "afficher les fichiers non fusionnés dans la sortie" -#: builtin/ls-files.c:647 +#: builtin/ls-files.c:650 msgid "show resolve-undo information" msgstr "afficher l'information resolv-undo" -#: builtin/ls-files.c:649 +#: builtin/ls-files.c:652 msgid "skip files matching pattern" msgstr "sauter les fichiers correspondant au motif" -#: builtin/ls-files.c:652 +#: builtin/ls-files.c:655 msgid "read exclude patterns from <file>" msgstr "lire les motifs d'exclusion depuis <fichier>" -#: builtin/ls-files.c:655 +#: builtin/ls-files.c:658 msgid "read additional per-directory exclude patterns in <file>" msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>" -#: builtin/ls-files.c:657 +#: builtin/ls-files.c:660 msgid "add the standard git exclusions" msgstr "ajouter les exclusions git standard" -#: builtin/ls-files.c:661 +#: builtin/ls-files.c:664 msgid "make the output relative to the project top directory" msgstr "afficher en relatif par rapport au répertoire racine du projet" -#: builtin/ls-files.c:664 +#: builtin/ls-files.c:667 msgid "recurse through submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/ls-files.c:666 +#: builtin/ls-files.c:669 msgid "if any <file> is not in the index, treat this as an error" msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur" -#: builtin/ls-files.c:667 +#: builtin/ls-files.c:670 msgid "tree-ish" msgstr "arbre ou apparenté" -#: builtin/ls-files.c:668 +#: builtin/ls-files.c:671 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "considérer que les chemins supprimés depuis <arbre ou apparenté> sont " "toujours présents" -#: builtin/ls-files.c:670 +#: builtin/ls-files.c:673 msgid "show debugging data" msgstr "afficher les données de débogage" -#: builtin/ls-files.c:672 +#: builtin/ls-files.c:675 msgid "suppress duplicate entries" msgstr "supprimer les entrées dupliquées" +#: builtin/ls-files.c:677 +msgid "show sparse directories in the presence of a sparse index" +msgstr "afficher les répertoires clairsemés en présence d'un index clairsemé" + #: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -18225,26 +18128,30 @@ msgid "use a diff3 based merge" msgstr "utiliser une fusion basée sur diff3" #: builtin/merge-file.c:37 +msgid "use a zealous diff3 based merge" +msgstr "utiliser une fusion basée sur un diff3 zélée" + +#: builtin/merge-file.c:39 msgid "for conflicts, use our version" msgstr "pour les conflits, utiliser notre version (our)" -#: builtin/merge-file.c:39 +#: builtin/merge-file.c:41 msgid "for conflicts, use their version" msgstr "pour les conflits, utiliser leur version (their)" -#: builtin/merge-file.c:41 +#: builtin/merge-file.c:43 msgid "for conflicts, use a union version" msgstr "pour les conflits, utiliser l'ensemble des versions" -#: builtin/merge-file.c:44 +#: builtin/merge-file.c:46 msgid "for conflicts, use this marker size" msgstr "pour les conflits, utiliser cette taille de marqueur" -#: builtin/merge-file.c:45 +#: builtin/merge-file.c:47 msgid "do not warn about conflicts" msgstr "ne pas avertir à propos des conflits" -#: builtin/merge-file.c:47 +#: builtin/merge-file.c:49 msgid "set labels for file1/orig-file/file2" msgstr "définir les labels pour fichier1/fichier-orig/fichier2" @@ -18283,182 +18190,186 @@ msgstr "Fusion de %s avec %s\n" msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<options>] [<commit>...]" -#: builtin/merge.c:124 +#: builtin/merge.c:125 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:147 +#: builtin/merge.c:148 #, c-format msgid "option `%s' requires a value" msgstr "le commutateur '%s' a besoin d'une valeur" -#: builtin/merge.c:200 +#: builtin/merge.c:201 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" -#: builtin/merge.c:201 +#: builtin/merge.c:202 #, c-format msgid "Available strategies are:" msgstr "Les stratégies disponibles sont :" -#: builtin/merge.c:206 +#: builtin/merge.c:207 #, c-format msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:257 builtin/pull.c:134 +#: builtin/merge.c:258 builtin/pull.c:134 msgid "do not show a diffstat at the end of the merge" msgstr "ne pas afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:260 builtin/pull.c:137 +#: builtin/merge.c:261 builtin/pull.c:137 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:261 builtin/pull.c:140 +#: builtin/merge.c:262 builtin/pull.c:140 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:263 builtin/pull.c:143 +#: builtin/merge.c:264 builtin/pull.c:143 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "ajouter (au plus <n>) éléments du journal court au message de validation de " "la fusion" -#: builtin/merge.c:266 builtin/pull.c:149 +#: builtin/merge.c:267 builtin/pull.c:149 msgid "create a single commit instead of doing a merge" msgstr "créer une validation unique au lieu de faire une fusion" -#: builtin/merge.c:268 builtin/pull.c:152 +#: builtin/merge.c:269 builtin/pull.c:152 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:270 builtin/pull.c:155 +#: builtin/merge.c:271 builtin/pull.c:155 msgid "edit message before committing" msgstr "éditer le message avant la validation" -#: builtin/merge.c:272 +#: builtin/merge.c:273 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:274 builtin/pull.c:162 +#: builtin/merge.c:275 builtin/pull.c:162 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:278 builtin/pull.c:168 +#: builtin/merge.c:279 builtin/pull.c:168 msgid "verify that the named commit has a valid GPG signature" msgstr "vérifier que le commit nommé a une signature GPG valide" -#: builtin/merge.c:279 builtin/notes.c:785 builtin/pull.c:172 +#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172 #: builtin/rebase.c:1117 builtin/revert.c:114 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:280 builtin/pull.c:173 +#: builtin/merge.c:281 builtin/pull.c:173 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:281 builtin/pull.c:176 +#: builtin/merge.c:282 builtin/pull.c:176 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:282 builtin/pull.c:177 +#: builtin/merge.c:283 builtin/pull.c:177 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:284 +#: builtin/merge.c:285 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "message de validation de la fusion (pour une fusion sans avance rapide)" #: builtin/merge.c:291 +msgid "use <name> instead of the real target" +msgstr "utiliser <nom> au lieu de la cible réelle" + +#: builtin/merge.c:294 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:293 +#: builtin/merge.c:296 msgid "--abort but leave index and working tree alone" msgstr "--abort mais laisser l'index et l'arbre de travail inchangés" -#: builtin/merge.c:295 +#: builtin/merge.c:298 msgid "continue the current in-progress merge" msgstr "continuer la fusion en cours" -#: builtin/merge.c:297 builtin/pull.c:184 +#: builtin/merge.c:300 builtin/pull.c:184 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" -#: builtin/merge.c:304 +#: builtin/merge.c:307 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg" -#: builtin/merge.c:321 +#: builtin/merge.c:323 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:326 +#: builtin/merge.c:328 msgid "stash failed" msgstr "échec du remisage" -#: builtin/merge.c:331 +#: builtin/merge.c:333 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:353 builtin/merge.c:370 +#: builtin/merge.c:355 builtin/merge.c:372 msgid "read-tree failed" msgstr "read-tree a échoué" -#: builtin/merge.c:401 +#: builtin/merge.c:403 msgid "Already up to date. (nothing to squash)" msgstr "Déjà à jour. (rien à compresser)" -#: builtin/merge.c:415 +#: builtin/merge.c:417 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressée -- HEAD non mise à jour\n" -#: builtin/merge.c:465 +#: builtin/merge.c:467 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n" -#: builtin/merge.c:515 +#: builtin/merge.c:517 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:603 +#: builtin/merge.c:605 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:730 +#: builtin/merge.c:732 msgid "Not handling anything other than two heads merge." msgstr "Impossible de gérer autre chose que la fusion de deux têtes." -#: builtin/merge.c:743 +#: builtin/merge.c:745 #, c-format msgid "unknown strategy option: -X%s" msgstr "option de stratégie inconnue : -X%s" -#: builtin/merge.c:762 t/helper/test-fast-rebase.c:223 +#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:814 +#: builtin/merge.c:816 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:823 +#: builtin/merge.c:825 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la " "fusion.\n" -#: builtin/merge.c:829 +#: builtin/merge.c:831 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -18470,11 +18381,11 @@ msgstr "" "branche de sujet.\n" "\n" -#: builtin/merge.c:834 +#: builtin/merge.c:836 msgid "An empty message aborts the commit.\n" msgstr "Un message vide abandonne la validation.\n" -#: builtin/merge.c:837 +#: builtin/merge.c:839 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -18483,74 +18394,74 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:892 +#: builtin/merge.c:894 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:907 +#: builtin/merge.c:909 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:968 +#: builtin/merge.c:970 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "La fusion automatique a échoué ; réglez les conflits et validez le " "résultat.\n" -#: builtin/merge.c:1007 +#: builtin/merge.c:1009 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:1009 +#: builtin/merge.c:1011 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:1011 +#: builtin/merge.c:1013 msgid "No default upstream defined for the current branch." msgstr "Pas de branche amont par défaut définie pour la branche courante." -#: builtin/merge.c:1016 +#: builtin/merge.c:1018 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1073 +#: builtin/merge.c:1075 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1174 +#: builtin/merge.c:1177 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" -#: builtin/merge.c:1208 +#: builtin/merge.c:1211 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" -#: builtin/merge.c:1321 +#: builtin/merge.c:1324 msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" -#: builtin/merge.c:1325 +#: builtin/merge.c:1328 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)." -#: builtin/merge.c:1343 +#: builtin/merge.c:1346 msgid "--quit expects no arguments" msgstr "--quit n'accepte pas d'argument" -#: builtin/merge.c:1356 +#: builtin/merge.c:1359 msgid "--continue expects no arguments" msgstr "--continue ne supporte aucun argument" -#: builtin/merge.c:1360 +#: builtin/merge.c:1363 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)." -#: builtin/merge.c:1376 +#: builtin/merge.c:1379 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -18558,7 +18469,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1383 +#: builtin/merge.c:1386 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -18566,86 +18477,78 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1386 +#: builtin/merge.c:1389 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)." -#: builtin/merge.c:1400 -msgid "You cannot combine --squash with --no-ff." -msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." - -#: builtin/merge.c:1402 -msgid "You cannot combine --squash with --commit." -msgstr "Vous ne pouvez pas combiner --squash avec --commit." - -#: builtin/merge.c:1418 +#: builtin/merge.c:1421 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini." -#: builtin/merge.c:1435 +#: builtin/merge.c:1438 msgid "Squash commit into empty head not supported yet" msgstr "La validation compressée vers une tête vide n'est pas encore supportée" -#: builtin/merge.c:1437 +#: builtin/merge.c:1440 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide" -#: builtin/merge.c:1442 +#: builtin/merge.c:1445 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1444 +#: builtin/merge.c:1447 msgid "Can merge only exactly one commit into empty head" msgstr "" "Possible de fusionner exactement une seule validation dans une tête vide" -#: builtin/merge.c:1531 +#: builtin/merge.c:1534 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1550 +#: builtin/merge.c:1553 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1598 +#: builtin/merge.c:1601 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1608 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1664 builtin/merge.c:1730 +#: builtin/merge.c:1667 builtin/merge.c:1733 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1668 +#: builtin/merge.c:1671 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1720 +#: builtin/merge.c:1723 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n" -#: builtin/merge.c:1722 +#: builtin/merge.c:1725 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1732 +#: builtin/merge.c:1735 #, c-format msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "Utilisation de %s pour préparer la résolution à la main.\n" -#: builtin/merge.c:1746 +#: builtin/merge.c:1749 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -18688,7 +18591,7 @@ msgstr "l'étiquette sur stdin n'a pas passé le test strict fsck" msgid "tag on stdin did not refer to a valid object" msgstr "l'étiquette sur stdin ne pointe pas sur un objet valide" -#: builtin/mktag.c:104 builtin/tag.c:243 +#: builtin/mktag.c:104 builtin/tag.c:242 msgid "unable to write tag file" msgstr "impossible d'écrire le fichier d'étiquettes" @@ -18754,7 +18657,7 @@ msgstr "écrire l'index multi-paquet ne contenant que les index fournis" msgid "refs snapshot for selecting bitmap commits" msgstr "instantané des réfs pour sélectionner les commits de bitmap" -#: builtin/multi-pack-index.c:202 +#: builtin/multi-pack-index.c:206 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -18855,54 +18758,54 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:853 +#: builtin/mv.c:314 builtin/remote.c:790 builtin/repack.c:857 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:474 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<options>] <validation>..." -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:475 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<options>] --all" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:476 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<options>] --stdin" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c:533 msgid "print only ref-based names (no object names)" msgstr "" "afficher seulement les noms basés sur des références (pas de nom d'objet)" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:534 msgid "only use tags to name the commits" msgstr "utiliser seulement les étiquettes pour nommer les validations" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:536 msgid "only use refs matching <pattern>" msgstr "utiliser seulement les références correspondant à <motif>" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:538 msgid "ignore refs matching <pattern>" msgstr "ignorer les références correspondant à <motif>" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:540 msgid "list all commits reachable from all refs" msgstr "" "afficher toutes les validations accessibles depuis toutes les références" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:541 msgid "read from stdin" msgstr "lire depuis l'entrée standard" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:542 msgid "allow to print `undefined` names (default)" msgstr "autoriser l'affichage des noms `non définis` (par défaut)" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:548 msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" @@ -19022,25 +18925,25 @@ msgstr "git notes get-ref" msgid "Write/edit the notes for the following object:" msgstr "Écrire/éditer les notes pour l'objet suivant :" -#: builtin/notes.c:150 +#: builtin/notes.c:149 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "impossible de démarrer 'show' pour l'objet '%s'" -#: builtin/notes.c:154 +#: builtin/notes.c:153 msgid "could not read 'show' output" msgstr "impossible de lire la sortie de 'show'" -#: builtin/notes.c:162 +#: builtin/notes.c:161 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "impossible de finir 'show' pour l'objet '%s'" -#: builtin/notes.c:195 +#: builtin/notes.c:194 msgid "please supply the note contents using either -m or -F option" msgstr "veuillez fournir le contenu de la note en utilisant l'option -m ou -F" -#: builtin/notes.c:204 +#: builtin/notes.c:203 msgid "unable to write note object" msgstr "impossible d'écrire l'objet note" @@ -19049,7 +18952,7 @@ msgstr "impossible d'écrire l'objet note" msgid "the note contents have been left in %s" msgstr "le contenu de la note a été laissé dans %s" -#: builtin/notes.c:240 builtin/tag.c:577 +#: builtin/notes.c:240 builtin/tag.c:581 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" @@ -19091,8 +18994,8 @@ msgstr "refus de faire %s sur des notes dans %s (hors de refs/notes/)" #: builtin/notes.c:374 builtin/notes.c:429 builtin/notes.c:507 #: builtin/notes.c:519 builtin/notes.c:596 builtin/notes.c:663 -#: builtin/notes.c:813 builtin/notes.c:961 builtin/notes.c:983 -#: builtin/prune-packed.c:25 builtin/tag.c:587 +#: builtin/notes.c:813 builtin/notes.c:965 builtin/notes.c:987 +#: builtin/prune-packed.c:25 builtin/receive-pack.c:2487 builtin/tag.c:591 msgid "too many arguments" msgstr "trop d'arguments" @@ -19139,7 +19042,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "Écrasement des notes existantes pour l'objet %s\n" -#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:900 +#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904 #, c-format msgid "Removing note for object %s\n" msgstr "Suppression de la note pour l'objet %s\n" @@ -19262,18 +19165,18 @@ msgstr "vous devez spécifier une référence de notes à fusionner" msgid "unknown -s/--strategy: %s" msgstr "-s/--strategy inconnu : %s" -#: builtin/notes.c:871 +#: builtin/notes.c:874 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "une fusion de notes dans %s est déjà en cours avec %s" -#: builtin/notes.c:874 +#: builtin/notes.c:878 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" "impossible de stocker le lien vers la référence actuelle aux notes (%s)" -#: builtin/notes.c:876 +#: builtin/notes.c:880 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -19284,42 +19187,42 @@ msgstr "" "validez le résultat avec 'git notes merges --commit', ou abandonnez la " "fusion avec 'git notes merge --abort'.\n" -#: builtin/notes.c:895 builtin/tag.c:590 +#: builtin/notes.c:899 builtin/tag.c:594 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Impossible de résoudre '%s' comme une référence valide." -#: builtin/notes.c:898 +#: builtin/notes.c:902 #, c-format msgid "Object %s has no note\n" msgstr "L'objet %s n'a pas de note\n" -#: builtin/notes.c:910 +#: builtin/notes.c:914 msgid "attempt to remove non-existent note is not an error" msgstr "" "la tentative de suppression d'une note non existante n'est pas une erreur" -#: builtin/notes.c:913 +#: builtin/notes.c:917 msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:952 builtin/prune.c:132 builtin/worktree.c:147 +#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:147 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" -#: builtin/notes.c:953 +#: builtin/notes.c:957 msgid "report pruned notes" msgstr "afficher les notes éliminées" -#: builtin/notes.c:996 +#: builtin/notes.c:1000 msgid "notes-ref" msgstr "références-notes" -#: builtin/notes.c:997 +#: builtin/notes.c:1001 msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" -#: builtin/notes.c:1032 builtin/stash.c:1752 +#: builtin/notes.c:1036 builtin/stash.c:1818 #, c-format msgid "unknown subcommand: %s" msgstr "sous-commande inconnue : %s" @@ -19730,10 +19633,6 @@ msgstr "la taille limite minimale d'un paquet est 1 MiB" 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:4073 -msgid "--keep-unreachable and --unpack-unreachable are incompatible" -msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles" - #: builtin/pack-objects.c:4079 msgid "cannot use --filter without --stdout" msgstr "impossible d'utiliser --filter sans --stdout" @@ -19750,7 +19649,7 @@ msgstr "impossible d'utiliser un liste interne de révisions avec --stdin-packs" msgid "Enumerating objects" msgstr "Énumération des objets" -#: builtin/pack-objects.c:4181 +#: builtin/pack-objects.c:4180 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -19793,19 +19692,19 @@ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>…]" -#: builtin/prune.c:133 +#: builtin/prune.c:145 msgid "report pruned objects" msgstr "afficher les objets éliminés" -#: builtin/prune.c:136 +#: builtin/prune.c:148 msgid "expire objects older than <time>" msgstr "faire expirer les objets plus vieux que <heure>" -#: builtin/prune.c:138 +#: builtin/prune.c:150 msgid "limit traversal to objects outside promisor packfiles" msgstr "limiter la traversée aux objets hors des fichiers paquets prometteurs" -#: builtin/prune.c:151 +#: builtin/prune.c:163 msgid "cannot prune in a precious-objects repo" msgstr "impossible de nettoyer dans un dépôt d'objets précieux" @@ -19838,7 +19737,7 @@ msgstr "autoriser l'avance rapide" msgid "control use of pre-merge-commit and commit-msg hooks" msgstr "contrôler l'utilisation des crochets pre-merge-commit et commit-msg" -#: builtin/pull.c:171 parse-options.h:338 +#: builtin/pull.c:171 parse-options.h:340 msgid "automatically stash/stash pop before and after" msgstr "remiser et réappliquer automatiquement avant et après" @@ -19916,6 +19815,7 @@ msgid "<remote>" msgstr "<distant>" #: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487 +#: contrib/scalar/scalar.c:375 msgid "<branch>" msgstr "<branche>" @@ -19949,13 +19849,13 @@ msgstr "impossible d'accéder le commit %s" msgid "ignoring --verify-signatures for rebase" msgstr "--verify-signatures est ignoré pour un rebasage" -#: builtin/pull.c:942 +#: builtin/pull.c:969 msgid "" "You have divergent branches and need to specify how to reconcile them.\n" "You can do so by running one of the following commands sometime before\n" "your next pull:\n" "\n" -" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase false # merge\n" " git config pull.rebase true # rebase\n" " git config pull.ff only # fast-forward only\n" "\n" @@ -19978,21 +19878,21 @@ msgstr "" "passer --rebase, --no-rebase ou --ff-only sur la ligne de commande pour\n" "remplacer à l'invocation la valeur par défaut configurée.\n" -#: builtin/pull.c:1016 +#: builtin/pull.c:1046 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Mise à jour d'une branche non encore créée avec les changements ajoutés dans " "l'index." -#: builtin/pull.c:1020 +#: builtin/pull.c:1050 msgid "pull with rebase" msgstr "tirer avec un rebasage" -#: builtin/pull.c:1021 +#: builtin/pull.c:1051 msgid "please commit or stash them." msgstr "veuillez les valider ou les remiser." -#: builtin/pull.c:1046 +#: builtin/pull.c:1076 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -20003,7 +19903,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:1052 +#: builtin/pull.c:1082 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -20020,23 +19920,23 @@ msgstr "" "$ git reset --hard\n" "pour régénérer." -#: builtin/pull.c:1067 +#: builtin/pull.c:1097 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tête vide." -#: builtin/pull.c:1072 +#: builtin/pull.c:1102 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." -#: builtin/pull.c:1074 +#: builtin/pull.c:1104 msgid "Cannot fast-forward to multiple branches." msgstr "Impossible d'aller en avance rapide sur de multiples branches." -#: builtin/pull.c:1088 +#: builtin/pull.c:1119 msgid "Need to specify how to reconcile divergent branches." msgstr "Besoin de spécifier comment réconcilier des branches divergentes." -#: builtin/pull.c:1102 +#: builtin/pull.c:1133 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossible de rebaser avec des modifications de sous-modules enregistrées " @@ -20229,7 +20129,7 @@ msgstr "Poussée vers %s\n" msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:544 builtin/submodule--helper.c:3258 +#: builtin/push.c:544 builtin/submodule--helper.c:3259 msgid "repository" msgstr "dépôt" @@ -20303,10 +20203,6 @@ msgstr "signer la poussée avec GPG" msgid "request atomic transaction on remote side" msgstr "demande une transaction atomique sur le serveur distant" -#: builtin/push.c:592 -msgid "--delete is incompatible with --all, --mirror and --tags" -msgstr "--delete est incompatible avec --all, --mirror et --tags" - #: builtin/push.c:594 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" @@ -20338,26 +20234,14 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:630 -msgid "--all and --tags are incompatible" -msgstr "--all et --tags sont incompatibles" - #: builtin/push.c:632 msgid "--all can't be combined with refspecs" msgstr "--all ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:636 -msgid "--mirror and --tags are incompatible" -msgstr "--mirror et --tags sont incompatibles" - #: builtin/push.c:638 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:641 -msgid "--all and --mirror are incompatible" -msgstr "--all et --mirror sont incompatibles" - #: builtin/push.c:648 msgid "push options must not have new line characters" msgstr "" @@ -20785,18 +20669,6 @@ msgstr "Il semble que 'git am' soit en cours. Impossible de rebaser." msgid "--preserve-merges was replaced by --rebase-merges" msgstr "--preserve-merges a été remplacé par --rebase-merges" -#: builtin/rebase.c:1193 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "impossible de combiner '--keep-base' avec '--onto'" - -#: builtin/rebase.c:1195 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "impossible de combiner '--keep-base' avec '--root'" - -#: builtin/rebase.c:1199 -msgid "cannot combine '--root' with '--fork-point'" -msgstr "impossible de combiner '--root' avec '--fork-point'" - #: builtin/rebase.c:1202 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" @@ -20864,9 +20736,9 @@ msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiert --merge ou --interactive" #: builtin/rebase.c:1463 -msgid "cannot combine apply options with merge options" +msgid "apply options and merge options cannot be used together" msgstr "" -"impossible de combiner les options d'application avec les options de fusion" +"Les options d'apply et celles de merge ne peuvent pas être utilisées ensemble" #: builtin/rebase.c:1476 #, c-format @@ -20907,7 +20779,7 @@ msgid "no such branch/commit '%s'" msgstr "pas de branche ou commit '%s'" #: builtin/rebase.c:1618 builtin/submodule--helper.c:39 -#: builtin/submodule--helper.c:2658 +#: builtin/submodule--helper.c:2659 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" @@ -20977,7 +20849,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:1280 +#: builtin/receive-pack.c:1275 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" @@ -21007,7 +20879,7 @@ msgstr "" "Pour éliminer ce message et conserver le comportement par défaut,\n" "réglez « receive.denyCurrentBranch » à 'refuse'." -#: builtin/receive-pack.c:1300 +#: builtin/receive-pack.c:1295 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" @@ -21027,13 +20899,13 @@ msgstr "" "\n" "Pour éliminer ce message, réglez-le à 'refuse'." -#: builtin/receive-pack.c:2480 +#: builtin/receive-pack.c:2474 msgid "quiet" msgstr "quiet" -#: builtin/receive-pack.c:2495 -msgid "You must specify a directory." -msgstr "Vous devez spécifier un répertoire." +#: builtin/receive-pack.c:2489 +msgid "you must specify a directory" +msgstr "Vous devez spécifier un répertoire" #: builtin/reflog.c:17 msgid "" @@ -21057,41 +20929,41 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <référence>" -#: builtin/reflog.c:568 builtin/reflog.c:573 +#: builtin/reflog.c:585 builtin/reflog.c:590 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' n'est pas un horodatage valide" -#: builtin/reflog.c:609 +#: builtin/reflog.c:631 #, c-format msgid "Marking reachable objects..." msgstr "Marquage des objets inaccessibles..." -#: builtin/reflog.c:647 +#: builtin/reflog.c:675 #, c-format msgid "%s points nowhere!" msgstr "%s ne pointe nulle part !" -#: builtin/reflog.c:700 +#: builtin/reflog.c:731 msgid "no reflog specified to delete" msgstr "pas de journal de références à supprimer spécifié" -#: builtin/reflog.c:708 +#: builtin/reflog.c:742 #, c-format msgid "not a reflog: %s" msgstr "'%s' n'est pas un journal de références" -#: builtin/reflog.c:713 +#: builtin/reflog.c:747 #, c-format msgid "no reflog for '%s'" msgstr "pas de journal de références pour '%s'" -#: builtin/reflog.c:759 +#: builtin/reflog.c:794 #, c-format msgid "invalid ref format: %s" msgstr "format de référence invalide : %s" -#: builtin/reflog.c:768 +#: builtin/reflog.c:803 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" @@ -21183,6 +21055,11 @@ msgstr "git remote update [<options>] [<groupe> | <distante>]..." msgid "Updating %s" msgstr "Mise à jour de %s" +#: builtin/remote.c:101 +#, c-format +msgid "Could not fetch %s" +msgstr "Impossible de récupérer %s" + #: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" @@ -21428,7 +21305,7 @@ msgstr "ne pas interroger les distantes" #: builtin/remote.c:1243 #, c-format msgid "* remote %s" -msgstr "* distante %s" +msgstr "* distant %s" #: builtin/remote.c:1244 #, c-format @@ -21642,155 +21519,147 @@ msgid "could not start pack-objects to repack promisor objects" msgstr "" "ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur" -#: builtin/repack.c:273 builtin/repack.c:816 +#: builtin/repack.c:275 builtin/repack.c:820 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack : attente de lignes d'Id d'objets en hexa complet seulement depuis " "les objects de paquet." -#: builtin/repack.c:297 +#: builtin/repack.c:299 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "impossible de terminer pack-objects pour ré-empaqueter les objets de " "prometteur" -#: builtin/repack.c:312 +#: builtin/repack.c:314 #, c-format msgid "cannot open index for %s" msgstr "impossible d'ouvrir l'index pour %s" -#: builtin/repack.c:371 +#: builtin/repack.c:373 #, c-format msgid "pack %s too large to consider in geometric progression" msgstr "" "le paquet %s est trop gros pour être pris en compte dans un progression " "géométrique" -#: builtin/repack.c:404 builtin/repack.c:411 builtin/repack.c:416 +#: builtin/repack.c:406 builtin/repack.c:413 builtin/repack.c:418 #, c-format msgid "pack %s too large to roll up" msgstr "le paquet %s est trop gros à enrouler" -#: builtin/repack.c:496 +#: builtin/repack.c:498 #, c-format msgid "could not open tempfile %s for writing" msgstr "impossible d'ouvrir le fichier temporaire %s en écriture" -#: builtin/repack.c:514 +#: builtin/repack.c:516 msgid "could not close refs snapshot tempfile" msgstr "impossible de fermer le fichier temporaire d'instantané des réfs" -#: builtin/repack.c:628 +#: builtin/repack.c:630 msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" -#: builtin/repack.c:630 +#: builtin/repack.c:632 msgid "same as -a, and turn unreachable objects loose" msgstr "identique à -a et transformer les objets inaccessibles en suspens" -#: builtin/repack.c:633 +#: builtin/repack.c:635 msgid "remove redundant packs, and run git-prune-packed" msgstr "supprimer les paquets redondants et lancer git-prune-packed" -#: builtin/repack.c:635 +#: builtin/repack.c:637 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passer --no-reuse-delta à git-pack-objects" -#: builtin/repack.c:637 +#: builtin/repack.c:639 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passer --no-reuse-object à git-pack-objects" -#: builtin/repack.c:639 +#: builtin/repack.c:641 msgid "do not run git-update-server-info" msgstr "ne pas lancer git-update-server-info" -#: builtin/repack.c:642 +#: builtin/repack.c:644 msgid "pass --local to git-pack-objects" msgstr "passer --local à git-pack-objects" -#: builtin/repack.c:644 +#: builtin/repack.c:646 msgid "write bitmap index" msgstr "écrire un index en bitmap" -#: builtin/repack.c:646 +#: builtin/repack.c:648 msgid "pass --delta-islands to git-pack-objects" msgstr "passer --delta-islands à git-pack-objects" -#: builtin/repack.c:647 +#: builtin/repack.c:649 msgid "approxidate" msgstr "date approximative" -#: builtin/repack.c:648 +#: builtin/repack.c:650 msgid "with -A, do not loosen objects older than this" msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci" -#: builtin/repack.c:650 +#: builtin/repack.c:652 msgid "with -a, repack unreachable objects" msgstr "avec -a, repaquétiser les objets inaccessibles" -#: builtin/repack.c:652 +#: builtin/repack.c:654 msgid "size of the window used for delta compression" msgstr "taille de la fenêtre utilisée pour la compression des deltas" -#: builtin/repack.c:653 builtin/repack.c:659 +#: builtin/repack.c:655 builtin/repack.c:661 msgid "bytes" msgstr "octets" -#: builtin/repack.c:654 +#: builtin/repack.c:656 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments" -#: builtin/repack.c:656 +#: builtin/repack.c:658 msgid "limits the maximum delta depth" msgstr "limite la profondeur maximale des deltas" -#: builtin/repack.c:658 +#: builtin/repack.c:660 msgid "limits the maximum number of threads" msgstr "limite le nombre maximal de fils" -#: builtin/repack.c:660 +#: builtin/repack.c:662 msgid "maximum size of each packfile" msgstr "taille maximum de chaque fichier paquet" -#: builtin/repack.c:662 +#: builtin/repack.c:664 msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:664 +#: builtin/repack.c:666 msgid "do not repack this pack" msgstr "ne pas rempaqueter ce paquet" -#: builtin/repack.c:666 +#: builtin/repack.c:668 msgid "find a geometric progression with factor <N>" msgstr "trouver une progression géométrique avec un facteur <N>" -#: builtin/repack.c:668 +#: builtin/repack.c:670 msgid "write a multi-pack index of the resulting packs" msgstr "écrire un index de multi-paquet des paquets résultants" -#: builtin/repack.c:678 +#: builtin/repack.c:680 msgid "cannot delete packs in a precious-objects repo" msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux" -#: builtin/repack.c:682 -msgid "--keep-unreachable and -A are incompatible" -msgstr "--keep-unreachable et -A sont incompatibles" - -#: builtin/repack.c:713 -msgid "--geometric is incompatible with -A, -a" -msgstr "--geometric est incompatible avec -A, -a" - -#: builtin/repack.c:825 +#: builtin/repack.c:829 msgid "Nothing new to pack." msgstr "Rien de neuf à empaqueter." -#: builtin/repack.c:855 +#: builtin/repack.c:859 #, c-format msgid "missing required file: %s" msgstr "fichier nécessaire manquant : %s" -#: builtin/repack.c:857 +#: builtin/repack.c:861 #, c-format msgid "could not unlink: %s" msgstr "impossible de délier : '%s'" @@ -21873,67 +21742,61 @@ msgstr "cat-file a retourné un échec" msgid "unable to open %s for reading" msgstr "impossible d'ouvrir %s en écriture" -#: builtin/replace.c:272 +#: builtin/replace.c:271 msgid "unable to spawn mktree" msgstr "impossible de lire l'arbre (%s)" -#: builtin/replace.c:276 +#: builtin/replace.c:275 msgid "unable to read from mktree" msgstr "impossible de lire depui mktree" -#: builtin/replace.c:285 +#: builtin/replace.c:284 msgid "mktree reported failure" msgstr "mktree a échoué" -#: builtin/replace.c:289 +#: builtin/replace.c:288 msgid "mktree did not return an object name" msgstr "mktree n'a pas retourné de nom d'objet" -#: builtin/replace.c:298 +#: builtin/replace.c:297 #, c-format msgid "unable to fstat %s" msgstr "fstat de %s impossible" -#: builtin/replace.c:303 +#: builtin/replace.c:302 msgid "unable to write object to database" msgstr "impossible d'écrire l'objet dans la base de données" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 -#, c-format -msgid "not a valid object name: '%s'" -msgstr "nom d'objet invalide : '%s'" - -#: builtin/replace.c:326 +#: builtin/replace.c:325 #, c-format msgid "unable to get object type for %s" msgstr "impossible d'obtenir le type de l'objet pour %s" -#: builtin/replace.c:342 +#: builtin/replace.c:341 msgid "editing object file failed" msgstr "échec de l'édition du fichier d'objet" -#: builtin/replace.c:351 +#: builtin/replace.c:350 #, c-format msgid "new object is the same as the old one: '%s'" msgstr "le nouvel objet est identique à l'ancien : '%s'" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, c-format msgid "could not parse %s as a commit" msgstr "impossible d'analyser %s comme commit" -#: builtin/replace.c:416 +#: builtin/replace.c:415 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mauvaise étiquette de fusion dans le commit '%s'" -#: builtin/replace.c:418 +#: builtin/replace.c:417 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "étiquette de fusion malformée dans le commit '%s'" -#: builtin/replace.c:430 +#: builtin/replace.c:429 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -21942,31 +21805,31 @@ msgstr "" "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; " "utilisez --edit au lieu de --graft" -#: builtin/replace.c:469 +#: builtin/replace.c:468 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "le commit original '%s' contient une signature GPG" -#: builtin/replace.c:470 +#: builtin/replace.c:469 msgid "the signature will be removed in the replacement commit!" msgstr "la signature sera éliminée dans la validation de remplacement !" -#: builtin/replace.c:480 +#: builtin/replace.c:479 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "impossible d'écrire le commit de remplacement pour '%s'" -#: builtin/replace.c:488 +#: builtin/replace.c:487 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft pour '%s' non nécessaire" -#: builtin/replace.c:492 +#: builtin/replace.c:491 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "le nouveau commit est identique à l'ancien : '%s'" -#: builtin/replace.c:527 +#: builtin/replace.c:526 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -21975,71 +21838,71 @@ msgstr "" "impossible de convertir la(les) greffe(s) suivante(s) :\n" "%s" -#: builtin/replace.c:548 +#: builtin/replace.c:547 msgid "list replace refs" msgstr "afficher les références de remplacement" -#: builtin/replace.c:549 +#: builtin/replace.c:548 msgid "delete replace refs" msgstr "supprimer les références de remplacement" -#: builtin/replace.c:550 +#: builtin/replace.c:549 msgid "edit existing object" msgstr "éditer l'objet existant" -#: builtin/replace.c:551 +#: builtin/replace.c:550 msgid "change a commit's parents" msgstr "modifier les parents d'un commit" -#: builtin/replace.c:552 +#: builtin/replace.c:551 msgid "convert existing graft file" msgstr "convertir le fichier de greffe existant" -#: builtin/replace.c:553 +#: builtin/replace.c:552 msgid "replace the ref if it exists" msgstr "remplacer la référence si elle existe" -#: builtin/replace.c:555 +#: builtin/replace.c:554 msgid "do not pretty-print contents for --edit" msgstr "afficher sans mise en forme pour --edit" -#: builtin/replace.c:556 +#: builtin/replace.c:555 msgid "use this format" msgstr "utiliser ce format" -#: builtin/replace.c:569 +#: builtin/replace.c:568 msgid "--format cannot be used when not listing" msgstr "--format ne peut pas être utilisé sans lister" -#: builtin/replace.c:577 +#: builtin/replace.c:576 msgid "-f only makes sense when writing a replacement" msgstr "-f n'a de sens qu'en écrivant un remplacement" -#: builtin/replace.c:581 +#: builtin/replace.c:580 msgid "--raw only makes sense with --edit" msgstr "--raw n'a de sens qu'avec l'option --edit" -#: builtin/replace.c:587 +#: builtin/replace.c:586 msgid "-d needs at least one argument" msgstr "-d requiert au moins un argument" -#: builtin/replace.c:593 +#: builtin/replace.c:592 msgid "bad number of arguments" msgstr "mauvais nombre d'arguments" -#: builtin/replace.c:599 +#: builtin/replace.c:598 msgid "-e needs exactly one argument" msgstr "-e requiert un seul argument" -#: builtin/replace.c:605 +#: builtin/replace.c:604 msgid "-g needs at least one argument" msgstr "-g requiert au moins un argument" -#: builtin/replace.c:611 +#: builtin/replace.c:610 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file ne supporte aucun argument" -#: builtin/replace.c:617 +#: builtin/replace.c:616 msgid "only one pattern can be given with -l" msgstr "-l n'accepte qu'un motifs" @@ -22061,136 +21924,128 @@ msgstr "'git rerere forget' sans chemin est obsolète" msgid "unable to generate diff for '%s'" msgstr "échec de la génération de diff pour '%s'" -#: builtin/reset.c:32 +#: builtin/reset.c:33 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -#: builtin/reset.c:33 +#: builtin/reset.c:34 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." msgstr "" "git reset [-q] [<arbre ou apparenté>] [--] <spécificateur-de-chemin>..." -#: builtin/reset.c:34 +#: builtin/reset.c:35 msgid "" "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" msgstr "" "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<arbre-esque>]" -#: builtin/reset.c:35 +#: builtin/reset.c:36 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" msgstr "git reset --patch [<arbre-esque>] [--] [<spéc.-de-chemin>...]" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "mixed" msgstr "mixed" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "soft" msgstr "soft" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "hard" msgstr "hard" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "merge" msgstr "merge" -#: builtin/reset.c:41 +#: builtin/reset.c:42 msgid "keep" msgstr "keep" -#: builtin/reset.c:89 +#: builtin/reset.c:90 msgid "You do not have a valid HEAD." msgstr "Vous n'avez pas une HEAD valide." -#: builtin/reset.c:91 +#: builtin/reset.c:92 msgid "Failed to find tree of HEAD." msgstr "Impossible de trouver l'arbre pour HEAD." -#: builtin/reset.c:97 +#: builtin/reset.c:98 #, c-format msgid "Failed to find tree of %s." msgstr "Impossible de trouver l'arbre pour %s." -#: builtin/reset.c:122 +#: builtin/reset.c:123 #, c-format msgid "HEAD is now at %s" msgstr "HEAD est maintenant à %s" -#: builtin/reset.c:201 +#: builtin/reset.c:299 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion." -#: builtin/reset.c:301 builtin/stash.c:605 builtin/stash.c:679 -#: builtin/stash.c:703 +#: builtin/reset.c:396 builtin/stash.c:606 builtin/stash.c:680 +#: builtin/stash.c:704 msgid "be quiet, only report errors" msgstr "être silencieux, afficher seulement les erreurs" -#: builtin/reset.c:303 +#: builtin/reset.c:398 msgid "reset HEAD and index" msgstr "réinitialiser HEAD et l'index" -#: builtin/reset.c:304 +#: builtin/reset.c:399 msgid "reset only HEAD" msgstr "réinitialiser seulement HEAD" -#: builtin/reset.c:306 builtin/reset.c:308 +#: builtin/reset.c:401 builtin/reset.c:403 msgid "reset HEAD, index and working tree" msgstr "réinitialiser HEAD, l'index et la copie de travail" -#: builtin/reset.c:310 +#: builtin/reset.c:405 msgid "reset HEAD but keep local changes" msgstr "réinitialiser HEAD mais garder les changements locaux" -#: builtin/reset.c:316 +#: builtin/reset.c:411 msgid "record only the fact that removed paths will be added later" msgstr "" "enregistrer seulement le fait que les chemins effacés seront ajoutés plus " "tard" -#: builtin/reset.c:350 +#: builtin/reset.c:445 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Échec de résolution de '%s' comme une révision valide." -#: builtin/reset.c:358 +#: builtin/reset.c:453 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Échec de résolution de '%s' comme un arbre valide." -#: builtin/reset.c:367 -msgid "--patch is incompatible with --{hard,mixed,soft}" -msgstr "--patch est incompatible avec --{hard,mixed,soft}" - -#: builtin/reset.c:377 +#: builtin/reset.c:472 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la " "place." -#: builtin/reset.c:379 +#: builtin/reset.c:474 #, c-format msgid "Cannot do %s reset with paths." msgstr "Impossible de faire un \"%s reset\" avec des chemins." -#: builtin/reset.c:394 +#: builtin/reset.c:489 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu" -#: builtin/reset.c:398 -msgid "-N can only be used with --mixed" -msgstr "-N ne peut être utilisé qu'avec --mixed" - -#: builtin/reset.c:419 +#: builtin/reset.c:520 msgid "Unstaged changes after reset:" msgstr "Modifications non indexées après reset :" -#: builtin/reset.c:422 +#: builtin/reset.c:523 #, c-format msgid "" "\n" @@ -22205,19 +22060,15 @@ msgstr "" "de\n" "config reset.quiet à true pour avoir ce comportement en permanence.\n" -#: builtin/reset.c:440 +#: builtin/reset.c:541 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'." -#: builtin/reset.c:445 +#: builtin/reset.c:546 msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." -#: builtin/rev-list.c:541 -msgid "cannot combine --exclude-promisor-objects and --missing" -msgstr "impossible de combiner --exclude-promisor-objects et --missing" - #: builtin/rev-list.c:602 msgid "object filtering requires --objects" msgstr "le filtrage d'objet exige --objects" @@ -22227,8 +22078,9 @@ msgid "rev-list does not support display of notes" msgstr "rev-list ne supporte l'affichage des notes" #: builtin/rev-list.c:679 -msgid "marked counting is incompatible with --objects" -msgstr "le comptage marqué est incompatible avec --objects" +#, c-format +msgid "marked counting and '%s' cannot be used together" +msgstr "le comptage marqué et '%s' ne peuvent pas être utilisés ensemble" #: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -22676,13 +22528,6 @@ msgid "show <n> most recent ref-log entries starting at base" msgstr "" "afficher les <n> plus récents éléments de ref-log en commençant à la base" -#: builtin/show-branch.c:710 -msgid "" -"--reflog is incompatible with --all, --remotes, --independent or --merge-base" -msgstr "" -"--reflog est incompatible avec --all, --remotes, --independent et --merge-" -"base" - #: builtin/show-branch.c:734 msgid "no branches given, and HEAD is not valid" msgstr "aucune branche spécifiée, et HEAD est invalide" @@ -22703,19 +22548,19 @@ msgstr[1] "%d entrées seulement ne peuvent être montrée en même temps." msgid "no such ref %s" msgstr "référence inexistante %s" -#: builtin/show-branch.c:828 +#: builtin/show-branch.c:830 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "impossible de gérer plus de %d révision." msgstr[1] "impossible de gérer plus de %d révisions." -#: builtin/show-branch.c:832 +#: builtin/show-branch.c:834 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' n'est pas une référence valide." -#: builtin/show-branch.c:835 +#: builtin/show-branch.c:837 #, c-format msgid "cannot find commit %s (%s)" msgstr "impossible de trouver le commit %s (%s)" @@ -22785,13 +22630,17 @@ msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgid "git sparse-checkout list" msgstr "git sparse-checkout list" -#: builtin/sparse-checkout.c:72 +#: builtin/sparse-checkout.c:60 +msgid "this worktree is not sparse" +msgstr "cet arbre de travail n'est pas clairsemé" + +#: builtin/sparse-checkout.c:75 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" "cet arbre de travail n'est pas clairsemé (le fichier sparse-checkout " "pourrait ne pas exister)" -#: builtin/sparse-checkout.c:173 +#: builtin/sparse-checkout.c:176 #, c-format msgid "" "directory '%s' contains untracked files, but is not in the sparse-checkout " @@ -22800,77 +22649,102 @@ msgstr "" "le dossier '%s' contient des fichiers non-suivis, mais n'est pas dans le " "cone d'extraction clairsemée" -#: builtin/sparse-checkout.c:181 +#: builtin/sparse-checkout.c:184 #, c-format msgid "failed to remove directory '%s'" msgstr "échec de suppression du répertoire '%s'" -#: builtin/sparse-checkout.c:321 +#: builtin/sparse-checkout.c:324 msgid "failed to create directory for sparse-checkout file" msgstr "" "échec de la création du répertoire pour le fichier d'extraction clairsemée" -#: builtin/sparse-checkout.c:362 +#: builtin/sparse-checkout.c:365 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:364 +#: builtin/sparse-checkout.c:367 msgid "failed to set extensions.worktreeConfig setting" msgstr "échec de paramétrage extensions.worktreeConfig" -#: builtin/sparse-checkout.c:384 +#: builtin/sparse-checkout.c:411 +msgid "failed to modify sparse-index config" +msgstr "impossible de modifier la configuration d'index clairsemé" + +#: builtin/sparse-checkout.c:422 msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" -#: builtin/sparse-checkout.c:404 +#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:729 +#: builtin/sparse-checkout.c:778 msgid "initialize the sparse-checkout in cone mode" msgstr "initialiser l'extraction clairsemée en mode cone" -#: builtin/sparse-checkout.c:406 +#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:731 +#: builtin/sparse-checkout.c:780 msgid "toggle the use of a sparse index" msgstr "bascule l'utilisation d'index clairsemé" -#: builtin/sparse-checkout.c:434 -msgid "failed to modify sparse-index config" -msgstr "impossible de modifier la configuration d'index clairsemé" - -#: builtin/sparse-checkout.c:455 +#: builtin/sparse-checkout.c:476 #, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" -#: builtin/sparse-checkout.c:507 +#: builtin/sparse-checkout.c:528 #, c-format msgid "could not normalize path %s" msgstr "impossible de normaliser le chemin '%s'" -#: builtin/sparse-checkout.c:519 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)" - -#: builtin/sparse-checkout.c:544 +#: builtin/sparse-checkout.c:557 #, 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:598 builtin/sparse-checkout.c:622 +#: builtin/sparse-checkout.c:612 builtin/sparse-checkout.c:640 msgid "unable to load existing sparse-checkout patterns" msgstr "impossible de charger les motifs de l'extraction clairsemée existants" -#: builtin/sparse-checkout.c:667 +#: builtin/sparse-checkout.c:616 +msgid "existing sparse-checkout patterns do not use cone mode" +msgstr "" +"les motifs de l'extraction clairsemée existants n'utilisent pas le mode cone" + +#: builtin/sparse-checkout.c:682 +msgid "git sparse-checkout add (--stdin | <patterns>)" +msgstr "git sparse-checkout add (--stdin | <motifs>)" + +#: builtin/sparse-checkout.c:694 builtin/sparse-checkout.c:733 msgid "read patterns from standard in" msgstr "lire les motifs depuis l'entrée standard" -#: builtin/sparse-checkout.c:682 -msgid "git sparse-checkout reapply" -msgstr "git sparse-checkout reapply" +#: builtin/sparse-checkout.c:699 +msgid "no sparse-checkout to add to" +msgstr "aucun sparse-checkout auquel on peut ajouter" + +#: builtin/sparse-checkout.c:712 +msgid "" +"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | " +"<patterns>)" +msgstr "" +"git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] (--stdin | " +"<motifs>)" -#: builtin/sparse-checkout.c:701 +#: builtin/sparse-checkout.c:765 +msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" +msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" + +#: builtin/sparse-checkout.c:785 +msgid "must be in a sparse-checkout to reapply sparsity patterns" +msgstr "" +"extraction clairsemée nécessaire pour pouvoir réappliquer les motifs de " +"clairsemage" + +#: builtin/sparse-checkout.c:803 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:732 +#: builtin/sparse-checkout.c:845 msgid "error while refreshing working directory" msgstr "erreur lors du rafraîchissement du répertoire de travail" @@ -22896,22 +22770,26 @@ msgstr "git stash branch <nom-de-branche> [<remise>]" #: builtin/stash.c:30 msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" " [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n" " [--] [<spécificateur-de-chemin>...]]" #: builtin/stash.c:34 msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" +"quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" #: builtin/stash.c:55 @@ -23005,142 +22883,159 @@ msgstr "Fusion de %s avec %s" msgid "Index was not unstashed." msgstr "L'index n'a pas été sorti de remise." -#: builtin/stash.c:575 +#: builtin/stash.c:576 msgid "could not restore untracked files from stash" msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage" -#: builtin/stash.c:607 builtin/stash.c:705 +#: builtin/stash.c:608 builtin/stash.c:706 msgid "attempt to recreate the index" msgstr "tentative de recréer l'index" -#: builtin/stash.c:651 +#: builtin/stash.c:652 #, c-format msgid "Dropped %s (%s)" msgstr "%s supprimé (%s)" -#: builtin/stash.c:654 +#: builtin/stash.c:655 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s : Impossible de supprimer l'élément de stash" -#: builtin/stash.c:667 +#: builtin/stash.c:668 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' n'est pas une référence de remisage" -#: builtin/stash.c:717 +#: builtin/stash.c:718 msgid "The stash entry is kept in case you need it again." msgstr "" "L'entrée de remisage est conservée au cas où vous en auriez encore besoin." -#: builtin/stash.c:740 +#: builtin/stash.c:741 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: builtin/stash.c:824 +#: builtin/stash.c:825 msgid "failed to parse tree" msgstr "échec de l'analyse de l'arbre" -#: builtin/stash.c:835 +#: builtin/stash.c:836 msgid "failed to unpack trees" msgstr "échec du dépaquetage des arbres" -#: builtin/stash.c:855 +#: builtin/stash.c:856 msgid "include untracked files in the stash" msgstr "inclure les fichiers non suivis dans le remisage" -#: builtin/stash.c:858 +#: builtin/stash.c:859 msgid "only show untracked files in the stash" msgstr "ne montrer que les fichiers non suivis dans le remisage" -#: builtin/stash.c:945 builtin/stash.c:982 +#: builtin/stash.c:946 builtin/stash.c:983 #, c-format msgid "Cannot update %s with %s" msgstr "Impossible de mettre à jour %s avec %s" -#: builtin/stash.c:963 builtin/stash.c:1619 builtin/stash.c:1684 +#: builtin/stash.c:964 builtin/stash.c:1678 builtin/stash.c:1750 msgid "stash message" msgstr "message pour le remisage" -#: builtin/stash.c:973 +#: builtin/stash.c:974 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" exige un argument <commit>" -#: builtin/stash.c:1187 +#: builtin/stash.c:1159 +msgid "No staged changes" +msgstr "Aucune modification indexée" + +#: builtin/stash.c:1220 msgid "No changes selected" msgstr "Aucun changement sélectionné" -#: builtin/stash.c:1287 +#: builtin/stash.c:1320 msgid "You do not have the initial commit yet" msgstr "Vous n'avez pas encore la validation initiale" -#: builtin/stash.c:1314 +#: builtin/stash.c:1347 msgid "Cannot save the current index state" msgstr "Impossible de sauver l'état courant de l'index" -#: builtin/stash.c:1323 +#: builtin/stash.c:1356 msgid "Cannot save the untracked files" msgstr "Impossible de sauver les fichiers non-suivis" -#: builtin/stash.c:1334 builtin/stash.c:1343 +#: builtin/stash.c:1367 builtin/stash.c:1386 msgid "Cannot save the current worktree state" msgstr "Impossible de sauver l'état courant de la copie de travail" -#: builtin/stash.c:1371 +#: builtin/stash.c:1377 +msgid "Cannot save the current staged state" +msgstr "Impossible de sauver l'état actuel de l'index" + +#: builtin/stash.c:1414 msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'état de la copie de travail" -#: builtin/stash.c:1420 +#: builtin/stash.c:1463 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Impossible d'utiliser --patch et --include-untracked ou --all en même temps" -#: builtin/stash.c:1438 +#: builtin/stash.c:1474 +msgid "Can't use --staged and --include-untracked or --all at the same time" +msgstr "" +"Impossible d'utiliser --staged et --include-untracked ou --all en même temps" + +#: builtin/stash.c:1492 msgid "Did you forget to 'git add'?" msgstr "Vous avez sûrement oublié 'git add' ?" -#: builtin/stash.c:1453 +#: builtin/stash.c:1507 msgid "No local changes to save" msgstr "Pas de modifications locales à sauver" -#: builtin/stash.c:1460 +#: builtin/stash.c:1514 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: builtin/stash.c:1475 +#: builtin/stash.c:1529 msgid "Cannot save the current status" msgstr "Impossible de sauver l'état courant" -#: builtin/stash.c:1480 +#: builtin/stash.c:1534 #, c-format msgid "Saved working directory and index state %s" msgstr "Arbre de travail et état de l'index sauvegardés dans %s" -#: builtin/stash.c:1571 +#: builtin/stash.c:1627 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: builtin/stash.c:1610 builtin/stash.c:1675 +#: builtin/stash.c:1667 builtin/stash.c:1739 msgid "keep index" msgstr "conserver l'index" -#: builtin/stash.c:1612 builtin/stash.c:1677 +#: builtin/stash.c:1669 builtin/stash.c:1741 +msgid "stash staged changes only" +msgstr "remiser seulement les modifications indexées" + +#: builtin/stash.c:1671 builtin/stash.c:1743 msgid "stash in patch mode" msgstr "remiser une mode rustine" -#: builtin/stash.c:1613 builtin/stash.c:1678 +#: builtin/stash.c:1672 builtin/stash.c:1744 msgid "quiet mode" msgstr "mode silencieux" -#: builtin/stash.c:1615 builtin/stash.c:1680 +#: builtin/stash.c:1674 builtin/stash.c:1746 msgid "include untracked files in stash" msgstr "inclure les fichiers non suivis dans la remise" -#: builtin/stash.c:1617 builtin/stash.c:1682 +#: builtin/stash.c:1676 builtin/stash.c:1748 msgid "include ignore files" msgstr "inclure les fichiers ignorés" -#: builtin/stash.c:1717 +#: builtin/stash.c:1783 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -23166,7 +23061,7 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace" -#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2667 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2668 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Nom de référence complet attendu, %s obtenu" @@ -23189,7 +23084,7 @@ msgstr "" "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme " "son propre amont d'autorité." -#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1859 msgid "alternative anchor for relative paths" msgstr "ancre alternative pour les chemins relatifs" @@ -23291,7 +23186,7 @@ msgstr "impossible de résoudre HEAD dans le sous-module '%s'" msgid "failed to recurse into submodule '%s'" msgstr "récursion impossible dans le sous-module '%s'" -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1589 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1590 msgid "suppress submodule status output" msgstr "supprimer la sortie d'état du sous-module" @@ -23361,10 +23256,6 @@ msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<chemin>]" msgid "could not fetch a revision for HEAD" msgstr "impossible de récupérer une révision pour HEAD" -#: builtin/submodule--helper.c:1316 -msgid "--cached and --files are mutually exclusive" -msgstr "--cached et --files sont mutuellement exclusifs" - #: builtin/submodule--helper.c:1373 #, c-format msgid "Synchronizing submodule url for '%s'\n" @@ -23394,17 +23285,16 @@ msgstr "" msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1508 #, c-format msgid "" -"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " -"really want to remove it including all of its history)" +"Submodule work tree '%s' contains a .git directory. This will be replaced " +"with a .git file by using absorbgitdirs." msgstr "" -"L'arbre de travail du sous-module '%s' contient un répertoire .git (utilisez " -"'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " -"historique)" +"L'arbre de travail du sous-module '%s' contient un répertoire .git. Il sera " +"remplacé par un fichier .git en utilisant absorbgitdirs." -#: builtin/submodule--helper.c:1524 +#: builtin/submodule--helper.c:1525 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -23413,48 +23303,48 @@ msgstr "" "L'arbre de travail du sous-module '%s' contient des modifications locales ; " "utilisez '-f' pour les annuler" -#: builtin/submodule--helper.c:1532 +#: builtin/submodule--helper.c:1533 #, c-format msgid "Cleared directory '%s'\n" msgstr "Répertoire '%s' nettoyé\n" -#: builtin/submodule--helper.c:1534 +#: builtin/submodule--helper.c:1535 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n" -#: builtin/submodule--helper.c:1545 +#: builtin/submodule--helper.c:1546 #, c-format msgid "could not create empty submodule directory %s" msgstr "impossible de créer le répertoire vide du sous-module %s" -#: builtin/submodule--helper.c:1561 +#: builtin/submodule--helper.c:1562 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Sous-module '%s' (%s) non enregistré pour le chemin '%s'\n" -#: builtin/submodule--helper.c:1590 +#: builtin/submodule--helper.c:1591 msgid "remove submodule working trees even if they contain local changes" msgstr "" "éliminer les arbres de travail des sous-modules même s'ils contiennent des " "modifications locales" -#: builtin/submodule--helper.c:1591 +#: builtin/submodule--helper.c:1592 msgid "unregister all submodules" msgstr "désenregistrer tous les sous-modules" -#: builtin/submodule--helper.c:1596 +#: builtin/submodule--helper.c:1597 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]" -#: builtin/submodule--helper.c:1610 +#: builtin/submodule--helper.c:1611 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules" -#: builtin/submodule--helper.c:1655 +#: builtin/submodule--helper.c:1656 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -23466,69 +23356,69 @@ msgstr "" "submodule.alternateErrorStrategy à 'info', ou de manière équivalente,\n" "clonez avec '--reference-if-able' au lieu de '--reference'." -#: builtin/submodule--helper.c:1700 builtin/submodule--helper.c:1703 +#: builtin/submodule--helper.c:1701 builtin/submodule--helper.c:1704 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s" -#: builtin/submodule--helper.c:1739 +#: builtin/submodule--helper.c:1740 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" "La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue" -#: builtin/submodule--helper.c:1746 +#: builtin/submodule--helper.c:1747 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue" -#: builtin/submodule--helper.c:1771 +#: builtin/submodule--helper.c:1772 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "" "refus de créer/utiliser '%s' dans un répertoire git d'un autre sous-module" -#: builtin/submodule--helper.c:1812 +#: builtin/submodule--helper.c:1813 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "le clonage de '%s' dans le chemin de sous-module '%s' a échoué" -#: builtin/submodule--helper.c:1817 +#: builtin/submodule--helper.c:1818 #, c-format msgid "directory not empty: '%s'" msgstr "le répertoire n'est pas vide : '%s'" -#: builtin/submodule--helper.c:1829 +#: builtin/submodule--helper.c:1830 #, c-format msgid "could not get submodule directory for '%s'" msgstr "impossible de créer le répertoire de sous-module pour '%s'" -#: builtin/submodule--helper.c:1861 +#: builtin/submodule--helper.c:1862 msgid "where the new submodule will be cloned to" msgstr "emplacement où le sous-module sera cloné" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1865 msgid "name of the new submodule" msgstr "nom du nouveau sous-module" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:1868 msgid "url where to clone the submodule from" -msgstr "URL depuis laquelle cloner le sous-module" +msgstr "url depuis laquelle cloner le sous-module" -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:3264 +#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:3265 msgid "depth for shallow clones" msgstr "profondeur de l'historique des clones superficiels" -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:2525 -#: builtin/submodule--helper.c:3257 +#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:2526 +#: builtin/submodule--helper.c:3258 msgid "force cloning progress" msgstr "forcer l'affichage de la progression du clonage" -#: builtin/submodule--helper.c:1880 builtin/submodule--helper.c:2527 +#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:2528 msgid "disallow cloning into non-empty directory" msgstr "interdire de cloner dans un répertoire non-vide" -#: builtin/submodule--helper.c:1887 +#: builtin/submodule--helper.c:1888 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -23538,94 +23428,94 @@ msgstr "" "<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> " "--path <chemin>" -#: builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1925 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:1928 +#: builtin/submodule--helper.c:1929 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:2043 +#: builtin/submodule--helper.c:2044 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Le chemin de sous-module '%s' n'est pas initialisé" -#: builtin/submodule--helper.c:2047 +#: builtin/submodule--helper.c:2048 msgid "Maybe you want to use 'update --init'?" msgstr "Vous voudriez sûrement utiliser 'update --init' ?" -#: builtin/submodule--helper.c:2077 +#: builtin/submodule--helper.c:2078 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Sous-module non fusionné %s non traité" -#: builtin/submodule--helper.c:2106 +#: builtin/submodule--helper.c:2107 #, c-format msgid "Skipping submodule '%s'" msgstr "Sous-module '%s' non traité" -#: builtin/submodule--helper.c:2256 +#: builtin/submodule--helper.c:2257 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Impossible de cloner '%s'. Réessai prévu" -#: builtin/submodule--helper.c:2267 +#: builtin/submodule--helper.c:2268 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Impossible de cloner '%s' pour la seconde fois, abandon" -#: builtin/submodule--helper.c:2372 +#: builtin/submodule--helper.c:2373 #, c-format msgid "Unable to checkout '%s' in submodule path '%s'" msgstr "Impossible d'extraire '%s' dans le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:2376 +#: builtin/submodule--helper.c:2377 #, c-format msgid "Unable to rebase '%s' in submodule path '%s'" msgstr "Impossible de rebaser '%s' dans le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:2380 +#: builtin/submodule--helper.c:2381 #, c-format msgid "Unable to merge '%s' in submodule path '%s'" msgstr "Impossible de fusionner '%s' dans le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:2384 +#: builtin/submodule--helper.c:2385 #, c-format msgid "Execution of '%s %s' failed in submodule path '%s'" msgstr "L'exécution de '%s %s' a échoué dans le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:2408 +#: builtin/submodule--helper.c:2409 #, c-format msgid "Submodule path '%s': checked out '%s'\n" msgstr "Chemin de sous-module '%s' : '%s' extrait\n" -#: builtin/submodule--helper.c:2412 +#: builtin/submodule--helper.c:2413 #, c-format msgid "Submodule path '%s': rebased into '%s'\n" msgstr "Chemin de sous-module '%s' : rebasé dans '%s'\n" -#: builtin/submodule--helper.c:2416 +#: builtin/submodule--helper.c:2417 #, c-format msgid "Submodule path '%s': merged in '%s'\n" msgstr "Chemin de sous-module '%s' : fusionné dans '%s'\n" -#: builtin/submodule--helper.c:2420 +#: builtin/submodule--helper.c:2421 #, c-format msgid "Submodule path '%s': '%s %s'\n" msgstr "Le chemin de sous-module '%s' : '%s %s'\n" -#: builtin/submodule--helper.c:2444 +#: builtin/submodule--helper.c:2445 #, c-format msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:" msgstr "" "Impossible de rapatrier dans le chemin de sous-module '%s' ; essai de " "rapatriement direct de %s :" -#: builtin/submodule--helper.c:2453 +#: builtin/submodule--helper.c:2454 #, c-format msgid "" "Fetched in submodule path '%s', but it did not contain %s. Direct fetching " @@ -23634,87 +23524,87 @@ msgstr "" "Chemin de sous-module '%s' récupéré, mais il ne contenait pas %s. La " "récupération directe de ce commit a échoué." -#: builtin/submodule--helper.c:2504 builtin/submodule--helper.c:2574 -#: builtin/submodule--helper.c:2812 +#: builtin/submodule--helper.c:2505 builtin/submodule--helper.c:2575 +#: builtin/submodule--helper.c:2813 msgid "path into the working tree" msgstr "chemin dans la copie de travail" -#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2579 +#: builtin/submodule--helper.c:2508 builtin/submodule--helper.c:2580 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "chemin dans la copie de travail, traversant les frontières de sous-modules" -#: builtin/submodule--helper.c:2511 builtin/submodule--helper.c:2577 +#: builtin/submodule--helper.c:2512 builtin/submodule--helper.c:2578 msgid "rebase, merge, checkout or none" msgstr "valeurs possibles : rebase, merge, checkout ou none" -#: builtin/submodule--helper.c:2517 +#: builtin/submodule--helper.c:2518 msgid "create a shallow clone truncated to the specified number of revisions" msgstr "créer un clone superficiel tronqué au nombre de révisions spécifié" -#: builtin/submodule--helper.c:2520 +#: builtin/submodule--helper.c:2521 msgid "parallel jobs" msgstr "jobs parallèles" -#: builtin/submodule--helper.c:2522 +#: builtin/submodule--helper.c:2523 msgid "whether the initial clone should follow the shallow recommendation" msgstr "spécifie si le clonage initial doit être aussi superficiel" -#: builtin/submodule--helper.c:2523 +#: builtin/submodule--helper.c:2524 msgid "don't print cloning progress" msgstr "ne pas afficher la progression du clonage" -#: builtin/submodule--helper.c:2534 +#: builtin/submodule--helper.c:2535 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:2547 +#: builtin/submodule--helper.c:2548 msgid "bad value for update parameter" msgstr "valeur invalide pour la mise à jour du paramètre" -#: builtin/submodule--helper.c:2565 +#: builtin/submodule--helper.c:2566 msgid "suppress output for update by rebase or merge" msgstr "" "supprimer la sortie lors de la mise à jour par un rebasage ou une fusion" -#: builtin/submodule--helper.c:2566 +#: builtin/submodule--helper.c:2567 msgid "force checkout updates" msgstr "forcer les mises à jour d'extraction" -#: builtin/submodule--helper.c:2568 +#: builtin/submodule--helper.c:2569 msgid "don't fetch new objects from the remote site" msgstr "ne pas récupérer les nouveaux objets depuis le site distant" -#: builtin/submodule--helper.c:2570 +#: builtin/submodule--helper.c:2571 msgid "overrides update mode in case the repository is a fresh clone" msgstr "" "passer outre le mode mise à jour dans le cas où le dépôt est un clone nouveau" -#: builtin/submodule--helper.c:2571 +#: builtin/submodule--helper.c:2572 msgid "depth for shallow fetch" msgstr "profondeur pour une récupération superficielle" -#: builtin/submodule--helper.c:2581 +#: builtin/submodule--helper.c:2582 msgid "sha1" msgstr "sha1" -#: builtin/submodule--helper.c:2582 +#: builtin/submodule--helper.c:2583 msgid "SHA1 expected by superproject" msgstr "SHA1 attendu par le super-projet" -#: builtin/submodule--helper.c:2584 +#: builtin/submodule--helper.c:2585 msgid "subsha1" msgstr "sous-sha1" -#: builtin/submodule--helper.c:2585 +#: builtin/submodule--helper.c:2586 msgid "SHA1 of submodule's HEAD" msgstr "SHA1 de la HEAD du sous-module" -#: builtin/submodule--helper.c:2591 +#: builtin/submodule--helper.c:2592 msgid "git submodule--helper run-update-procedure [<options>] <path>" msgstr "git submodule--helper run-update-procedure [<options>] <chemin>" -#: builtin/submodule--helper.c:2662 +#: builtin/submodule--helper.c:2663 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -23723,98 +23613,94 @@ msgstr "" "La branche du sous-module %s est configurée pour hériter de la branche du " "superprojet, mais le superprojet n'est sur aucune branche" -#: builtin/submodule--helper.c:2780 +#: builtin/submodule--helper.c:2781 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'" -#: builtin/submodule--helper.c:2813 +#: builtin/submodule--helper.c:2814 msgid "recurse into submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:2819 +#: builtin/submodule--helper.c:2820 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<options>] [<chemin>...]" -#: builtin/submodule--helper.c:2875 +#: builtin/submodule--helper.c:2876 msgid "check if it is safe to write to the .gitmodules file" msgstr "vérifier si écrire dans le fichier .gitmodules est sur" -#: builtin/submodule--helper.c:2878 +#: builtin/submodule--helper.c:2879 msgid "unset the config in the .gitmodules file" msgstr "désactiver la configuration dans le fichier .gitmodules" -#: builtin/submodule--helper.c:2883 +#: builtin/submodule--helper.c:2884 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config name [<valeur>]" -#: builtin/submodule--helper.c:2884 +#: builtin/submodule--helper.c:2885 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nom>" -#: builtin/submodule--helper.c:2885 +#: builtin/submodule--helper.c:2886 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2904 builtin/submodule--helper.c:3120 -#: builtin/submodule--helper.c:3276 +#: builtin/submodule--helper.c:2905 builtin/submodule--helper.c:3121 +#: builtin/submodule--helper.c:3277 msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail" -#: builtin/submodule--helper.c:2920 +#: builtin/submodule--helper.c:2921 msgid "suppress output for setting url of a submodule" msgstr "supprimer la sortie lors du paramétrage de l'url d'un sous-module" -#: builtin/submodule--helper.c:2924 +#: builtin/submodule--helper.c:2925 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper sync [--quiet] <chemin> <nouvelle-url>" -#: builtin/submodule--helper.c:2957 +#: builtin/submodule--helper.c:2958 msgid "set the default tracking branch to master" msgstr "régler la branche de suivi par défaut à master" -#: builtin/submodule--helper.c:2959 +#: builtin/submodule--helper.c:2960 msgid "set the default tracking branch" msgstr "régler la branche de suivi par défaut" -#: builtin/submodule--helper.c:2963 +#: builtin/submodule--helper.c:2964 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:2964 +#: builtin/submodule--helper.c:2965 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:2971 +#: builtin/submodule--helper.c:2972 msgid "--branch or --default required" msgstr "--branch ou --default requis" -#: builtin/submodule--helper.c:2974 -msgid "--branch and --default are mutually exclusive" -msgstr "--branch et --default sont mutuellement exclusifs" - -#: builtin/submodule--helper.c:3037 +#: builtin/submodule--helper.c:3038 #, c-format msgid "Adding existing repo at '%s' to the index\n" msgstr "Ajout du dépôt existant à '%s' dans l'index\n" -#: builtin/submodule--helper.c:3040 +#: builtin/submodule--helper.c:3041 #, c-format msgid "'%s' already exists and is not a valid git repo" msgstr "'%s' existe déjà et n'est pas un dépôt git valide" -#: builtin/submodule--helper.c:3053 +#: builtin/submodule--helper.c:3054 #, c-format msgid "A git directory for '%s' is found locally with remote(s):\n" msgstr "" "Un répertoire git pour '%s' est trouvé en local avec le(s) serveur(s) " "distant(s) :\n" -#: builtin/submodule--helper.c:3060 +#: builtin/submodule--helper.c:3061 #, c-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23831,54 +23717,54 @@ msgstr "" "correct\n" "ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'." -#: builtin/submodule--helper.c:3072 +#: builtin/submodule--helper.c:3073 #, c-format msgid "Reactivating local git directory for submodule '%s'\n" msgstr "Réactivation du répertoire git local pour le sous-module '%s'\n" -#: builtin/submodule--helper.c:3109 +#: builtin/submodule--helper.c:3110 #, c-format msgid "unable to checkout submodule '%s'" msgstr "Impossible d'extraire le sous-module '%s'" -#: builtin/submodule--helper.c:3148 +#: builtin/submodule--helper.c:3149 #, c-format msgid "Failed to add submodule '%s'" msgstr "Échec d'ajout du sous-module '%s'" -#: builtin/submodule--helper.c:3152 builtin/submodule--helper.c:3157 -#: builtin/submodule--helper.c:3165 +#: builtin/submodule--helper.c:3153 builtin/submodule--helper.c:3158 +#: builtin/submodule--helper.c:3166 #, c-format msgid "Failed to register submodule '%s'" msgstr "Échec d'enregistrement du sous-module '%s'" -#: builtin/submodule--helper.c:3221 +#: builtin/submodule--helper.c:3222 #, c-format msgid "'%s' already exists in the index" msgstr "'%s' existe déjà dans l'index" -#: builtin/submodule--helper.c:3224 +#: builtin/submodule--helper.c:3225 #, c-format msgid "'%s' already exists in the index and is not a submodule" msgstr "'%s' existe déjà dans l'index et n'est pas un sous-module" -#: builtin/submodule--helper.c:3253 +#: builtin/submodule--helper.c:3254 msgid "branch of repository to add as submodule" msgstr "la branche du dépôt à ajouter comme sous-module" -#: builtin/submodule--helper.c:3254 +#: builtin/submodule--helper.c:3255 msgid "allow adding an otherwise ignored submodule path" msgstr "permettre l'ajout des chemins de modules ignorés par ailleurs" -#: builtin/submodule--helper.c:3256 +#: builtin/submodule--helper.c:3257 msgid "print only error messages" msgstr "afficher seulement les messages d'erreur" -#: builtin/submodule--helper.c:3260 +#: builtin/submodule--helper.c:3261 msgid "borrow the objects from reference repositories" msgstr "emprunter les objets depuis des dépôts de références" -#: builtin/submodule--helper.c:3262 +#: builtin/submodule--helper.c:3263 msgid "" "sets the submodule’s name to the given string instead of defaulting to its " "path" @@ -23886,32 +23772,32 @@ msgstr "" "configurer le nom du sous-module avec la chaîne fournie au lieu d'utiliser " "par défaut son chemin" -#: builtin/submodule--helper.c:3269 +#: builtin/submodule--helper.c:3270 msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" msgstr "git submodule--helper add [<options>] [--] <dépôt> [<chemin>]" -#: builtin/submodule--helper.c:3297 +#: builtin/submodule--helper.c:3298 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Un chemin relatif ne peut être utilisé que depuis la racine de la copie de " "travail" -#: builtin/submodule--helper.c:3305 +#: builtin/submodule--helper.c:3306 #, c-format msgid "repo URL: '%s' must be absolute or begin with ./|../" msgstr "l'URL de dépôt : '%s' doit être absolu ou commencer par ./|../" -#: builtin/submodule--helper.c:3340 +#: builtin/submodule--helper.c:3341 #, c-format msgid "'%s' is not a valid submodule name" msgstr "'%s' n'est pas un nom valide de sous-module" -#: builtin/submodule--helper.c:3404 git.c:449 git.c:723 +#: builtin/submodule--helper.c:3405 git.c:452 git.c:726 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ne gère pas --super-prefix" -#: builtin/submodule--helper.c:3410 +#: builtin/submodule--helper.c:3411 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" @@ -24011,11 +23897,11 @@ msgstr "" "Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-" "même si vous le souhaitez.\n" -#: builtin/tag.c:241 +#: builtin/tag.c:240 msgid "unable to sign the tag" msgstr "impossible de signer l'étiquette" -#: builtin/tag.c:259 +#: builtin/tag.c:258 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -24030,15 +23916,15 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:275 +#: builtin/tag.c:274 msgid "bad object type." msgstr "mauvais type d'objet." -#: builtin/tag.c:326 +#: builtin/tag.c:325 msgid "no tag message?" msgstr "pas de message pour l'étiquette ?" -#: builtin/tag.c:333 +#: builtin/tag.c:332 #, c-format msgid "The tag message has been left in %s\n" msgstr "Le message pour l'étiquette a été laissé dans %s\n" @@ -24119,46 +24005,22 @@ msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées" msgid "print only tags of the object" msgstr "afficher seulement les étiquettes de l'objet" -#: builtin/tag.c:525 -msgid "--column and -n are incompatible" -msgstr "--column et -n sont incompatibles" - -#: builtin/tag.c:546 -msgid "-n option is only allowed in list mode" -msgstr "l'option -n est autorisée seulement en mode de liste" - -#: builtin/tag.c:548 -msgid "--contains option is only allowed in list mode" -msgstr "l'option --contains est autorisée seulement en mode de liste" - -#: builtin/tag.c:550 -msgid "--no-contains option is only allowed in list mode" -msgstr "l'option --no-contains est autorisée seulement en mode liste" - -#: builtin/tag.c:552 -msgid "--points-at option is only allowed in list mode" -msgstr "l'option --points-at est autorisée seulement en mode liste" - -#: builtin/tag.c:554 -msgid "--merged and --no-merged options are only allowed in list mode" -msgstr "" -"les options --merged et --no-merged ne sont autorisées qu'en mode liste" - -#: builtin/tag.c:568 -msgid "only one -F or -m option is allowed." -msgstr "une seule option -F ou -m est autorisée." +#: builtin/tag.c:558 +#, c-format +msgid "the '%s' option is only allowed in list mode" +msgstr "l'option '%s' est autorisée seulement en mode de liste" -#: builtin/tag.c:593 +#: builtin/tag.c:597 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' n'est pas un nom d'étiquette valide." -#: builtin/tag.c:598 +#: builtin/tag.c:602 #, c-format msgid "tag '%s' already exists" msgstr "l'étiquette '%s' existe déjà" -#: builtin/tag.c:629 +#: builtin/tag.c:633 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" @@ -24601,140 +24463,128 @@ msgstr "impossible de créer le répertoire de '%s'" msgid "initializing" msgstr "initialisation" -#: builtin/worktree.c:421 builtin/worktree.c:427 +#: builtin/worktree.c:420 builtin/worktree.c:426 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')" -#: builtin/worktree.c:423 +#: builtin/worktree.c:422 #, 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:432 +#: builtin/worktree.c:431 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Préparation de l'arbre de travail (extraction de '%s')" -#: builtin/worktree.c:438 +#: builtin/worktree.c:437 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Préparation de l'arbre de travail (HEAD détachée %s)" -#: builtin/worktree.c:483 +#: builtin/worktree.c:482 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:486 +#: builtin/worktree.c:485 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:488 +#: builtin/worktree.c:487 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:490 +#: builtin/worktree.c:489 msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" -#: builtin/worktree.c:491 +#: builtin/worktree.c:490 msgid "keep the new working tree locked" msgstr "conserver le verrou sur le nouvel arbre de travail" -#: builtin/worktree.c:493 builtin/worktree.c:730 +#: builtin/worktree.c:492 builtin/worktree.c:729 msgid "reason for locking" msgstr "raison du verrouillage" -#: builtin/worktree.c:496 +#: builtin/worktree.c:495 msgid "set up tracking mode (see git-branch(1))" msgstr "régler le mode de suivi (voir git-branch(1))" -#: builtin/worktree.c:499 +#: builtin/worktree.c:498 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:507 -msgid "-b, -B, and --detach are mutually exclusive" -msgstr "-b, -B et --detach sont mutuellement exclusifs" - -#: builtin/worktree.c:509 -msgid "--reason requires --lock" -msgstr "--reason exige --lock" - -#: builtin/worktree.c:513 +#: builtin/worktree.c:512 msgid "added with --lock" msgstr "ajouté avec --lock" -#: builtin/worktree.c:575 +#: builtin/worktree.c:574 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:692 +#: builtin/worktree.c:691 msgid "show extended annotations and reasons, if available" msgstr "afficher les annotations étendues et les raisons, si disponible" -#: builtin/worktree.c:694 +#: builtin/worktree.c:693 msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "" "ajouter l'annotation 'prunable' aux arbres de travail plus vieux que <temps>" -#: builtin/worktree.c:703 -msgid "--verbose and --porcelain are mutually exclusive" -msgstr "--verbose et --porcelain sont mutuellement exclusifs" - -#: builtin/worktree.c:742 builtin/worktree.c:775 builtin/worktree.c:849 -#: builtin/worktree.c:973 +#: builtin/worktree.c:741 builtin/worktree.c:774 builtin/worktree.c:848 +#: builtin/worktree.c:972 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:744 builtin/worktree.c:777 +#: builtin/worktree.c:743 builtin/worktree.c:776 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:749 +#: builtin/worktree.c:748 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:751 +#: builtin/worktree.c:750 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:779 +#: builtin/worktree.c:778 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" -#: builtin/worktree.c:820 +#: builtin/worktree.c:819 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:828 +#: builtin/worktree.c:827 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:851 builtin/worktree.c:975 +#: builtin/worktree.c:850 builtin/worktree.c:974 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' est un arbre de travail principal" -#: builtin/worktree.c:856 +#: builtin/worktree.c:855 #, 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:869 +#: builtin/worktree.c:868 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -24744,7 +24594,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:871 +#: builtin/worktree.c:870 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -24752,39 +24602,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:874 +#: builtin/worktree.c:873 #, 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:879 +#: builtin/worktree.c:878 #, c-format msgid "failed to move '%s' to '%s'" msgstr "échec au déplacement de '%s' vers '%s'" -#: builtin/worktree.c:925 +#: builtin/worktree.c:924 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "échec du lancement de 'git status' sur '%s'" -#: builtin/worktree.c:929 +#: builtin/worktree.c:928 #, 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:934 +#: builtin/worktree.c:933 #, 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:957 +#: builtin/worktree.c:956 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:980 +#: builtin/worktree.c:979 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -24794,7 +24644,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:982 +#: builtin/worktree.c:981 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -24802,18 +24652,18 @@ msgstr "" "impossible de supprimer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:985 +#: builtin/worktree.c:984 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" "la validation a échoué, impossible de supprimer l'arbre de travail : %s" -#: builtin/worktree.c:1009 +#: builtin/worktree.c:1008 #, c-format msgid "repair: %s: %s" msgstr "réparation : %s : '%s'" -#: builtin/worktree.c:1012 +#: builtin/worktree.c:1011 #, c-format msgid "error: %s: %s" msgstr "erreur : %s : %s" @@ -24866,21 +24716,16 @@ msgstr "" "pour en lire plus à propos d'une commande spécifique ou d'un concept.\n" "Voir 'git help git' pour un survol du système." -#: git.c:188 +#: git.c:188 git.c:216 git.c:300 #, c-format -msgid "no directory given for --git-dir\n" -msgstr "aucun répertoire fourni pour --git-dir\n" +msgid "no directory given for '%s' option\n" +msgstr "aucun répertoire fourni pour l'option '%s'\n" #: git.c:202 #, c-format msgid "no namespace given for --namespace\n" msgstr "aucun espace de nom fournit pour --namespace\n" -#: git.c:216 -#, c-format -msgid "no directory given for --work-tree\n" -msgstr "aucun répertoire fourni pour --work-tree\n" - #: git.c:230 #, c-format msgid "no prefix given for --super-prefix\n" @@ -24896,11 +24741,6 @@ msgstr "-c requiert une chaîne de configuration\n" msgid "no config key given for --config-env\n" msgstr "aucune clé de configuration fournie pour --config-env\n" -#: git.c:300 -#, c-format -msgid "no directory given for -C\n" -msgstr "aucun répertoire fourni pour -C\n" - #: git.c:326 #, c-format msgid "unknown option: %s\n" @@ -24930,29 +24770,29 @@ msgstr "alias vide pour %s" msgid "recursive alias: %s" msgstr "alias recursif : %s" -#: git.c:476 +#: git.c:479 msgid "write failure on standard output" msgstr "échec d'écriture sur la sortie standard" -#: git.c:478 +#: git.c:481 msgid "unknown write failure on standard output" msgstr "échec inconnu d'écriture sur la sortie standard" -#: git.c:480 +#: git.c:483 msgid "close failed on standard output" msgstr "échec de fermeture de la sortie standard" -#: git.c:832 +#: git.c:835 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "boucle d'alias détectée : l'expansion de '%s' ne finit jamais : %s" -#: git.c:882 +#: git.c:885 #, c-format msgid "cannot handle %s as a builtin" msgstr "impossible d'utiliser %s comme une fonction intégrée" -#: git.c:895 +#: git.c:898 #, c-format msgid "" "usage: %s\n" @@ -24961,34 +24801,26 @@ msgstr "" "usage : %s\n" "\n" -#: git.c:915 +#: git.c:918 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n" -#: git.c:927 +#: git.c:930 #, c-format msgid "failed to run command '%s': %s\n" msgstr "échec au lancement de la commande '%s' : %s\n" -#: http-fetch.c:118 +#: http-fetch.c:128 #, 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)" -#: http-fetch.c:128 +#: http-fetch.c:138 msgid "not a git repository" msgstr "pas un dépôt git" -#: http-fetch.c:134 -msgid "--packfile requires --index-pack-args" -msgstr "--packfile nécessite --index-pack-args" - -#: http-fetch.c:143 -msgid "--index-pack-args can only be used with --packfile" -msgstr "--index-pack-args ne peut être utilisé qu'avec --packfile" - #: t/helper/test-fast-rebase.c:141 msgid "unhandled options" msgstr "options non gérées" @@ -25276,6 +25108,177 @@ msgstr "remote-curl : récupération tentée sans dépôt local" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl : commande inconnue '%s' depuis git" +#: contrib/scalar/scalar.c:49 +msgid "need a working directory" +msgstr "répertoire de travail nécessaire" + +#: contrib/scalar/scalar.c:86 +msgid "could not find enlistment root" +msgstr "impossible de trouver la racine d'enrôlement" + +#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:351 +#: contrib/scalar/scalar.c:436 contrib/scalar/scalar.c:579 +#, c-format +msgid "could not switch to '%s'" +msgstr "impossible de basculer vers '%s'" + +#: contrib/scalar/scalar.c:180 +#, c-format +msgid "could not configure %s=%s" +msgstr "impossible de configurer %s=%s" + +#: contrib/scalar/scalar.c:198 +msgid "could not configure log.excludeDecoration" +msgstr "impossible de configurer log.excludeDecoration" + +#: contrib/scalar/scalar.c:219 +msgid "Scalar enlistments require a worktree" +msgstr "Les enrôlements scalaires requièrent un arbre de travail" + +#: contrib/scalar/scalar.c:311 +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "la HEAD distante n'est pas une branche : '%.*s'" + +#: contrib/scalar/scalar.c:317 +msgid "failed to get default branch name from remote; using local default" +msgstr "" +"échec de récupération de la branche par défaut depuis le distant ; " +"utilisation de la valeur par défaut locale" + +#: contrib/scalar/scalar.c:330 +msgid "failed to get default branch name" +msgstr "échec de l'obtention du nom de branche par défaut" + +#: contrib/scalar/scalar.c:341 +msgid "failed to unregister repository" +msgstr "échec du désenregistrement du dépôt" + +#: contrib/scalar/scalar.c:356 +msgid "failed to delete enlistment directory" +msgstr "échec de la suppression du répertoire d'enrôlement" + +#: contrib/scalar/scalar.c:376 +msgid "branch to checkout after clone" +msgstr "branche à extraire après le clonage" + +#: contrib/scalar/scalar.c:378 +msgid "when cloning, create full working directory" +msgstr "lors d'un clonage, créer un répertoire de travail complet" + +#: contrib/scalar/scalar.c:380 +msgid "only download metadata for the branch that will be checked out" +msgstr "ne télécharger les méta-données que pour la branche qui sera extraite" + +#: contrib/scalar/scalar.c:385 +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [<options>] [--] <dépôt> [<répertoire>]" + +#: contrib/scalar/scalar.c:410 +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "impossible de déduire le nom de l'arbre de travail depuis '%s'" + +#: contrib/scalar/scalar.c:419 +#, c-format +msgid "directory '%s' exists already" +msgstr "le répertoire '%s' existe déjà" + +#: contrib/scalar/scalar.c:446 +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "échec d'obtention de la branche par défaut pour '%s'" + +#: contrib/scalar/scalar.c:457 +#, c-format +msgid "could not configure remote in '%s'" +msgstr "impossible de paramétrer le distant dans '%s'" + +#: contrib/scalar/scalar.c:466 +#, c-format +msgid "could not configure '%s'" +msgstr "impossible de configurer '%s'" + +#: contrib/scalar/scalar.c:469 +msgid "partial clone failed; attempting full clone" +msgstr "échec du clonage partiel ; tentative de clonage complet" + +#: contrib/scalar/scalar.c:473 +msgid "could not configure for full clone" +msgstr "impossible de configurer pour le clonage complet" + +#: contrib/scalar/scalar.c:505 +msgid "`scalar list` does not take arguments" +msgstr "`scalar list` n'accepte pas d'argument" + +#: contrib/scalar/scalar.c:518 +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<enrôlement>]" + +#: contrib/scalar/scalar.c:545 +msgid "reconfigure all registered enlistments" +msgstr "reconfigurer tous les enrôlements enregistrés" + +#: contrib/scalar/scalar.c:549 +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scala reconfigure [--all|<enrôlement>]" + +#: contrib/scalar/scalar.c:567 +msgid "--all or <enlistment>, but not both" +msgstr "--all ou <enrôlement>, mais pas les deux" + +#: contrib/scalar/scalar.c:582 +#, c-format +msgid "git repository gone in '%s'" +msgstr "dépôt git parti dans '%s'" + +#: contrib/scalar/scalar.c:622 +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <tâche> [<enrôlement>]\n" +"Tâches :\n" + +#: contrib/scalar/scalar.c:640 +#, c-format +msgid "no such task: '%s'" +msgstr "pas de tâche : '%s'" + +#: contrib/scalar/scalar.c:690 +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<enrôlement>]" + +#: contrib/scalar/scalar.c:737 +msgid "scalar delete <enlistment>" +msgstr "scalar delete <enrôlement>" + +#: contrib/scalar/scalar.c:752 +msgid "refusing to delete current working directory" +msgstr "refus de la suppression du répertoire de travail actuel" + +#: contrib/scalar/scalar.c:767 +msgid "include Git version" +msgstr "inclure la version Git" + +#: contrib/scalar/scalar.c:769 +msgid "include Git's build options" +msgstr "inclure les options de construction de Git" + +#: contrib/scalar/scalar.c:773 +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +#: contrib/scalar/scalar.c:821 +msgid "" +"scalar <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar <commande> [<options>]\n" +"\n" +"Commandes :\n" + #: compat/compiler.h:26 msgid "no compiler information available\n" msgstr "aucune information de compilateur disponible\n" @@ -25300,38 +25303,38 @@ msgstr "date-d'expiration" msgid "no-op (backward compatibility)" msgstr "sans action (rétrocompatibilité)" -#: parse-options.h:308 +#: parse-options.h:310 msgid "be more verbose" msgstr "être plus verbeux" -#: parse-options.h:310 +#: parse-options.h:312 msgid "be more quiet" msgstr "être plus silencieux" -#: parse-options.h:316 +#: parse-options.h:318 msgid "use <n> digits to display object names" msgstr "utiliser <n> chiffres pour afficher les noms des objets" -#: parse-options.h:335 +#: parse-options.h:337 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" -#: parse-options.h:336 +#: parse-options.h:338 msgid "read pathspec from file" msgstr "lire les spécificateurs de fichier depuis fichier" -#: parse-options.h:337 +#: parse-options.h:339 msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "" "avec --pathspec-from-file, les spécificateurs de chemin sont séparés par un " "caractère NUL" -#: ref-filter.h:101 +#: ref-filter.h:98 msgid "key" msgstr "clé" -#: ref-filter.h:101 +#: ref-filter.h:98 msgid "field name to sort on" msgstr "nom du champ servant à trier" @@ -25406,17 +25409,17 @@ msgid "Show canonical names and email addresses of contacts" msgstr "Afficher les noms canoniques et les adresses courriel des contacts" #: command-list.h:65 +msgid "Ensures that a reference name is well formed" +msgstr "S'assurer qu'un nom de référence est bien formé" + +#: command-list.h:66 msgid "Switch branches or restore working tree files" msgstr "Basculer de branche ou restaurer la copie de travail" -#: command-list.h:66 +#: command-list.h:67 msgid "Copy files from the index to the working tree" msgstr "Copier les fichiers depuis l'index dans la copie de travail" -#: command-list.h:67 -msgid "Ensures that a reference name is well formed" -msgstr "S'assurer qu'un nom de référence est bien formé" - #: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "Trouver les commits à appliquer en amont" @@ -25619,61 +25622,61 @@ msgstr "" "Ajouter ou analyser l'information structurée dans les messages de validation" #: command-list.h:116 -msgid "The Git repository browser" -msgstr "Le navigateur de dépôt Git" - -#: command-list.h:117 msgid "Show commit logs" msgstr "Afficher l'historique des validations" -#: command-list.h:118 +#: command-list.h:117 msgid "Show information about files in the index and the working tree" msgstr "" "Afficher l'information à propos des fichiers dans l'index ou l'arbre de " "travail" -#: command-list.h:119 +#: command-list.h:118 msgid "List references in a remote repository" msgstr "Lister les références dans un dépôt distant" -#: command-list.h:120 +#: command-list.h:119 msgid "List the contents of a tree object" msgstr "Afficher le contenu d'un objet arbre" -#: command-list.h:121 +#: command-list.h:120 msgid "Extracts patch and authorship from a single e-mail message" msgstr "" "Extraire le patch et l'information de d'auteur depuis un simple message de " "courriel" -#: command-list.h:122 +#: command-list.h:121 msgid "Simple UNIX mbox splitter program" msgstr "Programme simple de découpage de mbox UNIX" -#: command-list.h:123 +#: command-list.h:122 msgid "Run tasks to optimize Git repository data" msgstr "Lancer les tâches pour optimiser les données du depôt Git" -#: command-list.h:124 +#: command-list.h:123 msgid "Join two or more development histories together" msgstr "Fusionner deux ou plusieurs historiques de développement ensemble" -#: command-list.h:125 +#: command-list.h:124 msgid "Find as good common ancestors as possible for a merge" msgstr "Trouver un ancêtre aussi bon que possible pour une fusion" -#: command-list.h:126 +#: command-list.h:125 msgid "Run a three-way file merge" msgstr "Lancer une fusion à 3 points" -#: command-list.h:127 +#: command-list.h:126 msgid "Run a merge for files needing merging" msgstr "Lancer une fusion à 3 points pour les fichiers à fusionner" -#: command-list.h:128 +#: command-list.h:127 msgid "The standard helper program to use with git-merge-index" msgstr "Le programme assistant standard à utiliser avec git-merge-index" +#: command-list.h:128 +msgid "Show three-way merge without touching index" +msgstr "Afficher la fusion à trois points sans modifier l'index" + #: command-list.h:129 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" @@ -25681,363 +25684,363 @@ msgstr "" "conflits de fusion" #: command-list.h:130 -msgid "Show three-way merge without touching index" -msgstr "Afficher la fusion à trois points sans modifier l'index" - -#: command-list.h:131 -msgid "Write and verify multi-pack-indexes" -msgstr "Écrire et vérifier les index multi-paquet" - -#: command-list.h:132 msgid "Creates a tag object with extra validation" msgstr "Créer un objet étiquette avec validation supplémentaire" -#: command-list.h:133 +#: command-list.h:131 msgid "Build a tree-object from ls-tree formatted text" msgstr "Construire un objet arbre depuis une texte formaté comme ls-tree" -#: command-list.h:134 +#: command-list.h:132 +msgid "Write and verify multi-pack-indexes" +msgstr "Écrire et vérifier les index multi-paquet" + +#: command-list.h:133 msgid "Move or rename a file, a directory, or a symlink" msgstr "Déplacer ou renommer un fichier, un répertoire, ou un lien symbolique" -#: command-list.h:135 +#: command-list.h:134 msgid "Find symbolic names for given revs" msgstr "Trouver les noms symboliques pour des révisions données" -#: command-list.h:136 +#: command-list.h:135 msgid "Add or inspect object notes" msgstr "Ajouter ou inspecter les notes d'un objet" -#: command-list.h:137 +#: command-list.h:136 msgid "Import from and submit to Perforce repositories" msgstr "Importer et soumettre à des dépôt Perforce" -#: command-list.h:138 +#: command-list.h:137 msgid "Create a packed archive of objects" msgstr "Créer une archive compactée d'objets" -#: command-list.h:139 +#: command-list.h:138 msgid "Find redundant pack files" msgstr "Trouver les fichiers pack redondants" -#: command-list.h:140 +#: command-list.h:139 msgid "Pack heads and tags for efficient repository access" msgstr "Empaqueter les têtes et les étiquettes pour un accès efficace au dépôt" -#: command-list.h:141 +#: command-list.h:140 msgid "Compute unique ID for a patch" msgstr "Calculer l'ID unique d'un patch" -#: command-list.h:142 +#: command-list.h:141 msgid "Prune all unreachable objects from the object database" msgstr "" "Éliminer les objets inatteignables depuis la base de données des objets" -#: command-list.h:143 +#: command-list.h:142 msgid "Remove extra objects that are already in pack files" msgstr "Éliminer les objets qui sont déjà présents dans les fichiers pack" -#: command-list.h:144 +#: command-list.h:143 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Rapatrier et intégrer un autre dépôt ou une branche locale" -#: command-list.h:145 +#: command-list.h:144 msgid "Update remote refs along with associated objects" msgstr "Mettre à jour les références distantes ainsi que les objets associés" -#: command-list.h:146 +#: command-list.h:145 msgid "Applies a quilt patchset onto the current branch" msgstr "Appliquer un patchset quilt sur la branche courante" -#: command-list.h:147 +#: command-list.h:146 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "" "Comparer deux plages de commits (par exemple deux versions d'une branche)" -#: command-list.h:148 +#: command-list.h:147 msgid "Reads tree information into the index" msgstr "Lire l'information d'arbre dans l'index" -#: command-list.h:149 +#: command-list.h:148 msgid "Reapply commits on top of another base tip" msgstr "Réapplication des commits sur le sommet de l'autre base" -#: command-list.h:150 +#: command-list.h:149 msgid "Receive what is pushed into the repository" msgstr "Recevoir ce qui est poussé dans le dépôt" -#: command-list.h:151 +#: command-list.h:150 msgid "Manage reflog information" msgstr "Gérer l'information de reflog" -#: command-list.h:152 +#: command-list.h:151 msgid "Manage set of tracked repositories" msgstr "Gérer un ensemble de dépôts suivis" -#: command-list.h:153 +#: command-list.h:152 msgid "Pack unpacked objects in a repository" msgstr "Empaqueter les objets non-empaquetés d'un dépôt" -#: command-list.h:154 +#: command-list.h:153 msgid "Create, list, delete refs to replace objects" msgstr "Créer, lister, supprimer des référence pour remplacer des objets" -#: command-list.h:155 +#: command-list.h:154 msgid "Generates a summary of pending changes" msgstr "Générer une résumé des modifications en attentes" -#: command-list.h:156 +#: command-list.h:155 msgid "Reuse recorded resolution of conflicted merges" msgstr "Réutiliser une résolution enregistrée de fusions conflictuelles" -#: command-list.h:157 +#: command-list.h:156 msgid "Reset current HEAD to the specified state" msgstr "Réinitialiser la HEAD courante à l'état spécifié" -#: command-list.h:158 +#: command-list.h:157 msgid "Restore working tree files" msgstr "Restaurer les fichiers l'arbre de travail" -#: command-list.h:159 -msgid "Revert some existing commits" -msgstr "Inverser des commits existants" - -#: command-list.h:160 +#: command-list.h:158 msgid "Lists commit objects in reverse chronological order" msgstr "Afficher les objets commit dans l'ordre chronologique inverse" -#: command-list.h:161 +#: command-list.h:159 msgid "Pick out and massage parameters" msgstr "Analyser et préparer les paramètres" -#: command-list.h:162 +#: command-list.h:160 +msgid "Revert some existing commits" +msgstr "Inverser des commits existants" + +#: command-list.h:161 msgid "Remove files from the working tree and from the index" msgstr "Supprimer des fichiers de la copie de travail et de l'index" -#: command-list.h:163 +#: command-list.h:162 msgid "Send a collection of patches as emails" msgstr "Envoyer un ensemble de patchs comme courriels" -#: command-list.h:164 +#: command-list.h:163 msgid "Push objects over Git protocol to another repository" msgstr "Pousser les objets sur un autre dépôt via le protocole Git" +#: command-list.h:164 +msgid "Git's i18n setup code for shell scripts" +msgstr "Le code d'initialisation i18n pour les scripts shell" + #: command-list.h:165 +msgid "Common Git shell script setup code" +msgstr "Le code d'initialisation commun aux scripts shell Git" + +#: command-list.h:166 msgid "Restricted login shell for Git-only SSH access" msgstr "Shell de login restreint pour un accès SSH vers Git seulement" -#: command-list.h:166 +#: command-list.h:167 msgid "Summarize 'git log' output" msgstr "Résumer la sortie de 'git log'" -#: command-list.h:167 +#: command-list.h:168 msgid "Show various types of objects" msgstr "Afficher différents types d'objets" -#: command-list.h:168 +#: command-list.h:169 msgid "Show branches and their commits" msgstr "Afficher les branches et leurs commits" -#: command-list.h:169 +#: command-list.h:170 msgid "Show packed archive index" msgstr "Afficher l'index de l'archive empaquetée" -#: command-list.h:170 +#: command-list.h:171 msgid "List references in a local repository" msgstr "Lister les références du dépôt local" -#: command-list.h:171 -msgid "Git's i18n setup code for shell scripts" -msgstr "Le code d'initialisation i18n pour les scripts shell" - #: command-list.h:172 -msgid "Common Git shell script setup code" -msgstr "Le code d'initialisation commun aux scripts shell Git" - -#: command-list.h:173 msgid "Initialize and modify the sparse-checkout" msgstr "Initialiser et modifier l'extraction clairsemée" +#: command-list.h:173 +msgid "Add file contents to the staging area" +msgstr "Ajouter le contenu de fichiers à l'index" + #: command-list.h:174 msgid "Stash the changes in a dirty working directory away" msgstr "Remiser les modifications d'un répertoire de travail sale" #: command-list.h:175 -msgid "Add file contents to the staging area" -msgstr "Ajouter le contenu de fichiers à l'index" - -#: command-list.h:176 msgid "Show the working tree status" msgstr "Afficher l'état de la copie de travail" -#: command-list.h:177 +#: command-list.h:176 msgid "Remove unnecessary whitespace" msgstr "Retirer les espaces inutiles" -#: command-list.h:178 +#: command-list.h:177 msgid "Initialize, update or inspect submodules" msgstr "Initialiser, mettre à jour et inspecter les sous-modules" -#: command-list.h:179 +#: command-list.h:178 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Opération Bidirectionnelle entre un dépôt Subversion et Git" -#: command-list.h:180 +#: command-list.h:179 msgid "Switch branches" msgstr "Basculer de branche" -#: command-list.h:181 +#: command-list.h:180 msgid "Read, modify and delete symbolic refs" msgstr "Lire, modifier et supprimer les références symboliques" -#: command-list.h:182 +#: command-list.h:181 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" "Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG" -#: command-list.h:183 +#: command-list.h:182 msgid "Creates a temporary file with a blob's contents" msgstr "Créer un fichier temporaire avec le contenu d'un blob" -#: command-list.h:184 +#: command-list.h:183 msgid "Unpack objects from a packed archive" msgstr "Dépaqueter les objets depuis une archive empaquetée" -#: command-list.h:185 +#: command-list.h:184 msgid "Register file contents in the working tree to the index" msgstr "Enregistrer le contenu d'un fichier de l'arbre de travail dans l'index" -#: command-list.h:186 +#: command-list.h:185 msgid "Update the object name stored in a ref safely" msgstr "" "Mettre à jour le nom d'objet stocké dans une référence en toute sécurité" -#: command-list.h:187 +#: command-list.h:186 msgid "Update auxiliary info file to help dumb servers" msgstr "" "Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs " "idiots" -#: command-list.h:188 +#: command-list.h:187 msgid "Send archive back to git-archive" msgstr "Renvoyer une archive dans git-archive" -#: command-list.h:189 +#: command-list.h:188 msgid "Send objects packed back to git-fetch-pack" msgstr "Renvoyer des objets empaquetés dans git-fetch-pack" -#: command-list.h:190 +#: command-list.h:189 msgid "Show a Git logical variable" msgstr "Afficher un variable logique de Git" -#: command-list.h:191 +#: command-list.h:190 msgid "Check the GPG signature of commits" msgstr "Vérifier la signature GPG de commits" -#: command-list.h:192 +#: command-list.h:191 msgid "Validate packed Git archive files" msgstr "Valider des fichiers d'archive Git empaquetés" -#: command-list.h:193 +#: command-list.h:192 msgid "Check the GPG signature of tags" msgstr "Vérifier la signature GPG d'étiquettes" -#: command-list.h:194 -msgid "Git web interface (web frontend to Git repositories)" -msgstr "Interface web de Git" - -#: command-list.h:195 +#: command-list.h:193 msgid "Show logs with difference each commit introduces" msgstr "Afficher les journaux avec la différence que chaque commit introduit" -#: command-list.h:196 +#: command-list.h:194 msgid "Manage multiple working trees" msgstr "Gérer des arbres de travail multiples" -#: command-list.h:197 +#: command-list.h:195 msgid "Create a tree object from the current index" msgstr "Créer un objet arbre depuis l'index courant" -#: command-list.h:198 +#: command-list.h:196 msgid "Defining attributes per path" msgstr "Définition des attributs par chemin" -#: command-list.h:199 +#: command-list.h:197 msgid "Git command-line interface and conventions" msgstr "Interface en ligne de commande et conventions de Git" -#: command-list.h:200 +#: command-list.h:198 msgid "A Git core tutorial for developers" msgstr "Tutoriel du cœur de Git pour les développeurs" -#: command-list.h:201 +#: command-list.h:199 msgid "Providing usernames and passwords to Git" msgstr "Fourniture des noms d'utilisateurs et des mots de passe à Git" -#: command-list.h:202 +#: command-list.h:200 msgid "Git for CVS users" msgstr "Git pour les utilisateurs de CVS" -#: command-list.h:203 +#: command-list.h:201 msgid "Tweaking diff output" msgstr "Bidouillage de la sortie diff" -#: command-list.h:204 +#: command-list.h:202 msgid "A useful minimum set of commands for Everyday Git" msgstr "Un ensemble minimal utile des commandes de Git pour tous les jours" -#: command-list.h:205 +#: command-list.h:203 msgid "Frequently asked questions about using Git" msgstr "Foire aux questions sur l'utilisation de Git" -#: command-list.h:206 +#: command-list.h:204 msgid "A Git Glossary" msgstr "Un glossaire Git" -#: command-list.h:207 +#: command-list.h:205 msgid "Hooks used by Git" msgstr "Crochets utilisés par Git" -#: command-list.h:208 +#: command-list.h:206 msgid "Specifies intentionally untracked files to ignore" msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement" -#: command-list.h:209 +#: command-list.h:207 +msgid "The Git repository browser" +msgstr "Le navigateur de dépôt Git" + +#: command-list.h:208 msgid "Map author/committer names and/or E-Mail addresses" msgstr "" "Fait correspondre les noms d'auteur/validateur avec les adresses de courriel" -#: command-list.h:210 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "Définition des propriétés de sous-module" -#: command-list.h:211 +#: command-list.h:210 msgid "Git namespaces" msgstr "Espaces de nom de Git" -#: command-list.h:212 +#: command-list.h:211 msgid "Helper programs to interact with remote repositories" msgstr "Programmes assistants pour interagir avec des dépôts distants" -#: command-list.h:213 +#: command-list.h:212 msgid "Git Repository Layout" msgstr "Disposition d'un dépôt Git" -#: command-list.h:214 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "Spécification des révisions et portées pour Git" -#: command-list.h:215 +#: command-list.h:214 msgid "Mounting one repository inside another" msgstr "Montage d'un dépôt dans un autre dépôt" +#: command-list.h:215 +msgid "A tutorial introduction to Git" +msgstr "Une introduction pratique à Git" + #: command-list.h:216 msgid "A tutorial introduction to Git: part two" msgstr "Une introduction pratique à Git : deuxième partie" #: command-list.h:217 -msgid "A tutorial introduction to Git" -msgstr "Une introduction pratique à Git" +msgid "Git web interface (web frontend to Git repositories)" +msgstr "Interface web de Git" #: command-list.h:218 msgid "An overview of recommended workflows with Git" @@ -26114,45 +26117,45 @@ msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" msgid "usage: $dashless $USAGE" msgstr "usage : $dashless $USAGE" -#: git-sh-setup.sh:191 +#: git-sh-setup.sh:183 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "" "Impossible de se placer dans le répertoire $cdup, la racine de la copie de " "travail" -#: git-sh-setup.sh:200 git-sh-setup.sh:207 +#: git-sh-setup.sh:192 git-sh-setup.sh:199 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "fatal : $program_name ne peut pas être utilisé sans copie de travail." -#: git-sh-setup.sh:221 +#: git-sh-setup.sh:213 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "" "Impossible de réécrire les branches : vous avez des modifications non " "indexées." -#: git-sh-setup.sh:224 +#: git-sh-setup.sh:216 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "$action est impossible : vous avez des modifications non indexées." -#: git-sh-setup.sh:235 +#: git-sh-setup.sh:227 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "" "$action est impossible : votre index contient des modifications non validées." -#: git-sh-setup.sh:237 +#: git-sh-setup.sh:229 msgid "Additionally, your index contains uncommitted changes." msgstr "De plus, votre index contient des modifications non validées." -#: git-sh-setup.sh:357 +#: git-sh-setup.sh:349 msgid "You need to run this command from the toplevel of the working tree." msgstr "" "Vous devez lancer cette commande depuis la racine de votre copie de travail." -#: git-sh-setup.sh:362 +#: git-sh-setup.sh:354 msgid "Unable to determine absolute path of git directory" msgstr "Impossible de déterminer le chemin absolu du répertoire git" @@ -26234,7 +26237,7 @@ msgstr "" 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:1251 +#: git-add--interactive.perl:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -26248,7 +26251,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:1257 +#: git-add--interactive.perl:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -26262,7 +26265,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:1263 +#: git-add--interactive.perl:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -26276,7 +26279,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:1269 +#: git-add--interactive.perl:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -26290,7 +26293,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:1275 git-add--interactive.perl:1293 +#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -26304,7 +26307,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:1281 +#: git-add--interactive.perl:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -26318,7 +26321,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:1287 +#: git-add--interactive.perl:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -26332,7 +26335,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:1299 +#: git-add--interactive.perl:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -26346,7 +26349,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:1314 +#: git-add--interactive.perl:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -26368,91 +26371,91 @@ msgstr "" "e - éditer manuellement la section actuelle\n" "? - afficher l'aide\n" -#: git-add--interactive.perl:1345 +#: git-add--interactive.perl:1347 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:1360 +#: git-add--interactive.perl:1362 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "fichier non-fusionné ignoré : %s\n" -#: git-add--interactive.perl:1479 +#: git-add--interactive.perl:1481 #, 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:1480 +#: git-add--interactive.perl:1482 #, 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:1481 +#: git-add--interactive.perl:1483 #, 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:1482 +#: git-add--interactive.perl:1484 #, 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:1599 +#: git-add--interactive.perl:1601 msgid "No other hunks to goto\n" msgstr "Aucune autre section à atteindre\n" -#: git-add--interactive.perl:1617 +#: git-add--interactive.perl:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Nombre invalide : '%s'\n" -#: git-add--interactive.perl:1622 +#: git-add--interactive.perl:1624 #, 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:1657 +#: git-add--interactive.perl:1659 msgid "No other hunks to search\n" msgstr "Aucune autre section à rechercher\n" -#: git-add--interactive.perl:1674 +#: git-add--interactive.perl:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regex de recherche malformée %s : %s\n" -#: git-add--interactive.perl:1684 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" msgstr "Aucune section ne correspond au motif donné\n" -#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "Pas de section précédente\n" -#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "Pas de section suivante\n" -#: git-add--interactive.perl:1730 +#: git-add--interactive.perl:1732 msgid "Sorry, cannot split this hunk\n" msgstr "Désolé, impossible de découper cette section\n" -#: git-add--interactive.perl:1736 +#: git-add--interactive.perl:1738 #, 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:1746 +#: git-add--interactive.perl:1748 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:1811 +#: git-add--interactive.perl:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -26470,58 +26473,58 @@ 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:1828 git-add--interactive.perl:1840 -#: git-add--interactive.perl:1843 git-add--interactive.perl:1850 -#: git-add--interactive.perl:1853 git-add--interactive.perl:1860 -#: git-add--interactive.perl:1864 git-add--interactive.perl:1870 +#: git-add--interactive.perl:1830 git-add--interactive.perl:1842 +#: git-add--interactive.perl:1845 git-add--interactive.perl:1852 +#: git-add--interactive.perl:1855 git-add--interactive.perl:1862 +#: git-add--interactive.perl:1866 git-add--interactive.perl:1872 msgid "missing --" msgstr "-- manquant" -#: git-add--interactive.perl:1866 +#: git-add--interactive.perl:1868 #, perl-format msgid "unknown --patch mode: %s" msgstr "mode de --patch inconnu : %s" -#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 +#: git-add--interactive.perl:1874 git-add--interactive.perl:1880 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argument invalide %s, -- attendu" -#: git-send-email.perl:129 +#: git-send-email.perl:159 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "" "la zone locale diffère du GMT par un intervalle supérieur à une minute\n" -#: git-send-email.perl:136 git-send-email.perl:142 +#: git-send-email.perl:166 git-send-email.perl:172 msgid "local time offset greater than or equal to 24 hours\n" msgstr "le décalage de temps local est plus grand ou égal à 24 heures\n" -#: git-send-email.perl:214 +#: git-send-email.perl:244 #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "fatal : la commande '%s' s'est interrompue avec le code %d" -#: git-send-email.perl:227 +#: git-send-email.perl:257 msgid "the editor exited uncleanly, aborting everything" msgstr "l'éditeur est sorti en erreur, abandon total" -#: git-send-email.perl:316 +#: git-send-email.perl:346 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "'%s' contient une version intermédiaire du courriel que vous composiez.\n" -#: git-send-email.perl:321 +#: git-send-email.perl:351 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' contient le courriel composé.\n" -#: git-send-email.perl:450 +#: git-send-email.perl:484 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases est incompatible avec d'autres options\n" -#: git-send-email.perl:525 +#: git-send-email.perl:561 msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -26533,11 +26536,11 @@ msgstr "" "Positionnez sendemail.forbidSendmailVariables à false pour désactiver cette " "vérification.\n" -#: git-send-email.perl:530 git-send-email.perl:746 +#: git-send-email.perl:566 git-send-email.perl:782 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n" -#: git-send-email.perl:533 +#: git-send-email.perl:569 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -26545,39 +26548,39 @@ msgstr "" "`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de " "commande ou des options de configuration)\n" -#: git-send-email.perl:546 +#: git-send-email.perl:582 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Champ de --suppress-cc inconnu : '%s'\n" -#: git-send-email.perl:577 +#: git-send-email.perl:613 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Paramètre de --confirm inconnu : '%s'\n" -#: git-send-email.perl:617 +#: git-send-email.perl:653 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" "attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n" -#: git-send-email.perl:619 +#: git-send-email.perl:655 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "attention : `:include:` n'est pas supporté : %s\n" -#: git-send-email.perl:621 +#: git-send-email.perl:657 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" "attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n" -#: git-send-email.perl:626 +#: git-send-email.perl:662 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "attention : ligne sendmail non reconnue : %s\n" -#: git-send-email.perl:711 +#: git-send-email.perl:747 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -26592,12 +26595,12 @@ msgstr "" " * en indiquant \"./%s\" si vous désignez un fichier, ou\n" " * en fournissant l'option --format-patch pour une plage.\n" -#: git-send-email.perl:732 +#: git-send-email.perl:768 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Échec à l'ouverture du répertoire %s : %s" -#: git-send-email.perl:767 +#: git-send-email.perl:803 msgid "" "\n" "No patch files specified!\n" @@ -26607,17 +26610,17 @@ msgstr "" "Aucun fichier patch spécifié !\n" "\n" -#: git-send-email.perl:780 +#: git-send-email.perl:816 #, perl-format msgid "No subject line in %s?" msgstr "Ligne de sujet non trouvée dans %s ?" -#: git-send-email.perl:791 +#: git-send-email.perl:827 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Impossible d'ouvrir %s en écriture : %s" -#: git-send-email.perl:802 +#: git-send-email.perl:838 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -26631,27 +26634,27 @@ msgstr "" "\n" "Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n" -#: git-send-email.perl:826 +#: git-send-email.perl:862 #, perl-format msgid "Failed to open %s: %s" msgstr "Échec à l'ouverture de %s : %s" -#: git-send-email.perl:843 +#: git-send-email.perl:879 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Échec à l'ouverture de %s.final : %s" -#: git-send-email.perl:886 +#: git-send-email.perl:922 msgid "Summary email is empty, skipping it\n" msgstr "Le courriel de résumé étant vide, il a été ignoré\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:935 +#: git-send-email.perl:971 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Êtes-vous sur de vouloir utiliser <%s> [y/N] ? " -#: git-send-email.perl:990 +#: git-send-email.perl:1026 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -26659,11 +26662,11 @@ msgstr "" "Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-" "Transfer-Encoding.\n" -#: git-send-email.perl:995 +#: git-send-email.perl:1031 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? " -#: git-send-email.perl:1003 +#: git-send-email.perl:1039 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -26676,22 +26679,22 @@ msgstr "" "a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez " "vraiment envoyer.\n" -#: git-send-email.perl:1022 +#: git-send-email.perl:1058 msgid "To whom should the emails be sent (if anyone)?" msgstr "À qui les courriels doivent-ils être envoyés (s'il y en a) ?" -#: git-send-email.perl:1040 +#: git-send-email.perl:1076 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal : l'alias '%s' se développe en lui-même\n" -#: git-send-email.perl:1052 +#: git-send-email.perl:1088 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en " "a) ? " -#: git-send-email.perl:1114 git-send-email.perl:1122 +#: git-send-email.perl:1150 git-send-email.perl:1158 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n" @@ -26699,16 +26702,16 @@ msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1126 +#: git-send-email.perl:1162 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): " -#: git-send-email.perl:1446 +#: git-send-email.perl:1482 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "Le chemin vers la CA \"%s\" n'existe pas" -#: git-send-email.perl:1529 +#: git-send-email.perl:1565 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -26735,114 +26738,114 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1544 +#: git-send-email.perl:1580 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Envoyer ce courriel ? ([y]es|[n]o|[e]dit|[q]uit|[a]ll) : " -#: git-send-email.perl:1547 +#: git-send-email.perl:1583 msgid "Send this email reply required" msgstr "Une réponse est nécessaire" -#: git-send-email.perl:1581 +#: git-send-email.perl:1617 msgid "The required SMTP server is not properly defined." msgstr "Le serveur SMTP nécessaire n'est pas défini correctement." -#: git-send-email.perl:1628 +#: git-send-email.perl:1664 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Le serveur ne supporte pas STARTTLS ! %s" -#: git-send-email.perl:1633 git-send-email.perl:1637 +#: git-send-email.perl:1669 git-send-email.perl:1673 #, perl-format msgid "STARTTLS failed! %s" msgstr "échec de STARTTLS ! %s" -#: git-send-email.perl:1646 +#: git-send-email.perl:1682 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-" "debug." -#: git-send-email.perl:1664 +#: git-send-email.perl:1700 #, perl-format msgid "Failed to send %s\n" msgstr "Échec de l'envoi de %s\n" -#: git-send-email.perl:1667 +#: git-send-email.perl:1703 #, perl-format msgid "Dry-Sent %s\n" msgstr "Envoi simulé de %s\n" -#: git-send-email.perl:1667 +#: git-send-email.perl:1703 #, perl-format msgid "Sent %s\n" msgstr "%s envoyé\n" -#: git-send-email.perl:1669 +#: git-send-email.perl:1705 msgid "Dry-OK. Log says:\n" msgstr "Simulation OK. Le journal indique :\n" -#: git-send-email.perl:1669 +#: git-send-email.perl:1705 msgid "OK. Log says:\n" msgstr "OK. Le journal indique :\n" -#: git-send-email.perl:1688 +#: git-send-email.perl:1724 msgid "Result: " msgstr "Résultat : " -#: git-send-email.perl:1691 +#: git-send-email.perl:1727 msgid "Result: OK\n" msgstr "Résultat : OK\n" -#: git-send-email.perl:1708 +#: git-send-email.perl:1744 #, perl-format msgid "can't open file %s" msgstr "impossible d'ouvrir le fichier %s" -#: git-send-email.perl:1756 git-send-email.perl:1776 +#: git-send-email.perl:1792 git-send-email.perl:1812 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1762 +#: git-send-email.perl:1798 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1819 +#: git-send-email.perl:1855 #, 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:1854 +#: git-send-email.perl:1890 #, 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:1973 +#: git-send-email.perl:2009 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Impossible d'exécuter '%s'" -#: git-send-email.perl:1980 +#: git-send-email.perl:2016 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Ajout de %s : %s depuis : '%s'\n" -#: git-send-email.perl:1984 +#: git-send-email.perl:2020 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) échec de la fermeture du pipe vers '%s'" -#: git-send-email.perl:2014 +#: git-send-email.perl:2050 msgid "cannot send message as 7bit" msgstr "impossible d'envoyer un message comme 7bit" -#: git-send-email.perl:2022 +#: git-send-email.perl:2058 msgid "invalid transfer encoding" msgstr "codage de transfert invalide" -#: git-send-email.perl:2059 +#: git-send-email.perl:2095 #, perl-format msgid "" "fatal: %s: rejected by sendemail-validate hook\n" @@ -26853,12 +26856,12 @@ msgstr "" "%s\n" "attention : aucun patch envoyé\n" -#: git-send-email.perl:2069 git-send-email.perl:2122 git-send-email.perl:2132 +#: git-send-email.perl:2105 git-send-email.perl:2158 git-send-email.perl:2168 #, perl-format msgid "unable to open %s: %s\n" msgstr "impossible d'ouvrir %s :%s\n" -#: git-send-email.perl:2072 +#: git-send-email.perl:2108 #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -26867,13 +26870,392 @@ msgstr "" "fatal : %s : %d est plus long que 998 caractères \n" "attention : aucun patch envoyé\n" -#: git-send-email.perl:2090 +#: git-send-email.perl:2126 #, 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:2094 +#: git-send-email.perl:2130 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " + +#~ msgid "--index outside a repository" +#~ msgstr "--index hors d'un dépôt" + +#~ msgid "--cached outside a repository" +#~ msgstr "--cached hors d'un dépôt" + +#~ msgid "unrecognized input" +#~ msgstr "entrée non reconnue" + +#, c-format +#~ msgid "cannot read %s" +#~ msgstr "impossible de lire %s" + +#~ msgid "Option --exec can only be used together with --remote" +#~ msgstr "L'option --exec ne peut être utilisée qu'en complément de --remote" + +#, c-format +#~ msgid "" +#~ "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." +#~ msgstr "" +#~ "La branche '%s' est paramétrée pour suivre la branche distante '%s' de " +#~ "'%s' en rebasant." + +#, c-format +#~ msgid "Branch '%s' set up to track remote branch '%s' from '%s'." +#~ msgstr "" +#~ "La branche '%s' est paramétrée pour suivre la branche distante '%s' " +#~ "depuis '%s'." + +#, c-format +#~ msgid "Branch '%s' set up to track local branch '%s' by rebasing." +#~ msgstr "" +#~ "La branche '%s' est paramétrée pour suivre la branche locale '%'s en " +#~ "rebasant." + +#, c-format +#~ msgid "Branch '%s' set up to track local branch '%s'." +#~ msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'." + +#, c-format +#~ msgid "Branch '%s' set up to track remote ref '%s' by rebasing." +#~ msgstr "" +#~ "La branche '%s' est paramétrée pour suivre la référence distante '%s' en " +#~ "rebasant." + +#, c-format +#~ msgid "Branch '%s' set up to track remote ref '%s'." +#~ msgstr "" +#~ "La branche '%s' est paramétrée pour suivre la référence distante '%s'." + +#~ msgid "Cannot force update the current branch." +#~ msgstr "Impossible de forcer la mise à jour de la branche courante." + +#, c-format +#~ msgid "Not a valid object name: '%s'." +#~ msgstr "Nom d'objet invalide : '%s'." + +#~ msgid "--name-only, --name-status, --check and -s are mutually exclusive" +#~ msgstr "" +#~ "--name-only, --name-status, --check et -s sont mutuellement exclusifs" + +#~ msgid "-G, -S and --find-object are mutually exclusive" +#~ msgstr "-G, -S et --find-object sont mutuellement exclusifs" + +#~ msgid "" +#~ "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" +#~ msgstr "" +#~ "-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-" +#~ "regex avec -S" + +#~ msgid "" +#~ "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " +#~ "with -G and -S" +#~ msgstr "" +#~ "--pickaxe-all et --find-object sont mutuellement exclusifs, utilisez --" +#~ "pickaxe-all avec -G et -S" + +#~ msgid "--stateless-rpc requires multi_ack_detailed" +#~ msgstr "--stateless-rpc nécessite multi_ack_detailed" + +#~ msgid "--left-only and --right-only are mutually exclusive" +#~ msgstr "--left-only et --right-only sont mutuellement exclusifs" + +#, c-format +#~ msgid "unrecognized %%(objectsize) argument: %s" +#~ msgstr "argument %%(objectsize) non reconnu : %s" + +#, c-format +#~ msgid "unrecognized %%(subject) argument: %s" +#~ msgstr "argument %%(subject) non reconnu : %s" + +#, c-format +#~ msgid "unrecognized %%(contents) argument: %s" +#~ msgstr "argument %%(contents) non reconnu : %s" + +#, c-format +#~ msgid "unrecognized %%(raw) argument: %s" +#~ msgstr "argument %%(raw) non reconnu : %s" + +#, c-format +#~ msgid "unrecognized argument '%s' in %%(%s)" +#~ msgstr "argument '%s' non reconnu dans %%(%s)" + +#, c-format +#~ msgid "unrecognized %%(align) argument: %s" +#~ msgstr "argument %%(align) non reconnu : %s" + +#, c-format +#~ msgid "unrecognized %%(if) argument: %s" +#~ msgstr "argument %%(if) non reconnu : %s" + +#, c-format +#~ msgid "format: %%(if) atom used without a %%(then) atom" +#~ msgstr "format : atome %%(if) utilisé sans un atome %%(then)" + +#, c-format +#~ msgid "format: %%(then) atom used without an %%(if) atom" +#~ msgstr "format : atome %%(then) utilisé sans un atome %%(if)" + +#, c-format +#~ msgid "format: %%(else) atom used without a %%(then) atom" +#~ msgstr "format : atome %%(else) utilisé sans un atome %%(then)" + +#~ msgid "--unsorted-input is incompatible with --no-walk" +#~ msgstr "--unsorted-input est incompatible avec --no-walk" + +#~ msgid "--no-walk is incompatible with --unsorted-input" +#~ msgstr "--no-walk est incompatible avec --unsorted-input" + +#~ msgid "--dry-run is incompatible with --interactive/--patch" +#~ msgstr "--dry-run est incompatible avec --interactive/--patch" + +#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch" +#~ msgstr "--pathspec-from-file est incompatible avec --interactive/--patch" + +#~ msgid "--pathspec-from-file is incompatible with --edit" +#~ msgstr "--pathspec-from-file est incompatible avec --edit" + +#~ msgid "-A and -u are mutually incompatible" +#~ msgstr "-A et -u sont mutuellement incompatibles" + +#~ msgid "Option --ignore-missing can only be used together with --dry-run" +#~ msgstr "" +#~ "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-" +#~ "run" + +#~ msgid "--pathspec-from-file is incompatible with pathspec arguments" +#~ msgstr "--pathspec-from-file est incompatible avec pathspec arguments" + +#~ msgid "--pathspec-file-nul requires --pathspec-from-file" +#~ msgstr "--pathspec-file-nul nécessite --pathspec-from-file" + +#, c-format +#~ msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" +#~ msgstr "" +#~ "--show-current-patch=%s est incompatible avec --show-current-patch=%s" + +#~ msgid "--column and --verbose are incompatible" +#~ msgstr "--column et --verbose sont incompatibles" + +#, c-format +#~ msgid "'%s' cannot be used with %s" +#~ msgstr "'%s' ne peut pas être utilisé avec %s" + +#~ msgid "set upstream info for new branch" +#~ msgstr "" +#~ "paramétrer les coordonnées de branche amont pour une nouvelle branche" + +#, c-format +#~ msgid "-%c, -%c and --orphan are mutually exclusive" +#~ msgstr "-%c, -%c et --orphan sont mutuellement exclusifs" + +#~ msgid "-p and --overlay are mutually exclusive" +#~ msgstr "-p et --overlay sont mutuellement exclusifs" + +#~ msgid "--pathspec-from-file is incompatible with --detach" +#~ msgstr "--pathspec-from-file est incompatible avec --detach" + +#~ msgid "--pathspec-from-file is incompatible with --patch" +#~ msgstr "--pathspec-from-file est incompatible avec --patch" + +#, c-format +#~ msgid "--bare and --origin %s options are incompatible." +#~ 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." + +#~ msgid "--pathspec-from-file with -a does not make sense" +#~ msgstr "--pathspec-from-file avec l'option -a n'a pas de sens" + +#, c-format +#~ msgid "cannot combine -m with --fixup:%s" +#~ msgstr "impossible de combiner -m avec --fixup:%s" + +#~ msgid "--long and -z are incompatible" +#~ msgstr "--long et -z sont incompatibles" + +#, c-format +#~ msgid "cannot combine reword option of --fixup with path '%s'" +#~ msgstr "" +#~ "impossible de combiner l'option reword de --fixup avec le chemin '%s'" + +#~ msgid "" +#~ "reword option of --fixup is mutually exclusive with --patch/--" +#~ "interactive/--all/--include/--only" +#~ msgstr "" +#~ "l'option reword de --fixup est mutuellement exclusive avec --patch/--" +#~ "interactive/--all/--include/--only" + +#~ msgid "--long is incompatible with --abbrev=0" +#~ msgstr "--long et --abbrev=0 sont incompatibles" + +#~ msgid "--dirty is incompatible with commit-ishes" +#~ 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" + +#~ msgid "--stdin and --merge-base are mutually exclusive" +#~ msgstr "--stdin et --merge-base sont mutuellement exclusifs" + +#~ msgid "--dir-diff is incompatible with --no-index" +#~ msgstr "--dir-diff est incompatible avec --no-index" + +#~ msgid "--gui, --tool and --extcmd are mutually exclusive" +#~ msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs" + +#~ msgid "--anonymize-map without --anonymize does not make sense" +#~ msgstr "--anonymize-map n'a aucune signification sans --anonymize" + +#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists" +#~ msgstr "" +#~ "Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists" + +#, c-format +#~ msgid "Refusing to fetch into current branch %s of non-bare repository" +#~ msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu" + +#~ msgid "--deepen and --depth are mutually exclusive" +#~ msgstr "--deepen et --depth sont mutuellement exclusifs" + +#~ msgid "--depth and --unshallow cannot be used together" +#~ msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" + +#~ msgid "--fix-thin cannot be used without --stdin" +#~ msgstr "--fix-thin ne peut pas être utilisé sans --stdin" + +#~ msgid "--object-format cannot be used with --stdin" +#~ msgstr "--object-format ne peut pas être utilisé avec --stdin" + +#~ msgid "--separate-git-dir and --bare are mutually exclusive" +#~ msgstr "--separate-git-dir et --bare sont mutuellement exclusifs" + +#~ msgid "-n and -k are mutually exclusive" +#~ msgstr "-n et -k sont mutuellement exclusifs" + +#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive" +#~ msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs" + +#~ msgid "--stdout, --output, and --output-directory are mutually exclusive" +#~ msgstr "" +#~ "--stdout, --output, et --output-directory sont mutuellement exclusifs" + +#~ msgid "--creation-factor requires --range-diff" +#~ msgstr "--creation-factor requiert --range-diff" + +#~ msgid "You cannot combine --squash with --no-ff." +#~ msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." + +#~ msgid "You cannot combine --squash with --commit." +#~ msgstr "Vous ne pouvez pas combiner --squash avec --commit." + +#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible" +#~ msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles" + +#~ msgid "--delete is incompatible with --all, --mirror and --tags" +#~ msgstr "--delete est incompatible avec --all, --mirror et --tags" + +#~ msgid "--all and --tags are incompatible" +#~ msgstr "--all et --tags sont incompatibles" + +#~ msgid "--mirror and --tags are incompatible" +#~ msgstr "--mirror et --tags sont incompatibles" + +#~ msgid "--all and --mirror are incompatible" +#~ msgstr "--all et --mirror sont incompatibles" + +#~ msgid "cannot combine '--keep-base' with '--onto'" +#~ msgstr "impossible de combiner '--keep-base' avec '--onto'" + +#~ msgid "cannot combine '--keep-base' with '--root'" +#~ msgstr "impossible de combiner '--keep-base' avec '--root'" + +#~ msgid "cannot combine '--root' with '--fork-point'" +#~ msgstr "impossible de combiner '--root' avec '--fork-point'" + +#~ msgid "cannot combine apply options with merge options" +#~ msgstr "" +#~ "impossible de combiner les options d'application avec les options de " +#~ "fusion" + +#~ msgid "--keep-unreachable and -A are incompatible" +#~ msgstr "--keep-unreachable et -A sont incompatibles" + +#~ msgid "--geometric is incompatible with -A, -a" +#~ msgstr "--geometric est incompatible avec -A, -a" + +#~ msgid "--patch is incompatible with --{hard,mixed,soft}" +#~ msgstr "--patch est incompatible avec --{hard,mixed,soft}" + +#~ msgid "-N can only be used with --mixed" +#~ msgstr "-N ne peut être utilisé qu'avec --mixed" + +#~ msgid "cannot combine --exclude-promisor-objects and --missing" +#~ msgstr "impossible de combiner --exclude-promisor-objects et --missing" + +#~ msgid "marked counting is incompatible with --objects" +#~ msgstr "le comptage marqué est incompatible avec --objects" + +#~ msgid "" +#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-" +#~ "base" +#~ msgstr "" +#~ "--reflog est incompatible avec --all, --remotes, --independent et --merge-" +#~ "base" + +#~ msgid "git sparse-checkout reapply" +#~ msgstr "git sparse-checkout reapply" + +#~ msgid "--cached and --files are mutually exclusive" +#~ msgstr "--cached et --files sont mutuellement exclusifs" + +#~ msgid "--branch and --default are mutually exclusive" +#~ msgstr "--branch et --default sont mutuellement exclusifs" + +#~ msgid "--column and -n are incompatible" +#~ msgstr "--column et -n sont incompatibles" + +#~ msgid "--contains option is only allowed in list mode" +#~ msgstr "l'option --contains est autorisée seulement en mode de liste" + +#~ msgid "--no-contains option is only allowed in list mode" +#~ msgstr "l'option --no-contains est autorisée seulement en mode liste" + +#~ msgid "--points-at option is only allowed in list mode" +#~ msgstr "l'option --points-at est autorisée seulement en mode liste" + +#~ msgid "--merged and --no-merged options are only allowed in list mode" +#~ msgstr "" +#~ "les options --merged et --no-merged ne sont autorisées qu'en mode liste" + +#~ msgid "only one -F or -m option is allowed." +#~ msgstr "une seule option -F ou -m est autorisée." + +#~ msgid "-b, -B, and --detach are mutually exclusive" +#~ msgstr "-b, -B et --detach sont mutuellement exclusifs" + +#~ msgid "--reason requires --lock" +#~ msgstr "--reason exige --lock" + +#~ msgid "--verbose and --porcelain are mutually exclusive" +#~ msgstr "--verbose et --porcelain sont mutuellement exclusifs" + +#, c-format +#~ msgid "no directory given for --git-dir\n" +#~ msgstr "aucun répertoire fourni pour --git-dir\n" + +#, c-format +#~ msgid "no directory given for --work-tree\n" +#~ msgstr "aucun répertoire fourni pour --work-tree\n" + +#~ msgid "--packfile requires --index-pack-args" +#~ msgstr "--packfile nécessite --index-pack-args" + +#~ msgid "--index-pack-args can only be used with --packfile" +#~ msgstr "--index-pack-args ne peut être utilisé qu'avec --packfile" |