diff options
| author |  Jean-Noël Avila <jn.avila@free.fr> | 2018-06-03 16:36:32 +0200 |
|---|---|---|
| committer | Jean-Noël Avila <jn.avila@free.fr> | 2018-06-03 16:36:32 +0200 |
| commit | f29a2d82f48d5b0ddc02af05731f284543b886bd (patch) | |
| tree | 6f647f7c83e962efdbd3c4dd8ee3c777a59f35da /po | |
| parent | l10n: git.pot: v2.18.0 round 1 (108 new, 14 removed) (diff) | |
| download | tgif-f29a2d82f48d5b0ddc02af05731f284543b886bd.tar.xz | |
l10n: fr.po v2.18 round 1
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Diffstat (limited to 'po')
| -rw-r--r-- | po/fr.po | 5206 |
1 files changed, 2889 insertions, 2317 deletions
@@ -74,8 +74,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2018-03-16 07:29+0800\n" -"PO-Revision-Date: 2018-03-23 23:03+0100\n" +"POT-Creation-Date: 2018-05-31 23:32+0800\n" +"PO-Revision-Date: 2018-06-03 16:32+0200\n" "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -84,37 +84,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" -#: advice.c:62 +#: advice.c:92 #, c-format -msgid "hint: %.*s\n" -msgstr "astuce: %.*s\n" +msgid "%shint: %.*s%s\n" +msgstr "%sastuce: %.*s%s\n" -#: advice.c:90 +#: advice.c:137 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:92 +#: advice.c:139 msgid "Committing is not possible because you have unmerged files." msgstr "Impossible de valider car vous avez des fichiers non fusionnés." -#: advice.c:94 +#: advice.c:141 msgid "Merging is not possible because you have unmerged files." msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés." -#: advice.c:96 +#: advice.c:143 msgid "Pulling is not possible because you have unmerged files." msgstr "Impossible de tirer car vous avez des fichiers non fusionnés." -#: advice.c:98 +#: advice.c:145 msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés." -#: advice.c:100 +#: advice.c:147 #, 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:108 +#: advice.c:155 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." @@ -122,23 +122,23 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nécessaire pour marquer la résolution et valider." -#: advice.c:116 +#: advice.c:163 msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:121 builtin/merge.c:1251 +#: advice.c:168 builtin/merge.c:1249 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: advice.c:123 +#: advice.c:170 msgid "Please, commit your changes before merging." msgstr "Veuillez valider vos changements avant de fusionner." -#: advice.c:124 +#: advice.c:171 msgid "Exiting because of unfinished merge." msgstr "Abandon à cause d'une fusion non terminée." -#: advice.c:130 +#: advice.c:177 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -419,7 +419,7 @@ msgstr "le patch a échoué : %s:%ld" msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" @@ -624,7 +624,7 @@ msgstr[1] "Application du patch %%s avec %d rejets..." msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025 +#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" @@ -678,15 +678,15 @@ 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:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" #: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 -#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193 -#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197 -#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567 -#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787 +#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198 +#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210 +#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584 +#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807 #: git-add--interactive.perl:197 msgid "path" msgstr "chemin" @@ -763,7 +763,7 @@ msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 -#: builtin/pack-objects.c:3035 +#: builtin/pack-objects.c:3177 msgid "action" msgstr "action" @@ -793,9 +793,9 @@ msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21 -#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665 -#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666 +#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124 msgid "be verbose" msgstr "mode verbeux" @@ -836,7 +836,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 +#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" @@ -857,10 +857,10 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869 +#: archive.c:439 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119 #: parse-options.h:165 msgid "file" msgstr "fichier" @@ -893,8 +893,8 @@ msgstr "compression efficace" msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111 -#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113 +#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593 msgid "repo" msgstr "dépôt" @@ -945,22 +945,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:460 +#: bisect.c:461 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Contenu mal cité dans le fichier '%s' : %s" -#: bisect.c:668 +#: bisect.c:669 #, c-format msgid "We cannot bisect more!\n" msgstr "Impossible de pousser la bissection plus loin !\n" -#: bisect.c:722 +#: bisect.c:723 #, c-format msgid "Not a valid commit name %s" msgstr "%s n'est pas un nom de commit valide" -#: bisect.c:746 +#: bisect.c:747 #, c-format msgid "" "The merge base %s is bad.\n" @@ -969,7 +969,7 @@ msgstr "" "La base de fusion %s est mauvaise.\n" "Cela signifie que le bogue été corrigé entre %s et [%s].\n" -#: bisect.c:751 +#: bisect.c:752 #, c-format msgid "" "The merge base %s is new.\n" @@ -978,7 +978,7 @@ msgstr "" "La base de fusion %s est nouvelle.\n" "La propriété a changé entre %s et [%s].\n" -#: bisect.c:756 +#: bisect.c:757 #, c-format msgid "" "The merge base %s is %s.\n" @@ -987,7 +987,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:764 +#: bisect.c:765 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -998,7 +998,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:777 +#: bisect.c:778 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1010,36 +1010,36 @@ msgstr "" "et %s.\n" "On continue tout de même." -#: bisect.c:810 +#: bisect.c:811 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bissection : une base de fusion doit être testée\n" -#: bisect.c:850 +#: bisect.c:851 #, c-format msgid "a %s revision is needed" msgstr "une révision %s est nécessaire" -#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235 +#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" -#: bisect.c:920 +#: bisect.c:921 #, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" -#: bisect.c:950 +#: bisect.c:951 msgid "reading bisect refs failed" msgstr "impossible de lire les références de bissection" -#: bisect.c:969 +#: bisect.c:970 #, c-format msgid "%s was both %s and %s\n" msgstr "%s était à la fois %s et %s\n" -#: bisect.c:977 +#: bisect.c:978 #, c-format msgid "" "No testable commit found.\n" @@ -1048,7 +1048,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:996 +#: bisect.c:997 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1058,52 +1058,52 @@ msgstr[1] "(à peu près %d étapes)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1002 +#: bisect.c:1003 #, 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 cette %s\n" msgstr[1] "Bissection : %d révisions à tester après cette %s\n" -#: blame.c:1758 +#: blame.c:1756 msgid "--contents and --reverse do not blend well." msgstr "--contents et --reverse ne font pas bon ménage." -#: blame.c:1769 +#: blame.c:1767 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:1789 +#: blame.c:1787 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:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699 -#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370 -#: builtin/shortlog.c:191 +#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1860 +#: sequencer.c:3631 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:371 +#: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" -#: blame.c:1816 +#: blame.c:1814 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:1827 +#: blame.c:1825 #, c-format msgid "no such path %s in %s" msgstr "pas de chemin %s dans %s" -#: blame.c:1838 +#: blame.c:1836 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossible de lire le blob %s pour le chemin %s" -#: branch.c:53 +#: branch.c:54 #, c-format msgid "" "\n" @@ -1116,97 +1116,97 @@ msgstr "" "l'information de suivi distant en invoquant\n" "\"git branch --setup-upstream-to=%s%s%s\"." -#: branch.c:67 +#: branch.c:68 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "La branche %s ne peut pas être sa propre branche amont." -#: branch.c:93 +#: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" "La branche '%s' est paramétrée pour suivre la branche distante '%s' de '%s' " "en rebasant." -#: branch.c:94 +#: branch.c:95 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "" "La branche '%s' est paramétrée pour suivre la branche distante '%s' depuis " "'%s'." -#: branch.c:98 +#: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "" "La branche '%s' est paramétrée pour suivre la branche locale '%'s en " "rebasant." -#: branch.c:99 +#: branch.c:100 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'." -#: branch.c:104 +#: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "" "La branche '%s' est paramétrée pour suivre la référence distante '%s' en " "rebasant." -#: branch.c:105 +#: branch.c:106 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "La branche '%s' est paramétrée pour suivre la référence distante '%s'." -#: branch.c:109 +#: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" "La branche '%s' est paramétrée pour suivre la référence locale '%s' en " "rebasant." -#: branch.c:110 +#: branch.c:111 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "La branche '%s' est paramétrée pour suivre la référence locale '%s'." -#: branch.c:119 +#: branch.c:120 msgid "Unable to write upstream branch configuration" msgstr "Échec de l'écriture de la configuration de branche amont" -#: branch.c:156 +#: branch.c:157 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "Pas de suivi : information ambiguë pour la référence %s" -#: branch.c:189 +#: branch.c:190 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' n'est pas un nom de branche valide." -#: branch.c:208 +#: branch.c:209 #, c-format msgid "A branch named '%s' already exists." msgstr "Une branche nommée '%s' existe déjà." -#: branch.c:213 +#: branch.c:214 msgid "Cannot force update the current branch." msgstr "Impossible de forcer la mise à jour de la branche courante." -#: branch.c:233 +#: branch.c:234 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est " "pas une branche." -#: branch.c:235 +#: branch.c:236 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la branche amont demandée '%s' n'existe pas" -#: branch.c:237 +#: branch.c:238 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1226,27 +1226,27 @@ msgstr "" "sa jumelle distante, vous pouvez utiliser \"git push -u\"\n" "pour paramétrer le suivi distant en même temps que vous poussez." -#: branch.c:280 +#: branch.c:281 #, c-format msgid "Not a valid object name: '%s'." msgstr "Nom d'objet invalide : '%s'." -#: branch.c:300 +#: branch.c:301 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nom d'objet ambigu : '%s'." -#: branch.c:305 +#: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Point d'embranchement invalide : '%s'." -#: branch.c:359 +#: branch.c:360 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' est déjà extrait dans '%s'" -#: branch.c:382 +#: branch.c:383 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "la HEAD de la copie de travail %s n'est pas mise à jour" @@ -1261,7 +1261,7 @@ msgstr "'%s' ne semble pas être un fichier bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750 +#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -1305,7 +1305,7 @@ msgstr "rev-list a disparu" msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296 +#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" @@ -1328,18 +1328,39 @@ msgstr "l'index de groupe a disparu" msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1436 builtin/am.c:2072 +#: commit.c:43 sequencer.c:2363 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376 +#: builtin/replace.c:448 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" -#: commit.c:43 +#: commit.c:45 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s n'est pas un commit !" -#: commit.c:1506 +#: commit.c:182 +msgid "" +"Support for <GIT_DIR>/info/grafts is deprecated\n" +"and will be removed in a future Git version.\n" +"\n" +"Please use \"git replace --convert-graft-file\"\n" +"to convert the grafts into replace refs.\n" +"\n" +"Turn this message off by running\n" +"\"git config advice.graftFileDeprecated false\"" +msgstr "" +"Le support de <GIT_DIR>/info/grafts est déconseillé\n" +"et sera supprimé dans une version future de Git.\n" +"\n" +"Veuillez utiliser \"git replace --convert-graft-file\"\n" +"pour convertir les grafts en référence de remplacement.\n" +"\n" +"Supprimez ce message en lançant\n" +"\"git config advice.graftFileDeprecated false\"" + +#: commit.c:1537 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1351,189 +1372,203 @@ msgstr "" "variable de configuration i18n.commitencoding à l'encodage utilisé par votre " "projet.\n" +#: commit-graph.c:669 +#, 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:696 +msgid "too many commits to write graph" +msgstr "trop de commits pour écrire un graphe" + +#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521 +#, c-format +msgid "cannot mkdir %s" +msgstr "impossible de créer le répertoire (mkdir) %s" + #: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "plus de mémoire" -#: config.c:186 +#: config.c:187 msgid "relative config include conditionals must come from files" msgstr "" "les conditions d'inclusion de configuration relative doivent venir de " "fichiers" -#: config.c:720 +#: config.c:788 #, c-format msgid "bad config line %d in blob %s" msgstr "ligne %d de config incorrecte dans le blob %s" -#: config.c:724 +#: config.c:792 #, c-format msgid "bad config line %d in file %s" msgstr "ligne %d de config incorrecte dans le fichier %s" -#: config.c:728 +#: config.c:796 #, c-format msgid "bad config line %d in standard input" msgstr "ligne %d de config incorrecte dans l'entrée standard" -#: config.c:732 +#: config.c:800 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ligne %d de config incorrecte dans le blob de sous-module %s" -#: config.c:736 +#: config.c:804 #, c-format msgid "bad config line %d in command line %s" msgstr "ligne %d de config incorrecte dans la ligne de commande %s" -#: config.c:740 +#: config.c:808 #, c-format msgid "bad config line %d in %s" msgstr "ligne %d de config incorrecte dans %s" -#: config.c:868 +#: config.c:936 msgid "out of range" msgstr "hors plage" -#: config.c:868 +#: config.c:936 msgid "invalid unit" msgstr "unité invalide" -#: config.c:874 +#: config.c:942 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" -#: config.c:879 +#: config.c:947 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob " "%s : %s" -#: config.c:882 +#: config.c:950 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier " "%s : %s" -#: config.c:885 +#: config.c:953 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée " "standard : %s" -#: config.c:888 +#: config.c:956 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de " "sous-module %s : %s" -#: config.c:891 +#: config.c:959 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de " "commande %s : %s" -#: config.c:894 +#: config.c:962 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" -#: config.c:989 +#: config.c:1057 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" -#: config.c:998 +#: config.c:1066 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' pour '%s' n'est pas un horodatage valide" -#: config.c:1094 config.c:1105 +#: config.c:1171 config.c:1182 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" -#: config.c:1225 +#: config.c:1307 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1386 +#: config.c:1473 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" -#: config.c:1582 +#: config.c:1681 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:1914 +#: config.c:2013 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:2101 +#: config.c:2200 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: config.c:2144 +#: config.c:2243 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par " "défaut" -#: config.c:2170 +#: config.c:2269 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et " "100" -#: config.c:2195 +#: config.c:2294 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "impossible d'analyser '%s' depuis le configuration en ligne de commande" -#: config.c:2197 +#: config.c:2296 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" -#: config.c:2256 +#: config.c:2402 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2599 config.c:2816 +#: config.c:2766 config.c:3019 #, c-format msgid "fstat on %s failed" msgstr "échec de fstat sur %s" -#: config.c:2706 +#: config.c:2905 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:2708 builtin/remote.c:776 +#: config.c:2907 builtin/remote.c:779 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" -#: connect.c:52 +#: connect.c:60 msgid "The remote end hung up upon initial contact" msgstr "L'hôte distant a fermé la connexion lors du contact initial" -#: connect.c:54 +#: connect.c:62 msgid "" "Could not read from remote repository.\n" "\n" @@ -1545,7 +1580,7 @@ msgstr "" "Veuillez vérifier que vous avez les droits d'accès\n" "et que le dépôt existe." -#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144 +#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145 msgid "Checking connectivity" msgstr "Vérification de la connectivité" @@ -1561,12 +1596,12 @@ msgstr "impossible d'écrire dans la rev-list" msgid "failed to close rev-list's stdin" msgstr "impossible de fermer l'entrée standard du rev-list" -#: convert.c:205 +#: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s." msgstr "Les CRLF seraient remplacés par des LF dans %s." -#: convert.c:207 +#: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -1576,12 +1611,12 @@ msgstr "" "Le fichier conservera ses fins de ligne d'origine dans votre copie de " "travail." -#: convert.c:215 +#: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "Les LF seraient remplacés par des CRLF dans %s" -#: convert.c:217 +#: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -1591,6 +1626,44 @@ msgstr "" "Le fichier conservera ses fins de ligne d'origine dans votre copie de " "travail." +#: convert.c:279 +#, c-format +msgid "BOM is prohibited in '%s' if encoded as %s" +msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s" + +#: convert.c:286 +#, c-format +msgid "" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." +msgstr "Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez utiliser UTF-%s comme encodage d'arbre de travail." + +#: convert.c:304 +#, c-format +msgid "BOM is required in '%s' if encoded as %s" +msgstr "Un BOM est obligatoire dans '%s' s'il est encodé comme %s" + +#: convert.c:306 +#, c-format +msgid "" +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" +"%sLE (depending on the byte order) as working-tree-encoding." +msgstr "Il manque un marqueur d'ordre d'octets (BOM) au fichier '%s'. Veuillez utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre de travail." + +#: convert.c:424 +#, c-format +msgid "failed to encode '%s' from %s to %s" +msgstr "échec de l'encodage de '%s' de %s vers %s" + +#: convert.c:467 +#, c-format +msgid "encoding '%s' from %s to %s and back is not the same" +msgstr "encoder '%s' depuis %s vers %s puis inversement ne produit pas le même contenu" + +#: convert.c:1225 +msgid "true/false are no valid working-tree-encodings" +msgstr "true/false ne sont pas des encodages d'arbre de travail valides" + #: date.c:116 msgid "in the future" msgstr "dans le futur" @@ -1707,24 +1780,24 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:3822 +#: diff.c:3823 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:4146 +#: diff.c:4153 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:4149 +#: diff.c:4156 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S et --find-object sont mutuellement exclusifs" -#: diff.c:4237 +#: diff.c:4244 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:4403 +#: diff.c:4410 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1733,24 +1806,24 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4417 +#: diff.c:4424 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" -#: diff.c:5493 +#: diff.c:5500 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:5496 +#: diff.c:5503 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:5499 +#: diff.c:5506 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1758,25 +1831,25 @@ msgstr "" "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le " "commande." -#: dir.c:1866 +#: dir.c:1867 #, c-format msgid "could not open directory '%s'" msgstr "impossible d'ouvrir le répertoire '%s'" -#: dir.c:2108 +#: dir.c:2109 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2232 +#: dir.c:2233 msgid "Untracked cache is disabled on this system or location." msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit." -#: dir.c:3024 dir.c:3029 +#: dir.c:3075 dir.c:3080 #, c-format msgid "could not create directories for %s" msgstr "impossible de créer les répertoires pour %s" -#: dir.c:3054 +#: dir.c:3109 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" @@ -1801,201 +1874,205 @@ msgstr "impossible de stat le fichier '%s'" msgid "Remote with no URL" msgstr "Dépôt distant sans URL" -#: fetch-pack.c:253 +#: fetch-pack.c:254 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack : list courte attendue" -#: fetch-pack.c:265 +#: fetch-pack.c:266 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:284 builtin/archive.c:63 +#: fetch-pack.c:285 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "erreur distante : %s" -#: fetch-pack.c:285 +#: fetch-pack.c:286 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu" -#: fetch-pack.c:337 +#: fetch-pack.c:338 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc nécessite multi_ack_detailed" -#: fetch-pack.c:428 +#: fetch-pack.c:429 fetch-pack.c:1310 #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalide : %s" -#: fetch-pack.c:434 +#: fetch-pack.c:435 fetch-pack.c:1316 #, c-format msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" -#: fetch-pack.c:436 +#: fetch-pack.c:437 fetch-pack.c:1318 #, c-format msgid "object not found: %s" msgstr "objet non trouvé : %s" -#: fetch-pack.c:439 +#: fetch-pack.c:440 fetch-pack.c:1321 #, c-format msgid "error in object: %s" msgstr "Erreur dans l'objet : %s" -#: fetch-pack.c:441 +#: fetch-pack.c:442 fetch-pack.c:1323 #, c-format msgid "no shallow found: %s" msgstr "Pas de superficiel trouvé : %s" -#: fetch-pack.c:444 +#: fetch-pack.c:445 fetch-pack.c:1326 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "superficiel/non superficiel attendu, %s trouvé" -#: fetch-pack.c:485 +#: fetch-pack.c:486 #, c-format msgid "got %s %d %s" msgstr "réponse %s %d %s" -#: fetch-pack.c:499 +#: fetch-pack.c:500 #, c-format msgid "invalid commit %s" msgstr "commit invalide %s" -#: fetch-pack.c:532 +#: fetch-pack.c:533 msgid "giving up" msgstr "abandon" -#: fetch-pack.c:542 progress.c:229 +#: fetch-pack.c:543 progress.c:229 msgid "done" msgstr "fait" -#: fetch-pack.c:554 +#: fetch-pack.c:555 #, c-format msgid "got %s (%d) %s" msgstr "%s trouvé (%d) %s" -#: fetch-pack.c:600 +#: fetch-pack.c:601 #, c-format msgid "Marking %s as complete" msgstr "Marquage de %s comme terminé" -#: fetch-pack.c:788 +#: fetch-pack.c:828 #, c-format msgid "already have %s (%s)" msgstr "%s déjà possédé (%s)" -#: fetch-pack.c:829 +#: fetch-pack.c:869 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral" -#: fetch-pack.c:837 +#: fetch-pack.c:877 msgid "protocol error: bad pack header" msgstr "erreur de protocole : mauvais entête de paquet" -#: fetch-pack.c:895 +#: fetch-pack.c:944 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack : impossible de dupliquer %s" -#: fetch-pack.c:911 +#: fetch-pack.c:960 #, c-format msgid "%s failed" msgstr "échec de %s" -#: fetch-pack.c:913 +#: fetch-pack.c:962 msgid "error in sideband demultiplexer" msgstr "erreur dans le démultiplexer latéral" -#: fetch-pack.c:940 +#: fetch-pack.c:989 msgid "Server does not support shallow clients" msgstr "Le serveur ne supporte les clients superficiels" -#: fetch-pack.c:944 +#: fetch-pack.c:993 msgid "Server supports multi_ack_detailed" msgstr "Le serveur supporte multi_ack_detailed" -#: fetch-pack.c:947 +#: fetch-pack.c:996 msgid "Server supports no-done" msgstr "Le serveur support no-done" -#: fetch-pack.c:953 +#: fetch-pack.c:1002 msgid "Server supports multi_ack" msgstr "Le serveur supporte multi_ack" -#: fetch-pack.c:957 +#: fetch-pack.c:1006 msgid "Server supports side-band-64k" msgstr "Le serveur supporte side-band-64k" -#: fetch-pack.c:961 +#: fetch-pack.c:1010 msgid "Server supports side-band" msgstr "Le serveru supporte side-band" -#: fetch-pack.c:965 +#: fetch-pack.c:1014 msgid "Server supports allow-tip-sha1-in-want" msgstr "Le serveur supporte allow-tip-sha1-in-want" -#: fetch-pack.c:969 +#: fetch-pack.c:1018 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Le serveur supporte allow-reachable-sha1-in-want" -#: fetch-pack.c:979 +#: fetch-pack.c:1028 msgid "Server supports ofs-delta" msgstr "Le serveur supporte ofs-delta" -#: fetch-pack.c:985 +#: fetch-pack.c:1034 fetch-pack.c:1204 msgid "Server supports filter" msgstr "Le serveur supporte filter" -#: fetch-pack.c:993 +#: fetch-pack.c:1042 #, c-format msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: fetch-pack.c:999 +#: fetch-pack.c:1048 msgid "Server does not support --shallow-since" msgstr "Le receveur ne gère pas --shallow-since" -#: fetch-pack.c:1003 +#: fetch-pack.c:1052 msgid "Server does not support --shallow-exclude" msgstr "Le receveur ne gère pas --shallow-exclude" -#: fetch-pack.c:1005 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "Le receveur ne gère pas --deepen" -#: fetch-pack.c:1016 +#: fetch-pack.c:1065 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:1028 +#: fetch-pack.c:1077 fetch-pack.c:1414 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." -#: fetch-pack.c:1190 +#: fetch-pack.c:1199 +msgid "Server does not support shallow requests" +msgstr "Le serveur ne supporte les requêtes superficielles" + +#: fetch-pack.c:1584 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1212 +#: fetch-pack.c:1610 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:1215 +#: fetch-pack.c:1613 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé" -#: gpg-interface.c:181 +#: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "gpg n'a pas pu signer les données" -#: gpg-interface.c:211 +#: gpg-interface.c:210 msgid "could not create temporary file" msgstr "impossible de créer un fichier temporaire" -#: gpg-interface.c:214 +#: gpg-interface.c:213 #, c-format msgid "failed writing detached signature to '%s'" msgstr "impossible d'écrire la signature détachée dans '%s'" @@ -2005,18 +2082,18 @@ msgstr "impossible d'écrire la signature détachée dans '%s'" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "couleur invalide '%.*s' ignorée dans log.graphColors" -#: grep.c:2022 +#: grep.c:2020 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81 +#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81 #: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: grep.c:2050 +#: grep.c:2048 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquée" @@ -2160,7 +2237,7 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis" msgid "name consists only of disallowed characters: %s" msgstr "le nom n'est constitué que de caractères interdits : %s" -#: ident.c:416 builtin/commit.c:582 +#: ident.c:416 builtin/commit.c:587 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" @@ -2197,82 +2274,158 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Impossible de créer '%s.lock' : %s" -#: merge.c:74 +#: merge.c:71 msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 -#: builtin/checkout.c:599 builtin/clone.c:759 +#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 +#: builtin/checkout.c:606 builtin/clone.c:761 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" -#: merge-recursive.c:235 +#: merge-recursive.c:298 msgid "(bad commit)\n" msgstr "(mauvais commit)\n" -#: merge-recursive.c:257 merge-recursive.c:265 +#: merge-recursive.c:320 +#, c-format +msgid "add_cacheinfo failed for path '%s'; merge aborting." +msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion." + +#: merge-recursive.c:328 #, c-format -msgid "addinfo_cache failed for path '%s'" -msgstr "échec de addinfo_cache pour le chemin '%s'" +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." +msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion." -#: merge-recursive.c:329 +#: merge-recursive.c:410 msgid "error building trees" msgstr "erreur de construction des arbres" -#: merge-recursive.c:771 +#: merge-recursive.c:881 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:782 +#: merge-recursive.c:892 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n" -#: merge-recursive.c:796 merge-recursive.c:815 +#: merge-recursive.c:906 merge-recursive.c:925 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:805 +#: merge-recursive.c:915 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:847 builtin/cat-file.c:37 +#: merge-recursive.c:957 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:849 +#: merge-recursive.c:959 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:873 +#: merge-recursive.c:983 #, c-format msgid "failed to open '%s': %s" msgstr "échec à l'ouverture de '%s' : %s" -#: merge-recursive.c:884 +#: merge-recursive.c:994 #, c-format msgid "failed to symlink '%s': %s" msgstr "échec à la création du lien symbolique '%s' : %s" -#: merge-recursive.c:889 +#: merge-recursive.c:999 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:1029 +#: merge-recursive.c:1186 +#, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "Échec de la fusion du sous-module %s (non extrait)" + +#: merge-recursive.c:1193 +#, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "Échec de fusion du sous-module %s (commits non présents)" + +#: merge-recursive.c:1200 +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "Échec de la fusion du sous-module %s (les commits ne descendent pas de la base de fusion)" + +#: merge-recursive.c:1208 merge-recursive.c:1220 +#, c-format +msgid "Fast-forwarding submodule %s to the following commit:" +msgstr "Avance rapide du sous-module %s au commit suivant :" + +#: merge-recursive.c:1211 merge-recursive.c:1223 +#, c-format +msgid "Fast-forwarding submodule %s to %s" +msgstr "Avance rapide du sous-module %s à %s" + +#: merge-recursive.c:1245 +#, c-format +msgid "Failed to merge submodule %s (merge following commits not found)" +msgstr "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)" + +#: merge-recursive.c:1249 +#, c-format +msgid "Failed to merge submodule %s (not fast-forward)" +msgstr "Échec de fusion du sous-module %s (pas en avance rapide)" + +#: merge-recursive.c:1250 +msgid "Found a possible merge resolution for the submodule:\n" +msgstr "Résolution possible de fusion trouvée pour le sous-module :\n" + +#: merge-recursive.c:1253 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Si c'est correct, ajoutez le simplement à l'index\n" +"en utilisant par exemple :\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"qui acceptera cette suggestion.\n" + +#: merge-recursive.c:1262 +#, c-format +msgid "Failed to merge submodule %s (multiple merges found)" +msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)" + +#: merge-recursive.c:1321 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-recursive.c:1034 +#: merge-recursive.c:1326 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-recursive.c:1146 +#: merge-recursive.c:1358 +#, c-format +msgid "Auto-merging %s" +msgstr "Fusion automatique de %s" + +#: merge-recursive.c:1423 +#, c-format +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." +msgstr "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la place." + +#: merge-recursive.c:1475 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2281,7 +2434,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre." -#: merge-recursive.c:1151 +#: merge-recursive.c:1480 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2290,7 +2443,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " "%s de %s laissée dans l'arbre." -#: merge-recursive.c:1158 +#: merge-recursive.c:1487 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2299,7 +2452,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1163 +#: merge-recursive.c:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2308,20 +2461,31 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " "%s de %s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1197 +#: merge-recursive.c:1526 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1197 +#: merge-recursive.c:1526 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1254 +#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368 +#: merge-recursive.c:3086 +#, c-format +msgid "Refusing to lose dirty file at %s" +msgstr "Refus de perdre le fichier modifié %s" + +#: merge-recursive.c:1594 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s est un répertoire dans %s ajouté plutôt comme %s" -#: merge-recursive.c:1279 +#: merge-recursive.c:1599 +#, c-format +msgid "Refusing to lose untracked file at %s; adding as %s instead" +msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place" + +#: merge-recursive.c:1625 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2330,142 +2494,178 @@ msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1284 +#: merge-recursive.c:1630 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1346 +#: merge-recursive.c:1694 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-" ">'%s' dans %s" -#: merge-recursive.c:1379 +#: merge-recursive.c:1733 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Renommage de %s en %s et de %s en %s à la place" -#: merge-recursive.c:1582 +#: merge-recursive.c:1745 +#, c-format +msgid "Refusing to lose untracked file at %s, even though it's in the way." +msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne." + +#: merge-recursive.c:1951 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to place %s because " +"directory %s was renamed to multiple other directories, with no destination " +"getting a majority of the files." +msgstr "CONFLIT (renommage de répertoire coupé) : la place de %s n'est pas claire parce que le répertoire %s a été renommé en plusieurs autres répertoires, sans aucune destination récupérant la majorité des fichiers." + +#: merge-recursive.c:1983 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne des renommages implicites de répertoire déplaçant les chemins suivants : %s." + +#: merge-recursive.c:1993 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "CONFLIT (renommage implicite de répertoire) : impossible de transformer plusieurs chemins sur %s ; les chemins concernés sont : %s" + +#: merge-recursive.c:2085 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" +">%s in %s" +msgstr "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. Renommage de répertoire %s->%s dans %s" + +#: merge-recursive.c:2330 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été renommé." + +#: merge-recursive.c:2736 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s" -#: merge-recursive.c:1597 +#: merge-recursive.c:2751 #, c-format msgid "Adding merged %s" msgstr "Ajout de %s fusionné" -#: merge-recursive.c:1604 merge-recursive.c:1834 +#: merge-recursive.c:2758 merge-recursive.c:3089 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:1661 +#: merge-recursive.c:2914 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-recursive.c:1664 +#: merge-recursive.c:2917 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-recursive.c:1733 +#: merge-recursive.c:2986 msgid "modify" msgstr "modification" -#: merge-recursive.c:1733 +#: merge-recursive.c:2986 msgid "modified" msgstr "modifié" -#: merge-recursive.c:1743 +#: merge-recursive.c:2997 msgid "content" msgstr "contenu" -#: merge-recursive.c:1750 +#: merge-recursive.c:3004 msgid "add/add" msgstr "ajout/ajout" -#: merge-recursive.c:1786 +#: merge-recursive.c:3046 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:1800 -#, c-format -msgid "Auto-merging %s" -msgstr "Fusion automatique de %s" - -#: merge-recursive.c:1804 git-submodule.sh:879 +#: merge-recursive.c:3055 git-submodule.sh:895 msgid "submodule" msgstr "sous-module" -#: merge-recursive.c:1805 +#: merge-recursive.c:3056 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-recursive.c:1899 +#: merge-recursive.c:3178 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:1925 +#: merge-recursive.c:3204 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:1931 +#: merge-recursive.c:3210 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:1938 +#: merge-recursive.c:3217 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s" -#: merge-recursive.c:1947 +#: merge-recursive.c:3226 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:1987 +#: merge-recursive.c:3267 #, c-format msgid "Dirty index: cannot merge (dirty: %s)" msgstr "Index sale : fusion impossible (sales : %s)" -#: merge-recursive.c:1991 +#: merge-recursive.c:3271 msgid "Already up to date!" msgstr "Déjà à jour !" -#: merge-recursive.c:2000 +#: merge-recursive.c:3280 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:2097 +#: merge-recursive.c:3379 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:2110 +#: merge-recursive.c:3392 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ancêtre commun trouvé :" msgstr[1] "%u ancêtres communs trouvés :" -#: merge-recursive.c:2149 +#: merge-recursive.c:3431 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:2212 +#: merge-recursive.c:3495 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816 +#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -2508,31 +2708,31 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Mauvaise valeur de %s : '%s'" -#: object.c:239 +#: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" -#: packfile.c:561 +#: packfile.c:563 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" -#: packfile.c:1694 +#: packfile.c:1742 #, 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:1698 +#: packfile.c:1746 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)" -#: parse-options.c:619 +#: parse-options.c:621 msgid "..." msgstr "..." -#: parse-options.c:638 +#: parse-options.c:640 #, c-format msgid "usage: %s" msgstr "usage : %s" @@ -2540,26 +2740,31 @@ msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:644 +#: parse-options.c:646 #, c-format msgid " or: %s" msgstr " ou : %s" -#: parse-options.c:647 +#: parse-options.c:649 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:686 +#: parse-options.c:688 msgid "-NUM" msgstr "-NUM" -#: parse-options-cb.c:108 +#: parse-options-cb.c:44 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "date d'expiration malformée : '%s'" + +#: parse-options-cb.c:112 #, c-format msgid "malformed object name '%s'" msgstr "nom d'objet malformé '%s'" -#: path.c:891 +#: path.c:892 #, c-format msgid "Could not make %s writable by group" msgstr "Impossible de rendre %s inscriptible pour le groupe" @@ -2647,7 +2852,7 @@ msgstr "le chemin '%s' est au-delà d'un lien symbolique" msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: read-cache.c:1473 +#: read-cache.c:1500 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2656,7 +2861,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1483 +#: read-cache.c:1510 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2665,53 +2870,54 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049 +#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627 +#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233 #, c-format msgid "could not stat '%s'" msgstr "stat impossible de '%s'" -#: read-cache.c:2461 +#: read-cache.c:2490 #, c-format msgid "unable to open git dir: %s" msgstr "impossible d'ouvrir le répertoire git : %s" -#: read-cache.c:2473 +#: read-cache.c:2502 #, c-format msgid "unable to unlink: %s" msgstr "échec lors de l'unlink : %s" -#: refs.c:706 +#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:779 #, c-format -msgid "Could not open '%s' for writing" -msgstr "Impossible d'ouvrir '%s' en écriture" +msgid "could not open '%s' for writing" +msgstr "impossible d'ouvrir '%s' en écriture" -#: refs.c:1850 +#: refs.c:1880 msgid "ref updates forbidden inside quarantine environment" msgstr "mises à jour des références interdites en environnement de quarantaine" -#: refs/files-backend.c:1189 +#: refs/files-backend.c:1191 #, c-format msgid "could not remove reference %s" msgstr "impossible de supprimer la référence %s" -#: refs/files-backend.c:1203 refs/packed-backend.c:1528 -#: refs/packed-backend.c:1538 +#: refs/files-backend.c:1205 refs/packed-backend.c:1531 +#: refs/packed-backend.c:1541 #, c-format msgid "could not delete reference %s: %s" msgstr "Impossible de supprimer la référence %s : %s" -#: refs/files-backend.c:1206 refs/packed-backend.c:1541 +#: refs/files-backend.c:1208 refs/packed-backend.c:1544 #, c-format msgid "could not delete references: %s" msgstr "impossible de supprimer les références : %s" # à priori on parle d'une branche ici -#: ref-filter.c:35 wt-status.c:1842 +#: ref-filter.c:35 wt-status.c:1850 msgid "gone" msgstr "disparue" @@ -2730,157 +2936,162 @@ msgstr "en retard de %d" msgid "ahead %d, behind %d" msgstr "en avance de %d, en retard de %d" -#: ref-filter.c:107 +#: ref-filter.c:121 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format attendu : %%(color:<couleur>)" -#: ref-filter.c:109 +#: ref-filter.c:123 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "couleur non reconnue : %%(color:%s)" -#: ref-filter.c:129 +#: ref-filter.c:145 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valeur entière attendue refname:lstrip=%s" -#: ref-filter.c:133 +#: ref-filter.c:149 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valeur entière attendue refname:rstrip=%s" -#: ref-filter.c:135 +#: ref-filter.c:151 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argument %%(%s) non reconnu : %s" -#: ref-filter.c:184 +#: ref-filter.c:206 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) n'accepte pas d'argument" -#: ref-filter.c:191 +#: ref-filter.c:215 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) n'accepte pas d'argument" -#: ref-filter.c:209 +#: ref-filter.c:235 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argument %%(trailers) inconnu : %s" -#: ref-filter.c:232 +#: ref-filter.c:264 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valeur positive attendue contents:lines=%s" -#: ref-filter.c:234 +#: ref-filter.c:266 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argument %%(contents) non reconnu : %s" -#: ref-filter.c:247 +#: ref-filter.c:281 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valeur positive attendue objectname:short=%s" -#: ref-filter.c:251 +#: ref-filter.c:285 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argument %%(objectname) non reconnu : %s" -#: ref-filter.c:278 +#: ref-filter.c:315 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format attendu : %%(align:<largeur>,<position>)" -#: ref-filter.c:290 +#: ref-filter.c:327 #, c-format msgid "unrecognized position:%s" msgstr "position non reconnue : %s" -#: ref-filter.c:294 +#: ref-filter.c:334 #, c-format msgid "unrecognized width:%s" msgstr "largeur non reconnue : %s" -#: ref-filter.c:300 +#: ref-filter.c:343 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argument %%(align) non reconnu : %s" -#: ref-filter.c:304 +#: ref-filter.c:351 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "valeur positive attendue avec l'atome %%(align)" -#: ref-filter.c:319 +#: ref-filter.c:369 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argument %%(if) non reconnu : %s" -#: ref-filter.c:409 +#: ref-filter.c:464 #, c-format msgid "malformed field name: %.*s" msgstr "nom de champ malformé %.*s" -#: ref-filter.c:435 +#: ref-filter.c:491 #, c-format msgid "unknown field name: %.*s" msgstr "nom de champ inconnu : %.*s" -#: ref-filter.c:547 +#: ref-filter.c:608 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format : atome %%(if) utilisé sans un atome %%(then)" -#: ref-filter.c:607 +#: ref-filter.c:671 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format : atome %%(then) utilisé sans un atome %%(if)" -#: ref-filter.c:609 +#: ref-filter.c:673 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format : atome %%(then) utilisé plus d'une fois" -#: ref-filter.c:611 +#: ref-filter.c:675 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atome %%(then) utilisé après %%(else)" -#: ref-filter.c:637 +#: ref-filter.c:703 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(if)" -#: ref-filter.c:639 +#: ref-filter.c:705 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(then)" -#: ref-filter.c:641 +#: ref-filter.c:707 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format : atome %%(else) utilisé plus d'une fois" -#: ref-filter.c:654 +#: ref-filter.c:722 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format : atome %%(end) utilisé sans atome correspondant" -#: ref-filter.c:709 +#: ref-filter.c:779 #, c-format msgid "malformed format string %s" msgstr "Chaîne de formatage mal formée %s" -#: ref-filter.c:1313 +#: ref-filter.c:1387 #, c-format msgid "(no branch, rebasing %s)" msgstr "(aucune branche, rebasage de %s)" -#: ref-filter.c:1316 +#: ref-filter.c:1390 +#, c-format +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "(aucune branche, rebasage de la HEAD détachée %s)" + +#: ref-filter.c:1393 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a démarré sur %s)" @@ -2888,7 +3099,7 @@ msgstr "(aucune branche, bisect a démarré sur %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1324 +#: ref-filter.c:1401 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD détachée sur %s)" @@ -2896,150 +3107,150 @@ msgstr "(HEAD détachée sur %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1331 +#: ref-filter.c:1408 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD détachée depuis %s)" -#: ref-filter.c:1335 +#: ref-filter.c:1412 msgid "(no branch)" msgstr "(aucune branche)" -#: ref-filter.c:1364 +#: ref-filter.c:1442 #, c-format msgid "missing object %s for %s" msgstr "objet manquant %s pour %s" -#: ref-filter.c:1367 +#: ref-filter.c:1445 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "echec de parse_object_buffer sur %s pour %s" -#: ref-filter.c:1819 +#: ref-filter.c:1902 #, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" -#: ref-filter.c:1886 +#: ref-filter.c:1984 #, c-format msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:1891 +#: ref-filter.c:1989 #, c-format msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" -#: ref-filter.c:2152 +#: ref-filter.c:2261 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:2246 +#: ref-filter.c:2365 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: remote.c:795 +#: remote.c:605 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Impossible de récupérer à la fois %s et %s pour %s" -#: remote.c:799 +#: remote.c:609 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:803 +#: remote.c:613 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#: remote.c:811 +#: remote.c:621 msgid "Internal error" msgstr "Erreur interne" -#: remote.c:1726 remote.c:1828 +#: remote.c:1534 remote.c:1635 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1735 +#: remote.c:1543 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1738 +#: remote.c:1546 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurée pour la branche '%s'" -#: remote.c:1744 +#: remote.c:1552 #, 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:1759 +#: remote.c:1567 #, 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:1771 +#: remote.c:1579 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branche '%s' n'a aucune branche distante de poussée" -#: remote.c:1782 +#: remote.c:1589 #, 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:1795 +#: remote.c:1602 msgid "push has no destination (push.default is 'nothing')" msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')" -#: remote.c:1817 +#: remote.c:1624 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de résoudre une poussée 'simple' pour une destination unique" -#: remote.c:2132 +#: remote.c:1939 #, 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:2136 +#: remote.c:1943 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2139 +#: remote.c:1946 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:2143 +#: remote.c:1950 #, 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:2146 +#: remote.c:1953 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (utilisez \"%s\" pour plus de détails)\n" -#: remote.c:2150 +#: remote.c:1957 #, 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:2156 +#: remote.c:1963 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2159 +#: remote.c:1966 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -3051,11 +3262,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:2167 +#: remote.c:1974 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:2170 +#: remote.c:1977 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -3070,29 +3281,29 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:2180 +#: remote.c:1987 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" -#: revision.c:2277 +#: revision.c:2289 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2280 +#: revision.c:2292 #, 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:2477 +#: revision.c:2489 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" -#: run-command.c:731 +#: run-command.c:728 msgid "open /dev/null failed" msgstr "échec de l'ouverture de /dev/null" -#: run-command.c:1274 +#: run-command.c:1271 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -3104,7 +3315,9 @@ msgstr "" #: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" -msgstr "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage distant" +msgstr "" +"paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage " +"distant" #: send-pack.c:143 #, c-format @@ -3140,29 +3353,34 @@ msgstr "Le receveur ne gère pas les poussées avec --atomic" msgid "the receiving end does not support push options" msgstr "Le receveur ne gère pas les options de poussées" -#: sequencer.c:158 +#: sequencer.c:174 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mode de nettoyage invalide de message de validation '%s'" -#: sequencer.c:267 +#: sequencer.c:274 +#, c-format +msgid "could not delete '%s'" +msgstr "Impossible de supprimer '%s'" + +#: sequencer.c:300 msgid "revert" msgstr "revert" -#: sequencer.c:269 +#: sequencer.c:302 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:271 +#: sequencer.c:304 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:273 +#: sequencer.c:306 #, c-format msgid "Unknown action: %d" msgstr "Action inconnue : %d" -#: sequencer.c:330 +#: sequencer.c:363 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -3170,7 +3388,7 @@ msgstr "" "après résolution des conflits, marquez les chemins corrigés\n" "avec 'git add <chemins>' ou 'git rm <chemins>'" -#: sequencer.c:333 +#: sequencer.c:366 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -3180,43 +3398,45 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:346 sequencer.c:2245 +#: sequencer.c:379 sequencer.c:2467 #, c-format msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" -#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264 -#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656 +#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485 +#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "impossible d'écrire dans '%s'" -#: sequencer.c:353 +#: sequencer.c:386 #, c-format msgid "could not write eol to '%s'" msgstr "impossible d'écrire la fin de ligne dans '%s'" -#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252 +#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487 +#: sequencer.c:2701 #, c-format msgid "failed to finalize '%s'" msgstr "échec lors de la finalisation de '%s'" -#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259 -#: builtin/commit.c:722 builtin/merge.c:1047 +#: sequencer.c:414 sequencer.c:803 sequencer.c:1492 sequencer.c:2370 +#: sequencer.c:2683 sequencer.c:2787 builtin/am.c:259 builtin/commit.c:727 +#: builtin/merge.c:1045 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" -#: sequencer.c:405 +#: sequencer.c:440 #, c-format msgid "your local changes would be overwritten by %s." msgstr "vos modifications locales seraient écrasées par %s." -#: sequencer.c:409 +#: sequencer.c:444 msgid "commit your changes or stash them to proceed." msgstr "validez vos modifications ou les remiser pour continuer." -#: sequencer.c:438 +#: sequencer.c:473 #, c-format msgid "%s: fast-forward" msgstr "%s : avance rapide" @@ -3224,20 +3444,20 @@ msgstr "%s : avance rapide" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:526 +#: sequencer.c:562 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:542 -msgid "could not resolve HEAD commit" -msgstr "impossible de résoudre le commit HEAD" - -#: sequencer.c:562 +#: sequencer.c:578 msgid "unable to update cache tree" msgstr "impossible de mettre à jour l'arbre de cache" -#: sequencer.c:658 +#: sequencer.c:591 +msgid "could not resolve HEAD commit" +msgstr "impossible de résoudre le commit HEAD" + +#: sequencer.c:748 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3266,11 +3486,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:915 +#: sequencer.c:817 +msgid "writing root commit" +msgstr "écriture du commit racine" + +#: sequencer.c:1042 msgid "'prepare-commit-msg' hook failed" msgstr "échec du crochet 'prepare-commit-msg'" -#: sequencer.c:922 +#: sequencer.c:1049 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3298,7 +3522,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:935 +#: sequencer.c:1062 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3324,330 +3548,316 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:975 +#: sequencer.c:1102 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: sequencer.c:977 +#: sequencer.c:1104 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: sequencer.c:1023 +#: sequencer.c:1150 msgid "unable to resolve HEAD after creating commit" msgstr "impossible de résoudre HEAD après création du commit" -#: sequencer.c:1025 +#: sequencer.c:1152 msgid "detached HEAD" msgstr "HEAD détachée" -#: sequencer.c:1029 +#: sequencer.c:1156 msgid " (root-commit)" msgstr " (commit racine)" -#: sequencer.c:1050 +#: sequencer.c:1177 msgid "could not parse HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:1052 +#: sequencer.c:1179 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s n'est pas un commit !" -#: sequencer.c:1056 builtin/commit.c:1491 +#: sequencer.c:1183 builtin/commit.c:1528 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: sequencer.c:1107 sequencer.c:1673 +#: sequencer.c:1234 sequencer.c:1831 msgid "unable to parse commit author" msgstr "impossible d'analyser l'auteur du commit" -#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643 +#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: sequencer.c:1134 sequencer.c:1186 +#: sequencer.c:1261 sequencer.c:1316 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826 -#: builtin/merge.c:851 +#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824 +#: builtin/merge.c:849 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: sequencer.c:1213 +#: sequencer.c:1343 #, c-format msgid "could not parse commit %s" msgstr "impossible d'analyser le commit %s" -#: sequencer.c:1218 +#: sequencer.c:1348 #, c-format msgid "could not parse parent commit %s" msgstr "impossible d'analyser le commit parent %s" -#: sequencer.c:1347 -#, c-format -msgid "" -"unexpected 1st line of squash message:\n" -"\n" -"\t%.*s" -msgstr "" -"première ligne de message de compression inattendue :\n" -"\n" -"\t%.*s" - -#: sequencer.c:1353 -#, c-format -msgid "" -"invalid 1st line of squash message:\n" -"\n" -"\t%.*s" -msgstr "" -"première ligne de message de compression invalide :\n" -"\n" -"\t%.*s" - -#: sequencer.c:1359 sequencer.c:1384 +#: sequencer.c:1499 sequencer.c:1524 #, c-format msgid "This is a combination of %d commits." msgstr "Ceci est la combinaison de %d commits." -#: sequencer.c:1368 sequencer.c:3265 +#: sequencer.c:1509 sequencer.c:4354 msgid "need a HEAD to fixup" msgstr "une HEAD est nécessaire à la correction" -#: sequencer.c:1370 +#: sequencer.c:1511 sequencer.c:2728 msgid "could not read HEAD" msgstr "Impossible de lire HEAD" -#: sequencer.c:1372 +#: sequencer.c:1513 msgid "could not read HEAD's commit message" msgstr "impossible de lire le message de validation de HEAD" -#: sequencer.c:1378 +#: sequencer.c:1519 #, c-format msgid "cannot write '%s'" msgstr "impossible d'écrire '%s'" -#: sequencer.c:1387 git-rebase--interactive.sh:452 +#: sequencer.c:1526 git-rebase--interactive.sh:457 msgid "This is the 1st commit message:" msgstr "Ceci est le premier message de validation :" -#: sequencer.c:1395 +#: sequencer.c:1534 #, c-format msgid "could not read commit message of %s" msgstr "impossible de lire le message de validation de %s" -#: sequencer.c:1402 +#: sequencer.c:1541 #, c-format msgid "This is the commit message #%d:" msgstr "Ceci est le message de validation numéro %d :" -#: sequencer.c:1407 +#: sequencer.c:1547 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Le message de validation %d sera ignoré :" -#: sequencer.c:1412 +#: sequencer.c:1552 #, c-format msgid "unknown command: %d" msgstr "commande inconnue : %d" -#: sequencer.c:1479 +#: sequencer.c:1630 msgid "your index file is unmerged." msgstr "votre fichier d'index n'est pas fusionné." -#: sequencer.c:1498 +#: sequencer.c:1637 +msgid "cannot fixup root commit" +msgstr "impossible de réparer le commit racine" + +#: sequencer.c:1656 #, 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:1506 +#: sequencer.c:1664 #, c-format msgid "commit %s does not have parent %d" msgstr "le commit %s n'a pas de parent %d" -#: sequencer.c:1510 +#: sequencer.c:1668 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" "une branche principale a été spécifiée mais le commit %s n'est pas une " "fusion." -#: sequencer.c:1516 +#: sequencer.c:1674 #, 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:1535 +#: sequencer.c:1693 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:1600 sequencer.c:2397 +#: sequencer.c:1758 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossible de renommer '%s' en '%s'" -#: sequencer.c:1654 +#: sequencer.c:1812 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:1655 +#: sequencer.c:1813 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:1702 +#: sequencer.c:1863 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:1712 +#: sequencer.c:1873 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:1718 +#: sequencer.c:1880 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:1792 +#: sequencer.c:1960 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s n'accepte pas d'argument : '%s'" -#: sequencer.c:1801 +#: sequencer.c:1969 #, c-format msgid "missing arguments for %s" msgstr "argument manquant pour %s" -#: sequencer.c:1844 +#: sequencer.c:2028 #, c-format msgid "invalid line %d: %.*s" msgstr "ligne %d invalide : %.*s" -#: sequencer.c:1852 +#: sequencer.c:2036 #, c-format msgid "cannot '%s' without a previous commit" msgstr "'%s' impossible avec le commit précédent" -#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091 +#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172 #, c-format msgid "could not read '%s'." msgstr "impossible de lire '%s'." -#: sequencer.c:1906 +#: sequencer.c:2107 msgid "please fix this using 'git rebase --edit-todo'." msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: sequencer.c:1908 +#: sequencer.c:2109 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "feuille d'instruction inutilisable : '%s'" -#: sequencer.c:1913 +#: sequencer.c:2114 msgid "no commits parsed." msgstr "aucun commit analysé." -#: sequencer.c:1924 +#: sequencer.c:2125 msgid "cannot cherry-pick during a revert." msgstr "impossible de picorer pendant l'annulation d'un commit." -#: sequencer.c:1926 +#: sequencer.c:2127 msgid "cannot revert during a cherry-pick." msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:1993 +#: sequencer.c:2194 #, c-format msgid "invalid key: %s" msgstr "clé invalide : %s" -#: sequencer.c:1996 +#: sequencer.c:2197 #, c-format msgid "invalid value for %s: %s" msgstr "valeur invalide pour %s : %s" -#: sequencer.c:2062 +#: sequencer.c:2268 +msgid "unusable squash-onto" +msgstr "\"écrase-sur\" inutilisable" + +#: sequencer.c:2284 #, c-format msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformée : %s" -#: sequencer.c:2100 +#: sequencer.c:2322 msgid "a cherry-pick or revert is already in progress" msgstr "un picorage ou un retour est déjà en cours" -#: sequencer.c:2101 +#: sequencer.c:2323 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" -#: sequencer.c:2104 +#: sequencer.c:2326 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossible de créer le répertoire de séquenceur '%s'" -#: sequencer.c:2118 +#: sequencer.c:2340 msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:2173 sequencer.c:2761 +#: sequencer.c:2395 sequencer.c:3402 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:2175 +#: sequencer.c:2397 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:2177 sequencer.c:2212 +#: sequencer.c:2399 sequencer.c:2434 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:2198 builtin/grep.c:720 +#: sequencer.c:2420 builtin/grep.c:720 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:2200 +#: sequencer.c:2422 #, c-format msgid "cannot read '%s': %s" msgstr "impossible de lire '%s' : %s" -#: sequencer.c:2201 +#: sequencer.c:2423 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:2207 +#: sequencer.c:2429 #, 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:2218 +#: sequencer.c:2440 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:2324 sequencer.c:2679 +#: sequencer.c:2544 sequencer.c:3320 #, c-format msgid "could not update %s" msgstr "impossible de mettre à jour %s" -#: sequencer.c:2362 sequencer.c:2659 +#: sequencer.c:2582 sequencer.c:3300 msgid "cannot read HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:2402 builtin/difftool.c:639 +#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:2421 +#: sequencer.c:2640 msgid "could not read index" msgstr "impossible de lire l'index" -#: sequencer.c:2426 +#: sequencer.c:2645 #, c-format msgid "" "execution failed: %s\n" @@ -3662,11 +3872,11 @@ msgstr "" "git rebase --continue\n" "\n" -#: sequencer.c:2432 +#: sequencer.c:2651 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:2438 +#: sequencer.c:2657 #, c-format msgid "" "execution succeeded: %s\n" @@ -3683,17 +3893,62 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:2497 +#: sequencer.c:2770 +msgid "writing fake root commit" +msgstr "écriture d'un commit racine bidon" + +#: sequencer.c:2775 +msgid "writing squash-onto" +msgstr "écriture de 'écraser-sur'" + +#: sequencer.c:2810 +#, c-format +msgid "failed to find tree of %s" +msgstr "impossible de trouver l'arbre de %s" + +#: sequencer.c:2828 +msgid "could not write index" +msgstr "impossible d'écrire l'index" + +#: sequencer.c:2860 +msgid "cannot merge without a current revision" +msgstr "impossible de fusionner avec une révision courante" + +#: sequencer.c:2883 +#, c-format +msgid "could not resolve '%s'" +msgstr "impossible de résoudre '%s'" + +#: sequencer.c:2905 +#, c-format +msgid "could not get commit message of '%s'" +msgstr "impossible de lire le message de validation de '%s'" + +#: sequencer.c:2915 sequencer.c:2940 +#, c-format +msgid "could not write '%s'" +msgstr "impossible d'écrire '%s'" + +#: sequencer.c:3004 +#, c-format +msgid "could not even attempt to merge '%.*s'" +msgstr "impossible de seulement essayer de fusionner '%.*s'" + +#: sequencer.c:3020 +msgid "merge: Unable to write new index file" +msgstr "fusion : Impossible d'écrire le nouveau fichier index" + +#: sequencer.c:3087 #, c-format msgid "Applied autostash.\n" msgstr "Autoremisage appliqué.\n" -#: sequencer.c:2509 +#: sequencer.c:3099 #, c-format msgid "cannot store %s" msgstr "impossible de stocker %s" -#: sequencer.c:2512 git-rebase.sh:178 +#: sequencer.c:3102 git-rebase.sh:188 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3704,52 +3959,69 @@ 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:2595 +#: sequencer.c:3133 +#, c-format +msgid "" +"Could not execute the todo command\n" +"\n" +" %.*s\n" +"It has been rescheduled; To edit the command before continuing, please\n" +"edit the todo list first:\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" +msgstr "" +"Impossible d'exécuter la commande\n" +"\n" +" %.*s\n" +"Elle a été reprogrammée ; pour éditer la commande avant de poursuivre,\n" +"veuillez éditer la liste de commandes en premier :\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" + +#: sequencer.c:3201 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "arrêt à %s... %.*s\n" -#: sequencer.c:2637 +#: sequencer.c:3263 #, c-format msgid "unknown command %d" msgstr "commande inconnue %d" -#: sequencer.c:2667 +#: sequencer.c:3308 msgid "could not read orig-head" msgstr "impossible de lire orig-head" -#: sequencer.c:2672 sequencer.c:3262 +#: sequencer.c:3313 sequencer.c:4351 msgid "could not read 'onto'" msgstr "impossible de lire 'onto'" -#: sequencer.c:2686 +#: sequencer.c:3327 #, c-format msgid "could not update HEAD to %s" msgstr "impossible de mettre à jour HEAD sur %s" -#: sequencer.c:2770 +#: sequencer.c:3413 msgid "cannot rebase: You have unstaged changes." msgstr "impossible de rebaser : vous avez des modifications non indexées." -#: sequencer.c:2775 -msgid "could not remove CHERRY_PICK_HEAD" -msgstr "impossible de supprimer CHERRY_PICK_HEAD" - -#: sequencer.c:2784 +#: sequencer.c:3422 msgid "cannot amend non-existing commit" msgstr "impossible de corriger un commit non-existant" -#: sequencer.c:2786 +#: sequencer.c:3424 #, c-format msgid "invalid file: '%s'" msgstr "fichier invalide : '%s'" -#: sequencer.c:2788 +#: sequencer.c:3426 #, c-format msgid "invalid contents: '%s'" msgstr "contenu invalide : '%s'" -#: sequencer.c:2791 +#: sequencer.c:3429 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3759,45 +4031,54 @@ 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:2801 +#: sequencer.c:3454 sequencer.c:3492 +#, c-format +msgid "could not write file: '%s'" +msgstr "impossible d'écrire le fichier : '%s'" + +#: sequencer.c:3507 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "impossible de supprimer CHERRY_PICK_HEAD" + +#: sequencer.c:3514 msgid "could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: sequencer.c:2881 +#: sequencer.c:3611 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:2885 +#: sequencer.c:3615 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:2918 +#: sequencer.c:3648 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" -#: sequencer.c:3023 +#: sequencer.c:4097 msgid "make_script: unhandled options" msgstr "make_script : options non gérées" -#: sequencer.c:3026 +#: sequencer.c:4100 msgid "make_script: error preparing revisions" msgstr "make_script : erreur lors de la préparation des révisions" -#: sequencer.c:3060 sequencer.c:3095 +#: sequencer.c:4141 sequencer.c:4176 #, c-format msgid "unusable todo list: '%s'" msgstr "liste à faire inutilisable : '%s'" -#: sequencer.c:3146 +#: sequencer.c:4235 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré." -#: sequencer.c:3212 +#: sequencer.c:4301 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -3806,7 +4087,7 @@ msgstr "" "Attention : certains commits ont pu être accidentellement supprimés.\n" "Commits supprimés (du plus jeune au plus vieux) :\n" -#: sequencer.c:3219 +#: sequencer.c:4308 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3824,7 +4105,7 @@ msgstr "" "Les comportements disponibles sont : ignore, warn, error.\n" "\n" -#: sequencer.c:3231 +#: sequencer.c:4320 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3835,27 +4116,21 @@ msgstr "" "rebase --continue'.\n" "Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n" -#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing" -msgstr "impossible d'ouvrir '%s' en écriture" - -#: sequencer.c:3285 +#: sequencer.c:4374 #, c-format msgid "could not parse commit '%s'" msgstr "impossible d'analyser le commit '%s'" -#: sequencer.c:3401 +#: sequencer.c:4489 msgid "the script was already rearranged." msgstr "le script a déjà été réarrangé." -#: setup.c:122 +#: setup.c:123 #, c-format msgid "'%s' is outside repository" msgstr "'%s' est hors du dépôt" -#: setup.c:171 +#: setup.c:172 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -3865,7 +4140,7 @@ msgstr "" "Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui " "n'existent pas localement." -#: setup.c:184 +#: setup.c:185 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3876,12 +4151,14 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:233 +#: setup.c:234 #, c-format msgid "option '%s' must come before non-option arguments" -msgstr "l'option '%s' doit être présente avant les arguments qui ne sont pas des options" +msgstr "" +"l'option '%s' doit être présente avant les arguments qui ne sont pas des " +"options" -#: setup.c:252 +#: setup.c:253 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3892,158 +4169,163 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:388 +#: setup.c:389 msgid "unable to set up work tree using invalid config" -msgstr "impossible de mettre en place le répertoire de travail en utilisant une configuration invalide" +msgstr "" +"impossible de mettre en place le répertoire de travail en utilisant une " +"configuration invalide" -#: setup.c:395 +#: setup.c:393 msgid "this operation must be run in a work tree" msgstr "Cette opération doit être effectuée dans un arbre de travail" -#: setup.c:506 +#: setup.c:503 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Version attendue du dépôt git <= %d, %d trouvée" -#: setup.c:514 +#: setup.c:511 msgid "unknown repository extensions found:" msgstr "extensions de dépôt inconnues trouvées :" -#: setup.c:533 +#: setup.c:530 #, c-format msgid "error opening '%s'" msgstr "erreur à l'ouverture de '%s'" -#: setup.c:535 +#: setup.c:532 #, c-format msgid "too large to be a .git file: '%s'" msgstr "trop gros pour être une fichier .git : '%s'" -#: setup.c:537 +#: setup.c:534 #, c-format msgid "error reading %s" msgstr "erreur à la lecture de %s" -#: setup.c:539 +#: setup.c:536 #, c-format msgid "invalid gitfile format: %s" msgstr "format de fichier git invalide : %s" -#: setup.c:541 +#: setup.c:538 #, c-format msgid "no path in gitfile: %s" msgstr "aucun chemin dans le fichier git : %s" -#: setup.c:543 +#: setup.c:540 #, c-format msgid "not a git repository: %s" msgstr "ce n'est pas un dépôt git : %s" -#: setup.c:642 +#: setup.c:639 #, c-format msgid "'$%s' too big" msgstr "'$%s' trop gros" -#: setup.c:656 +#: setup.c:653 #, c-format msgid "not a git repository: '%s'" msgstr "ce n'est pas un dépôt git : '%s'" -#: setup.c:685 setup.c:687 setup.c:718 +#: setup.c:682 setup.c:684 setup.c:715 #, c-format msgid "cannot chdir to '%s'" msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'" -#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818 +#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815 msgid "cannot come back to cwd" msgstr "impossible de revenir au répertoire de travail courant" -#: setup.c:816 +#: setup.c:813 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s" -#: setup.c:827 +#: setup.c:824 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "échec du stat de '%*s%s%s'" -#: setup.c:1057 +#: setup.c:1054 msgid "Unable to read current working directory" msgstr "Impossible d'accéder au répertoire de travail courant" -#: setup.c:1069 setup.c:1075 +#: setup.c:1066 setup.c:1072 #, c-format msgid "cannot change to '%s'" msgstr "impossible de modifier en '%s'" -#: setup.c:1088 +#: setup.c:1085 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -"ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) n'est un dépôt git\n" -"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM n'est pas défini)." +"ni ceci ni aucun de ses répertoires parents (jusqu'au point de montage %s) " +"n'est un dépôt git\n" +"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM " +"n'est pas défini)." -#: setup.c:1172 +#: setup.c:1168 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" "problème avec la valeur de core.sharedRepository (0%.3o).\n" -"Le propriétaire des fichiers doit toujours avoir les droits en lecture et écriture." +"Le propriétaire des fichiers doit toujours avoir les droits en lecture et " +"écriture." -#: setup.c:1215 +#: setup.c:1211 msgid "open /dev/null or dup failed" msgstr "échec de l'ouverture ou au dup de /dev/null" -#: setup.c:1230 +#: setup.c:1226 msgid "fork failed" msgstr "échec de la bifurcation" -#: setup.c:1235 +#: setup.c:1231 msgid "setsid failed" msgstr "échec du setsid" -#: sha1_file.c:592 +#: sha1-file.c:625 #, c-format msgid "path '%s' does not exist" msgstr "le chemin '%s' n'existe pas" -#: sha1_file.c:618 +#: sha1-file.c:651 #, 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:624 +#: sha1-file.c:657 #, 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:630 +#: sha1-file.c:663 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: sha1_file.c:638 +#: sha1-file.c:671 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: sha1_name.c:422 +#: sha1-name.c:442 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "le SHA1 court %s est ambigu" -#: sha1_name.c:433 +#: sha1-name.c:453 msgid "The candidates are:" msgstr "Les candidats sont :" -#: sha1_name.c:693 +#: sha1-name.c:695 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -4068,72 +4350,72 @@ msgstr "" "message\n" "en lançant \"git config advice.objectNameWarning false\"" -#: submodule.c:96 submodule.c:130 +#: submodule.c:97 submodule.c:131 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Modification impossible de .gitmodules non fusionné, résolvez les conflits " "d'abord" -#: submodule.c:100 submodule.c:134 +#: submodule.c:101 submodule.c:135 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Impossible de trouver une section où path=%s dans .gitmodules" -#: submodule.c:108 +#: submodule.c:109 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Impossible de mettre à jour l'élément %s de .gitmodules" # ici %s est un chemin -#: submodule.c:141 +#: submodule.c:142 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Impossible de supprimer l'élément de .gitmodules pour %s" -#: submodule.c:152 +#: submodule.c:153 msgid "staging updated .gitmodules failed" msgstr "échec de la mise en index du .gitmodules mis à jour" -#: submodule.c:312 +#: submodule.c:315 #, c-format msgid "in unpopulated submodule '%s'" msgstr "dans le sous-module '%s' non populé" -#: submodule.c:343 +#: submodule.c:346 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Le chemin '%s' est dans le sous-module '%.*s'" -#: submodule.c:833 +#: submodule.c:837 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit" -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724 +#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: submodule.c:1370 +#: submodule.c:1373 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' n'est pas reconnu comme dépôt git" -#: submodule.c:1508 +#: submodule.c:1511 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "impossible de démarrer 'git status' dans le sous-module '%s'" -#: submodule.c:1521 +#: submodule.c:1524 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "impossible de lancer 'git status' dans le sous-module '%s'" -#: submodule.c:1614 +#: submodule.c:1617 #, c-format msgid "submodule '%s' has dirty index" msgstr "le sous-module '%s' a un index sale" -#: submodule.c:1878 +#: submodule.c:1716 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -4141,18 +4423,18 @@ msgstr "" "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail " "n'est pas supporté" -#: submodule.c:1890 submodule.c:1946 +#: submodule.c:1728 submodule.c:1784 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "impossible de trouve le nom pour le sous-module '%s'" -#: submodule.c:1894 builtin/submodule--helper.c:1246 -#: builtin/submodule--helper.c:1256 +#: submodule.c:1732 builtin/submodule--helper.c:1261 +#: builtin/submodule--helper.c:1271 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le répertoire '%s'" -#: submodule.c:1897 +#: submodule.c:1735 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -4163,29 +4445,30 @@ msgstr "" "'%s' sur\n" "'%s'\n" -#: submodule.c:1981 +#: submodule.c:1819 #, c-format msgid "could not recurse into submodule '%s'" msgstr "récursion impossible dans le sous-module '%s'" -#: submodule.c:2025 +#: submodule.c:1863 msgid "could not start ls-files in .." msgstr "impossible de démarrer ls-files dans .." -#: submodule.c:2045 -msgid "BUG: returned path string doesn't match cwd?" -msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?" - -#: submodule.c:2064 +#: submodule.c:1902 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree a renvoyé un code de retour inattendu %d" -#: submodule-config.c:263 +#: submodule-config.c:230 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "nom de sous-module suspicieux %s ignoré" + +#: submodule-config.c:294 msgid "negative values not allowed for submodule.fetchjobs" msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs" -#: submodule-config.c:436 +#: submodule-config.c:467 #, c-format msgid "invalid value for %s" msgstr "Valeur invalide pour %s" @@ -4201,7 +4484,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:539 trailer.c:544 builtin/remote.c:290 +#: trailer.c:539 trailer.c:544 builtin/remote.c:293 #, c-format msgid "more than one %s" msgstr "plus d'un %s" @@ -4244,17 +4527,21 @@ msgstr "impossible de créer un fichier temporaire" msgid "could not rename temporary file to %s" msgstr "impossible de renommer un fichier temporaire en %s" -#: transport.c:63 +#: transport.c:116 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n" -#: transport.c:152 +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport : option de profondeur invalide '%s'" -#: transport.c:916 +#: transport.c:584 +msgid "could not parse transport.color.* config" +msgstr "impossible d'analyser la configuration transport.color.*" + +#: transport.c:996 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -4263,7 +4550,7 @@ msgstr "" "Les chemins suivant de sous-module contiennent des modifications\n" "qui ne peuvent être trouvées sur aucun distant :\n" -#: transport.c:920 +#: transport.c:1000 #, c-format msgid "" "\n" @@ -4290,11 +4577,11 @@ msgstr "" "pour les pousser vers un serveur distant.\n" "\n" -#: transport.c:928 +#: transport.c:1008 msgid "Aborting." msgstr "Abandon." -#: transport-helper.c:1079 +#: transport-helper.c:1087 #, c-format msgid "Could not read ref %s" msgstr "impossible de lire la réf %s" @@ -4311,11 +4598,11 @@ msgstr "mode invalide dans l'entrée d'arbre" msgid "empty filename in tree entry" msgstr "nom de fichier vide dans une entrée de l'arbre" -#: tree-walk.c:114 +#: tree-walk.c:113 msgid "too-short tree file" msgstr "fichier arbre trop court" -#: unpack-trees.c:108 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4326,7 +4613,7 @@ msgstr "" "%%sVeuillez valider ou remiser vos modifications avant de basculer de " "branche." -#: unpack-trees.c:110 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4336,7 +4623,7 @@ msgstr "" "l'extraction :\n" "%%s" -#: unpack-trees.c:113 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4346,7 +4633,7 @@ msgstr "" "fusion :\n" "%%sVeuillez valider ou remiser vos modifications avant la fusion." -#: unpack-trees.c:115 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4356,7 +4643,7 @@ msgstr "" "fusion :\n" "%%s" -#: unpack-trees.c:118 +#: unpack-trees.c:121 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4365,7 +4652,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%sVeuillez valider ou remiser vos modifications avant %s." -#: unpack-trees.c:120 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4374,7 +4661,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%s" -#: unpack-trees.c:125 +#: unpack-trees.c:128 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4384,7 +4671,7 @@ msgstr "" "contenus :\n" "%s" -#: unpack-trees.c:129 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4394,7 +4681,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:131 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4403,7 +4690,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par l'extraction :\n" "%%s" -#: unpack-trees.c:134 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4413,7 +4700,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:136 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4422,7 +4709,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par la fusion :\n" "%%s" -#: unpack-trees.c:139 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4432,7 +4719,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:141 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4441,7 +4728,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par %s :\n" "%%s" -#: unpack-trees.c:146 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4452,7 +4739,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:148 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4462,7 +4749,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" "%%s" -#: unpack-trees.c:151 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4472,7 +4759,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:153 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4481,7 +4768,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par la fusion :\n" "%%s" -#: unpack-trees.c:156 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4491,7 +4778,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:158 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4500,12 +4787,12 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par %s :\n" "%%s" -#: unpack-trees.c:165 +#: unpack-trees.c:170 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible." -#: unpack-trees.c:168 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -4515,7 +4802,7 @@ msgstr "" "pas à jour :\n" "%s" -#: unpack-trees.c:170 +#: unpack-trees.c:175 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4526,7 +4813,7 @@ msgstr "" "jour par l'extraction creuse :\n" "%s" -#: unpack-trees.c:172 +#: unpack-trees.c:177 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4537,7 +4824,7 @@ msgstr "" "à jour par extraction creuse :\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:179 #, c-format msgid "" "Cannot update submodule:\n" @@ -4546,12 +4833,12 @@ msgstr "" "Mise à jour impossible pour le sous-module :\n" "%s" -#: unpack-trees.c:251 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "Abandon\n" -#: unpack-trees.c:333 +#: unpack-trees.c:344 msgid "Checking out files" msgstr "Extraction des fichiers" @@ -4592,12 +4879,15 @@ msgstr "échec de la lecture de '%s'" #: worktree.c:291 #, c-format msgid "'%s' at main working tree is not the repository directory" -msgstr "'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt" +msgstr "" +"'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt" #: worktree.c:302 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" -msgstr "le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre de travail" +msgstr "" +"le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre " +"de travail" #: worktree.c:314 #, c-format @@ -4620,7 +4910,7 @@ msgid "could not open '%s' for reading and writing" msgstr "impossible d'ouvrir '%s' en lecture/écriture" #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 -#: builtin/am.c:862 builtin/merge.c:1044 +#: builtin/am.c:862 builtin/merge.c:1042 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" @@ -4634,158 +4924,158 @@ msgstr "impossible d'accéder à '%s'" msgid "unable to get current working directory" msgstr "impossible d'accéder au répertoire de travail courant" -#: wt-status.c:151 +#: wt-status.c:154 msgid "Unmerged paths:" msgstr "Chemins non fusionnés :" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:181 wt-status.c:208 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)" -#: wt-status.c:180 wt-status.c:207 +#: wt-status.c:183 wt-status.c:210 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)" -#: wt-status.c:184 +#: wt-status.c:187 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:186 wt-status.c:190 +#: wt-status.c:189 wt-status.c:193 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme " "résolu)" -#: wt-status.c:188 +#: wt-status.c:191 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)" -#: wt-status.c:199 wt-status.c:1007 +#: wt-status.c:202 wt-status.c:1015 msgid "Changes to be committed:" msgstr "Modifications qui seront validées :" -#: wt-status.c:217 wt-status.c:1016 +#: wt-status.c:220 wt-status.c:1024 msgid "Changes not staged for commit:" msgstr "Modifications qui ne seront pas validées :" -#: wt-status.c:221 +#: wt-status.c:224 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)" -#: wt-status.c:223 +#: wt-status.c:226 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera " "validé)" -#: wt-status.c:224 +#: wt-status.c:227 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications " "dans la copie de travail)" -#: wt-status.c:226 +#: wt-status.c:229 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)" -#: wt-status.c:238 +#: wt-status.c:241 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)" -#: wt-status.c:253 +#: wt-status.c:256 msgid "both deleted:" msgstr "supprimé des deux côtés :" -#: wt-status.c:255 +#: wt-status.c:258 msgid "added by us:" msgstr "ajouté par nous :" -#: wt-status.c:257 +#: wt-status.c:260 msgid "deleted by them:" msgstr "supprimé par eux :" -#: wt-status.c:259 +#: wt-status.c:262 msgid "added by them:" msgstr "ajouté par eux :" -#: wt-status.c:261 +#: wt-status.c:264 msgid "deleted by us:" msgstr "supprimé par nous :" -#: wt-status.c:263 +#: wt-status.c:266 msgid "both added:" msgstr "ajouté de deux côtés :" -#: wt-status.c:265 +#: wt-status.c:268 msgid "both modified:" msgstr "modifié des deux côtés :" -#: wt-status.c:275 +#: wt-status.c:278 msgid "new file:" msgstr "nouveau fichier :" -#: wt-status.c:277 +#: wt-status.c:280 msgid "copied:" msgstr "copié :" -#: wt-status.c:279 +#: wt-status.c:282 msgid "deleted:" msgstr "supprimé :" -#: wt-status.c:281 +#: wt-status.c:284 msgid "modified:" msgstr "modifié :" -#: wt-status.c:283 +#: wt-status.c:286 msgid "renamed:" msgstr "renommé :" -#: wt-status.c:285 +#: wt-status.c:288 msgid "typechange:" msgstr "modif. type :" -#: wt-status.c:287 +#: wt-status.c:290 msgid "unknown:" msgstr "inconnu :" -#: wt-status.c:289 +#: wt-status.c:292 msgid "unmerged:" msgstr "non fusionné :" -#: wt-status.c:369 +#: wt-status.c:372 msgid "new commits, " msgstr "nouveaux commits, " -#: wt-status.c:371 +#: wt-status.c:374 msgid "modified content, " msgstr "contenu modifié, " -#: wt-status.c:373 +#: wt-status.c:376 msgid "untracked content, " msgstr "contenu non suivi, " -#: wt-status.c:847 +#: wt-status.c:853 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Votre remisage contient actuellement %d entrée" msgstr[1] "Votre remisage contient actuellement %d entrées" -#: wt-status.c:879 +#: wt-status.c:885 msgid "Submodules changed but not updated:" msgstr "Sous-modules modifiés mais non mis à jour :" -#: wt-status.c:881 +#: wt-status.c:887 msgid "Submodule changes to be committed:" msgstr "Changements du sous-module à valider :" -#: wt-status.c:963 +#: wt-status.c:969 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -4793,107 +5083,107 @@ msgstr "" "Ne touchez pas à la ligne ci-dessus.\n" "Tout ce qui suit sera éliminé." -#: wt-status.c:1076 +#: wt-status.c:1084 msgid "You have unmerged paths." msgstr "Vous avez des chemins non fusionnés." -#: wt-status.c:1079 +#: wt-status.c:1087 msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:1081 +#: wt-status.c:1089 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)" -#: wt-status.c:1086 +#: wt-status.c:1094 msgid "All conflicts fixed but you are still merging." msgstr "Tous les conflits sont réglés mais la fusion n'est pas terminée." -#: wt-status.c:1089 +#: wt-status.c:1097 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:1099 +#: wt-status.c:1107 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:1102 +#: wt-status.c:1110 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:1106 +#: wt-status.c:1114 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:1108 +#: wt-status.c:1116 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:1110 +#: wt-status.c:1118 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1242 +#: wt-status.c:1250 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo est manquant." -#: wt-status.c:1244 +#: wt-status.c:1252 msgid "No commands done." msgstr "Aucune commande réalisée." -#: wt-status.c:1247 +#: wt-status.c:1255 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Dernière commande effectuée (%d commande effectuée) :" msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :" -#: wt-status.c:1258 +#: wt-status.c:1266 #, c-format msgid " (see more in file %s)" msgstr " (voir plus dans le fichier %s)" -#: wt-status.c:1263 +#: wt-status.c:1271 msgid "No commands remaining." msgstr "Aucune commande restante." -#: wt-status.c:1266 +#: wt-status.c:1274 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Prochaine commande à effectuer (%d commande restante) :" msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :" -#: wt-status.c:1274 +#: wt-status.c:1282 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)" -#: wt-status.c:1287 +#: wt-status.c:1295 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Vous êtes en train de rebaser la branche '%s' sur '%s'." -#: wt-status.c:1292 +#: wt-status.c:1300 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1306 +#: wt-status.c:1314 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1308 +#: wt-status.c:1316 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1310 +#: wt-status.c:1318 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (utilisez \"git rebase --abort\" pour extraire la branche d'origine)" -#: wt-status.c:1316 +#: wt-status.c:1324 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1320 +#: wt-status.c:1328 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4901,128 +5191,128 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1325 +#: wt-status.c:1333 msgid "You are currently splitting a commit during a rebase." msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage." -#: wt-status.c:1328 +#: wt-status.c:1336 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")" -#: wt-status.c:1332 +#: wt-status.c:1340 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la " "branche '%s' sur '%s'." -#: wt-status.c:1337 +#: wt-status.c:1345 msgid "You are currently editing a commit during a rebase." msgstr "" "Vous êtes actuellement en train d'éditer un commit pendant un rebasage." -#: wt-status.c:1340 +#: wt-status.c:1348 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1342 +#: wt-status.c:1350 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (utilisez \"git rebase --continue\" quand vous avez effectué toutes vos " "modifications)" -#: wt-status.c:1352 +#: wt-status.c:1360 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1357 +#: wt-status.c:1365 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1360 +#: wt-status.c:1368 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" -#: wt-status.c:1362 +#: wt-status.c:1370 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" -#: wt-status.c:1371 +#: wt-status.c:1379 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1376 +#: wt-status.c:1384 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1379 +#: wt-status.c:1387 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1381 +#: wt-status.c:1389 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1392 +#: wt-status.c:1400 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1396 +#: wt-status.c:1404 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1399 +#: wt-status.c:1407 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)" -#: wt-status.c:1596 +#: wt-status.c:1604 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1602 +#: wt-status.c:1610 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1604 +#: wt-status.c:1612 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1609 +#: wt-status.c:1617 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1611 +#: wt-status.c:1619 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1614 +#: wt-status.c:1622 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1634 +#: wt-status.c:1642 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1635 +#: wt-status.c:1643 msgid "No commits yet" msgstr "Aucun commit" -#: wt-status.c:1649 +#: wt-status.c:1657 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1651 +#: wt-status.c:1659 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1655 +#: wt-status.c:1663 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -5034,32 +5324,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1661 +#: wt-status.c:1669 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1663 +#: wt-status.c:1671 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1669 +#: wt-status.c:1677 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1674 +#: wt-status.c:1682 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " "\"git commit -a\")\n" -#: wt-status.c:1677 +#: wt-status.c:1685 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1680 +#: wt-status.c:1688 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -5068,71 +5358,71 @@ msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents (utilisez \"git add\" pour les suivre)\n" -#: wt-status.c:1683 +#: wt-status.c:1691 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents\n" -#: wt-status.c:1686 +#: wt-status.c:1694 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les " "suivre)\n" -#: wt-status.c:1689 wt-status.c:1694 +#: wt-status.c:1697 wt-status.c:1702 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1692 +#: wt-status.c:1700 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n" -#: wt-status.c:1696 +#: wt-status.c:1704 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1809 +#: wt-status.c:1817 msgid "No commits yet on " msgstr "Encore aucun commit sur " -#: wt-status.c:1813 +#: wt-status.c:1821 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1844 +#: wt-status.c:1852 msgid "different" msgstr "différent" -#: wt-status.c:1846 wt-status.c:1854 +#: wt-status.c:1854 wt-status.c:1862 msgid "behind " msgstr "derrière " -#: wt-status.c:1849 wt-status.c:1852 +#: wt-status.c:1857 wt-status.c:1860 msgid "ahead " msgstr "devant " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2358 +#: wt-status.c:2366 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "Impossible de %s : vous avez des modifications non indexées." -#: wt-status.c:2364 +#: wt-status.c:2372 msgid "additionally, your index contains uncommitted changes." msgstr "de plus, votre index contient des modifications non validées." -#: wt-status.c:2366 +#: wt-status.c:2374 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossible : votre index contient des modifications non validées." -#: compat/precompose_utf8.c:58 builtin/clone.c:440 +#: compat/precompose_utf8.c:58 builtin/clone.c:442 #, c-format msgid "failed to unlink '%s'" msgstr "échec lors de l'unlink de '%s'" @@ -5146,7 +5436,7 @@ msgstr "git add [<options>] [--] <chemin>..." msgid "unexpected diff status %c" msgstr "état de diff inattendu %c" -#: builtin/add.c:88 builtin/commit.c:257 +#: builtin/add.c:88 builtin/commit.c:266 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" @@ -5190,82 +5480,82 @@ msgstr "Patch vide. Abandon." msgid "Could not apply '%s'" msgstr "Impossible d'appliquer '%s'" -#: builtin/add.c:271 +#: builtin/add.c:269 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124 -#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 -#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 +#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123 +#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557 +#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:294 +#: builtin/add.c:292 msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302 +#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302 msgid "select hunks interactively" msgstr "sélection interactive des sections" -#: builtin/add.c:296 +#: builtin/add.c:294 msgid "edit current diff and apply" msgstr "édition du diff actuel et application" -#: builtin/add.c:297 +#: builtin/add.c:295 msgid "allow adding otherwise ignored files" msgstr "permettre l'ajout de fichiers ignorés" -#: builtin/add.c:298 +#: builtin/add.c:296 msgid "update tracked files" msgstr "mettre à jour les fichiers suivis" -#: builtin/add.c:299 +#: builtin/add.c:297 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)" -#: builtin/add.c:300 +#: builtin/add.c:298 msgid "record only the fact that the path will be added later" msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard" -#: builtin/add.c:301 +#: builtin/add.c:299 msgid "add changes from all tracked and untracked files" msgstr "ajouter les modifications de tous les fichiers suivis et non suivis" -#: builtin/add.c:304 +#: builtin/add.c:302 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignorer les chemins effacés dans la copie de travail (identique à --no-all)" -#: builtin/add.c:306 +#: builtin/add.c:304 msgid "don't add, only refresh the index" msgstr "ne pas ajouter, juste rafraîchir l'index" -#: builtin/add.c:307 +#: builtin/add.c:305 msgid "just skip files which cannot be added because of errors" msgstr "" "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait " "d'erreurs" -#: builtin/add.c:308 +#: builtin/add.c:306 msgid "check if - even missing - files are ignored in dry run" msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide" -#: builtin/add.c:309 builtin/update-index.c:964 +#: builtin/add.c:307 builtin/update-index.c:974 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:309 builtin/update-index.c:965 +#: builtin/add.c:307 builtin/update-index.c:975 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exécutable pour les fichiers listés" -#: builtin/add.c:311 +#: builtin/add.c:309 msgid "warn when adding an embedded repository" msgstr "avertir lors de l'ajout d'un dépôt embarqué" -#: builtin/add.c:326 +#: builtin/add.c:324 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -5296,48 +5586,48 @@ msgstr "" "\n" "Référez-vous à \"git help submodule\" pour plus d'information." -#: builtin/add.c:354 +#: builtin/add.c:352 #, c-format msgid "adding embedded git repository: %s" msgstr "dépôt git embarqué ajouté : %s" -#: builtin/add.c:372 +#: builtin/add.c:370 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Utilisez -f si vous voulez réellement les ajouter.\n" -#: builtin/add.c:380 +#: builtin/add.c:378 msgid "adding files failed" msgstr "échec de l'ajout de fichiers" -#: builtin/add.c:417 +#: builtin/add.c:416 msgid "-A and -u are mutually incompatible" msgstr "-A et -u sont mutuellement incompatibles" -#: builtin/add.c:424 +#: builtin/add.c:423 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run" -#: builtin/add.c:428 +#: builtin/add.c:427 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x" -#: builtin/add.c:443 +#: builtin/add.c:442 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Rien de spécifié, rien n'a été ajouté.\n" -#: builtin/add.c:444 +#: builtin/add.c:443 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" -#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280 -#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316 +#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325 #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 -#: builtin/rm.c:271 builtin/submodule--helper.c:326 +#: builtin/rm.c:270 builtin/submodule--helper.c:328 msgid "index file corrupt" msgstr "fichier d'index corrompu" @@ -5389,7 +5679,7 @@ msgstr "décalage horaire invalide" msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: builtin/am.c:1013 builtin/clone.c:405 +#: builtin/am.c:1013 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" @@ -5398,7 +5688,7 @@ msgstr "échec de la création du répertoire '%s'" msgid "Failed to split patches." msgstr "Échec de découpage des patchs." -#: builtin/am.c:1148 builtin/commit.c:342 +#: builtin/am.c:1148 builtin/commit.c:351 msgid "unable to write index file" msgstr "impossible d'écrire le fichier d'index" @@ -5507,7 +5797,8 @@ msgstr "le patch a échoué à %s %.*s" #: builtin/am.c:1838 msgid "Use 'git am --show-current-patch' to see the failed patch" -msgstr "Utilisez 'git am --show-current-patch' pour visualiser le patch en échec" +msgstr "" +"Utilisez 'git am --show-current-patch' pour visualiser le patch en échec" #: builtin/am.c:1882 msgid "" @@ -5577,7 +5868,7 @@ msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 -#: builtin/repack.c:182 +#: builtin/repack.c:192 msgid "be quiet" msgstr "être silencieux" @@ -5620,16 +5911,17 @@ msgstr "retirer tout le contenu avant la ligne des ciseaux" msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" -#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 -#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203 -#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197 -#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382 -#: parse-options.h:144 parse-options.h:146 parse-options.h:257 +#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665 +#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:207 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201 +#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631 +#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144 +#: parse-options.h:146 parse-options.h:258 msgid "n" msgstr "n" -#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38 -#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39 +#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38 +#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39 msgid "format" msgstr "format" @@ -5674,8 +5966,8 @@ msgstr "mentir sur la date de validation" msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238 +#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399 msgid "key-id" msgstr "id-clé" @@ -5817,121 +6109,147 @@ msgstr "--write-terms exige deux arguments" msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state ne supporte aucun argument" -#: builtin/blame.c:27 +#: builtin/blame.c:29 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>" -#: builtin/blame.c:32 +#: builtin/blame.c:34 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<options-de-révision> sont documentés dans git-rev-list(1)" -#: builtin/blame.c:677 +#: builtin/blame.c:404 +#, c-format +msgid "expecting a color: %s" +msgstr "couleur attendue : %s" + +#: builtin/blame.c:411 +msgid "must end with a color" +msgstr "doit finir avec une couleur" + +#: builtin/blame.c:697 +#, c-format +msgid "invalid color '%s' in color.blame.repeatedLines" +msgstr "couleur invalide '%s' dans color.blame.repeatedlines" + +#: builtin/blame.c:715 +msgid "invalid value for blame.coloring" +msgstr "valeur invalide pour blame.coloring" + +#: builtin/blame.c:786 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:678 +#: builtin/blame.c:787 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)" -#: builtin/blame.c:679 +#: builtin/blame.c:788 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:680 +#: builtin/blame.c:789 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:681 +#: builtin/blame.c:790 msgid "Force progress reporting" msgstr "Forcer l'affichage de l'état d'avancement" -#: builtin/blame.c:682 +#: builtin/blame.c:791 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:683 +#: builtin/blame.c:792 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:684 +#: builtin/blame.c:793 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:685 +#: builtin/blame.c:794 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:686 +#: builtin/blame.c:795 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:687 +#: builtin/blame.c:796 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:688 +#: builtin/blame.c:797 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:689 +#: builtin/blame.c:798 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:690 +#: builtin/blame.c:799 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:691 +#: builtin/blame.c:800 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:692 +#: builtin/blame.c:801 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:699 +#: builtin/blame.c:802 +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:803 +msgid "color lines by age" +msgstr "colorier les lignes par âge" + +#: builtin/blame.c:810 msgid "Use an experimental heuristic to improve diffs" msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs" -#: builtin/blame.c:701 +#: builtin/blame.c:812 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:702 +#: builtin/blame.c:813 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:703 +#: builtin/blame.c:814 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:704 builtin/blame.c:705 +#: builtin/blame.c:815 builtin/blame.c:816 msgid "score" msgstr "score" -#: builtin/blame.c:704 +#: builtin/blame.c:815 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:705 +#: builtin/blame.c:816 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:706 +#: builtin/blame.c:817 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:706 +#: builtin/blame.c:817 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:753 +#: builtin/blame.c:866 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress ne peut pas être utilisé avec --incremental ou les formats " @@ -5945,18 +6263,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:804 +#: builtin/blame.c:917 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" -#: builtin/blame.c:890 +#: builtin/blame.c:1003 #, 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:936 +#: builtin/blame.c:1049 msgid "Blaming lines" msgstr "Assignation de blâme aux lignes" @@ -6069,69 +6387,69 @@ msgstr "Branche de suivi %s supprimée (précédemment %s).\n" msgid "Deleted branch %s (was %s).\n" msgstr "Branche %s supprimée (précédemment %s).\n" -#: builtin/branch.c:417 builtin/tag.c:58 +#: builtin/branch.c:416 builtin/tag.c:58 msgid "unable to parse format string" msgstr "impossible d'analyser la chaîne de format" -#: builtin/branch.c:450 +#: builtin/branch.c:453 #, c-format msgid "Branch %s is being rebased at %s" msgstr "La branche %s est en cours de rebasage sur %s" -#: builtin/branch.c:454 +#: builtin/branch.c:457 #, c-format msgid "Branch %s is being bisected at %s" msgstr "La branche %s est en cours de bissection sur %s" -#: builtin/branch.c:471 +#: builtin/branch.c:474 msgid "cannot copy the current branch while not on any." msgstr "impossible de copier la branche actuelle, il n'y en a pas." -#: builtin/branch.c:473 +#: builtin/branch.c:476 msgid "cannot rename the current branch while not on any." msgstr "impossible de renommer la branche actuelle, il n'y en a pas." -#: builtin/branch.c:484 +#: builtin/branch.c:487 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:511 +#: builtin/branch.c:514 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:513 +#: builtin/branch.c:516 msgid "Branch copy failed" msgstr "Échec de copie de la branche" -#: builtin/branch.c:517 +#: builtin/branch.c:520 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Création d'une copie d'une branche mal nommée '%s'" -#: builtin/branch.c:520 +#: builtin/branch.c:523 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'une branche mal nommée '%s'" -#: builtin/branch.c:526 +#: builtin/branch.c:529 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !" -#: builtin/branch.c:535 +#: builtin/branch.c:538 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La branche est renommée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:537 +#: builtin/branch.c:540 msgid "Branch is copied, but update of config-file failed" msgstr "" "La branche est copiée, mais la mise à jour du fichier de configuration a " "échoué" -#: builtin/branch.c:553 +#: builtin/branch.c:556 #, c-format msgid "" "Please edit the description for the branch\n" @@ -6142,184 +6460,186 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/branch.c:586 +#: builtin/branch.c:589 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:588 +#: builtin/branch.c:591 msgid "show hash and subject, give twice for upstream branch" msgstr "afficher le hachage et le sujet, doublé pour la branche amont" -#: builtin/branch.c:589 +#: builtin/branch.c:592 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:590 +#: builtin/branch.c:593 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:592 +#: builtin/branch.c:595 msgid "do not use" msgstr "ne pas utiliser" -#: builtin/branch.c:594 +#: builtin/branch.c:597 msgid "upstream" msgstr "amont" -#: builtin/branch.c:594 +#: builtin/branch.c:597 msgid "change the upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:595 +#: builtin/branch.c:598 msgid "Unset the upstream info" msgstr "Désactiver l'information amont" -#: builtin/branch.c:596 +#: builtin/branch.c:599 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:597 +#: builtin/branch.c:600 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:599 builtin/branch.c:601 +#: builtin/branch.c:602 builtin/branch.c:604 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:600 builtin/branch.c:602 +#: builtin/branch.c:603 builtin/branch.c:605 msgid "print only branches that don't contain the commit" msgstr "afficher seulement les branches qui ne contiennent pas le commit" -#: builtin/branch.c:605 +#: builtin/branch.c:608 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:606 +#: builtin/branch.c:609 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:608 +#: builtin/branch.c:611 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:609 +#: builtin/branch.c:612 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:610 +#: builtin/branch.c:613 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:611 +#: builtin/branch.c:614 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:612 +#: builtin/branch.c:615 msgid "copy a branch and its reflog" msgstr "copier une branche et son reflog" -#: builtin/branch.c:613 +#: builtin/branch.c:616 msgid "copy a branch, even if target exists" msgstr "copier une branche, même si la cible existe" -#: builtin/branch.c:614 +#: builtin/branch.c:617 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:615 +#: builtin/branch.c:618 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:617 +#: builtin/branch.c:620 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:618 +#: builtin/branch.c:621 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:619 +#: builtin/branch.c:622 msgid "print only branches that are merged" msgstr "afficher seulement les branches qui sont fusionnées" -#: builtin/branch.c:620 +#: builtin/branch.c:623 msgid "print only branches that are not merged" msgstr "afficher seulement les branches qui ne sont pas fusionnées" -#: builtin/branch.c:621 +#: builtin/branch.c:624 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411 +#: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 +#: builtin/tag.c:412 msgid "key" msgstr "clé" -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412 +#: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 +#: builtin/tag.c:413 msgid "field name to sort on" msgstr "nom du champ servant à trier" -#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/branch.c:628 builtin/for-each-ref.c:43 builtin/notes.c:408 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 -#: builtin/tag.c:414 +#: builtin/tag.c:415 msgid "object" msgstr "objet" -#: builtin/branch.c:626 +#: builtin/branch.c:629 msgid "print only branches of the object" msgstr "afficher seulement les branches de l'objet" -#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421 +#: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422 msgid "sorting and filtering are case insensitive" msgstr "le tri et le filtrage sont non-sensibles à la casse" -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419 +#: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/branch.c:652 builtin/clone.c:735 +#: builtin/branch.c:655 builtin/clone.c:737 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:675 +#: builtin/branch.c:678 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 +#: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:718 +#: builtin/branch.c:721 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:723 +#: builtin/branch.c:726 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:730 +#: builtin/branch.c:733 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:733 +#: builtin/branch.c:736 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:748 +#: builtin/branch.c:751 msgid "too many branches for a copy operation" msgstr "trop de branches pour une opération de copie" -#: builtin/branch.c:757 +#: builtin/branch.c:760 msgid "too many arguments for a rename operation" msgstr "trop d'arguments pour une opération de renommage" -#: builtin/branch.c:762 +#: builtin/branch.c:765 msgid "too many arguments to set new upstream" msgstr "trop d'arguments pour spécifier une branche amont" -#: builtin/branch.c:766 +#: builtin/branch.c:769 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -6327,37 +6647,37 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 +#: builtin/branch.c:772 builtin/branch.c:794 builtin/branch.c:810 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:773 +#: builtin/branch.c:776 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:785 +#: builtin/branch.c:788 msgid "too many arguments to unset upstream" msgstr "trop d'arguments pour désactiver un amont" -#: builtin/branch.c:789 +#: builtin/branch.c:792 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur " "aucune branche." -#: builtin/branch.c:795 +#: builtin/branch.c:798 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:810 +#: builtin/branch.c:813 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche" -#: builtin/branch.c:813 +#: builtin/branch.c:816 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -6378,7 +6698,7 @@ msgstr "La création d'un colis requiert un dépôt." msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." -#: builtin/cat-file.c:523 +#: builtin/cat-file.c:525 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -6386,7 +6706,7 @@ msgstr "" "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p " "| <type> | --textconv | --filters) [--path=<chemin>] <objet>" -#: builtin/cat-file.c:524 +#: builtin/cat-file.c:526 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -6394,66 +6714,66 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:563 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:564 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:563 +#: builtin/cat-file.c:565 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:567 msgid "exit with zero when there's no error" msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:568 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:570 msgid "for blob objects, run textconv on object's content" msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:572 msgid "for blob objects, run filters on object's content" msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet" -#: builtin/cat-file.c:571 git-submodule.sh:878 +#: builtin/cat-file.c:573 git-submodule.sh:894 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:572 +#: builtin/cat-file.c:574 msgid "use a specific path for --textconv/--filters" msgstr "utiliser un chemin spécifique pour --textconv/--filters" -#: builtin/cat-file.c:574 +#: builtin/cat-file.c:576 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:577 msgid "buffer --batch output" msgstr "bufferiser la sortie de --batch" -#: builtin/cat-file.c:577 +#: builtin/cat-file.c:579 msgid "show info and content of objects fed from the standard input" msgstr "" "afficher l'information et le contenu des objets passés en entrée standard" -#: builtin/cat-file.c:580 +#: builtin/cat-file.c:582 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" -#: builtin/cat-file.c:583 +#: builtin/cat-file.c:585 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "suivre les liens symbolique internes à la copie de travail (utilisé avec --" "batch ou --batch-check)" -#: builtin/cat-file.c:585 +#: builtin/cat-file.c:587 msgid "show all objects with --batch or --batch-check" msgstr "montrer tous les objets avec --batch ou --batch-check" @@ -6482,7 +6802,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:20 builtin/checkout.c:1106 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1113 builtin/gc.c:500 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -6574,9 +6894,9 @@ msgid "write the content to temporary files" msgstr "écrire le contenu dans des fichiers temporaires" #: builtin/checkout-index.c:173 builtin/column.c:31 -#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206 -#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574 -#: builtin/worktree.c:570 +#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219 +#: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591 +#: builtin/worktree.c:610 msgid "string" msgstr "chaîne" @@ -6649,54 +6969,54 @@ msgstr "" msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:505 +#: builtin/checkout.c:506 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:636 +#: builtin/checkout.c:643 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:677 +#: builtin/checkout.c:684 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:681 builtin/clone.c:689 +#: builtin/checkout.c:688 builtin/clone.c:691 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" -#: builtin/checkout.c:685 +#: builtin/checkout.c:692 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:695 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:692 +#: builtin/checkout.c:699 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:694 builtin/checkout.c:1039 +#: builtin/checkout.c:701 builtin/checkout.c:1046 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:696 +#: builtin/checkout.c:703 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:747 +#: builtin/checkout.c:754 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:753 +#: builtin/checkout.c:760 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6719,7 +7039,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:772 +#: builtin/checkout.c:779 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6748,162 +7068,162 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:804 +#: builtin/checkout.c:811 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:808 +#: builtin/checkout.c:815 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:836 builtin/checkout.c:1034 +#: builtin/checkout.c:843 builtin/checkout.c:1041 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:940 +#: builtin/checkout.c:947 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:980 builtin/worktree.c:249 +#: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1016 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1048 +#: builtin/checkout.c:1055 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1051 builtin/checkout.c:1055 +#: builtin/checkout.c:1058 builtin/checkout.c:1062 #, 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:1059 builtin/checkout.c:1062 builtin/checkout.c:1067 -#: builtin/checkout.c:1070 +#: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074 +#: builtin/checkout.c:1077 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1075 +#: builtin/checkout.c:1082 #, 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:1107 builtin/checkout.c:1109 builtin/clone.c:116 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387 -#: builtin/worktree.c:389 +#: builtin/checkout.c:1114 builtin/checkout.c:1116 builtin/clone.c:118 +#: builtin/remote.c:167 builtin/remote.c:169 builtin/worktree.c:433 +#: builtin/worktree.c:435 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1115 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1110 +#: builtin/checkout.c:1117 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1118 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1112 builtin/worktree.c:391 +#: builtin/checkout.c:1119 builtin/worktree.c:437 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1120 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1122 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1122 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1123 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1118 +#: builtin/checkout.c:1125 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1120 +#: builtin/checkout.c:1127 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1129 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1124 builtin/merge.c:239 +#: builtin/checkout.c:1131 builtin/merge.c:240 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263 +#: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264 msgid "style" msgstr "style" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1134 msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1137 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:1132 +#: builtin/checkout.c:1139 msgid "second guess 'git checkout <no-such-branch>'" msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'" -#: builtin/checkout.c:1134 +#: builtin/checkout.c:1141 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:1138 builtin/clone.c:83 builtin/fetch.c:150 -#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556 -#: builtin/send-pack.c:173 +#: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149 +#: builtin/merge.c:237 builtin/pull.c:128 builtin/push.c:572 +#: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1175 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1185 +#: builtin/checkout.c:1192 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1197 msgid "Missing branch name; try -b" msgstr "Nom de branche manquant ; essayez -b" -#: builtin/checkout.c:1226 +#: builtin/checkout.c:1233 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1233 +#: builtin/checkout.c:1240 #, 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:1237 +#: builtin/checkout.c:1244 #, 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:1241 +#: builtin/checkout.c:1248 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6942,7 +7262,7 @@ msgstr "Ignorerait le dépôt %s\n" msgid "failed to remove %s" msgstr "échec de la suppression de %s" -#: builtin/clean.c:302 git-add--interactive.perl:572 +#: builtin/clean.c:302 git-add--interactive.perl:579 #, c-format msgid "" "Prompt help:\n" @@ -6955,7 +7275,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:581 +#: builtin/clean.c:306 git-add--interactive.perl:588 #, c-format msgid "" "Prompt help:\n" @@ -6976,8 +7296,8 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection\n" -#: builtin/clean.c:522 git-add--interactive.perl:547 -#: git-add--interactive.perl:552 +#: builtin/clean.c:522 git-add--interactive.perl:554 +#: git-add--interactive.perl:559 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hein (%s) ?\n" @@ -7002,7 +7322,7 @@ msgstr "Sélectionner les éléments à supprimer" msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:788 git-add--interactive.perl:1710 +#: builtin/clean.c:788 git-add--interactive.perl:1717 #, c-format msgid "Bye.\n" msgstr "Au revoir.\n" @@ -7025,11 +7345,11 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:823 git-add--interactive.perl:1786 +#: builtin/clean.c:823 git-add--interactive.perl:1793 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: builtin/clean.c:824 git-add--interactive.perl:1783 +#: builtin/clean.c:824 git-add--interactive.perl:1790 msgid "What now" msgstr "Et maintenant ?" @@ -7098,147 +7418,149 @@ msgstr "" "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clone.c:40 +#: builtin/clone.c:42 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:85 +#: builtin/clone.c:87 msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479 +#: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479 msgid "create a bare repository" msgstr "créer un dépôt nu" -#: builtin/clone.c:90 +#: builtin/clone.c:92 msgid "create a mirror repository (implies bare)" msgstr "créer un dépôt miroir (implique dépôt nu)" -#: builtin/clone.c:92 +#: builtin/clone.c:94 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" -#: builtin/clone.c:94 +#: builtin/clone.c:96 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, toujours copier" -#: builtin/clone.c:96 +#: builtin/clone.c:98 msgid "setup as shared repository" msgstr "régler comme dépôt partagé" -#: builtin/clone.c:98 builtin/clone.c:102 +#: builtin/clone.c:100 builtin/clone.c:104 msgid "pathspec" msgstr "spécificateur de chemin" -#: builtin/clone.c:98 builtin/clone.c:102 +#: builtin/clone.c:100 builtin/clone.c:104 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" -#: builtin/clone.c:105 +#: builtin/clone.c:107 msgid "number of submodules cloned in parallel" msgstr "nombre de sous-modules clonés en parallèle" -#: builtin/clone.c:106 builtin/init-db.c:476 +#: builtin/clone.c:108 builtin/init-db.c:476 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:107 builtin/init-db.c:477 +#: builtin/clone.c:109 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210 -#: builtin/submodule--helper.c:1577 +#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223 +#: builtin/submodule--helper.c:1594 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:113 +#: builtin/clone.c:115 builtin/submodule--helper.c:1225 +#: builtin/submodule--helper.c:1596 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" -#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/pack-objects.c:3166 builtin/repack.c:213 msgid "name" msgstr "nom" -#: builtin/clone.c:115 +#: builtin/clone.c:117 msgid "use <name> instead of 'origin' to track upstream" msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont" -#: builtin/clone.c:117 +#: builtin/clone.c:119 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" -#: builtin/clone.c:119 +#: builtin/clone.c:121 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813 -#: builtin/pull.c:211 +#: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813 +#: builtin/pull.c:216 msgid "depth" msgstr "profondeur" -#: builtin/clone.c:121 +#: builtin/clone.c:123 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017 +#: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157 #: parse-options.h:154 msgid "time" msgstr "heure" -#: builtin/clone.c:123 +#: builtin/clone.c:125 msgid "create a shallow clone since a specific time" msgstr "créer un clone superficiel depuis une date spécifique" -#: builtin/clone.c:124 builtin/fetch.c:155 +#: builtin/clone.c:126 builtin/fetch.c:154 msgid "revision" msgstr "révision" -#: builtin/clone.c:125 builtin/fetch.c:156 +#: builtin/clone.c:127 builtin/fetch.c:155 msgid "deepen history of shallow clone, excluding rev" msgstr "" "approfondir l'historique d'un clone superficiel en excluant une révision" -#: builtin/clone.c:127 +#: builtin/clone.c:129 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -#: builtin/clone.c:129 +#: builtin/clone.c:131 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:131 +#: builtin/clone.c:133 msgid "any cloned submodules will be shallow" msgstr "tous les sous-modules clonés seront superficiels" -#: builtin/clone.c:132 builtin/init-db.c:485 +#: builtin/clone.c:134 builtin/init-db.c:485 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:133 builtin/init-db.c:486 +#: builtin/clone.c:135 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" -#: builtin/clone.c:134 +#: builtin/clone.c:136 msgid "key=value" msgstr "clé=valeur" -#: builtin/clone.c:135 +#: builtin/clone.c:137 msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224 -#: builtin/push.c:567 +#: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229 +#: builtin/push.c:583 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227 -#: builtin/push.c:569 +#: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232 +#: builtin/push.c:585 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" -#: builtin/clone.c:276 +#: builtin/clone.c:278 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -7246,42 +7568,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:329 +#: builtin/clone.c:331 #, 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:401 +#: builtin/clone.c:403 #, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" -#: builtin/clone.c:409 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:423 +#: builtin/clone.c:425 #, c-format msgid "failed to stat %s\n" msgstr "échec du stat de %s\n" -#: builtin/clone.c:445 +#: builtin/clone.c:447 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:449 +#: builtin/clone.c:451 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:475 +#: builtin/clone.c:477 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:489 +#: builtin/clone.c:491 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -7291,102 +7613,102 @@ msgstr "" "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" "et réessayer l'extraction avec 'git checkout -f HEAD'\n" -#: builtin/clone.c:566 +#: builtin/clone.c:568 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:661 +#: builtin/clone.c:663 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: builtin/clone.c:677 +#: builtin/clone.c:679 #, c-format msgid "unable to update %s" msgstr "impossible de mettre à jour %s" -#: builtin/clone.c:726 +#: builtin/clone.c:728 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:756 +#: builtin/clone.c:758 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:801 +#: builtin/clone.c:803 msgid "unable to write parameters to config file" msgstr "impossible d'écrire les paramètres dans le fichier de configuration" -#: builtin/clone.c:864 +#: builtin/clone.c:866 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" -#: builtin/clone.c:866 +#: builtin/clone.c:868 msgid "cannot unlink temporary alternates file" msgstr "impossible de unlinker le fichier temporaire alternates" -#: builtin/clone.c:906 builtin/receive-pack.c:1946 +#: builtin/clone.c:907 builtin/receive-pack.c:1947 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:910 +#: builtin/clone.c:911 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:923 +#: builtin/clone.c:924 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:926 +#: builtin/clone.c:927 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:939 +#: builtin/clone.c:940 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:945 builtin/fetch.c:1455 +#: builtin/clone.c:946 builtin/fetch.c:1460 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:955 +#: builtin/clone.c:956 #, 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:965 +#: builtin/clone.c:966 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270 -#: builtin/worktree.c:255 builtin/worktree.c:285 +#: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270 +#: builtin/worktree.c:246 builtin/worktree.c:276 #, 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:985 +#: builtin/clone.c:986 #, 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:1005 +#: builtin/clone.c:1006 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:1007 +#: builtin/clone.c:1008 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:1031 +#: builtin/clone.c:1032 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -7460,7 +7782,7 @@ msgstr "Remplissage d'espace sur le côté droit" msgid "Padding space between columns" msgstr "Remplissage d'espace entre les colonnes" -#: builtin/column.c:52 +#: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command doit être le premier argument" @@ -7518,61 +7840,61 @@ msgstr "" "Puis \"git cherry-pick --continue\" continuera le picorage \n" "des commits restants.\n" -#: builtin/commit.c:284 +#: builtin/commit.c:293 msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" -#: builtin/commit.c:325 +#: builtin/commit.c:334 msgid "unable to create temporary index" msgstr "impossible de créer l'index temporaire" -#: builtin/commit.c:331 +#: builtin/commit.c:340 msgid "interactive add failed" msgstr "échec de l'ajout interactif" -#: builtin/commit.c:344 +#: builtin/commit.c:353 msgid "unable to update temporary index" msgstr "impossible de mettre à jour l'index temporaire" -#: builtin/commit.c:346 +#: builtin/commit.c:355 msgid "Failed to update main cache tree" msgstr "Impossible de mettre à jour l'arbre de cache principal" -#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444 +#: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449 msgid "unable to write new_index file" msgstr "impossible d'écrire le fichier new_index" -#: builtin/commit.c:427 +#: builtin/commit.c:432 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." -#: builtin/commit.c:429 +#: builtin/commit.c:434 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." -#: builtin/commit.c:437 +#: builtin/commit.c:442 msgid "cannot read the index" msgstr "impossible de lire l'index" -#: builtin/commit.c:456 +#: builtin/commit.c:461 msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" -#: builtin/commit.c:553 +#: builtin/commit.c:558 #, c-format msgid "commit '%s' lacks author header" msgstr "entête d'auteur manquant dans le commit '%s'" -#: builtin/commit.c:555 +#: builtin/commit.c:560 #, c-format msgid "commit '%s' has malformed author line" msgstr "le commit '%s' a une ligne d'auteur malformée" -#: builtin/commit.c:574 +#: builtin/commit.c:579 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" -#: builtin/commit.c:626 +#: builtin/commit.c:631 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -7580,38 +7902,38 @@ msgstr "" "impossible de sélectionner un caractère de commentaire\n" "qui n'est pas utilisé dans le message de validation actuel" -#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024 +#: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:675 builtin/shortlog.c:309 +#: builtin/commit.c:680 builtin/shortlog.c:316 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" -#: builtin/commit.c:677 +#: builtin/commit.c:682 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" -#: builtin/commit.c:681 +#: builtin/commit.c:686 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:710 builtin/commit.c:718 +#: builtin/commit.c:715 builtin/commit.c:723 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:715 +#: builtin/commit.c:720 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" -#: builtin/commit.c:769 +#: builtin/commit.c:774 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:787 +#: builtin/commit.c:792 #, c-format msgid "" "\n" @@ -7626,7 +7948,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:792 +#: builtin/commit.c:797 #, c-format msgid "" "\n" @@ -7641,7 +7963,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:805 +#: builtin/commit.c:810 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7651,7 +7973,7 @@ msgstr "" "commençant par '%c' seront ignorées, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:813 +#: builtin/commit.c:818 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7662,151 +7984,151 @@ msgstr "" "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n" "si vous le souhaitez. Un message vide abandonne la validation.\n" -#: builtin/commit.c:830 +#: builtin/commit.c:835 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:838 +#: builtin/commit.c:843 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:845 +#: builtin/commit.c:850 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:862 +#: builtin/commit.c:867 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:928 +#: builtin/commit.c:933 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:942 builtin/tag.c:256 +#: builtin/commit.c:947 builtin/tag.c:257 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" -#: builtin/commit.c:986 +#: builtin/commit.c:991 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun " "auteur existant" -#: builtin/commit.c:1000 +#: builtin/commit.c:1005 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Mode de fichier ignoré invalide '%s'" -#: builtin/commit.c:1014 builtin/commit.c:1264 +#: builtin/commit.c:1019 builtin/commit.c:1269 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1052 +#: builtin/commit.c:1057 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1085 +#: builtin/commit.c:1090 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens" -#: builtin/commit.c:1094 +#: builtin/commit.c:1099 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1097 +#: builtin/commit.c:1102 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1099 +#: builtin/commit.c:1104 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." -#: builtin/commit.c:1102 +#: builtin/commit.c:1107 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble" -#: builtin/commit.c:1112 +#: builtin/commit.c:1117 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." -#: builtin/commit.c:1114 +#: builtin/commit.c:1119 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F." -#: builtin/commit.c:1122 +#: builtin/commit.c:1127 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." -#: builtin/commit.c:1139 +#: builtin/commit.c:1144 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Une seule option parmi --include/--only/--all/--interactive/--patch peut " "être utilisée." -#: builtin/commit.c:1141 +#: builtin/commit.c:1146 msgid "No paths with --include/--only does not make sense." msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." -#: builtin/commit.c:1155 builtin/tag.c:542 +#: builtin/commit.c:1160 builtin/tag.c:543 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" -#: builtin/commit.c:1160 +#: builtin/commit.c:1165 msgid "Paths with -a does not make sense." msgstr "Spécifier des chemins avec l'option -a n'a pas de sens." -#: builtin/commit.c:1278 builtin/commit.c:1443 +#: builtin/commit.c:1303 builtin/commit.c:1480 msgid "show status concisely" msgstr "afficher l'état avec concision" -#: builtin/commit.c:1280 builtin/commit.c:1445 +#: builtin/commit.c:1305 builtin/commit.c:1482 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1282 +#: builtin/commit.c:1307 msgid "show stash information" msgstr "afficher l'information de remisage" -#: builtin/commit.c:1284 builtin/commit.c:1447 +#: builtin/commit.c:1309 builtin/commit.c:1484 msgid "compute full ahead/behind values" msgstr "calcule les valeurs complètes en avance/en retard" -#: builtin/commit.c:1286 +#: builtin/commit.c:1311 msgid "version" msgstr "version" -#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542 -#: builtin/worktree.c:541 +#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558 +#: builtin/worktree.c:581 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1289 builtin/commit.c:1451 +#: builtin/commit.c:1314 builtin/commit.c:1488 msgid "show status in long format (default)" msgstr "afficher l'état en format long (par défaut)" -#: builtin/commit.c:1292 builtin/commit.c:1454 +#: builtin/commit.c:1317 builtin/commit.c:1491 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457 -#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396 +#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494 +#: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397 msgid "mode" msgstr "mode" -#: builtin/commit.c:1295 builtin/commit.c:1457 +#: builtin/commit.c:1320 builtin/commit.c:1494 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " "no. (Défaut : all)" -#: builtin/commit.c:1299 +#: builtin/commit.c:1324 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -7814,11 +8136,11 @@ msgstr "" "afficher les fichiers ignorés, \"mode\" facultatif : traditional " "(traditionnel), matching (correspondant), no. (Défaut : traditional)" -#: builtin/commit.c:1301 parse-options.h:167 +#: builtin/commit.c:1326 parse-options.h:167 msgid "when" msgstr "quand" -#: builtin/commit.c:1302 +#: builtin/commit.c:1327 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7826,187 +8148,195 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1304 +#: builtin/commit.c:1329 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1323 +#: builtin/commit.c:1330 +msgid "do not detect renames" +msgstr "ne pas détecter les renommages" + +#: builtin/commit.c:1332 +msgid "detect renames, optionally set similarity index" +msgstr "détecter les renommages, en spécifiant optionnellement le facteur de similarité" + +#: builtin/commit.c:1352 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis" -#: builtin/commit.c:1413 +#: builtin/commit.c:1450 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1414 +#: builtin/commit.c:1451 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1416 +#: builtin/commit.c:1453 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1417 builtin/tag.c:393 +#: builtin/commit.c:1454 builtin/tag.c:394 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1418 +#: builtin/commit.c:1455 msgid "author" msgstr "auteur" -#: builtin/commit.c:1418 +#: builtin/commit.c:1455 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1419 builtin/gc.c:359 +#: builtin/commit.c:1456 builtin/gc.c:501 msgid "date" msgstr "date" -#: builtin/commit.c:1419 +#: builtin/commit.c:1456 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402 -#: builtin/notes.c:565 builtin/tag.c:391 +#: builtin/commit.c:1457 builtin/merge.c:227 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:392 msgid "message" msgstr "message" -#: builtin/commit.c:1420 +#: builtin/commit.c:1457 msgid "commit message" msgstr "message de validation" -#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423 -#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92 +#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460 +#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92 msgid "commit" msgstr "commit" -#: builtin/commit.c:1421 +#: builtin/commit.c:1458 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1422 +#: builtin/commit.c:1459 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1423 +#: builtin/commit.c:1460 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "utiliser un message au format autosquash pour corriger le commit spécifié" -#: builtin/commit.c:1424 +#: builtin/commit.c:1461 msgid "use autosquash formatted message to squash specified commit" msgstr "" "utiliser un message au format autosquash pour compresser le commit spécifié" -#: builtin/commit.c:1425 +#: builtin/commit.c:1462 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:1426 builtin/log.c:1446 builtin/merge.c:240 -#: builtin/pull.c:149 builtin/revert.c:105 +#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:241 +#: builtin/pull.c:154 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1427 +#: builtin/commit.c:1464 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1428 +#: builtin/commit.c:1465 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1429 +#: builtin/commit.c:1466 msgid "default" msgstr "défaut" -#: builtin/commit.c:1429 builtin/tag.c:397 +#: builtin/commit.c:1466 builtin/tag.c:398 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" -#: builtin/commit.c:1430 +#: builtin/commit.c:1467 msgid "include status in commit message template" msgstr "inclure l'état dans le modèle de message de validation" -#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179 +#: builtin/commit.c:1469 builtin/merge.c:239 builtin/pull.c:184 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "signer la validation avec GPG" -#: builtin/commit.c:1435 +#: builtin/commit.c:1472 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1436 +#: builtin/commit.c:1473 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1437 +#: builtin/commit.c:1474 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1438 +#: builtin/commit.c:1475 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1439 +#: builtin/commit.c:1476 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1440 +#: builtin/commit.c:1477 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1441 +#: builtin/commit.c:1478 msgid "bypass pre-commit and commit-msg hooks" msgstr "éviter d'utiliser les crochets pre-commit et commit-msg" -#: builtin/commit.c:1442 +#: builtin/commit.c:1479 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1455 +#: builtin/commit.c:1492 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1456 +#: builtin/commit.c:1493 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1461 +#: builtin/commit.c:1498 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1463 +#: builtin/commit.c:1500 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1536 +#: builtin/commit.c:1573 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1543 +#: builtin/commit.c:1580 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1562 +#: builtin/commit.c:1599 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1573 +#: builtin/commit.c:1610 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abandon de la validation dû à un message de validation vide.\n" -#: builtin/commit.c:1578 +#: builtin/commit.c:1615 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" -#: builtin/commit.c:1613 +#: builtin/commit.c:1650 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -8016,150 +8346,212 @@ msgstr "" "new_index. Vérifiez que le disque n'est pas plein ou que le quota\n" "n'a pas été dépassé, puis lancez \"git reset HEAD\" pour réparer." +#: builtin/commit-graph.c:9 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "git commit-graph [--object-dir <objdir>]" + +#: builtin/commit-graph.c:10 builtin/commit-graph.c:16 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "git commit-graph read [--object-dir <objdir>]" + +#: builtin/commit-graph.c:11 builtin/commit-graph.c:21 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--" +"stdin-commits]" +msgstr "git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--stdin-commits]" + +#: builtin/commit-graph.c:39 builtin/commit-graph.c:92 +#: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466 +msgid "dir" +msgstr "répertoire" + +#: builtin/commit-graph.c:40 builtin/commit-graph.c:93 +#: builtin/commit-graph.c:148 +msgid "The object directory to store the graph" +msgstr "Le répertoire d'objet où stocker le graphe" + +#: builtin/commit-graph.c:95 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "scanner les index compactés listés sur stdin à la recherche de commits" + +#: builtin/commit-graph.c:97 +msgid "start walk at commits listed by stdin" +msgstr "commencer le parcours aux commits listés sur stdin" + +#: builtin/commit-graph.c:99 +msgid "include all commits already in the commit-graph file" +msgstr "inclure tous les commits déjà présents dans le fichier de graphe de commits" + +#: builtin/commit-graph.c:108 +msgid "cannot use both --stdin-commits and --stdin-packs" +msgstr "impossible d'utiliser à la fois --stdin-commits et --stdin-packs" + #: builtin/config.c:10 msgid "git config [<options>]" msgstr "git config [<options>]" -#: builtin/config.c:58 +#: builtin/config.c:101 +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "argument --type non reconnu, %s" + +#: builtin/config.c:123 msgid "Config file location" msgstr "Emplacement du fichier de configuration" -#: builtin/config.c:59 +#: builtin/config.c:124 msgid "use global config file" msgstr "utiliser les fichier de configuration global" -#: builtin/config.c:60 +#: builtin/config.c:125 msgid "use system config file" msgstr "utiliser le fichier de configuration du système" -#: builtin/config.c:61 +#: builtin/config.c:126 msgid "use repository config file" msgstr "utiliser le fichier de configuration du dépôt" -#: builtin/config.c:62 +#: builtin/config.c:127 msgid "use given config file" msgstr "utiliser le fichier de configuration spécifié" -#: builtin/config.c:63 +#: builtin/config.c:128 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:63 +#: builtin/config.c:128 msgid "read config from given blob object" msgstr "lire la configuration depuis l'objet blob fourni" -#: builtin/config.c:64 +#: builtin/config.c:129 msgid "Action" msgstr "Action" -#: builtin/config.c:65 +#: builtin/config.c:130 msgid "get value: name [value-regex]" msgstr "obtenir la valeur : nom [regex-de-valeur]" -#: builtin/config.c:66 +#: builtin/config.c:131 msgid "get all values: key [value-regex]" msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]" -#: builtin/config.c:67 +#: builtin/config.c:132 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]" -#: builtin/config.c:68 +#: builtin/config.c:133 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:69 +#: builtin/config.c:134 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]" -#: builtin/config.c:70 +#: builtin/config.c:135 msgid "add a new variable: name value" msgstr "ajouter une nouvelle variable : nom valeur" -#: builtin/config.c:71 +#: builtin/config.c:136 msgid "remove a variable: name [value-regex]" msgstr "supprimer une variable : nom [regex-de-valeur]" -#: builtin/config.c:72 +#: builtin/config.c:137 msgid "remove all matches: name [value-regex]" msgstr "supprimer toutes les correspondances nom [regex-de-valeur]" -#: builtin/config.c:73 +#: builtin/config.c:138 msgid "rename section: old-name new-name" msgstr "renommer une section : ancien-nom nouveau-nom" -#: builtin/config.c:74 +#: builtin/config.c:139 msgid "remove a section: name" msgstr "supprimer une section : nom" -#: builtin/config.c:75 +#: builtin/config.c:140 msgid "list all" msgstr "afficher tout" -#: builtin/config.c:76 +#: builtin/config.c:141 msgid "open an editor" msgstr "ouvrir un éditeur" -#: builtin/config.c:77 +#: builtin/config.c:142 msgid "find the color configured: slot [default]" msgstr "trouver la couleur configurée : slot [par défaut]" -#: builtin/config.c:78 +#: builtin/config.c:143 msgid "find the color setting: slot [stdout-is-tty]" msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]" -#: builtin/config.c:79 +#: builtin/config.c:144 msgid "Type" msgstr "Type" -#: builtin/config.c:80 +#: builtin/config.c:145 +msgid "value is given this type" +msgstr "ce type est assigné à la valeur" + +#: builtin/config.c:146 msgid "value is \"true\" or \"false\"" msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)" -#: builtin/config.c:81 +#: builtin/config.c:147 msgid "value is decimal number" msgstr "la valeur est un nombre décimal" -#: builtin/config.c:82 +#: builtin/config.c:148 msgid "value is --bool or --int" msgstr "la valeur est --bool ou --int" -#: builtin/config.c:83 +#: builtin/config.c:149 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:84 +#: builtin/config.c:150 msgid "value is an expiry date" msgstr "la valeur est une date d'expiration" -#: builtin/config.c:85 +#: builtin/config.c:151 msgid "Other" msgstr "Autre" -#: builtin/config.c:86 +#: builtin/config.c:152 msgid "terminate values with NUL byte" msgstr "terminer les valeurs avec un caractère NUL" -#: builtin/config.c:87 +#: builtin/config.c:153 msgid "show variable names only" msgstr "n'afficher que les noms de variable" -#: builtin/config.c:88 +#: builtin/config.c:154 msgid "respect include directives on lookup" msgstr "respecter les directives d'inclusion lors de la recherche" -#: builtin/config.c:89 +#: builtin/config.c:155 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:335 +#: builtin/config.c:156 +msgid "value" +msgstr "valeur" + +#: builtin/config.c:156 +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:332 +#, 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:431 msgid "unable to parse default color value" msgstr "impossible de lire la valeur de couleur par défaut" -#: builtin/config.c:479 +#: builtin/config.c:575 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -8174,16 +8566,20 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:507 +#: builtin/config.c:603 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:632 +#: builtin/config.c:606 +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:735 #, c-format msgid "cannot create configuration file %s" msgstr "création impossible du fichier de configuration '%s'" -#: builtin/config.c:645 +#: builtin/config.c:748 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -8192,11 +8588,11 @@ msgstr "" "impossible de surcharger des valeurs multiples avec une seule valeur\n" " Utilisez une regexp, --add ou --replace-all pour modifier %s." -#: builtin/count-objects.c:88 +#: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:98 +#: builtin/count-objects.c:100 msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" @@ -8505,154 +8901,152 @@ msgstr "pas d'<outil> spécifié pour --tool=<outil>" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "pas de <commande> spécifié pour --extcmd=<commande>" -#: builtin/fast-export.c:26 +#: builtin/fast-export.c:27 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [options-de-liste-de-révisions]" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1000 msgid "show progress after <n> objects" msgstr "afficher la progression après <n> objets" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1002 msgid "select handling of signed tags" msgstr "sélectionner la gestion des étiquettes signées" -#: builtin/fast-export.c:1003 +#: builtin/fast-export.c:1005 msgid "select handling of tags that tag filtered objects" msgstr "" "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés" -#: builtin/fast-export.c:1006 +#: builtin/fast-export.c:1008 msgid "Dump marks to this file" msgstr "Enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:1008 +#: builtin/fast-export.c:1010 msgid "Import marks from this file" msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:1010 +#: builtin/fast-export.c:1012 msgid "Fake a tagger when tags lack one" msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas" -#: builtin/fast-export.c:1012 +#: builtin/fast-export.c:1014 msgid "Output full tree for each commit" msgstr "Afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:1014 +#: builtin/fast-export.c:1016 msgid "Use the done feature to terminate the stream" msgstr "Utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:1015 +#: builtin/fast-export.c:1017 msgid "Skip output of blob data" msgstr "Sauter l'affichage de données de blob" -#: builtin/fast-export.c:1016 +#: builtin/fast-export.c:1018 msgid "refspec" msgstr "spécificateur de référence" -#: builtin/fast-export.c:1017 +#: builtin/fast-export.c:1019 msgid "Apply refspec to exported refs" msgstr "Appliquer le spécificateur de référence aux références exportées" -#: builtin/fast-export.c:1018 +#: builtin/fast-export.c:1020 msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -#: builtin/fetch.c:27 +#: builtin/fetch.c:28 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" -#: builtin/fetch.c:28 +#: builtin/fetch.c:29 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:124 builtin/pull.c:188 +#: builtin/fetch.c:123 builtin/pull.c:193 msgid "fetch from all remotes" msgstr "récupérer depuis tous les dépôts distants" -#: builtin/fetch.c:126 builtin/pull.c:191 +#: builtin/fetch.c:125 builtin/pull.c:196 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:128 builtin/pull.c:194 +#: builtin/fetch.c:127 builtin/pull.c:199 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:129 builtin/pull.c:196 +#: builtin/fetch.c:128 builtin/pull.c:201 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:131 +#: builtin/fetch.c:130 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:133 builtin/pull.c:198 +#: builtin/fetch.c:132 builtin/pull.c:203 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:135 +#: builtin/fetch.c:134 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:137 +#: builtin/fetch.c:136 msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules récupérés en parallèle" -#: builtin/fetch.c:139 builtin/pull.c:201 +#: builtin/fetch.c:138 builtin/pull.c:206 msgid "prune remote-tracking branches no longer on remote" msgstr "" "éliminer les branches de suivi distant si la branche n'existe plus dans le " "dépôt distant" -#: builtin/fetch.c:141 +#: builtin/fetch.c:140 msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "éliminer les étiquettes locales qui ont disparu du dépôt distant et qui encombrent les étiquettes modifiées" +msgstr "" +"éliminer les étiquettes locales qui ont disparu du dépôt distant et qui " +"encombrent les étiquettes modifiées" -#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126 +#: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:143 +#: builtin/fetch.c:142 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:147 builtin/pull.c:209 +#: builtin/fetch.c:146 builtin/pull.c:214 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:149 +#: builtin/fetch.c:148 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212 +#: builtin/fetch.c:151 builtin/fetch.c:157 builtin/pull.c:217 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:154 +#: builtin/fetch.c:153 msgid "deepen history of shallow repository based on time" msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date" -#: builtin/fetch.c:160 builtin/pull.c:215 +#: builtin/fetch.c:159 builtin/pull.c:220 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:162 builtin/log.c:1466 -msgid "dir" -msgstr "répertoire" - -#: builtin/fetch.c:163 +#: builtin/fetch.c:162 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:166 +#: builtin/fetch.c:165 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8660,91 +9054,101 @@ msgstr "" "par défaut pour la récupération récursive de sous-modules (priorité plus " "basse que les fichiers de config)" -#: builtin/fetch.c:170 builtin/pull.c:218 +#: builtin/fetch.c:169 builtin/pull.c:223 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:171 builtin/pull.c:220 +#: builtin/fetch.c:170 builtin/pull.c:225 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:172 builtin/pull.c:221 +#: builtin/fetch.c:171 builtin/pull.c:226 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:431 +#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:172 +msgid "server-specific" +msgstr "spécifique au serveur" + +#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "option à transmettre" + +#: builtin/fetch.c:442 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:549 +#: builtin/fetch.c:560 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" "le paramètre de configuration fetch.output contient une valeur invalide %s" -#: builtin/fetch.c:642 +#: builtin/fetch.c:653 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:646 +#: builtin/fetch.c:657 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:659 builtin/fetch.c:739 +#: builtin/fetch.c:670 builtin/fetch.c:750 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:660 +#: builtin/fetch.c:671 msgid "can't fetch in current branch" msgstr "impossible de récupérer dans la branche actuelle" -#: builtin/fetch.c:669 +#: builtin/fetch.c:680 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719 -#: builtin/fetch.c:734 +#: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730 +#: builtin/fetch.c:745 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:689 +#: builtin/fetch.c:700 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:692 +#: builtin/fetch.c:703 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:695 +#: builtin/fetch.c:706 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:734 +#: builtin/fetch.c:745 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:739 +#: builtin/fetch.c:750 msgid "non-fast-forward" msgstr "pas en avance rapide" -#: builtin/fetch.c:784 +#: builtin/fetch.c:795 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n" -#: builtin/fetch.c:804 +#: builtin/fetch.c:815 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "%s rejeté parce que les racines superficielles ne sont pas mises à jour" -#: builtin/fetch.c:892 builtin/fetch.c:988 +#: builtin/fetch.c:903 builtin/fetch.c:999 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:903 +#: builtin/fetch.c:914 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8753,55 +9157,57 @@ msgstr "" "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n" " 'git remote prune %s' pour supprimer des branches anciennes en conflit" -#: builtin/fetch.c:958 +#: builtin/fetch.c:969 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:959 +#: builtin/fetch.c:970 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:991 +#: builtin/fetch.c:1002 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:992 builtin/remote.c:1024 +#: builtin/fetch.c:1003 builtin/remote.c:1033 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:1015 +#: builtin/fetch.c:1026 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu" -#: builtin/fetch.c:1034 +#: builtin/fetch.c:1045 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1048 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:1277 +#: builtin/fetch.c:1287 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1279 builtin/remote.c:97 +#: builtin/fetch.c:1289 builtin/remote.c:98 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1325 builtin/fetch.c:1498 +#: builtin/fetch.c:1335 builtin/fetch.c:1503 msgid "" "--filter can only be used with the remote configured in core.partialClone" -msgstr "--filter ne peut être utilisé qu'avec le dépôt distant configuré dans core.partialClone" +msgstr "" +"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans core." +"partialClone" -#: builtin/fetch.c:1350 +#: builtin/fetch.c:1358 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8809,40 +9215,40 @@ msgstr "" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" "distant depuis lesquels les nouvelles révisions devraient être récupérées." -#: builtin/fetch.c:1394 +#: builtin/fetch.c:1395 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1439 +#: builtin/fetch.c:1444 msgid "Negative depth in --deepen is not supported" msgstr "Une profondeur négative dans --deepen n'est pas supportée" -#: builtin/fetch.c:1441 +#: builtin/fetch.c:1446 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen et --depth sont mutuellement exclusifs" -#: builtin/fetch.c:1446 +#: builtin/fetch.c:1451 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1448 +#: builtin/fetch.c:1453 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow sur un dépôt complet n'a pas de sens" -#: builtin/fetch.c:1464 +#: builtin/fetch.c:1469 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1466 +#: builtin/fetch.c:1471 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all n'a pas de sens avec des spécifications de référence" -#: builtin/fetch.c:1475 +#: builtin/fetch.c:1480 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1482 +#: builtin/fetch.c:1487 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "La récupération d'un groupe et les spécifications de référence n'ont pas de " @@ -8910,7 +9316,7 @@ msgstr "échapper les champs réservés pour compatibilité avec Tcl" msgid "show only <n> matched refs" msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:39 builtin/tag.c:420 +#: builtin/for-each-ref.c:39 builtin/tag.c:421 msgid "respect format colors" msgstr "respecter les couleurs de formatage" @@ -8934,82 +9340,82 @@ 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/fsck.c:568 +#: builtin/fsck.c:569 msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" -#: builtin/fsck.c:660 +#: builtin/fsck.c:661 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<options>] [<objet>...]" -#: builtin/fsck.c:666 +#: builtin/fsck.c:667 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:667 +#: builtin/fsck.c:668 msgid "show dangling objects" msgstr "afficher les objets en suspens" -#: builtin/fsck.c:668 +#: builtin/fsck.c:669 msgid "report tags" msgstr "afficher les étiquettes" -#: builtin/fsck.c:669 +#: builtin/fsck.c:670 msgid "report root nodes" msgstr "signaler les nœuds racines" -#: builtin/fsck.c:670 +#: builtin/fsck.c:671 msgid "make index objects head nodes" msgstr "considérer les objets de l'index comme nœuds tête" # translated from man page -#: builtin/fsck.c:671 +#: builtin/fsck.c:672 msgid "make reflogs head nodes (default)" msgstr "considérer les reflogs comme nœuds tête (par défaut)" -#: builtin/fsck.c:672 +#: builtin/fsck.c:673 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:673 +#: builtin/fsck.c:674 msgid "check only connectivity" msgstr "ne vérifier que la connectivité" -#: builtin/fsck.c:674 +#: builtin/fsck.c:675 msgid "enable more strict checking" msgstr "activer une vérification plus strict" -#: builtin/fsck.c:676 +#: builtin/fsck.c:677 msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:677 builtin/prune.c:108 +#: builtin/fsck.c:678 builtin/prune.c:109 msgid "show progress" msgstr "afficher la progression" -#: builtin/fsck.c:678 +#: builtin/fsck.c:679 msgid "show verbose names for reachable objects" msgstr "afficher les noms étendus pour les objets inaccessibles" -#: builtin/fsck.c:742 +#: builtin/fsck.c:745 msgid "Checking objects" msgstr "Vérification des objets" -#: builtin/gc.c:27 +#: builtin/gc.c:33 msgid "git gc [<options>]" msgstr "git gc [<options>]" -#: builtin/gc.c:80 +#: builtin/gc.c:88 #, c-format msgid "Failed to fstat %s: %s" msgstr "Échec du stat de %s : %s" -#: builtin/gc.c:312 +#: builtin/gc.c:452 #, c-format msgid "Can't stat %s" msgstr "impossible de faire un stat de %s" -#: builtin/gc.c:321 +#: builtin/gc.c:461 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -9025,47 +9431,56 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:360 +#: builtin/gc.c:502 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:362 +#: builtin/gc.c:504 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:363 +#: builtin/gc.c:505 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:366 +#: builtin/gc.c:508 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:384 +#: builtin/gc.c:511 +msgid "repack all other packs except the largest pack" +msgstr "recompacter tous les autres paquets excepté le plus gros paquet" + +#: builtin/gc.c:528 +#, c-format +msgid "failed to parse gc.logexpiry value %s" +msgstr "impossible d'analyser gc.logexpiry %s" + +#: builtin/gc.c:539 #, c-format -msgid "Failed to parse gc.logexpiry value %s" -msgstr "impossible de lire la valeur de gc.logexpiry %s" +msgid "failed to parse prune expiry value %s" +msgstr "impossible d'analyser la valeur d'expiration d'élagage %s" -#: builtin/gc.c:412 +#: builtin/gc.c:559 #, 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:414 +#: builtin/gc.c:561 #, 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:415 +#: builtin/gc.c:562 #, 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:440 +#: builtin/gc.c:598 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -9073,23 +9488,23 @@ 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:487 +#: builtin/gc.c:645 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/grep.c:27 +#: builtin/grep.c:28 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]" -#: builtin/grep.c:225 +#: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep : échec de création du fil: %s" -#: builtin/grep.c:283 +#: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "nombre de fils spécifié invalide (%d) pour %s" @@ -9098,17 +9513,17 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712 +#: builtin/grep.c:293 builtin/index-pack.c:1531 builtin/index-pack.c:1723 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622 +#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" -#: builtin/grep.c:637 +#: builtin/grep.c:638 #, c-format msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" @@ -9315,7 +9730,7 @@ msgstr "" msgid "unable to resolve revision: %s" msgstr "impossible de résoudre la révision : %s" -#: builtin/grep.c:1036 builtin/index-pack.c:1519 +#: builtin/grep.c:1036 builtin/index-pack.c:1527 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" @@ -9517,300 +9932,304 @@ msgstr "'%s' est un alias de '%s'" msgid "usage: %s%s" msgstr "usage : %s%s" -#: builtin/index-pack.c:157 +#: builtin/index-pack.c:158 #, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" -#: builtin/index-pack.c:207 +#: builtin/index-pack.c:208 #, c-format msgid "object type mismatch at %s" msgstr "type d'objet non correspondant à %s" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:228 #, c-format msgid "did not receive expected object %s" msgstr "objet attendu non reçu %s" -#: builtin/index-pack.c:230 +#: builtin/index-pack.c:231 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objet %s : type attendu %s, reçu %s" -#: builtin/index-pack.c:272 +#: builtin/index-pack.c:273 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "impossible de remplir %d octet" msgstr[1] "impossible de remplir %d octets" -#: builtin/index-pack.c:282 +#: builtin/index-pack.c:283 msgid "early EOF" msgstr "fin de fichier prématurée" -#: builtin/index-pack.c:283 +#: builtin/index-pack.c:284 msgid "read error on input" msgstr "erreur de lecture sur l'entrée" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:296 msgid "used more bytes than were available" msgstr "plus d'octets utilisés que disponibles" -#: builtin/index-pack.c:302 +#: builtin/index-pack.c:303 msgid "pack too large for current definition of off_t" msgstr "le paquet est trop grand pour la définition actuelle de off_t" -#: builtin/index-pack.c:305 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:306 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "le paquet dépasse la taille maximale permise" -#: builtin/index-pack.c:320 +#: builtin/index-pack.c:321 #, c-format msgid "unable to create '%s'" msgstr "impossible de créer '%s'" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:327 #, c-format msgid "cannot open packfile '%s'" msgstr "impossible d'ouvrir le fichier paquet '%s'" -#: builtin/index-pack.c:340 +#: builtin/index-pack.c:341 msgid "pack signature mismatch" msgstr "la signature du paquet ne correspond pas" -#: builtin/index-pack.c:342 +#: builtin/index-pack.c:343 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "la version de paquet %<PRIu32> non supportée" -#: builtin/index-pack.c:360 +#: builtin/index-pack.c:361 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "le paquet a un mauvais objet à l'offset %<PRIuMAX> : %s" -#: builtin/index-pack.c:481 +#: builtin/index-pack.c:482 #, c-format msgid "inflate returned %d" msgstr "la décompression (inflate) a retourné %d" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:531 msgid "offset value overflow for delta base object" msgstr "dépassement de la valeur d'offset pour l'objet delta de base" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:539 msgid "delta base offset is out of bound" msgstr "l'objet delta de base est hors limite" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:547 #, c-format msgid "unknown object type %d" msgstr "type d'objet inconnu %d" -#: builtin/index-pack.c:577 +#: builtin/index-pack.c:578 msgid "cannot pread pack file" msgstr "impossible de lire (pread) le fichier paquet" -#: builtin/index-pack.c:579 +#: builtin/index-pack.c:580 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "fin prématurée du fichier paquet, %<PRIuMAX> octet lu" msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus" -#: builtin/index-pack.c:605 +#: builtin/index-pack.c:606 msgid "serious inflate inconsistency" msgstr "grave incohérence dans la décompression (inflate)" -#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779 -#: builtin/index-pack.c:818 builtin/index-pack.c:827 +#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780 +#: builtin/index-pack.c:819 builtin/index-pack.c:828 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:753 builtin/pack-objects.c:182 -#: builtin/pack-objects.c:276 +#: builtin/index-pack.c:754 builtin/pack-objects.c:198 +#: builtin/pack-objects.c:292 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" -#: builtin/index-pack.c:816 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object info %s" msgstr "impossible de lire l'information existante de l'objet %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:825 #, c-format msgid "cannot read existing object %s" msgstr "impossible de lire l'objet existant %s" -#: builtin/index-pack.c:838 +#: builtin/index-pack.c:839 #, c-format msgid "invalid blob object %s" msgstr "objet blob invalide %s" -#: builtin/index-pack.c:853 +#: builtin/index-pack.c:842 builtin/index-pack.c:860 +msgid "fsck error in packed object" +msgstr "erreur de fsck dans l'objet empaqueté" + +#: builtin/index-pack.c:857 #, c-format msgid "invalid %s" msgstr "%s invalide" -#: builtin/index-pack.c:856 -msgid "Error in object" -msgstr "Erreur dans l'objet" - -#: builtin/index-pack.c:858 +#: builtin/index-pack.c:862 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Tous les objets enfants de %s ne sont pas accessibles" -#: builtin/index-pack.c:930 builtin/index-pack.c:961 +#: builtin/index-pack.c:934 builtin/index-pack.c:965 msgid "failed to apply delta" msgstr "échec d'application du delta" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1135 msgid "Receiving objects" msgstr "Réception d'objets" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1135 msgid "Indexing objects" msgstr "Indexation d'objets" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1169 msgid "pack is corrupted (SHA1 mismatch)" msgstr "le paquet est corrompu (SHA1 ne correspond pas)" -#: builtin/index-pack.c:1170 +#: builtin/index-pack.c:1174 msgid "cannot fstat packfile" msgstr "impossible d'obtenir le statut (fstat) du fichier paquet" -#: builtin/index-pack.c:1173 +#: builtin/index-pack.c:1177 msgid "pack has junk at the end" msgstr "le paquet est invalide à la fin" -#: builtin/index-pack.c:1185 +#: builtin/index-pack.c:1189 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusion extrême dans parse_pack_objects()" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1212 msgid "Resolving deltas" msgstr "Résolution des deltas" -#: builtin/index-pack.c:1219 +#: builtin/index-pack.c:1223 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" -#: builtin/index-pack.c:1261 +#: builtin/index-pack.c:1265 msgid "confusion beyond insanity" msgstr "confusion extrême" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1271 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "complété avec %d objet local" msgstr[1] "complété avec %d objets locaux" -#: builtin/index-pack.c:1279 +#: builtin/index-pack.c:1283 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1287 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "le paquet a %d delta non résolu" msgstr[1] "le paquet a %d deltas non résolus" -#: builtin/index-pack.c:1307 +#: builtin/index-pack.c:1311 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1383 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1397 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'" -#: builtin/index-pack.c:1422 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "impossible d'écrire le fichier %s '%s'" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "impossible de fermer le fichier %s écrit '%s'" -#: builtin/index-pack.c:1454 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1513 +#: builtin/index-pack.c:1521 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1581 +#: builtin/index-pack.c:1590 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1583 +#: builtin/index-pack.c:1592 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'" -#: builtin/index-pack.c:1631 +#: builtin/index-pack.c:1640 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "pas un delta : %d objet" msgstr[1] "pas un delta : %d objets" -#: builtin/index-pack.c:1638 +#: builtin/index-pack.c:1647 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longueur chaînée = %d : %lu objet" msgstr[1] "longueur chaînée = %d : %lu objets" -#: builtin/index-pack.c:1675 +#: builtin/index-pack.c:1684 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1724 builtin/index-pack.c:1727 -#: builtin/index-pack.c:1743 builtin/index-pack.c:1747 +#: builtin/index-pack.c:1735 builtin/index-pack.c:1738 +#: builtin/index-pack.c:1754 builtin/index-pack.c:1758 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1763 +#: builtin/index-pack.c:1774 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1765 +#: builtin/index-pack.c:1776 msgid "--stdin requires a git repository" msgstr "--stdin requiert un dépôt git" -#: builtin/index-pack.c:1771 +#: builtin/index-pack.c:1782 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" +#: builtin/index-pack.c:1832 builtin/unpack-objects.c:578 +msgid "fsck error in pack objects" +msgstr "erreur de fsck dans les objets paquets" + #: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" @@ -9907,11 +10326,6 @@ msgstr "permissions" msgid "specify that the git repository is to be shared amongst several users" msgstr "spécifier que le dépôt git sera partagé entre plusieurs utilisateurs" -#: builtin/init-db.c:516 builtin/init-db.c:521 -#, c-format -msgid "cannot mkdir %s" -msgstr "impossible de créer le répertoire (mkdir) %s" - #: builtin/init-db.c:525 #, c-format msgid "cannot chdir to %s" @@ -10097,7 +10511,7 @@ msgstr "Deux répertoires de sortie ?" msgid "Unknown commit %s" msgstr "Commit inconnu %s" -#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522 +#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Impossible de résoudre '%s' comme une référence valide." @@ -10457,7 +10871,7 @@ msgstr "" msgid "show debugging data" msgstr "afficher les données de débogage" -#: builtin/ls-remote.c:7 +#: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" @@ -10467,41 +10881,41 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<dépôt> [<références>...]]" -#: builtin/ls-remote.c:52 +#: builtin/ls-remote.c:59 msgid "do not print remote URL" msgstr "ne pas afficher les URL distantes" -#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 msgid "exec" msgstr "exécutable" -#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 msgid "path of git-upload-pack on the remote host" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/ls-remote.c:58 +#: builtin/ls-remote.c:65 msgid "limit to tags" msgstr "limiter aux étiquettes" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:66 msgid "limit to heads" msgstr "limiter aux heads" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:67 msgid "do not show peeled tags" msgstr "ne pas afficher les étiquettes pelées" -#: builtin/ls-remote.c:62 +#: builtin/ls-remote.c:69 msgid "take url.<base>.insteadOf into account" msgstr "prendre en compte url.<base>.insteadOf" -#: builtin/ls-remote.c:64 +#: builtin/ls-remote.c:73 msgid "exit with exit code 2 if no matching refs are found" msgstr "" "sortir avec un code d'erreur 2 si aucune correspondance de référence n'est " "trouvée" -#: builtin/ls-remote.c:67 +#: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle" @@ -10548,154 +10962,154 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "mbox vide : '%s'" -#: builtin/merge.c:49 +#: builtin/merge.c:50 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<options>] [<commit>...]" -#: builtin/merge.c:50 +#: builtin/merge.c:51 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:51 +#: builtin/merge.c:52 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:108 +#: builtin/merge.c:109 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:145 +#: builtin/merge.c:146 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" -#: builtin/merge.c:146 +#: builtin/merge.c:147 #, c-format msgid "Available strategies are:" msgstr "Les stratégies disponibles sont :" -#: builtin/merge.c:151 +#: builtin/merge.c:152 #, c-format msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:201 builtin/pull.c:137 +#: builtin/merge.c:202 builtin/pull.c:142 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:204 builtin/pull.c:140 +#: builtin/merge.c:205 builtin/pull.c:145 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:205 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:148 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:207 builtin/pull.c:146 +#: builtin/merge.c:208 builtin/pull.c:151 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:210 builtin/pull.c:152 +#: builtin/merge.c:211 builtin/pull.c:157 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:212 builtin/pull.c:155 +#: builtin/merge.c:213 builtin/pull.c:160 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:214 builtin/pull.c:158 +#: builtin/merge.c:215 builtin/pull.c:163 msgid "edit message before committing" msgstr "éditer le message avant la validation" -#: builtin/merge.c:215 +#: builtin/merge.c:216 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:217 builtin/pull.c:164 +#: builtin/merge.c:218 builtin/pull.c:169 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:221 builtin/pull.c:167 +#: builtin/merge.c:222 builtin/pull.c:172 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:222 builtin/notes.c:777 builtin/pull.c:171 +#: builtin/merge.c:223 builtin/notes.c:777 builtin/pull.c:176 #: builtin/revert.c:109 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:223 builtin/pull.c:172 +#: builtin/merge.c:224 builtin/pull.c:177 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:224 builtin/pull.c:175 +#: builtin/merge.c:225 builtin/pull.c:180 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:225 builtin/pull.c:176 +#: builtin/merge.c:226 builtin/pull.c:181 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:227 +#: builtin/merge.c:228 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:231 +#: builtin/merge.c:232 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:233 +#: builtin/merge.c:234 msgid "continue the current in-progress merge" msgstr "continuer la fusion en cours" -#: builtin/merge.c:235 builtin/pull.c:183 +#: builtin/merge.c:236 builtin/pull.c:188 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" -#: builtin/merge.c:241 +#: builtin/merge.c:242 msgid "verify commit-msg hook" msgstr "vérifier le crochet commit-msg" -#: builtin/merge.c:266 +#: builtin/merge.c:267 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:271 +#: builtin/merge.c:272 msgid "stash failed" msgstr "échec du remisage" -#: builtin/merge.c:276 +#: builtin/merge.c:277 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:298 builtin/merge.c:315 +#: builtin/merge.c:299 builtin/merge.c:316 msgid "read-tree failed" msgstr "read-tree a échoué" -#: builtin/merge.c:345 +#: builtin/merge.c:346 msgid " (nothing to squash)" msgstr " (rien à compresser)" -#: builtin/merge.c:356 +#: builtin/merge.c:357 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressée -- HEAD non mise à jour\n" -#: builtin/merge.c:406 +#: builtin/merge.c:407 #, 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:456 +#: builtin/merge.c:457 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:546 +#: builtin/merge.c:547 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" @@ -10714,19 +11128,19 @@ msgstr "Options inconnue pour merge-recursive : -X%s" msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:749 +#: builtin/merge.c:748 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:758 +#: builtin/merge.c:757 #, 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:764 +#: builtin/merge.c:763 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10743,70 +11157,70 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:800 +#: builtin/merge.c:799 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:820 +#: builtin/merge.c:818 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:873 +#: builtin/merge.c:871 #, 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:912 +#: builtin/merge.c:910 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:914 +#: builtin/merge.c:912 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:916 +#: builtin/merge.c:914 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:921 +#: builtin/merge.c:919 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:974 +#: builtin/merge.c:972 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1076 +#: builtin/merge.c:1074 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" -#: builtin/merge.c:1110 +#: builtin/merge.c:1108 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" -#: builtin/merge.c:1212 +#: builtin/merge.c:1210 msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" -#: builtin/merge.c:1216 +#: builtin/merge.c:1214 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:1228 +#: builtin/merge.c:1226 msgid "--continue expects no arguments" msgstr "--continue ne supporte aucun argument" -#: builtin/merge.c:1232 +#: builtin/merge.c:1230 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:1248 +#: builtin/merge.c:1246 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10814,7 +11228,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1255 +#: builtin/merge.c:1253 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10822,114 +11236,114 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1258 +#: builtin/merge.c:1256 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:1267 +#: builtin/merge.c:1265 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1275 +#: builtin/merge.c:1273 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:1292 +#: builtin/merge.c:1290 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:1294 +#: builtin/merge.c:1292 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:1299 +#: builtin/merge.c:1297 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1301 +#: builtin/merge.c:1299 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:1335 +#: builtin/merge.c:1333 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La validation %s a une signature GPG non fiable, prétendument par %s." -#: builtin/merge.c:1338 +#: builtin/merge.c:1336 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La validation %s a une mauvaise signature GPG prétendument par %s." -#: builtin/merge.c:1341 +#: builtin/merge.c:1339 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: builtin/merge.c:1344 +#: builtin/merge.c:1342 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La validation %s a une signature GPG correcte par %s\n" -#: builtin/merge.c:1403 +#: builtin/merge.c:1401 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1412 +#: builtin/merge.c:1410 msgid "Already up to date." msgstr "Déjà à jour." -#: builtin/merge.c:1422 +#: builtin/merge.c:1420 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1463 +#: builtin/merge.c:1461 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1470 +#: builtin/merge.c:1468 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1495 +#: builtin/merge.c:1493 msgid "Already up to date. Yeeah!" msgstr "Déjà à jour. Ouais !" -#: builtin/merge.c:1501 +#: builtin/merge.c:1499 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1524 builtin/merge.c:1603 +#: builtin/merge.c:1522 builtin/merge.c:1601 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1528 +#: builtin/merge.c:1526 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1592 #, 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:1596 +#: builtin/merge.c:1594 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1603 #, 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:1617 +#: builtin/merge.c:1615 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -11066,27 +11480,27 @@ msgstr "autoriser la création de plus d'un arbre" msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<options>] <source>... <destination>" -#: builtin/mv.c:83 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?" -#: builtin/mv.c:85 builtin/rm.c:289 +#: builtin/mv.c:84 builtin/rm.c:288 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Veuillez indexer vos modifications de .gitmodules ou les remiser pour " "continuer" -#: builtin/mv.c:103 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "%.*s est dans l'index" -#: builtin/mv.c:125 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "forcer le déplacement/renommage même si la cible existe" -#: builtin/mv.c:127 +#: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "sauter les erreurs de déplacement/renommage" @@ -11151,7 +11565,7 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394 +#: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" @@ -11344,12 +11758,12 @@ msgstr "impossible d'écrire l'objet note" msgid "the note contents have been left in %s" msgstr "le contenu de la note a été laissé dans %s" -#: builtin/notes.c:234 builtin/tag.c:506 +#: builtin/notes.c:234 builtin/tag.c:507 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: builtin/notes.c:236 builtin/tag.c:509 +#: builtin/notes.c:236 builtin/tag.c:510 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" @@ -11597,7 +12011,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160 +#: builtin/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" @@ -11618,224 +12032,252 @@ msgstr "utiliser les notes depuis <références-notes>" msgid "unknown subcommand: %s" msgstr "sous-commande inconnue : %s" -#: builtin/pack-objects.c:33 +#: builtin/pack-objects.c:48 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [options...] [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:34 +#: builtin/pack-objects.c:49 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [options...] base-name [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:195 builtin/pack-objects.c:198 +#: builtin/pack-objects.c:211 builtin/pack-objects.c:214 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: builtin/pack-objects.c:791 +#: builtin/pack-objects.c:810 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à " "cause de pack.packSizeLimit" -#: builtin/pack-objects.c:804 +#: builtin/pack-objects.c:823 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1084 +#: builtin/pack-objects.c:1106 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "désactivation de l'écriture en bitmap car certains objets ne sont pas " "compressés" -#: builtin/pack-objects.c:2454 +#: builtin/pack-objects.c:1765 +msgid "Counting objects" +msgstr "Décompte des objets" + +#: builtin/pack-objects.c:1895 +#, c-format +msgid "unable to get size of %s" +msgstr "impossible de récupérer la taille de %s" + +#: builtin/pack-objects.c:1910 +#, c-format +msgid "unable to parse object header of %s" +msgstr "impossible d'analyser l'entête d'objet de %s" + +#: builtin/pack-objects.c:2564 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2735 msgid "invalid value for --missing" msgstr "valeur invalide pour --missing" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:3067 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:3071 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2962 +#: builtin/pack-objects.c:3102 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2964 +#: builtin/pack-objects.c:3104 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2966 +#: builtin/pack-objects.c:3106 msgid "show progress meter during object writing phase" msgstr "afficher la barre de progression durant la phase d'écrite des objets" -#: builtin/pack-objects.c:2969 +#: builtin/pack-objects.c:3109 msgid "similar to --all-progress when progress meter is shown" msgstr "similaire à --all-progress quand la barre de progression est affichée" -#: builtin/pack-objects.c:2970 +#: builtin/pack-objects.c:3110 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2971 +#: builtin/pack-objects.c:3111 msgid "write the pack index file in the specified idx format version" msgstr "" "écrire le fichier d'index du paquet dans le format d'index de version " "spécifié" -#: builtin/pack-objects.c:2974 +#: builtin/pack-objects.c:3114 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2976 +#: builtin/pack-objects.c:3116 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2978 +#: builtin/pack-objects.c:3118 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2980 +#: builtin/pack-objects.c:3120 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2982 +#: builtin/pack-objects.c:3122 msgid "limit pack window by memory in addition to object limit" msgstr "" "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets" -#: builtin/pack-objects.c:2984 +#: builtin/pack-objects.c:3124 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "longueur maximum de la chaîne de delta autorisée dans le paquet résultant" -#: builtin/pack-objects.c:2986 +#: builtin/pack-objects.c:3126 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2988 +#: builtin/pack-objects.c:3128 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2990 +#: builtin/pack-objects.c:3130 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:3132 msgid "use threads when searching for best delta matches" msgstr "" "utiliser des fils lors de la recherche pour une meilleurs correspondance des " "deltas" -#: builtin/pack-objects.c:2994 +#: builtin/pack-objects.c:3134 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2996 +#: builtin/pack-objects.c:3136 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2998 +#: builtin/pack-objects.c:3138 msgid "limit the objects to those that are not yet packed" msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3141 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3144 msgid "include objects referred by reflog entries" msgstr "inclure les objets référencés par les éléments de reflog" -#: builtin/pack-objects.c:3007 +#: builtin/pack-objects.c:3147 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:3010 +#: builtin/pack-objects.c:3150 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:3012 +#: builtin/pack-objects.c:3152 msgid "include tag objects that refer to objects to be packed" msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter" -#: builtin/pack-objects.c:3014 +#: builtin/pack-objects.c:3154 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:3016 +#: builtin/pack-objects.c:3156 msgid "pack loose unreachable objects" msgstr "empaqueter les objets inaccessibles détachés" -#: builtin/pack-objects.c:3018 +#: builtin/pack-objects.c:3158 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:3021 +#: builtin/pack-objects.c:3161 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:3023 +#: builtin/pack-objects.c:3163 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:3025 +#: builtin/pack-objects.c:3165 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:3027 +#: builtin/pack-objects.c:3167 +msgid "ignore this pack" +msgstr "ignorer ce paquet" + +#: builtin/pack-objects.c:3169 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:3029 +#: builtin/pack-objects.c:3171 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:3031 +#: builtin/pack-objects.c:3173 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "utiliser un index en bitmap si disponible pour accélerer le décompte des " "objets" -#: builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3175 msgid "write a bitmap index together with the pack index" msgstr "écrire un index en bitmap associé à l'index de paquet" -#: builtin/pack-objects.c:3036 +#: builtin/pack-objects.c:3178 msgid "handling for missing objects" msgstr "gestion des objets manquants" -#: builtin/pack-objects.c:3039 +#: builtin/pack-objects.c:3181 msgid "do not pack objects in promisor packfiles" msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs" -#: builtin/pack-objects.c:3178 -msgid "Counting objects" -msgstr "Décompte des objets" +#: builtin/pack-objects.c:3205 +#, c-format +msgid "delta chain depth %d is too deep, forcing %d" +msgstr "la profondeur %d de chaîne de delta est trop grande, forcée à %d" + +#: builtin/pack-objects.c:3210 +#, c-format +msgid "pack.deltaCacheLimit is too high, forcing %d" +msgstr "pack.deltaCacheLimit est trop grand, forcé à %d" -#: builtin/pack-refs.c:6 +#: builtin/pack-objects.c:3338 +msgid "Enumerating objects" +msgstr "Énumération des objets" + +#: builtin/pack-refs.c:7 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<options>]" -#: builtin/pack-refs.c:14 +#: builtin/pack-refs.c:15 msgid "pack everything" msgstr "empaqueter tout" -#: builtin/pack-refs.c:15 +#: builtin/pack-refs.c:16 msgid "prune loose refs (default)" msgstr "éliminer les références perdues (défaut)" @@ -11851,65 +12293,65 @@ msgstr "Suppression des objets dupliqués" msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>…]" -#: builtin/prune.c:107 +#: builtin/prune.c:108 msgid "report pruned objects" msgstr "afficher les objets éliminés" -#: builtin/prune.c:110 +#: builtin/prune.c:111 msgid "expire objects older than <time>" msgstr "faire expirer les objets plus vieux que <heure>" -#: builtin/prune.c:112 +#: builtin/prune.c:113 msgid "limit traversal to objects outside promisor packfiles" msgstr "limiter la traversée aux objets hors des fichiers paquets prometteurs" -#: builtin/prune.c:126 +#: builtin/prune.c:127 msgid "cannot prune in a precious-objects repo" msgstr "impossible de nettoyer dans un dépôt d'objets précieux" -#: builtin/pull.c:54 builtin/pull.c:56 +#: builtin/pull.c:59 builtin/pull.c:61 #, c-format msgid "Invalid value for %s: %s" msgstr "Valeur invalide pour %s : %s" -#: builtin/pull.c:76 +#: builtin/pull.c:81 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/pull.c:127 +#: builtin/pull.c:132 msgid "control for recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/pull.c:131 +#: builtin/pull.c:136 msgid "Options related to merging" msgstr "Options relatives à la fusion" -#: builtin/pull.c:134 +#: builtin/pull.c:139 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" -#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 +#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" -#: builtin/pull.c:170 +#: builtin/pull.c:175 msgid "automatically stash/stash pop before and after rebase" msgstr "remiser avant et réappliquer après le rebasage automatiquement" -#: builtin/pull.c:186 +#: builtin/pull.c:191 msgid "Options related to fetching" msgstr "Options relatives au rapatriement" -#: builtin/pull.c:204 +#: builtin/pull.c:209 msgid "number of submodules pulled in parallel" msgstr "nombre de sous-modules tirés en parallèle" -#: builtin/pull.c:299 +#: builtin/pull.c:304 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valeur invalide pour pull.ff : %s" -#: builtin/pull.c:415 +#: builtin/pull.c:420 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11917,14 +12359,14 @@ msgstr "" "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous " "venez de récupérer." -#: builtin/pull.c:417 +#: builtin/pull.c:422 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Il n'y a pas de candidate avec laquelle fusionner parmi les références que " "vous venez de récupérer." -#: builtin/pull.c:418 +#: builtin/pull.c:423 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11932,7 +12374,7 @@ msgstr "" "Généralement, cela signifie que vous avez indiqué un spécificateur\n" "de référence joker qui n'a pas eu de correspondance sur le serveur distant." -#: builtin/pull.c:421 +#: builtin/pull.c:426 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11944,44 +12386,44 @@ msgstr "" "configuration\n" "pour la branche actuelle, vous devez spécifier la branche avec la commande." -#: builtin/pull.c:426 git-parse-remote.sh:73 +#: builtin/pull.c:431 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Vous n'êtes actuellement sur aucune branche." -#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79 +#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser." -#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82 +#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Veuillez spécifier une branche avec laquelle fusionner." -#: builtin/pull.c:431 builtin/pull.c:446 +#: builtin/pull.c:436 builtin/pull.c:451 msgid "See git-pull(1) for details." msgstr "Référez-vous à git-pull(1) pour de plus amples détails." -#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 +#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<distant>" -#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477 +#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branche>" -#: builtin/pull.c:441 git-parse-remote.sh:75 +#: builtin/pull.c:446 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Pas d'information de suivi distant pour la branche actuelle." -#: builtin/pull.c:450 git-parse-remote.sh:95 +#: builtin/pull.c:455 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si vous souhaitez indiquer l'information de suivi distant pour cette " "branche, vous pouvez le faire avec :" -#: builtin/pull.c:455 +#: builtin/pull.c:460 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11991,29 +12433,29 @@ msgstr "" "'%s'\n" "du serveur distant, mais cette référence n'a pas été récupérée." -#: builtin/pull.c:819 +#: builtin/pull.c:826 msgid "ignoring --verify-signatures for rebase" msgstr "--verify-signatures est ignoré pour un rebasage" -#: builtin/pull.c:867 +#: builtin/pull.c:874 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase." -#: builtin/pull.c:875 +#: builtin/pull.c:882 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:878 +#: builtin/pull.c:885 msgid "pull with rebase" msgstr "tirer avec un rebasage" -#: builtin/pull.c:879 +#: builtin/pull.c:886 msgid "please commit or stash them." msgstr "veuillez les valider ou les remiser." -#: builtin/pull.c:904 +#: builtin/pull.c:911 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -12024,7 +12466,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:909 +#: builtin/pull.c:916 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -12041,33 +12483,33 @@ msgstr "" "$ git reset --hard\n" "pour régénérer." -#: builtin/pull.c:924 +#: builtin/pull.c:931 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tête vide." -#: builtin/pull.c:928 +#: builtin/pull.c:935 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." -#: builtin/pull.c:935 +#: builtin/pull.c:942 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossible de rebaser avec des modifications de sous-modules enregistrées " "localement" -#: builtin/push.c:17 +#: builtin/push.c:19 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/push.c:92 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "raccourci d'étiquette sans <étiquette>" -#: builtin/push.c:102 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "--delete accepte seulement des noms entiers de références cibles" -#: builtin/push.c:146 +#: builtin/push.c:165 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -12076,7 +12518,7 @@ msgstr "" "Pour choisir l'option de manière permanente, voir push.default dans 'git " "help config'." -#: builtin/push.c:149 +#: builtin/push.c:168 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -12101,7 +12543,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:164 +#: builtin/push.c:183 #, c-format msgid "" "You are not currently on a branch.\n" @@ -12116,7 +12558,7 @@ msgstr "" "\n" " git push %s HEAD:<nom-de-la-branche-amont>\n" -#: builtin/push.c:178 +#: builtin/push.c:197 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -12130,13 +12572,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:186 +#: builtin/push.c:205 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "La branche courante %s a de multiples branches amont, impossible de pousser." -#: builtin/push.c:189 +#: builtin/push.c:208 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -12147,14 +12589,14 @@ msgstr "" "pas une branche amont de votre branche courante '%s', sans me dire\n" "quoi pousser pour mettre à jour quelle branche amont." -#: builtin/push.c:248 +#: builtin/push.c:267 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Vous n'avez pas spécifié de spécifications de référence à pousser, et push." "default est \"nothing\"." -#: builtin/push.c:255 +#: builtin/push.c:274 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -12169,7 +12611,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:261 +#: builtin/push.c:280 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -12184,7 +12626,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:267 +#: builtin/push.c:286 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -12202,13 +12644,13 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:274 +#: builtin/push.c:293 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Les mises à jour ont été rejetées car l'étiquette existe déjà dans la " "branche distante." -#: builtin/push.c:277 +#: builtin/push.c:296 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -12220,22 +12662,22 @@ msgstr "" "pointer\n" "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" -#: builtin/push.c:337 +#: builtin/push.c:357 #, c-format msgid "Pushing to %s\n" msgstr "Poussée vers %s\n" -#: builtin/push.c:341 +#: builtin/push.c:361 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:372 +#: builtin/push.c:395 #, c-format msgid "bad repository '%s'" msgstr "mauvais dépôt '%s'" -#: builtin/push.c:373 +#: builtin/push.c:396 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -12257,113 +12699,105 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:391 -msgid "--all and --tags are incompatible" -msgstr "--all et --tags sont incompatibles" - -#: builtin/push.c:392 -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:397 -msgid "--mirror and --tags are incompatible" -msgstr "--mirror et --tags sont incompatibles" - -#: builtin/push.c:398 -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:403 -msgid "--all and --mirror are incompatible" -msgstr "--all et --mirror sont incompatibles" - -#: builtin/push.c:535 +#: builtin/push.c:551 msgid "repository" msgstr "dépôt" -#: builtin/push.c:536 builtin/send-pack.c:163 +#: builtin/push.c:552 builtin/send-pack.c:164 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:537 builtin/send-pack.c:165 +#: builtin/push.c:553 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:539 +#: builtin/push.c:555 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:540 +#: builtin/push.c:556 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:543 builtin/send-pack.c:166 +#: builtin/push.c:559 builtin/send-pack.c:167 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:545 builtin/send-pack.c:180 +#: builtin/push.c:561 builtin/send-pack.c:181 msgid "refname>:<expect" msgstr "nom de référence>:<attendu" -#: builtin/push.c:546 builtin/send-pack.c:181 +#: builtin/push.c:562 builtin/send-pack.c:182 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:549 +#: builtin/push.c:565 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:551 builtin/send-pack.c:174 +#: builtin/push.c:567 builtin/send-pack.c:175 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 -#: builtin/send-pack.c:161 +#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161 +#: builtin/send-pack.c:162 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:554 +#: builtin/push.c:570 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:557 +#: builtin/push.c:573 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:559 +#: builtin/push.c:575 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:560 +#: builtin/push.c:576 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:563 builtin/send-pack.c:168 +#: builtin/push.c:579 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "signer la poussée avec GPG" -#: builtin/push.c:565 builtin/send-pack.c:175 +#: builtin/push.c:581 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "demande une transaction atomique sur le serveur distant" -#: builtin/push.c:566 builtin/send-pack.c:171 -msgid "server-specific" -msgstr "spécifique au serveur" - -#: builtin/push.c:566 builtin/send-pack.c:172 -msgid "option to transmit" -msgstr "option à transmettre" - -#: builtin/push.c:583 +#: builtin/push.c:599 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:585 +#: builtin/push.c:601 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" #: builtin/push.c:604 +msgid "--all and --tags are incompatible" +msgstr "--all et --tags sont incompatibles" + +#: builtin/push.c:606 +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:610 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror et --tags sont incompatibles" + +#: builtin/push.c:612 +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:615 +msgid "--all and --mirror are incompatible" +msgstr "--all et --mirror sont incompatibles" + +#: builtin/push.c:634 msgid "push options must not have new line characters" msgstr "" "les options de poussée ne peuvent pas contenir de caractères de nouvelle " @@ -12380,67 +12814,67 @@ msgstr "" "sparse-checkout] [--index-output=<fichier>] (--empty | <arbre ou apparenté " "1> [<arbre ou apparenté 2> [<arbre ou apparenté 3>]])" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:120 msgid "write resulting index to <file>" msgstr "écrire l'index résultant dans <fichier>" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:123 msgid "only empty the index" msgstr "juste vider l'index" -#: builtin/read-tree.c:126 +#: builtin/read-tree.c:125 msgid "Merging" msgstr "Fusion" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:127 msgid "perform a merge in addition to a read" msgstr "effectuer une fusion en plus d'une lecture" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:129 msgid "3-way merge if no file level merging required" msgstr "fusion à 3 points si aucune fusion de niveau fichier n'est requise" -#: builtin/read-tree.c:132 +#: builtin/read-tree.c:131 msgid "3-way merge in presence of adds and removes" msgstr "fusion à 3 points en présence d'ajouts et suppressions" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:133 msgid "same as -m, but discard unmerged entries" msgstr "comme -m, mais annule les éléments non fusionnés" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:134 msgid "<subdirectory>/" msgstr "<sous-répertoire>/" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:135 msgid "read the tree into the index under <subdirectory>/" msgstr "lire l'arbre dans l'index dans <sous-répertoire>/" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:138 msgid "update working tree with merge result" msgstr "mettre à jour la copie de travail avec le résultat de la fusion" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:140 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:142 +#: builtin/read-tree.c:141 msgid "allow explicitly ignored files to be overwritten" msgstr "autoriser explicitement les fichiers ignorés à être écrasés" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:144 msgid "don't check the working tree after merging" msgstr "ne pas vérifier la copie de travail après la fusion" -#: builtin/read-tree.c:146 +#: builtin/read-tree.c:145 msgid "don't update the index or the work tree" msgstr "ne pas mettre à jour l'index ou la copie de travail" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:147 msgid "skip applying sparse checkout filter" msgstr "sauter l'application du filtre d'extraction creuse" -#: builtin/read-tree.c:150 +#: builtin/read-tree.c:149 msgid "debug unpack-trees" msgstr "déboguer unpack-trees" @@ -12457,46 +12891,58 @@ msgid "allow commits with empty messages" msgstr "autoriser les validations avec des messages vides" #: builtin/rebase--helper.c:27 +msgid "rebase merge commits" +msgstr "rebaser les commits de fusion" + +#: builtin/rebase--helper.c:29 +msgid "keep original branch points of cousins" +msgstr "conserver les points de branchement de cousins originaux" + +#: builtin/rebase--helper.c:30 msgid "continue rebase" msgstr "continuer le rebasage" -#: builtin/rebase--helper.c:29 +#: builtin/rebase--helper.c:32 msgid "abort rebase" msgstr "abandonner le rebasage" -#: builtin/rebase--helper.c:32 +#: builtin/rebase--helper.c:35 msgid "make rebase script" msgstr "créer les script de rebasage" -#: builtin/rebase--helper.c:34 +#: builtin/rebase--helper.c:37 msgid "shorten commit ids in the todo list" msgstr "raccourcir les identifiants de commits dans la liste à-faire" -#: builtin/rebase--helper.c:36 +#: builtin/rebase--helper.c:39 msgid "expand commit ids in the todo list" msgstr "étendre les identifiants de commit dans la liste à-faire" -#: builtin/rebase--helper.c:38 +#: builtin/rebase--helper.c:41 msgid "check the todo list" msgstr "vérifier la liste à-faire" -#: builtin/rebase--helper.c:40 +#: builtin/rebase--helper.c:43 msgid "skip unnecessary picks" msgstr "éviter les commandes de picorage non nécessaires" -#: builtin/rebase--helper.c:42 +#: builtin/rebase--helper.c:45 msgid "rearrange fixup/squash lines" msgstr "réarranger les lignes fixup/squash" -#: builtin/rebase--helper.c:44 +#: builtin/rebase--helper.c:47 msgid "insert exec commands in todo list" msgstr "insérer les commandes exec dans la liste à-faire" -#: builtin/receive-pack.c:30 +#: builtin/rebase--helper.c:68 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges" + +#: builtin/receive-pack.c:31 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <répertoire-git>" -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:842 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" @@ -12526,7 +12972,7 @@ msgstr "" "Pour éliminer ce message et conserver le comportement par défaut,\n" "réglez « receive.denyCurrentBranch » à 'refuse'." -#: builtin/receive-pack.c:861 +#: builtin/receive-pack.c:862 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" @@ -12546,11 +12992,11 @@ msgstr "" "\n" "Pour éliminer ce message, réglez-le à 'refuse'." -#: builtin/receive-pack.c:1934 +#: builtin/receive-pack.c:1935 msgid "quiet" msgstr "quiet" -#: builtin/receive-pack.c:1948 +#: builtin/receive-pack.c:1949 msgid "You must specify a directory." msgstr "Vous devez spécifier un répertoire." @@ -12559,11 +13005,11 @@ msgstr "Vous devez spécifier un répertoire." msgid "'%s' is not a valid timestamp" msgstr "'%s' n'est pas un horodatage valide" -#: builtin/remote.c:13 +#: builtin/remote.c:14 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:14 +#: builtin/remote.c:15 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -12571,83 +13017,83 @@ msgstr "" "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nom> <url>" -#: builtin/remote.c:15 builtin/remote.c:35 +#: builtin/remote.c:16 builtin/remote.c:36 msgid "git remote rename <old> <new>" msgstr "git remote rename <ancienne> <nouvelle>" -#: builtin/remote.c:16 builtin/remote.c:40 +#: builtin/remote.c:17 builtin/remote.c:41 msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: builtin/remote.c:17 builtin/remote.c:45 +#: builtin/remote.c:18 builtin/remote.c:46 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nom>" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nom>" -#: builtin/remote.c:20 +#: builtin/remote.c:21 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<groupe> | " "<distante>)...]" -#: builtin/remote.c:21 +#: builtin/remote.c:22 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nom> <branche>..." -#: builtin/remote.c:22 builtin/remote.c:71 +#: builtin/remote.c:23 builtin/remote.c:72 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nom>" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nom> <nouvelle-URL>" -#: builtin/remote.c:25 builtin/remote.c:78 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nom> <URL>" -#: builtin/remote.c:30 +#: builtin/remote.c:31 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<options>] <nom> <URL>" -#: builtin/remote.c:50 +#: builtin/remote.c:51 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branche>..." -#: builtin/remote.c:51 +#: builtin/remote.c:52 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nom> <branche>..." -#: builtin/remote.c:56 +#: builtin/remote.c:57 msgid "git remote show [<options>] <name>" msgstr "git remote show [<options>] <nom>" -#: builtin/remote.c:61 +#: builtin/remote.c:62 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<options>] <nom>" -#: builtin/remote.c:66 +#: builtin/remote.c:67 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<options>] [<groupe> | <distante>]..." -#: builtin/remote.c:95 +#: builtin/remote.c:96 #, c-format msgid "Updating %s" msgstr "Mise à jour de %s" -#: builtin/remote.c:127 +#: builtin/remote.c:128 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -12655,92 +13101,92 @@ msgstr "" "--mirror est dangereux et obsolète ; merci\n" "\t d'utiliser --mirror=fetch ou --mirror=push à la place" -#: builtin/remote.c:144 +#: builtin/remote.c:145 #, c-format msgid "unknown mirror argument: %s" msgstr "argument miroir inconnu : %s" -#: builtin/remote.c:160 +#: builtin/remote.c:161 msgid "fetch the remote branches" msgstr "rapatrier les branches distantes" -#: builtin/remote.c:162 +#: builtin/remote.c:163 msgid "import all tags and associated objects when fetching" msgstr "" "importer toutes les étiquettes et les objets associés lors du rapatriement" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "or do not fetch any tag at all (--no-tags)" msgstr "ou ne rapatrier aucune étiquette (--no-tags)" -#: builtin/remote.c:167 +#: builtin/remote.c:168 msgid "branch(es) to track" msgstr "branche(s) à suivre" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "master branch" msgstr "branche maîtresse" -#: builtin/remote.c:169 +#: builtin/remote.c:170 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis" -#: builtin/remote.c:182 +#: builtin/remote.c:183 msgid "specifying a master branch makes no sense with --mirror" msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror" -#: builtin/remote.c:184 +#: builtin/remote.c:185 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "spécifier les branches à suivre n'a de sens qu'avec des miroirs de " "rapatriement" -#: builtin/remote.c:191 builtin/remote.c:631 +#: builtin/remote.c:192 builtin/remote.c:634 #, c-format msgid "remote %s already exists." msgstr "la distante %s existe déjà." -#: builtin/remote.c:195 builtin/remote.c:635 +#: builtin/remote.c:196 builtin/remote.c:638 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' n'est pas un nom valide de distante" -#: builtin/remote.c:235 +#: builtin/remote.c:236 #, c-format msgid "Could not setup master '%s'" msgstr "Impossible de paramétrer la maîtresse '%s'" -#: builtin/remote.c:337 +#: builtin/remote.c:342 #, 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:438 builtin/remote.c:446 +#: builtin/remote.c:441 builtin/remote.c:449 msgid "(matching)" msgstr "(correspond)" -#: builtin/remote.c:450 +#: builtin/remote.c:453 msgid "(delete)" msgstr "(supprimer)" -#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 +#: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861 #, c-format msgid "No such remote: %s" msgstr "Distante inconnue : %s" -#: builtin/remote.c:641 +#: builtin/remote.c:644 #, 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:661 +#: builtin/remote.c:664 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -12751,17 +13197,17 @@ msgstr "" "\t%s\n" "\tVeuillez mettre à jour la configuration manuellement si nécessaire." -#: builtin/remote.c:697 +#: builtin/remote.c:700 #, c-format msgid "deleting '%s' failed" msgstr "échec de suppression de '%s'" -#: builtin/remote.c:731 +#: builtin/remote.c:734 #, c-format msgid "creating '%s' failed" msgstr "échec de création de '%s'" -#: builtin/remote.c:796 +#: builtin/remote.c:799 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -12776,113 +13222,118 @@ msgstr[1] "" "supprimées ;\n" "pour les supprimer, utilisez :" -#: builtin/remote.c:810 +#: builtin/remote.c:813 #, c-format msgid "Could not remove config section '%s'" msgstr "Impossible de supprimer la section de configuration '%s'" -#: builtin/remote.c:911 +#: builtin/remote.c:914 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)" -#: builtin/remote.c:914 +#: builtin/remote.c:917 msgid " tracked" msgstr " suivi" -#: builtin/remote.c:916 +#: builtin/remote.c:919 msgid " stale (use 'git remote prune' to remove)" msgstr " dépassé (utilisez 'git remote prune' pour supprimer)" -#: builtin/remote.c:918 +#: builtin/remote.c:921 msgid " ???" msgstr " ???" -#: builtin/remote.c:959 +#: builtin/remote.c:962 #, 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:967 +#: builtin/remote.c:971 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebase de manière interactive sur la distante %s" -#: builtin/remote.c:968 +#: builtin/remote.c:973 +#, 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:976 #, c-format msgid "rebases onto remote %s" msgstr "rebase sur la distante %s" -#: builtin/remote.c:971 +#: builtin/remote.c:980 #, c-format msgid " merges with remote %s" msgstr " fusionne avec la distante %s" -#: builtin/remote.c:974 +#: builtin/remote.c:983 #, c-format msgid "merges with remote %s" msgstr "fusionne avec la distante %s" -#: builtin/remote.c:977 +#: builtin/remote.c:986 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s et avec la distante %s\n" -#: builtin/remote.c:1020 +#: builtin/remote.c:1029 msgid "create" msgstr "créer" -#: builtin/remote.c:1023 +#: builtin/remote.c:1032 msgid "delete" msgstr "supprimer" -#: builtin/remote.c:1027 +#: builtin/remote.c:1036 msgid "up to date" msgstr "à jour" -#: builtin/remote.c:1030 +#: builtin/remote.c:1039 msgid "fast-forwardable" msgstr "peut être mis à jour en avance rapide" -#: builtin/remote.c:1033 +#: builtin/remote.c:1042 msgid "local out of date" msgstr "le local n'est pas à jour" -#: builtin/remote.c:1040 +#: builtin/remote.c:1049 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s force vers %-*s (%s)" -#: builtin/remote.c:1043 +#: builtin/remote.c:1052 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s pousse vers %-*s (%s)" -#: builtin/remote.c:1047 +#: builtin/remote.c:1056 #, c-format msgid " %-*s forces to %s" msgstr " %-*s force vers %s" -#: builtin/remote.c:1050 +#: builtin/remote.c:1059 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s pousse vers %s" -#: builtin/remote.c:1118 +#: builtin/remote.c:1127 msgid "do not query remotes" msgstr "ne pas interroger les distantes" -#: builtin/remote.c:1145 +#: builtin/remote.c:1154 #, c-format msgid "* remote %s" msgstr "* distante %s" -#: builtin/remote.c:1146 +#: builtin/remote.c:1155 #, c-format msgid " Fetch URL: %s" msgstr " URL de rapatriement : %s" -#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 +#: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311 msgid "(no URL)" msgstr "(pas d'URL)" @@ -12890,25 +13341,25 @@ msgstr "(pas d'URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1161 builtin/remote.c:1163 +#: builtin/remote.c:1170 builtin/remote.c:1172 #, c-format msgid " Push URL: %s" msgstr " URL push : %s" -#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 +#: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178 #, c-format msgid " HEAD branch: %s" msgstr " Branche HEAD : %s" -#: builtin/remote.c:1165 +#: builtin/remote.c:1174 msgid "(not queried)" msgstr "(non demandé)" -#: builtin/remote.c:1167 +#: builtin/remote.c:1176 msgid "(unknown)" msgstr "(inconnu)" -#: builtin/remote.c:1171 +#: builtin/remote.c:1180 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -12916,162 +13367,162 @@ msgstr "" " Branche HEAD (la HEAD distante est ambiguë, peut être l'une des " "suivantes) :\n" -#: builtin/remote.c:1183 +#: builtin/remote.c:1192 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branche distante :%s" msgstr[1] " Branches distantes :%s" -#: builtin/remote.c:1186 builtin/remote.c:1212 +#: builtin/remote.c:1195 builtin/remote.c:1221 msgid " (status not queried)" msgstr " (état non demandé)" -#: builtin/remote.c:1195 +#: builtin/remote.c:1204 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:1203 +#: builtin/remote.c:1212 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:1209 +#: builtin/remote.c:1218 #, 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:1230 +#: builtin/remote.c:1239 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "définir refs/remotes/<nom>/HEAD selon la distante" -#: builtin/remote.c:1232 +#: builtin/remote.c:1241 msgid "delete refs/remotes/<name>/HEAD" msgstr "supprimer refs/remotes/<nom>/HEAD" -#: builtin/remote.c:1247 +#: builtin/remote.c:1256 msgid "Cannot determine remote HEAD" msgstr "Impossible de déterminer la HEAD distante" -#: builtin/remote.c:1249 +#: builtin/remote.c:1258 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:1259 +#: builtin/remote.c:1268 #, c-format msgid "Could not delete %s" msgstr "Impossible de supprimer %s" -#: builtin/remote.c:1267 +#: builtin/remote.c:1276 #, c-format msgid "Not a valid ref: %s" msgstr "Référence non valide : %s" -#: builtin/remote.c:1269 +#: builtin/remote.c:1278 #, c-format msgid "Could not setup %s" msgstr "Impossible de paramétrer %s" -#: builtin/remote.c:1287 +#: builtin/remote.c:1296 #, c-format msgid " %s will become dangling!" msgstr " %s se retrouvera en suspens !" -#: builtin/remote.c:1288 +#: builtin/remote.c:1297 #, c-format msgid " %s has become dangling!" msgstr " %s se retrouve en suspens !" -#: builtin/remote.c:1298 +#: builtin/remote.c:1307 #, c-format msgid "Pruning %s" msgstr "Élimination de %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1308 #, c-format msgid "URL: %s" msgstr "URL : %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1324 #, c-format msgid " * [would prune] %s" msgstr " * [serait éliminé] %s" -#: builtin/remote.c:1318 +#: builtin/remote.c:1327 #, c-format msgid " * [pruned] %s" msgstr " * [éliminé] %s" -#: builtin/remote.c:1363 +#: builtin/remote.c:1372 msgid "prune remotes after fetching" msgstr "éliminer les distants après le rapatriement" -#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 +#: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557 #, c-format msgid "No such remote '%s'" msgstr "Pas de serveur remote '%s'" -#: builtin/remote.c:1442 +#: builtin/remote.c:1451 msgid "add branch" msgstr "ajouter une branche" -#: builtin/remote.c:1449 +#: builtin/remote.c:1458 msgid "no remote specified" msgstr "pas de serveur distant spécifié" -#: builtin/remote.c:1466 +#: builtin/remote.c:1475 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:1468 +#: builtin/remote.c:1477 msgid "return all URLs" msgstr "retourner toutes les URLs" -#: builtin/remote.c:1496 +#: builtin/remote.c:1505 #, c-format msgid "no URLs configured for remote '%s'" msgstr "aucune URL configurée pour le dépôt distant '%s'" -#: builtin/remote.c:1522 +#: builtin/remote.c:1531 msgid "manipulate push URLs" msgstr "manipuler les URLs push" -#: builtin/remote.c:1524 +#: builtin/remote.c:1533 msgid "add URL" msgstr "ajouter une URL" -#: builtin/remote.c:1526 +#: builtin/remote.c:1535 msgid "delete URLs" msgstr "supprimer des URLs" -#: builtin/remote.c:1533 +#: builtin/remote.c:1542 msgid "--add --delete doesn't make sense" msgstr "--add --delete n'a aucun sens" -#: builtin/remote.c:1572 +#: builtin/remote.c:1581 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Motif d'URL ancien invalide : %s" -#: builtin/remote.c:1580 +#: builtin/remote.c:1589 #, c-format msgid "No such URL found: %s" msgstr "Pas d'URL trouvée : %s" -#: builtin/remote.c:1582 +#: builtin/remote.c:1591 msgid "Will not delete all non-push URLs" msgstr "Pas de suppression de toutes les URLs non-push" -#: builtin/remote.c:1598 +#: builtin/remote.c:1607 msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" -#: builtin/remote.c:1629 +#: builtin/remote.c:1638 #, c-format msgid "Unknown subcommand: %s" msgstr "Sous-commande inconnue : %s" @@ -13089,128 +13540,136 @@ msgstr "" "Utilisez\n" "--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps." -#: builtin/repack.c:170 +#: builtin/repack.c:180 msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" -#: builtin/repack.c:172 +#: builtin/repack.c:182 msgid "same as -a, and turn unreachable objects loose" msgstr "identique à -a et transformer les objets inaccessibles en suspens" -#: builtin/repack.c:175 +#: builtin/repack.c:185 msgid "remove redundant packs, and run git-prune-packed" msgstr "supprimer les paquets redondants et lancer git-prune-packed" -#: builtin/repack.c:177 +#: builtin/repack.c:187 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passer --no-reuse-delta à git-pack-objects" -#: builtin/repack.c:179 +#: builtin/repack.c:189 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passer --no-reuse-object à git-pack-objects" -#: builtin/repack.c:181 +#: builtin/repack.c:191 msgid "do not run git-update-server-info" msgstr "ne pas lancer git update-server-info" -#: builtin/repack.c:184 +#: builtin/repack.c:194 msgid "pass --local to git-pack-objects" msgstr "passer --local à git-pack-objects" -#: builtin/repack.c:186 +#: builtin/repack.c:196 msgid "write bitmap index" msgstr "écrire un index en bitmap" -#: builtin/repack.c:187 +#: builtin/repack.c:197 msgid "approxidate" msgstr "date approximative" -#: builtin/repack.c:188 +#: builtin/repack.c:198 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:190 +#: builtin/repack.c:200 msgid "with -a, repack unreachable objects" msgstr "avec -a, repaquétiser les objets inaccessibles" -#: builtin/repack.c:192 +#: builtin/repack.c:202 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:193 builtin/repack.c:199 +#: builtin/repack.c:203 builtin/repack.c:209 msgid "bytes" msgstr "octets" -#: builtin/repack.c:194 +#: builtin/repack.c:204 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:196 +#: builtin/repack.c:206 msgid "limits the maximum delta depth" msgstr "limite la profondeur maximale des deltas" -#: builtin/repack.c:198 +#: builtin/repack.c:208 msgid "limits the maximum number of threads" msgstr "limite le nombre maximal de fils" -#: builtin/repack.c:200 +#: builtin/repack.c:210 msgid "maximum size of each packfile" msgstr "taille maximum de chaque fichier paquet" -#: builtin/repack.c:202 +#: builtin/repack.c:212 msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:212 +#: builtin/repack.c:214 +msgid "do not repack this pack" +msgstr "ne pas rempaqueter ce paquet" + +#: builtin/repack.c:224 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:216 +#: builtin/repack.c:228 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable et -A sont incompatibles" -#: builtin/repack.c:410 builtin/worktree.c:148 +#: builtin/repack.c:425 builtin/worktree.c:139 #, c-format msgid "failed to remove '%s'" msgstr "échec de la suppression de '%s'" -#: builtin/replace.c:20 +#: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <objet> <remplacement>" -#: builtin/replace.c:21 +#: builtin/replace.c:23 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <objet>" -#: builtin/replace.c:22 +#: builtin/replace.c:24 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <commit> [<parent>...]" -#: builtin/replace.c:23 +#: builtin/replace.c:25 +msgid "git replace [-f] --convert-graft-file" +msgstr "git replace [-f] --convert-graft-file" + +#: builtin/replace.c:26 msgid "git replace -d <object>..." msgstr "git replace -d <objet>..." -#: builtin/replace.c:24 +#: builtin/replace.c:27 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<motif>]]" -#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 +#: builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445 #, c-format msgid "Not a valid object name: '%s'" msgstr "Nom d'objet invalide : '%s'" -#: builtin/replace.c:361 +#: builtin/replace.c:407 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mauvaise étiquette de fusion dans le commit '%s'" -#: builtin/replace.c:363 +#: builtin/replace.c:409 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "étiquette de fusion malformée dans le commit '%s'" -#: builtin/replace.c:374 +#: builtin/replace.c:421 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -13219,45 +13678,58 @@ msgstr "" "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; " "utilisez --edit au lieu de --graft" -#: builtin/replace.c:407 +#: builtin/replace.c:460 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "le commit original '%s' contient une signature GPG." -#: builtin/replace.c:408 +#: builtin/replace.c:461 msgid "the signature will be removed in the replacement commit!" msgstr "la signature sera éliminée dans la validation de remplacement !" -#: builtin/replace.c:414 +#: builtin/replace.c:471 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Impossible d'écrire le commit de remplacement pour '%s'" -#: builtin/replace.c:438 +#: builtin/replace.c:514 +#, c-format +msgid "" +"could not convert the following graft(s):\n" +"%s" +msgstr "" +"impossible de convertir la(les) greffe(s) suivante(s) :\n" +"%s" + +#: builtin/replace.c:535 msgid "list replace refs" msgstr "afficher les références de remplacement" -#: builtin/replace.c:439 +#: builtin/replace.c:536 msgid "delete replace refs" msgstr "supprimer les références de remplacement" -#: builtin/replace.c:440 +#: builtin/replace.c:537 msgid "edit existing object" msgstr "éditer l'objet existant" -#: builtin/replace.c:441 +#: builtin/replace.c:538 msgid "change a commit's parents" msgstr "Modifier les parents d'un commit" -#: builtin/replace.c:442 +#: builtin/replace.c:539 +msgid "convert existing graft file" +msgstr "convertir le fichier de greffe existant" + +#: builtin/replace.c:540 msgid "replace the ref if it exists" msgstr "remplacer la référence si elle existe" -#: builtin/replace.c:444 +#: builtin/replace.c:542 msgid "do not pretty-print contents for --edit" msgstr "afficher sans mise en forme pour --edit" -#: builtin/replace.c:445 +#: builtin/replace.c:543 msgid "use this format" msgstr "utiliser ce format" @@ -13579,42 +14051,42 @@ msgid_plural "the following files have local modifications:" msgstr[0] "le fichier suivant a des modifications locales :" msgstr[1] "les fichiers suivants ont des modifications locales :" -#: builtin/rm.c:243 +#: builtin/rm.c:241 msgid "do not list removed files" msgstr "ne pas afficher les fichiers supprimés" -#: builtin/rm.c:244 +#: builtin/rm.c:242 msgid "only remove from the index" msgstr "supprimer seulement de l'index" -#: builtin/rm.c:245 +#: builtin/rm.c:243 msgid "override the up-to-date check" msgstr "outrepasser la vérification des fichiers à jour" -#: builtin/rm.c:246 +#: builtin/rm.c:244 msgid "allow recursive removal" msgstr "autoriser la suppression récursive" -#: builtin/rm.c:248 +#: builtin/rm.c:246 msgid "exit with a zero status even if nothing matched" msgstr "sortir avec un état zéro même si rien ne correspondait" -#: builtin/rm.c:307 +#: builtin/rm.c:306 #, c-format msgid "not removing '%s' recursively without -r" msgstr "pas de suppression récursive de '%s' sans -r" -#: builtin/rm.c:346 +#: builtin/rm.c:345 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm : impossible de supprimer %s" -#: builtin/rm.c:369 +#: builtin/rm.c:368 #, c-format msgid "could not remove '%s'" msgstr "impossible de supprimer '%s'" -#: builtin/send-pack.c:19 +#: builtin/send-pack.c:20 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " @@ -13627,52 +14099,72 @@ msgstr "" " --all et la spécification explicite de <référence> sont mutuellement " "exclusifs." -#: builtin/send-pack.c:162 +#: builtin/send-pack.c:163 msgid "remote name" msgstr "nom distant" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:177 msgid "use stateless RPC protocol" msgstr "utiliser un protocole RPC sans état" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:178 msgid "read refs from stdin" msgstr "lire les références depuis l'entrée standard" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:179 msgid "print status from remote helper" msgstr "afficher les messages du greffon de protocole distant" +#: builtin/serve.c:7 +msgid "git serve [<options>]" +msgstr "git serve [<options>]" + +#: builtin/serve.c:17 builtin/upload-pack.c:23 +msgid "quit after a single request/response exchange" +msgstr "quitter après un unique échange requête/réponse" + +#: builtin/serve.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "sortir immédiatement après l'annonce des capacités" + #: builtin/shortlog.c:14 -msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" -msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" +msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] <chemin>...]" -#: builtin/shortlog.c:263 +#: builtin/shortlog.c:15 +msgid "git log --pretty=short | git shortlog [<options>]" +msgstr "git log --pretty=short | git shortlog [<options>]" + +#: builtin/shortlog.c:264 msgid "Group by committer rather than author" msgstr "Grouper par validateur plutôt que par auteur" -#: builtin/shortlog.c:265 +#: builtin/shortlog.c:266 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:267 +#: builtin/shortlog.c:268 msgid "Suppress commit descriptions, only provides commit count" msgstr "" "Supprimer les descriptions de validation, fournit seulement le nombre de " "validations" -#: builtin/shortlog.c:269 +#: builtin/shortlog.c:270 msgid "Show the email address of each author" msgstr "Afficher l'adresse courriel de chaque auteur" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:271 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:272 msgid "Linewrap output" msgstr "Couper les lignes" +#: builtin/shortlog.c:298 +msgid "too many arguments given outside repository" +msgstr "trop d'arguments fournis hors d'un dépôt" + #: builtin/show-branch.c:12 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" @@ -13878,39 +14370,39 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace" -#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669 +#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1688 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" -#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678 +#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1697 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Nom de référence complet attendu, %s obtenu" -#: builtin/submodule--helper.c:59 +#: builtin/submodule--helper.c:61 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote n'accepte aucun argument" -#: builtin/submodule--helper.c:96 +#: builtin/submodule--helper.c:98 #, c-format msgid "cannot strip one component off url '%s'" msgstr "impossible de supprimer un composant de l'URL '%s'" -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198 +#: builtin/submodule--helper.c:406 builtin/submodule--helper.c:1211 msgid "alternative anchor for relative paths" msgstr "ancre alternative pour les chemins relatifs" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:411 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483 +#: builtin/submodule--helper.c:462 builtin/submodule--helper.c:485 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules" -#: builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:500 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13919,60 +14411,60 @@ msgstr "" "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme " "son propre amont d'autorité." -#: builtin/submodule--helper.c:509 +#: builtin/submodule--helper.c:511 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:513 +#: builtin/submodule--helper.c:515 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n" -#: builtin/submodule--helper.c:523 +#: builtin/submodule--helper.c:525 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "attention : nous vous suggérons de spécifier une commande de mode de mise à " "jour pour le sous-module '%s'\n" -#: builtin/submodule--helper.c:530 +#: builtin/submodule--helper.c:532 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module " "'%s'" -#: builtin/submodule--helper.c:552 +#: builtin/submodule--helper.c:554 msgid "Suppress output for initializing a submodule" msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module" -#: builtin/submodule--helper.c:557 +#: builtin/submodule--helper.c:559 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<chemin>]" -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747 +#: builtin/submodule--helper.c:631 builtin/submodule--helper.c:757 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le " "chemin '%s'" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:670 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "impossible de résoudre HEAD dans le sous-module '%s'" -#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856 +#: builtin/submodule--helper.c:697 builtin/submodule--helper.c:866 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "récursion impossible dans le sous-module '%s'" -#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021 +#: builtin/submodule--helper.c:721 builtin/submodule--helper.c:1031 msgid "Suppress submodule status output" msgstr "supprimer la sortie d'état du sous-module" -#: builtin/submodule--helper.c:712 +#: builtin/submodule--helper.c:722 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -13980,139 +14472,148 @@ msgstr "" "Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD " "du sous-module" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:723 msgid "recurse into nested submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:718 +#: builtin/submodule--helper.c:728 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]" -#: builtin/submodule--helper.c:742 +#: builtin/submodule--helper.c:752 msgid "git submodule--helper name <path>" msgstr "git submodule--helper <nom> <chemin>" -#: builtin/submodule--helper.c:806 +#: builtin/submodule--helper.c:816 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synchronisation de l'URL sous-module pour '%s'\n" -#: builtin/submodule--helper.c:812 +#: builtin/submodule--helper.c:822 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "échec d'enregistrement de l'URL pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:826 +#: builtin/submodule--helper.c:836 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:847 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "échec de mise à jour du dépôt distant pour le sous-module '%s'" -#: builtin/submodule--helper.c:885 +#: builtin/submodule--helper.c:895 msgid "Suppress output of synchronizing submodule url" -msgstr "Supprimer la sortie lors de la synchronisation de l'URL d'un sous-module" +msgstr "" +"Supprimer la sortie lors de la synchronisation de l'URL d'un sous-module" -#: builtin/submodule--helper.c:887 +#: builtin/submodule--helper.c:897 msgid "Recurse into nested submodules" msgstr "Parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:892 +#: builtin/submodule--helper.c:902 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]" -#: builtin/submodule--helper.c:946 +#: builtin/submodule--helper.c:956 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " "really want to remove it including all of its history)" -msgstr "L'arbre de travail du sous-module '%s' contient un répertoire .git (utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son historique)" +msgstr "" +"L'arbre de travail du sous-module '%s' contient un répertoire .git (utilisez " +"'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " +"historique)" -#: builtin/submodule--helper.c:958 +#: builtin/submodule--helper.c:968 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" -msgstr "L'arbre de travail du sous-module '%s' contient des modifications locales ; utilisez '-f' pour les annuler" +msgstr "" +"L'arbre de travail du sous-module '%s' contient des modifications locales ; " +"utilisez '-f' pour les annuler" -#: builtin/submodule--helper.c:966 +#: builtin/submodule--helper.c:976 #, c-format msgid "Cleared directory '%s'\n" msgstr "Répertoire '%s' nettoyé\n" -#: builtin/submodule--helper.c:968 +#: builtin/submodule--helper.c:978 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:987 #, c-format msgid "could not create empty submodule directory %s" msgstr "impossible de créer le répertoire vide du sous-module %s" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:1003 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Sous-module '%s' (%s) non enregistré pour le chemin '%s'\n" -#: builtin/submodule--helper.c:1022 +#: builtin/submodule--helper.c:1032 msgid "Remove submodule working trees even if they contain local changes" -msgstr "Éliminer les arbres de travail des sous-modules même s'ils contiennent des modifications locales" +msgstr "" +"Éliminer les arbres de travail des sous-modules même s'ils contiennent des " +"modifications locales" -#: builtin/submodule--helper.c:1023 +#: builtin/submodule--helper.c:1033 msgid "Unregister all submodules" msgstr "Désenregistrer tous les sous-modules" -#: builtin/submodule--helper.c:1028 +#: builtin/submodule--helper.c:1038 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" -msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]" +msgstr "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]" -#: builtin/submodule--helper.c:1042 +#: builtin/submodule--helper.c:1052 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules" -#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136 +#: builtin/submodule--helper.c:1145 builtin/submodule--helper.c:1148 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s" -#: builtin/submodule--helper.c:1172 +#: builtin/submodule--helper.c:1184 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" "La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue" -#: builtin/submodule--helper.c:1179 +#: builtin/submodule--helper.c:1191 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1214 msgid "where the new submodule will be cloned to" msgstr "emplacement où le sous-module sera cloné" -#: builtin/submodule--helper.c:1204 +#: builtin/submodule--helper.c:1217 msgid "name of the new submodule" msgstr "nom du nouveau sous-module" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1220 msgid "url where to clone the submodule from" msgstr "URL depuis laquelle cloner le sous-module" -#: builtin/submodule--helper.c:1213 +#: builtin/submodule--helper.c:1228 msgid "depth for shallow clones" msgstr "profondeur de l'historique des clones superficiels" -#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587 +#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606 msgid "force cloning progress" msgstr "forcer l'affichage de la progression du clonage" -#: builtin/submodule--helper.c:1221 +#: builtin/submodule--helper.c:1236 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -14120,83 +14621,83 @@ msgstr "" "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference " "<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>" -#: builtin/submodule--helper.c:1252 +#: builtin/submodule--helper.c:1267 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Le clonage de '%s' dans le chemin de sous-module '%s' a échoué" -#: builtin/submodule--helper.c:1267 +#: builtin/submodule--helper.c:1281 #, c-format msgid "could not get submodule directory for '%s'" msgstr "impossible de créer le répertoire de sous-module pour '%s'" -#: builtin/submodule--helper.c:1332 +#: builtin/submodule--helper.c:1347 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Le chemin de sous-module '%s' n'est pas initialisé" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1351 msgid "Maybe you want to use 'update --init'?" msgstr "Vous voudriez sûrement utiliser 'update --init' ?" -#: builtin/submodule--helper.c:1365 +#: builtin/submodule--helper.c:1380 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Sous-module non fusionné %s non traité" -#: builtin/submodule--helper.c:1394 +#: builtin/submodule--helper.c:1409 #, c-format msgid "Skipping submodule '%s'" msgstr "Sous-module '%s' non traité" -#: builtin/submodule--helper.c:1527 +#: builtin/submodule--helper.c:1544 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Impossible de cloner '%s'. Réessai prévu" -#: builtin/submodule--helper.c:1538 +#: builtin/submodule--helper.c:1555 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Impossible de cloner '%s' pour la seconde fois, abandon" -#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788 +#: builtin/submodule--helper.c:1585 builtin/submodule--helper.c:1808 msgid "path into the working tree" msgstr "chemin dans la copie de travail" -#: builtin/submodule--helper.c:1571 +#: builtin/submodule--helper.c:1588 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "chemin dans la copie de travail, traversant les frontières de sous-modules" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:1592 msgid "rebase, merge, checkout or none" msgstr "valeurs possibles : rebase, merge, checkout ou none" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1598 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié" -#: builtin/submodule--helper.c:1582 +#: builtin/submodule--helper.c:1601 msgid "parallel jobs" msgstr "jobs parallèles" -#: builtin/submodule--helper.c:1584 +#: builtin/submodule--helper.c:1603 msgid "whether the initial clone should follow the shallow recommendation" msgstr "spécifie si le clonage initial doit être aussi superficiel" -#: builtin/submodule--helper.c:1585 +#: builtin/submodule--helper.c:1604 msgid "don't print cloning progress" msgstr "ne pas afficher la progression du clonage" -#: builtin/submodule--helper.c:1592 +#: builtin/submodule--helper.c:1611 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:1624 msgid "bad value for update parameter" msgstr "valeur invalide pour la mise à jour du paramètre" -#: builtin/submodule--helper.c:1673 +#: builtin/submodule--helper.c:1692 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -14205,20 +14706,20 @@ msgstr "" "la branche du sous-module %s est configurée pour hériter de la branche du " "superprojet, mais le superprojet n'est sur aucune branche" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:1809 msgid "recurse into submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:1795 +#: builtin/submodule--helper.c:1815 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<chemin>...]" -#: builtin/submodule--helper.c:1857 +#: builtin/submodule--helper.c:1901 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ne gère pas --super-prefix" -#: builtin/submodule--helper.c:1863 +#: builtin/submodule--helper.c:1907 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" @@ -14288,7 +14789,7 @@ msgstr "étiquette '%s' non trouvée." msgid "Deleted tag '%s' (was %s)\n" msgstr "Étiquette '%s' supprimée (elle était sur %s)\n" -#: builtin/tag.c:131 +#: builtin/tag.c:132 #, c-format msgid "" "\n" @@ -14301,7 +14802,7 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/tag.c:135 +#: builtin/tag.c:136 #, c-format msgid "" "\n" @@ -14316,147 +14817,147 @@ msgstr "" "Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-" "même si vous le souhaitez.\n" -#: builtin/tag.c:189 +#: builtin/tag.c:190 msgid "unable to sign the tag" msgstr "impossible de signer l'étiquette" -#: builtin/tag.c:191 +#: builtin/tag.c:192 msgid "unable to write tag file" msgstr "impossible d'écrire le fichier d'étiquettes" -#: builtin/tag.c:216 +#: builtin/tag.c:217 msgid "bad object type." msgstr "mauvais type d'objet." -#: builtin/tag.c:265 +#: builtin/tag.c:266 msgid "no tag message?" msgstr "pas de message pour l'étiquette ?" -#: builtin/tag.c:272 +#: builtin/tag.c:273 #, c-format msgid "The tag message has been left in %s\n" msgstr "Le message pour l'étiquette a été laissé dans %s\n" -#: builtin/tag.c:381 +#: builtin/tag.c:382 msgid "list tag names" msgstr "afficher les noms des étiquettes" -#: builtin/tag.c:383 +#: builtin/tag.c:384 msgid "print <n> lines of each tag message" msgstr "affiche <n> lignes de chaque message d'étiquette" -#: builtin/tag.c:385 +#: builtin/tag.c:386 msgid "delete tags" msgstr "supprimer des étiquettes" -#: builtin/tag.c:386 +#: builtin/tag.c:387 msgid "verify tags" msgstr "vérifier des étiquettes" -#: builtin/tag.c:388 +#: builtin/tag.c:389 msgid "Tag creation options" msgstr "Options de création de l'étiquette" -#: builtin/tag.c:390 +#: builtin/tag.c:391 msgid "annotated tag, needs a message" msgstr "étiquette annotée, nécessite un message" -#: builtin/tag.c:392 +#: builtin/tag.c:393 msgid "tag message" msgstr "message pour l'étiquette" -#: builtin/tag.c:394 +#: builtin/tag.c:395 msgid "force edit of tag message" msgstr "forcer l'édition du message d'étiquetage" -#: builtin/tag.c:395 +#: builtin/tag.c:396 msgid "annotated and GPG-signed tag" msgstr "étiquette annotée et signée avec GPG" -#: builtin/tag.c:399 +#: builtin/tag.c:400 msgid "use another key to sign the tag" msgstr "utiliser une autre clé pour signer l'étiquette" -#: builtin/tag.c:400 +#: builtin/tag.c:401 msgid "replace the tag if exists" msgstr "remplacer l'étiquette si elle existe" -#: builtin/tag.c:401 builtin/update-ref.c:368 +#: builtin/tag.c:402 builtin/update-ref.c:368 msgid "create a reflog" msgstr "créer un reflog" -#: builtin/tag.c:403 +#: builtin/tag.c:404 msgid "Tag listing options" msgstr "Options d'affichage des étiquettes" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "show tag list in columns" msgstr "afficher la liste des étiquettes sous forme de colonnes" -#: builtin/tag.c:405 builtin/tag.c:407 +#: builtin/tag.c:406 builtin/tag.c:408 msgid "print only tags that contain the commit" msgstr "afficher seulement les étiquettes qui contiennent la validation" -#: builtin/tag.c:406 builtin/tag.c:408 +#: builtin/tag.c:407 builtin/tag.c:409 msgid "print only tags that don't contain the commit" msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "print only tags that are merged" msgstr "afficher seulement les étiquettes qui sont fusionnées" -#: builtin/tag.c:410 +#: builtin/tag.c:411 msgid "print only tags that are not merged" msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "print only tags of the object" msgstr "afficher seulement les étiquettes de l'objet" -#: builtin/tag.c:459 +#: builtin/tag.c:460 msgid "--column and -n are incompatible" msgstr "--column et -n sont incompatibles" -#: builtin/tag.c:481 +#: builtin/tag.c:482 msgid "-n option is only allowed in list mode" msgstr "l'option -n est autorisée seulement en mode de liste" -#: builtin/tag.c:483 +#: builtin/tag.c:484 msgid "--contains option is only allowed in list mode" msgstr "l'option --contains est autorisée seulement en mode de liste" -#: builtin/tag.c:485 +#: builtin/tag.c:486 msgid "--no-contains option is only allowed in list mode" msgstr "l'option --contains est autorisée seulement en mode liste" -#: builtin/tag.c:487 +#: builtin/tag.c:488 msgid "--points-at option is only allowed in list mode" msgstr "l'option --points-at est autorisée seulement en mode liste" -#: builtin/tag.c:489 +#: builtin/tag.c:490 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" "les options --merged et --no-merged ne sont autorisées qu'en mode liste" -#: builtin/tag.c:500 +#: builtin/tag.c:501 msgid "only one -F or -m option is allowed." msgstr "une seule option -F ou -m est autorisée." -#: builtin/tag.c:519 +#: builtin/tag.c:520 msgid "too many params" msgstr "trop de paramètres" -#: builtin/tag.c:525 +#: builtin/tag.c:526 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' n'est pas un nom d'étiquette valide." -#: builtin/tag.c:530 +#: builtin/tag.c:531 #, c-format msgid "tag '%s' already exists" msgstr "l'étiquette '%s' existe déjà" -#: builtin/tag.c:561 +#: builtin/tag.c:562 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" @@ -14532,148 +15033,148 @@ msgstr "" msgid " OK" msgstr " OK" -#: builtin/update-index.c:579 +#: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<options>] [--] [<fichier>...]" -#: builtin/update-index.c:936 +#: builtin/update-index.c:946 msgid "continue refresh even when index needs update" msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour" -#: builtin/update-index.c:939 +#: builtin/update-index.c:949 msgid "refresh: ignore submodules" msgstr "rafraîchir : ignorer les sous-modules" -#: builtin/update-index.c:942 +#: builtin/update-index.c:952 msgid "do not ignore new files" msgstr "ne pas ignorer les nouveaux fichiers" -#: builtin/update-index.c:944 +#: builtin/update-index.c:954 msgid "let files replace directories and vice-versa" msgstr "laisser les fichiers remplacer des répertoires et vice-versa" -#: builtin/update-index.c:946 +#: builtin/update-index.c:956 msgid "notice files missing from worktree" msgstr "aviser des fichiers manquants dans la copie de travail" -#: builtin/update-index.c:948 +#: builtin/update-index.c:958 msgid "refresh even if index contains unmerged entries" msgstr "rafraîchir même si l'index contient des éléments non fusionnés" -#: builtin/update-index.c:951 +#: builtin/update-index.c:961 msgid "refresh stat information" msgstr "rafraîchir l'information de stat" -#: builtin/update-index.c:955 +#: builtin/update-index.c:965 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "comme --refresh, mais en ignorant l'option assume-unchanged" -#: builtin/update-index.c:959 +#: builtin/update-index.c:969 msgid "<mode>,<object>,<path>" msgstr "<mode>, <objet>, <chemin>" -#: builtin/update-index.c:960 +#: builtin/update-index.c:970 msgid "add the specified entry to the index" msgstr "ajouter l'élément spécifié dans l'index" -#: builtin/update-index.c:969 +#: builtin/update-index.c:979 msgid "mark files as \"not changing\"" msgstr "marquer les fichiers comme \"non changeants\"" -#: builtin/update-index.c:972 +#: builtin/update-index.c:982 msgid "clear assumed-unchanged bit" msgstr "mettre à zéro le bit supposé-non-modifié" -#: builtin/update-index.c:975 +#: builtin/update-index.c:985 msgid "mark files as \"index-only\"" msgstr "marquer les fichiers comme \"index seulement\"" -#: builtin/update-index.c:978 +#: builtin/update-index.c:988 msgid "clear skip-worktree bit" msgstr "mettre à zéro le bit sauter-la-copie-de travail" -#: builtin/update-index.c:981 +#: builtin/update-index.c:991 msgid "add to index only; do not add content to object database" msgstr "" "ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de " "données des objets" -#: builtin/update-index.c:983 +#: builtin/update-index.c:993 msgid "remove named paths even if present in worktree" msgstr "" "supprimer les chemins nommés même s'ils sont présents dans la copie de " "travail" -#: builtin/update-index.c:985 +#: builtin/update-index.c:995 msgid "with --stdin: input lines are terminated by null bytes" msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls" -#: builtin/update-index.c:987 +#: builtin/update-index.c:997 msgid "read list of paths to be updated from standard input" msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard" -#: builtin/update-index.c:991 +#: builtin/update-index.c:1001 msgid "add entries from standard input to the index" msgstr "ajouter les éléments depuis l'entrée standard à l'index" -#: builtin/update-index.c:995 +#: builtin/update-index.c:1005 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés" -#: builtin/update-index.c:999 +#: builtin/update-index.c:1009 msgid "only update entries that differ from HEAD" msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1013 msgid "ignore files missing from worktree" msgstr "ignorer les fichiers manquants dans la copie de travail" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1016 msgid "report actions to standard output" msgstr "afficher les actions sur la sortie standard" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1018 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1022 msgid "write index in this format" msgstr "écrire l'index dans ce format" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1024 msgid "enable or disable split index" msgstr "activer ou désactiver l'index divisé" -#: builtin/update-index.c:1016 +#: builtin/update-index.c:1026 msgid "enable/disable untracked cache" msgstr "activer ou désactiver le cache de non-suivis" -#: builtin/update-index.c:1018 +#: builtin/update-index.c:1028 msgid "test if the filesystem supports untracked cache" msgstr "tester si le système de fichier supporte le cache de non-suivis" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1030 msgid "enable untracked cache without testing the filesystem" msgstr "activer le cache de non-suivis sans tester le système de fichier" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1032 msgid "write out the index even if is not flagged as changed" msgstr "écrire l'index même s'il n'est pas marqué comme modifié" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1034 msgid "enable or disable file system monitor" msgstr "" "activer ou désactiver la surveillance du système de fichier (fsmonitor)" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1036 msgid "mark files as fsmonitor valid" msgstr "marquer les fichiers comme valides pour fsmonitor" -#: builtin/update-index.c:1029 +#: builtin/update-index.c:1039 msgid "clear fsmonitor valid bit" msgstr "effacer le bit de validité fsmonitor" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1138 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -14681,7 +15182,7 @@ msgstr "" "core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous " "souhaitez vraiment activer l'index coupé" -#: builtin/update-index.c:1136 +#: builtin/update-index.c:1147 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -14689,7 +15190,7 @@ msgstr "" "core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous " "souhaitez vraiment désactiver l'index coupé" -#: builtin/update-index.c:1147 +#: builtin/update-index.c:1158 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -14697,11 +15198,11 @@ msgstr "" "core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous " "souhaitez vraiment désactiver le cache des fichiers non-suivis" -#: builtin/update-index.c:1151 +#: builtin/update-index.c:1162 msgid "Untracked cache disabled" msgstr "Le cache non suivi est désactivé" -#: builtin/update-index.c:1159 +#: builtin/update-index.c:1170 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -14709,29 +15210,29 @@ msgstr "" "core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous " "souhaitez vraiment activer le cache des fichiers non-suivis" -#: builtin/update-index.c:1163 +#: builtin/update-index.c:1174 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Le cache non suivi est activé pour '%s'" -#: builtin/update-index.c:1171 +#: builtin/update-index.c:1182 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment " "activer la surveillance du système de fichiers" -#: builtin/update-index.c:1175 +#: builtin/update-index.c:1186 msgid "fsmonitor enabled" msgstr "fsmonitor activé" -#: builtin/update-index.c:1178 +#: builtin/update-index.c:1189 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous " "souhaitez vraiment désactiver la surveillance du système de fichiers" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1193 msgid "fsmonitor disabled" msgstr "fsmonitor désactivé" @@ -14773,6 +15274,24 @@ msgstr "git update-server-info [--force]" msgid "update the info files from scratch" msgstr "mettre à jour les fichiers d'information à partir de zéro" +#: builtin/upload-pack.c:11 +msgid "git upload-pack [<options>] <dir>" +msgstr "git upload-pack [<options>] <répertoire>" + +#: builtin/upload-pack.c:25 +msgid "exit immediately after initial ref advertisement" +msgstr "Sortir immédiatement après l'annonce initiale des références" + +#: builtin/upload-pack.c:27 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "" +"nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire " +"Git" + +#: builtin/upload-pack.c:29 +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "interrompre le transfert après <n> secondes d'inactivité" + #: builtin/verify-commit.c:18 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <commit>..." @@ -14833,23 +15352,23 @@ 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:58 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Suppression de worktrees/%s : répertoire invalide" -#: builtin/worktree.c:66 +#: builtin/worktree.c:64 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas" -#: builtin/worktree.c:71 builtin/worktree.c:80 +#: builtin/worktree.c:69 builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)" -#: builtin/worktree.c:90 +#: builtin/worktree.c:88 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -14858,185 +15377,207 @@ msgstr "" "Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets " "attendus, %<PRIuMAX> octets lus)" -#: builtin/worktree.c:98 +#: builtin/worktree.c:96 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Suppression de worktrees/%s : fichier gitdir invalide" -#: builtin/worktree.c:114 +#: builtin/worktree.c:105 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Suppression de worktrees/%s : le fichier gitdir point sur un endroit " "inexistant" -#: builtin/worktree.c:161 +#: builtin/worktree.c:152 msgid "report pruned working trees" msgstr "afficher les arbres de travail éliminés" -#: builtin/worktree.c:163 +#: builtin/worktree.c:154 msgid "expire working trees older than <time>" msgstr "faire expirer les arbres de travail plus vieux que <temps>" -#: builtin/worktree.c:238 +#: builtin/worktree.c:229 #, c-format msgid "'%s' already exists" msgstr "'%s' existe déjà" -#: builtin/worktree.c:269 +#: builtin/worktree.c:260 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:308 +#: builtin/worktree.c:373 builtin/worktree.c:379 #, c-format -msgid "Preparing %s (identifier %s)" -msgstr "Préparation de %s (identifiant %s)" +msgid "Preparing worktree (new branch '%s')" +msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')" -#: builtin/worktree.c:385 +#: builtin/worktree.c:375 +#, c-format +msgid "Preparing worktree (resetting branch '%s'; was at %s)" +msgstr "Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; précédemment sur %s)" + +#: builtin/worktree.c:384 +#, c-format +msgid "Preparing worktree (checking out '%s')" +msgstr "Préparation de l'arbre de travail (extraction de '%s')" + +#: builtin/worktree.c:390 +#, c-format +msgid "Preparing worktree (detached HEAD %s)" +msgstr "Préparation de l'arbre de travail (HEAD détachée %s)" + +#: builtin/worktree.c:431 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "extraire la <branche> même si elle est déjà extraite dans une autre copie de " "travail" -#: builtin/worktree.c:388 +#: builtin/worktree.c:434 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:390 +#: builtin/worktree.c:436 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:392 +#: builtin/worktree.c:438 msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" -#: builtin/worktree.c:393 +#: builtin/worktree.c:439 msgid "keep the new working tree locked" msgstr "conserver le verrou sur le nouvel arbre de travail" -#: builtin/worktree.c:395 +#: builtin/worktree.c:441 msgid "set up tracking mode (see git-branch(1))" msgstr "régler le mode de suivi (voir git-branch(1))" -#: builtin/worktree.c:398 +#: builtin/worktree.c:444 msgid "try to match the new branch name with a remote-tracking branch" msgstr "essayer de nommer la nouvelle branche comme la branche amont" -#: builtin/worktree.c:406 +#: builtin/worktree.c:452 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/worktree.c:471 +#: builtin/worktree.c:511 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:571 +#: builtin/worktree.c:611 msgid "reason for locking" msgstr "raison du verrouillage" -#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670 -#: builtin/worktree.c:809 +#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710 +#: builtin/worktree.c:850 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:585 builtin/worktree.c:618 +#: builtin/worktree.c:625 builtin/worktree.c:658 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:590 +#: builtin/worktree.c:630 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:592 +#: builtin/worktree.c:632 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:620 +#: builtin/worktree.c:660 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" -#: builtin/worktree.c:645 +#: builtin/worktree.c:685 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" +msgstr "" +"les arbres de travail contenant des sous-modules ne peuvent pas être " +"déplacés ou supprimés" -#: builtin/worktree.c:672 builtin/worktree.c:811 +#: builtin/worktree.c:712 builtin/worktree.c:852 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' est un arbre de travail principal" -#: builtin/worktree.c:677 +#: builtin/worktree.c:717 #, 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:683 +#: builtin/worktree.c:723 #, c-format msgid "target '%s' already exists" msgstr "la cible '%s' existe déjà" -#: builtin/worktree.c:690 +#: builtin/worktree.c:730 #, c-format msgid "cannot move a locked working tree, lock reason: %s" -msgstr "impossible de déplacer un arbre de travail verrouillé, raison du verrouillage : %s" +msgstr "" +"impossible de déplacer un arbre de travail verrouillé, raison du " +"verrouillage : %s" -#: builtin/worktree.c:692 +#: builtin/worktree.c:732 msgid "cannot move a locked working tree" msgstr "impossible de déplacer un arbre de travail verrouillé" -#: builtin/worktree.c:695 +#: builtin/worktree.c:735 #, 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:700 +#: builtin/worktree.c:740 #, c-format msgid "failed to move '%s' to '%s'" msgstr "échec au déplacement de '%s' vers '%s'" -#: builtin/worktree.c:748 +#: builtin/worktree.c:788 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "échec du lancement de 'git status' sur '%s'" -#: builtin/worktree.c:752 +#: builtin/worktree.c:792 #, c-format msgid "'%s' is dirty, use --force to delete it" msgstr "'%s' est sale, utilisez --force pour le supprimer" -#: builtin/worktree.c:757 +#: builtin/worktree.c:797 #, 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:768 builtin/worktree.c:782 +#: builtin/worktree.c:808 builtin/worktree.c:822 #, c-format msgid "failed to delete '%s'" msgstr "échec de la suppression de '%s'" -#: builtin/worktree.c:794 +#: builtin/worktree.c:834 msgid "force removing even if the worktree is dirty" msgstr "forcer la suppression même si l'arbre de travail est sale" -#: builtin/worktree.c:815 +#: builtin/worktree.c:856 #, c-format msgid "cannot remove a locked working tree, lock reason: %s" -msgstr "impossible de supprimer un arbre de travail verrouillé, raison du verrouillage : %s" +msgstr "" +"impossible de supprimer un arbre de travail verrouillé, raison du " +"verrouillage : %s" -#: builtin/worktree.c:817 +#: builtin/worktree.c:858 msgid "cannot remove a locked working tree" msgstr "impossible de supprimer un arbre de travail verrouillé" -#: builtin/worktree.c:820 +#: builtin/worktree.c:861 #, c-format msgid "validation failed, cannot remove working tree: %s" -msgstr "la validation a échoué, impossible de supprimer l'arbre de travail : %s" +msgstr "" +"la validation a échoué, impossible de supprimer l'arbre de travail : %s" #: builtin/write-tree.c:14 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" @@ -15054,28 +15595,6 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le débogage" -#: upload-pack.c:27 -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<options>] <répertoire>" - -#: upload-pack.c:1070 -msgid "quit after a single request/response exchange" -msgstr "quitter après un unique échange requête/réponse" - -#: upload-pack.c:1072 -msgid "exit immediately after initial ref advertisement" -msgstr "Sortir immédiatement après l'annonce initiale des références" - -#: upload-pack.c:1074 -msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "" -"nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire " -"Git" - -#: upload-pack.c:1076 -msgid "interrupt transfer after <n> seconds of inactivity" -msgstr "interrompre le transfert après <n> secondes d'inactivité" - #: credential-cache--daemon.c:222 #, c-format msgid "" @@ -15093,21 +15612,22 @@ msgstr "" msgid "print debugging messages to stderr" msgstr "afficher les messages de debug sur stderr" -#: git.c:8 +#: git.c:26 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" " <command> [<args>]" msgstr "" "git [--version] [--help] [-C <chemin>] [-c <nom>=<valeur>]\n" " [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n" " [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n" " <commande> [<args>]" -#: git.c:15 +#: git.c:33 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -15117,66 +15637,67 @@ msgstr "" "quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n" "pour en lire plus à propos d'une commande spécifique ou d'un concept." -#: git.c:95 +#: git.c:113 #, c-format msgid "no directory given for --git-dir\n" msgstr "aucun répertoire fourni pour --git-dir\n" -#: git.c:109 +#: git.c:127 #, c-format msgid "no namespace given for --namespace\n" msgstr "aucun espace de nom fournit pour --namespace\n" -#: git.c:123 +#: git.c:141 #, c-format msgid "no directory given for --work-tree\n" msgstr "aucun répertoire fourni pour --work-tree\n" -#: git.c:137 +#: git.c:155 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "aucun préfixe fourni pour --super-prefix\n" -#: git.c:159 +#: git.c:177 #, c-format msgid "-c expects a configuration string\n" msgstr "-c requiert une chaîne de configuration\n" -#: git.c:197 +#: git.c:215 #, c-format msgid "no directory given for -C\n" msgstr "aucun répertoire fourni pour -C\n" -#: git.c:212 +#: git.c:233 #, c-format msgid "unknown option: %s\n" msgstr "option inconnue : %s\n" -#: git.c:687 +#: git.c:698 #, 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" +msgstr "" +"l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n" -#: git.c:699 +#: git.c:710 #, c-format msgid "failed to run command '%s': %s\n" msgstr "échec au lancement de la commande '%s' : %s\n" -#: http.c:342 +#: http.c:348 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" "valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d" -#: http.c:363 +#: http.c:369 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "La délégation de commande n'est pas supporté avec cuRL < 7.22.0" -#: http.c:372 +#: http.c:378 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "L'épinglage de clé publique n'est pas supporté avec cuRL < 7.44.0" -#: http.c:1857 +#: http.c:1854 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -15187,7 +15708,7 @@ msgstr "" " demandé : %s\n" " redirection : %s" -#: remote-curl.c:345 +#: remote-curl.c:401 #, c-format msgid "redirecting to %s" msgstr "redirection vers %s" @@ -15316,15 +15837,15 @@ msgstr "date-d'expiration" msgid "no-op (backward compatibility)" msgstr "sans action (rétrocompatibilité)" -#: parse-options.h:250 +#: parse-options.h:251 msgid "be more verbose" msgstr "être plus verbeux" -#: parse-options.h:252 +#: parse-options.h:253 msgid "be more quiet" msgstr "être plus silencieux" -#: parse-options.h:258 +#: parse-options.h:259 msgid "use <n> digits to display SHA-1s" msgstr "utiliser <n> chiffres pour afficher les SHA-1s" @@ -15562,7 +16083,7 @@ 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-rebase.sh:60 +#: git-rebase.sh:61 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -15576,43 +16097,43 @@ msgstr "" "arrêter\n" "et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"." -#: git-rebase.sh:163 git-rebase.sh:409 +#: git-rebase.sh:173 git-rebase.sh:442 #, sh-format msgid "Could not move back to $head_name" msgstr "Impossible de revenir à $head_name" -#: git-rebase.sh:174 +#: git-rebase.sh:184 msgid "Applied autostash." msgstr "Autoremisage appliqué." -#: git-rebase.sh:177 +#: git-rebase.sh:187 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Impossible de stocker $stash_sha1" -#: git-rebase.sh:218 +#: git-rebase.sh:229 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: git-rebase.sh:223 +#: git-rebase.sh:234 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser." -#: git-rebase.sh:370 +#: git-rebase.sh:403 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: git-rebase.sh:381 +#: git-rebase.sh:414 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." -#: git-rebase.sh:388 +#: git-rebase.sh:421 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: git-rebase.sh:391 +#: git-rebase.sh:424 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -15620,7 +16141,7 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: git-rebase.sh:435 +#: git-rebase.sh:468 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -15642,76 +16163,80 @@ msgstr "" "chose\n" "d'important ici." -#: git-rebase.sh:491 +#: git-rebase.sh:509 +msgid "error: cannot combine '--signoff' with '--preserve-merges'" +msgstr "erreur : '--signoff' et '--preserve-merges' sont incompatibles" + +#: git-rebase.sh:537 #, sh-format msgid "invalid upstream '$upstream_name'" msgstr "invalide '$upstream_name' en amont" -#: git-rebase.sh:515 +#: git-rebase.sh:561 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name : il y a plus d'une base de fusion" -#: git-rebase.sh:518 git-rebase.sh:522 +#: git-rebase.sh:564 git-rebase.sh:568 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name : il n'y a pas de base de fusion" -#: git-rebase.sh:527 +#: git-rebase.sh:573 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Ne pointe pas sur une validation valide : $onto_name" -#: git-rebase.sh:553 +#: git-rebase.sh:599 #, sh-format msgid "fatal: no such branch/commit '$branch_name'" msgstr "fatal : pas de branche ou commit '$branch_name'" -#: git-rebase.sh:586 +#: git-rebase.sh:632 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: git-rebase.sh:591 +#: git-rebase.sh:637 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Autoremisage créé : $stash_abbrev" -#: git-rebase.sh:595 +#: git-rebase.sh:641 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: git-rebase.sh:618 +#: git-rebase.sh:664 #, sh-format msgid "HEAD is up to date." msgstr "HEAD est à jour." -#: git-rebase.sh:620 +#: git-rebase.sh:666 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La branche courante $branch_name est à jour." -#: git-rebase.sh:628 +#: git-rebase.sh:674 #, sh-format msgid "HEAD is up to date, rebase forced." msgstr "HEAD est à jour, rebasage forcé." -#: git-rebase.sh:630 +#: git-rebase.sh:676 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "La branche courante $branch_name est à jour, rebasage forcé." -#: git-rebase.sh:642 +#: git-rebase.sh:688 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Changements de $mb sur $onto :" -#: git-rebase.sh:651 +#: git-rebase.sh:697 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Rembobinage préalable de head pour pouvoir rejouer votre travail par-" "dessus..." -#: git-rebase.sh:661 +#: git-rebase.sh:707 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name mise à jour en avance rapide sur $onto_name." @@ -15780,113 +16305,113 @@ msgstr "Impossible de sauver l'état courant" msgid "Saved working directory and index state $stash_msg" msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg" -#: git-stash.sh:340 +#: git-stash.sh:342 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: git-stash.sh:488 +#: git-stash.sh:490 #, sh-format msgid "unknown option: $opt" msgstr "option inconnue : $opt" -#: git-stash.sh:501 +#: git-stash.sh:503 msgid "No stash entries found." msgstr "Aucune entrée de remisage trouvée." -#: git-stash.sh:508 +#: git-stash.sh:510 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Trop de révisions spécifiées : $REV" -#: git-stash.sh:523 +#: git-stash.sh:525 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference n'est pas une référence valide" -#: git-stash.sh:551 +#: git-stash.sh:553 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' n'est pas une validation de type remisage" -#: git-stash.sh:562 +#: git-stash.sh:564 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' n'est pas une référence de remisage" -#: git-stash.sh:570 +#: git-stash.sh:572 msgid "unable to refresh index" msgstr "impossible de rafraîchir l'index" -#: git-stash.sh:574 +#: git-stash.sh:576 msgid "Cannot apply a stash in the middle of a merge" msgstr "Impossible d'appliquer un remisage en cours de fusion" -#: git-stash.sh:582 +#: git-stash.sh:584 msgid "Conflicts in index. Try without --index." msgstr "Conflits dans l'index. Essayez sans --index." -#: git-stash.sh:584 +#: git-stash.sh:586 msgid "Could not save index tree" msgstr "Impossible de sauvegarder l'arbre d'index" -#: git-stash.sh:593 +#: git-stash.sh:595 msgid "Could not restore untracked files from stash entry" msgstr "" "Impossible de restaurer les fichiers non-suivis depuis l'entrée de remisage" -#: git-stash.sh:618 +#: git-stash.sh:620 msgid "Cannot unstage modified files" msgstr "Impossible de désindexer les fichiers modifiés" -#: git-stash.sh:633 +#: git-stash.sh:635 msgid "Index was not unstashed." msgstr "L'index n'a pas été sorti de remise." -#: git-stash.sh:647 +#: git-stash.sh:649 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." -#: git-stash.sh:656 +#: git-stash.sh:658 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} supprimé ($s)" -#: git-stash.sh:657 +#: git-stash.sh:659 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Impossible de supprimer l'élément de stash" -#: git-stash.sh:665 +#: git-stash.sh:667 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: git-stash.sh:744 +#: git-stash.sh:746 msgid "(To restore them type \"git stash apply\")" msgstr "(Pour les restaurer tapez \"git stash apply\")" -#: git-submodule.sh:181 +#: git-submodule.sh:188 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:191 +#: git-submodule.sh:198 #, 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:210 +#: git-submodule.sh:217 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' existe déjà dans l'index" -#: git-submodule.sh:213 +#: git-submodule.sh:220 #, 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:226 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -15897,24 +16422,24 @@ msgstr "" "$sm_path\n" "Utilisez -f si vous voulez vraiment l'ajouter." -#: git-submodule.sh:237 +#: 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:239 +#: 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:247 +#: 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:249 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -15931,49 +16456,49 @@ msgstr "" "correct\n" "ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'." -#: git-submodule.sh:255 +#: 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:267 +#: 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:272 +#: 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:281 +#: 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:342 +#: git-submodule.sh:354 #, sh-format msgid "Entering '$displaypath'" msgstr "Entrée dans '$displaypath'" -#: git-submodule.sh:362 +#: git-submodule.sh:374 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "Arrêt sur '$displaypath' ; le script a retourné un état non nul." -#: git-submodule.sh:584 +#: git-submodule.sh:600 #, 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:594 +#: git-submodule.sh:610 #, 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:599 +#: git-submodule.sh:615 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -15982,12 +16507,12 @@ msgstr "" "Impossible de trouver la révision courante ${remote_name}/${branch} dans le " "chemin de sous-module '$sm_path'" -#: git-submodule.sh:617 +#: git-submodule.sh:633 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:623 +#: git-submodule.sh:639 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -15996,76 +16521,76 @@ msgstr "" "Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas " "$sha1. La récupération directe de ce commit a échoué." -#: git-submodule.sh:630 +#: git-submodule.sh:646 #, 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:631 +#: git-submodule.sh:647 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" -#: git-submodule.sh:635 +#: git-submodule.sh:651 #, 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:636 +#: git-submodule.sh:652 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'" -#: git-submodule.sh:641 +#: git-submodule.sh:657 #, 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:642 +#: git-submodule.sh:658 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'" -#: git-submodule.sh:647 +#: git-submodule.sh:663 #, 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:648 +#: git-submodule.sh:664 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'" -#: git-submodule.sh:679 +#: git-submodule.sh:695 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" -#: git-submodule.sh:775 +#: git-submodule.sh:791 msgid "The --cached option cannot be used with the --files option" msgstr "L'option --cached ne peut pas être utilisée avec l'option --files" -#: git-submodule.sh:827 +#: git-submodule.sh:843 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode $mod_dst inattendu" -#: git-submodule.sh:847 +#: git-submodule.sh:863 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Attention : $display_name ne contient pas la validation $sha1_src" -#: git-submodule.sh:850 +#: git-submodule.sh:866 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Attention : $display_name ne contient pas la validation $sha1_dst" -#: git-submodule.sh:853 +#: git-submodule.sh:869 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -16077,38 +16602,50 @@ msgstr "" msgid "See git-${cmd}(1) for details." msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." -#: git-rebase--interactive.sh:140 +#: git-rebase--interactive.sh:142 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Rebasage ($new_count/$total)" -#: git-rebase--interactive.sh:156 +#: git-rebase--interactive.sh:158 msgid "" "\n" "Commands:\n" -"p, pick = use commit\n" -"r, reword = use commit, but edit the commit message\n" -"e, edit = use commit, but stop for amending\n" -"s, squash = use commit, but meld into previous commit\n" -"f, fixup = like \"squash\", but discard this commit's log message\n" -"x, exec = run command (the rest of the line) using shell\n" -"d, drop = remove commit\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <commit> = run command (the rest of the line) using shell\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" "\n" "Commandes :\n" -" p, pick = utiliser le commit\n" -" r, reword = utiliser le commit, mais reformuler son message\n" -" e, edit = utiliser le commit, mais s'arrêter pour le modifier\n" -" s, squash = utiliser le commit, mais le fusionner avec le précédent\n" -" f, fixup = comme \"squash\", mais en éliminant son message\n" -" x, exec = lancer la commande (reste de la ligne) dans un shell\n" -" d, drop = supprimer le commit\n" +" p, pick <commit> = utiliser le commit\n" +" r, reword <commit> = utiliser le commit, mais reformuler son message\n" +" e, edit <commit> = utiliser le commit, mais s'arrêter pour le modifier\n" +" s, squash <commit> = utiliser le commit, mais le fusionner avec le précédent\n" +" f, fixup <commit> = comme \"squash\", mais en éliminant son message\n" +" x, exec <commit> = lancer la commande (reste de la ligne) dans un shell\n" +" d, drop <commit> = supprimer le commit\n" +" l, label <label> = nommer la HEAD courante\n" +" t, reset <label> = réinitialiser HEAD à label\n" +" m, merge [-C <commit> | -c <commit>] <label> [# <uniligne>]\n" +" créer un commit de fusion utilisant le message de fusion original\n" +" (ou l'uniligne, si aucun commit de fusion n'a été spécifié).\n" +" Utilisez -c <commit> pour reformuler le message de validation.\n" "\n" "Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n" -#: git-rebase--interactive.sh:171 +#: git-rebase--interactive.sh:179 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -16117,7 +16654,7 @@ msgstr "" "Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un " "commit.\n" -#: git-rebase--interactive.sh:175 +#: git-rebase--interactive.sh:183 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -16125,7 +16662,7 @@ msgstr "" "\n" "Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n" -#: git-rebase--interactive.sh:213 +#: git-rebase--interactive.sh:221 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -16144,83 +16681,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:238 +#: git-rebase--interactive.sh:246 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1 n'est pas un commit qui peut être picorer" -#: git-rebase--interactive.sh:277 +#: git-rebase--interactive.sh:285 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Nom de commit invalide : $sha1" -#: git-rebase--interactive.sh:319 +#: git-rebase--interactive.sh:325 msgid "Cannot write current commit's replacement sha1" msgstr "Impossible de sauver le sha1 du remplaçant du commit en cours" -#: git-rebase--interactive.sh:371 +#: git-rebase--interactive.sh:376 #, sh-format msgid "Fast-forward to $sha1" msgstr "Avance rapide sur $sha1" -#: git-rebase--interactive.sh:373 +#: git-rebase--interactive.sh:378 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Avance rapide impossible sur $sha1" -#: git-rebase--interactive.sh:382 +#: git-rebase--interactive.sh:387 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Impossible de déplacer HEAD sur $first_parent" -#: git-rebase--interactive.sh:387 +#: git-rebase--interactive.sh:392 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Refus d'écraser un commit de fusion: $sha1" -#: git-rebase--interactive.sh:405 +#: git-rebase--interactive.sh:410 #, sh-format msgid "Error redoing merge $sha1" msgstr "Erreur lors de la réapplication de la fusion $sha1" -#: git-rebase--interactive.sh:414 +#: git-rebase--interactive.sh:419 #, sh-format msgid "Could not pick $sha1" msgstr "Impossible de picorer $sha1" -#: git-rebase--interactive.sh:423 +#: git-rebase--interactive.sh:428 #, sh-format msgid "This is the commit message #${n}:" msgstr "Ceci est le ${n}ième message de validation :" -#: git-rebase--interactive.sh:428 +#: git-rebase--interactive.sh:433 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Le message de validation ${n} sera ignoré :" -#: git-rebase--interactive.sh:439 +#: git-rebase--interactive.sh:444 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Ceci est la combinaison de $count commit." msgstr[1] "Ceci est la combinaison de $count commits." -#: git-rebase--interactive.sh:448 +#: git-rebase--interactive.sh:453 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Impossible d'écrire $fixup_msg" -#: git-rebase--interactive.sh:451 +#: git-rebase--interactive.sh:456 msgid "This is a combination of 2 commits." msgstr "Ceci est la combinaison de 2 commits." -#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535 -#: git-rebase--interactive.sh:538 +#: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540 +#: git-rebase--interactive.sh:543 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Impossible d'appliquer $sha1... $rest" -#: git-rebase--interactive.sh:567 +#: git-rebase--interactive.sh:572 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -16237,31 +16774,31 @@ msgstr "" "le\n" "problème avant de pouvoir reformuler le message du commit." -#: git-rebase--interactive.sh:582 +#: git-rebase--interactive.sh:587 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Arrêté à $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:597 +#: git-rebase--interactive.sh:602 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "'$squash_style' impossible avec le commit précédent" -#: git-rebase--interactive.sh:639 +#: git-rebase--interactive.sh:644 #, sh-format msgid "Executing: $rest" msgstr "Exécution : $rest" -#: git-rebase--interactive.sh:647 +#: git-rebase--interactive.sh:652 #, sh-format msgid "Execution failed: $rest" msgstr "L'exécution a échoué : $rest" -#: git-rebase--interactive.sh:649 +#: git-rebase--interactive.sh:654 msgid "and made changes to the index and/or the working tree" msgstr "et a mis à jour l'index ou la copie de travail" -#: git-rebase--interactive.sh:651 +#: git-rebase--interactive.sh:656 msgid "" "You can fix the problem, and then run\n" "\n" @@ -16272,7 +16809,7 @@ msgstr "" "git rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:664 +#: git-rebase--interactive.sh:669 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -16287,29 +16824,29 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:675 +#: git-rebase--interactive.sh:680 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Commande inconnue : $command $sha1 $rest" -#: git-rebase--interactive.sh:676 +#: git-rebase--interactive.sh:681 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: git-rebase--interactive.sh:711 +#: git-rebase--interactive.sh:716 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Rebasage et mise à jour de $head_name avec succès." -#: git-rebase--interactive.sh:735 +#: git-rebase--interactive.sh:740 msgid "could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: git-rebase--interactive.sh:771 +#: git-rebase--interactive.sh:778 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Impossible de supprimer CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:776 +#: git-rebase--interactive.sh:783 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -16340,12 +16877,12 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:793 +#: git-rebase--interactive.sh:800 msgid "Error trying to find the author identity to amend commit" msgstr "" "Erreur lors de la recherche de l'identité de l'auteur pour corriger le commit" -#: git-rebase--interactive.sh:798 +#: git-rebase--interactive.sh:805 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -16353,11 +16890,11 @@ msgstr "" "Vous avez des modifications non validées dans votre copie de travail.\n" "Veuillez les valider d'abord, puis relancer 'git rebase --continue'." -#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807 +#: git-rebase--interactive.sh:810 git-rebase--interactive.sh:814 msgid "Could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: git-rebase--interactive.sh:836 +#: git-rebase--interactive.sh:843 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -16372,57 +16909,59 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008 +#: git-rebase--interactive.sh:851 git-rebase--interactive.sh:937 msgid "Could not execute editor" msgstr "Impossible de lancer l'éditeur" -#: git-rebase--interactive.sh:860 +#: git-rebase--interactive.sh:872 #, sh-format msgid "Could not checkout $switch_to" msgstr "Impossible d'extraire $switch_to" -#: git-rebase--interactive.sh:865 +#: git-rebase--interactive.sh:879 msgid "No HEAD?" msgstr "Pas de HEAD ?" -#: git-rebase--interactive.sh:866 +#: git-rebase--interactive.sh:880 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Impossible de créer un répertoire temporaire $state_dir" -#: git-rebase--interactive.sh:869 +#: git-rebase--interactive.sh:883 msgid "Could not mark as interactive" msgstr "Impossible de marquer comme interactif" -#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884 -msgid "Could not init rewritten commits" -msgstr "Impossible d'initialiser les commits réécrits" - -#: git-rebase--interactive.sh:910 -msgid "Could not generate todo list" -msgstr "Impossible de générer la liste à-faire" - -#: git-rebase--interactive.sh:986 +#: git-rebase--interactive.sh:915 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)" msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)" -#: git-rebase--interactive.sh:991 +#: git-rebase--interactive.sh:920 msgid "" "\n" -"However, if you remove everything, the rebase will be aborted.\n" +"\tHowever, if you remove everything, the rebase will be aborted.\n" "\n" +"\t" msgstr "" "\n" "Cependant, si vous effacez tout, le rebasage sera annulé.\n" "\n" +"\t" -#: git-rebase--interactive.sh:998 +#: git-rebase--interactive.sh:927 msgid "Note that empty commits are commented out" msgstr "Veuillez noter que les commits vides sont en commentaire" +#: git-rebase--interactive.sh:980 +msgid "Could not generate todo list" +msgstr "Impossible de générer la liste à-faire" + +#: git-rebase--interactive.sh:1001 git-rebase--interactive.sh:1006 +msgid "Could not init rewritten commits" +msgstr "Impossible d'initialiser les commits réécrits" + #: git-sh-setup.sh:89 git-sh-setup.sh:94 #, sh-format msgid "usage: $dashless $USAGE" @@ -16504,68 +17043,68 @@ msgstr "indexé" msgid "unstaged" msgstr "non-indexé" -#: git-add--interactive.perl:246 git-add--interactive.perl:271 +#: git-add--interactive.perl:253 git-add--interactive.perl:278 msgid "binary" msgstr "binaire" -#: git-add--interactive.perl:255 git-add--interactive.perl:309 +#: git-add--interactive.perl:262 git-add--interactive.perl:316 msgid "nothing" msgstr "rien" -#: git-add--interactive.perl:291 git-add--interactive.perl:306 +#: git-add--interactive.perl:298 git-add--interactive.perl:313 msgid "unchanged" msgstr "inchangé" -#: git-add--interactive.perl:602 +#: git-add--interactive.perl:609 #, 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" -#: git-add--interactive.perl:605 +#: git-add--interactive.perl:612 #, 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" -#: git-add--interactive.perl:608 +#: git-add--interactive.perl:615 #, 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" -#: git-add--interactive.perl:611 +#: git-add--interactive.perl:618 #, 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:620 +#: git-add--interactive.perl:627 msgid "Update" msgstr "Mise à jour" -#: git-add--interactive.perl:632 +#: git-add--interactive.perl:639 msgid "Revert" msgstr "Inverser" -#: git-add--interactive.perl:655 +#: git-add--interactive.perl:662 #, perl-format msgid "note: %s is untracked now.\n" msgstr "note : %s n'est plus suivi à présent.\n" -#: git-add--interactive.perl:666 +#: git-add--interactive.perl:673 msgid "Add untracked" msgstr "Ajouter un fichier non-suivi" -#: git-add--interactive.perl:672 +#: git-add--interactive.perl:679 msgid "No untracked files.\n" msgstr "Aucun Fichier non suivi.\n" -#: git-add--interactive.perl:1026 +#: git-add--interactive.perl:1033 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -16573,7 +17112,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:1029 +#: git-add--interactive.perl:1036 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -16581,7 +17120,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:1032 +#: git-add--interactive.perl:1039 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -16589,7 +17128,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme desindexée." -#: git-add--interactive.perl:1035 git-add--interactive.perl:1044 +#: git-add--interactive.perl:1042 git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -16597,7 +17136,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme appliquée." -#: git-add--interactive.perl:1038 git-add--interactive.perl:1041 +#: git-add--interactive.perl:1045 git-add--interactive.perl:1048 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -16605,17 +17144,17 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme éliminée." -#: git-add--interactive.perl:1078 +#: git-add--interactive.perl:1085 #, 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:1079 +#: git-add--interactive.perl:1086 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" -#: git-add--interactive.perl:1085 +#: git-add--interactive.perl:1092 #, perl-format msgid "" "---\n" @@ -16629,7 +17168,7 @@ msgstr "" "Les lignes commençant par %s seront éliminées.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1093 +#: git-add--interactive.perl:1100 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" @@ -16639,7 +17178,7 @@ 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" -#: git-add--interactive.perl:1107 +#: git-add--interactive.perl:1114 #, 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" @@ -16650,14 +17189,14 @@ msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: git-add--interactive.perl:1206 +#: git-add--interactive.perl:1213 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] ? " -#: git-add--interactive.perl:1215 +#: git-add--interactive.perl:1222 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -16671,7 +17210,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:1221 +#: git-add--interactive.perl:1228 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -16685,7 +17224,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:1227 +#: git-add--interactive.perl:1234 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -16699,7 +17238,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:1233 +#: git-add--interactive.perl:1240 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -16713,7 +17252,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:1239 +#: git-add--interactive.perl:1246 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -16727,7 +17266,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:1245 +#: git-add--interactive.perl:1252 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -16741,7 +17280,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:1251 +#: git-add--interactive.perl:1258 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -16755,7 +17294,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:1266 +#: git-add--interactive.perl:1273 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -16777,211 +17316,218 @@ msgstr "" "e - éditer manuellement la section actuelle\n" "? - afficher l'aide\n" -#: git-add--interactive.perl:1297 +#: git-add--interactive.perl:1304 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:1298 +#: git-add--interactive.perl:1305 msgid "Apply them to the worktree anyway? " msgstr "Les appliquer quand même à l'arbre de travail ? " -#: git-add--interactive.perl:1301 +#: git-add--interactive.perl:1308 msgid "Nothing was applied.\n" msgstr "Rien n'a été appliqué.\n" -#: git-add--interactive.perl:1312 +#: git-add--interactive.perl:1319 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "fichier non-fusionné ignoré : %s\n" -#: git-add--interactive.perl:1321 +#: git-add--interactive.perl:1328 msgid "Only binary files changed.\n" msgstr "Seuls des fichiers binaires ont changé.\n" -#: git-add--interactive.perl:1323 +#: git-add--interactive.perl:1330 msgid "No changes.\n" msgstr "Aucune modification.\n" -#: git-add--interactive.perl:1331 +#: git-add--interactive.perl:1338 msgid "Patch update" msgstr "Mise à jour par patch" -#: git-add--interactive.perl:1383 +#: git-add--interactive.perl:1390 #, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1384 +#: git-add--interactive.perl:1391 #, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1385 +#: git-add--interactive.perl:1392 #, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Indexer cette section [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1388 +#: git-add--interactive.perl:1395 #, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1389 +#: git-add--interactive.perl:1396 #, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1390 +#: git-add--interactive.perl:1397 #, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Remiser cette section [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1393 +#: git-add--interactive.perl:1400 #, 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,?] ? " -#: git-add--interactive.perl:1394 +#: git-add--interactive.perl:1401 #, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1395 +#: git-add--interactive.perl:1402 #, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1398 +#: git-add--interactive.perl:1405 #, 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,?] ? " -#: git-add--interactive.perl:1399 +#: git-add--interactive.perl:1406 #, 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,?] ? " -#: git-add--interactive.perl:1400 +#: git-add--interactive.perl:1407 #, 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,?] ? " -#: git-add--interactive.perl:1403 +#: git-add--interactive.perl:1410 #, 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,?] ? " -#: git-add--interactive.perl:1404 +#: git-add--interactive.perl:1411 #, 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,?] ? " -#: git-add--interactive.perl:1405 +#: git-add--interactive.perl:1412 #, 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,?] ? " -#: git-add--interactive.perl:1408 +#: git-add--interactive.perl:1415 #, 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,?] ? " +msgstr "" +"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1409 +#: git-add--interactive.perl:1416 #, 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,?] ? " -#: git-add--interactive.perl:1410 +#: git-add--interactive.perl:1417 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " +msgstr "" +"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1413 +#: git-add--interactive.perl:1420 #, 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,?] ? " +msgstr "" +"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d" +"%s,?] ? " -#: git-add--interactive.perl:1414 +#: git-add--interactive.perl:1421 #, 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,?] ? " +msgstr "" +"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d" +"%s,?] ? " -#: git-add--interactive.perl:1415 +#: git-add--interactive.perl:1422 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " +msgstr "" +"Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1515 +#: git-add--interactive.perl:1522 msgid "No other hunks to goto\n" msgstr "Aucune autre section à atteindre\n" -#: git-add--interactive.perl:1522 +#: git-add--interactive.perl:1529 msgid "go to which hunk (<ret> to see more)? " msgstr "aller à quelle section (<ret> pour voir plus) ? " -#: git-add--interactive.perl:1524 +#: git-add--interactive.perl:1531 msgid "go to which hunk? " msgstr "aller à quelle section ? " -#: git-add--interactive.perl:1533 +#: git-add--interactive.perl:1540 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Nombre invalide : '%s'\n" -#: git-add--interactive.perl:1538 +#: git-add--interactive.perl:1545 #, 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:1564 +#: git-add--interactive.perl:1571 msgid "No other hunks to search\n" msgstr "aucune autre section à rechercher\n" -#: git-add--interactive.perl:1568 +#: git-add--interactive.perl:1575 msgid "search for regex? " msgstr "rechercher la regex ? " -#: git-add--interactive.perl:1581 +#: git-add--interactive.perl:1588 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regex de recherche malformée %s : %s\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1598 msgid "No hunk matches the given pattern\n" msgstr "Aucune section ne correspond au motif donné\n" -#: git-add--interactive.perl:1603 git-add--interactive.perl:1625 +#: git-add--interactive.perl:1610 git-add--interactive.perl:1632 msgid "No previous hunk\n" msgstr "Pas de section précédente\n" -#: git-add--interactive.perl:1612 git-add--interactive.perl:1631 +#: git-add--interactive.perl:1619 git-add--interactive.perl:1638 msgid "No next hunk\n" msgstr "Pas de section suivante\n" -#: git-add--interactive.perl:1637 +#: git-add--interactive.perl:1644 msgid "Sorry, cannot split this hunk\n" msgstr "Désolé, impossible de découper cette section\n" -#: git-add--interactive.perl:1643 +#: git-add--interactive.perl:1650 #, 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:1653 +#: git-add--interactive.perl:1660 msgid "Sorry, cannot edit this hunk\n" msgstr "Désolé, impossible d'éditer cette section\n" -#: git-add--interactive.perl:1699 +#: git-add--interactive.perl:1706 msgid "Review diff" msgstr "Réviser la différence" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1718 +#: git-add--interactive.perl:1725 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -16999,18 +17545,18 @@ 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:1735 git-add--interactive.perl:1740 -#: git-add--interactive.perl:1743 git-add--interactive.perl:1750 -#: git-add--interactive.perl:1754 git-add--interactive.perl:1760 +#: git-add--interactive.perl:1742 git-add--interactive.perl:1747 +#: git-add--interactive.perl:1750 git-add--interactive.perl:1757 +#: git-add--interactive.perl:1761 git-add--interactive.perl:1767 msgid "missing --" msgstr "-- manquant" -#: git-add--interactive.perl:1756 +#: git-add--interactive.perl:1763 #, perl-format msgid "unknown --patch mode: %s" msgstr "mode de --patch inconnu : %s" -#: git-add--interactive.perl:1762 git-add--interactive.perl:1768 +#: git-add--interactive.perl:1769 git-add--interactive.perl:1775 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argument invalide %s, -- attendu" @@ -17052,7 +17598,9 @@ msgstr "Lancement de git format-patch impossible à l'extérieur d'un dépôt\n" msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" -msgstr "`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de commande ou des options de configuration)\n" +msgstr "" +"`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de " +"commande ou des options de configuration)\n" #: git-send-email.perl:456 #, perl-format @@ -17226,7 +17774,7 @@ msgstr "Que faire de cette adresse ? ([q]uitter|[d]élaisser|[e]diter): " msgid "CA path \"%s\" does not exist" msgstr "le chemin vers la CA \"%s\" n'existe pas" -#: git-send-email.perl:1395 +#: git-send-email.perl:1400 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -17250,137 +17798,164 @@ msgstr "" " lancez 'git config --global sendemail.confirm auto'.\n" "\n" -#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your +#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1410 -msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " -msgstr "Envoyer ce courriel ? ([y]es|[n]o|[q]uit|[a]ll) : " +#: git-send-email.perl:1415 +msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " +msgstr "Envoyer ce courriel ? ([y]es|[n]o|[e]dit|[q]uit|[a]ll) : " -#: git-send-email.perl:1413 +#: git-send-email.perl:1418 msgid "Send this email reply required" msgstr "Une réponse est nécessaire" -#: git-send-email.perl:1439 +#: git-send-email.perl:1446 msgid "The required SMTP server is not properly defined." msgstr "Le serveur SMTP nécessaire n'est pas défini correctement." -#: git-send-email.perl:1486 +#: git-send-email.perl:1493 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Le serveur ne supporte pas STARTTLS ! %s" -#: git-send-email.perl:1491 git-send-email.perl:1495 +#: git-send-email.perl:1498 git-send-email.perl:1502 #, perl-format msgid "STARTTLS failed! %s" msgstr "echec de STARTTLS ! %s" -#: git-send-email.perl:1505 +#: git-send-email.perl:1512 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-" "debug." -#: git-send-email.perl:1523 +#: git-send-email.perl:1530 #, perl-format msgid "Failed to send %s\n" msgstr "échec de l'envoi de %s\n" -#: git-send-email.perl:1526 +#: git-send-email.perl:1533 #, perl-format msgid "Dry-Sent %s\n" msgstr "Envoi simulé de %s\n" -#: git-send-email.perl:1526 +#: git-send-email.perl:1533 #, perl-format msgid "Sent %s\n" msgstr "%s envoyé\n" -#: git-send-email.perl:1528 +#: git-send-email.perl:1535 msgid "Dry-OK. Log says:\n" msgstr "Simulation OK. Le journal indique :\n" -#: git-send-email.perl:1528 +#: git-send-email.perl:1535 msgid "OK. Log says:\n" msgstr "OK. Le journal indique :\n" -#: git-send-email.perl:1540 +#: git-send-email.perl:1547 msgid "Result: " msgstr "Résultat : " -#: git-send-email.perl:1543 +#: git-send-email.perl:1550 msgid "Result: OK\n" msgstr "Résultat : OK\n" -#: git-send-email.perl:1556 +#: git-send-email.perl:1568 #, perl-format msgid "can't open file %s" msgstr "impossible d'ouvrir le fichier %s" -#: git-send-email.perl:1603 git-send-email.perl:1623 +#: git-send-email.perl:1615 git-send-email.perl:1635 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1609 +#: git-send-email.perl:1621 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Ajout de to: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1657 +#: git-send-email.perl:1674 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1682 +#: git-send-email.perl:1699 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(corps) Ajout de cc: %s depuis la ligne '%s'\n" -#: git-send-email.perl:1788 +#: git-send-email.perl:1817 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Impossible d'exécuter '%s'" -#: git-send-email.perl:1795 +#: git-send-email.perl:1824 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Ajout de %s : %s depuis : '%s'\n" -#: git-send-email.perl:1799 +#: git-send-email.perl:1828 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) échec de la fermeture du pipe vers '%s'" -#: git-send-email.perl:1826 +#: git-send-email.perl:1855 msgid "cannot send message as 7bit" msgstr "impossible d'envoyer un message comme 7bit" -#: git-send-email.perl:1834 +#: git-send-email.perl:1863 msgid "invalid transfer encoding" msgstr "codage de transfert invalide" -#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933 +#: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962 #, perl-format msgid "unable to open %s: %s\n" msgstr "impossible d'ouvrir %s :%s\n" -#: git-send-email.perl:1875 +#: git-send-email.perl:1904 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s : le patch contient une ligne plus longue que 998 caractères" -#: git-send-email.perl:1891 +#: git-send-email.perl:1920 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1895 +#: git-send-email.perl:1924 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " +#~ msgid "Could not open '%s' for writing" +#~ msgstr "Impossible d'ouvrir '%s' en écriture" + +#~ msgid "" +#~ "unexpected 1st line of squash message:\n" +#~ "\n" +#~ "\t%.*s" +#~ msgstr "" +#~ "première ligne de message de compression inattendue :\n" +#~ "\n" +#~ "\t%.*s" + +#~ msgid "" +#~ "invalid 1st line of squash message:\n" +#~ "\n" +#~ "\t%.*s" +#~ msgstr "" +#~ "première ligne de message de compression invalide :\n" +#~ "\n" +#~ "\t%.*s" + +#~ msgid "BUG: returned path string doesn't match cwd?" +#~ msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?" + +#~ msgid "Error in object" +#~ msgstr "Erreur dans l'objet" + #~ msgid "git fetch-pack: expected ACK/NAK, got EOF" #~ msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu" @@ -17898,9 +18473,6 @@ msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " #~ "Veuillez indexer vos modifications de .gitmodules ou remisez-les pour " #~ "continuer" -#~ msgid "could not verify the tag '%s'" -#~ msgstr "impossible de vérifier l'étiquette '%s'" - #~ msgid "failed to remove: %s" #~ msgstr "échec de la suppression de %s" |