diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2020-12-16 21:26:55 (GMT) |
|---|---|---|
| committer | Jean-Noël Avila <jn.avila@free.fr> | 2020-12-16 21:26:55 (GMT) |
| commit | 02cc663a761754caf13fb2c954fced09ba4c0ff8 (patch) | |
| tree | b1f1343cd8c5c83a689e833e6e0554055771c520 /po | |
| parent | 5e38c80fa762f27f0f4b7e3a4d5841238ca63cfc (diff) | |
| download | git-02cc663a761754caf13fb2c954fced09ba4c0ff8.zip git-02cc663a761754caf13fb2c954fced09ba4c0ff8.tar.gz git-02cc663a761754caf13fb2c954fced09ba4c0ff8.tar.bz2 | |
l10n: fr.po: v2.30.0 rnd 1
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Diffstat (limited to 'po')
| -rw-r--r-- | po/fr.po | 4805 |
1 files changed, 2409 insertions, 2396 deletions
@@ -76,8 +76,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-10-10 09:32+0800\n" -"PO-Revision-Date: 2020-10-27 22:01+0100\n" +"POT-Creation-Date: 2020-12-15 16:27+0800\n" +"PO-Revision-Date: 2020-12-16 22:15+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" @@ -87,203 +87,203 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" "X-Generator: Poedit 2.2.3\n" -#: add-interactive.c:368 +#: add-interactive.c:376 #, c-format msgid "Huh (%s)?" msgstr "Hein (%s) ?" -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 -#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 -#: builtin/rebase.c:1944 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284 +#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 +#: builtin/rebase.c:1955 msgid "could not read index" msgstr "impossible de lire l'index" -#: add-interactive.c:576 git-add--interactive.perl:269 +#: add-interactive.c:584 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "binaire" -#: add-interactive.c:634 git-add--interactive.perl:278 +#: add-interactive.c:642 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "rien" -#: add-interactive.c:635 git-add--interactive.perl:314 +#: add-interactive.c:643 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "inchangé" -#: add-interactive.c:672 git-add--interactive.perl:643 +#: add-interactive.c:680 git-add--interactive.perl:641 msgid "Update" msgstr "Mise à jour" -#: add-interactive.c:689 add-interactive.c:877 +#: add-interactive.c:697 add-interactive.c:885 #, c-format msgid "could not stage '%s'" msgstr "impossible d'indexer '%s'" -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 msgid "could not write index" msgstr "impossible d'écrire l'index" -#: add-interactive.c:698 git-add--interactive.perl:628 +#: add-interactive.c:706 git-add--interactive.perl:626 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "%d chemin mis à jour\n" msgstr[1] "%d chemins mis à jour\n" -#: add-interactive.c:716 git-add--interactive.perl:678 +#: add-interactive.c:724 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "note : %s n'est plus suivi à présent.\n" -#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:295 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" -#: add-interactive.c:751 git-add--interactive.perl:655 +#: add-interactive.c:759 git-add--interactive.perl:653 msgid "Revert" msgstr "Inverser" -#: add-interactive.c:767 +#: add-interactive.c:775 msgid "Could not parse HEAD^{tree}" msgstr "impossible d'analyser HEAD^{tree}" -#: add-interactive.c:805 git-add--interactive.perl:631 +#: add-interactive.c:813 git-add--interactive.perl:629 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "%d chemin inversé\n" msgstr[1] "%d chemins inversés\n" -#: add-interactive.c:856 git-add--interactive.perl:695 +#: add-interactive.c:864 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "Aucun Fichier non suivi.\n" -#: add-interactive.c:860 git-add--interactive.perl:689 +#: add-interactive.c:868 git-add--interactive.perl:687 msgid "Add untracked" msgstr "Ajouter un fichier non-suivi" -#: add-interactive.c:887 git-add--interactive.perl:625 +#: add-interactive.c:895 git-add--interactive.perl:623 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "%d chemin ajouté\n" msgstr[1] "%d chemins ajoutés\n" -#: add-interactive.c:917 +#: add-interactive.c:925 #, c-format msgid "ignoring unmerged: %s" msgstr "fichier non-fusionné ignoré : %s" -#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371 +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Seuls des fichiers binaires ont changé.\n" -#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Aucune modification.\n" -#: add-interactive.c:935 git-add--interactive.perl:1381 +#: add-interactive.c:943 git-add--interactive.perl:1379 msgid "Patch update" msgstr "Mise à jour par patch" -#: add-interactive.c:974 git-add--interactive.perl:1794 +#: add-interactive.c:982 git-add--interactive.perl:1792 msgid "Review diff" msgstr "Réviser la différence" -#: add-interactive.c:1002 +#: add-interactive.c:1010 msgid "show paths with changes" msgstr "afficher les chemins comprenant des modifications" -#: add-interactive.c:1004 +#: add-interactive.c:1012 msgid "add working tree state to the staged set of changes" msgstr "" "ajouter l'état de l'arbre de travail à l'ensemble des modifications indexées" -#: add-interactive.c:1006 +#: add-interactive.c:1014 msgid "revert staged set of changes back to the HEAD version" msgstr "retourner l'ensemble de modifications indexées à la version HEAD" -#: add-interactive.c:1008 +#: add-interactive.c:1016 msgid "pick hunks and update selectively" msgstr "sélection et mise à jour individuelle des sections" -#: add-interactive.c:1010 +#: add-interactive.c:1018 msgid "view diff between HEAD and index" msgstr "visualiser les diffs entre HEAD et l'index" -#: add-interactive.c:1012 +#: add-interactive.c:1020 msgid "add contents of untracked files to the staged set of changes" msgstr "" "ajouter le contenu des fichiers non-suivis à l'ensemble des modifications " "indexées" -#: add-interactive.c:1020 add-interactive.c:1069 +#: add-interactive.c:1028 add-interactive.c:1077 msgid "Prompt help:" msgstr "Aide :" -#: add-interactive.c:1022 +#: add-interactive.c:1030 msgid "select a single item" msgstr "sélectionner un seul élément" -#: add-interactive.c:1024 +#: add-interactive.c:1032 msgid "select a range of items" msgstr "sélectionner une plage d'éléments" -#: add-interactive.c:1026 +#: add-interactive.c:1034 msgid "select multiple ranges" msgstr "sélectionner plusieurs plages" -#: add-interactive.c:1028 add-interactive.c:1073 +#: add-interactive.c:1036 add-interactive.c:1081 msgid "select item based on unique prefix" msgstr "sélectionner un élément basé sur une préfixe unique" -#: add-interactive.c:1030 +#: add-interactive.c:1038 msgid "unselect specified items" msgstr "désélectionner les éléments spécifiés" -#: add-interactive.c:1032 +#: add-interactive.c:1040 msgid "choose all items" msgstr "choisir tous les éléments" -#: add-interactive.c:1034 +#: add-interactive.c:1042 msgid "(empty) finish selecting" msgstr "(vide) arrêter de sélectionner" -#: add-interactive.c:1071 +#: add-interactive.c:1079 msgid "select a numbered item" msgstr "sélectionner un élément par son numéro" -#: add-interactive.c:1075 +#: add-interactive.c:1083 msgid "(empty) select nothing" msgstr "(vide) ne rien sélectionner" -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891 +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 msgid "What now" msgstr "Et maintenant ?" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "staged" msgstr "indexé" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "unstaged" msgstr "non-indexé" -#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270 -#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 -#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 +#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 @@ -291,31 +291,31 @@ msgstr "non-indexé" msgid "path" msgstr "chemin" -#: add-interactive.c:1143 +#: add-interactive.c:1151 msgid "could not refresh index" msgstr "impossible de rafraîchir l'index" -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Au revoir.\n" -#: add-patch.c:34 git-add--interactive.perl:1433 +#: add-patch.c:34 git-add--interactive.perl:1431 #, 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:1434 +#: add-patch.c:35 git-add--interactive.perl:1432 #, 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:1435 +#: add-patch.c:36 git-add--interactive.perl:1433 #, 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:1436 +#: add-patch.c:37 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Indexer cette section [y,n,q,a,d%s,?] ? " @@ -342,22 +342,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:1439 +#: add-patch.c:56 git-add--interactive.perl:1437 #, 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:1440 +#: add-patch.c:57 git-add--interactive.perl:1438 #, 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:1441 +#: add-patch.c:58 git-add--interactive.perl:1439 #, 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:1442 +#: add-patch.c:59 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Remiser cette section [y,n,q,a,d%s,?] ? " @@ -384,22 +384,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:1445 +#: add-patch.c:80 git-add--interactive.perl:1443 #, 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:1446 +#: add-patch.c:81 git-add--interactive.perl:1444 #, 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:1447 +#: add-patch.c:82 git-add--interactive.perl:1445 #, 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:1448 +#: add-patch.c:83 git-add--interactive.perl:1446 #, 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,?] ? " @@ -426,22 +426,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:1451 +#: add-patch.c:103 git-add--interactive.perl:1449 #, 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:1452 +#: add-patch.c:104 git-add--interactive.perl:1450 #, 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:1453 +#: add-patch.c:105 git-add--interactive.perl:1451 #, 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:1454 +#: add-patch.c:106 git-add--interactive.perl:1452 #, 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,?] ? " @@ -468,26 +468,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:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:126 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 #, 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:1458 -#: git-add--interactive.perl:1476 +#: add-patch.c:127 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 #, 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:1459 -#: git-add--interactive.perl:1477 +#: add-patch.c:128 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, 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:1460 -#: git-add--interactive.perl:1478 +#: add-patch.c:129 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, 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,?] ? " @@ -514,23 +514,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:1463 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, 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:1464 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, 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:1465 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 #, 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:1466 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -550,27 +550,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:1469 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 #, 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:1470 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 #, 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:1471 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 #, 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:1472 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -639,7 +639,7 @@ msgstr "" "Votre filtre doit maintenir une correspondance un-pour-un\n" "entre les lignes en entrée et en sortie." -#: add-patch.c:785 +#: add-patch.c:790 #, c-format msgid "" "expected context line #%d in\n" @@ -648,7 +648,7 @@ msgstr "" "ligne de contexte attendue #%d dans\n" "%.*s" -#: add-patch.c:800 +#: add-patch.c:805 #, c-format msgid "" "hunks do not overlap:\n" @@ -661,12 +661,12 @@ msgstr "" "\tne se termine pas par :\n" "%.*s" -#: add-patch.c:1076 git-add--interactive.perl:1117 +#: add-patch.c:1081 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" "Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n" -#: add-patch.c:1080 +#: add-patch.c:1085 #, c-format msgid "" "---\n" @@ -680,7 +680,7 @@ msgstr "" "Les lignes commençant par %c seront éliminées.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1094 git-add--interactive.perl:1131 +#: add-patch.c:1099 git-add--interactive.perl:1129 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -690,11 +690,11 @@ msgstr "" "l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n" "alors l'édition sera abandonnée et la section conservée.\n" -#: add-patch.c:1127 +#: add-patch.c:1132 msgid "could not parse hunk header" msgstr "impossible d'analyser l'entête de section" -#: add-patch.c:1172 +#: add-patch.c:1177 msgid "'git apply --cached' failed" msgstr "'git apply --cached' a échoué" @@ -710,26 +710,26 @@ msgstr "'git apply --cached' a échoué" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1241 git-add--interactive.perl:1244 +#: add-patch.c:1246 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" " "l'élimine !) [y|n] ? " -#: add-patch.c:1284 +#: add-patch.c:1289 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:1285 git-add--interactive.perl:1348 +#: add-patch.c:1290 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "Les appliquer quand même à l'arbre de travail ? " -#: add-patch.c:1292 git-add--interactive.perl:1351 +#: add-patch.c:1297 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "Rien n'a été appliqué.\n" -#: add-patch.c:1349 +#: add-patch.c:1354 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -751,73 +751,73 @@ msgstr "" "e - éditer manuellement la section actuelle\n" "? - afficher l'aide\n" -#: add-patch.c:1511 add-patch.c:1521 +#: add-patch.c:1516 add-patch.c:1526 msgid "No previous hunk" msgstr "Pas de section précédente" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1521 add-patch.c:1531 msgid "No next hunk" msgstr "Pas de section suivante" -#: add-patch.c:1532 +#: add-patch.c:1537 msgid "No other hunks to goto" msgstr "Aucune autre section à atteindre" -#: add-patch.c:1543 git-add--interactive.perl:1608 +#: add-patch.c:1548 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "aller à quelle section (<ret> pour voir plus) ? " -#: add-patch.c:1544 git-add--interactive.perl:1610 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "aller à quelle section ? " -#: add-patch.c:1555 +#: add-patch.c:1560 #, c-format msgid "Invalid number: '%s'" msgstr "Numéro invalide : '%s'" -#: add-patch.c:1560 +#: add-patch.c:1565 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "Désolé, %d seule section disponible." msgstr[1] "Désolé, Seulement %d sections disponibles." -#: add-patch.c:1569 +#: add-patch.c:1574 msgid "No other hunks to search" msgstr "aucune autre section à rechercher" -#: add-patch.c:1575 git-add--interactive.perl:1663 +#: add-patch.c:1580 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "rechercher la regex ? " -#: add-patch.c:1590 +#: add-patch.c:1595 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Regex de recherche malformée %s : %s" -#: add-patch.c:1607 +#: add-patch.c:1612 msgid "No hunk matches the given pattern" msgstr "Aucune section ne correspond au motif donné" -#: add-patch.c:1614 +#: add-patch.c:1619 msgid "Sorry, cannot split this hunk" msgstr "Désolé, impossible de découper cette section" -#: add-patch.c:1618 +#: add-patch.c:1623 #, c-format msgid "Split into %d hunks." msgstr "Découpée en %d sections." -#: add-patch.c:1622 +#: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" msgstr "Désolé, impossible d'éditer cette section" -#: add-patch.c:1674 +#: add-patch.c:1679 msgid "'git apply' failed" msgstr "'git apply' a échoué" -#: advice.c:140 +#: advice.c:143 #, c-format msgid "" "\n" @@ -826,37 +826,37 @@ msgstr "" "\n" "Désactivez ce message avec \"git config advice.%s false\"" -#: advice.c:156 +#: advice.c:159 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sastuce: %.*s%s\n" -#: advice.c:247 +#: advice.c:250 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Impossible de picorer car vous avez des fichiers non fusionnés." -#: advice.c:249 +#: advice.c:252 msgid "Committing is not possible because you have unmerged files." msgstr "Impossible de valider car vous avez des fichiers non fusionnés." -#: advice.c:251 +#: advice.c:254 msgid "Merging is not possible because you have unmerged files." msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés." -#: advice.c:253 +#: advice.c:256 msgid "Pulling is not possible because you have unmerged files." msgstr "Impossible de tirer car vous avez des fichiers non fusionnés." -#: advice.c:255 +#: advice.c:258 msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés." -#: advice.c:257 +#: advice.c:260 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés." -#: advice.c:265 +#: advice.c:268 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -864,23 +864,23 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nécessaire pour marquer la résolution et valider." -#: advice.c:273 +#: advice.c:276 msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:278 builtin/merge.c:1349 +#: advice.c:281 builtin/merge.c:1369 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: advice.c:280 +#: advice.c:283 msgid "Please, commit your changes before merging." msgstr "Veuillez valider vos changements avant de fusionner." -#: advice.c:281 +#: advice.c:284 msgid "Exiting because of unfinished merge." msgstr "Abandon à cause d'une fusion non terminée." -#: advice.c:287 +#: advice.c:290 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -1182,7 +1182,7 @@ msgstr "le patch a échoué : %s:%ld" msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" @@ -1347,7 +1347,7 @@ msgstr "" msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4376 builtin/bisect--helper.c:537 +#: apply.c:4376 builtin/bisect--helper.c:524 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" @@ -1398,176 +1398,176 @@ msgstr "Section n°%d appliquée proprement." msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: apply.c:4715 +#: apply.c:4720 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traité." -#: apply.c:4723 +#: apply.c:4728 msgid "unrecognized input" msgstr "entrée non reconnue" -#: apply.c:4743 +#: apply.c:4748 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: apply.c:4900 +#: apply.c:4905 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s' :%s" -#: apply.c:4927 +#: apply.c:4932 #, 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:4933 apply.c:4948 +#: apply.c:4938 apply.c:4953 #, 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:4941 +#: apply.c:4946 #, 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:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4962 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: apply.c:4985 +#: apply.c:4990 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4988 +#: apply.c:4993 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4990 builtin/am.c:2279 +#: apply.c:4995 builtin/am.c:2266 msgid "num" msgstr "num" -#: apply.c:4991 +#: apply.c:4996 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: apply.c:4994 +#: apply.c:4999 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: apply.c:4996 +#: apply.c:5001 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:5000 +#: apply.c:5005 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:5002 +#: apply.c:5007 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:5004 +#: apply.c:5009 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:5006 +#: apply.c:5011 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:5008 +#: apply.c:5013 msgid "mark new files with `git add --intent-to-add`" msgstr "marquer les nouveaux fichiers `git add --intent-to-add`" -#: apply.c:5010 +#: apply.c:5015 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: apply.c:5012 +#: apply.c:5017 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: apply.c:5015 +#: apply.c:5020 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)" -#: apply.c:5017 +#: apply.c:5022 msgid "attempt three-way merge if a patch does not apply" msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement" -#: apply.c:5019 +#: apply.c:5024 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:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 +#: apply.c:5027 builtin/checkout-index.c:182 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: apply.c:5024 +#: apply.c:5029 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 +#: apply.c:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 msgid "action" msgstr "action" -#: apply.c:5026 +#: apply.c:5031 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:5029 apply.c:5032 +#: apply.c:5034 apply.c:5037 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: apply.c:5035 +#: apply.c:5040 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: apply.c:5037 +#: apply.c:5042 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: apply.c:5039 +#: apply.c:5044 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: apply.c:5041 +#: apply.c:5046 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: apply.c:5047 builtin/add.c:329 builtin/check-ignore.c:22 #: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "mode verbeux" -#: apply.c:5044 +#: apply.c:5049 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:5047 +#: apply.c:5052 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:5049 builtin/am.c:2267 +#: apply.c:5054 builtin/am.c:2254 msgid "root" msgstr "racine" -#: apply.c:5050 +#: apply.c:5055 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" @@ -1581,16 +1581,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:449 +#: archive-tar.c:450 #, c-format msgid "unable to start '%s' filter" msgstr "impossible de démarrer le filtre '%s'" -#: archive-tar.c:452 +#: archive-tar.c:453 msgid "unable to redirect descriptor" msgstr "impossible de rediriger un descripteur" -#: archive-tar.c:459 +#: archive-tar.c:460 #, c-format msgid "'%s' filter reported error" msgstr "le filtre '%s' a retourné une erreur" @@ -1639,9 +1639,9 @@ msgstr "git archive --remote <dépôt> [--exec <commande>] --list" msgid "cannot read %s" msgstr "impossible de lire %s" -#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 -#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 -#: builtin/merge.c:1124 +#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886 +#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1138 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" @@ -1680,119 +1680,111 @@ msgstr "Fichier non trouvé : %s" msgid "Not a regular file: %s" msgstr "'%s' n'est pas un fichier normal" -#: archive.c:553 +#: archive.c:555 msgid "fmt" msgstr "fmt" -#: archive.c:553 +#: archive.c:555 msgid "archive format" msgstr "format d'archive" -#: archive.c:554 builtin/log.c:1760 +#: archive.c:556 builtin/log.c:1765 msgid "prefix" msgstr "préfixe" -#: archive.c:555 +#: archive.c:557 msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 +#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1208 builtin/fast-export.c:1210 -#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/fast-export.c:1214 builtin/grep.c:919 builtin/hash-object.c:105 #: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "fichier" -#: archive.c:557 +#: archive.c:559 msgid "add untracked file to archive" msgstr "ajouter les fichiers non suivis à l'archive" -#: archive.c:560 builtin/archive.c:90 +#: archive.c:562 builtin/archive.c:90 msgid "write the archive to this file" msgstr "écrire l'archive dans ce fichier" -#: archive.c:562 +#: archive.c:564 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le répertoire de travail" -#: archive.c:563 +#: archive.c:565 msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" -#: archive.c:564 -msgid "store only" -msgstr "stockage seulement" - -#: archive.c:565 -msgid "compress faster" -msgstr "compression rapide" - -#: archive.c:573 -msgid "compress better" -msgstr "compression efficace" +#: archive.c:567 +msgid "set compression level" +msgstr "régler le niveau de compression" -#: archive.c:576 +#: archive.c:570 msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 #: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "dépôt" -#: archive.c:579 builtin/archive.c:92 +#: archive.c:573 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "récupérer l'archive depuis le dépôt distant <dépôt>" -#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 #: builtin/notes.c:498 msgid "command" msgstr "commande" -#: archive.c:581 builtin/archive.c:94 +#: archive.c:575 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" -#: archive.c:588 +#: archive.c:582 msgid "Unexpected option --remote" msgstr "Option --remote inattendue" -#: archive.c:590 +#: archive.c:584 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:592 +#: archive.c:586 msgid "Unexpected option --output" msgstr "Option --output inattendue" -#: archive.c:594 +#: archive.c:588 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:616 +#: archive.c:610 #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'archive inconnu '%s'" -#: archive.c:623 +#: archive.c:619 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argument non supporté pour le format '%s' : -%d" -#: attr.c:212 +#: attr.c:202 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s n'est pas un nom valide d'attribut" -#: attr.c:369 +#: attr.c:359 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s non permis : %s : %d" -#: attr.c:409 +#: attr.c:399 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1800,22 +1792,22 @@ msgstr "" "Les motifs de négation sont ignorés dans les attributs git\n" "Utilisez '\\!' pour un point d'exclamation littéral." -#: bisect.c:476 +#: bisect.c:489 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Contenu mal cité dans le fichier '%s' : %s" -#: bisect.c:686 +#: bisect.c:699 #, c-format msgid "We cannot bisect more!\n" msgstr "Impossible de pousser la bissection plus loin !\n" -#: bisect.c:753 +#: bisect.c:766 #, c-format msgid "Not a valid commit name %s" msgstr "%s n'est pas un nom de commit valide" -#: bisect.c:778 +#: bisect.c:791 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1824,7 +1816,7 @@ msgstr "" "La base de fusion %s est mauvaise.\n" "Cela signifie que le bogue été corrigé entre %s et [%s].\n" -#: bisect.c:783 +#: bisect.c:796 #, c-format msgid "" "The merge base %s is new.\n" @@ -1833,7 +1825,7 @@ msgstr "" "La base de fusion %s est nouvelle.\n" "La propriété a changé entre %s et [%s].\n" -#: bisect.c:788 +#: bisect.c:801 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1842,7 +1834,7 @@ msgstr "" "La base de fusion %s est %s.\n" "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n" -#: bisect.c:796 +#: bisect.c:809 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1853,7 +1845,7 @@ msgstr "" "git bisect ne peut pas fonctionner correctement dans ce cas.\n" "Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n" -#: bisect.c:809 +#: bisect.c:822 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1865,36 +1857,36 @@ msgstr "" "et %s.\n" "On continue tout de même." -#: bisect.c:848 +#: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bissection : une base de fusion doit être testée\n" -#: bisect.c:898 +#: bisect.c:911 #, c-format msgid "a %s revision is needed" msgstr "une révision %s est nécessaire" -#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" -#: bisect.c:974 builtin/merge.c:150 +#: bisect.c:987 builtin/merge.c:152 #, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" -#: bisect.c:1014 +#: bisect.c:1027 msgid "reading bisect refs failed" msgstr "impossible de lire les références de bissection" -#: bisect.c:1044 +#: bisect.c:1057 #, c-format msgid "%s was both %s and %s\n" msgstr "%s était à la fois %s et %s\n" -#: bisect.c:1053 +#: bisect.c:1066 #, c-format msgid "" "No testable commit found.\n" @@ -1903,7 +1895,7 @@ msgstr "" "Aucun commit testable n'a été trouvé\n" "Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n" -#: bisect.c:1082 +#: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1913,48 +1905,48 @@ msgstr[1] "(à peu près %d étapes)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1088 +#: bisect.c:1101 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bissection : %d révision à tester après ceci %s\n" msgstr[1] "Bissection : %d révisions à tester après ceci %s\n" -#: blame.c:2778 +#: blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "--contents et --reverse ne font pas bon ménage." -#: blame.c:2792 +#: blame.c:2791 msgid "cannot use --contents with final commit object name" msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final" -#: blame.c:2813 +#: blame.c:2812 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse et --first-parent ensemble nécessitent la spécification d'un " "dernier commit" -#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 -#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 -#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 -#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 -#: builtin/shortlog.c:320 +#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138 +#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 +#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 +#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:267 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" -#: blame.c:2840 +#: blame.c:2839 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de " "premier parent" -#: blame.c:2851 +#: blame.c:2850 #, c-format msgid "no such path %s in %s" msgstr "pas de chemin %s dans %s" -#: blame.c:2862 +#: blame.c:2861 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossible de lire le blob %s pour le chemin %s" @@ -2127,7 +2119,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:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" @@ -2190,7 +2182,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:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 +#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" @@ -2213,7 +2205,7 @@ msgstr "l'index de groupe a disparu" msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit-graph.c:188 midx.c:46 +#: commit-graph.c:188 midx.c:47 msgid "invalid hash version" msgstr "version d'empreinte invalide" @@ -2283,7 +2275,7 @@ msgstr "" msgid "could not find commit %s" msgstr "impossible de trouver le commit %s" -#: commit-graph.c:1042 builtin/am.c:1306 +#: commit-graph.c:1042 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "impossible d'analyser le commit %s" @@ -2351,7 +2343,7 @@ msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits" 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:1720 midx.c:826 +#: commit-graph.c:1720 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "impossible de créer les répertoires de premier niveau de %s" @@ -2388,83 +2380,82 @@ msgstr "impossible de renommer le fichier temporaire de graphe de commits" msgid "Scanning merged commits" msgstr "Analyse des commits de fusion" -#: commit-graph.c:2026 -#, c-format -msgid "unexpected duplicate commit id %s" -msgstr "id de commit %s dupliqué inattendu" - -#: commit-graph.c:2049 +#: commit-graph.c:2059 msgid "Merging commit-graph" msgstr "fusion du graphe de commits" -#: commit-graph.c:2259 +#: commit-graph.c:2165 +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:2274 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "le graphe de commits ne peut pas écrire %d commits" -#: commit-graph.c:2270 +#: commit-graph.c:2285 msgid "too many commits to write graph" msgstr "trop de commits pour écrire un graphe" -#: commit-graph.c:2363 +#: commit-graph.c:2378 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:2373 +#: commit-graph.c:2388 #, 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:2383 commit-graph.c:2398 +#: commit-graph.c:2398 commit-graph.c:2413 #, 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:2390 +#: commit-graph.c:2405 #, 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:2408 +#: commit-graph.c:2423 msgid "Verifying commits in commit graph" msgstr "Verification des commits dans le graphe de commits" -#: commit-graph.c:2423 +#: commit-graph.c:2438 #, 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:2430 +#: commit-graph.c:2445 #, 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:2440 +#: commit-graph.c:2455 #, 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:2449 +#: commit-graph.c:2464 #, 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:2463 +#: commit-graph.c:2478 #, 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:2468 +#: commit-graph.c:2483 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2472,7 +2463,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:2472 +#: commit-graph.c:2487 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2480,20 +2471,20 @@ 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:2488 +#: commit-graph.c:2503 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "la génération du graphe de commit pour le commit %s est %u != %u" -#: commit-graph.c:2494 +#: commit-graph.c:2509 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "la date de validation pour le commit %s dans le graphe de commit est " "%<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 -#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" @@ -2599,7 +2590,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:408 sequencer.c:2547 +#: config.c:408 sequencer.c:2580 #, c-format msgid "invalid key: %s" msgstr "clé invalide : %s" @@ -2803,77 +2794,77 @@ 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:2470 +#: config.c:2473 #, c-format msgid "invalid section name '%s'" msgstr "nom de section invalide '%s'" -#: config.c:2502 +#: config.c:2505 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2531 +#: config.c:2534 #, c-format msgid "failed to write new configuration file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2783 config.c:3107 +#: config.c:2786 config.c:3112 #, c-format msgid "could not lock config file %s" msgstr "impossible de verrouiller le fichier de configuration %s" -#: config.c:2794 +#: config.c:2797 #, c-format msgid "opening %s" msgstr "ouverture de %s" -#: config.c:2829 builtin/config.c:354 +#: config.c:2834 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "motif invalide : %s" -#: config.c:2854 +#: config.c:2859 #, c-format msgid "invalid config file %s" msgstr "fichier de configuration invalide %s" -#: config.c:2867 config.c:3120 +#: config.c:2872 config.c:3125 #, c-format msgid "fstat on %s failed" msgstr "échec de fstat sur %s" -#: config.c:2878 +#: config.c:2883 #, c-format msgid "unable to mmap '%s'" msgstr "impossible de réaliser un map de '%s'" -#: config.c:2887 config.c:3125 +#: config.c:2892 config.c:3130 #, c-format msgid "chmod on %s failed" msgstr "échec de chmod sur %s" -#: config.c:2972 config.c:3222 +#: config.c:2977 config.c:3227 #, c-format msgid "could not write config file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:3006 +#: config.c:3011 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 +#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" -#: config.c:3098 +#: config.c:3103 #, c-format msgid "invalid section name: %s" msgstr "nom de section invalide : %s" -#: config.c:3265 +#: config.c:3270 #, c-format msgid "missing value for '%s'" msgstr "valeur manquante pour '%s'" @@ -3319,6 +3310,26 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "Marquage de %d îlots, fait.\n" +#: diff-lib.c:534 +msgid "--merge-base does not work with ranges" +msgstr "--merge-base ne fonctionne pas avec des plages" + +#: diff-lib.c:536 +msgid "--merge-base only works with commits" +msgstr "--merge-base ne fonctionne qu'avec des commits" + +#: diff-lib.c:553 +msgid "unable to get HEAD" +msgstr "impossible d'acquérir HEAD" + +#: diff-lib.c:560 +msgid "no merge base found" +msgstr "aucune base de fusion trouvée" + +#: diff-lib.c:562 +msgid "multiple merge bases found" +msgstr "bases multiples de fusion trouvées" + #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<options>] <chemin> <chemin>" @@ -3383,35 +3394,35 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:4269 +#: diff.c:4276 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:4618 +#: diff.c:4625 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:4621 +#: diff.c:4628 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S et --find-object sont mutuellement exclusifs" -#: diff.c:4699 +#: diff.c:4706 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:4747 +#: diff.c:4754 #, c-format msgid "invalid --stat value: %s" msgstr "valeur invalide de --stat : %s" -#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s attend une valeur numérique" -#: diff.c:4784 +#: diff.c:4791 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3420,42 +3431,42 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4869 +#: diff.c:4876 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s" -#: diff.c:4893 +#: diff.c:4900 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valeur inconnue après ws-error-highlight=%.*s" -#: diff.c:4907 +#: diff.c:4914 #, c-format msgid "unable to resolve '%s'" msgstr "impossible de résoudre '%s'" -#: diff.c:4957 diff.c:4963 +#: diff.c:4964 diff.c:4970 #, c-format msgid "%s expects <n>/<m> form" msgstr "forme <n>/<m> attendue par %s" -#: diff.c:4975 +#: diff.c:4982 #, c-format msgid "%s expects a character, got '%s'" msgstr "caractère attendu par %s, '%s' trouvé" -#: diff.c:4996 +#: diff.c:5003 #, c-format msgid "bad --color-moved argument: %s" msgstr "mauvais argument --color-moved : %s" -#: diff.c:5015 +#: diff.c:5022 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode invalide '%s' dans --color-moved-ws" -#: diff.c:5055 +#: diff.c:5062 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3463,155 +3474,160 @@ msgstr "" "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " "\"histogram\"" -#: diff.c:5091 diff.c:5111 +#: diff.c:5098 diff.c:5118 #, c-format msgid "invalid argument to %s" msgstr "argument invalide pour %s" -#: diff.c:5248 +#: diff.c:5222 +#, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "regex invalide fournie à -I : '%s'" + +#: diff.c:5271 #, 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:5304 +#: diff.c:5327 #, c-format msgid "bad --word-diff argument: %s" msgstr "mauvais argument pour --word-diff : %s" -#: diff.c:5327 +#: diff.c:5350 msgid "Diff output format options" msgstr "Options de format de sortie de diff" -#: diff.c:5329 diff.c:5335 +#: diff.c:5352 diff.c:5358 msgid "generate patch" msgstr "générer la rustine" -#: diff.c:5332 builtin/log.c:176 +#: diff.c:5355 builtin/log.c:178 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: diff.c:5337 diff.c:5451 diff.c:5458 +#: diff.c:5360 diff.c:5474 diff.c:5481 msgid "<n>" msgstr "<n>" -#: diff.c:5338 diff.c:5341 +#: diff.c:5361 diff.c:5364 msgid "generate diffs with <n> lines context" msgstr "générer les diffs avec <n> lignes de contexte" -#: diff.c:5343 +#: diff.c:5366 msgid "generate the diff in raw format" msgstr "générer le diff en format brut" -#: diff.c:5346 +#: diff.c:5369 msgid "synonym for '-p --raw'" msgstr "synonyme de '-p --raw'" -#: diff.c:5350 +#: diff.c:5373 msgid "synonym for '-p --stat'" msgstr "synonyme de '-p --stat'" -#: diff.c:5354 +#: diff.c:5377 msgid "machine friendly --stat" msgstr "--stat pour traitement automatique" -#: diff.c:5357 +#: diff.c:5380 msgid "output only the last line of --stat" msgstr "afficher seulement la dernière ligne de --stat" -#: diff.c:5359 diff.c:5367 +#: diff.c:5382 diff.c:5390 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5360 +#: diff.c:5383 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:5364 +#: diff.c:5387 msgid "synonym for --dirstat=cumulative" msgstr "synonyme pour --dirstat=cumulative" -#: diff.c:5368 +#: diff.c:5391 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonyme pour --dirstat=files,param1,param2..." -#: diff.c:5372 +#: diff.c:5395 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:5375 +#: diff.c:5398 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:5378 +#: diff.c:5401 msgid "show only names of changed files" msgstr "n'afficher que les noms de fichiers modifiés" -#: diff.c:5381 +#: diff.c:5404 msgid "show only names and status of changed files" msgstr "n'afficher que les noms et les status des fichiers modifiés" -#: diff.c:5383 +#: diff.c:5406 msgid "<width>[,<name-width>[,<count>]]" msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]" -#: diff.c:5384 +#: diff.c:5407 msgid "generate diffstat" msgstr "générer un diffstat" -#: diff.c:5386 diff.c:5389 diff.c:5392 +#: diff.c:5409 diff.c:5412 diff.c:5415 msgid "<width>" msgstr "<largeur>" -#: diff.c:5387 +#: diff.c:5410 msgid "generate diffstat with a given width" msgstr "générer un diffstat avec la largeur indiquée" -#: diff.c:5390 +#: diff.c:5413 msgid "generate diffstat with a given name width" msgstr "génerer un diffstat avec la largeur de nom indiquée" -#: diff.c:5393 +#: diff.c:5416 msgid "generate diffstat with a given graph width" msgstr "génerer un diffstat avec la largeur de graphe indiquée" -#: diff.c:5395 +#: diff.c:5418 msgid "<count>" msgstr "<compte>" -#: diff.c:5396 +#: diff.c:5419 msgid "generate diffstat with limited lines" msgstr "générer un diffstat avec des lignes limitées" -#: diff.c:5399 +#: diff.c:5422 msgid "generate compact summary in diffstat" msgstr "générer une résumé compact dans le diffstat" -#: diff.c:5402 +#: diff.c:5425 msgid "output a binary diff that can be applied" msgstr "produire un diff binaire qui peut être appliqué" -#: diff.c:5405 +#: diff.c:5428 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:5407 +#: diff.c:5430 msgid "show colored diff" msgstr "afficher un diff coloré" -#: diff.c:5408 +#: diff.c:5431 msgid "<kind>" msgstr "<sorte>" -#: diff.c:5409 +#: diff.c:5432 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3619,7 +3635,7 @@ msgstr "" "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', " "'nouveau' dans le diff" -#: diff.c:5412 +#: diff.c:5435 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3627,93 +3643,93 @@ msgstr "" "ne pas compresser les chemins et utiliser des NULs comme terminateurs de " "champs dans --raw ou --numstat" -#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 +#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553 msgid "<prefix>" msgstr "<préfixe>" -#: diff.c:5416 +#: diff.c:5439 msgid "show the given source prefix instead of \"a/\"" msgstr "afficher le préfixe de source indiqué au lieu de \"a/\"" -#: diff.c:5419 +#: diff.c:5442 msgid "show the given destination prefix instead of \"b/\"" msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\"" -#: diff.c:5422 +#: diff.c:5445 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:5425 +#: diff.c:5448 msgid "do not show any source or destination prefix" msgstr "n'afficher aucun préfixe, ni de source, ni de destination" -#: diff.c:5428 +#: diff.c:5451 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:5432 diff.c:5437 diff.c:5442 +#: diff.c:5455 diff.c:5460 diff.c:5465 msgid "<char>" msgstr "<caractère>" -#: diff.c:5433 +#: diff.c:5456 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:5438 +#: diff.c:5461 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:5443 +#: diff.c:5466 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:5446 +#: diff.c:5469 msgid "Diff rename options" msgstr "Options de renommage de diff" -#: diff.c:5447 +#: diff.c:5470 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5448 +#: diff.c:5471 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:5452 +#: diff.c:5475 msgid "detect renames" msgstr "détecter les renommages" -#: diff.c:5456 +#: diff.c:5479 msgid "omit the preimage for deletes" msgstr "supprimer la pré-image pour les suppressions" -#: diff.c:5459 +#: diff.c:5482 msgid "detect copies" msgstr "détecter les copies" -#: diff.c:5463 +#: diff.c:5486 msgid "use unmodified files as source to find copies" msgstr "" "utiliser les fichiers non-modifiés comme sources pour trouver des copies" -#: diff.c:5465 +#: diff.c:5488 msgid "disable rename detection" msgstr "désactiver la détection de renommage" -#: diff.c:5468 +#: diff.c:5491 msgid "use empty blobs as rename source" msgstr "utiliser des blobs vides comme source de renommage" -#: diff.c:5470 +#: diff.c:5493 msgid "continue listing the history of a file beyond renames" msgstr "continuer à afficher l'historique d'un fichier au delà des renommages" -#: diff.c:5473 +#: diff.c:5496 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3721,161 +3737,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:5475 +#: diff.c:5498 msgid "Diff algorithm options" msgstr "Options de l'algorithme de diff" -#: diff.c:5477 +#: diff.c:5500 msgid "produce the smallest possible diff" msgstr "produire le diff le plus petit possible" -#: diff.c:5480 +#: diff.c:5503 msgid "ignore whitespace when comparing lines" msgstr "ignorer les espaces lors de la comparaison de ligne" -#: diff.c:5483 +#: diff.c:5506 msgid "ignore changes in amount of whitespace" msgstr "ignorer des modifications du nombre d'espaces" -#: diff.c:5486 +#: diff.c:5509 msgid "ignore changes in whitespace at EOL" msgstr "ignorer des modifications d'espace en fin de ligne" -#: diff.c:5489 +#: diff.c:5512 msgid "ignore carrier-return at the end of line" msgstr "ignore le retour chariot en fin de ligne" -#: diff.c:5492 +#: diff.c:5515 msgid "ignore changes whose lines are all blank" msgstr "ignorer les modifications dont les lignes sont vides" -#: diff.c:5495 +#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587 +msgid "<regex>" +msgstr "<regex>" + +#: diff.c:5518 +msgid "ignore changes whose all lines match <regex>" +msgstr "ignorer les modifications dont les lignes correspondent à <regex>" + +#: diff.c:5521 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:5498 +#: diff.c:5524 msgid "generate diff using the \"patience diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"patience\"" -#: diff.c:5502 +#: diff.c:5528 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" "générer un diff en utilisant l'algorithme de différence \"histogramme\"" -#: diff.c:5504 +#: diff.c:5530 msgid "<algorithm>" msgstr "<algorithme>" -#: diff.c:5505 +#: diff.c:5531 msgid "choose a diff algorithm" msgstr "choisir un algorithme de différence" -#: diff.c:5507 +#: diff.c:5533 msgid "<text>" msgstr "<texte>" -#: diff.c:5508 +#: diff.c:5534 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\"" -#: diff.c:5510 diff.c:5519 diff.c:5522 +#: diff.c:5536 diff.c:5545 diff.c:5548 msgid "<mode>" msgstr "<mode>" -#: diff.c:5511 +#: diff.c:5537 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:5513 diff.c:5516 diff.c:5561 -msgid "<regex>" -msgstr "<regex>" - -#: diff.c:5514 +#: diff.c:5540 msgid "use <regex> to decide what a word is" msgstr "utiliser <regex> pour décider ce qu'est un mot" -#: diff.c:5517 +#: diff.c:5543 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5520 +#: diff.c:5546 msgid "moved lines of code are colored differently" msgstr "les lignes déplacées sont colorées différemment" -#: diff.c:5523 +#: diff.c:5549 msgid "how white spaces are ignored in --color-moved" msgstr "comment les espaces sont ignorés dans --color-moved" -#: diff.c:5526 +#: diff.c:5552 msgid "Other diff options" msgstr "Autres options diff" -#: diff.c:5528 +#: diff.c:5554 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:5532 +#: diff.c:5558 msgid "treat all files as text" msgstr "traiter les fichiers comme texte" -#: diff.c:5534 +#: diff.c:5560 msgid "swap two inputs, reverse the diff" msgstr "échanger les entrées, inverser le diff" -#: diff.c:5536 +#: diff.c:5562 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:5538 +#: diff.c:5564 msgid "disable all output of the program" msgstr "désactiver tous les affichages du programme" -#: diff.c:5540 +#: diff.c:5566 msgid "allow an external diff helper to be executed" msgstr "autoriser l'exécution d'un assistant externe de diff" -#: diff.c:5542 +#: diff.c:5568 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:5544 +#: diff.c:5570 msgid "<when>" msgstr "<quand>" -#: diff.c:5545 +#: diff.c:5571 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:5548 +#: diff.c:5574 msgid "<format>" msgstr "<format>" -#: diff.c:5549 +#: diff.c:5575 msgid "specify how differences in submodules are shown" msgstr "spécifier comment les différences dans les sous-modules sont affichées" -#: diff.c:5553 +#: diff.c:5579 msgid "hide 'git add -N' entries from the index" msgstr "masquer les entrées 'git add -N' de l'index" -#: diff.c:5556 +#: diff.c:5582 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:5558 +#: diff.c:5584 msgid "<string>" msgstr "<chaîne>" -#: diff.c:5559 +#: diff.c:5585 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3883,7 +3903,7 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la " "chaîne spécifiée" -#: diff.c:5562 +#: diff.c:5588 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3891,26 +3911,26 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la regex " "spécifiée" -#: diff.c:5565 +#: diff.c:5591 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:5568 +#: diff.c:5594 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue" -#: diff.c:5571 +#: diff.c:5597 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:5572 +#: diff.c:5598 msgid "<object-id>" msgstr "<id-objet>" -#: diff.c:5573 +#: diff.c:5599 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3918,35 +3938,35 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de l'objet " "indiqué" -#: diff.c:5575 +#: diff.c:5601 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5576 +#: diff.c:5602 msgid "select files by diff type" msgstr "sélectionner les fichiers par types de diff" -#: diff.c:5578 +#: diff.c:5604 msgid "<file>" msgstr "<fichier>" -#: diff.c:5579 +#: diff.c:5605 msgid "Output to a specific file" msgstr "Sortie vers un fichier spécifié" -#: diff.c:6236 +#: diff.c:6262 msgid "inexact rename detection was skipped due to too many files." msgstr "" "détection de renommage inexact annulée à cause d'un trop grand nombre de " "fichiers." -#: diff.c:6239 +#: diff.c:6265 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:6242 +#: diff.c:6268 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -4054,246 +4074,246 @@ msgstr "impossible de régler GIT_DIR à '%s'" msgid "too many args to run %s" msgstr "trop d'arguments pour lancer %s" -#: fetch-pack.c:176 +#: fetch-pack.c:177 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack : liste superficielle attendue" -#: fetch-pack.c:179 +#: fetch-pack.c:180 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:190 +#: fetch-pack.c:191 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:210 +#: fetch-pack.c:211 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu" -#: fetch-pack.c:221 +#: fetch-pack.c:222 msgid "unable to write to remote" msgstr "impossible d'écrire sur un distant" -#: fetch-pack.c:282 +#: fetch-pack.c:283 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc nécessite multi_ack_detailed" -#: fetch-pack.c:375 fetch-pack.c:1397 +#: fetch-pack.c:378 fetch-pack.c:1406 #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalide : %s" -#: fetch-pack.c:381 fetch-pack.c:1403 +#: fetch-pack.c:384 fetch-pack.c:1412 #, c-format msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" -#: fetch-pack.c:383 fetch-pack.c:1405 +#: fetch-pack.c:386 fetch-pack.c:1414 #, c-format msgid "object not found: %s" msgstr "objet non trouvé : %s" -#: fetch-pack.c:386 fetch-pack.c:1408 +#: fetch-pack.c:389 fetch-pack.c:1417 #, c-format msgid "error in object: %s" msgstr "Erreur dans l'objet : %s" -#: fetch-pack.c:388 fetch-pack.c:1410 +#: fetch-pack.c:391 fetch-pack.c:1419 #, c-format msgid "no shallow found: %s" msgstr "Pas de superficiel trouvé : %s" -#: fetch-pack.c:391 fetch-pack.c:1414 +#: fetch-pack.c:394 fetch-pack.c:1423 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "superficiel/non superficiel attendu, %s trouvé" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "got %s %d %s" msgstr "réponse %s %d %s" -#: fetch-pack.c:448 +#: fetch-pack.c:451 #, c-format msgid "invalid commit %s" msgstr "commit invalide %s" -#: fetch-pack.c:479 +#: fetch-pack.c:482 msgid "giving up" msgstr "abandon" -#: fetch-pack.c:492 progress.c:339 +#: fetch-pack.c:495 progress.c:339 msgid "done" msgstr "fait" -#: fetch-pack.c:504 +#: fetch-pack.c:507 #, c-format msgid "got %s (%d) %s" msgstr "%s trouvé (%d) %s" -#: fetch-pack.c:540 +#: fetch-pack.c:543 #, c-format msgid "Marking %s as complete" msgstr "Marquage de %s comme terminé" -#: fetch-pack.c:755 +#: fetch-pack.c:758 #, c-format msgid "already have %s (%s)" msgstr "%s déjà possédé (%s)" -#: fetch-pack.c:824 +#: fetch-pack.c:827 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral" -#: fetch-pack.c:832 +#: fetch-pack.c:835 msgid "protocol error: bad pack header" msgstr "erreur de protocole : mauvais entête de paquet" -#: fetch-pack.c:916 +#: fetch-pack.c:919 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack : impossible de dupliquer %s" -#: fetch-pack.c:933 +#: fetch-pack.c:937 #, c-format msgid "%s failed" msgstr "échec de %s" -#: fetch-pack.c:935 +#: fetch-pack.c:939 msgid "error in sideband demultiplexer" msgstr "erreur dans le démultiplexer latéral" -#: fetch-pack.c:978 +#: fetch-pack.c:982 #, c-format msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 -#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 -#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 -#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 +#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005 +#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021 +#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059 #, c-format msgid "Server supports %s" msgstr "Le serveur supporte %s" -#: fetch-pack.c:985 +#: fetch-pack.c:992 msgid "Server does not support shallow clients" msgstr "Le serveur ne supporte les clients superficiels" -#: fetch-pack.c:1045 +#: fetch-pack.c:1052 msgid "Server does not support --shallow-since" msgstr "Le receveur ne gère pas --shallow-since" -#: fetch-pack.c:1050 +#: fetch-pack.c:1057 msgid "Server does not support --shallow-exclude" msgstr "Le receveur ne gère pas --shallow-exclude" -#: fetch-pack.c:1054 +#: fetch-pack.c:1061 msgid "Server does not support --deepen" msgstr "Le receveur ne gère pas --deepen" -#: fetch-pack.c:1056 +#: fetch-pack.c:1063 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:1069 +#: fetch-pack.c:1076 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:1081 fetch-pack.c:1619 +#: fetch-pack.c:1088 fetch-pack.c:1628 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." -#: fetch-pack.c:1205 +#: fetch-pack.c:1214 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "non-correspondance des algorithmes : client %s ; serveur %s" -#: fetch-pack.c:1209 +#: fetch-pack.c:1218 #, c-format msgid "the server does not support algorithm '%s'" msgstr "Le serveur ne supporte pas l'algorithme '%s'" -#: fetch-pack.c:1229 +#: fetch-pack.c:1238 msgid "Server does not support shallow requests" msgstr "Le serveur ne supporte pas les requêtes superficielles" -#: fetch-pack.c:1236 +#: fetch-pack.c:1245 msgid "Server supports filter" msgstr "Le serveur supporte filter" -#: fetch-pack.c:1275 +#: fetch-pack.c:1284 msgid "unable to write request to remote" msgstr "impossible d'écrire la requête sur le distant" -#: fetch-pack.c:1293 +#: fetch-pack.c:1302 #, c-format msgid "error reading section header '%s'" msgstr "erreur à la lecture de l'entête de section '%s'" -#: fetch-pack.c:1299 +#: fetch-pack.c:1308 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' attendu, '%s' reçu" -#: fetch-pack.c:1360 +#: fetch-pack.c:1369 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "ligne d'acquittement inattendue : '%s'" -#: fetch-pack.c:1365 +#: fetch-pack.c:1374 #, c-format msgid "error processing acks: %d" msgstr "erreur lors du traitement des acquittements : %d" -#: fetch-pack.c:1375 +#: fetch-pack.c:1384 msgid "expected packfile to be sent after 'ready'" msgstr "fichier paquet attendu à envoyer après 'ready'" -#: fetch-pack.c:1377 +#: fetch-pack.c:1386 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:1419 +#: fetch-pack.c:1428 #, c-format msgid "error processing shallow info: %d" msgstr "erreur lors du traitement de l'information de superficialité : %d" -#: fetch-pack.c:1466 +#: fetch-pack.c:1475 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref attendu, '%s' trouvé" -#: fetch-pack.c:1471 +#: fetch-pack.c:1480 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inattendu : '%s'" -#: fetch-pack.c:1476 +#: fetch-pack.c:1485 #, c-format msgid "error processing wanted refs: %d" msgstr "erreur lors du traitement des références voulues : %d" -#: fetch-pack.c:1506 +#: fetch-pack.c:1515 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack : paquet de fin de réponse attendu" -#: fetch-pack.c:1887 +#: fetch-pack.c:1897 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1910 builtin/clone.c:692 +#: fetch-pack.c:1920 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: fetch-pack.c:1937 +#: fetch-pack.c:1947 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:1940 +#: fetch-pack.c:1950 #, 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é" @@ -4316,7 +4336,7 @@ msgstr "gpg n'a pas pu signer les données" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "couleur invalide '%.*s' ignorée dans log.graphColors" -#: grep.c:668 +#: grep.c:640 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4324,18 +4344,18 @@ msgstr "" "le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est " "supporté qu'avec -P avec PCRE v2" -#: grep.c:2128 +#: grep.c:2100 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 +#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: grep.c:2156 +#: grep.c:2128 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquée" @@ -4429,7 +4449,7 @@ msgstr "Commandes externes" msgid "Command aliases" msgstr "Alias de commande" -#: help.c:513 +#: help.c:527 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4438,33 +4458,33 @@ msgstr "" "'%s' semble être une commande git, mais elle n'a pas pu\n" "être exécutée. Peut-être git-%s est-elle cassée ?" -#: help.c:572 +#: help.c:543 help.c:631 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'." + +#: help.c:591 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ahem. Votre système n'indique aucune commande Git." -#: help.c:594 +#: help.c:613 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" "ATTENTION : vous avez invoqué une commande Git nommée '%s' qui n'existe pas." -#: help.c:599 +#: help.c:618 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Continuons en supposant que vous avez voulu dire '%s'." -#: help.c:604 +#: help.c:623 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" "Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'." -#: help.c:612 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'." - -#: help.c:616 +#: help.c:635 msgid "" "\n" "The most similar command is" @@ -4478,16 +4498,16 @@ msgstr[1] "" "\n" "Les commandes les plus ressemblantes sont" -#: help.c:656 +#: help.c:675 msgid "git version [<options>]" msgstr "git version [<options>]" -#: help.c:711 +#: help.c:730 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:715 +#: help.c:734 msgid "" "\n" "Did you mean this?" @@ -4656,6 +4676,21 @@ msgstr "Impossible de créer '%s.lock' : %s" msgid "expected flush after ls-refs arguments" msgstr "vidage attendu après les arguments ls-refs" +#: merge-ort-wrappers.c:13 merge-recursive.c:3672 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par la " +"fusion :\n" +" %s" + +#: merge-ort-wrappers.c:33 merge-recursive.c:3436 +#, c-format +msgid "Already up to date!" +msgstr "Déjà à jour !" + #: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(mauvais commit)\n" @@ -5048,10 +5083,6 @@ msgstr "Ajout de %s" msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s" -#: merge-recursive.c:3436 -msgid "Already up to date!" -msgstr "Déjà à jour !" - #: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" @@ -5072,22 +5103,12 @@ msgstr[1] "%u ancêtres communs trouvés :" msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:3672 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Vos modifications locales aux fichiers suivants seraient écrasées par la " -"fusion :\n" -" %s" - #: merge-recursive.c:3769 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 +#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -5095,128 +5116,124 @@ msgstr "Impossible d'écrire l'index." msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 -#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" -#: midx.c:79 +#: midx.c:80 #, c-format msgid "multi-pack-index file %s is too small" msgstr "le fichier d'index multi-paquet %s est trop petit" -#: midx.c:95 +#: midx.c:96 #, 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:100 +#: midx.c:101 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "la version d'index multi-paquet %d n'est pas reconnue" -#: midx.c:105 +#: midx.c:106 #, 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:122 +#: midx.c:123 msgid "invalid chunk offset (too large)" msgstr "décalage de section invalide (trop grand)" -#: midx.c:146 +#: midx.c:147 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" "identifiant de terminaison de tronçon d'index multi-paquet terminant " "apparaît plus tôt qu'attendu" -#: midx.c:159 +#: midx.c:160 msgid "multi-pack-index missing required pack-name chunk" msgstr "index multi-paquet manque de tronçon de nom de paquet" -#: midx.c:161 +#: midx.c:162 msgid "multi-pack-index missing required OID fanout chunk" msgstr "index multi-paquet manque de tronçon de d'étalement OID requis" -#: midx.c:163 +#: midx.c:164 msgid "multi-pack-index missing required OID lookup chunk" msgstr "index multi-paquet manque de tronçon de recherche OID" -#: midx.c:165 +#: midx.c:166 msgid "multi-pack-index missing required object offsets chunk" msgstr "index multi-paquet manque de tronçon de décalage d'objet" -#: midx.c:179 +#: midx.c:180 #, 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:222 +#: midx.c:223 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mauvais pack-int-id : %u (%u paquets au total)" -#: midx.c:272 +#: midx.c:273 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:300 -msgid "error preparing packfile from multi-pack-index" -msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet" - -#: midx.c:485 +#: midx.c:480 #, c-format msgid "failed to add packfile '%s'" msgstr "échec de l'ajout du fichier paquet '%s'" -#: midx.c:491 +#: midx.c:486 #, c-format msgid "failed to open pack-index '%s'" msgstr "échec à l'ouverture du fichier paquet '%s'" -#: midx.c:551 +#: midx.c:546 #, c-format msgid "failed to locate object %d in packfile" msgstr "échec de localisation de l'objet %d dans le fichier paquet" -#: midx.c:853 +#: midx.c:846 msgid "Adding packfiles to multi-pack-index" msgstr "Ajout de fichiers paquet à un index multi-paquet" -#: midx.c:886 +#: midx.c:879 #, c-format msgid "did not see pack-file %s to drop" msgstr "fichier paquet à éliminer %s non trouvé" -#: midx.c:938 +#: midx.c:931 msgid "no pack files to index." msgstr "Aucun fichier paquet à l'index." -#: midx.c:990 +#: midx.c:982 msgid "Writing chunks to multi-pack-index" msgstr "Écriture des sections dans l'index multi-paquet" -#: midx.c:1068 +#: midx.c:1060 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "échec du nettoyage de l'index de multi-paquet à %s" -#: midx.c:1124 +#: midx.c:1116 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:1132 +#: midx.c:1124 msgid "Looking for referenced packfiles" msgstr "Recherche de fichiers paquets référencés" -#: midx.c:1147 +#: midx.c:1139 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -5224,55 +5241,55 @@ msgstr "" "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = " "étalement[%d]" -#: midx.c:1152 +#: midx.c:1144 msgid "the midx contains no oid" msgstr "le midx ne contient aucun oid" -#: midx.c:1161 +#: midx.c:1153 msgid "Verifying OID order in multi-pack-index" msgstr "Vérification de l'ordre des OID dans l'index multi-paquet" -#: midx.c:1170 +#: midx.c:1162 #, 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:1190 +#: midx.c:1182 msgid "Sorting objects by packfile" msgstr "Classement des objets par fichier paquet" -#: midx.c:1197 +#: midx.c:1189 msgid "Verifying object offsets" msgstr "Vérification des décalages des objets" -#: midx.c:1213 +#: midx.c:1205 #, 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:1219 +#: midx.c:1211 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "impossible de lire le fichier paquet %s" -#: midx.c:1228 +#: midx.c:1220 #, 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:1253 +#: midx.c:1245 msgid "Counting referenced objects" msgstr "Comptage des objets référencés" -#: midx.c:1263 +#: midx.c:1255 msgid "Finding and deleting unreferenced packfiles" msgstr "Recherche et effacement des fichiers paquets non-référencés" -#: midx.c:1454 +#: midx.c:1446 msgid "could not start pack-objects" msgstr "Impossible de démarrer le groupement d'objets" -#: midx.c:1474 +#: midx.c:1466 msgid "could not finish pack-objects" msgstr "Impossible de finir le groupement d'objets" @@ -5360,16 +5377,16 @@ msgstr "incohérence de hachage %s" msgid "unable to get size of %s" msgstr "impossible de récupérer la taille de %s" -#: packfile.c:630 +#: packfile.c:615 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" -#: packfile.c:1922 +#: packfile.c:1907 #, 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:1926 +#: packfile.c:1911 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -5622,7 +5639,7 @@ msgstr "erreur de protocole : mauvais caractère de longueur de ligne : %.4s" msgid "protocol error: bad line length %d" msgstr "erreur de protocole : mauvaise longueur de ligne %d" -#: pkt-line.c:373 sideband.c:150 +#: pkt-line.c:373 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "erreur distante : %s" @@ -5673,7 +5690,7 @@ msgstr "impossible de démarrer `log`" msgid "could not read `log` output" msgstr "impossible de lire la sortie de `log`" -#: range-diff.c:98 sequencer.c:5283 +#: range-diff.c:98 sequencer.c:5310 #, c-format msgid "could not parse commit '%s'" msgstr "impossible d'analyser le commit '%s'" @@ -5692,11 +5709,11 @@ msgstr "" msgid "could not parse git header '%.*s'" msgstr "impossible d'analyser l'entête git '%.*s'" -#: range-diff.c:301 +#: range-diff.c:299 msgid "failed to generate diff" msgstr "échec de la génération de diff" -#: range-diff.c:534 range-diff.c:536 +#: range-diff.c:532 range-diff.c:534 #, c-format msgid "could not parse log for '%s'" msgstr "impossible d'analyser le journal pour '%s'" @@ -5814,8 +5831,8 @@ msgstr "entrées de préparation non ordonnées pour '%s'" #: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 #: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 -#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" @@ -5871,12 +5888,12 @@ msgstr "impossible de rafraîchir l'index partagé '%s'" msgid "broken index, expect %s in %s, got %s" msgstr "index cassé, %s attendu dans %s, %s obtenu" -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 +#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 #, c-format msgid "could not stat '%s'" msgstr "stat impossible de '%s'" @@ -6009,14 +6026,14 @@ msgstr "" "Cependant, si vous effacez tout, le rebasage sera annulé.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 -#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607 +#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270 #, c-format msgid "could not write '%s'" msgstr "impossible d'écrire '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 -#: builtin/rebase.c:246 +#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228 +#: builtin/rebase.c:252 #, c-format msgid "could not write '%s'." msgstr "impossible d'écrire '%s'." @@ -6048,9 +6065,9 @@ msgstr "" "Les comportements disponibles sont : ignore, warn, error.\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 -#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 -#: builtin/rebase.c:258 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394 +#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239 +#: builtin/rebase.c:264 #, c-format msgid "could not read '%s'." msgstr "impossible de lire '%s'." @@ -6247,61 +6264,61 @@ msgstr "format : atome %%(end) utilisé sans atome correspondant" msgid "malformed format string %s" msgstr "Chaîne de formatage mal formée %s" -#: ref-filter.c:1541 +#: ref-filter.c:1549 #, c-format msgid "no branch, rebasing %s" msgstr "aucune branche, rebasage de %s" -#: ref-filter.c:1544 +#: ref-filter.c:1552 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "aucune branche, rebasage de la HEAD détachée %s" -#: ref-filter.c:1547 +#: ref-filter.c:1555 #, c-format msgid "no branch, bisect started on %s" msgstr "aucune branche, bisect a démarré sur %s" -#: ref-filter.c:1557 +#: ref-filter.c:1565 msgid "no branch" msgstr "aucune branche" -#: ref-filter.c:1591 ref-filter.c:1800 +#: ref-filter.c:1599 ref-filter.c:1808 #, c-format msgid "missing object %s for %s" msgstr "objet manquant %s pour %s" -#: ref-filter.c:1601 +#: ref-filter.c:1609 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "échec de parse_object_buffer sur %s pour %s" -#: ref-filter.c:2054 +#: ref-filter.c:2062 #, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" -#: ref-filter.c:2143 +#: ref-filter.c:2151 #, c-format msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:2148 refs.c:657 +#: ref-filter.c:2156 refs.c:660 #, c-format msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" -#: ref-filter.c:2464 +#: ref-filter.c:2472 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:2563 +#: ref-filter.c:2571 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: ref-filter.c:2568 +#: ref-filter.c:2576 #, c-format msgid "option `%s' must point to a commit" msgstr "l'option '%s' doit pointer sur un commit" @@ -6311,65 +6328,65 @@ msgstr "l'option '%s' doit pointer sur un commit" msgid "%s does not point to a valid object!" msgstr "%s ne pointe pas sur un objet valide!" -#: refs.c:572 +#: refs.c:575 #, c-format msgid "could not retrieve `%s`" msgstr "impossible de récupérer `%s`" -#: refs.c:579 +#: refs.c:582 #, c-format msgid "invalid branch name: %s = %s" msgstr "Nom de branche invalide : %s = %s" -#: refs.c:655 +#: refs.c:658 #, c-format msgid "ignoring dangling symref %s" msgstr "symref pendant %s ignoré" -#: refs.c:892 +#: refs.c:895 #, 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:898 +#: refs.c:901 #, 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:957 +#: refs.c:960 #, c-format msgid "log for %s is empty" msgstr "le journal pour la réf %s est vide" -#: refs.c:1049 +#: refs.c:1052 #, 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:1120 +#: refs.c:1123 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "échec de update_ref pour la réf '%s' : %s" -#: refs.c:1944 +#: refs.c:1947 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "mises à jour multiples pour la réf '%s' non permises" -#: refs.c:2024 +#: refs.c:2027 msgid "ref updates forbidden inside quarantine environment" msgstr "mises à jour des références interdites en environnement de quarantaine" -#: refs.c:2035 +#: refs.c:2038 msgid "ref updates aborted by hook" msgstr "mises à jour des références annulées par le crochet" -#: refs.c:2135 refs.c:2165 +#: refs.c:2138 refs.c:2168 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe ; impossible de créer '%s'" -#: refs.c:2141 refs.c:2176 +#: refs.c:2144 refs.c:2179 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "impossible de traiter '%s' et '%s' en même temps" @@ -6390,7 +6407,7 @@ msgstr "Impossible de supprimer la référence %s : %s" msgid "could not delete references: %s" msgstr "impossible de supprimer les références : %s" -#: refspec.c:167 +#: refspec.c:170 #, c-format msgid "invalid refspec '%s'" msgstr "spécificateur de réference invalide : '%s'" @@ -6540,97 +6557,97 @@ msgstr "" 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:1703 remote.c:1804 +#: remote.c:1714 remote.c:1815 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1712 +#: remote.c:1723 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1715 +#: remote.c:1726 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurée pour la branche '%s'" -#: remote.c:1721 +#: remote.c:1732 #, 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:1736 +#: remote.c:1747 #, 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:1748 +#: remote.c:1759 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branche '%s' n'a aucune branche distante de poussée" -#: remote.c:1758 +#: remote.c:1769 #, 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:1771 +#: remote.c:1782 msgid "push has no destination (push.default is 'nothing')" msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')" -#: remote.c:1793 +#: remote.c:1804 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de résoudre une poussée 'simple' pour une destination unique" -#: remote.c:1922 +#: remote.c:1933 #, c-format msgid "couldn't find remote ref %s" msgstr "impossible de trouver la référence distante %s" -#: remote.c:1935 +#: remote.c:1946 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Référence bizarre '%s' ignorée localement" -#: remote.c:2098 +#: remote.c:2109 #, 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:2102 +#: remote.c:2113 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2105 +#: remote.c:2116 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:2109 +#: remote.c:2120 #, 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:2112 +#: remote.c:2123 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (utilisez \"%s\" pour plus de détails)\n" -#: remote.c:2116 +#: remote.c:2127 #, 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:2122 +#: remote.c:2133 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2125 +#: remote.c:2136 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6642,11 +6659,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:2133 +#: remote.c:2144 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:2136 +#: remote.c:2147 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6661,12 +6678,12 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:2146 +#: remote.c:2157 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:2337 +#: remote.c:2348 #, c-format msgid "cannot parse expected object name '%s'" msgstr "impossible d'analyser le nom attendu d'objet '%s'" @@ -6744,7 +6761,7 @@ msgstr "impossible de délier '%s' qui est errant" msgid "Recorded preimage for '%s'" msgstr "Pré-image enregistrée pour '%s'" -#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1992 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" @@ -6783,43 +6800,43 @@ 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:3426 +#: reset.c:70 reset.c:76 sequencer.c:3460 #, c-format msgid "failed to find tree of %s" msgstr "impossible de trouver l'arbre de %s" -#: revision.c:2344 +#: revision.c:2336 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<fichier-paquet> n'est plus géré" -#: revision.c:2364 +#: revision.c:2356 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "valeur inconnue pour --diff-merges : %s" -#: revision.c:2702 +#: revision.c:2694 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2705 +#: revision.c:2697 #, 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:2915 +#: revision.c:2907 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:763 +#: run-command.c:764 msgid "open /dev/null failed" msgstr "échec de l'ouverture de /dev/null" -#: run-command.c:1270 +#: run-command.c:1271 #, c-format msgid "cannot create async thread: %s" msgstr "impossible de créer un fil asynchrone : %s" -#: run-command.c:1334 +#: run-command.c:1335 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6829,35 +6846,35 @@ msgstr "" "Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook " "false`." -#: send-pack.c:145 +#: send-pack.c:146 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage " "distant" -#: send-pack.c:147 +#: send-pack.c:148 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "impossible d'analyser l'état de dépaquetage distant : %s" -#: send-pack.c:149 +#: send-pack.c:150 #, c-format msgid "remote unpack failed: %s" msgstr "le dépaquetage a échoué : %s" -#: send-pack.c:372 +#: send-pack.c:374 msgid "failed to sign the push certificate" msgstr "impossible de signer le certificat de poussée" -#: send-pack.c:460 +#: send-pack.c:467 msgid "the receiving end does not support this repository's hash algorithm" msgstr "Le receveur ne gère pas l'algorithme d'empreinte de ce dépôt" -#: send-pack.c:469 +#: send-pack.c:476 msgid "the receiving end does not support --signed push" msgstr "Le receveur ne gère pas les poussées avec --signed" -#: send-pack.c:471 +#: send-pack.c:478 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6865,47 +6882,47 @@ msgstr "" "pas d'envoi de certificat de poussée car le receveur ne gère pas les " "poussées avec --signed" -#: send-pack.c:483 +#: send-pack.c:490 msgid "the receiving end does not support --atomic push" msgstr "Le receveur ne gère pas les poussées avec --atomic" -#: send-pack.c:488 +#: send-pack.c:495 msgid "the receiving end does not support push options" msgstr "Le receveur ne gère pas les options de poussées" -#: sequencer.c:194 +#: sequencer.c:195 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mode de nettoyage invalide de message de validation '%s'" -#: sequencer.c:308 +#: sequencer.c:323 #, c-format msgid "could not delete '%s'" msgstr "Impossible de supprimer '%s'" -#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 +#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "impossible de supprimer '%s'" -#: sequencer.c:339 +#: sequencer.c:353 msgid "revert" msgstr "revert" -#: sequencer.c:341 +#: sequencer.c:355 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:343 +#: sequencer.c:357 msgid "rebase" msgstr "rebase" -#: sequencer.c:345 +#: sequencer.c:359 #, c-format msgid "unknown action: %d" msgstr "action inconnue : %d" -#: sequencer.c:404 +#: sequencer.c:418 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6913,7 +6930,7 @@ msgstr "" "après résolution des conflits, marquez les chemins corrigés\n" "avec 'git add <chemins>' ou 'git rm <chemins>'" -#: sequencer.c:407 +#: sequencer.c:421 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6923,43 +6940,43 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:420 sequencer.c:3028 +#: sequencer.c:434 sequencer.c:3062 #, c-format msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" -#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 -#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080 +#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "impossible d'écrire dans '%s'" -#: sequencer.c:427 +#: sequencer.c:441 #, c-format msgid "could not write eol to '%s'" msgstr "impossible d'écrire la fin de ligne dans '%s'" -#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 -#: sequencer.c:3311 +#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082 +#: sequencer.c:3345 #, c-format msgid "failed to finalize '%s'" msgstr "échec lors de la finalisation de '%s'" -#: sequencer.c:471 +#: sequencer.c:485 #, c-format msgid "your local changes would be overwritten by %s." msgstr "vos modifications locales seraient écrasées par %s." -#: sequencer.c:475 +#: sequencer.c:489 msgid "commit your changes or stash them to proceed." msgstr "validez vos modifications ou les remiser pour continuer." -#: sequencer.c:507 +#: sequencer.c:521 #, c-format msgid "%s: fast-forward" msgstr "%s : avance rapide" -#: sequencer.c:546 builtin/tag.c:566 +#: sequencer.c:560 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" @@ -6967,65 +6984,65 @@ msgstr "Mode de nettoyage invalide %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:640 +#: sequencer.c:670 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:657 +#: sequencer.c:687 msgid "unable to update cache tree" msgstr "impossible de mettre à jour l'arbre de cache" -#: sequencer.c:671 +#: sequencer.c:701 msgid "could not resolve HEAD commit" msgstr "impossible de résoudre le commit HEAD" -#: sequencer.c:751 +#: sequencer.c:781 #, c-format msgid "no key present in '%.*s'" msgstr "aucune clé présente dans '%.*s'" -#: sequencer.c:762 +#: sequencer.c:792 #, c-format msgid "unable to dequote value of '%s'" msgstr "Impossible de décoter la valeur de '%s'" -#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 -#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 +#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: sequencer.c:809 +#: sequencer.c:839 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' déjà fourni" -#: sequencer.c:814 +#: sequencer.c:844 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' déjà fourni" -#: sequencer.c:819 +#: sequencer.c:849 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' déjà fourni" -#: sequencer.c:823 +#: sequencer.c:853 #, c-format msgid "unknown variable '%s'" msgstr "variable inconnue '%s'" -#: sequencer.c:828 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' manquant" -#: sequencer.c:830 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' manquant" -#: sequencer.c:832 +#: sequencer.c:862 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' manquant" -#: sequencer.c:897 +#: sequencer.c:927 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -7054,11 +7071,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1178 +#: sequencer.c:1208 msgid "'prepare-commit-msg' hook failed" msgstr "échec du crochet 'prepare-commit-msg'" -#: sequencer.c:1184 +#: sequencer.c:1214 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7087,7 +7104,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1197 +#: sequencer.c:1227 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7113,339 +7130,339 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1239 +#: sequencer.c:1269 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: sequencer.c:1241 +#: sequencer.c:1271 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: sequencer.c:1287 +#: sequencer.c:1317 msgid "unable to resolve HEAD after creating commit" msgstr "impossible de résoudre HEAD après création du commit" -#: sequencer.c:1289 +#: sequencer.c:1319 msgid "detached HEAD" msgstr "HEAD détachée" -#: sequencer.c:1293 +#: sequencer.c:1323 msgid " (root-commit)" msgstr " (commit racine)" -#: sequencer.c:1314 +#: sequencer.c:1344 msgid "could not parse HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:1316 +#: sequencer.c:1346 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s n'est pas un commit !" -#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 +#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: sequencer.c:1373 sequencer.c:2067 +#: sequencer.c:1403 sequencer.c:2100 msgid "unable to parse commit author" msgstr "impossible d'analyser l'auteur du commit" -#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 +#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: sequencer.c:1417 sequencer.c:1535 +#: sequencer.c:1447 sequencer.c:1565 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:1446 sequencer.c:1478 +#: sequencer.c:1476 sequencer.c:1508 #, c-format msgid "invalid author identity '%s'" msgstr "identité d'auteur invalide '%s'" -#: sequencer.c:1452 +#: sequencer.c:1482 msgid "corrupt author: missing date information" msgstr "auteur corrompu : information de date manquante" -#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 -#: builtin/merge.c:915 +#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904 +#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: sequencer.c:1518 sequencer.c:4237 +#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "impossible de mettre à jour %s" -#: sequencer.c:1567 +#: sequencer.c:1597 #, c-format msgid "could not parse commit %s" msgstr "impossible d'analyser le commit %s" -#: sequencer.c:1572 +#: sequencer.c:1602 #, c-format msgid "could not parse parent commit %s" msgstr "impossible d'analyser le commit parent %s" -#: sequencer.c:1655 sequencer.c:1766 +#: sequencer.c:1685 sequencer.c:1796 #, c-format msgid "unknown command: %d" msgstr "commande inconnue : %d" -#: sequencer.c:1713 sequencer.c:1738 +#: sequencer.c:1743 sequencer.c:1768 #, c-format msgid "This is a combination of %d commits." msgstr "Ceci est la combinaison de %d commits." -#: sequencer.c:1723 +#: sequencer.c:1753 msgid "need a HEAD to fixup" msgstr "une HEAD est nécessaire à la correction" -#: sequencer.c:1725 sequencer.c:3338 +#: sequencer.c:1755 sequencer.c:3372 msgid "could not read HEAD" msgstr "Impossible de lire HEAD" -#: sequencer.c:1727 +#: sequencer.c:1757 msgid "could not read HEAD's commit message" msgstr "impossible de lire le message de validation de HEAD" -#: sequencer.c:1733 +#: sequencer.c:1763 #, c-format msgid "cannot write '%s'" msgstr "impossible d'écrire '%s'" -#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 +#: sequencer.c:1770 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Ceci est le premier message de validation :" -#: sequencer.c:1748 +#: sequencer.c:1778 #, c-format msgid "could not read commit message of %s" msgstr "impossible de lire le message de validation de %s" -#: sequencer.c:1755 +#: sequencer.c:1785 #, c-format msgid "This is the commit message #%d:" msgstr "Ceci est le message de validation numéro %d :" -#: sequencer.c:1761 +#: sequencer.c:1791 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Le message de validation %d sera ignoré :" -#: sequencer.c:1849 +#: sequencer.c:1879 msgid "your index file is unmerged." msgstr "votre fichier d'index n'est pas fusionné." -#: sequencer.c:1856 +#: sequencer.c:1886 msgid "cannot fixup root commit" msgstr "impossible de réparer le commit racine" -#: sequencer.c:1875 +#: sequencer.c:1905 #, 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:1883 sequencer.c:1891 +#: sequencer.c:1913 sequencer.c:1921 #, c-format msgid "commit %s does not have parent %d" msgstr "le commit %s n'a pas de parent %d" -#: sequencer.c:1897 +#: sequencer.c:1927 #, 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:1916 +#: sequencer.c:1946 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:1981 +#: sequencer.c:2011 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossible de renommer '%s' en '%s'" -#: sequencer.c:2038 +#: sequencer.c:2071 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:2039 +#: sequencer.c:2072 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:2059 +#: sequencer.c:2092 #, 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:2117 +#: sequencer.c:2150 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:2124 +#: sequencer.c:2157 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:2201 +#: sequencer.c:2234 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s n'accepte pas d'argument : '%s'" -#: sequencer.c:2210 +#: sequencer.c:2243 #, c-format msgid "missing arguments for %s" msgstr "argument manquant pour %s" -#: sequencer.c:2241 +#: sequencer.c:2274 #, c-format msgid "could not parse '%s'" msgstr "impossible d'analyser '%s'" -#: sequencer.c:2302 +#: sequencer.c:2335 #, c-format msgid "invalid line %d: %.*s" msgstr "ligne %d invalide : %.*s" -#: sequencer.c:2313 +#: sequencer.c:2346 #, c-format msgid "cannot '%s' without a previous commit" msgstr "'%s' impossible avec le commit précédent" -#: sequencer.c:2399 +#: sequencer.c:2432 msgid "cancelling a cherry picking in progress" msgstr "annulation d'un picorage en cours" -#: sequencer.c:2408 +#: sequencer.c:2441 msgid "cancelling a revert in progress" msgstr "annulation d'un retour en cours" -#: sequencer.c:2452 +#: sequencer.c:2485 msgid "please fix this using 'git rebase --edit-todo'." msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: sequencer.c:2454 +#: sequencer.c:2487 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "feuille d'instruction inutilisable : '%s'" -#: sequencer.c:2459 +#: sequencer.c:2492 msgid "no commits parsed." msgstr "aucun commit analysé." -#: sequencer.c:2470 +#: sequencer.c:2503 msgid "cannot cherry-pick during a revert." msgstr "impossible de picorer pendant l'annulation d'un commit." -#: sequencer.c:2472 +#: sequencer.c:2505 msgid "cannot revert during a cherry-pick." msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:2550 +#: sequencer.c:2583 #, c-format msgid "invalid value for %s: %s" msgstr "valeur invalide pour %s : %s" -#: sequencer.c:2657 +#: sequencer.c:2690 msgid "unusable squash-onto" msgstr "\"écrase-sur\" inutilisable" -#: sequencer.c:2677 +#: sequencer.c:2710 #, c-format msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformée : %s" -#: sequencer.c:2769 sequencer.c:4609 +#: sequencer.c:2803 sequencer.c:4636 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:2786 +#: sequencer.c:2820 msgid "revert is already in progress" msgstr "un retour est déjà en cours" -#: sequencer.c:2788 +#: sequencer.c:2822 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "essayez \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2791 +#: sequencer.c:2825 msgid "cherry-pick is already in progress" msgstr "un picorage est déjà en cours" -#: sequencer.c:2793 +#: sequencer.c:2827 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2807 +#: sequencer.c:2841 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossible de créer le répertoire de séquenceur '%s'" -#: sequencer.c:2822 +#: sequencer.c:2856 msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:2882 sequencer.c:4325 +#: sequencer.c:2916 sequencer.c:4371 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:2884 sequencer.c:2895 +#: sequencer.c:2918 sequencer.c:2929 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:2886 sequencer.c:2930 +#: sequencer.c:2920 sequencer.c:2964 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:2916 builtin/grep.c:745 +#: sequencer.c:2950 builtin/grep.c:756 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:2918 +#: sequencer.c:2952 #, c-format msgid "cannot read '%s': %s" msgstr "impossible de lire '%s' : %s" -#: sequencer.c:2919 +#: sequencer.c:2953 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:2925 +#: sequencer.c:2959 #, 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:2936 +#: sequencer.c:2970 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:2977 +#: sequencer.c:3011 msgid "no revert in progress" msgstr "Pas de retour en cours ?" -#: sequencer.c:2986 +#: sequencer.c:3020 msgid "no cherry-pick in progress" msgstr "aucun picorage en cours" -#: sequencer.c:2996 +#: sequencer.c:3030 msgid "failed to skip the commit" msgstr "échec du saut de commit" -#: sequencer.c:3003 +#: sequencer.c:3037 msgid "there is nothing to skip" msgstr "il n'y a rien à sauter" -#: sequencer.c:3006 +#: sequencer.c:3040 #, c-format msgid "" "have you committed already?\n" @@ -7454,16 +7471,16 @@ msgstr "" "Avez-vous déjà validé ?\n" "essayez \"git %s -continue\"" -#: sequencer.c:3168 sequencer.c:4217 +#: sequencer.c:3202 sequencer.c:4263 msgid "cannot read HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:3185 +#: sequencer.c:3219 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3193 +#: sequencer.c:3227 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7482,27 +7499,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3203 +#: sequencer.c:3237 #, c-format msgid "Could not apply %s... %.*s" msgstr "impossible d'appliquer %s... %.*s" -#: sequencer.c:3210 +#: sequencer.c:3244 #, c-format msgid "Could not merge %.*s" msgstr "Impossible de fusionner %.*s" -#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 +#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3240 +#: sequencer.c:3274 #, c-format msgid "Executing: %s\n" msgstr "Exécution : %s\n" -#: sequencer.c:3255 +#: sequencer.c:3289 #, c-format msgid "" "execution failed: %s\n" @@ -7517,11 +7534,11 @@ msgstr "" "git rebase --continue\n" "\n" -#: sequencer.c:3261 +#: sequencer.c:3295 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:3267 +#: sequencer.c:3301 #, c-format msgid "" "execution succeeded: %s\n" @@ -7538,91 +7555,91 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3328 +#: sequencer.c:3362 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom de label illégal '%.*s'" -#: sequencer.c:3382 +#: sequencer.c:3416 msgid "writing fake root commit" msgstr "écriture d'un commit racine bidon" -#: sequencer.c:3387 +#: sequencer.c:3421 msgid "writing squash-onto" msgstr "écriture de 'écraser-sur'" -#: sequencer.c:3471 +#: sequencer.c:3505 #, c-format msgid "could not resolve '%s'" msgstr "impossible de résoudre '%s'" -#: sequencer.c:3502 +#: sequencer.c:3538 msgid "cannot merge without a current revision" msgstr "impossible de fusionner avec une révision courante" -#: sequencer.c:3524 +#: sequencer.c:3560 #, c-format msgid "unable to parse '%.*s'" msgstr "impossible d'analyser '%.*s'" -#: sequencer.c:3533 +#: sequencer.c:3569 #, c-format msgid "nothing to merge: '%.*s'" msgstr "rien à fusionner : '%.*s'" -#: sequencer.c:3545 +#: sequencer.c:3581 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:3561 +#: sequencer.c:3597 #, c-format msgid "could not get commit message of '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:3730 +#: sequencer.c:3780 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "impossible de seulement essayer de fusionner '%.*s'" -#: sequencer.c:3746 +#: sequencer.c:3796 msgid "merge: Unable to write new index file" msgstr "fusion : Impossible d'écrire le nouveau fichier index" -#: sequencer.c:3820 +#: sequencer.c:3870 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: sequencer.c:3823 +#: sequencer.c:3873 #, c-format msgid "Unexpected stash response: '%s'" msgstr "réponse de remisage inattendue : '%s'" -#: sequencer.c:3829 +#: sequencer.c:3879 #, c-format msgid "Could not create directory for '%s'" msgstr "Impossible de créer le répertoire pour '%s'" -#: sequencer.c:3832 +#: sequencer.c:3882 #, c-format msgid "Created autostash: %s\n" msgstr "Autoremisage créé : %s\n" -#: sequencer.c:3836 +#: sequencer.c:3886 msgid "could not reset --hard" msgstr "impossible de réinitialiser --hard" -#: sequencer.c:3861 +#: sequencer.c:3911 #, c-format msgid "Applied autostash.\n" msgstr "Autoremisage appliqué.\n" -#: sequencer.c:3873 +#: sequencer.c:3923 #, c-format msgid "cannot store %s" msgstr "impossible de stocker %s" -#: sequencer.c:3876 +#: sequencer.c:3926 #, c-format msgid "" "%s\n" @@ -7633,35 +7650,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:3881 +#: sequencer.c:3931 msgid "Applying autostash resulted in conflicts." msgstr "L'application du remisage automatique a créé des conflits." -#: sequencer.c:3882 +#: sequencer.c:3932 msgid "Autostash exists; creating a new stash entry." msgstr "" "Un remisage automatique existe ; création d'une nouvelle entrée de remisage." -#: sequencer.c:3974 -#, c-format -msgid "%s: not a valid OID" -msgstr "%s n'est pas un OID valide" - -#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4025 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: sequencer.c:3994 +#: sequencer.c:4040 #, c-format msgid "Stopped at HEAD\n" msgstr "arrêt à HEAD\n" -#: sequencer.c:3996 +#: sequencer.c:4042 #, c-format msgid "Stopped at %s\n" msgstr "Arrêté à %s\n" -#: sequencer.c:4004 +#: sequencer.c:4050 #, c-format msgid "" "Could not execute the todo command\n" @@ -7682,58 +7694,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4050 +#: sequencer.c:4096 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Rebasage (%d/%d)%s" -#: sequencer.c:4095 +#: sequencer.c:4141 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "arrêt à %s... %.*s\n" -#: sequencer.c:4166 +#: sequencer.c:4212 #, c-format msgid "unknown command %d" msgstr "commande inconnue %d" -#: sequencer.c:4225 +#: sequencer.c:4271 msgid "could not read orig-head" msgstr "impossible de lire orig-head" -#: sequencer.c:4230 +#: sequencer.c:4276 msgid "could not read 'onto'" msgstr "impossible de lire 'onto'" -#: sequencer.c:4244 +#: sequencer.c:4290 #, c-format msgid "could not update HEAD to %s" msgstr "impossible de mettre à jour HEAD sur %s" -#: sequencer.c:4304 +#: sequencer.c:4350 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Rebasage et mise à jour de %s avec succès.\n" -#: sequencer.c:4337 +#: sequencer.c:4383 msgid "cannot rebase: You have unstaged changes." msgstr "impossible de rebaser : vous avez des modifications non indexées." -#: sequencer.c:4346 +#: sequencer.c:4392 msgid "cannot amend non-existing commit" msgstr "impossible de corriger un commit non-existant" -#: sequencer.c:4348 +#: sequencer.c:4394 #, c-format msgid "invalid file: '%s'" msgstr "fichier invalide : '%s'" -#: sequencer.c:4350 +#: sequencer.c:4396 #, c-format msgid "invalid contents: '%s'" msgstr "contenu invalide : '%s'" -#: sequencer.c:4353 +#: sequencer.c:4399 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7743,55 +7755,50 @@ 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:4389 sequencer.c:4428 +#: sequencer.c:4435 sequencer.c:4474 #, c-format msgid "could not write file: '%s'" msgstr "impossible d'écrire le fichier : '%s'" -#: sequencer.c:4444 +#: sequencer.c:4490 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossible de supprimer CHERRY_PICK_HEAD" -#: sequencer.c:4451 +#: sequencer.c:4497 msgid "could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: sequencer.c:4477 -#, c-format -msgid "invalid committer '%s'" -msgstr "validateur invalide '%s'" - -#: sequencer.c:4586 +#: sequencer.c:4613 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:4590 +#: sequencer.c:4617 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:4625 +#: sequencer.c:4652 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" -#: sequencer.c:5102 +#: sequencer.c:5129 msgid "make_script: unhandled options" msgstr "make_script : options non gérées" -#: sequencer.c:5105 +#: sequencer.c:5132 msgid "make_script: error preparing revisions" msgstr "make_script : erreur lors de la préparation des révisions" -#: sequencer.c:5347 sequencer.c:5364 +#: sequencer.c:5374 sequencer.c:5391 msgid "nothing to do" msgstr "rien à faire" -#: sequencer.c:5383 +#: sequencer.c:5410 msgid "could not skip unnecessary pick commands" msgstr "impossible d'éviter les commandes de picorage non nécessaires" -#: sequencer.c:5480 +#: sequencer.c:5504 msgid "the script was already rearranged." msgstr "le script a déjà été réarrangé." @@ -7964,260 +7971,260 @@ msgstr "échec de la bifurcation" msgid "setsid failed" msgstr "échec du setsid" -#: sha1-file.c:470 +#: sha1-file.c:480 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates" -#: sha1-file.c:521 +#: sha1-file.c:531 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "impossible de normaliser le chemin d'objet alternatif : %s" -#: sha1-file.c:593 +#: sha1-file.c:603 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde" -#: sha1-file.c:600 +#: sha1-file.c:610 #, c-format msgid "unable to normalize object directory: %s" msgstr "impossible de normaliser le répertoire d'objet : %s" -#: sha1-file.c:643 +#: sha1-file.c:653 msgid "unable to fdopen alternates lockfile" msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives" -#: sha1-file.c:661 +#: sha1-file.c:671 msgid "unable to read alternates file" msgstr "lecture du fichier d'alternatives impossible" -#: sha1-file.c:668 +#: sha1-file.c:678 msgid "unable to move new alternates file into place" msgstr "impossible de déplacer le nouveau fichier d'alternative" -#: sha1-file.c:703 +#: sha1-file.c:713 #, c-format msgid "path '%s' does not exist" msgstr "le chemin '%s' n'existe pas" -#: sha1-file.c:724 +#: sha1-file.c:734 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "extraire le dépôt de référence '%s' comme une extraction liée n'est pas " "encore supporté." -#: sha1-file.c:730 +#: sha1-file.c:740 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "le dépôt de référence '%s' n'est pas un dépôt local." -#: sha1-file.c:736 +#: sha1-file.c:746 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: sha1-file.c:744 +#: sha1-file.c:754 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: sha1-file.c:804 +#: sha1-file.c:814 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "ligne invalide pendant l'analyse des refs alternatives : %s" -#: sha1-file.c:954 +#: sha1-file.c:964 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>" -#: sha1-file.c:975 +#: sha1-file.c:985 msgid "mmap failed" msgstr "échec de mmap" -#: sha1-file.c:1139 +#: sha1-file.c:1149 #, c-format msgid "object file %s is empty" msgstr "le fichier objet %s est vide" -#: sha1-file.c:1274 sha1-file.c:2467 +#: sha1-file.c:1284 sha1-file.c:2477 #, c-format msgid "corrupt loose object '%s'" msgstr "objet libre corrompu '%s'" -#: sha1-file.c:1276 sha1-file.c:2471 +#: sha1-file.c:1286 sha1-file.c:2481 #, c-format msgid "garbage at end of loose object '%s'" msgstr "données incorrectes à la fin de l'objet libre '%s'" -#: sha1-file.c:1318 +#: sha1-file.c:1328 msgid "invalid object type" msgstr "type d'objet invalide" -#: sha1-file.c:1402 +#: sha1-file.c:1412 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type" -#: sha1-file.c:1405 +#: sha1-file.c:1415 #, c-format msgid "unable to unpack %s header" msgstr "impossible de dépaqueter l'entête %s" -#: sha1-file.c:1411 +#: sha1-file.c:1421 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type" -#: sha1-file.c:1414 +#: sha1-file.c:1424 #, c-format msgid "unable to parse %s header" msgstr "impossible d'analyser l'entête %s" -#: sha1-file.c:1641 +#: sha1-file.c:1651 #, c-format msgid "failed to read object %s" msgstr "impossible de lire l'objet %s" -#: sha1-file.c:1645 +#: sha1-file.c:1655 #, c-format msgid "replacement %s not found for %s" msgstr "remplacement %s non trouvé pour %s" -#: sha1-file.c:1649 +#: sha1-file.c:1659 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'objet libre %s (stocké dans %s) est corrompu" -#: sha1-file.c:1653 +#: sha1-file.c:1663 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu" -#: sha1-file.c:1758 +#: sha1-file.c:1768 #, c-format msgid "unable to write file %s" msgstr "impossible d'écrire le fichier %s" -#: sha1-file.c:1765 +#: sha1-file.c:1775 #, c-format msgid "unable to set permission to '%s'" msgstr "impossible de régler les droits de '%s'" -#: sha1-file.c:1772 +#: sha1-file.c:1782 msgid "file write error" msgstr "erreur d'écriture d'un fichier" -#: sha1-file.c:1792 +#: sha1-file.c:1802 msgid "error when closing loose object file" msgstr "erreur en fermeture du fichier d'objet esseulé" -#: sha1-file.c:1857 +#: sha1-file.c:1867 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "droits insuffisants pour ajouter un objet à la base de données %s du dépôt" -#: sha1-file.c:1859 +#: sha1-file.c:1869 msgid "unable to create temporary file" msgstr "impossible de créer un fichier temporaire" -#: sha1-file.c:1883 +#: sha1-file.c:1893 msgid "unable to write loose object file" msgstr "impossible d'écrire le fichier d'objet esseulé" -#: sha1-file.c:1889 +#: sha1-file.c:1899 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "impossible de compresser le nouvel objet %s (%d)" -#: sha1-file.c:1893 +#: sha1-file.c:1903 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "échec de deflateEnd sur l'objet %s (%d)" -#: sha1-file.c:1897 +#: sha1-file.c:1907 #, c-format msgid "confused by unstable object source data for %s" msgstr "données de source d'objet instable pour %s" -#: sha1-file.c:1907 builtin/pack-objects.c:1086 +#: sha1-file.c:1917 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "échec de utime() sur %s" -#: sha1-file.c:1984 +#: sha1-file.c:1994 #, c-format msgid "cannot read object for %s" msgstr "impossible de lire l'objet pour %s" -#: sha1-file.c:2035 +#: sha1-file.c:2045 msgid "corrupt commit" msgstr "commit corrompu" -#: sha1-file.c:2043 +#: sha1-file.c:2053 msgid "corrupt tag" msgstr "étiquette corrompue" -#: sha1-file.c:2143 +#: sha1-file.c:2153 #, c-format msgid "read error while indexing %s" msgstr "erreur de lecture à l'indexation de %s" -#: sha1-file.c:2146 +#: sha1-file.c:2156 #, c-format msgid "short read while indexing %s" msgstr "lecture tronquée pendant l'indexation de %s" -#: sha1-file.c:2219 sha1-file.c:2229 +#: sha1-file.c:2229 sha1-file.c:2239 #, c-format msgid "%s: failed to insert into database" msgstr "%s : échec de l'insertion dans la base de données" -#: sha1-file.c:2235 +#: sha1-file.c:2245 #, c-format msgid "%s: unsupported file type" msgstr "%s : type de fichier non supporté" -#: sha1-file.c:2259 +#: sha1-file.c:2269 #, c-format msgid "%s is not a valid object" msgstr "%s n'est pas un objet valide" -#: sha1-file.c:2261 +#: sha1-file.c:2271 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" -#: sha1-file.c:2288 builtin/index-pack.c:192 +#: sha1-file.c:2298 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" -#: sha1-file.c:2478 sha1-file.c:2531 +#: sha1-file.c:2488 sha1-file.c:2541 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "incohérence de hachage pour %s (%s attendu)" -#: sha1-file.c:2502 +#: sha1-file.c:2512 #, c-format msgid "unable to mmap %s" msgstr "impossible de mmap %s" -#: sha1-file.c:2507 +#: sha1-file.c:2517 #, c-format msgid "unable to unpack header of %s" msgstr "impossible de dépaqueter l'entête de %s" -#: sha1-file.c:2513 +#: sha1-file.c:2523 #, c-format msgid "unable to parse header of %s" msgstr "impossible d'analyser l'entête de %s" -#: sha1-file.c:2524 +#: sha1-file.c:2534 #, c-format msgid "unable to unpack contents of %s" msgstr "impossible de dépaqueter le contenu de %s" @@ -8375,8 +8382,8 @@ msgid_plural "%u bytes/s" msgstr[0] "%u octet/s" msgstr[1] "%u octets/s" -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 -#: builtin/rebase.c:858 +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: builtin/rebase.c:864 #, c-format msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" @@ -8614,7 +8621,7 @@ msgstr "échec de la commande trailer '%s'" msgid "unknown value '%s' for key '%s'" msgstr "valeur inconnue '%s' pour la clé '%s'" -#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "plus d'un %s" @@ -8702,7 +8709,7 @@ msgstr "impossible de lancer fast-import" msgid "error while running fast-import" msgstr "erreur au lancement de fast-import" -#: transport-helper.c:549 transport-helper.c:1226 +#: transport-helper.c:549 transport-helper.c:1236 #, c-format msgid "could not read ref %s" msgstr "impossible de lire la réf %s" @@ -8722,7 +8729,7 @@ msgstr "" msgid "invalid remote service path" msgstr "chemin de service distant invalide" -#: transport-helper.c:661 transport.c:1428 +#: transport-helper.c:661 transport.c:1446 msgid "operation not supported by protocol" msgstr "option non supportée par le protocole" @@ -8740,56 +8747,61 @@ msgstr "'option' sans directive 'ok/error' correspondante" msgid "expected ok/error, helper said '%s'" msgstr "ok/error attendu, l'assistant a dit '%s'" -#: transport-helper.c:841 +#: transport-helper.c:845 #, c-format msgid "helper reported unexpected status of %s" msgstr "l'assistant a renvoyé un statut de retour inattendu %s" -#: transport-helper.c:924 +#: transport-helper.c:928 #, c-format msgid "helper %s does not support dry-run" msgstr "l'assistant %s ne gère pas dry-run" -#: transport-helper.c:927 +#: transport-helper.c:931 #, c-format msgid "helper %s does not support --signed" msgstr "l'assistant %s ne gère pas --signed" -#: transport-helper.c:930 +#: transport-helper.c:934 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "l'assistant %s ne gère pas --signed=if-asked" -#: transport-helper.c:935 +#: transport-helper.c:939 #, c-format msgid "helper %s does not support --atomic" msgstr "l'assistant %s ne gère pas --atomic" -#: transport-helper.c:941 +#: transport-helper.c:943 +#, c-format +msgid "helper %s does not support --%s" +msgstr "l'assistant %s ne gère pas --%s" + +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'push-option'" msgstr "l'assistant %s ne gère pas 'push-option'" -#: transport-helper.c:1040 +#: transport-helper.c:1050 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "l'assistant %s ne gère pas push ; un spécificateur de référence est " "nécessaire" -#: transport-helper.c:1045 +#: transport-helper.c:1055 #, c-format msgid "helper %s does not support 'force'" msgstr "l'assistant %s ne gère pas 'force'" -#: transport-helper.c:1092 +#: transport-helper.c:1102 msgid "couldn't run fast-export" msgstr "impossible de lancer fast-export" -#: transport-helper.c:1097 +#: transport-helper.c:1107 msgid "error while running fast-export" msgstr "erreur au lancement de fast-export" -#: transport-helper.c:1122 +#: transport-helper.c:1132 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8798,52 +8810,52 @@ msgstr "" "Aucune référence en commun et aucune spécfiée ; rien à faire.\n" "Vous devriez peut-être spécifier une branche.\n" -#: transport-helper.c:1203 +#: transport-helper.c:1213 #, c-format msgid "unsupported object format '%s'" msgstr "format d'objet non géré '%s'" -#: transport-helper.c:1212 +#: transport-helper.c:1222 #, c-format msgid "malformed response in ref list: %s" msgstr "réponse malformée dans le liste de réfs : %s" -#: transport-helper.c:1364 +#: transport-helper.c:1374 #, c-format msgid "read(%s) failed" msgstr "échec de read(%s)" -#: transport-helper.c:1391 +#: transport-helper.c:1401 #, c-format msgid "write(%s) failed" msgstr "échec de write(%s)" -#: transport-helper.c:1440 +#: transport-helper.c:1450 #, c-format msgid "%s thread failed" msgstr "échec du fil d'exécution %s" -#: transport-helper.c:1444 +#: transport-helper.c:1454 #, c-format msgid "%s thread failed to join: %s" msgstr "échec de jonction du fil d'exécution %s : %s" -#: transport-helper.c:1463 transport-helper.c:1467 +#: transport-helper.c:1473 transport-helper.c:1477 #, c-format msgid "can't start thread for copying data: %s" msgstr "impossible de démarrer le fil d'exécution pour copier les données : %s" -#: transport-helper.c:1504 +#: transport-helper.c:1514 #, c-format msgid "%s process failed to wait" msgstr "échec du processus %s pour l'attente" -#: transport-helper.c:1508 +#: transport-helper.c:1518 #, c-format msgid "%s process failed" msgstr "échec du processus %s" -#: transport-helper.c:1526 transport-helper.c:1535 +#: transport-helper.c:1536 transport-helper.c:1545 msgid "can't start thread for copying data" msgstr "impossible de démarrer le fil d'exécution pour copier les données" @@ -8870,29 +8882,29 @@ msgstr "voir protocol.version dans 'git help config' pour plus d'information" msgid "server options require protocol version 2 or later" msgstr "les options de serveur exigent une version 2 ou supérieure" -#: transport.c:712 +#: transport.c:727 msgid "could not parse transport.color.* config" msgstr "impossible d'analyser la configuration transport.color.*" -#: transport.c:785 +#: transport.c:802 msgid "support for protocol v2 not implemented yet" msgstr "le support du protocole v2 n'est pas encore implanté" -#: transport.c:919 +#: transport.c:936 #, c-format msgid "unknown value for config '%s': %s" msgstr "valeur inconnue pour la config '%s' : %s" -#: transport.c:985 +#: transport.c:1002 #, c-format msgid "transport '%s' not allowed" msgstr "transport '%s' non permis" -#: transport.c:1038 +#: transport.c:1055 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync n'est plus supporté" -#: transport.c:1140 +#: transport.c:1157 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8901,7 +8913,7 @@ msgstr "" "Les chemins suivants de sous-module contiennent des modifications\n" "qui ne peuvent être trouvées sur aucun distant :\n" -#: transport.c:1144 +#: transport.c:1161 #, c-format msgid "" "\n" @@ -8928,11 +8940,11 @@ msgstr "" "pour les pousser vers un serveur distant.\n" "\n" -#: transport.c:1152 +#: transport.c:1169 msgid "Aborting." msgstr "Abandon." -#: transport.c:1297 +#: transport.c:1315 msgid "failed to push all needed submodules" msgstr "échec de la poussée de tous les sous-modules nécessaires" @@ -9215,7 +9227,7 @@ msgstr "" msgid "Updating index flags" msgstr "Mise à jour des drapeaux de l'index" -#: upload-pack.c:1516 +#: upload-pack.c:1550 msgid "expected flush after fetch arguments" msgstr "vidage attendu après les arguments de récupération" @@ -9252,7 +9264,7 @@ msgstr "segment de chemin '..' invalide" msgid "Fetching objects" msgstr "Récupération des objets" -#: worktree.c:236 builtin/am.c:2116 +#: worktree.c:236 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "échec de la lecture de '%s'" @@ -9874,7 +9886,7 @@ msgstr "de plus, votre index contient des modifications non validées." msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossible : votre index contient des modifications non validées." -#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#: compat/precompose_utf8.c:58 builtin/clone.c:457 #, c-format msgid "failed to unlink '%s'" msgstr "échec pour délier '%s'" @@ -9901,7 +9913,7 @@ msgstr "suppression de '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:272 builtin/rev-parse.c:904 +#: builtin/add.c:272 builtin/rev-parse.c:908 msgid "Could not read the index" msgstr "Impossible de lire l'index" @@ -9938,8 +9950,8 @@ msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" #: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 -#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "simuler l'action" @@ -9947,7 +9959,7 @@ msgstr "simuler l'action" msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 +#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308 msgid "select hunks interactively" msgstr "sélection interactive des sections" @@ -10079,13 +10091,13 @@ msgstr "" msgid "--chmod param '%s' must be either -x or +x" msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x" -#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file est incompatible avec pathspec arguments" -#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul nécessite --pathspec-from-file" @@ -10104,117 +10116,112 @@ msgstr "" "Éliminez ce message en lançant\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:160 -#, c-format -msgid "invalid committer: %s" -msgstr "validateur invalide : %s" - -#: builtin/am.c:366 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "impossible d'analyser l'auteur du script" -#: builtin/am.c:450 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' a été effacé par le crochet applypatch-msg" -#: builtin/am.c:492 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "Ligne en entrée malformée : '%s'." -#: builtin/am.c:530 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Impossible de copier les notes de '%s' vers '%s'" -#: builtin/am.c:556 +#: builtin/am.c:542 msgid "fseek failed" msgstr "échec de fseek" -#: builtin/am.c:744 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "impossible d'analyser le patch '%s'" -#: builtin/am.c:809 +#: builtin/am.c:795 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:857 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "horodatage invalide" -#: builtin/am.c:862 builtin/am.c:874 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "ligne de Date invalide" -#: builtin/am.c:869 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "décalage horaire invalide" -#: builtin/am.c:962 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: builtin/am.c:967 builtin/clone.c:409 +#: builtin/am.c:953 builtin/clone.c:410 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/am.c:972 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "Échec de découpage des patchs." -#: builtin/am.c:1103 +#: builtin/am.c:1089 #, 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:1104 +#: builtin/am.c:1090 #, 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:1105 +#: builtin/am.c:1091 #, 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:1188 +#: builtin/am.c:1174 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:1216 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "Le patch actuel est vide." -#: builtin/am.c:1281 +#: builtin/am.c:1267 #, c-format msgid "missing author line in commit %s" msgstr "ligne d'auteur manquante dans le commit %s" -#: builtin/am.c:1284 +#: builtin/am.c:1270 #, c-format msgid "invalid ident line: %.*s" msgstr "ligne d'identification invalide : %.*s" -#: builtin/am.c:1503 +#: builtin/am.c:1489 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:1505 +#: builtin/am.c:1491 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:1524 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10222,24 +10229,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:1530 +#: builtin/am.c:1516 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour à un patch de la base et fusion à 3 points..." -#: builtin/am.c:1556 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." -#: builtin/am.c:1588 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "application à un historique vide" -#: builtin/am.c:1639 builtin/am.c:1643 +#: builtin/am.c:1626 builtin/am.c:1630 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." -#: builtin/am.c:1661 +#: builtin/am.c:1648 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -10247,40 +10254,40 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1671 +#: builtin/am.c:1658 #, 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:1717 builtin/commit.c:395 +#: builtin/am.c:1704 builtin/commit.c:395 msgid "unable to write index file" msgstr "impossible d'écrire le fichier d'index" -#: builtin/am.c:1721 +#: builtin/am.c:1708 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1761 builtin/am.c:1829 +#: builtin/am.c:1748 builtin/am.c:1816 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1778 +#: builtin/am.c:1765 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: builtin/am.c:1784 +#: builtin/am.c:1771 #, c-format msgid "Patch failed at %s %.*s" msgstr "le patch a échoué à %s %.*s" -#: builtin/am.c:1788 +#: builtin/am.c:1775 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:1832 +#: builtin/am.c:1819 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10291,7 +10298,7 @@ msgstr "" "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: builtin/am.c:1839 +#: builtin/am.c:1826 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10304,17 +10311,17 @@ msgstr "" "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour " "accepter son état." -#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:1998 +#: builtin/am.c:1985 msgid "failed to clean index" msgstr "échec du nettoyage de l'index" -#: builtin/am.c:2042 +#: builtin/am.c:2029 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10322,157 +10329,157 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: builtin/am.c:2149 +#: builtin/am.c:2136 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2191 +#: builtin/am.c:2178 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Valeur invalide pour --show-current-patch : %s" -#: builtin/am.c:2195 +#: builtin/am.c:2182 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s est incompatible avec --show-current-patch=%s" -#: builtin/am.c:2226 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2227 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --skip | --abort)" -#: builtin/am.c:2233 +#: builtin/am.c:2220 msgid "run interactively" msgstr "exécution interactive" -#: builtin/am.c:2235 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2237 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 -#: builtin/repack.c:309 builtin/stash.c:816 +#: builtin/am.c:2225 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:335 builtin/stash.c:815 msgid "be quiet" msgstr "être silencieux" -#: builtin/am.c:2240 -msgid "add a Signed-off-by line to the commit message" -msgstr "ajouter une ligne Signed-off-by au message de validation" +#: builtin/am.c:2227 +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:2243 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par défaut)" -#: builtin/am.c:2245 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k à git-mailinfo" -#: builtin/am.c:2247 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b à git-mailinfo" -#: builtin/am.c:2249 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m à git-mailinfo" -#: builtin/am.c:2251 +#: builtin/am.c:2238 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:2254 +#: builtin/am.c:2241 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:2257 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 -#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/am.c:2286 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" -#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 -#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350 +#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172 #: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 #: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/am.c:2269 builtin/branch.c:659 builtin/bugreport.c:136 #: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 #: builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2283 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "format de présentation des patchs" -#: builtin/am.c:2289 +#: builtin/am.c:2276 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:2291 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "continuer à appliquer les patchs après résolution d'un conflit" -#: builtin/am.c:2294 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2297 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2300 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "" "restaurer la branche originale et abandonner les applications de patch." -#: builtin/am.c:2303 +#: builtin/am.c:2290 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:2307 +#: builtin/am.c:2294 msgid "show the patch being applied" msgstr "afficher le patch en cours d'application" -#: builtin/am.c:2312 +#: builtin/am.c:2299 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2314 +#: builtin/am.c:2301 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 -#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 +#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536 +#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "id-clé" -#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 +#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2320 +#: builtin/am.c:2307 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2338 +#: builtin/am.c:2325 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." @@ -10480,17 +10487,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:2345 +#: builtin/am.c:2332 msgid "failed to read the index" msgstr "échec à la lecture de l'index" -#: builtin/am.c:2360 +#: builtin/am.c:2347 #, 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:2384 +#: builtin/am.c:2371 #, c-format msgid "" "Stray %s directory found.\n" @@ -10499,13 +10506,13 @@ msgstr "" "Répertoire abandonné %s trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2390 +#: builtin/am.c:2377 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:2400 +#: builtin/am.c:2387 msgid "interactive mode requires patches on the command line" msgstr "le mode interactif requiert des rustines sur la ligne de commande" @@ -10544,22 +10551,10 @@ msgid "git archive: expected a flush" msgstr "git archive : vidage attendu" #: builtin/bisect--helper.c:23 -msgid "git bisect--helper --next-all" -msgstr "git bisect--helper --next-all" - -#: builtin/bisect--helper.c:24 -msgid "git bisect--helper --write-terms <bad_term> <good_term>" -msgstr "git bisect--helper --write-terms <terme-pour-mauvais> <terme-pour-bon>" - -#: builtin/bisect--helper.c:25 -msgid "git bisect--helper --bisect-clean-state" -msgstr "git bisect--helper --bisect-clean-state" - -#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<commit>]" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:24 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" @@ -10567,7 +10562,7 @@ msgstr "" "git bisect--helper --bisect-write [--no-log] <état> <révision> <terme-pour-" "bon> <terme-pour-mauvais>" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" @@ -10575,13 +10570,13 @@ msgstr "" "git bisect--helper --bisect-check-and-set-terms <commande> <terme-pour-bon> " "<terme-pour-mauvais>" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" "git bisect--helper --bisect-next-check <terme-pour-bon> <terme-pour-mauvais> " "[<term>]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -10589,7 +10584,7 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:31 +#: builtin/bisect--helper.c:28 msgid "" "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " @@ -10599,58 +10594,62 @@ msgstr "" "=<terme>][--no-checkout] [--first-parent] [<mauvais> [<bon>...]] [--] " "[<chemins>...]" -#: builtin/bisect--helper.c:33 +#: builtin/bisect--helper.c:30 msgid "git bisect--helper --bisect-next" msgstr "git bisect--helper --bisect-next" -#: builtin/bisect--helper.c:34 +#: builtin/bisect--helper.c:31 msgid "git bisect--helper --bisect-auto-next" msgstr "git bisect--helper --bisect-auto-next" -#: builtin/bisect--helper.c:35 -msgid "git bisect--helper --bisect-autostart" -msgstr "git bisect--helper --bisect-autostart" +#: builtin/bisect--helper.c:32 +msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" +msgstr "git bisect--helper --bisect-reset (bad|new) [<rév>]" + +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" +msgstr "git bisect--helper --bisect-reset (good|old) [<rév>...]" -#: builtin/bisect--helper.c:97 +#: builtin/bisect--helper.c:108 #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "impossible d'ouvrir le fichier '%s' en mode '%s'" -#: builtin/bisect--helper.c:104 +#: builtin/bisect--helper.c:115 #, c-format msgid "could not write to file '%s'" msgstr "impossible d'écrire le fichier '%s'" -#: builtin/bisect--helper.c:143 +#: builtin/bisect--helper.c:154 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' n'est pas un terme valide" -#: builtin/bisect--helper.c:147 +#: builtin/bisect--helper.c:158 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "impossible d'utiliser la commande incluse '%s' comme terme" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:168 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "impossible de modifier la signification du terme '%s'" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:178 msgid "please use two different terms" msgstr "veuillez utiliser deux termes différents" -#: builtin/bisect--helper.c:207 +#: builtin/bisect--helper.c:194 #, c-format msgid "We are not bisecting.\n" msgstr "Pas de bissection en cours.\n" -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:202 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' n'est pas un commit valide" -#: builtin/bisect--helper.c:224 +#: builtin/bisect--helper.c:211 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10658,27 +10657,27 @@ msgstr "" "Échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset " "<commit>'." -#: builtin/bisect--helper.c:268 +#: builtin/bisect--helper.c:255 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Mauvais argument pour bisect_write : %s" -#: builtin/bisect--helper.c:273 +#: builtin/bisect--helper.c:260 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "impossible d'obtenir l'oid de la révision '%s'" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:272 #, c-format msgid "couldn't open the file '%s'" msgstr "impossible d'ouvrir le fichier '%s'" -#: builtin/bisect--helper.c:311 +#: builtin/bisect--helper.c:298 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Commande invalide : vous êtes actuellement dans une bissection %s/%s" -#: builtin/bisect--helper.c:338 +#: builtin/bisect--helper.c:325 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10687,7 +10686,7 @@ msgstr "" "Vous devez me donner au moins une révision %s et une révision %s.\n" "Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela." -#: builtin/bisect--helper.c:342 +#: builtin/bisect--helper.c:329 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10698,7 +10697,7 @@ msgstr "" "Puis vous devez me donner au moins une révision %s et une révision %s.\n" "Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela." -#: builtin/bisect--helper.c:362 +#: builtin/bisect--helper.c:349 #, c-format msgid "bisecting only with a %s commit" msgstr "Attention : bissection avec seulement une validation %s" @@ -10707,15 +10706,15 @@ msgstr "Attention : bissection avec seulement une validation %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:370 +#: builtin/bisect--helper.c:357 msgid "Are you sure [Y/n]? " msgstr "Confirmez-vous [Y/n] ? " -#: builtin/bisect--helper.c:431 +#: builtin/bisect--helper.c:418 msgid "no terms defined" msgstr "aucun terme défini" -#: builtin/bisect--helper.c:434 +#: builtin/bisect--helper.c:421 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10724,7 +10723,7 @@ msgstr "" "Vos termes actuels sont %s pour l'état ancien\n" "et %s pour le nouvel état.\n" -#: builtin/bisect--helper.c:444 +#: builtin/bisect--helper.c:431 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10734,53 +10733,53 @@ msgstr "" "Les options supportées sont : --term-good|--term-old et --term-bad|--term-" "new." -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:498 msgid "revision walk setup failed\n" msgstr "échec de la préparation du parcours des révisions\n" -#: builtin/bisect--helper.c:533 +#: builtin/bisect--helper.c:520 #, c-format msgid "could not open '%s' for appending" msgstr "impossible d'ouvrir '%s' en ajout" -#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652 msgid "'' is not a valid term" msgstr "'' n'est pas un terme valide" -#: builtin/bisect--helper.c:674 +#: builtin/bisect--helper.c:662 #, c-format msgid "unrecognized option: '%s'" msgstr "option non reconnue : '%s'" -#: builtin/bisect--helper.c:678 +#: builtin/bisect--helper.c:666 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' ne semble être une révision valide" -#: builtin/bisect--helper.c:709 +#: builtin/bisect--helper.c:697 msgid "bad HEAD - I need a HEAD" msgstr "mauvaise HEAD - j'ai besoin d'une HEAD" -#: builtin/bisect--helper.c:724 +#: builtin/bisect--helper.c:712 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "L'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'." -#: builtin/bisect--helper.c:745 +#: builtin/bisect--helper.c:733 msgid "won't bisect on cg-seek'ed tree" msgstr "refus de bissecter sur un arbre 'cg-seeked'" -#: builtin/bisect--helper.c:748 +#: builtin/bisect--helper.c:736 msgid "bad HEAD - strange symbolic ref" msgstr "mauvaise HEAD - référence symbolique douteuse" -#: builtin/bisect--helper.c:775 +#: builtin/bisect--helper.c:756 #, c-format msgid "invalid ref: '%s'" msgstr "réference invalide : '%s'" -#: builtin/bisect--helper.c:827 +#: builtin/bisect--helper.c:814 msgid "You need to start by \"git bisect start\"\n" msgstr "Vous devez démarrer avec \"git bisect start\"\n" @@ -10788,108 +10787,94 @@ msgstr "Vous devez démarrer avec \"git bisect start\"\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:838 +#: builtin/bisect--helper.c:825 msgid "Do you want me to do it for you [Y/n]? " msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? " -#: builtin/bisect--helper.c:866 -msgid "perform 'git bisect next'" -msgstr "effectuer 'git bisect next'" +#: builtin/bisect--helper.c:843 +msgid "Please call `--bisect-state` with at least one argument" +msgstr "Veuillez appeler `--bisect-state` avec au moins un argument" -#: builtin/bisect--helper.c:868 -msgid "write the terms to .git/BISECT_TERMS" -msgstr "écrire les termes dans .git/BISECT_TERMS" - -#: builtin/bisect--helper.c:870 -msgid "cleanup the bisection state" -msgstr "vérifier l'état de la bissection" +#: builtin/bisect--helper.c:856 +#, c-format +msgid "'git bisect %s' can take only one argument." +msgstr "'git bisect %s' n'accepte qu'un seul argument." -#: builtin/bisect--helper.c:872 -msgid "check for expected revs" -msgstr "vérifier si des révisions sont attendues" +#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879 +#, c-format +msgid "Bad rev input: %s" +msgstr "Mauvaise révision en entrée : %s" -#: builtin/bisect--helper.c:874 +#: builtin/bisect--helper.c:924 msgid "reset the bisection state" msgstr "réinitialiser l'état de la bissection" -#: builtin/bisect--helper.c:876 +#: builtin/bisect--helper.c:926 msgid "write out the bisection state in BISECT_LOG" msgstr "écrire l'état de la bissection dans BISECT_LOG" -#: builtin/bisect--helper.c:878 +#: builtin/bisect--helper.c:928 msgid "check and set terms in a bisection state" msgstr "vérifier et régler les termes dans un état de la bissection" -#: builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:930 msgid "check whether bad or good terms exist" msgstr "vérifier si les termes bons ou mauvais existent" -#: builtin/bisect--helper.c:882 +#: builtin/bisect--helper.c:932 msgid "print out the bisect terms" msgstr "afficher les termes de bissection" -#: builtin/bisect--helper.c:884 +#: builtin/bisect--helper.c:934 msgid "start the bisect session" msgstr "démarrer une session de bissection" -#: builtin/bisect--helper.c:886 +#: builtin/bisect--helper.c:936 msgid "find the next bisection commit" msgstr "trouver le prochain commit de bissection" -#: builtin/bisect--helper.c:888 +#: builtin/bisect--helper.c:938 msgid "verify the next bisection state then checkout the next bisection commit" msgstr "" "vérifier le prochain état de bissection puis extraire le prochain commit de " "bissection" -#: builtin/bisect--helper.c:890 -msgid "start the bisection if it has not yet been started" -msgstr "commencer la bissection si elle n'a pas déjà été commencée" +#: builtin/bisect--helper.c:940 +msgid "mark the state of ref (or refs)" +msgstr "marquer l'état d'une références (ou plusieurs)" -#: builtin/bisect--helper.c:892 +#: builtin/bisect--helper.c:942 msgid "no log for BISECT_WRITE" msgstr "pas de journal pour BISECT_WRITE" -#: builtin/bisect--helper.c:910 -msgid "--write-terms requires two arguments" -msgstr "--write-terms exige deux arguments" - -#: builtin/bisect--helper.c:914 -msgid "--bisect-clean-state requires no arguments" -msgstr "--bisect-clean-state ne supporte aucun argument" - -#: builtin/bisect--helper.c:921 +#: builtin/bisect--helper.c:957 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset supporte soit aucun argument, soit un commit" -#: builtin/bisect--helper.c:925 +#: builtin/bisect--helper.c:961 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write supporte soit 4 arguments, soit 5 arguments" -#: builtin/bisect--helper.c:931 +#: builtin/bisect--helper.c:967 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms exige 3 arguments" -#: builtin/bisect--helper.c:937 +#: builtin/bisect--helper.c:973 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check exige 2 ou 3 arguments" -#: builtin/bisect--helper.c:943 +#: builtin/bisect--helper.c:979 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms exige 0 ou 1 argument" -#: builtin/bisect--helper.c:952 +#: builtin/bisect--helper.c:988 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next exige 0 argument" -#: builtin/bisect--helper.c:958 +#: builtin/bisect--helper.c:994 msgid "--bisect-auto-next requires 0 arguments" msgstr "--bisect-auto-next exige 0 argument" -#: builtin/bisect--helper.c:964 -msgid "--bisect-autostart does not accept arguments" -msgstr "--bisect-autostart ne supporte aucun argument" - #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>" @@ -10916,137 +10901,136 @@ msgstr "couleur invalide '%s' dans color.blame.repeatedlines" msgid "invalid value for blame.coloring" msgstr "valeur invalide pour blame.coloring" -#: builtin/blame.c:845 +#: builtin/blame.c:847 #, c-format msgid "cannot find revision %s to ignore" msgstr "référence à ignorer %s introuvable" -#: builtin/blame.c:867 +#: builtin/blame.c:869 msgid "Show blame entries as we find them, incrementally" msgstr "" "Montrer les éléments de blâme au fur et à mesure de leur découverte, de " "manière incrémentale" -#: builtin/blame.c:868 +#: builtin/blame.c:870 msgid "Do not show object names of boundary commits (Default: off)" msgstr "" "Ne pas montrer les noms des objets pour les commits de limite (Défaut : " "désactivé)" -#: builtin/blame.c:869 +#: builtin/blame.c:871 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)" -#: builtin/blame.c:870 +#: builtin/blame.c:872 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:871 +#: builtin/blame.c:873 msgid "Force progress reporting" msgstr "Forcer l'affichage de l'état d'avancement" -#: builtin/blame.c:872 +#: builtin/blame.c:874 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:873 +#: builtin/blame.c:875 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:874 +#: builtin/blame.c:876 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:875 +#: builtin/blame.c:877 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:876 +#: builtin/blame.c:878 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:877 +#: builtin/blame.c:879 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)" -#: builtin/blame.c:878 +#: builtin/blame.c:880 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:879 +#: builtin/blame.c:881 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:880 +#: builtin/blame.c:882 msgid "Suppress author name and timestamp (Default: off)" msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)" -#: builtin/blame.c:881 +#: builtin/blame.c:883 msgid "Show author email instead of name (Default: off)" msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)" -#: builtin/blame.c:882 +#: builtin/blame.c:884 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:883 builtin/log.c:1808 +#: builtin/blame.c:885 builtin/log.c:1813 msgid "rev" msgstr "rév" -#: builtin/blame.c:883 +#: builtin/blame.c:885 msgid "Ignore <rev> when blaming" msgstr "ignore <rev> pendant le blâme" -#: builtin/blame.c:884 +#: builtin/blame.c:886 msgid "Ignore revisions from <file>" msgstr "ignorer les révisions listées dans <fichier>" -#: builtin/blame.c:885 +#: builtin/blame.c:887 msgid "color redundant metadata from previous line differently" msgstr "" "colorer différemment les métadonnées redondantes avec la ligne précédente" -#: builtin/blame.c:886 +#: builtin/blame.c:888 msgid "color lines by age" msgstr "colorier les lignes par âge" -#: builtin/blame.c:887 +#: builtin/blame.c:889 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:888 +#: builtin/blame.c:890 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list" -#: builtin/blame.c:889 +#: builtin/blame.c:891 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:890 builtin/blame.c:891 +#: builtin/blame.c:892 builtin/blame.c:893 msgid "score" msgstr "score" -#: builtin/blame.c:890 +#: builtin/blame.c:892 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:891 +#: builtin/blame.c:893 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:892 -msgid "n,m" -msgstr "n,m" +#: builtin/blame.c:894 +msgid "range" +msgstr "plage" -#: builtin/blame.c:892 -msgid "Process only line range n,m, counting from 1" -msgstr "" -"Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1" +#: builtin/blame.c:895 +msgid "Process only line range <start>,<end> or function :<funcname>" +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 " @@ -11060,18 +11044,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:1110 +#: 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" @@ -11286,7 +11270,7 @@ msgstr "régler le mode de suivi (voir git-pull(1))" msgid "do not use" msgstr "ne pas utiliser" -#: builtin/branch.c:626 builtin/rebase.c:526 +#: builtin/branch.c:626 builtin/rebase.c:532 msgid "upstream" msgstr "amont" @@ -11397,7 +11381,7 @@ msgstr "le tri et le filtrage sont non-sensibles à la casse" msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/branch.c:682 builtin/clone.c:789 +#: builtin/branch.c:682 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" @@ -11551,38 +11535,38 @@ msgstr "" "Veuillez relire le rapport de bogue ci-dessous.\n" "Vous pouvez supprimer toute ligne que vous ne souhaitez pas envoyer.\n" -#: builtin/bugreport.c:134 +#: builtin/bugreport.c:135 msgid "specify a destination for the bugreport file" msgstr "spécifier la destination du fichier de rapport de bogue" -#: builtin/bugreport.c:136 +#: builtin/bugreport.c:137 msgid "specify a strftime format suffix for the filename" msgstr "spécifier une suffixe au format strftime pour le nom de fichier" -#: builtin/bugreport.c:158 +#: builtin/bugreport.c:159 #, c-format msgid "could not create leading directories for '%s'" msgstr "impossible de créer les répertoires de premier niveau pour '%s'" -#: builtin/bugreport.c:165 +#: builtin/bugreport.c:166 msgid "System Info" msgstr "Info système" -#: builtin/bugreport.c:168 +#: builtin/bugreport.c:169 msgid "Enabled Hooks" msgstr "Crochets activés" -#: builtin/bugreport.c:175 +#: builtin/bugreport.c:176 #, c-format msgid "couldn't create a new file at '%s'" msgstr "impossible de créer un fichier nouveau à '%s'" -#: builtin/bugreport.c:178 +#: builtin/bugreport.c:179 #, c-format msgid "unable to write to %s" msgstr "impossible d'écrire dans %s" -#: builtin/bugreport.c:188 +#: builtin/bugreport.c:189 #, c-format msgid "Created new report at '%s'.\n" msgstr "Nouveau rapport créé à '%s'.\n" @@ -11640,11 +11624,11 @@ msgstr "%s est correct\n" msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." -#: builtin/bundle.c:171 builtin/remote.c:1687 +#: builtin/bundle.c:171 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" -#: builtin/bundle.c:193 builtin/remote.c:1718 +#: builtin/bundle.c:193 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "Sous-commande inconnue : %s" @@ -11761,7 +11745,7 @@ 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:1482 builtin/gc.c:538 +#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541 #: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -11815,56 +11799,56 @@ msgstr "impossible d'analyser le contact : %s" msgid "no contacts specified" msgstr "aucun contact spécifié" -#: builtin/checkout-index.c:131 +#: builtin/checkout-index.c:139 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<options>] [--] [<fichier>...]" -#: builtin/checkout-index.c:148 +#: builtin/checkout-index.c:156 msgid "stage should be between 1 and 3 or all" msgstr "stage doit valoir entre 1 et 3, ou all" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:173 msgid "check out all files in the index" msgstr "extraire tous les fichiers présents dans l'index" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:174 msgid "force overwrite of existing files" msgstr "forcer l'écrasement des fichiers existants" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:176 msgid "no warning for existing files and files not in index" msgstr "" "pas d'avertissement pour les fichiers existants et les fichiers absents de " "l'index" -#: builtin/checkout-index.c:169 +#: builtin/checkout-index.c:178 msgid "don't checkout new files" msgstr "ne pas extraire les nouveaux fichiers" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:180 msgid "update stat information in the index file" msgstr "mettre à jour l'information de stat dans le fichier d'index" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:184 msgid "read list of paths from the standard input" msgstr "lire la liste des chemins depuis l'entrée standard" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:186 msgid "write the content to temporary files" msgstr "écrire le contenu dans des fichiers temporaires" -#: builtin/checkout-index.c:178 builtin/column.c:31 +#: builtin/checkout-index.c:187 builtin/column.c:31 #: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 #: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:754 +#: builtin/worktree.c:757 msgid "string" msgstr "chaîne" -#: builtin/checkout-index.c:179 +#: builtin/checkout-index.c:188 msgid "when creating files, prepend <string>" msgstr "lors de la création de fichiers, préfixer par <chaîne>" -#: builtin/checkout-index.c:181 +#: builtin/checkout-index.c:190 msgid "copy out the files from named stage" msgstr "copier les fichiers depuis l'index nommé" @@ -11968,16 +11952,16 @@ msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié" msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:528 builtin/checkout.c:535 +#: builtin/checkout.c:541 builtin/checkout.c:548 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:703 +#: builtin/checkout.c:716 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:757 +#: builtin/checkout.c:770 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11987,50 +11971,50 @@ msgstr "" "suivants :\n" "%s" -#: builtin/checkout.c:853 +#: builtin/checkout.c:866 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:895 +#: builtin/checkout.c:908 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:899 builtin/clone.c:720 +#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" -#: builtin/checkout.c:903 +#: builtin/checkout.c:916 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:906 +#: builtin/checkout.c:919 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:910 +#: builtin/checkout.c:923 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:912 builtin/checkout.c:1338 +#: builtin/checkout.c:925 builtin/checkout.c:1356 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:914 +#: builtin/checkout.c:927 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:965 +#: builtin/checkout.c:978 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:971 +#: builtin/checkout.c:984 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12053,7 +12037,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:990 +#: builtin/checkout.c:1003 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12082,19 +12066,19 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:1025 +#: builtin/checkout.c:1038 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:1029 +#: builtin/checkout.c:1042 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:1069 builtin/checkout.c:1333 +#: builtin/checkout.c:1082 builtin/checkout.c:1351 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1164 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12103,7 +12087,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:1153 +#: builtin/checkout.c:1171 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" @@ -12123,51 +12107,51 @@ msgstr "" "ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n" "votre config." -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1181 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1247 msgid "only one reference expected" msgstr "une seule référence attendue" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1264 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 +#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1305 builtin/checkout.c:1671 +#: builtin/checkout.c:1323 builtin/checkout.c:1689 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1370 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "branche attendue, mais étiquette '%s' reçue" -#: builtin/checkout.c:1354 +#: builtin/checkout.c:1372 #, 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:1355 builtin/checkout.c:1363 +#: builtin/checkout.c:1373 builtin/checkout.c:1381 #, c-format msgid "a branch is expected, got '%s'" msgstr "une branche est attendue, mais '%s' a été reçue" -#: builtin/checkout.c:1358 +#: builtin/checkout.c:1376 #, 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:1374 +#: builtin/checkout.c:1392 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12175,7 +12159,7 @@ msgstr "" "impossible de basculer de branche pendant une fusion\n" "Envisagez \"git merge --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1378 +#: builtin/checkout.c:1396 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12183,7 +12167,7 @@ msgstr "" "impossible de basculer de branche pendant une session am\n" "Envisagez \"git am --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1382 +#: builtin/checkout.c:1400 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12191,7 +12175,7 @@ msgstr "" "impossible de basculer de branche pendant un rebasage\n" "Envisagez \"git rebase --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1386 +#: builtin/checkout.c:1404 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12199,7 +12183,7 @@ msgstr "" "impossible de basculer de branche pendant un picorage\n" "Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1408 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12207,146 +12191,146 @@ msgstr "" "impossible de basculer de branche pendant un retour\n" "Envisagez \"git revert --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1394 +#: builtin/checkout.c:1412 msgid "you are switching branch while bisecting" msgstr "Vous basculez de branche en cours de bissection" -#: builtin/checkout.c:1401 +#: builtin/checkout.c:1419 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 +#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430 #, 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:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 -#: builtin/checkout.c:1427 builtin/checkout.c:1432 +#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440 +#: builtin/checkout.c:1445 builtin/checkout.c:1450 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1429 +#: builtin/checkout.c:1447 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' n'accepte pas <point-de-départ>" -#: builtin/checkout.c:1437 +#: builtin/checkout.c:1455 #, 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:1444 +#: builtin/checkout.c:1462 msgid "missing branch or commit argument" msgstr "argument de branche ou de commit manquant" -#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 -#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 -#: builtin/send-pack.c:192 +#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575 +#: builtin/send-pack.c:198 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" -#: builtin/checkout.c:1487 +#: builtin/checkout.c:1505 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 +#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322 msgid "style" msgstr "style" -#: builtin/checkout.c:1489 +#: builtin/checkout.c:1507 msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1501 builtin/worktree.c:558 +#: builtin/checkout.c:1519 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" -#: builtin/checkout.c:1502 +#: builtin/checkout.c:1520 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1522 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1524 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1524 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1508 builtin/merge.c:291 +#: builtin/checkout.c:1526 builtin/merge.c:300 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1511 +#: builtin/checkout.c:1529 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:1524 +#: builtin/checkout.c:1542 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1545 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1531 +#: builtin/checkout.c:1549 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:1586 +#: builtin/checkout.c:1604 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1590 +#: builtin/checkout.c:1608 msgid "-p and --overlay are mutually exclusive" msgstr "-p et --overlay sont mutuellement exclusifs" -#: builtin/checkout.c:1627 +#: builtin/checkout.c:1645 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1632 +#: builtin/checkout.c:1650 #, c-format msgid "missing branch name; try -%c" msgstr "nom de branche manquant ; essayez -%c" -#: builtin/checkout.c:1664 +#: builtin/checkout.c:1682 #, c-format msgid "could not resolve %s" msgstr "impossible de résoudre %s" -#: builtin/checkout.c:1680 +#: builtin/checkout.c:1698 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1687 +#: builtin/checkout.c:1705 #, 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:1691 +#: builtin/checkout.c:1709 #, 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:1700 +#: builtin/checkout.c:1718 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file est incompatible avec --detach" -#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file est incompatible avec --patch" -#: builtin/checkout.c:1716 +#: builtin/checkout.c:1734 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12354,71 +12338,71 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1739 msgid "you must specify path(s) to restore" msgstr "Vous devez spécifier un ou des chemins à restaurer" -#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 -#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816 +#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170 #: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 #: builtin/worktree.c:556 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1748 +#: builtin/checkout.c:1766 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1768 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1751 +#: builtin/checkout.c:1769 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1753 +#: builtin/checkout.c:1771 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" "essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1772 msgid "use overlay mode (default)" msgstr "utiliser le mode de superposition (défaut)" -#: builtin/checkout.c:1799 +#: builtin/checkout.c:1817 msgid "create and switch to a new branch" msgstr "créer et basculer sur une nouvelle branche" -#: builtin/checkout.c:1801 +#: builtin/checkout.c:1819 msgid "create/reset and switch to a branch" msgstr "créer/réinitialiser et basculer sur une branche" -#: builtin/checkout.c:1803 +#: builtin/checkout.c:1821 msgid "second guess 'git switch <no-such-branch>'" msgstr "interpréter 'git switch <branche-inexistante>'" -#: builtin/checkout.c:1805 +#: builtin/checkout.c:1823 msgid "throw away local modifications" msgstr "laisser tomber les modifications locales" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1857 msgid "which tree-ish to checkout from" msgstr "de quel <arbre-esque> faire l'extraction" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1859 msgid "restore the index" msgstr "restaurer l'index" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1861 msgid "restore the working tree (default)" msgstr "restaurer l'arbre de travail (par défaut)" -#: builtin/checkout.c:1845 +#: builtin/checkout.c:1863 msgid "ignore unmerged entries" msgstr "ignorer les entrées non-fusionnées" -#: builtin/checkout.c:1846 +#: builtin/checkout.c:1864 msgid "use overlay mode" msgstr "utiliser le mode de superposition" @@ -12458,7 +12442,7 @@ msgstr "échec de la suppression de %s" msgid "could not lstat %s\n" msgstr "lstat de %s impossible\n" -#: builtin/clean.c:302 git-add--interactive.perl:595 +#: builtin/clean.c:302 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12471,7 +12455,7 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" " - (vide) ne rien sélectionner\n" -#: builtin/clean.c:306 git-add--interactive.perl:604 +#: builtin/clean.c:306 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12492,8 +12476,8 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:521 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hein (%s) ?\n" @@ -12563,7 +12547,7 @@ msgid "remove whole directories" msgstr "supprimer les répertoires entiers" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185 #: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" @@ -12605,168 +12589,168 @@ msgstr "-x et -X ne peuvent pas être utilisés ensemble" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 +#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:553 msgid "create a bare repository" msgstr "créer un dépôt nu" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "create a mirror repository (implies bare)" msgstr "créer un dépôt miroir (implique dépôt nu)" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, toujours copier" -#: builtin/clone.c:104 +#: builtin/clone.c:105 msgid "setup as shared repository" msgstr "régler comme dépôt partagé" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "pathspec" msgstr "spécificateur de chemin" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "number of submodules cloned in parallel" msgstr "nombre de sous-modules clonés en parallèle" -#: builtin/clone.c:111 builtin/init-db.c:550 +#: builtin/clone.c:112 builtin/init-db.c:550 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:112 builtin/init-db.c:551 +#: builtin/clone.c:113 builtin/init-db.c:551 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 #: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/clone.c:119 builtin/submodule--helper.c:1833 #: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" -#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 +#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358 msgid "name" msgstr "nom" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "use <name> instead of 'origin' to track upstream" msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont" -#: builtin/clone.c:122 +#: builtin/clone.c:123 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860 #: builtin/pull.c:208 msgid "depth" msgstr "profondeur" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535 #: builtin/pull.c:211 msgid "time" msgstr "heure" -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "create a shallow clone since a specific time" msgstr "créer un clone superficiel depuis une date spécifique" -#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 +#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317 msgid "revision" msgstr "révision" -#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 +#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "" "approfondir l'historique d'un clone superficiel en excluant une révision" -#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/clone.c:133 builtin/submodule--helper.c:1843 #: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -#: builtin/clone.c:134 +#: builtin/clone.c:135 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" "ne pas cloner les tags et indiquer aux récupérations futures de ne pas le " "faire" -#: builtin/clone.c:136 +#: builtin/clone.c:137 msgid "any cloned submodules will be shallow" msgstr "tous les sous-modules clonés seront superficiels" -#: builtin/clone.c:137 builtin/init-db.c:559 +#: builtin/clone.c:138 builtin/init-db.c:559 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:138 builtin/init-db.c:560 +#: builtin/clone.c:139 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "key=value" msgstr "clé=valeur" -#: builtin/clone.c:140 +#: builtin/clone.c:141 msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 -#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 +#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "spécifique au serveur" -#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 -#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 +#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "option à transmettre" -#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 -#: builtin/push.c:561 +#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 -#: builtin/push.c:563 +#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" -#: builtin/clone.c:149 +#: builtin/clone.c:150 msgid "any cloned submodules will use their remote-tracking branch" msgstr "" "tous les sous-modules clonés utiliseront leur branche de suivi à distance" -#: builtin/clone.c:151 +#: builtin/clone.c:152 msgid "initialize sparse-checkout file to include only files at root" msgstr "" "initialiser le fichier d'extraction partielle pour n'inclure que les " "fichiers à la racine" -#: builtin/clone.c:287 +#: builtin/clone.c:288 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12774,42 +12758,42 @@ msgstr "" "Aucun nom de répertoire n'a pu être deviné\n" "Veuillez spécifier un répertoire dans la ligne de commande" -#: builtin/clone.c:340 +#: builtin/clone.c:341 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n" -#: builtin/clone.c:413 +#: builtin/clone.c:414 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:431 +#: builtin/clone.c:432 #, c-format msgid "failed to start iterator over '%s'" msgstr "échec du démarrage un itérateur sur '%s'" -#: builtin/clone.c:462 +#: builtin/clone.c:463 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:466 +#: builtin/clone.c:467 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "failed to iterate over '%s'" msgstr "échec de l'itération sur '%s'" -#: builtin/clone.c:498 +#: builtin/clone.c:499 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:512 +#: builtin/clone.c:513 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12819,107 +12803,107 @@ msgstr "" "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" "et réessayer avec 'git restore --source=HEAD :/'\n" -#: builtin/clone.c:589 +#: builtin/clone.c:590 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:708 +#: builtin/clone.c:709 #, c-format msgid "unable to update %s" msgstr "impossible de mettre à jour %s" -#: builtin/clone.c:756 +#: builtin/clone.c:757 msgid "failed to initialize sparse-checkout" msgstr "échec lors de l'initialisation l'extraction partielle" -#: builtin/clone.c:779 +#: builtin/clone.c:780 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD distante réfère à une référence non existante, impossible de " "l'extraire.\n" -#: builtin/clone.c:811 +#: builtin/clone.c:812 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:868 +#: builtin/clone.c:887 msgid "unable to write parameters to config file" msgstr "impossible d'écrire les paramètres dans le fichier de configuration" -#: builtin/clone.c:931 +#: builtin/clone.c:950 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" -#: builtin/clone.c:933 +#: builtin/clone.c:952 msgid "cannot unlink temporary alternates file" msgstr "impossible de délier le fichier temporaire alternates" -#: builtin/clone.c:970 builtin/receive-pack.c:2434 +#: builtin/clone.c:992 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:974 +#: builtin/clone.c:996 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:987 +#: builtin/clone.c:1009 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:990 +#: builtin/clone.c:1012 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:1006 +#: builtin/clone.c:1025 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:1010 builtin/fetch.c:1841 +#: builtin/clone.c:1029 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:1020 +#: builtin/clone.c:1039 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide." -#: builtin/clone.c:1026 +#: builtin/clone.c:1045 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "le chemin du dépôt '%s' existe déjà et n'est pas un répertoire vide." -#: builtin/clone.c:1040 +#: builtin/clone.c:1059 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 -#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 +#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271 +#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" -#: builtin/clone.c:1060 +#: builtin/clone.c:1079 #, c-format msgid "could not create work tree dir '%s'" msgstr "impossible de créer le répertoire de la copie de travail '%s'" -#: builtin/clone.c:1080 +#: builtin/clone.c:1099 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:1082 +#: builtin/clone.c:1101 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:1106 +#: builtin/clone.c:1125 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12927,41 +12911,46 @@ msgstr "" "clone --recursive n'est pas compatible avec à la fois --reference et --" "reference-if-able" -#: builtin/clone.c:1170 +#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "'%s' n'est pas un nom valide de distante" + +#: builtin/clone.c:1210 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." -#: builtin/clone.c:1172 +#: builtin/clone.c:1212 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://" "\"." -#: builtin/clone.c:1174 +#: builtin/clone.c:1214 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt " "\"file://\"." -#: builtin/clone.c:1176 +#: builtin/clone.c:1216 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter est ignoré dans les clones locaux ; utilisez plutôt file:// ." -#: builtin/clone.c:1179 +#: builtin/clone.c:1219 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:1184 +#: builtin/clone.c:1224 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:1268 builtin/clone.c:1276 +#: builtin/clone.c:1308 builtin/clone.c:1316 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" -#: builtin/clone.c:1279 +#: builtin/clone.c:1319 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -13019,7 +13008,7 @@ msgid "could not find object directory matching %s" msgstr "impossible de trouver le répertoire objet correspondant à %s" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769 msgid "dir" msgstr "répertoire" @@ -13116,7 +13105,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "le parent dupliqué %s est ignoré" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555 #, c-format msgid "not a valid object name %s" msgstr "nom d'objet invalide %s" @@ -13144,8 +13133,8 @@ msgstr "parent" msgid "id of a parent commit object" msgstr "id d'un objet commit parent" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470 #: builtin/tag.c:413 msgid "message" msgstr "message" @@ -13158,7 +13147,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:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signer la validation avec GPG" @@ -13314,7 +13303,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:729 builtin/shortlog.c:478 +#: builtin/commit.c:729 builtin/shortlog.c:425 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" @@ -13505,8 +13494,8 @@ msgstr "calcule les valeurs complètes en avance/en retard" msgid "version" msgstr "version" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 -#: builtin/worktree.c:722 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 +#: builtin/worktree.c:725 msgid "machine-readable output" msgstr "sortie pour traitement automatique" @@ -13520,7 +13509,7 @@ msgstr "terminer les éléments par NUL" #: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 #: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 +#: builtin/fast-export.c:1205 builtin/rebase.c:1406 parse-options.h:336 msgid "mode" msgstr "mode" @@ -13581,7 +13570,7 @@ msgstr "afficher les diff dans le modèle de message de validation" msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 +#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415 msgid "read message from file" msgstr "lire le message depuis un fichier" @@ -13593,7 +13582,7 @@ msgstr "auteur" msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1503 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:542 msgid "date" msgstr "date" @@ -13629,10 +13618,10 @@ 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:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301 #: builtin/pull.c:145 builtin/revert.c:110 -msgid "add Signed-off-by:" -msgstr "ajouter une entrée Signed-off-by :" +msgid "add a Signed-off-by trailer" +msgstr "ajouter une ligne terminale Signed-off-by" #: builtin/commit.c:1511 msgid "use specified template file" @@ -13732,218 +13721,221 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<options>]" -#: builtin/config.c:107 builtin/env--helper.c:27 +#: builtin/config.c:109 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "argument --type non reconnu, %s" -#: builtin/config.c:119 +#: builtin/config.c:121 msgid "only one type at a time" msgstr "qu'un seul type à la fois" -#: builtin/config.c:128 +#: builtin/config.c:130 msgid "Config file location" msgstr "Emplacement du fichier de configuration" -#: builtin/config.c:129 +#: builtin/config.c:131 msgid "use global config file" msgstr "utiliser les fichier de configuration global" -#: builtin/config.c:130 +#: builtin/config.c:132 msgid "use system config file" msgstr "utiliser le fichier de configuration du système" -#: builtin/config.c:131 +#: builtin/config.c:133 msgid "use repository config file" msgstr "utiliser le fichier de configuration du dépôt" -#: builtin/config.c:132 +#: builtin/config.c:134 msgid "use per-worktree config file" msgstr "utiliser un fichier de configuration par arbre de travail" -#: builtin/config.c:133 +#: builtin/config.c:135 msgid "use given config file" msgstr "utiliser le fichier de configuration spécifié" -#: builtin/config.c:134 +#: builtin/config.c:136 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:134 +#: builtin/config.c:136 msgid "read config from given blob object" msgstr "lire la configuration depuis l'objet blob fourni" -#: builtin/config.c:135 +#: builtin/config.c:137 msgid "Action" msgstr "Action" -#: builtin/config.c:136 -msgid "get value: name [value-regex]" -msgstr "obtenir la valeur : nom [regex-de-valeur]" - -#: builtin/config.c:137 -msgid "get all values: key [value-regex]" -msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]" - #: builtin/config.c:138 -msgid "get values for regexp: name-regex [value-regex]" -msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]" +msgid "get value: name [value-pattern]" +msgstr "obtenir la valeur : nom [motif-de-valeur]" #: builtin/config.c:139 -msgid "get value specific for the URL: section[.var] URL" -msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL" +msgid "get all values: key [value-pattern]" +msgstr "obtenir toutes les valeurs : clé [motif-de-valeur]" #: builtin/config.c:140 -msgid "replace all matching variables: name value [value_regex]" -msgstr "" -"remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]" +msgid "get values for regexp: name-regex [value-pattern]" +msgstr "obtenir les valeur pour la regexp : regex-de-nom [motif-de-valeur]" #: builtin/config.c:141 -msgid "add a new variable: name value" -msgstr "ajouter une nouvelle variable : nom valeur" +msgid "get value specific for the URL: section[.var] URL" +msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL" #: builtin/config.c:142 -msgid "remove a variable: name [value-regex]" -msgstr "supprimer une variable : nom [regex-de-valeur]" +msgid "replace all matching variables: name value [value-pattern]" +msgstr "remplacer toutes les variables correspondant : nom valeur [motif-de-valeur]" #: builtin/config.c:143 -msgid "remove all matches: name [value-regex]" -msgstr "supprimer toutes les correspondances nom [regex-de-valeur]" +msgid "add a new variable: name value" +msgstr "ajouter une nouvelle variable : nom valeur" #: builtin/config.c:144 +msgid "remove a variable: name [value-pattern]" +msgstr "supprimer une variable : nom [motif-de-valeur]" + +#: builtin/config.c:145 +msgid "remove all matches: name [value-pattern]" +msgstr "supprimer toutes les correspondances nom [motif-de-valeur]" + +#: builtin/config.c:146 msgid "rename section: old-name new-name" msgstr "renommer une section : ancien-nom nouveau-nom" -#: builtin/config.c:145 +#: builtin/config.c:147 msgid "remove a section: name" msgstr "supprimer une section : nom" -#: builtin/config.c:146 +#: builtin/config.c:148 msgid "list all" msgstr "afficher tout" -#: builtin/config.c:147 +#: builtin/config.c:149 +msgid "use string equality when comparing values to 'value-pattern'" +msgstr "utiliser l'égalité de chaînes lors de la comparaison de 'motif-de-valeur'" + +#: builtin/config.c:150 msgid "open an editor" msgstr "ouvrir un éditeur" -#: builtin/config.c:148 +#: builtin/config.c:151 msgid "find the color configured: slot [default]" msgstr "trouver la couleur configurée : slot [par défaut]" -#: builtin/config.c:149 +#: builtin/config.c:152 msgid "find the color setting: slot [stdout-is-tty]" msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]" -#: builtin/config.c:150 +#: builtin/config.c:153 msgid "Type" msgstr "Type" -#: builtin/config.c:151 builtin/env--helper.c:43 +#: builtin/config.c:154 builtin/env--helper.c:43 msgid "value is given this type" msgstr "ce type est assigné à la valeur" -#: builtin/config.c:152 +#: builtin/config.c:155 msgid "value is \"true\" or \"false\"" msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)" -#: builtin/config.c:153 +#: builtin/config.c:156 msgid "value is decimal number" msgstr "la valeur est un nombre décimal" -#: builtin/config.c:154 +#: builtin/config.c:157 msgid "value is --bool or --int" msgstr "la valeur est --bool ou --int" -#: builtin/config.c:155 +#: builtin/config.c:158 msgid "value is --bool or string" msgstr "la valeur est --bool ou une chaîne" -#: builtin/config.c:156 +#: builtin/config.c:159 msgid "value is a path (file or directory name)" msgstr "la valeur est un chemin (vers un fichier ou un répertoire)" -#: builtin/config.c:157 +#: builtin/config.c:160 msgid "value is an expiry date" msgstr "la valeur est une date d'expiration" -#: builtin/config.c:158 +#: builtin/config.c:161 msgid "Other" msgstr "Autre" -#: builtin/config.c:159 +#: builtin/config.c:162 msgid "terminate values with NUL byte" msgstr "terminer les valeurs avec un caractère NUL" -#: builtin/config.c:160 +#: builtin/config.c:163 msgid "show variable names only" msgstr "n'afficher que les noms de variable" -#: builtin/config.c:161 +#: builtin/config.c:164 msgid "respect include directives on lookup" msgstr "respecter les directives d'inclusion lors de la recherche" -#: builtin/config.c:162 +#: builtin/config.c:165 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "afficher l'origine de la configuration (fichier, entrée standard, blob, " "ligne de commande)" -#: builtin/config.c:163 +#: builtin/config.c:166 msgid "show scope of config (worktree, local, global, system, command)" msgstr "" "afficher la portée de configuration (arbre de travail, local, global, " "système, commande)" -#: builtin/config.c:164 builtin/env--helper.c:45 +#: builtin/config.c:167 builtin/env--helper.c:45 msgid "value" msgstr "valeur" -#: builtin/config.c:164 +#: builtin/config.c:167 msgid "with --get, use default value when missing entry" msgstr "avec --get, utiliser le valeur par défaut quand l'entrée n'existe pas" -#: builtin/config.c:178 +#: builtin/config.c:181 #, c-format msgid "wrong number of arguments, should be %d" msgstr "mauvais nombre d'arguments, devrait être %d" -#: builtin/config.c:180 +#: builtin/config.c:183 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "mauvais nombre d'arguments, devrait être entre %d et %d" -#: builtin/config.c:334 +#: builtin/config.c:339 #, c-format msgid "invalid key pattern: %s" msgstr "motif de clé invalide : %s" -#: builtin/config.c:370 +#: builtin/config.c:377 #, c-format msgid "failed to format default config value: %s" msgstr "échec du formatage de la valeur de config par défaut : %s" -#: builtin/config.c:434 +#: builtin/config.c:441 #, c-format msgid "cannot parse color '%s'" msgstr "impossible d'analyser la couleur '%s'" -#: builtin/config.c:476 +#: builtin/config.c:483 msgid "unable to parse default color value" msgstr "impossible de lire la valeur de couleur par défaut" -#: builtin/config.c:529 builtin/config.c:789 +#: builtin/config.c:536 builtin/config.c:833 msgid "not in a git directory" msgstr "pas dans un répertoire git" -#: builtin/config.c:532 +#: builtin/config.c:539 msgid "writing to stdin is not supported" msgstr "l'écriture sur stdin n'est pas supportée" -#: builtin/config.c:535 +#: builtin/config.c:542 msgid "writing config blobs is not supported" msgstr "l'écriture de blob de configuration n'est pas supportée<" -#: builtin/config.c:620 +#: builtin/config.c:627 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13958,27 +13950,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:644 +#: builtin/config.c:652 msgid "only one config file at a time" msgstr "un seul fichier de configuration à la fois" -#: builtin/config.c:650 +#: builtin/config.c:658 msgid "--local can only be used inside a git repository" msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git" -#: builtin/config.c:652 +#: builtin/config.c:660 msgid "--blob can only be used inside a git repository" msgstr "--blob ne peut être utilisé qu'à l'intérieur d'un dépôt git" -#: builtin/config.c:654 +#: builtin/config.c:662 msgid "--worktree can only be used inside a git repository" msgstr "--worktree ne peut être utilisé qu'à l'intérieur d'un dépôt git" -#: builtin/config.c:676 +#: builtin/config.c:684 msgid "$HOME not set" msgstr "$HOME n'est pas défini" -#: builtin/config.c:700 +#: builtin/config.c:708 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -13989,19 +13981,19 @@ msgstr "" "la section \"CONFIGURATION FILE\" de \"git help worktree\" pour plus de " "détails" -#: builtin/config.c:735 +#: builtin/config.c:743 msgid "--get-color and variable type are incoherent" msgstr "--get-color et le type de la variable sont incohérents" -#: builtin/config.c:740 +#: builtin/config.c:748 msgid "only one action at a time" msgstr "une seule action à la fois" -#: builtin/config.c:753 +#: builtin/config.c:761 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only n'est applicable qu'avec --list ou --get-regexp" -#: builtin/config.c:759 +#: builtin/config.c:767 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" @@ -14009,33 +14001,37 @@ msgstr "" "--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --" "list" -#: builtin/config.c:765 +#: builtin/config.c:773 msgid "--default is only applicable to --get" msgstr "--default n'est applicable qu'avec --get" -#: builtin/config.c:778 +#: builtin/config.c:806 +msgid "--fixed-value only applies with 'value-pattern'" +msgstr "--fixed-value ne s'applique qu'à 'motif-de-valeur'" + +#: builtin/config.c:822 #, c-format msgid "unable to read config file '%s'" msgstr "lecture du fichier de configuration '%s' impossible" -#: builtin/config.c:781 +#: builtin/config.c:825 msgid "error processing config file(s)" msgstr "erreur lors du traitement de fichier(s) de configuration" -#: builtin/config.c:791 +#: builtin/config.c:835 msgid "editing stdin is not supported" msgstr "l'édition de stdin n'est pas supportée" -#: builtin/config.c:793 +#: builtin/config.c:837 msgid "editing blobs is not supported" msgstr "l'édition de blobs n'est pas supportée" -#: builtin/config.c:807 +#: builtin/config.c:851 #, c-format msgid "cannot create configuration file %s" msgstr "création impossible du fichier de configuration '%s'" -#: builtin/config.c:820 +#: builtin/config.c:864 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -14044,7 +14040,7 @@ msgstr "" "impossible de surcharger des valeurs multiples avec une seule valeur\n" " Utilisez une regexp, --add ou --replace-all pour modifier %s." -#: builtin/config.c:894 builtin/config.c:905 +#: builtin/config.c:943 builtin/config.c:954 #, c-format msgid "no such section: %s" msgstr "section inexistante : %s" @@ -14083,6 +14079,11 @@ msgstr "" msgid "credential-cache unavailable; no unix socket support" msgstr "credential-cache non disponible ; pas de gestion des socket unix" +#: builtin/credential-store.c:66 +#, c-format +msgid "unable to get credential storage lock in %d ms" +msgstr "impossible d'accéder au verrou de stockage d'identification en %d ms" + #: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<options>] <commit ou apparenté>*" @@ -14252,41 +14253,49 @@ msgstr "--dirty est incompatible avec la spécification de commits ou assimilés msgid "--broken is incompatible with commit-ishes" msgstr "--broken est incompatible avec les commits ou assimilés" +#: builtin/diff-tree.c:155 +msgid "--stdin and --merge-base are mutually exclusive" +msgstr "--stdin et --merge-base sont mutuellement exclusifs" + +#: builtin/diff-tree.c:157 +msgid "--merge-base only works with two commits" +msgstr "--merge-base ne fonctionne qu'avec deux commits" + #: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique" -#: builtin/diff.c:241 +#: builtin/diff.c:258 #, c-format msgid "invalid option: %s" msgstr "option invalide : %s" -#: builtin/diff.c:358 +#: builtin/diff.c:375 #, c-format msgid "%s...%s: no merge base" msgstr "%s..%s: pas de base de fusion" -#: builtin/diff.c:468 +#: builtin/diff.c:485 msgid "Not a git repository" msgstr "Ce n'est pas un dépôt git !" -#: builtin/diff.c:513 +#: builtin/diff.c:530 builtin/grep.c:681 #, c-format msgid "invalid object '%s' given." msgstr "objet spécifié '%s' invalide." -#: builtin/diff.c:524 +#: builtin/diff.c:541 #, c-format msgid "more than two blobs given: '%s'" msgstr "plus de deux blobs spécifiés : '%s'" -#: builtin/diff.c:529 +#: builtin/diff.c:546 #, c-format msgid "unhandled object '%s' given." msgstr "objet non géré '%s' spécifié." -#: builtin/diff.c:563 +#: builtin/diff.c:580 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "\"%s...%s\" : bases multiples de fusion, utilisation de %s" @@ -14315,7 +14324,7 @@ msgstr "impossible de lire le fichier symlink %s" msgid "could not read object %s for symlink %s" msgstr "Impossible de lire l'objet %s pour le symlink %s" -#: builtin/difftool.c:413 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -14323,53 +14332,53 @@ 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:634 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "les deux fichiers sont modifiés : '%s' et '%s'." -#: builtin/difftool.c:636 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "le fichier dans l'arbre de travail a été laissé." -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "des fichiers temporaires existent dans '%s'." -#: builtin/difftool.c:648 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "vous pourriez souhaiter les nettoyer ou les récupérer." -#: builtin/difftool.c:697 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utiliser `diff.guitool` au lieu de `diff.tool`" -#: builtin/difftool.c:699 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "réalise un diff de répertoire complet" -#: builtin/difftool.c:701 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "ne pas confirmer avant de lancer l'outil de diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "utiliser les liens symboliques en mode de diff de répertoire" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "tool" msgstr "outil" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "utiliser l'outil de diff spécifié" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 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:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -14377,31 +14386,31 @@ msgstr "" "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code " "non-nul" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "spécifier une commande personnalisée pour visualiser les différences" -#: builtin/difftool.c:717 +#: builtin/difftool.c:716 msgid "passed to `diff`" msgstr "passé à `diff`" -#: builtin/difftool.c:732 +#: builtin/difftool.c:731 msgid "difftool requires worktree or --no-index" msgstr "difftool exige un arbre de travail ou --no-index" -#: builtin/difftool.c:739 +#: builtin/difftool.c:738 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff est incompatible avec --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs" -#: builtin/difftool.c:750 +#: builtin/difftool.c:749 msgid "no <tool> given for --tool=<tool>" msgstr "pas d'<outil> spécifié pour --tool=<outil>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:756 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "pas de <commande> spécifié pour --extcmd=<commande>" @@ -14499,7 +14508,7 @@ msgstr "Utiliser la fonction \"done\" pour terminer le flux" msgid "Skip output of blob data" msgstr "Sauter l'affichage de données de blob" -#: builtin/fast-export.c:1223 builtin/log.c:1811 +#: builtin/fast-export.c:1223 builtin/log.c:1816 msgid "refspec" msgstr "spécificateur de référence" @@ -14542,33 +14551,33 @@ 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:3086 +#: builtin/fast-import.c:3088 #, c-format msgid "Missing from marks for submodule '%s'" msgstr "Champs from manquants pour le sous-module '%s'" -#: builtin/fast-import.c:3088 +#: builtin/fast-import.c:3090 #, c-format msgid "Missing to marks for submodule '%s'" msgstr "champs to manquants pour le sous-module '%s'" -#: builtin/fast-import.c:3223 +#: builtin/fast-import.c:3225 #, c-format msgid "Expected 'mark' command, got %s" msgstr "commande 'mark' attendue, %s trouvé" -#: builtin/fast-import.c:3228 +#: builtin/fast-import.c:3230 #, c-format msgid "Expected 'to' command, got %s" msgstr "commande 'to' attendue, %s trouvé" -#: builtin/fast-import.c:3320 +#: builtin/fast-import.c:3322 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:3374 +#: builtin/fast-import.c:3377 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "" @@ -14845,7 +14854,7 @@ msgstr " (%s est devenu en suspens)" msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:1195 builtin/remote.c:1113 +#: builtin/fetch.c:1195 builtin/remote.c:1118 msgid "(none)" msgstr "(aucun(e))" @@ -15048,6 +15057,22 @@ msgstr "afficher seulement les références qui contiennent le commit" msgid "print only refs which don't contain the commit" msgstr "afficher seulement les références qui ne contiennent pas le commit" +#: builtin/for-each-repo.c:9 +msgid "git for-each-repo --config=<config> <command-args>" +msgstr "git for-each-repo --config=<config> <arguments-de-commande>" + +#: builtin/for-each-repo.c:37 +msgid "config" +msgstr "config" + +#: builtin/for-each-repo.c:38 +msgid "config key storing a list of repository paths" +msgstr "clé de config qui stocke la liste des chemins de dépôts" + +#: builtin/for-each-repo.c:46 +msgid "missing --config=<config>" +msgstr "--config=<config> manquant" + #: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "inconnu" @@ -15292,31 +15317,31 @@ msgstr "%s : objet manquant" msgid "invalid parameter: expected sha1, got '%s'" msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé" -#: builtin/gc.c:36 +#: builtin/gc.c:39 msgid "git gc [<options>]" msgstr "git gc [<options>]" -#: builtin/gc.c:91 +#: builtin/gc.c:94 #, c-format msgid "Failed to fstat %s: %s" msgstr "Échec du stat de %s : %s" -#: builtin/gc.c:127 +#: builtin/gc.c:130 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "échec de l'analyse de '%s' valeur '%s'" -#: builtin/gc.c:476 builtin/init-db.c:58 +#: builtin/gc.c:479 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "impossible de faire un stat de '%s'" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 +#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: builtin/gc.c:492 +#: builtin/gc.c:495 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -15332,56 +15357,56 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:540 +#: builtin/gc.c:543 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:542 +#: builtin/gc.c:545 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:543 +#: builtin/gc.c:546 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:546 +#: builtin/gc.c:549 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:549 +#: builtin/gc.c:552 msgid "repack all other packs except the largest pack" msgstr "recompacter tous les autres paquets excepté le plus gros paquet" -#: builtin/gc.c:566 +#: builtin/gc.c:569 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "impossible d'analyser gc.logexpiry %s" -#: builtin/gc.c:577 +#: builtin/gc.c:580 #, c-format msgid "failed to parse prune expiry value %s" msgstr "impossible d'analyser la valeur d'expiration d'élagage %s" -#: builtin/gc.c:597 +#: builtin/gc.c:600 #, 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:599 +#: builtin/gc.c:602 #, 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:600 +#: builtin/gc.c:603 #, 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:640 +#: builtin/gc.c:643 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -15389,62 +15414,141 @@ 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:695 +#: builtin/gc.c:698 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:705 -msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" -msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<tâche>]" +#: builtin/gc.c:708 +msgid "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" +msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<tâche>] [--schedule]" + +#: builtin/gc.c:738 +msgid "--no-schedule is not allowed" +msgstr "--schedule n'est pas accepté" + +#: builtin/gc.c:743 +#, c-format +msgid "unrecognized --schedule argument '%s'" +msgstr "argument de --schedule non reconnu, '%s'" -#: builtin/gc.c:812 +#: builtin/gc.c:862 msgid "failed to write commit-graph" msgstr "échec de l'écriture du graphe de commits" -#: builtin/gc.c:905 +#: builtin/gc.c:901 +msgid "failed to fill remotes" +msgstr "échec du remplissage des distants" + +#: builtin/gc.c:1024 +msgid "failed to start 'git pack-objects' process" +msgstr "Impossible de démarrer le processus 'git pack-objects'" + +#: builtin/gc.c:1041 +msgid "failed to finish 'git pack-objects' process" +msgstr "Impossible de finir le processus 'git pack-objects'" + +#: builtin/gc.c:1093 +msgid "failed to write multi-pack-index" +msgstr "échec de l'écriture de l'index de multi-paquet" + +#: builtin/gc.c:1111 +msgid "'git multi-pack-index expire' failed" +msgstr "échec de 'git multi-pack-index expire'" + +#: builtin/gc.c:1172 +msgid "'git multi-pack-index repack' failed" +msgstr "échec de 'git multi-pack-index repack'" + +#: builtin/gc.c:1181 +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:1279 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "le fichier verrou '%s' existe, pas de maintenance" -#: builtin/gc.c:932 +#: builtin/gc.c:1309 #, c-format msgid "task '%s' failed" msgstr "échec de la tâche '%s'" -#: builtin/gc.c:979 +#: builtin/gc.c:1389 #, c-format msgid "'%s' is not a valid task" msgstr "'%s' n'est pas une tâche valide" -#: builtin/gc.c:984 +#: builtin/gc.c:1394 #, 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:999 +#: builtin/gc.c:1409 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:1001 +#: builtin/gc.c:1410 +msgid "frequency" +msgstr "fréquence" + +#: builtin/gc.c:1411 +msgid "run tasks based on frequency" +msgstr "lancer les tâches selon une fréquence" + +#: builtin/gc.c:1414 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:1002 +#: builtin/gc.c:1415 msgid "task" msgstr "tâche" -#: builtin/gc.c:1003 +#: builtin/gc.c:1416 msgid "run a specific task" msgstr "lancer une tâche spécifique" -#: builtin/gc.c:1026 -msgid "git maintenance run [<options>]" -msgstr "git maintenance run [<options>]" +#: builtin/gc.c:1433 +msgid "use at most one of --auto and --schedule=<frequency>" +msgstr "--auto et --schedule=<fréquence> sont mutuellement exclusifs" + +#: builtin/gc.c:1467 +msgid "failed to run 'git config'" +msgstr "échec du lancement de 'git config'" -#: builtin/gc.c:1037 +#: builtin/gc.c:1512 +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:1525 +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:1544 +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:1550 +msgid "failed to open stdin of 'crontab'" +msgstr "échec à l'ouverture de stdin de 'crontab'" + +#: builtin/gc.c:1592 +msgid "'crontab' died" +msgstr "'crontab' est mort" + +#: builtin/gc.c:1605 +msgid "failed to add repo to global config" +msgstr "échec de l'ajout du dépôt à la config globale" + +#: builtin/gc.c:1615 +msgid "git maintenance <subcommand> [<options>]" +msgstr "git maintenance <subcommand> [<options>]" + +#: builtin/gc.c:1634 #, c-format msgid "invalid subcommand: %s" msgstr "sous-commande invalide : %s" @@ -15483,250 +15587,250 @@ msgstr "impossible de lire l'arbre (%s)" msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" -#: builtin/grep.c:725 +#: builtin/grep.c:736 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend une valeur numérique" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "search in index instead of in the work tree" msgstr "rechercher dans l'index plutôt que dans la copie de travail" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "recursively search in each submodule" msgstr "rechercher récursivement dans chaque sous-module" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:841 +#: builtin/grep.c:852 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:848 +#: builtin/grep.c:859 msgid "search in subdirectories (default)" msgstr "rechercher dans les sous-répertoires (défaut)" -#: builtin/grep.c:850 +#: builtin/grep.c:861 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:854 +#: builtin/grep.c:865 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:863 +#: builtin/grep.c:874 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:866 +#: builtin/grep.c:877 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:867 +#: builtin/grep.c:878 msgid "show column number of first match" msgstr "afficher le numéro de colonne de la première correspondance" -#: builtin/grep.c:868 +#: builtin/grep.c:879 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:871 +#: builtin/grep.c:882 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:873 +#: builtin/grep.c:884 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:875 +#: builtin/grep.c:886 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:878 +#: builtin/grep.c:889 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:880 +#: builtin/grep.c:891 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:883 +#: builtin/grep.c:894 msgid "show only matching parts of a line" msgstr "n'afficher que les parties correspondantes d'une ligne" -#: builtin/grep.c:885 +#: builtin/grep.c:896 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:886 +#: builtin/grep.c:897 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:888 +#: builtin/grep.c:899 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:890 +#: builtin/grep.c:901 msgid "show filename only once above matches from same file" msgstr "" "afficher le nom de fichier une fois au dessus des correspondances du même " "fichier" -#: builtin/grep.c:893 +#: builtin/grep.c:904 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:896 +#: builtin/grep.c:907 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:901 +#: builtin/grep.c:912 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:904 +#: builtin/grep.c:915 msgid "show a line with the function name before matches" msgstr "" "afficher une ligne avec le nom de la fonction avant les correspondances" -#: builtin/grep.c:906 +#: builtin/grep.c:917 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:909 +#: builtin/grep.c:920 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:911 +#: builtin/grep.c:922 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:913 +#: builtin/grep.c:924 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:925 +#: builtin/grep.c:936 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:927 +#: builtin/grep.c:938 msgid "show only matches from files that match all patterns" msgstr "" "n'afficher que les correspondances de fichiers qui correspondent à tous les " "motifs" -#: builtin/grep.c:929 +#: builtin/grep.c:940 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:933 +#: builtin/grep.c:944 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:933 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:937 +#: builtin/grep.c:948 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:1004 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "aucun motif fourni" -#: builtin/grep.c:1040 +#: builtin/grep.c:1050 msgid "--no-index or --untracked cannot be used with revs" msgstr "" "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions" -#: builtin/grep.c:1048 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "impossible de résoudre la révision : %s" -#: builtin/grep.c:1078 +#: builtin/grep.c:1088 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked non supportée avec --recurse-submodules" -#: builtin/grep.c:1082 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "option de combinaison invalide, ignore --threads" -#: builtin/grep.c:1085 builtin/pack-objects.c:3655 +#: builtin/grep.c:1095 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "pas de support des fils, ignore --threads" -#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 +#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/grep.c:1122 +#: builtin/grep.c:1132 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail" -#: builtin/grep.c:1148 +#: builtin/grep.c:1158 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index" -#: builtin/grep.c:1154 +#: builtin/grep.c:1164 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi" -#: builtin/grep.c:1162 +#: builtin/grep.c:1172 msgid "both --cached and trees are given" msgstr "--cached et des arbres sont fournis en même temps" @@ -15920,7 +16024,7 @@ msgstr "le paquet est trop grand pour la définition actuelle de off_t" msgid "pack exceeds maximum allowed size" msgstr "le paquet dépasse la taille maximale permise" -#: builtin/index-pack.c:342 builtin/repack.c:254 +#: builtin/index-pack.c:342 builtin/repack.c:286 #, c-format msgid "unable to create '%s'" msgstr "impossible de créer '%s'" @@ -16388,128 +16492,128 @@ msgstr "--trailer n'a aucune signification avec --only-input" msgid "no input file given for in-place editing" msgstr "aucun fichier en entrée pour l'éditon sur place" -#: builtin/log.c:56 +#: builtin/log.c:58 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]" -#: builtin/log.c:57 +#: builtin/log.c:59 msgid "git show [<options>] <object>..." msgstr "git show [<options>] <objet>..." -#: builtin/log.c:110 +#: builtin/log.c:112 #, c-format msgid "invalid --decorate option: %s" msgstr "option --decorate invalide : %s" -#: builtin/log.c:177 +#: builtin/log.c:179 msgid "show source" msgstr "afficher la source" -#: builtin/log.c:178 +#: builtin/log.c:180 msgid "Use mail map file" msgstr "Utiliser le fichier de correspondance de mail" -#: builtin/log.c:181 +#: builtin/log.c:183 msgid "only decorate refs that match <pattern>" msgstr "décorer seulement les références correspondant à <motif>" -#: builtin/log.c:183 +#: builtin/log.c:185 msgid "do not decorate refs that match <pattern>" msgstr "ne pas décorer les références correspondant à <motif>" -#: builtin/log.c:184 +#: builtin/log.c:186 msgid "decorate options" msgstr "décorer les options" -#: builtin/log.c:187 -msgid "Process line range n,m in file, counting from 1" -msgstr "" -"Traiter seulement l'intervalle de lignes n,m du fichier en commençant le " -"compte à 1" +#: builtin/log.c:189 +msgid "" +"Trace the evolution of line range <start>,<end> or function :<funcname> in " +"<file>" +msgstr "tracer l'évolution d'une plage <début>,<fin> ou d'une fonction <nom-de-fonction> dans <fichier>" + +#: builtin/log.c:212 +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:297 +#: builtin/log.c:302 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:555 +#: builtin/log.c:564 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:570 builtin/log.c:665 +#: builtin/log.c:579 builtin/log.c:674 #, c-format msgid "could not read object %s" msgstr "impossible de lire l'objet %s" -#: builtin/log.c:690 +#: builtin/log.c:699 #, c-format msgid "unknown type: %d" msgstr "type inconnu : %d" -#: builtin/log.c:839 +#: builtin/log.c:848 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s : couverture invalide pour le mode de description" -#: builtin/log.c:846 +#: builtin/log.c:855 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:965 -msgid "name of output directory is too long" -msgstr "le nom du répertoire de sortie est trop long" - -#: builtin/log.c:981 +#: builtin/log.c:984 #, c-format msgid "cannot open patch file %s" msgstr "impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:998 +#: builtin/log.c:1001 msgid "need exactly one range" msgstr "exactement une plage nécessaire" -#: builtin/log.c:1008 +#: builtin/log.c:1011 msgid "not a range" msgstr "ceci n'est pas une plage" -#: builtin/log.c:1172 +#: builtin/log.c:1175 msgid "cover letter needs email format" msgstr "la lettre de motivation doit être au format courriel" -#: builtin/log.c:1178 +#: builtin/log.c:1181 msgid "failed to create cover-letter file" msgstr "échec de création du fichier de lettre de motivation" -#: builtin/log.c:1259 +#: builtin/log.c:1262 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1286 +#: builtin/log.c:1289 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1344 +#: builtin/log.c:1347 msgid "two output directories?" msgstr "deux répertoires de sortie ?" -#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 +#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332 #, c-format msgid "unknown commit %s" msgstr "commit inconnu %s" -#: builtin/log.c:1506 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1509 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:1515 +#: builtin/log.c:1518 msgid "could not find exact merge base" msgstr "impossible de trouver la base de fusion exacte" -#: builtin/log.c:1525 +#: builtin/log.c:1528 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" @@ -16522,293 +16626,297 @@ msgstr "" "Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> " "manuellement" -#: builtin/log.c:1548 +#: builtin/log.c:1551 msgid "failed to find exact merge base" msgstr "échec à trouver la base de fusion exacte" -#: builtin/log.c:1565 +#: builtin/log.c:1568 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:1575 +#: builtin/log.c:1578 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:1633 +#: builtin/log.c:1636 msgid "cannot get patch id" msgstr "impossible d'obtenir l'id du patch" -#: builtin/log.c:1690 +#: builtin/log.c:1693 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:1692 +#: builtin/log.c:1695 #, 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:1736 +#: builtin/log.c:1739 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1739 +#: builtin/log.c:1742 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1743 +#: builtin/log.c:1746 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1745 +#: builtin/log.c:1748 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1747 +#: builtin/log.c:1750 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:1748 +#: builtin/log.c:1751 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1751 +#: builtin/log.c:1754 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:1753 +#: builtin/log.c:1756 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1755 +#: builtin/log.c:1758 +msgid "max length of output filename" +msgstr "taille maximum du nom du fichier de sortie" + +#: builtin/log.c:1760 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" -#: builtin/log.c:1758 +#: builtin/log.c:1763 msgid "cover-from-description-mode" msgstr "cover-from-description-mode" -#: builtin/log.c:1759 +#: builtin/log.c:1764 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:1761 +#: builtin/log.c:1766 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1764 +#: builtin/log.c:1769 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1767 +#: builtin/log.c:1772 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1770 +#: builtin/log.c:1775 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1772 +#: builtin/log.c:1777 msgid "output all-zero hash in From header" msgstr "écrire une empreinte à zéro dans l'entête From" -#: builtin/log.c:1774 +#: builtin/log.c:1779 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1776 +#: builtin/log.c:1781 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:1778 +#: builtin/log.c:1783 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1779 +#: builtin/log.c:1784 msgid "header" msgstr "en-tête" -#: builtin/log.c:1780 +#: builtin/log.c:1785 msgid "add email header" msgstr "ajouter l'en-tête de courriel" -#: builtin/log.c:1781 builtin/log.c:1782 +#: builtin/log.c:1786 builtin/log.c:1787 msgid "email" msgstr "courriel" -#: builtin/log.c:1781 +#: builtin/log.c:1786 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1782 +#: builtin/log.c:1787 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1783 +#: builtin/log.c:1788 msgid "ident" msgstr "ident" -#: builtin/log.c:1784 +#: builtin/log.c:1789 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:1786 +#: builtin/log.c:1791 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1787 +#: builtin/log.c:1792 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1788 builtin/log.c:1791 +#: builtin/log.c:1793 builtin/log.c:1796 msgid "boundary" msgstr "limite" -#: builtin/log.c:1789 +#: builtin/log.c:1794 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1792 +#: builtin/log.c:1797 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1796 +#: builtin/log.c:1801 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1798 +#: builtin/log.c:1803 msgid "signature" msgstr "signature" -#: builtin/log.c:1799 +#: builtin/log.c:1804 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1800 +#: builtin/log.c:1805 msgid "base-commit" msgstr "commit-de-base" -#: builtin/log.c:1801 +#: builtin/log.c:1806 msgid "add prerequisite tree info to the patch series" msgstr "Ajouter un arbre prérequis à la série de patchs" -#: builtin/log.c:1804 +#: builtin/log.c:1809 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1805 +#: builtin/log.c:1810 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1807 +#: builtin/log.c:1812 msgid "show progress while generating patches" msgstr "" "afficher la barre de progression durant la phase de génération des patchs" -#: builtin/log.c:1809 +#: builtin/log.c:1814 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:1812 +#: builtin/log.c:1817 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:1814 +#: builtin/log.c:1819 msgid "percentage by which creation is weighted" msgstr "pourcentage par lequel la création est pondérée" -#: builtin/log.c:1896 +#: builtin/log.c:1905 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/log.c:1911 +#: builtin/log.c:1920 msgid "-n and -k are mutually exclusive" msgstr "-n et -k sont mutuellement exclusifs" -#: builtin/log.c:1913 +#: builtin/log.c:1922 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs" -#: builtin/log.c:1921 +#: builtin/log.c:1930 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1923 +#: builtin/log.c:1932 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1925 +#: builtin/log.c:1934 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1958 -msgid "standard output, or directory, which one?" -msgstr "sortie standard, ou répertoire, lequel ?" +#: builtin/log.c:1956 +msgid "--stdout, --output, and --output-directory are mutually exclusive" +msgstr "--stdout, --output, et --output-directory sont mutuellement exclusifs" -#: builtin/log.c:2062 +#: builtin/log.c:2079 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:2066 +#: builtin/log.c:2083 msgid "Interdiff:" msgstr "Interdiff :" -#: builtin/log.c:2067 +#: builtin/log.c:2084 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contre v%d :" -#: builtin/log.c:2073 +#: builtin/log.c:2090 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiert --range-diff" -#: builtin/log.c:2077 +#: builtin/log.c:2094 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:2085 +#: builtin/log.c:2102 msgid "Range-diff:" msgstr "Diff-intervalle :" -#: builtin/log.c:2086 +#: builtin/log.c:2103 #, c-format msgid "Range-diff against v%d:" msgstr "Diff-intervalle contre v%d :" -#: builtin/log.c:2097 +#: builtin/log.c:2114 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:2133 +#: builtin/log.c:2150 msgid "Generating patches" msgstr "Génération des patchs" -#: builtin/log.c:2177 +#: builtin/log.c:2194 msgid "failed to create output files" msgstr "échec de création des fichiers en sortie" -#: builtin/log.c:2236 +#: builtin/log.c:2253 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:2290 +#: builtin/log.c:2307 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16937,7 +17045,7 @@ msgstr "" msgid "do not print remote URL" msgstr "ne pas afficher les URL distantes" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398 msgid "exec" msgstr "exécutable" @@ -17125,194 +17233,194 @@ msgstr "impossible de résoudre la référence '%s'" msgid "Merging %s with %s\n" msgstr "Fusion de %s avec %s\n" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<options>] [<commit>...]" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:58 +#: builtin/merge.c:59 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:120 +#: builtin/merge.c:122 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:143 +#: builtin/merge.c:145 #, c-format msgid "option `%s' requires a value" msgstr "le commutateur '%s' a besoin d'une valeur" -#: builtin/merge.c:189 +#: builtin/merge.c:198 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" -#: builtin/merge.c:190 +#: builtin/merge.c:199 #, c-format msgid "Available strategies are:" msgstr "Les stratégies disponibles sont :" -#: builtin/merge.c:195 +#: builtin/merge.c:204 #, c-format msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:246 builtin/pull.c:133 +#: builtin/merge.c:255 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "ne pas afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:249 builtin/pull.c:136 +#: builtin/merge.c:258 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:250 builtin/pull.c:139 +#: builtin/merge.c:259 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:252 builtin/pull.c:142 +#: builtin/merge.c:261 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "ajouter (au plus <n>) éléments du journal court au message de validation de " "la fusion" -#: builtin/merge.c:255 builtin/pull.c:148 +#: builtin/merge.c:264 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "créer une validation unique au lieu de faire une fusion" -#: builtin/merge.c:257 builtin/pull.c:151 +#: builtin/merge.c:266 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:259 builtin/pull.c:154 +#: builtin/merge.c:268 builtin/pull.c:154 msgid "edit message before committing" msgstr "éditer le message avant la validation" -#: builtin/merge.c:261 +#: builtin/merge.c:270 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:263 builtin/pull.c:161 +#: builtin/merge.c:272 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:267 builtin/pull.c:164 +#: builtin/merge.c:276 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "vérifier que le commit nommé a une signature GPG valide" -#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 +#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:269 builtin/pull.c:169 +#: builtin/merge.c:278 builtin/pull.c:169 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:279 builtin/pull.c:172 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:271 builtin/pull.c:173 +#: builtin/merge.c:280 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:273 +#: builtin/merge.c:282 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:280 +#: builtin/merge.c:289 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:282 +#: builtin/merge.c:291 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:284 +#: builtin/merge.c:293 msgid "continue the current in-progress merge" msgstr "continuer la fusion en cours" -#: builtin/merge.c:286 builtin/pull.c:180 +#: builtin/merge.c:295 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" -#: builtin/merge.c:293 +#: builtin/merge.c:302 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg" -#: builtin/merge.c:310 +#: builtin/merge.c:319 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:315 +#: builtin/merge.c:324 msgid "stash failed" msgstr "échec du remisage" -#: builtin/merge.c:320 +#: builtin/merge.c:329 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:342 builtin/merge.c:359 +#: builtin/merge.c:351 builtin/merge.c:368 msgid "read-tree failed" msgstr "read-tree a échoué" -#: builtin/merge.c:389 +#: builtin/merge.c:398 msgid " (nothing to squash)" msgstr " (rien à compresser)" -#: builtin/merge.c:400 +#: builtin/merge.c:409 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressée -- HEAD non mise à jour\n" -#: builtin/merge.c:450 +#: builtin/merge.c:459 #, 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:501 +#: builtin/merge.c:510 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:588 +#: builtin/merge.c:597 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:713 +#: builtin/merge.c:723 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:726 +#: builtin/merge.c:736 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:741 +#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:793 +#: builtin/merge.c:807 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:802 +#: builtin/merge.c:816 #, 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:808 +#: builtin/merge.c:822 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" @@ -17324,11 +17432,11 @@ msgstr "" "branche de sujet.\n" "\n" -#: builtin/merge.c:813 +#: builtin/merge.c:827 msgid "An empty message aborts the commit.\n" msgstr "Un message vide abandonne la validation.\n" -#: builtin/merge.c:816 +#: builtin/merge.c:830 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17337,74 +17445,74 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:869 +#: builtin/merge.c:883 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:884 +#: builtin/merge.c:898 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:945 +#: builtin/merge.c:959 #, 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:984 +#: builtin/merge.c:998 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:986 +#: builtin/merge.c:1000 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:988 +#: builtin/merge.c:1002 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:993 +#: builtin/merge.c:1007 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1050 +#: builtin/merge.c:1064 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1153 +#: builtin/merge.c:1167 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" -#: builtin/merge.c:1187 +#: builtin/merge.c:1201 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" -#: builtin/merge.c:1291 +#: builtin/merge.c:1311 msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" -#: builtin/merge.c:1295 +#: builtin/merge.c:1315 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:1313 +#: builtin/merge.c:1333 msgid "--quit expects no arguments" msgstr "--quit n'accepte pas d'argument" -#: builtin/merge.c:1326 +#: builtin/merge.c:1346 msgid "--continue expects no arguments" msgstr "--continue ne supporte aucun argument" -#: builtin/merge.c:1330 +#: builtin/merge.c:1350 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:1346 +#: builtin/merge.c:1366 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17412,7 +17520,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1353 +#: builtin/merge.c:1373 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17420,98 +17528,98 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1356 +#: builtin/merge.c:1376 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:1370 +#: builtin/merge.c:1390 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1372 +#: builtin/merge.c:1392 msgid "You cannot combine --squash with --commit." msgstr "Vous ne pouvez pas combiner --squash avec --commit." -#: builtin/merge.c:1388 +#: builtin/merge.c:1408 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:1405 +#: builtin/merge.c:1425 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:1407 +#: builtin/merge.c:1427 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:1412 +#: builtin/merge.c:1432 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1414 +#: builtin/merge.c:1434 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:1495 +#: builtin/merge.c:1515 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1504 +#: builtin/merge.c:1524 msgid "Already up to date." msgstr "Déjà à jour." -#: builtin/merge.c:1514 +#: builtin/merge.c:1534 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1560 +#: builtin/merge.c:1580 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1567 +#: builtin/merge.c:1587 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1612 msgid "Already up to date. Yeeah!" msgstr "Déjà à jour. Ouais !" -#: builtin/merge.c:1598 +#: builtin/merge.c:1618 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1626 builtin/merge.c:1691 +#: builtin/merge.c:1646 builtin/merge.c:1711 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1630 +#: builtin/merge.c:1650 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1702 #, 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:1684 +#: builtin/merge.c:1704 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1693 +#: builtin/merge.c:1713 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Utilisation de %s pour préparer la résolution à la main.\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1727 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -17661,7 +17769,7 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" @@ -18124,7 +18232,7 @@ msgstr "références-notes" msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" -#: builtin/notes.c:1034 builtin/stash.c:1605 +#: builtin/notes.c:1034 builtin/stash.c:1604 #, c-format msgid "unknown subcommand: %s" msgstr "sous-commande inconnue : %s" @@ -18580,7 +18688,7 @@ msgstr "Options relatives à la fusion" msgid "incorporate changes by rebasing rather than merging" msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" -#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" @@ -18669,15 +18777,15 @@ msgstr "" "configuration\n" "pour la branche actuelle, vous devez spécifier la branche avec la commande." -#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1246 msgid "You are not currently on a branch." msgstr "Vous n'êtes actuellement sur aucune branche." -#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 msgid "Please specify which branch you want to rebase against." msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser." -#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 msgid "Please specify which branch you want to merge with." msgstr "Veuillez spécifier une branche avec laquelle fusionner." @@ -18686,20 +18794,19 @@ msgid "See git-pull(1) for details." msgstr "Référez-vous à git-pull(1) pour de plus amples détails." #: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 -#: builtin/rebase.c:1246 git-parse-remote.sh:64 +#: builtin/rebase.c:1252 msgid "<remote>" msgstr "<distant>" #: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 -#: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branche>" -#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1244 msgid "There is no tracking information for the current branch." msgstr "Pas d'information de suivi distant pour la branche actuelle." -#: builtin/pull.c:493 git-parse-remote.sh:95 +#: builtin/pull.c:493 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" @@ -18721,25 +18828,25 @@ msgstr "" msgid "unable to access commit %s" msgstr "impossible d'accéder le commit %s" -#: builtin/pull.c:894 +#: builtin/pull.c:915 msgid "ignoring --verify-signatures for rebase" msgstr "--verify-signatures est ignoré pour un rebasage" -#: builtin/pull.c:954 +#: builtin/pull.c:972 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:958 +#: builtin/pull.c:976 msgid "pull with rebase" msgstr "tirer avec un rebasage" -#: builtin/pull.c:959 +#: builtin/pull.c:977 msgid "please commit or stash them." msgstr "veuillez les valider ou les remiser." -#: builtin/pull.c:984 +#: builtin/pull.c:1002 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18750,7 +18857,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:990 +#: builtin/pull.c:1008 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18767,15 +18874,15 @@ msgstr "" "$ git reset --hard\n" "pour régénérer." -#: builtin/pull.c:1005 +#: builtin/pull.c:1023 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tête vide." -#: builtin/pull.c:1009 +#: builtin/pull.c:1027 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." -#: builtin/pull.c:1017 +#: builtin/pull.c:1041 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossible de rebaser avec des modifications de sous-modules enregistrées " @@ -18946,100 +19053,116 @@ msgstr "" "pointer\n" "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" -#: builtin/push.c:351 +#: builtin/push.c:294 +msgid "" +"Updates were rejected because the tip of the remote-tracking\n" +"branch has been updated since the last checkout. You may want\n" +"to integrate those changes locally (e.g., 'git pull ...')\n" +"before forcing an update.\n" +msgstr "" +"Les mises à jour ont été rejetées, car la pointe de la branche\n" +"de suivi a été mise à jour depuis la dernière extraction. Intégrez\n" +"ces changements localement (par exemple 'git pull ...') avant de\n" +"forcer à nouveau une mise à jour.\n" + +#: builtin/push.c:364 #, c-format msgid "Pushing to %s\n" msgstr "Poussée vers %s\n" -#: builtin/push.c:358 +#: builtin/push.c:371 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:532 +#: builtin/push.c:553 msgid "repository" msgstr "dépôt" -#: builtin/push.c:533 builtin/send-pack.c:183 +#: builtin/push.c:554 builtin/send-pack.c:189 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:534 builtin/send-pack.c:185 +#: builtin/push.c:555 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:536 +#: builtin/push.c:557 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:537 +#: builtin/push.c:558 msgid "push tags (can't be used with --all or --mirror)" msgstr "" "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)" -#: builtin/push.c:540 builtin/send-pack.c:186 +#: builtin/push.c:561 builtin/send-pack.c:192 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:541 builtin/send-pack.c:198 +#: builtin/push.c:562 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<nom-de-ref>:<attendu>" -#: builtin/push.c:542 builtin/send-pack.c:199 +#: builtin/push.c:563 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur" -#: builtin/push.c:545 +#: builtin/push.c:566 builtin/send-pack.c:208 +msgid "require remote updates to be integrated locally" +msgstr "exiger des mises à jours distantes pour une intégration locale" + +#: builtin/push.c:569 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:546 builtin/send-pack.c:193 +#: builtin/push.c:570 builtin/send-pack.c:199 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 -#: builtin/send-pack.c:181 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/send-pack.c:187 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:549 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:552 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:554 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:555 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:557 builtin/send-pack.c:187 +#: builtin/push.c:581 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "signer la poussée avec GPG" -#: builtin/push.c:559 builtin/send-pack.c:194 +#: builtin/push.c:583 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "demande une transaction atomique sur le serveur distant" -#: builtin/push.c:577 +#: builtin/push.c:601 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:579 +#: builtin/push.c:603 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" -#: builtin/push.c:599 +#: builtin/push.c:623 #, c-format msgid "bad repository '%s'" msgstr "mauvais dépôt '%s'" -#: builtin/push.c:600 +#: builtin/push.c:624 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -19061,27 +19184,27 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:615 +#: builtin/push.c:639 msgid "--all and --tags are incompatible" msgstr "--all et --tags sont incompatibles" -#: builtin/push.c:617 +#: builtin/push.c:641 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:621 +#: builtin/push.c:645 msgid "--mirror and --tags are incompatible" msgstr "--mirror et --tags sont incompatibles" -#: builtin/push.c:623 +#: builtin/push.c:647 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:626 +#: builtin/push.c:650 msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:630 +#: builtin/push.c:657 msgid "push options must not have new line characters" msgstr "" "les options de poussée ne peuvent pas contenir de caractères de nouvelle " @@ -19232,193 +19355,193 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 +#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244 #, c-format msgid "unusable todo list: '%s'" msgstr "liste à faire inutilisable : '%s'" -#: builtin/rebase.c:304 +#: builtin/rebase.c:310 #, c-format msgid "could not create temporary %s" msgstr "impossible de créer un fichier temporaire %s" -#: builtin/rebase.c:310 +#: builtin/rebase.c:316 msgid "could not mark as interactive" msgstr "impossible de marquer comme interactif" -#: builtin/rebase.c:364 +#: builtin/rebase.c:369 msgid "could not generate todo list" msgstr "impossible de générer la liste à-faire" -#: builtin/rebase.c:405 +#: builtin/rebase.c:411 msgid "a base commit must be provided with --upstream or --onto" msgstr "un commit de base doit être fourni avec --upstream ou --onto" -#: builtin/rebase.c:474 +#: builtin/rebase.c:480 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<options>]" -#: builtin/rebase.c:487 builtin/rebase.c:1382 +#: builtin/rebase.c:493 builtin/rebase.c:1388 msgid "keep commits which start empty" msgstr "conserver les commits qui commencent vides" -#: builtin/rebase.c:491 builtin/revert.c:128 +#: builtin/rebase.c:497 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "autoriser les validations avec des messages vides" -#: builtin/rebase.c:493 +#: builtin/rebase.c:499 msgid "rebase merge commits" msgstr "rebaser les commits de fusion" -#: builtin/rebase.c:495 +#: builtin/rebase.c:501 msgid "keep original branch points of cousins" msgstr "conserver les points de branchement de cousins originaux" -#: builtin/rebase.c:497 +#: builtin/rebase.c:503 msgid "move commits that begin with squash!/fixup!" msgstr "déplacer les commits qui commencent par squash!/fixup!" -#: builtin/rebase.c:498 +#: builtin/rebase.c:504 msgid "sign commits" msgstr "signer les commits" -#: builtin/rebase.c:500 builtin/rebase.c:1321 +#: builtin/rebase.c:506 builtin/rebase.c:1327 msgid "display a diffstat of what changed upstream" msgstr "afficher un diffstat de ce qui a changé en amont" -#: builtin/rebase.c:502 +#: builtin/rebase.c:508 msgid "continue rebase" msgstr "continuer le rebasage" -#: builtin/rebase.c:504 +#: builtin/rebase.c:510 msgid "skip commit" msgstr "sauter le commit" -#: builtin/rebase.c:505 +#: builtin/rebase.c:511 msgid "edit the todo list" msgstr "éditer la liste à-faire" -#: builtin/rebase.c:507 +#: builtin/rebase.c:513 msgid "show the current patch" msgstr "afficher le patch courant" -#: builtin/rebase.c:510 +#: builtin/rebase.c:516 msgid "shorten commit ids in the todo list" msgstr "raccourcir les identifiants de commits dans la liste à-faire" -#: builtin/rebase.c:512 +#: builtin/rebase.c:518 msgid "expand commit ids in the todo list" msgstr "étendre les identifiants de commit dans la liste à-faire" -#: builtin/rebase.c:514 +#: builtin/rebase.c:520 msgid "check the todo list" msgstr "vérifier la liste à-faire" -#: builtin/rebase.c:516 +#: builtin/rebase.c:522 msgid "rearrange fixup/squash lines" msgstr "réarranger les lignes fixup/squash" -#: builtin/rebase.c:518 +#: builtin/rebase.c:524 msgid "insert exec commands in todo list" msgstr "insérer les commandes exec dans la liste à-faire" -#: builtin/rebase.c:519 +#: builtin/rebase.c:525 msgid "onto" msgstr "sur" -#: builtin/rebase.c:522 +#: builtin/rebase.c:528 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:522 +#: builtin/rebase.c:528 msgid "restrict revision" msgstr "restreindre la révision" -#: builtin/rebase.c:524 +#: builtin/rebase.c:530 msgid "squash-onto" msgstr "écraser-sur" -#: builtin/rebase.c:525 +#: builtin/rebase.c:531 msgid "squash onto" msgstr "écraser sur" -#: builtin/rebase.c:527 +#: builtin/rebase.c:533 msgid "the upstream commit" msgstr "le commit amont" -#: builtin/rebase.c:529 +#: builtin/rebase.c:535 msgid "head-name" msgstr "nom du head" -#: builtin/rebase.c:529 +#: builtin/rebase.c:535 msgid "head name" msgstr "nom du head" -#: builtin/rebase.c:534 +#: builtin/rebase.c:540 msgid "rebase strategy" msgstr "stratégie de rebasage" -#: builtin/rebase.c:535 +#: builtin/rebase.c:541 msgid "strategy-opts" msgstr "options de stratégie" -#: builtin/rebase.c:536 +#: builtin/rebase.c:542 msgid "strategy options" msgstr "options de stratégie" -#: builtin/rebase.c:537 +#: builtin/rebase.c:543 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:538 +#: builtin/rebase.c:544 msgid "the branch or commit to checkout" msgstr "la branche ou le commit à extraire" -#: builtin/rebase.c:539 +#: builtin/rebase.c:545 msgid "onto-name" msgstr "sur-le-nom" -#: builtin/rebase.c:539 +#: builtin/rebase.c:545 msgid "onto name" msgstr "sur le nom" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 msgid "the command to run" msgstr "la commande à lancer" -#: builtin/rebase.c:543 builtin/rebase.c:1415 +#: builtin/rebase.c:549 builtin/rebase.c:1421 msgid "automatically re-schedule any `exec` that fails" msgstr "re-planifier automatiquement tout `exec` qui échoue" -#: builtin/rebase.c:559 +#: builtin/rebase.c:565 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges" -#: builtin/rebase.c:575 +#: builtin/rebase.c:581 #, c-format msgid "%s requires the merge backend" msgstr "%s requiert un moteur de fusion" -#: builtin/rebase.c:618 +#: builtin/rebase.c:624 #, c-format msgid "could not get 'onto': '%s'" msgstr "impossible d'accéder 'onto' : '%s'" -#: builtin/rebase.c:635 +#: builtin/rebase.c:641 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head invalide : '%s'" -#: builtin/rebase.c:660 +#: builtin/rebase.c:666 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "allow_rerere_autoupdate invalide ignoré : '%s'" -#: builtin/rebase.c:805 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:811 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -19432,7 +19555,7 @@ msgstr "" "arrêter\n" "et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"." -#: builtin/rebase.c:888 +#: builtin/rebase.c:894 #, c-format msgid "" "\n" @@ -19451,7 +19574,7 @@ msgstr "" "\n" "Résultat, git ne peut pas les rebaser." -#: builtin/rebase.c:1214 +#: builtin/rebase.c:1220 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -19460,7 +19583,7 @@ msgstr "" "type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), " "\"keep\" (garder) et \"ask\" (demander)." -#: builtin/rebase.c:1232 +#: builtin/rebase.c:1238 #, c-format msgid "" "%s\n" @@ -19477,7 +19600,7 @@ msgstr "" " git rebase '<branche>'\n" "\n" -#: builtin/rebase.c:1248 +#: builtin/rebase.c:1254 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19491,149 +19614,149 @@ msgstr "" " git branch --set-upstream-to=%s/<branche> %s\n" "\n" -#: builtin/rebase.c:1278 +#: builtin/rebase.c:1284 msgid "exec commands cannot contain newlines" msgstr "les commandes exec ne peut pas contenir de retour à la ligne" -#: builtin/rebase.c:1282 +#: builtin/rebase.c:1288 msgid "empty exec command" msgstr "commande exec vide" -#: builtin/rebase.c:1312 +#: builtin/rebase.c:1318 msgid "rebase onto given branch instead of upstream" msgstr "rebaser sur la branche %s au lieu de la branche amont" -#: builtin/rebase.c:1314 +#: builtin/rebase.c:1320 msgid "use the merge-base of upstream and branch as the current base" msgstr "" "utiliser la base de fusion de l'amont et la branche comme base actuelle" -#: builtin/rebase.c:1316 +#: builtin/rebase.c:1322 msgid "allow pre-rebase hook to run" msgstr "permettre le lancement du crochet pre-rebase" -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1324 msgid "be quiet. implies --no-stat" msgstr "être silencieux. implique --no-stat" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1330 msgid "do not show diffstat of what changed upstream" msgstr "ne pas afficher un diffstat de ce qui a changé en amont" -#: builtin/rebase.c:1327 -msgid "add a Signed-off-by: line to each commit" +#: builtin/rebase.c:1333 +msgid "add a Signed-off-by trailer to each commit" msgstr "ajouter une ligne Signed-off-by à chaque message de validation" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1336 msgid "make committer date match author date" msgstr "mettre la date de validateur à la date auteur" -#: builtin/rebase.c:1332 +#: builtin/rebase.c:1338 msgid "ignore author date and use current date" msgstr "ignorer la date d'auteur et utilise la date actuelle" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1340 msgid "synonym of --reset-author-date" msgstr "synonyme pour --reset-author-date" -#: builtin/rebase.c:1336 builtin/rebase.c:1340 +#: builtin/rebase.c:1342 builtin/rebase.c:1346 msgid "passed to 'git apply'" msgstr "passé jusqu'à git-apply" -#: builtin/rebase.c:1338 +#: builtin/rebase.c:1344 msgid "ignore changes in whitespace" msgstr "ignorer des modifications d'espaces" -#: builtin/rebase.c:1342 builtin/rebase.c:1345 +#: builtin/rebase.c:1348 builtin/rebase.c:1351 msgid "cherry-pick all commits, even if unchanged" msgstr "picorer tous les commits, même sans modifiant" -#: builtin/rebase.c:1347 +#: builtin/rebase.c:1353 msgid "continue" msgstr "continuer" -#: builtin/rebase.c:1350 +#: builtin/rebase.c:1356 msgid "skip current patch and continue" msgstr "sauter le patch courant et continuer" -#: builtin/rebase.c:1352 +#: builtin/rebase.c:1358 msgid "abort and check out the original branch" msgstr "abandonner et extraire la branche d'origine" -#: builtin/rebase.c:1355 +#: builtin/rebase.c:1361 msgid "abort but keep HEAD where it is" msgstr "abandonne mais garde HEAD où il est" -#: builtin/rebase.c:1356 +#: builtin/rebase.c:1362 msgid "edit the todo list during an interactive rebase" msgstr "éditer la liste à faire lors d'un rebasage interactif" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1365 msgid "show the patch file being applied or merged" msgstr "afficher le patch en cours d'application ou de fusion" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1368 msgid "use apply strategies to rebase" msgstr "utiliser des stratégies d'application pour rebaser" -#: builtin/rebase.c:1366 +#: builtin/rebase.c:1372 msgid "use merging strategies to rebase" msgstr "utiliser des stratégies de fusion pour rebaser" -#: builtin/rebase.c:1370 +#: builtin/rebase.c:1376 msgid "let the user edit the list of commits to rebase" msgstr "laisser l'utilisateur éditer la liste des commits à rebaser" -#: builtin/rebase.c:1374 +#: builtin/rebase.c:1380 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer" -#: builtin/rebase.c:1379 +#: builtin/rebase.c:1385 msgid "how to handle commits that become empty" msgstr "comment gérer les commits qui deviennent vides" -#: builtin/rebase.c:1386 +#: builtin/rebase.c:1392 msgid "move commits that begin with squash!/fixup! under -i" msgstr "déplace les commits qui commencent par squash!/fixup! sous -i" -#: builtin/rebase.c:1393 +#: builtin/rebase.c:1399 msgid "add exec lines after each commit of the editable list" msgstr "ajouter les lignes exec après chaque commit de la liste éditable" -#: builtin/rebase.c:1397 +#: builtin/rebase.c:1403 msgid "allow rebasing commits with empty messages" msgstr "autoriser les commits de rebasage avec des messages vides" -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1407 msgid "try to rebase merges instead of skipping them" msgstr "essayer de rebaser les fusions au lieu de les garder" -#: builtin/rebase.c:1404 +#: builtin/rebase.c:1410 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1412 msgid "use the given merge strategy" msgstr "utiliser la stratégie de fusion indiquée" -#: builtin/rebase.c:1408 builtin/revert.c:115 +#: builtin/rebase.c:1414 builtin/revert.c:115 msgid "option" msgstr "option" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1415 msgid "pass the argument through to the merge strategy" msgstr "passer les arguments jusqu'à la stratégie de fusion" -#: builtin/rebase.c:1412 +#: builtin/rebase.c:1418 msgid "rebase all reachable commits up to the root(s)" msgstr "rebaser tous les objets inatteignables depuis les racines" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1423 msgid "apply all changes, even those already present upstream" msgstr "" "appliquer toutes les modifications, même celles déjà présentes en amont" -#: builtin/rebase.c:1434 +#: builtin/rebase.c:1440 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -19641,44 +19764,44 @@ msgstr "" "les support de rebase.useBuiltin a été supprimé !\n" "Voir son entrée dans 'git help config' pour plus de détails." -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1446 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser." -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1487 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges est déconseillé. Utilisez --rebase-merges à la " "place." -#: builtin/rebase.c:1486 +#: builtin/rebase.c:1492 msgid "cannot combine '--keep-base' with '--onto'" msgstr "impossible de combiner '--keep-base' avec '--onto'" -#: builtin/rebase.c:1488 +#: builtin/rebase.c:1494 msgid "cannot combine '--keep-base' with '--root'" msgstr "impossible de combiner '--keep-base' avec '--root'" -#: builtin/rebase.c:1492 +#: builtin/rebase.c:1498 msgid "cannot combine '--root' with '--fork-point'" msgstr "impossible de combiner '--root' avec '--fork-point'" -#: builtin/rebase.c:1495 +#: builtin/rebase.c:1501 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: builtin/rebase.c:1499 +#: builtin/rebase.c:1505 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'action --edit-todo peut seulement être utilisée lors d'un rebasage " "interactif." -#: builtin/rebase.c:1522 +#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1540 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19686,16 +19809,16 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: builtin/rebase.c:1553 +#: builtin/rebase.c:1559 msgid "could not discard worktree changes" msgstr "Impossible de supprimer les changements de l'arbre de travail" -#: builtin/rebase.c:1572 +#: builtin/rebase.c:1578 #, c-format msgid "could not move back to %s" msgstr "Impossible de revenir à %s" -#: builtin/rebase.c:1618 +#: builtin/rebase.c:1624 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19717,136 +19840,136 @@ msgstr "" "chose\n" "d'important ici.\n" -#: builtin/rebase.c:1646 +#: builtin/rebase.c:1652 msgid "switch `C' expects a numerical value" msgstr "l'option `C' attend un valeur numérique" -#: builtin/rebase.c:1688 +#: builtin/rebase.c:1694 #, c-format msgid "Unknown mode: %s" msgstr "mode inconnu : %s" -#: builtin/rebase.c:1727 +#: builtin/rebase.c:1733 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiert --merge ou --interactive" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1763 msgid "cannot combine apply options with merge options" msgstr "" "impossible de combiner les options d'application avec les options de fusion" -#: builtin/rebase.c:1770 +#: builtin/rebase.c:1776 #, c-format msgid "Unknown rebase backend: %s" msgstr "backend de rebasage inconnu : %s" -#: builtin/rebase.c:1795 +#: builtin/rebase.c:1806 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec requiert --exec ou --interactive" -#: builtin/rebase.c:1815 +#: builtin/rebase.c:1826 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'" -#: builtin/rebase.c:1819 +#: builtin/rebase.c:1830 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "erreur : impossible de combiner '--preserve-merges' avec '--reschedule-" "failed-exec'" -#: builtin/rebase.c:1843 +#: builtin/rebase.c:1854 #, c-format msgid "invalid upstream '%s'" msgstr "amont invalide '%s'" -#: builtin/rebase.c:1849 +#: builtin/rebase.c:1860 msgid "Could not create new root commit" msgstr "Impossible de créer un nouveau commit racine" -#: builtin/rebase.c:1875 +#: builtin/rebase.c:1886 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s': exactement une base de fusion nécessaire avec une branche" -#: builtin/rebase.c:1878 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': exactement une base de fusion nécessaire" -#: builtin/rebase.c:1886 +#: builtin/rebase.c:1897 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "ne pointe pas sur une validation valide : '%s'" -#: builtin/rebase.c:1912 +#: builtin/rebase.c:1923 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal : pas de branche ou commit '%s'" -#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/rebase.c:1931 builtin/submodule--helper.c:40 #: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" -#: builtin/rebase.c:1931 +#: builtin/rebase.c:1942 msgid "Could not resolve HEAD to a revision" msgstr "Impossible de résoudre le commit HEAD vers un révision" -#: builtin/rebase.c:1952 +#: builtin/rebase.c:1963 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: builtin/rebase.c:1988 +#: builtin/rebase.c:1999 #, c-format msgid "could not switch to %s" msgstr "Impossible de basculer vers %s" -#: builtin/rebase.c:1999 +#: builtin/rebase.c:2010 msgid "HEAD is up to date." msgstr "HEAD est à jour." -#: builtin/rebase.c:2001 +#: builtin/rebase.c:2012 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La branche courante %s est à jour.\n" -#: builtin/rebase.c:2009 +#: builtin/rebase.c:2020 msgid "HEAD is up to date, rebase forced." msgstr "HEAD est à jour, rebasage forcé." -#: builtin/rebase.c:2011 +#: builtin/rebase.c:2022 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "La branche courante %s est à jour, rebasage forcé.\n" -#: builtin/rebase.c:2019 +#: builtin/rebase.c:2030 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: builtin/rebase.c:2026 +#: builtin/rebase.c:2037 #, c-format msgid "Changes to %s:\n" msgstr "Changements vers %s :\n" -#: builtin/rebase.c:2029 +#: builtin/rebase.c:2040 #, c-format msgid "Changes from %s to %s:\n" msgstr "Changements de %s sur %s :\n" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:2065 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Rembobinage préalable de head pour pouvoir rejouer votre travail par-" "dessus...\n" -#: builtin/rebase.c:2063 +#: builtin/rebase.c:2074 msgid "Could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: builtin/rebase.c:2072 +#: builtin/rebase.c:2083 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rapide de %s sur %s.\n" @@ -19855,7 +19978,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:1224 +#: builtin/receive-pack.c:1276 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" @@ -19885,7 +20008,7 @@ msgstr "" "Pour éliminer ce message et conserver le comportement par défaut,\n" "réglez « receive.denyCurrentBranch » à 'refuse'." -#: builtin/receive-pack.c:1244 +#: builtin/receive-pack.c:1296 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" @@ -19905,11 +20028,11 @@ msgstr "" "\n" "Pour éliminer ce message, réglez-le à 'refuse'." -#: builtin/receive-pack.c:2422 +#: builtin/receive-pack.c:2481 msgid "quiet" msgstr "quiet" -#: builtin/receive-pack.c:2436 +#: builtin/receive-pack.c:2495 msgid "You must specify a directory." msgstr "Vous devez spécifier un répertoire." @@ -20110,42 +20233,37 @@ msgstr "" "spécifier les branches à suivre n'a de sens qu'avec des miroirs de " "rapatriement" -#: builtin/remote.c:195 builtin/remote.c:697 +#: builtin/remote.c:195 builtin/remote.c:700 #, c-format msgid "remote %s already exists." msgstr "la distante %s existe déjà." -#: builtin/remote.c:199 builtin/remote.c:701 -#, c-format -msgid "'%s' is not a valid remote name" -msgstr "'%s' n'est pas un nom valide de distante" - -#: builtin/remote.c:239 +#: builtin/remote.c:240 #, c-format msgid "Could not setup master '%s'" msgstr "Impossible de paramétrer la maîtresse '%s'" -#: builtin/remote.c:354 +#: builtin/remote.c:355 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" "Impossible d'obtenir une correspondance distante pour la spécification de " "référence %s" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:454 builtin/remote.c:462 msgid "(matching)" msgstr "(correspond)" -#: builtin/remote.c:465 +#: builtin/remote.c:466 msgid "(delete)" msgstr "(supprimer)" -#: builtin/remote.c:654 +#: builtin/remote.c:655 #, c-format msgid "could not set '%s'" msgstr "impossible d'assigner '%s'" -#: builtin/remote.c:659 +#: builtin/remote.c:660 #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -20156,17 +20274,17 @@ msgstr "" "\t%s%d\n" "nomme à présent le distant inexistant '%s'" -#: builtin/remote.c:690 builtin/remote.c:833 builtin/remote.c:941 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 #, c-format msgid "No such remote: '%s'" msgstr "Pas de serveur remote : '%s'" -#: builtin/remote.c:707 +#: builtin/remote.c:710 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Impossible de renommer la section de configuration '%s' en '%s'" -#: builtin/remote.c:727 +#: builtin/remote.c:730 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -20177,17 +20295,17 @@ msgstr "" "\t%s\n" "\tVeuillez mettre à jour la configuration manuellement si nécessaire." -#: builtin/remote.c:767 +#: builtin/remote.c:770 #, c-format msgid "deleting '%s' failed" msgstr "échec de suppression de '%s'" -#: builtin/remote.c:801 +#: builtin/remote.c:804 #, c-format msgid "creating '%s' failed" msgstr "échec de création de '%s'" -#: builtin/remote.c:877 +#: builtin/remote.c:882 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -20202,118 +20320,118 @@ msgstr[1] "" "supprimées ;\n" "pour les supprimer, utilisez :" -#: builtin/remote.c:891 +#: builtin/remote.c:896 #, c-format msgid "Could not remove config section '%s'" msgstr "Impossible de supprimer la section de configuration '%s'" -#: builtin/remote.c:994 +#: builtin/remote.c:999 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)" -#: builtin/remote.c:997 +#: builtin/remote.c:1002 msgid " tracked" msgstr " suivi" -#: builtin/remote.c:999 +#: builtin/remote.c:1004 msgid " stale (use 'git remote prune' to remove)" msgstr " dépassé (utilisez 'git remote prune' pour supprimer)" -#: builtin/remote.c:1001 +#: builtin/remote.c:1006 msgid " ???" msgstr " ???" -#: builtin/remote.c:1042 +#: builtin/remote.c:1047 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche" -#: builtin/remote.c:1051 +#: builtin/remote.c:1056 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebase de manière interactive sur la distante %s" -#: builtin/remote.c:1053 +#: builtin/remote.c:1058 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "rebase de manière interactive (avec fusions) sur la distante %s" -#: builtin/remote.c:1056 +#: builtin/remote.c:1061 #, c-format msgid "rebases onto remote %s" msgstr "rebase sur la distante %s" -#: builtin/remote.c:1060 +#: builtin/remote.c:1065 #, c-format msgid " merges with remote %s" msgstr " fusionne avec la distante %s" -#: builtin/remote.c:1063 +#: builtin/remote.c:1068 #, c-format msgid "merges with remote %s" msgstr "fusionne avec la distante %s" -#: builtin/remote.c:1066 +#: builtin/remote.c:1071 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s et avec la distante %s\n" -#: builtin/remote.c:1109 +#: builtin/remote.c:1114 msgid "create" msgstr "créer" -#: builtin/remote.c:1112 +#: builtin/remote.c:1117 msgid "delete" msgstr "supprimer" -#: builtin/remote.c:1116 +#: builtin/remote.c:1121 msgid "up to date" msgstr "à jour" -#: builtin/remote.c:1119 +#: builtin/remote.c:1124 msgid "fast-forwardable" msgstr "peut être mis à jour en avance rapide" -#: builtin/remote.c:1122 +#: builtin/remote.c:1127 msgid "local out of date" msgstr "le local n'est pas à jour" -#: builtin/remote.c:1129 +#: builtin/remote.c:1134 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s force vers %-*s (%s)" -#: builtin/remote.c:1132 +#: builtin/remote.c:1137 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s pousse vers %-*s (%s)" -#: builtin/remote.c:1136 +#: builtin/remote.c:1141 #, c-format msgid " %-*s forces to %s" msgstr " %-*s force vers %s" -#: builtin/remote.c:1139 +#: builtin/remote.c:1144 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s pousse vers %s" -#: builtin/remote.c:1207 +#: builtin/remote.c:1212 msgid "do not query remotes" msgstr "ne pas interroger les distantes" -#: builtin/remote.c:1234 +#: builtin/remote.c:1239 #, c-format msgid "* remote %s" msgstr "* distante %s" -#: builtin/remote.c:1235 +#: builtin/remote.c:1240 #, c-format msgid " Fetch URL: %s" msgstr " URL de rapatriement : %s" -#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 +#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 msgid "(no URL)" msgstr "(pas d'URL)" @@ -20321,25 +20439,25 @@ msgstr "(pas d'URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1250 builtin/remote.c:1252 +#: builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " Push URL: %s" msgstr " URL push : %s" -#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 +#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 #, c-format msgid " HEAD branch: %s" msgstr " Branche HEAD : %s" -#: builtin/remote.c:1254 +#: builtin/remote.c:1259 msgid "(not queried)" msgstr "(non demandé)" -#: builtin/remote.c:1256 +#: builtin/remote.c:1261 msgid "(unknown)" msgstr "(inconnu)" -#: builtin/remote.c:1260 +#: builtin/remote.c:1265 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -20347,154 +20465,154 @@ msgstr "" " Branche HEAD (la HEAD distante est ambiguë, peut être l'une des " "suivantes) :\n" -#: builtin/remote.c:1272 +#: builtin/remote.c:1277 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branche distante :%s" msgstr[1] " Branches distantes :%s" -#: builtin/remote.c:1275 builtin/remote.c:1301 +#: builtin/remote.c:1280 builtin/remote.c:1306 msgid " (status not queried)" msgstr " (état non demandé)" -#: builtin/remote.c:1284 +#: builtin/remote.c:1289 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branche locale configurée pour 'git pull' :" msgstr[1] " Branches locales configurées pour 'git pull' :" -#: builtin/remote.c:1292 +#: builtin/remote.c:1297 msgid " Local refs will be mirrored by 'git push'" msgstr " Les références locales seront reflétées par 'git push'" -#: builtin/remote.c:1298 +#: builtin/remote.c:1303 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Référence locale configurée pour 'git push'%s :" msgstr[1] " Références locales configurées pour 'git push'%s :" -#: builtin/remote.c:1319 +#: builtin/remote.c:1324 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "définir refs/remotes/<nom>/HEAD selon la distante" -#: builtin/remote.c:1321 +#: builtin/remote.c:1326 msgid "delete refs/remotes/<name>/HEAD" msgstr "supprimer refs/remotes/<nom>/HEAD" -#: builtin/remote.c:1336 +#: builtin/remote.c:1341 msgid "Cannot determine remote HEAD" msgstr "Impossible de déterminer la HEAD distante" -#: builtin/remote.c:1338 +#: builtin/remote.c:1343 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Il y a de multiples branches HEAD distantes. Veuillez en choisir une " "explicitement avec :" -#: builtin/remote.c:1348 +#: builtin/remote.c:1353 #, c-format msgid "Could not delete %s" msgstr "Impossible de supprimer %s" -#: builtin/remote.c:1356 +#: builtin/remote.c:1361 #, c-format msgid "Not a valid ref: %s" msgstr "Référence non valide : %s" -#: builtin/remote.c:1358 +#: builtin/remote.c:1363 #, c-format msgid "Could not setup %s" msgstr "Impossible de paramétrer %s" -#: builtin/remote.c:1376 +#: builtin/remote.c:1381 #, c-format msgid " %s will become dangling!" msgstr " %s se retrouvera en suspens !" -#: builtin/remote.c:1377 +#: builtin/remote.c:1382 #, c-format msgid " %s has become dangling!" msgstr " %s se retrouve en suspens !" -#: builtin/remote.c:1387 +#: builtin/remote.c:1392 #, c-format msgid "Pruning %s" msgstr "Élimination de %s" -#: builtin/remote.c:1388 +#: builtin/remote.c:1393 #, c-format msgid "URL: %s" msgstr "URL : %s" -#: builtin/remote.c:1404 +#: builtin/remote.c:1409 #, c-format msgid " * [would prune] %s" msgstr " * [serait éliminé] %s" -#: builtin/remote.c:1407 +#: builtin/remote.c:1412 #, c-format msgid " * [pruned] %s" msgstr " * [éliminé] %s" -#: builtin/remote.c:1452 +#: builtin/remote.c:1457 msgid "prune remotes after fetching" msgstr "éliminer les distants après le rapatriement" -#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 +#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 #, c-format msgid "No such remote '%s'" msgstr "Pas de serveur remote '%s'" -#: builtin/remote.c:1531 +#: builtin/remote.c:1539 msgid "add branch" msgstr "ajouter une branche" -#: builtin/remote.c:1538 +#: builtin/remote.c:1546 msgid "no remote specified" msgstr "pas de serveur distant spécifié" -#: builtin/remote.c:1555 +#: builtin/remote.c:1563 msgid "query push URLs rather than fetch URLs" msgstr "interroger les URLs de poussée plutôt que les URLs de récupération" -#: builtin/remote.c:1557 +#: builtin/remote.c:1565 msgid "return all URLs" msgstr "retourner toutes les URLs" -#: builtin/remote.c:1585 +#: builtin/remote.c:1595 #, c-format msgid "no URLs configured for remote '%s'" msgstr "aucune URL configurée pour le dépôt distant '%s'" -#: builtin/remote.c:1611 +#: builtin/remote.c:1621 msgid "manipulate push URLs" msgstr "manipuler les URLs push" -#: builtin/remote.c:1613 +#: builtin/remote.c:1623 msgid "add URL" msgstr "ajouter une URL" -#: builtin/remote.c:1615 +#: builtin/remote.c:1625 msgid "delete URLs" msgstr "supprimer des URLs" -#: builtin/remote.c:1622 +#: builtin/remote.c:1632 msgid "--add --delete doesn't make sense" msgstr "--add --delete n'a aucun sens" -#: builtin/remote.c:1661 +#: builtin/remote.c:1673 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Motif d'URL ancien invalide : %s" -#: builtin/remote.c:1669 +#: builtin/remote.c:1681 #, c-format msgid "No such URL found: %s" msgstr "Pas d'URL trouvée : %s" -#: builtin/remote.c:1671 +#: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" msgstr "Pas de suppression de toutes les URLs non-push" @@ -20516,134 +20634,120 @@ 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:236 builtin/repack.c:421 +#: builtin/repack.c:268 builtin/repack.c:447 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:260 +#: builtin/repack.c:295 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:297 +#: builtin/repack.c:323 msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" -#: builtin/repack.c:299 +#: builtin/repack.c:325 msgid "same as -a, and turn unreachable objects loose" msgstr "identique à -a et transformer les objets inaccessibles en suspens" -#: builtin/repack.c:302 +#: builtin/repack.c:328 msgid "remove redundant packs, and run git-prune-packed" msgstr "supprimer les paquets redondants et lancer git-prune-packed" -#: builtin/repack.c:304 +#: builtin/repack.c:330 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passer --no-reuse-delta à git-pack-objects" -#: builtin/repack.c:306 +#: builtin/repack.c:332 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passer --no-reuse-object à git-pack-objects" -#: builtin/repack.c:308 +#: builtin/repack.c:334 msgid "do not run git-update-server-info" msgstr "ne pas lancer git update-server-info" -#: builtin/repack.c:311 +#: builtin/repack.c:337 msgid "pass --local to git-pack-objects" msgstr "passer --local à git-pack-objects" -#: builtin/repack.c:313 +#: builtin/repack.c:339 msgid "write bitmap index" msgstr "écrire un index en bitmap" -#: builtin/repack.c:315 +#: builtin/repack.c:341 msgid "pass --delta-islands to git-pack-objects" msgstr "passer --delta-islands à git-pack-objects" -#: builtin/repack.c:316 +#: builtin/repack.c:342 msgid "approxidate" msgstr "date approximative" -#: builtin/repack.c:317 +#: builtin/repack.c:343 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:319 +#: builtin/repack.c:345 msgid "with -a, repack unreachable objects" msgstr "avec -a, repaquétiser les objets inaccessibles" -#: builtin/repack.c:321 +#: builtin/repack.c:347 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:322 builtin/repack.c:328 +#: builtin/repack.c:348 builtin/repack.c:354 msgid "bytes" msgstr "octets" -#: builtin/repack.c:323 +#: builtin/repack.c:349 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:325 +#: builtin/repack.c:351 msgid "limits the maximum delta depth" msgstr "limite la profondeur maximale des deltas" -#: builtin/repack.c:327 +#: builtin/repack.c:353 msgid "limits the maximum number of threads" msgstr "limite le nombre maximal de fils" -#: builtin/repack.c:329 +#: builtin/repack.c:355 msgid "maximum size of each packfile" msgstr "taille maximum de chaque fichier paquet" -#: builtin/repack.c:331 +#: builtin/repack.c:357 msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:333 +#: builtin/repack.c:359 msgid "do not repack this pack" msgstr "ne pas rempaqueter ce paquet" -#: builtin/repack.c:343 +#: builtin/repack.c:369 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:347 +#: builtin/repack.c:373 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable et -A sont incompatibles" -#: builtin/repack.c:430 +#: builtin/repack.c:456 msgid "Nothing new to pack." msgstr "Rien de neuf à empaqueter." #: builtin/repack.c:486 #, c-format -msgid "" -"WARNING: Some packs in use have been renamed by\n" -"WARNING: prefixing old- to their name, in order to\n" -"WARNING: replace them with the new version of the\n" -"WARNING: file. But the operation failed, and the\n" -"WARNING: attempt to rename them back to their\n" -"WARNING: original names also failed.\n" -"WARNING: Please rename them in %s manually:\n" -msgstr "" -"ALERTE : certains paquets utilisés ont été renommés\n" -"ALERTE : en les préfixant par old-, de manière à\n" -"ALERTE : les remplacer par une nouvelle version de\n" -"ALERTE : fichier. Mais l'opération a échoué et la\n" -"ALERTE : tentative de renommage en sens inverse a\n" -"ALERTE : aussi échoué.\n" -"ALERTE : Veuillez les renommer manuellement dans %s :\n" +msgid "missing required file: %s" +msgstr "fichier nécessaire manquant : %s" -#: builtin/repack.c:534 +#: builtin/repack.c:488 #, c-format -msgid "failed to remove '%s'" -msgstr "échec de la suppression de '%s'" +msgid "could not unlink: %s" +msgstr "impossible de délier : '%s'" #: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" @@ -20975,8 +21079,8 @@ msgstr "HEAD est maintenant à %s" 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:295 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594 +#: builtin/stash.c:618 msgid "be quiet, only report errors" msgstr "être silencieux, afficher seulement les erreurs" @@ -21189,11 +21293,11 @@ msgstr "préserver les validations vides initialement" msgid "keep redundant, empty commits" msgstr "garder les validations redondantes, vides" -#: builtin/revert.c:232 +#: builtin/revert.c:239 msgid "revert failed" msgstr "revert a échoué" -#: builtin/revert.c:245 +#: builtin/revert.c:252 msgid "cherry-pick failed" msgstr "le picorage a échoué" @@ -21297,79 +21401,79 @@ msgstr "" " --all et la spécification explicite de <référence> sont mutuellement " "exclusifs." -#: builtin/send-pack.c:182 +#: builtin/send-pack.c:188 msgid "remote name" msgstr "nom distant" -#: builtin/send-pack.c:195 +#: builtin/send-pack.c:201 msgid "use stateless RPC protocol" msgstr "utiliser un protocole RPC sans état" -#: builtin/send-pack.c:196 +#: builtin/send-pack.c:202 msgid "read refs from stdin" msgstr "lire les références depuis l'entrée standard" -#: builtin/send-pack.c:197 +#: builtin/send-pack.c:203 msgid "print status from remote helper" msgstr "afficher les messages du greffon de protocole distant" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:16 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] <chemin>...]" -#: builtin/shortlog.c:16 +#: builtin/shortlog.c:17 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<options>]" -#: builtin/shortlog.c:134 +#: builtin/shortlog.c:135 msgid "using multiple --group options with stdin is not supported" msgstr "" "l'utilisation de plusieurs options --group avec stdin n'est pas supportée" -#: builtin/shortlog.c:144 +#: builtin/shortlog.c:145 msgid "using --group=trailer with stdin is not supported" msgstr "l'utilisation de --group=trailer avec stdin n'est pas supportée" -#: builtin/shortlog.c:388 +#: builtin/shortlog.c:335 #, c-format msgid "unknown group type: %s" msgstr "type de groupe inconnu : %s" -#: builtin/shortlog.c:416 +#: builtin/shortlog.c:363 msgid "Group by committer rather than author" msgstr "Grouper par validateur plutôt que par auteur" -#: builtin/shortlog.c:419 +#: builtin/shortlog.c:366 msgid "sort output according to the number of commits per author" msgstr "trier la sortie sur le nombre de validations par auteur" -#: builtin/shortlog.c:421 +#: builtin/shortlog.c:368 msgid "Suppress commit descriptions, only provides commit count" msgstr "" "Supprimer les descriptions de validation, fournit seulement le nombre de " "validations" -#: builtin/shortlog.c:423 +#: builtin/shortlog.c:370 msgid "Show the email address of each author" msgstr "Afficher l'adresse courriel de chaque auteur" -#: builtin/shortlog.c:424 +#: builtin/shortlog.c:371 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:425 +#: builtin/shortlog.c:372 msgid "Linewrap output" msgstr "Couper les lignes" -#: builtin/shortlog.c:427 +#: builtin/shortlog.c:374 msgid "field" msgstr "champ" -#: builtin/shortlog.c:428 +#: builtin/shortlog.c:375 msgid "Group by field" msgstr "Grouper par champ" -#: builtin/shortlog.c:456 +#: builtin/shortlog.c:403 msgid "too many arguments given outside repository" msgstr "trop d'arguments fournis hors d'un dépôt" @@ -21742,7 +21846,7 @@ msgid "could not generate diff %s^!." msgstr "impossible de générer %s^!." #: builtin/stash.c:422 -msgid "conflicts in index.Try without --index." +msgid "conflicts in index. Try without --index." msgstr "conflits dans l'index. Essayez sans --index." #: builtin/stash.c:428 @@ -21762,122 +21866,122 @@ msgstr "Fusion de %s avec %s" msgid "Index was not unstashed." msgstr "L'index n'a pas été sorti de remise." -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:522 builtin/stash.c:620 msgid "attempt to recreate the index" msgstr "tentative de recréer l'index" -#: builtin/stash.c:555 +#: builtin/stash.c:566 #, c-format msgid "Dropped %s (%s)" msgstr "%s supprimé (%s)" -#: builtin/stash.c:558 +#: builtin/stash.c:569 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s : Impossible de supprimer l'élément de stash" -#: builtin/stash.c:583 +#: builtin/stash.c:582 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' n'est pas une référence de remisage" -#: builtin/stash.c:633 +#: builtin/stash.c:632 msgid "The stash entry is kept in case you need it again." msgstr "" "L'entrée de remisage est conservée au cas où vous en auriez encore besoin." -#: builtin/stash.c:656 +#: builtin/stash.c:655 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: builtin/stash.c:800 builtin/stash.c:837 +#: builtin/stash.c:799 builtin/stash.c:836 #, c-format msgid "Cannot update %s with %s" msgstr "Impossible de mettre à jour %s avec %s" -#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536 msgid "stash message" msgstr "message pour le remisage" -#: builtin/stash.c:828 +#: builtin/stash.c:827 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" exige un argument <commit>" -#: builtin/stash.c:1043 +#: builtin/stash.c:1042 msgid "No changes selected" msgstr "Aucun changement sélectionné" -#: builtin/stash.c:1143 +#: builtin/stash.c:1142 msgid "You do not have the initial commit yet" msgstr "Vous n'avez pas encore la validation initiale" -#: builtin/stash.c:1170 +#: builtin/stash.c:1169 msgid "Cannot save the current index state" msgstr "Impossible de sauver l'état courant de l'index" -#: builtin/stash.c:1179 +#: builtin/stash.c:1178 msgid "Cannot save the untracked files" msgstr "Impossible de sauver les fichiers non-suivis" -#: builtin/stash.c:1190 builtin/stash.c:1199 +#: builtin/stash.c:1189 builtin/stash.c:1198 msgid "Cannot save the current worktree state" msgstr "Impossible de sauver l'état courant de la copie de travail" -#: builtin/stash.c:1227 +#: builtin/stash.c:1226 msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'état de la copie de travail" -#: builtin/stash.c:1276 +#: builtin/stash.c:1275 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:1292 +#: builtin/stash.c:1291 msgid "Did you forget to 'git add'?" msgstr "Vous avez sûrement oublié 'git add' ?" -#: builtin/stash.c:1307 +#: builtin/stash.c:1306 msgid "No local changes to save" msgstr "Pas de modifications locales à sauver" -#: builtin/stash.c:1314 +#: builtin/stash.c:1313 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: builtin/stash.c:1329 +#: builtin/stash.c:1328 msgid "Cannot save the current status" msgstr "Impossible de sauver l'état courant" -#: builtin/stash.c:1334 +#: builtin/stash.c:1333 #, 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:1424 +#: builtin/stash.c:1423 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: builtin/stash.c:1463 builtin/stash.c:1528 +#: builtin/stash.c:1462 builtin/stash.c:1527 msgid "keep index" msgstr "conserver l'index" -#: builtin/stash.c:1465 builtin/stash.c:1530 +#: builtin/stash.c:1464 builtin/stash.c:1529 msgid "stash in patch mode" msgstr "remiser une mode rustine" -#: builtin/stash.c:1466 builtin/stash.c:1531 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "quiet mode" msgstr "mode silencieux" -#: builtin/stash.c:1468 builtin/stash.c:1533 +#: builtin/stash.c:1467 builtin/stash.c:1532 msgid "include untracked files in stash" msgstr "inclure les fichiers non suivis dans la remise" -#: builtin/stash.c:1470 builtin/stash.c:1535 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "include ignore files" msgstr "inclure les fichiers ignorés" -#: builtin/stash.c:1570 +#: builtin/stash.c:1569 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22398,7 +22502,7 @@ msgstr "git submodule--helper config --unset <nom>" msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2665 git-submodule.sh:151 +#: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" @@ -22439,7 +22543,7 @@ msgstr "--branch ou --default requis" msgid "--branch and --default are mutually exclusive" msgstr "--branch et --default sont mutuellement exclusifs" -#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 +#: builtin/submodule--helper.c:2792 git.c:438 git.c:711 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ne gère pas --super-prefix" @@ -22470,11 +22574,11 @@ msgstr "supprimer la référence symbolique" msgid "shorten ref output" msgstr "raccourcir l'affichage de la référence" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason" msgstr "raison" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason of the update" msgstr "raison de la mise à jour" @@ -22624,7 +22728,7 @@ msgstr "utiliser une autre clé pour signer l'étiquette" msgid "replace the tag if exists" msgstr "remplacer l'étiquette si elle existe" -#: builtin/tag.c:422 builtin/update-ref.c:492 +#: builtin/tag.c:422 builtin/update-ref.c:505 msgid "create a reflog" msgstr "créer un reflog" @@ -22991,19 +23095,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<options>] --stdin [-z]" -#: builtin/update-ref.c:487 +#: builtin/update-ref.c:500 msgid "delete the reference" msgstr "supprimer la référence" -#: builtin/update-ref.c:489 +#: builtin/update-ref.c:502 msgid "update <refname> not the one it points to" msgstr "mettre à jour <nomréférence> et non la référence pointée par lui" -#: builtin/update-ref.c:490 +#: builtin/update-ref.c:503 msgid "stdin has NUL-terminated arguments" msgstr "l'entrée standard a des arguments qui se terminent par NUL" -#: builtin/update-ref.c:491 +#: builtin/update-ref.c:504 msgid "read updates from stdin" msgstr "lire les mises à jour depuis l'entrée standard" @@ -23096,7 +23200,7 @@ msgstr "git worktree remove [<options>] <arbre-de-travail>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <chemin>" -#: builtin/worktree.c:60 builtin/worktree.c:970 +#: builtin/worktree.c:60 builtin/worktree.c:973 #, c-format msgid "failed to delete '%s'" msgstr "échec de la suppression de '%s'" @@ -23236,58 +23340,58 @@ 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:755 +#: builtin/worktree.c:758 msgid "reason for locking" msgstr "raison du verrouillage" -#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 -#: builtin/worktree.c:998 +#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877 +#: builtin/worktree.c:1001 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:769 builtin/worktree.c:802 +#: builtin/worktree.c:772 builtin/worktree.c:805 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:774 +#: builtin/worktree.c:777 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:776 +#: builtin/worktree.c:779 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:804 +#: builtin/worktree.c:807 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" -#: builtin/worktree.c:845 +#: builtin/worktree.c:848 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:853 +#: builtin/worktree.c:856 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:876 builtin/worktree.c:1000 +#: builtin/worktree.c:879 builtin/worktree.c:1003 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' est un arbre de travail principal" -#: builtin/worktree.c:881 +#: builtin/worktree.c:884 #, 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:894 +#: builtin/worktree.c:897 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23297,7 +23401,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:896 +#: builtin/worktree.c:899 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23305,39 +23409,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:899 +#: builtin/worktree.c:902 #, 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:904 +#: builtin/worktree.c:907 #, c-format msgid "failed to move '%s' to '%s'" msgstr "échec au déplacement de '%s' vers '%s'" -#: builtin/worktree.c:950 +#: builtin/worktree.c:953 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "échec du lancement de 'git status' sur '%s'" -#: builtin/worktree.c:954 +#: builtin/worktree.c:957 #, 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:959 +#: builtin/worktree.c:962 #, 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:982 +#: builtin/worktree.c:985 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:1005 +#: builtin/worktree.c:1008 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23347,7 +23451,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:1007 +#: builtin/worktree.c:1010 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23355,18 +23459,18 @@ msgstr "" "impossible de supprimer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:1010 +#: builtin/worktree.c:1013 #, 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:1034 +#: builtin/worktree.c:1037 #, c-format msgid "repair: %s: %s" msgstr "réparation : %s : '%s'" -#: builtin/worktree.c:1037 +#: builtin/worktree.c:1040 #, c-format msgid "error: %s: %s" msgstr "erreur : %s : %s" @@ -23396,6 +23500,14 @@ msgstr "l'argument de --packfile doit être une empreinte valide ('%s' reçu)" msgid "not a git repository" msgstr "pas un dépôt git" +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "options non gérées" + +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" +msgstr "erreur lors de la préparation des révisions" + #: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" @@ -23513,17 +23625,17 @@ msgstr "échec inconnu d'écriture sur la sortie standard" msgid "close failed on standard output" msgstr "échec de fermeture de la sortie standard" -#: git.c:819 +#: git.c:820 #, 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:869 +#: git.c:870 #, c-format msgid "cannot handle %s as a builtin" msgstr "impossible d'utiliser %s comme une fonction intégrée" -#: git.c:882 +#: git.c:883 #, c-format msgid "" "usage: %s\n" @@ -23532,13 +23644,13 @@ msgstr "" "usage : %s\n" "\n" -#: git.c:902 +#: git.c:903 #, 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:914 +#: git.c:915 #, c-format msgid "failed to run command '%s': %s\n" msgstr "échec au lancement de la commande '%s' : %s\n" @@ -23593,136 +23705,136 @@ msgstr "" " demandé : %s\n" " redirection : %s" -#: remote-curl.c:174 +#: remote-curl.c:183 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "citation invalide dans la valeur push-option : '%s'" -#: remote-curl.c:298 +#: remote-curl.c:307 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs n'est pas valide : est-ce bien un dépôt git ?" -#: remote-curl.c:399 +#: remote-curl.c:408 msgid "invalid server response; expected service, got flush packet" msgstr "réponse du serveur invalide ; service attendu, paquet de vidage reçu" -#: remote-curl.c:430 +#: remote-curl.c:439 #, c-format msgid "invalid server response; got '%s'" msgstr "réponse du serveur invalide ; '%s' reçu" -#: remote-curl.c:490 +#: remote-curl.c:499 #, c-format msgid "repository '%s' not found" msgstr "dépôt '%s' non trouvé" -#: remote-curl.c:494 +#: remote-curl.c:503 #, c-format msgid "Authentication failed for '%s'" msgstr "Échec d'authentification pour '%s'" -#: remote-curl.c:498 +#: remote-curl.c:507 #, c-format msgid "unable to access '%s': %s" msgstr "impossible d'accéder à '%s' : %s" -#: remote-curl.c:504 +#: remote-curl.c:513 #, c-format msgid "redirecting to %s" msgstr "redirection vers %s" -#: remote-curl.c:633 +#: remote-curl.c:642 msgid "shouldn't have EOF when not gentle on EOF" msgstr "ne devrait pas recevoir OEF quand on n'est pas gentil sur EOF" -#: remote-curl.c:645 +#: remote-curl.c:654 msgid "remote server sent stateless separator" msgstr "le serveur distant a envoyé un séparateur sans état" -#: remote-curl.c:715 +#: remote-curl.c:724 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" "impossible de rembobiner le données post rpc - essayer d'augmenter http." "postBuffer" -#: remote-curl.c:745 +#: remote-curl.c:754 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl : mauvais caractère de longueur de ligne : %.4s" -#: remote-curl.c:747 +#: remote-curl.c:756 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl : paquet de fin de réponse inattendu" -#: remote-curl.c:823 +#: remote-curl.c:832 #, c-format msgid "RPC failed; %s" msgstr "échec RPC ; %s" -#: remote-curl.c:863 +#: remote-curl.c:872 msgid "cannot handle pushes this big" msgstr "impossible de gérer des poussées aussi grosses" -#: remote-curl.c:978 +#: remote-curl.c:987 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "impossible de compresser la requête ; erreur de compression zlib %d" -#: remote-curl.c:982 +#: remote-curl.c:991 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "impossible de compresser la requête ; erreur de fin zlib %d" -#: remote-curl.c:1032 +#: remote-curl.c:1041 #, c-format msgid "%d bytes of length header were received" msgstr "%d octets de longueur d'entête ont été reçus" -#: remote-curl.c:1034 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of body are still expected" msgstr "%d octets de corps sont encore attendus" -#: remote-curl.c:1123 +#: remote-curl.c:1132 msgid "dumb http transport does not support shallow capabilities" msgstr "le protocole http idiot ne supporte la capacité superficielle" -#: remote-curl.c:1138 +#: remote-curl.c:1147 msgid "fetch failed." msgstr "échec du récupération." -#: remote-curl.c:1184 +#: remote-curl.c:1193 msgid "cannot fetch by sha1 over smart http" msgstr "impossible de récupérer par sha1 sur http intelligent" -#: remote-curl.c:1228 remote-curl.c:1234 +#: remote-curl.c:1237 remote-curl.c:1243 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé" -#: remote-curl.c:1246 remote-curl.c:1361 +#: remote-curl.c:1255 remote-curl.c:1373 #, c-format msgid "http transport does not support %s" msgstr "le transport http ne supporte pas %s" -#: remote-curl.c:1282 +#: remote-curl.c:1291 msgid "git-http-push failed" msgstr "échec de git-http-push" -#: remote-curl.c:1467 +#: remote-curl.c:1479 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: usage: git remote-curl <distant> [<url>]" -#: remote-curl.c:1499 +#: remote-curl.c:1511 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl : erreur de lecture du flux de commande depuis git" -#: remote-curl.c:1506 +#: remote-curl.c:1518 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl : récupération tentée sans dépôt local" -#: remote-curl.c:1547 +#: remote-curl.c:1559 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl : commande inconnue '%s' depuis git" @@ -24006,184 +24118,183 @@ msgid "Output information on each ref" msgstr "Afficher de l'information sur chaque référence" #: command-list.h:99 +msgid "Run a Git command on a list of repositories" +msgstr "Lance une commande Git sur une liste de dépôts" + +#: command-list.h:100 msgid "Prepare patches for e-mail submission" msgstr "Préparer les patchs pour soumission par courriel" -#: command-list.h:100 +#: command-list.h:101 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "" "Vérifier la connectivité et la validité des objets dans la base de données" -#: command-list.h:101 +#: command-list.h:102 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "Effacer les fichiers non-nécessaires et optimiser le dépôt local" -#: command-list.h:102 +#: command-list.h:103 msgid "Extract commit ID from an archive created using git-archive" msgstr "Extraire l'ID du commit depuis une archive créée par git-archive" -#: command-list.h:103 +#: command-list.h:104 msgid "Print lines matching a pattern" msgstr "Afficher les lignes correspondant à un motif" -#: command-list.h:104 +#: command-list.h:105 msgid "A portable graphical interface to Git" msgstr "Une interface graphique portable pour Git" -#: command-list.h:105 +#: command-list.h:106 msgid "Compute object ID and optionally creates a blob from a file" msgstr "" "Calculer l'ID d'objet et créer optionnellement un blob depuis un fichier" -#: command-list.h:106 +#: command-list.h:107 msgid "Display help information about Git" msgstr "Afficher l'information d'aide à propos de Git" -#: command-list.h:107 +#: command-list.h:108 msgid "Server side implementation of Git over HTTP" msgstr "Implantation côté serveur de Git sur HTTP" -#: command-list.h:108 +#: command-list.h:109 msgid "Download from a remote Git repository via HTTP" msgstr "Télécharger depuis un dépôt Git distant via HTTP" -#: command-list.h:109 +#: command-list.h:110 msgid "Push objects over HTTP/DAV to another repository" msgstr "Pousser les objets sur un autre dépôt via HTTP/DAV" -#: command-list.h:110 +#: command-list.h:111 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "Envoyer un ensemble de rustines depuis stdin vers un répertoire IMAP" -#: command-list.h:111 +#: command-list.h:112 msgid "Build pack index file for an existing packed archive" msgstr "" "Construire un fichier d'index pack depuis une archive compactée existante" -#: command-list.h:112 +#: command-list.h:113 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Créer un dépôt Git vide ou réinitialiser un existant" -#: command-list.h:113 +#: command-list.h:114 msgid "Instantly browse your working repository in gitweb" msgstr "Naviguer instantanément votre dépôt de travail dans gitweb" -#: command-list.h:114 +#: command-list.h:115 msgid "Add or parse structured information in commit messages" msgstr "" "Ajouter ou analyser l'information structurée dans les messages de validation" -#: command-list.h:115 +#: command-list.h:116 msgid "The Git repository browser" msgstr "Le navigateur de dépôt Git" -#: command-list.h:116 +#: command-list.h:117 msgid "Show commit logs" msgstr "Afficher l'historique des validations" -#: command-list.h:117 +#: command-list.h:118 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:118 +#: command-list.h:119 msgid "List references in a remote repository" msgstr "Lister les références dans un dépôt distant" -#: command-list.h:119 +#: command-list.h:120 msgid "List the contents of a tree object" msgstr "Afficher le contenu d'un objet arbre" -#: command-list.h:120 +#: command-list.h:121 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:121 +#: command-list.h:122 msgid "Simple UNIX mbox splitter program" msgstr "Programme simple de découpage de mbox UNIX" -#: command-list.h:122 +#: command-list.h:123 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:123 +#: command-list.h:124 msgid "Join two or more development histories together" msgstr "Fusionner deux ou plusieurs historiques de développement ensemble" -#: command-list.h:124 +#: command-list.h:125 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:125 +#: command-list.h:126 msgid "Run a three-way file merge" msgstr "Lancer une fusion à 3 points" -#: command-list.h:126 +#: command-list.h:127 msgid "Run a merge for files needing merging" msgstr "Lancer une fusion à 3 points pour les fichiers à fusionner" -#: command-list.h:127 +#: command-list.h:128 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 +#: command-list.h:129 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" "Lancer les outils de résolution de conflit de fusion pour résoudre les " "conflits de fusion" -#: command-list.h:129 +#: 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:130 +#: command-list.h:131 msgid "Write and verify multi-pack-indexes" msgstr "Écrire et vérifier les index multi-paquet" -#: command-list.h:131 +#: command-list.h:132 msgid "Creates a tag object" msgstr "Créer un objet étiquette" -#: command-list.h:132 +#: command-list.h:133 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:133 +#: command-list.h:134 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:134 +#: command-list.h:135 msgid "Find symbolic names for given revs" msgstr "Trouver les noms symboliques pour des révisions données" -#: command-list.h:135 +#: command-list.h:136 msgid "Add or inspect object notes" msgstr "Ajouter ou inspecter les notes d'un objet" -#: command-list.h:136 +#: command-list.h:137 msgid "Import from and submit to Perforce repositories" msgstr "Importer et soumettre à des dépôt Perforce" -#: command-list.h:137 +#: command-list.h:138 msgid "Create a packed archive of objects" msgstr "Créer une archive compactée d'objets" -#: command-list.h:138 +#: command-list.h:139 msgid "Find redundant pack files" msgstr "Trouver les fichiers pack redondants" -#: command-list.h:139 +#: command-list.h:140 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:140 -msgid "Routines to help parsing remote repository access parameters" -msgstr "" -"Routines pour aider à analyser les paramètres d'accès aux dépôts distants" - #: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "Calculer l'ID unique d'un patch" @@ -24498,49 +24609,34 @@ msgstr "Une introduction pratique à Git" msgid "An overview of recommended workflows with Git" msgstr "Un aperçu des flux de travail recommandés avec Git" -#: git-bisect.sh:79 +#: git-bisect.sh:48 #, sh-format msgid "Bad rev input: $arg" msgstr "Mauvaise révision en entrée : $arg" -#: git-bisect.sh:99 -#, sh-format -msgid "Bad rev input: $bisected_head" -msgstr "Mauvaise révision en entrée : $bisected_head" - -#: git-bisect.sh:108 -#, sh-format -msgid "Bad rev input: $rev" -msgstr "Mauvaise révision en entrée : $rev" - -#: git-bisect.sh:117 -#, sh-format -msgid "'git bisect $TERM_BAD' can take only one argument." -msgstr "'git bisect $TERM_BAD' n'accepte qu'un seul argument." - -#: git-bisect.sh:149 +#: git-bisect.sh:82 msgid "No logfile given" msgstr "Pas de fichier de log donné" -#: git-bisect.sh:150 +#: git-bisect.sh:83 #, sh-format msgid "cannot read $file for replaying" msgstr "impossible de lire $file pour rejouer" -#: git-bisect.sh:173 +#: git-bisect.sh:105 msgid "?? what are you talking about?" msgstr "?? de quoi parlez-vous ?" -#: git-bisect.sh:183 +#: git-bisect.sh:115 msgid "bisect run failed: no command provided." msgstr "la bissection a échoué : aucune commande fournie." -#: git-bisect.sh:188 +#: git-bisect.sh:120 #, sh-format msgid "running $command" msgstr "lancement de $command" -#: git-bisect.sh:195 +#: git-bisect.sh:127 #, sh-format msgid "" "bisect run failed:\n" @@ -24549,24 +24645,24 @@ msgstr "" "la bissection a échoué :\n" "le code retour $res de '$command' est < 0 ou >= 128" -#: git-bisect.sh:221 +#: git-bisect.sh:152 msgid "bisect run cannot continue any more" msgstr "la bissection ne peut plus continuer" -#: git-bisect.sh:227 +#: git-bisect.sh:158 #, sh-format msgid "" "bisect run failed:\n" -"'bisect_state $state' exited with error code $res" +"'bisect-state $state' exited with error code $res" msgstr "" "la bissection a échoué :\n" -"'bisect_state $state' a retourné le code erreur $res" +"'bisect-state $state' a retourné le code erreur $res" -#: git-bisect.sh:234 +#: git-bisect.sh:165 msgid "bisect run success" msgstr "succès de la bissection" -#: git-bisect.sh:242 +#: git-bisect.sh:173 msgid "We are not bisecting." msgstr "Pas de bissection en cours." @@ -24610,50 +24706,50 @@ msgstr "Essai de fusion simple avec $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "La fusion simple a échoué, essai avec la fusion automatique." -#: git-submodule.sh:180 +#: git-submodule.sh:179 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Un chemin relatif ne peut être utilisé que depuis la racine de la copie de " "travail" -#: git-submodule.sh:190 +#: git-submodule.sh:189 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../" -#: git-submodule.sh:209 +#: git-submodule.sh:208 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' existe déjà dans l'index" -#: git-submodule.sh:212 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module" -#: git-submodule.sh:219 +#: git-submodule.sh:218 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' n'a pas de commit extrait" -#: git-submodule.sh:250 +#: git-submodule.sh:249 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Ajout du dépôt existant à '$sm_path' dans l'index" -#: git-submodule.sh:252 +#: git-submodule.sh:251 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide" -#: git-submodule.sh:260 +#: git-submodule.sh:259 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) " "distant(s) :" -#: git-submodule.sh:262 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -24670,39 +24766,39 @@ msgstr "" "correct\n" "ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'." -#: git-submodule.sh:268 +#: git-submodule.sh:267 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'." -#: git-submodule.sh:280 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Impossible d'extraire le sous-module '$sm_path'" -#: git-submodule.sh:285 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Échec d'ajout du sous-module '$sm_path'" -#: git-submodule.sh:294 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Échec d'enregistrement du sous-module '$sm_path'" -#: git-submodule.sh:567 +#: git-submodule.sh:568 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Impossible de trouver la révision courante dans le chemin de sous-module " "'$displaypath'" -#: git-submodule.sh:577 +#: git-submodule.sh:578 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'" -#: git-submodule.sh:582 +#: git-submodule.sh:583 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -24711,7 +24807,7 @@ msgstr "" "Impossible de trouver la révision courante ${remote_name}/${branch} dans le " "chemin de sous-module '$sm_path'" -#: git-submodule.sh:600 +#: git-submodule.sh:601 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -24720,7 +24816,7 @@ msgstr "" "Impossible de rapatrier dans le chemin de sous-module '$displaypath' ; essai " "de rapatriement direct de $sha1 :" -#: git-submodule.sh:606 +#: git-submodule.sh:607 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -24729,61 +24825,56 @@ msgstr "" "Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas " "$sha1. La récupération directe de ce commit a échoué." -#: git-submodule.sh:613 +#: git-submodule.sh:614 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:614 +#: git-submodule.sh:615 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" -#: git-submodule.sh:618 +#: git-submodule.sh:619 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:619 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'" -#: git-submodule.sh:624 +#: git-submodule.sh:625 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:625 +#: git-submodule.sh:626 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'" -#: git-submodule.sh:630 +#: git-submodule.sh:631 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "L'exécution de '$command $sha1' a échoué dans le chemin de sous-module " "'$displaypath'" -#: git-submodule.sh:631 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'" -#: git-submodule.sh:662 +#: git-submodule.sh:663 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" -#: git-parse-remote.sh:89 -#, sh-format -msgid "See git-${cmd}(1) for details." -msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." - #: git-rebase--preserve-merges.sh:109 msgid "Applied autostash." msgstr "Autoremisage appliqué." @@ -25185,14 +25276,14 @@ msgstr "Impossible de déterminer le chemin absolu du répertoire git" msgid "%12s %12s %s" msgstr "%12s %s12s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "%d chemin touché\n" msgstr[1] "%d chemins touchés\n" -#: git-add--interactive.perl:1058 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -25200,7 +25291,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme indexée." -#: git-add--interactive.perl:1061 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -25208,7 +25299,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme remisée." -#: git-add--interactive.perl:1064 +#: git-add--interactive.perl:1062 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -25216,8 +25307,8 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme desindexée." -#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 -#: git-add--interactive.perl:1082 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1074 +#: git-add--interactive.perl:1080 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -25225,8 +25316,8 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme appliquée." -#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 -#: git-add--interactive.perl:1079 +#: git-add--interactive.perl:1068 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -25234,12 +25325,12 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme éliminée." -#: git-add--interactive.perl:1116 +#: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s" -#: git-add--interactive.perl:1123 +#: git-add--interactive.perl:1121 #, perl-format msgid "" "---\n" @@ -25252,12 +25343,12 @@ msgstr "" "Pour éliminer les lignes '%s', effacez-les.\n" "Les lignes commençant par %s seront éliminées.\n" -#: git-add--interactive.perl:1145 +#: git-add--interactive.perl:1143 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s" -#: git-add--interactive.perl:1253 +#: git-add--interactive.perl:1251 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -25271,7 +25362,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:1259 +#: git-add--interactive.perl:1257 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -25285,7 +25376,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:1265 +#: git-add--interactive.perl:1263 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -25299,7 +25390,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:1271 +#: git-add--interactive.perl:1269 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -25313,7 +25404,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:1277 git-add--interactive.perl:1295 +#: git-add--interactive.perl:1275 git-add--interactive.perl:1293 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -25327,7 +25418,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:1283 +#: git-add--interactive.perl:1281 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -25341,7 +25432,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:1289 +#: git-add--interactive.perl:1287 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -25355,7 +25446,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:1301 +#: git-add--interactive.perl:1299 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -25369,7 +25460,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:1316 +#: git-add--interactive.perl:1314 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -25391,91 +25482,91 @@ msgstr "" "e - éditer manuellement la section actuelle\n" "? - afficher l'aide\n" -#: git-add--interactive.perl:1347 +#: git-add--interactive.perl:1345 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:1362 +#: git-add--interactive.perl:1360 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "fichier non-fusionné ignoré : %s\n" -#: git-add--interactive.perl:1481 +#: git-add--interactive.perl:1479 #, 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:1482 +#: git-add--interactive.perl:1480 #, 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:1483 +#: git-add--interactive.perl:1481 #, 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:1484 +#: git-add--interactive.perl:1482 #, 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:1601 +#: git-add--interactive.perl:1599 msgid "No other hunks to goto\n" msgstr "Aucune autre section à atteindre\n" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Nombre invalide : '%s'\n" -#: git-add--interactive.perl:1624 +#: git-add--interactive.perl:1622 #, 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:1659 +#: git-add--interactive.perl:1657 msgid "No other hunks to search\n" msgstr "aucune autre section à rechercher\n" -#: git-add--interactive.perl:1676 +#: git-add--interactive.perl:1674 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regex de recherche malformée %s : %s\n" -#: git-add--interactive.perl:1686 +#: git-add--interactive.perl:1684 msgid "No hunk matches the given pattern\n" msgstr "Aucune section ne correspond au motif donné\n" -#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 +#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 msgid "No previous hunk\n" msgstr "Pas de section précédente\n" -#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 +#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 msgid "No next hunk\n" msgstr "Pas de section suivante\n" -#: git-add--interactive.perl:1732 +#: git-add--interactive.perl:1730 msgid "Sorry, cannot split this hunk\n" msgstr "Désolé, impossible de découper cette section\n" -#: git-add--interactive.perl:1738 +#: git-add--interactive.perl:1736 #, 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:1748 +#: git-add--interactive.perl:1746 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:1813 +#: git-add--interactive.perl:1811 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -25493,19 +25584,19 @@ msgstr "" "diff - visualiser les diff entre HEAD et l'index\n" "add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n" -#: git-add--interactive.perl:1830 git-add--interactive.perl:1835 -#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 -#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 -#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 +#: 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 msgid "missing --" msgstr "-- manquant" -#: git-add--interactive.perl:1861 +#: git-add--interactive.perl:1866 #, perl-format msgid "unknown --patch mode: %s" msgstr "mode de --patch inconnu : %s" -#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 +#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argument invalide %s, -- attendu" @@ -25890,81 +25981,3 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " -#~ msgid "unknown hash algorithm length" -#~ msgstr "longueur d'algorithme d'empreinte inconnue" - -#~ msgid "" -#~ "commit-graph chunk lookup table entry missing; file may be incomplete" -#~ msgstr "" -#~ "entrée de table de consultation de morceaux de graphe de commite " -#~ "manquante ; le fichier est peut être incomplet" - -#~ msgid "Writing changed paths Bloom filters index" -#~ msgstr "Écriture de l'index des filtres Bloom des chemins modifiés" - -#~ msgid "hash version %u does not match" -#~ msgstr "la version %u du condensé ne correspond pas" - -#~ msgid "Remote with no URL" -#~ msgstr "Dépôt distant sans URL" - -#~ msgid "%%(subject) does not take arguments" -#~ msgstr "%%(subject) n'accepte pas d'argument" - -#~ msgid "positive value expected objectname:short=%s" -#~ msgstr "valeur positive attendue objectname:short=%s" - -#~ msgid "unrecognized %%(objectname) argument: %s" -#~ msgstr "argument %%(objectname) non reconnu : %s" - -#~ msgid "option `%s' is incompatible with --merged" -#~ msgstr "l'option « %s » est incompatible avec --merged" - -#~ msgid "option `%s' is incompatible with --no-merged" -#~ msgstr "l'option « %s » est incompatible avec --no-merged" - -#~ msgid "could not open '%s' for writing: %s" -#~ msgstr "impossible d'ouvrir '%s' en écriture : %s" - -#~ msgid "could not read ref '%s'" -#~ msgstr "impossible de lire la réf '%s'" - -#~ msgid "ref '%s' already exists" -#~ msgstr "la référence '%s' existe déjà" - -#~ msgid "unexpected object ID when writing '%s'" -#~ msgstr "id d'objet inattendu pendant l'écriture de '%s'" - -#~ msgid "unexpected object ID when deleting '%s'" -#~ msgstr "id d'objet inattendu pendant la suppression de '%s'" - -#~ msgid "The hash algorithm %s is not supported in this build." -#~ msgstr "" -#~ "L'algorithme d'empreinte %s n'est pas pris en charge par cette version." - -#~ msgid "could not open the file BISECT_TERMS" -#~ msgstr "impossible d'ouvrir le fichier BISECT_TERMS" - -#~ msgid "update BISECT_HEAD instead of checking out the current commit" -#~ msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel" - -#~ msgid "print only names (no SHA-1)" -#~ msgstr "afficher seulement les noms (pas de SHA-1)" - -#~ msgid "passed to 'git am'" -#~ msgstr "passé jusqu'à 'git am'" - -#~ msgid "The --cached option cannot be used with the --files option" -#~ msgstr "L'option --cached ne peut pas être utilisée avec l'option --files" - -#~ msgid " Warn: $display_name doesn't contain commit $sha1_src" -#~ msgstr " Attention : $display_name ne contient pas la validation $sha1_src" - -#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst" -#~ msgstr " Attention : $display_name ne contient pas la validation $sha1_dst" - -#~ msgid "" -#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -#~ msgstr "" -#~ " Attention : $display_name ne contient pas les validations $sha1_src et " -#~ "$sha1_dst" |