diff options
Diffstat (limited to 'po/fr.po')
| -rw-r--r-- | po/fr.po | 6778 |
1 files changed, 4106 insertions, 2672 deletions
@@ -1,7 +1,7 @@ # French translations for Git. # Copyright (C) 2015 Jean-Noël Avila <jn.avila@free.fr> # This file is distributed under the same license as the Git package. -# Jean-Noël Avila <jn.avila@free.fr>, 2013. +# Jean-Noël Avila <jn.avila@free.fr>, 2015. # Sébastien Helleu <flashcode@flashtux.org>, 2013. # # French translations of common Git words used in this file: @@ -73,8 +73,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2015-07-14 07:19+0800\n" -"PO-Revision-Date: 2015-07-14 23:02+0200\n" +"POT-Creation-Date: 2016-05-24 23:42+0800\n" +"PO-Revision-Date: 2016-05-26 22:46+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" @@ -96,99 +96,112 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nécessaire pour marquer la résolution et valider." -#: archive.c:11 +#: advice.c:101 builtin/merge.c:1238 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." + +#: advice.c:103 +msgid "Please, commit your changes before merging." +msgstr "Veuillez valider vos changements avant de fusionner." + +#: advice.c:104 +msgid "Exiting because of unfinished merge." +msgstr "Abandon à cause d'une fusion non terminée." + +#: archive.c:12 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]" -#: archive.c:12 +#: archive.c:13 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:13 +#: archive.c:14 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <dépôt> [--exec <commande>] [<options>] <arbre ou " "apparenté> [<chemin>...]" -#: archive.c:14 +#: archive.c:15 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" -#: archive.c:427 +#: archive.c:429 msgid "fmt" msgstr "fmt" -#: archive.c:427 +#: archive.c:429 msgid "archive format" msgstr "format d'archive" -#: archive.c:428 builtin/log.c:1204 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "préfixe" -#: archive.c:429 +#: archive.c:431 msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516 -#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986 -#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:99 -#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394 -#: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:150 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 builtin/blame.c:2549 +#: builtin/config.c:60 builtin/fast-export.c:987 builtin/fast-export.c:989 +#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:459 +#: builtin/ls-files.c:462 builtin/notes.c:398 builtin/notes.c:561 +#: builtin/read-tree.c:109 parse-options.h:153 msgid "file" msgstr "fichier" -#: archive.c:431 builtin/archive.c:89 +#: archive.c:433 builtin/archive.c:89 msgid "write the archive to this file" msgstr "écrire l'archive dans ce fichier" -#: archive.c:433 +#: archive.c:435 msgid "read .gitattributes in working directory" msgstr "lire .gitattributes dans le répertoire de travail" -#: archive.c:434 +#: archive.c:436 msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" -#: archive.c:435 +#: archive.c:437 msgid "store only" msgstr "stockage seulement" -#: archive.c:436 +#: archive.c:438 msgid "compress faster" msgstr "compression rapide" -#: archive.c:444 +#: archive.c:446 msgid "compress better" msgstr "compression efficace" -#: archive.c:447 +#: archive.c:449 msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "dépôt" -#: archive.c:450 builtin/archive.c:91 +#: archive.c:452 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "récupérer l'archive depuis le dépôt distant <dépôt>" -#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482 msgid "command" msgstr "commande" -#: archive.c:452 builtin/archive.c:93 +#: archive.c:454 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "chemin vers la commande distante git-upload-archive" -#: attr.c:265 +#: attr.c:263 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -196,90 +209,107 @@ msgstr "" "Les motifs de négation sont ignorés dans les attributs git\n" "Utilisez '\\!' pour un point d'exclamation littéral." -#: branch.c:60 +#: branch.c:53 +#, c-format +msgid "" +"\n" +"After fixing the error cause you may try to fix up\n" +"the remote tracking information by invoking\n" +"\"git branch --set-upstream-to=%s%s%s\"." +msgstr "" +"\n" +"Après correction de la cause de l'erreur, vous pouvez essayer de corriger\n" +"l'information de suivi distant en invoquant\n" +"\"git branch --setup-upstream-to=%s%s%s\"." + +#: branch.c:67 #, 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:83 +#: branch.c:93 #, 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:84 +#: branch.c:94 #, 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:88 +#: branch.c:98 #, 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:89 +#: branch.c:99 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "La branche %s est paramétrée pour suivre la branche locale %s." -#: branch.c:94 +#: branch.c:104 #, 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:95 +#: branch.c:105 #, 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:99 +#: branch.c:109 #, 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:100 +#: branch.c:110 #, 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:133 +#: branch.c:119 +msgid "Unable to write upstream branch configuration" +msgstr "Échec de l'écriture de la configuration de branche amont" + +#: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "Pas de suivi : information ambiguë pour la référence %s" -#: branch.c:162 +#: branch.c:185 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' n'est pas un nom de branche valide." -#: branch.c:167 +#: branch.c:190 #, c-format msgid "A branch named '%s' already exists." msgstr "Une branche nommée '%s' existe déjà." -#: branch.c:175 +#: branch.c:198 msgid "Cannot force update the current branch." msgstr "Impossible de forcer la mise à jour de la branche courante." -#: branch.c:195 +#: branch.c:218 #, 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:197 +#: branch.c:220 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la branche amont demandée '%s' n'existe pas" -#: branch.c:199 +#: branch.c:222 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -299,21 +329,31 @@ 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:243 +#: branch.c:266 #, c-format msgid "Not a valid object name: '%s'." msgstr "Nom d'objet invalide : '%s'." -#: branch.c:263 +#: branch.c:286 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nom d'objet ambigu : '%s'." -#: branch.c:268 +#: branch.c:291 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Point d'embranchement invalide : '%s'." +#: branch.c:345 +#, c-format +msgid "'%s' is already checked out at '%s'" +msgstr "'%s' est déjà extrait dans '%s'" + +#: branch.c:364 +#, 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" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -324,7 +364,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:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -333,10 +373,10 @@ msgstr "impossible d'ouvrir '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" -#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705 -#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330 -#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358 -#: builtin/shortlog.c:158 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 +#: builtin/merge.c:361 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" @@ -358,47 +398,48 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "Le colis exige cette référence :" msgstr[1] "Le colis exige ces %d références :" -#: bundle.c:251 +#: bundle.c:253 msgid "Could not spawn pack-objects" msgstr "Impossible de créer des objets groupés" -#: bundle.c:269 +#: bundle.c:264 msgid "pack-objects died" msgstr "les objets groupés ont disparu" -#: bundle.c:309 +#: bundle.c:304 msgid "rev-list died" msgstr "rev-list a disparu" -#: bundle.c:358 +#: bundle.c:353 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:443 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:453 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:474 +#: bundle.c:491 msgid "index-pack died" msgstr "l'index de groupe a disparu" -#: color.c:260 +#: color.c:275 #, c-format msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:40 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" @@ -412,28 +453,28 @@ msgstr "%s %s n'est pas un commit !" msgid "memory exhausted" msgstr "plus de mémoire" -#: config.c:474 config.c:476 +#: config.c:475 config.c:477 #, c-format -msgid "bad config file line %d in %s" -msgstr "ligne %d de fichier de config incorrecte dans %s" +msgid "bad config line %d in %s %s" +msgstr "ligne %d de fichier de config incorrecte dans %s %s" -#: config.c:592 +#: config.c:593 #, c-format -msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgid "bad numeric config value '%s' for '%s' in %s %s: %s" msgstr "" -"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s" +"valeur numérique de configuration incorrecte '%s' pour '%s' dans %s %s : %s" -#: config.c:594 +#: config.c:595 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s" -#: config.c:679 +#: config.c:680 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'" -#: config.c:757 config.c:768 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "niveau de compression zlib incorrect %d" @@ -443,44 +484,52 @@ msgstr "niveau de compression zlib incorrect %d" msgid "invalid mode for object creation: %s" msgstr "mode invalide pour la création d'objet : %s" -#: config.c:1216 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:1277 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:1601 +#: config.c:1629 #, 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:1603 +#: config.c:1631 #, 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:1662 +#: config.c:1690 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "impossible de régler '%s' à '%s'" + +#: config.c:2226 +#, c-format +msgid "could not unset '%s'" +msgstr "impossible de désinitialiser '%s'" + #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "impossible d'écrire dans la rev-list : %s" +msgid "failed write to rev-list" +msgstr "impossible d'écrire dans la rev-list" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "impossible de fermer l'entrée standard du rev-list : %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" +msgstr "impossible de fermer l'entrée standard du rev-list" #: date.c:95 msgid "in the future" @@ -555,28 +604,28 @@ msgstr[1] "il y a %lu ans" msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" -#: diff.c:114 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Impossible d'analyser le pourcentage de modification de dirstat '%s'\n" -#: diff.c:119 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Paramètre dirstat inconnu '%s'\n" -#: diff.c:214 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'" -#: diff.c:266 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -585,16 +634,16 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -603,70 +652,70 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'" -#: dir.c:1852 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:1945 -msgid "Untracked cache is disabled on this system." -msgstr "Le cache non suivi est désactivé sur ce système." +#: dir.c:1942 +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." -#: gpg-interface.c:129 gpg-interface.c:200 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "impossible de lancer gpg." -#: gpg-interface.c:141 +#: gpg-interface.c:178 msgid "gpg did not accept the data" msgstr "gpg n'a pas accepté les données" -#: gpg-interface.c:152 +#: gpg-interface.c:189 msgid "gpg failed to sign the data" msgstr "gpg n'a pas pu signer les données" -#: gpg-interface.c:185 +#: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" -msgstr "impossible de créer un fichier temporaire '%s' : %s" +msgid "could not create temporary file '%s'" +msgstr "impossible de créer un fichier temporaire '%s'" -#: gpg-interface.c:188 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" -msgstr "impossible d'écrire la signature détachée dans '%s' : %s" +msgid "failed writing detached signature to '%s'" +msgstr "impossible d'écrire la signature détachée dans '%s'" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" -msgstr "'%s' : %s" +msgid "failed to stat '%s'" +msgstr "échec du stat de '%s'" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" -msgstr "'%s' : lecture tronquée %s" +msgid "'%s': short read" +msgstr "'%s' : lecture tronquée" -#: help.c:207 +#: help.c:205 #, c-format msgid "available git commands in '%s'" msgstr "commandes git disponibles dans '%s'" -#: help.c:214 +#: help.c:212 msgid "git commands available from elsewhere on your $PATH" msgstr "commandes git disponibles depuis un autre endroit de votre $PATH" -#: help.c:246 +#: help.c:244 msgid "These are common Git commands used in various situations:" msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :" -#: help.c:311 +#: help.c:309 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -675,11 +724,11 @@ msgstr "" "'%s' semble être une commande git, mais elle n'a pas pu\n" "être exécutée. Peut-être git-%s est-elle cassée ?" -#: help.c:368 +#: help.c:366 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ahem. Votre système n'indique aucune commande Git." -#: help.c:390 +#: help.c:388 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -689,17 +738,17 @@ msgstr "" "pas.\n" "Continuons en supposant que vous avez voulu dire '%s'" -#: help.c:395 +#: help.c:393 #, c-format msgid "in %0.1f seconds automatically..." msgstr "dans %0.1f secondes automatiquement..." -#: help.c:402 +#: help.c:400 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git : '%s' n'est pas une commande git. Voir 'git --help'." -#: help.c:406 help.c:466 +#: help.c:404 help.c:464 msgid "" "\n" "Did you mean this?" @@ -713,25 +762,41 @@ msgstr[1] "" "\n" "Vouliez-vous dire un de ceux-là ?" -#: help.c:462 +#: help.c:460 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: lockfile.c:345 -msgid "BUG: reopen a lockfile that is still open" -msgstr "BUG: réouverture d'un fichier verrou déjà ouvert" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"Impossible de créer '%s.lock' : %s.\n" +"\n" +"Il semble qu'un autre processus git est déjà lancé dans ce dépôt,\n" +"par exemple un éditeur ouvert par 'git commit'. Veuillez vous assurer\n" +"que tous les processus sont terminés et réessayez. Si l'echec persiste,\n" +"un processus git peut avoir planté :\n" +"supprimez le fichier manuellement pour poursuivre." -#: lockfile.c:347 -msgid "BUG: reopen a lockfile that has been committed" -msgstr "BUG: réouverture d'un fichier verrou validé" +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "Impossible de créer '%s.lock' : %s" #: merge.c:41 msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587 -#: builtin/clone.c:647 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" @@ -749,64 +814,64 @@ msgstr "échec de addinfo_cache pour le chemin '%s'" msgid "error building trees" msgstr "erreur de construction des arbres" -#: merge-recursive.c:687 +#: merge-recursive.c:689 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:698 +#: merge-recursive.c:700 #, 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:712 merge-recursive.c:733 +#: merge-recursive.c:714 merge-recursive.c:735 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:723 +#: merge-recursive.c:725 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:763 +#: merge-recursive.c:765 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:765 +#: merge-recursive.c:767 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:788 builtin/clone.c:306 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "échec à l'ouverture de '%s'" -#: merge-recursive.c:796 +#: merge-recursive.c:798 #, c-format msgid "failed to symlink '%s'" msgstr "échec à la création du lien symbolique '%s'" -#: merge-recursive.c:799 +#: merge-recursive.c:801 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:937 +#: merge-recursive.c:939 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-recursive.c:941 +#: merge-recursive.c:943 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-recursive.c:957 +#: merge-recursive.c:959 msgid "unsupported object type in the tree" msgstr "type d'objet non supporté dans l'arbre" -#: merge-recursive.c:1032 merge-recursive.c:1046 +#: merge-recursive.c:1034 merge-recursive.c:1048 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -815,7 +880,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:1038 merge-recursive.c:1051 +#: merge-recursive.c:1040 merge-recursive.c:1053 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -824,20 +889,20 @@ 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:1092 +#: merge-recursive.c:1094 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1092 +#: merge-recursive.c:1094 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1148 +#: merge-recursive.c:1150 #, 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:1170 +#: merge-recursive.c:1172 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -846,146 +911,146 @@ msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1175 +#: merge-recursive.c:1177 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1229 +#: merge-recursive.c:1231 #, 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:1259 +#: merge-recursive.c:1261 #, 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:1458 +#: merge-recursive.c:1460 #, 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:1468 +#: merge-recursive.c:1470 #, c-format msgid "Adding merged %s" msgstr "Ajout de %s fusionné" -#: merge-recursive.c:1473 merge-recursive.c:1671 +#: merge-recursive.c:1475 merge-recursive.c:1677 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:1524 +#: merge-recursive.c:1526 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-recursive.c:1527 +#: merge-recursive.c:1529 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-recursive.c:1575 +#: merge-recursive.c:1581 msgid "modify" msgstr "modification" -#: merge-recursive.c:1575 +#: merge-recursive.c:1581 msgid "modified" msgstr "modifié" -#: merge-recursive.c:1585 +#: merge-recursive.c:1591 msgid "content" msgstr "contenu" -#: merge-recursive.c:1592 +#: merge-recursive.c:1598 msgid "add/add" msgstr "ajout/ajout" -#: merge-recursive.c:1626 +#: merge-recursive.c:1632 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:1640 +#: merge-recursive.c:1646 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1644 git-submodule.sh:1150 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "sous-module" -#: merge-recursive.c:1645 +#: merge-recursive.c:1651 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-recursive.c:1731 +#: merge-recursive.c:1737 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:1756 +#: merge-recursive.c:1762 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:1762 +#: merge-recursive.c:1768 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:1767 +#: merge-recursive.c:1773 #, 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:1777 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:1794 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "Échec fatal de fusion, qui ne devrait jamais arriver." -#: merge-recursive.c:1813 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "Déjà à jour !" -#: merge-recursive.c:1822 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:1852 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "Chemin non traité ??? %s" -#: merge-recursive.c:1900 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:1913 +#: merge-recursive.c:1917 #, 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:1950 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:2007 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:2018 builtin/merge.c:645 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." @@ -993,19 +1058,19 @@ msgstr "Impossible d'écrire l'index." msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Impossible de valider un arbre de notes non initialisé/référencé" -#: notes-utils.c:82 +#: notes-utils.c:100 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Mauvaise valeur de notes.rewriteMode : '%s'" -#: notes-utils.c:92 +#: notes-utils.c:110 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: notes-utils.c:119 +#: notes-utils.c:137 #, c-format msgid "Bad %s value: '%s'" msgstr "Mauvaise valeur de %s : '%s'" @@ -1015,31 +1080,41 @@ msgstr "Mauvaise valeur de %s : '%s'" msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" -#: parse-options.c:546 +#: parse-options.c:572 msgid "..." msgstr "..." -#: parse-options.c:564 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:568 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr " ou : %s" -#: parse-options.c:571 +#: parse-options.c:597 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:605 +#: parse-options.c:631 msgid "-NUM" msgstr "-NUM" +#: parse-options-cb.c:108 +#, c-format +msgid "malformed object name '%s'" +msgstr "nom d'objet malformé '%s'" + +#: path.c:796 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Impossible de rendre %s inscriptible pour le groupe" + #: pathspec.c:133 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" @@ -1095,12 +1170,12 @@ msgstr "" "%s : le spécificateur magique de chemin n'est pas supporté par cette " "commande : %s" -#: pathspec.c:432 +#: pathspec.c:433 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "le chemin '%s' est au-delà d'un lien symbolique" -#: pathspec.c:441 +#: pathspec.c:442 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -1108,15 +1183,15 @@ msgstr "" "Il n'y a rien dont il faut exclure par des motifs :(exclure).\n" "Peut-être avez-vous oublié d'ajouter ':/' ou '.' ?" -#: pretty.c:968 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: progress.c:236 +#: progress.c:235 msgid "done" msgstr "fait" -#: read-cache.c:1295 +#: read-cache.c:1281 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -1125,7 +1200,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1305 +#: read-cache.c:1291 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -1134,96 +1209,251 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: remote.c:792 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "Impossible d'ouvrir '%s' en écriture" + +#: refs/files-backend.c:2243 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "Impossible de supprimer la référence %s : %s" + +#: refs/files-backend.c:2246 +#, c-format +msgid "could not delete references: %s" +msgstr "impossible de supprimer les références : %s" + +#: refs/files-backend.c:2255 +#, c-format +msgid "could not remove reference %s" +msgstr "impossible de supprimer la référence %s" + +#: ref-filter.c:55 +#, c-format +msgid "expected format: %%(color:<color>)" +msgstr "format attendu : %%(color:<couleur>)" + +#: ref-filter.c:57 +#, c-format +msgid "unrecognized color: %%(color:%s)" +msgstr "couleur non reconnue : %%(color:%s)" + +#: ref-filter.c:71 +#, c-format +msgid "unrecognized format: %%(%s)" +msgstr "format non reconnu %%(%s)" + +#: ref-filter.c:77 +#, c-format +msgid "%%(body) does not take arguments" +msgstr "%%(body) n'accepte pas d'argument" + +#: ref-filter.c:84 +#, c-format +msgid "%%(subject) does not take arguments" +msgstr "%%(subject) n'accepte pas d'argument" + +#: ref-filter.c:101 +#, c-format +msgid "positive value expected contents:lines=%s" +msgstr "valeur positive attendue contents:lines=%s" + +#: ref-filter.c:103 +#, c-format +msgid "unrecognized %%(contents) argument: %s" +msgstr "argument %%(contents) non reconnu : %s" + +#: ref-filter.c:113 +#, c-format +msgid "unrecognized %%(objectname) argument: %s" +msgstr "argument %%(objectname) non reconnu : %s" + +#: ref-filter.c:135 +#, c-format +msgid "expected format: %%(align:<width>,<position>)" +msgstr "format attendu : %%(align:<largeur>,<position>)" + +#: ref-filter.c:147 +#, c-format +msgid "unrecognized position:%s" +msgstr "position non reconnue : %s" + +#: ref-filter.c:151 +#, c-format +msgid "unrecognized width:%s" +msgstr "largeur non reconnue : %s" + +#: ref-filter.c:157 +#, c-format +msgid "unrecognized %%(align) argument: %s" +msgstr "argument %%(align) non reconnu : %s" + +#: ref-filter.c:161 +#, c-format +msgid "positive width expected with the %%(align) atom" +msgstr "valeur positive attendue avec l'atome %%(align)" + +#: ref-filter.c:244 +#, c-format +msgid "malformed field name: %.*s" +msgstr "nom de champ malformé %.*s" + +#: ref-filter.c:270 +#, c-format +msgid "unknown field name: %.*s" +msgstr "nom de champ inconnu : %.*s" + +#: ref-filter.c:372 +#, c-format +msgid "format: %%(end) atom used without corresponding atom" +msgstr "format : atome %%(end) utilisé sans atome correspondant" + +#: ref-filter.c:424 +#, c-format +msgid "malformed format string %s" +msgstr "Chaîne de formatage mal formée %s" + +#: ref-filter.c:878 +msgid ":strip= requires a positive integer argument" +msgstr ":strip= requiert un argument entier positif" + +#: ref-filter.c:883 +#, c-format +msgid "ref '%s' does not have %ld components to :strip" +msgstr "la réf '%s' n'a pas %ld composants à :strip" + +#: ref-filter.c:1046 +#, c-format +msgid "unknown %.*s format %s" +msgstr "format de %.*s inconnu %s" + +#: ref-filter.c:1066 ref-filter.c:1097 +#, c-format +msgid "missing object %s for %s" +msgstr "objet manquant %s pour %s" + +#: ref-filter.c:1069 ref-filter.c:1100 +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "echec de parse_object_buffer sur %s pour %s" + +#: ref-filter.c:1311 +#, c-format +msgid "malformed object at '%s'" +msgstr "objet malformé à '%s'" + +#: ref-filter.c:1373 +#, c-format +msgid "ignoring ref with broken name %s" +msgstr "réf avec un nom cassé %s ignoré" + +#: ref-filter.c:1378 +#, c-format +msgid "ignoring broken ref %s" +msgstr "réf cassé %s ignoré" + +#: ref-filter.c:1651 +#, c-format +msgid "format: %%(end) atom missing" +msgstr "format: atome %%(end) manquant" + +#: ref-filter.c:1705 +#, c-format +msgid "malformed object name %s" +msgstr "nom d'objet malformé %s" + +#: remote.c:746 #, 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:796 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:800 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#: remote.c:808 +#: remote.c:762 msgid "Internal error" msgstr "Erreur interne" -#: remote.c:1723 remote.c:1766 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1732 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1735 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurée pour la branche '%s'" -#: remote.c:1741 +#: remote.c:1696 #, 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:1756 +#: remote.c:1711 #, 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:1726 #, 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:1737 #, 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:1750 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:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de résoudre une poussée 'simple' pour une destination unique" -#: remote.c:2124 +#: remote.c:2074 #, 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:2128 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2131 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:2135 +#: remote.c:2085 #, 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:2141 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2144 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1235,11 +1465,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:2152 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:2155 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1254,49 +1484,54 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:2165 +#: remote.c:2115 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:2366 +#: revision.c:2142 +msgid "your current branch appears to be broken" +msgstr "votre branche actuelle semble cassée" + +#: revision.c:2145 +#, 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:2339 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" -#: run-command.c:83 +#: run-command.c:92 msgid "open /dev/null failed" msgstr "échec de l'ouverture de /dev/null" -#: run-command.c:85 +#: run-command.c:94 #, c-format msgid "dup2(%d,%d) failed" msgstr "échec de dup2(%d,%d)" -#: send-pack.c:272 +#: send-pack.c:295 msgid "failed to sign the push certificate" msgstr "impossible de signer le certificat de poussée" -#: send-pack.c:378 +#: send-pack.c:404 msgid "the receiving end does not support --signed push" msgstr "Le receveur ne gère pas les poussées avec --signed" -#: send-pack.c:389 +#: send-pack.c:406 +msgid "" +"not sending a push certificate since the receiving end does not support --" +"signed push" +msgstr "" +"pas d'envoi de certificat de poussée car le receveur ne gère pas les " +"poussées avec --signed" + +#: send-pack.c:418 msgid "the receiving end does not support --atomic push" msgstr "Le receveur ne gère pas les poussées avec --atomic" -#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 -#: builtin/merge.c:983 -#, c-format -msgid "Could not open '%s' for writing" -msgstr "Impossible d'ouvrir '%s' en écriture" - -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 -#: builtin/merge.c:988 -#, c-format -msgid "Could not write to '%s'" -msgstr "Impossible d'écrire dans '%s'" - -#: sequencer.c:195 +#: sequencer.c:174 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -1304,7 +1539,7 @@ msgstr "" "après résolution des conflits, marquez les chemins corrigés\n" "avec 'git add <chemins>' ou 'git rm <chemins>'" -#: sequencer.c:198 +#: sequencer.c:177 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -1314,67 +1549,67 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:211 sequencer.c:861 sequencer.c:944 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "Impossible d'écrire dans %s" -#: sequencer.c:214 +#: sequencer.c:193 #, c-format msgid "Error wrapping up %s" msgstr "Erreur à l'emballage de %s" -#: sequencer.c:229 +#: sequencer.c:208 msgid "Your local changes would be overwritten by cherry-pick." msgstr "Vos modifications locales seraient écrasées par cherry-pick." -#: sequencer.c:231 +#: sequencer.c:210 msgid "Your local changes would be overwritten by revert." msgstr "Vos modifications locales seraient écrasées par revert." -#: sequencer.c:234 +#: sequencer.c:213 msgid "Commit your changes or stash them to proceed." msgstr "Validez vos modifications ou les remiser pour continuer." #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:321 +#: sequencer.c:300 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:339 +#: sequencer.c:318 msgid "Could not resolve HEAD commit\n" msgstr "Impossible de résoudre le commit HEAD\n" -#: sequencer.c:359 +#: sequencer.c:338 msgid "Unable to update cache tree\n" msgstr "Impossible de mettre à jour l'arbre de cache\n" -#: sequencer.c:411 +#: sequencer.c:390 #, c-format msgid "Could not parse commit %s\n" msgstr "Impossible d'analyser le commit %s\n" -#: sequencer.c:416 +#: sequencer.c:395 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Impossible d'analyser le commit parent %s\n" -#: sequencer.c:482 +#: sequencer.c:460 msgid "Your index file is unmerged." msgstr "Votre fichier d'index n'est pas fusionné." -#: sequencer.c:501 +#: sequencer.c:479 #, 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:509 +#: sequencer.c:487 #, c-format msgid "Commit %s does not have parent %d" msgstr "Le commit %s n'a pas le parent %d" -#: sequencer.c:513 +#: sequencer.c:491 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -1383,162 +1618,186 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:526 +#: sequencer.c:504 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:530 +#: sequencer.c:508 #, c-format msgid "Cannot get commit message for %s" msgstr "Impossible d'obtenir un message de validation pour %s" -#: sequencer.c:616 +#: sequencer.c:594 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:617 +#: sequencer.c:595 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:653 +#: sequencer.c:630 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:661 +#: sequencer.c:638 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:665 +#: sequencer.c:642 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:725 +#: sequencer.c:702 #, c-format msgid "Cannot %s during a %s" msgstr "Impossible de %s pendant un %s" -#: sequencer.c:747 +#: sequencer.c:724 #, c-format msgid "Could not parse line %d." msgstr "Impossible d'analyser la ligne %d." -#: sequencer.c:752 +#: sequencer.c:729 msgid "No commits parsed." msgstr "Aucun commit analysé." -#: sequencer.c:765 +#: sequencer.c:741 #, c-format msgid "Could not open %s" msgstr "Impossible d'ouvrir %s" -#: sequencer.c:769 +#: sequencer.c:745 #, c-format msgid "Could not read %s." msgstr "Impossible de lire %s." -#: sequencer.c:776 +#: sequencer.c:752 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Feuille d'instruction inutilisable : %s" -#: sequencer.c:806 +#: sequencer.c:782 #, c-format msgid "Invalid key: %s" msgstr "Clé invalide: %s" -#: sequencer.c:809 +#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52 #, c-format msgid "Invalid value for %s: %s" msgstr "Valeur invalide pour %s : %s" -#: sequencer.c:821 +#: sequencer.c:795 #, c-format msgid "Malformed options sheet: %s" msgstr "Feuille d'options malformée : %s" -#: sequencer.c:842 +#: sequencer.c:814 msgid "a cherry-pick or revert is already in progress" msgstr "un picorage ou un retour est déjà en cours" -#: sequencer.c:843 +#: sequencer.c:815 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\"" -#: sequencer.c:847 +#: sequencer.c:819 #, c-format msgid "Could not create sequencer directory %s" msgstr "Impossible de créer le répertoire de séquenceur %s" -#: sequencer.c:863 sequencer.c:948 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "Erreur lors de l'emballage de %s." -#: sequencer.c:882 sequencer.c:1018 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:884 +#: sequencer.c:856 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:886 +#: sequencer.c:858 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:908 builtin/apply.c:4291 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" -msgstr "impossible d'ouvrir %s : %s" +msgid "cannot open %s" +msgstr "impossible d'ouvrir %s" -#: sequencer.c:911 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "impossible de lire %s : %s" -#: sequencer.c:912 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:918 +#: sequencer.c:887 #, 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:941 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "Impossible de formater %s." -#: sequencer.c:1086 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:1089 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:1123 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "Impossible d'annuler en tant que commit initial" -#: sequencer.c:1124 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "Impossible de picorer vers une HEAD vide" -#: setup.c:243 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" -#: sha1_name.c:453 +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "Version attendue du dépôt git <= %d, %d trouvée" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "extensions de dépôt inconnues trouvées :" + +#: sha1_file.c:1080 +msgid "offset before end of packfile (broken .idx?)" +msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" + +#: sha1_file.c:2458 +#, 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 ?)" + +#: sha1_file.c:2462 +#, 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é ?)" + +#: sha1_name.c:462 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" @@ -1589,37 +1848,287 @@ msgstr "Impossible de supprimer l'élément de .gitmodules pour %s" msgid "staging updated .gitmodules failed" msgstr "échec de la mise en index du .gitmodules mis à jour" -#: submodule.c:1115 +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "Valeur invalide pour %s" + +#: trailer.c:237 #, c-format -msgid "Could not set core.worktree in %s" -msgstr "Impossible de paramétrer core.worktree dans %s" +msgid "running trailer command '%s' failed" +msgstr "échec de la commande trailer '%s'" -#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 -#: trailer.c:561 +#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 +#: trailer.c:562 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valeur inconnue '%s' pour la clé '%s'" -#: trailer.c:543 trailer.c:548 builtin/remote.c:290 +#: trailer.c:544 trailer.c:549 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "plus d'un %s" -#: trailer.c:581 +#: trailer.c:582 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "symbole vide dans la ligne de fin '%.*s'" -#: trailer.c:701 +#: trailer.c:702 #, c-format msgid "could not read input file '%s'" msgstr "impossible de lire le fichier d'entrée '%s'" -#: trailer.c:704 +#: trailer.c:705 msgid "could not read from stdin" msgstr "Impossible de lire depuis l'entrée standard" -#: unpack-trees.c:203 +#: trailer.c:857 builtin/am.c:42 +#, c-format +msgid "could not stat %s" +msgstr "stat impossible de %s" + +#: trailer.c:859 +#, c-format +msgid "file %s is not a regular file" +msgstr "%s n'est pas un fichier régulier" + +#: trailer.c:861 +#, c-format +msgid "file %s is not writable by user" +msgstr "le fichier %s n'est pas inscriptible par l'utilisateur" + +#: trailer.c:873 +msgid "could not open temporary file" +msgstr "impossible de créer un fichier temporaire" + +#: trailer.c:912 +#, c-format +msgid "could not rename temporary file to %s" +msgstr "impossible de renommer un fichier temporaire en %s" + +#: transport-helper.c:1041 +#, c-format +msgid "Could not read ref %s" +msgstr "impossible de lire la réf %s" + +#: unpack-trees.c:64 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you can switch branches." +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n" +"%%sVeuillez valider ou remiser vos modifications avant de basculer de branche." + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :\n" +"%%s" + +#: unpack-trees.c:69 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you can merge." +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n" +"%%sVeuillez valider ou remiser vos modifications avant la fusion." + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :\n" +"%%s" + +#: unpack-trees.c:74 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you can %s." +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" +"%%sVeuillez valider ou remiser vos modifications avant %s." + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" +"%%s" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"La mise à jour des répertoires suivants effacerait les fichiers non suivis contenus :\n" +"%s" + +#: unpack-trees.c:85 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"Les fichiers suivants non suivis seraient effacés par l'extraction :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient effacés par l'extraction :\n" +"%%s" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Les fichiers suivants non suivis seraient effacés par la fusion :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant la fusion." + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient effacés par la fusion :\n" +"%%s" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Les fichiers suivants non suivis seraient effacés par %s :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant %s." + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient effacés par %s :\n" +"%%s" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" +"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" +"%%s" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" +"Les fichiers suivants non suivis seraient effacés par la fusion :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant la fusion." + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient écrasés par la fusion :\n" +"%%s" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" +"Les fichiers suivants non suivis seraient écrasés par %s :\n" +"%%sVeuillez renommer ou effacer ces fichiers avant %s." + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Les fichiers suivants non suivis seraient écrasés par %s :\n" +"%%s" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible." + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont pas à jour :\n" +"%s" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Les fichiers suivants de la copie de travail seraient écrasés par la mise à jour par extraction creuse :\n" +"%s" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" +"Les fichiers suivants de la copie de travail seraient supprimés par la mise à jour par extraction creuse :\n" +"%s" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "Abandon\n" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "Extraction des fichiers" @@ -1652,42 +2161,43 @@ msgstr "numéro de port invalide" msgid "invalid '..' path segment" msgstr "segment de chemin '..' invalide" -#: wrapper.c:523 +#: wrapper.c:222 wrapper.c:381 #, c-format -msgid "unable to access '%s': %s" -msgstr "impossible d'accéder à '%s' : %s" +msgid "could not open '%s' for reading and writing" +msgstr "impossible d'ouvrir '%s' en lecture/écriture" -#: wrapper.c:544 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format -msgid "unable to access '%s'" -msgstr "impossible d'accéder à '%s'" +msgid "could not open '%s' for writing" +msgstr "impossible d'ouvrir '%s' en écriture" -#: wrapper.c:555 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 +#: builtin/pull.c:407 #, c-format -msgid "unable to look up current user in the passwd file: %s" -msgstr "" -"impossible de rechercher l'utilisateur actuel dans le fichier de mots de " -"passe : %s" +msgid "could not open '%s' for reading" +msgstr "impossible d'ouvrir '%s' en lecture" -#: wrapper.c:556 -msgid "no such user" -msgstr "utilisateur inconnu" +#: wrapper.c:594 wrapper.c:615 +#, c-format +msgid "unable to access '%s'" +msgstr "impossible d'accéder à '%s'" -#: wrapper.c:564 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "impossible d'accéder au répertoire de travail courant" -#: wrapper.c:575 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "Impossible d'ouvrir '%s' en écriture" -#: wrapper.c:587 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "Impossible d'écrire dans %s" -#: wrapper.c:593 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "impossible de fermer %s" @@ -1852,7 +2362,7 @@ msgid "" "Everything below will be removed." msgstr "" "Ne touchez pas à la ligne ci-dessus\n" -"Tout se qui suit sera éliminé." +"Tout ce qui suit sera éliminé." #: wt-status.c:949 msgid "You have unmerged paths." @@ -1862,60 +2372,91 @@ msgstr "Vous avez des chemins non fusionnés." msgid " (fix conflicts and run \"git commit\")" msgstr " (réglez les conflits puis lancez \"git commit\")" -#: wt-status.c:955 +#: wt-status.c:956 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:958 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr " (utilisez \"git commit\" pour terminer la fusion)" -#: wt-status.c:968 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "Vous êtes au milieu d'une session am." -#: wt-status.c:971 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "Le patch actuel est vide." -#: wt-status.c:975 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (réglez les conflits puis lancez \"git am --continue\")" -#: wt-status.c:977 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (utilisez \"git am --skip\" pour sauter ce patch)" -#: wt-status.c:979 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)" -#: wt-status.c:1039 wt-status.c:1056 +#: wt-status.c:1105 +msgid "No commands done." +msgstr "Aucune commande réalisée." + +#: wt-status.c:1108 +#, 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:1119 +#, c-format +msgid " (see more in file %s)" +msgstr " (voir plus dans le fichier %s)" + +#: wt-status.c:1124 +msgid "No commands remaining." +msgstr "Aucune commande restante." + +#: wt-status.c:1127 +#, 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:1135 +msgid " (use \"git rebase --edit-todo\" to view and edit)" +msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)" + +#: wt-status.c:1148 #, 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:1044 wt-status.c:1061 +#: wt-status.c:1153 msgid "You are currently rebasing." msgstr "Vous êtes en train de rebaser." -#: wt-status.c:1047 +#: wt-status.c:1167 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (réglez les conflits puis lancez \"git rebase --continue\")" -#: wt-status.c:1049 +#: wt-status.c:1169 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)" -#: wt-status.c:1051 +#: wt-status.c:1171 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:1064 +#: wt-status.c:1177 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")" -#: wt-status.c:1068 +#: wt-status.c:1181 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -1923,120 +2464,124 @@ msgstr "" "Vous êtes actuellement en train de fractionner un commit pendant un rebasage " "de la branche '%s' sur '%s'." -#: wt-status.c:1073 +#: wt-status.c:1186 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:1076 +#: wt-status.c:1189 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:1080 +#: wt-status.c:1193 #, 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:1085 +#: wt-status.c:1198 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:1088 +#: wt-status.c:1201 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)" -#: wt-status.c:1090 +#: wt-status.c:1203 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (utilisez \"git rebase --continue\" quand vous êtes satisfait de vos " "modifications)" -#: wt-status.c:1100 +#: wt-status.c:1213 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Vous êtes actuellement en train de picorer le commit %s." -#: wt-status.c:1105 +#: wt-status.c:1218 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")" -#: wt-status.c:1108 +#: wt-status.c:1221 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:1110 +#: wt-status.c:1223 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:1119 +#: wt-status.c:1232 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1124 +#: wt-status.c:1237 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1127 +#: wt-status.c:1240 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1129 +#: wt-status.c:1242 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1140 +#: wt-status.c:1253 #, 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:1144 +#: wt-status.c:1257 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1147 +#: wt-status.c:1260 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:1324 +#: wt-status.c:1460 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1331 +#: wt-status.c:1466 +msgid "interactive rebase in progress; onto " +msgstr "rebasage interactif en cours ; sur " + +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1336 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "HEAD détachée sur " -#: wt-status.c:1338 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "HEAD détachée depuis " -#: wt-status.c:1341 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1358 +#: wt-status.c:1496 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1372 +#: wt-status.c:1510 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1374 +#: wt-status.c:1512 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1378 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2048,32 +2593,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1384 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1386 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1392 +#: wt-status.c:1530 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1397 +#: wt-status.c:1535 #, 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:1400 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1403 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -2082,53 +2627,57 @@ 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:1406 +#: wt-status.c:1544 #, 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:1409 +#: wt-status.c:1547 #, 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:1412 wt-status.c:1417 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1415 +#: wt-status.c:1553 #, 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:1419 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1528 -msgid "HEAD (no branch)" -msgstr "HEAD (aucune branche)" - -#: wt-status.c:1534 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "Validation initiale sur " +#: wt-status.c:1668 +msgid "HEAD (no branch)" +msgstr "HEAD (aucune branche)" + # à priori on parle d'une branche ici -#: wt-status.c:1561 +#: wt-status.c:1697 msgid "gone" msgstr "disparue" -#: wt-status.c:1563 wt-status.c:1571 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "derrière " -#: compat/precompose_utf8.c:55 builtin/clone.c:345 +#: wt-status.c:1702 wt-status.c:1705 +msgid "ahead " +msgstr "devant " + +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "échec lors de l'unlink de '%s'" @@ -2142,7 +2691,7 @@ msgstr "git add [<options>] [--] <chemin>..." msgid "unexpected diff status %c" msgstr "status de diff inattendu %c" -#: builtin/add.c:70 builtin/commit.c:277 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" @@ -2155,7 +2704,7 @@ msgstr "suppression de '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:194 builtin/rev-parse.c:796 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "Impossible de lire l'index" @@ -2191,15 +2740,15 @@ 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:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369 -#: builtin/rm.c:268 +#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616 -#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "mode verbeux" @@ -2207,7 +2756,7 @@ msgstr "mode verbeux" msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "sélection interactive des sections" @@ -2268,92 +2817,495 @@ 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:358 +#: builtin/add.c:352 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Rien de spécifié, rien n'a été ajouté.\n" -#: builtin/add.c:359 +#: builtin/add.c:353 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Vous vouliez sûrement dire 'git add .' ?\n" -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 +#, c-format +msgid "could not read '%s'" +msgstr "impossible de lire '%s'" + +#: builtin/am.c:430 +msgid "could not parse author script" +msgstr "impossible d'analyser le script author" + +#: builtin/am.c:507 +#, c-format +msgid "'%s' was deleted by the applypatch-msg hook" +msgstr "'%s' a été effacé par le crochet applypatch-msg" + +#: builtin/am.c:548 builtin/notes.c:300 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "Ligne en entrée malformée : '%s'." + +#: builtin/am.c:585 builtin/notes.c:315 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "Impossible de copier les notes de '%s' vers '%s'" + +#: builtin/am.c:611 +msgid "fseek failed" +msgstr "échec de fseek" + +#: builtin/am.c:788 +#, c-format +msgid "could not parse patch '%s'" +msgstr "impossible d'analyser le patch '%s'" + +#: builtin/am.c:853 +msgid "Only one StGIT patch series can be applied at once" +msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois" + +#: builtin/am.c:900 +msgid "invalid timestamp" +msgstr "horodatage invalide" + +#: builtin/am.c:903 builtin/am.c:911 +msgid "invalid Date line" +msgstr "ligne de Date invalide" + +#: builtin/am.c:908 +msgid "invalid timezone offset" +msgstr "décalage horaire invalide" + +#: builtin/am.c:995 +msgid "Patch format detection failed." +msgstr "Échec de détection du format du patch." + +#: builtin/am.c:1000 builtin/clone.c:380 +#, c-format +msgid "failed to create directory '%s'" +msgstr "échec de la création du répertoire '%s'" + +#: builtin/am.c:1004 +msgid "Failed to split patches." +msgstr "Échec de découpage des patchs." + +#: builtin/am.c:1136 builtin/commit.c:365 +msgid "unable to write index file" +msgstr "impossible d'écrire le fichier d'index" + +#: builtin/am.c:1187 +#, c-format +msgid "When you have resolved this problem, run \"%s --continue\"." +msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"." + +#: builtin/am.c:1188 +#, c-format +msgid "If you prefer to skip this patch, run \"%s --skip\" instead." +msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"." + +#: builtin/am.c:1189 +#, c-format +msgid "To restore the original branch and stop patching, run \"%s --abort\"." +msgstr "" +"Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --" +"abort\"." + +#: builtin/am.c:1327 +msgid "Patch is empty. Was it split wrong?" +msgstr "Le patch est vide. Le découpage était-il bon ?" + +#: builtin/am.c:1401 builtin/log.c:1516 +#, c-format +msgid "invalid ident line: %s" +msgstr "ligne d'identification invalide : %s" + +#: builtin/am.c:1428 +#, c-format +msgid "unable to parse commit %s" +msgstr "impossible d'analyser le commit %s" + +#: builtin/am.c:1630 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" +"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " +"points." + +#: builtin/am.c:1632 +msgid "Using index info to reconstruct a base tree..." +msgstr "" +"Utilisation de l'information de l'index pour reconstruire un arbre de base..." + +#: builtin/am.c:1651 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"Avez-vous édité le patch à la main ?\n" +"Il ne s'applique pas aux blobs enregistrés dans son index." + +#: builtin/am.c:1657 +msgid "Falling back to patching base and 3-way merge..." +msgstr "Retour à un patch de la base et fusion à 3 points..." + +#: builtin/am.c:1672 +msgid "Failed to merge in the changes." +msgstr "Échec d'intégration des modifications." + +#: builtin/am.c:1696 builtin/merge.c:636 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree a échoué à écrire un arbre" + +#: builtin/am.c:1703 +msgid "applying to an empty history" +msgstr "application à un historique vide" + +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 +msgid "failed to write commit object" +msgstr "échec de l'écriture de l'objet commit" + +#: builtin/am.c:1748 builtin/am.c:1752 +#, c-format +msgid "cannot resume: %s does not exist." +msgstr "impossible de continuer : %s n'existe pas." + +#: builtin/am.c:1768 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" +"impossible d'être interactif sans entrée standard connectée à un terminal." + +#: builtin/am.c:1773 +msgid "Commit Body is:" +msgstr "Le corps de la validation est :" + +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#. +#: builtin/am.c:1783 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " +msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : " + +#: builtin/am.c:1833 +#, c-format +msgid "Dirty index: cannot apply patches (dirty: %s)" +msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" + +#: builtin/am.c:1868 builtin/am.c:1940 +#, c-format +msgid "Applying: %.*s" +msgstr "Application de %.*s" + +#: builtin/am.c:1884 +msgid "No changes -- Patch already applied." +msgstr "Pas de changement -- Patch déjà appliqué." + +#: builtin/am.c:1892 +#, c-format +msgid "Patch failed at %s %.*s" +msgstr "le patch a échoué à %s %.*s" + +#: builtin/am.c:1898 +#, c-format +msgid "The copy of the patch that failed is found in: %s" +msgstr "La copie du patch qui a échoué se trouve dans : %s" + +#: builtin/am.c:1943 +msgid "" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" +"Aucun changement - avez-vous oublié d'utiliser 'git add' ?\n" +"S'il n'y a plus rien à indexer, il se peut qu'autre chose ait déjà\n" +"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " +"patch." + +#: builtin/am.c:1950 +msgid "" +"You still have unmerged paths in your index.\n" +"Did you forget to use 'git add'?" +msgstr "" +"Vous avez toujours des chemins non fusionnés dans votre index\n" +"Auriez-vous oublié de faire 'git add' ?" + +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 +#: builtin/reset.c:316 +#, c-format +msgid "Could not parse object '%s'." +msgstr "Impossible d'analyser l'objet '%s'." + +#: builtin/am.c:2110 +msgid "failed to clean index" +msgstr "échec du nettoyage de l'index" + +#: builtin/am.c:2144 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" +"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" +"Pas de retour à ORIG_HEAD" + +#: builtin/am.c:2205 +#, c-format +msgid "Invalid value for --patch-format: %s" +msgstr "Valeur invalide pour --patch-format : %s" + +#: builtin/am.c:2238 +msgid "git am [<options>] [(<mbox>|<Maildir>)...]" +msgstr "git am [<options>] [(<mbox>|<Maildir>)...]" + +#: builtin/am.c:2239 +msgid "git am [<options>] (--continue | --skip | --abort)" +msgstr "git am [<options>] (--continue | --quit | --abort)" + +#: builtin/am.c:2245 +msgid "run interactively" +msgstr "exécution interactive" + +#: builtin/am.c:2247 +msgid "historical option -- no-op" +msgstr "option historique -- no-op" + +#: builtin/am.c:2249 +msgid "allow fall back on 3way merging if needed" +msgstr "permettre de revenir à une fusion à 3 points si nécessaire" + +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 +#: builtin/repack.c:171 +msgid "be quiet" +msgstr "être silencieux" + +#: builtin/am.c:2252 +msgid "add a Signed-off-by line to the commit message" +msgstr "ajouter une ligne Signed-off-by au message de validation" + +#: builtin/am.c:2255 +msgid "recode into utf8 (default)" +msgstr "recoder en utf-8 (par défaut)" + +#: builtin/am.c:2257 +msgid "pass -k flag to git-mailinfo" +msgstr "passer l'option -k à git-mailinfo" + +#: builtin/am.c:2259 +msgid "pass -b flag to git-mailinfo" +msgstr "passer l'option -b à git-mailinfo" + +#: builtin/am.c:2261 +msgid "pass -m flag to git-mailinfo" +msgstr "passer l'option -m à git-mailinfo" + +#: builtin/am.c:2263 +msgid "pass --keep-cr flag to git-mailsplit for mbox format" +msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox" + +#: builtin/am.c:2266 +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" +msgstr "" +"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr" + +#: builtin/am.c:2269 +msgid "strip everything before a scissors line" +msgstr "retirer tout le contenu avant la ligne des ciseaux" + +#: builtin/am.c:2270 builtin/apply.c:4546 +msgid "action" +msgstr "action" + +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 +#: builtin/am.c:2298 +msgid "pass it through git-apply" +msgstr "le passer jusqu'à git-apply" + +#: builtin/am.c:2279 builtin/apply.c:4570 +msgid "root" +msgstr "racine" + +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 +#: builtin/pull.c:179 builtin/submodule--helper.c:277 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 +#: builtin/submodule--helper.c:770 +msgid "path" +msgstr "chemin" + +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 builtin/pull.c:193 +#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645 +#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 +#: parse-options.h:134 parse-options.h:244 +msgid "n" +msgstr "n" + +#: builtin/am.c:2291 builtin/apply.c:4514 +msgid "num" +msgstr "num" + +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/tag.c:372 +msgid "format" +msgstr "format" + +#: builtin/am.c:2295 +msgid "format the patch(es) are in" +msgstr "format de présentation des patchs" + +#: builtin/am.c:2301 +msgid "override error message when patch failure occurs" +msgstr "surcharger le message d'erreur lors d'un échec d'application de patch" + +#: builtin/am.c:2303 +msgid "continue applying patches after resolving a conflict" +msgstr "continuer à appliquer les patchs après résolution d'un conflit" + +#: builtin/am.c:2306 +msgid "synonyms for --continue" +msgstr "synonymes de --continue" + +#: builtin/am.c:2309 +msgid "skip the current patch" +msgstr "sauter le patch courant" + +#: builtin/am.c:2312 +msgid "restore the original branch and abort the patching operation." +msgstr "" +"restaurer la branche originale et abandonner les applications de patch." + +#: builtin/am.c:2316 +msgid "lie about committer date" +msgstr "mentir sur la date de validation" + +#: builtin/am.c:2318 +msgid "use current timestamp for author date" +msgstr "utiliser l'horodatage actuel pour la date d'auteur" + +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 +msgid "key-id" +msgstr "id-clé" + +#: builtin/am.c:2321 +msgid "GPG-sign commits" +msgstr "signer les commits avec GPG" + +#: builtin/am.c:2324 +msgid "(internal use for git-rebase)" +msgstr "(utilisation interne pour git-rebase)" + +#: builtin/am.c:2339 +msgid "" +"The -b/--binary option has been a no-op for long time, and\n" +"it will be removed. Please do not use it anymore." +msgstr "" +"L'option -b/--binary ne fait plus rien depuis longtemps,\n" +"et elle sera supprimée. Veuillez ne plus l'utiliser." + +#: builtin/am.c:2346 +msgid "failed to read the index" +msgstr "échec à la lecture de l'index" + +#: builtin/am.c:2361 +#, c-format +msgid "previous rebase directory %s still exists but mbox given." +msgstr "" +"le répertoire précédent de rebasage %s existe toujours mais mbox donnée." + +#: builtin/am.c:2385 +#, c-format +msgid "" +"Stray %s directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" +"Répertoire abandonné %s trouvé.\n" +"Utilisez \"git am --abort\" pour le supprimer." + +#: builtin/am.c:2391 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "" +"Pas de résolution de l'opération en cours, nous ne sommes pas dans une " +"reprise." + #: builtin/apply.c:59 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<options>] [<patch>...]" -#: builtin/apply.c:112 +#: builtin/apply.c:111 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "option d'espace non reconnue '%s'" -#: builtin/apply.c:127 +#: builtin/apply.c:126 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "option d'ignorance d'espace non reconnue '%s'" -#: builtin/apply.c:822 +#: builtin/apply.c:818 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Impossible de préparer la regexp d'horodatage %s" -#: builtin/apply.c:831 +#: builtin/apply.c:827 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec a retourné %d pour l'entrée : %s" -#: builtin/apply.c:912 +#: builtin/apply.c:908 #, c-format msgid "unable to find filename in patch at line %d" msgstr "nom de fichier du patch introuvable à la ligne %d" -#: builtin/apply.c:944 +#: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu, %s trouvé à la " "ligne %d" -#: builtin/apply.c:948 +#: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply : mauvais format de git-diff - nouveau nom de fichier inconsistant " "à la ligne %d" -#: builtin/apply.c:949 +#: builtin/apply.c:943 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply : mauvais format de git-diff - ancien nom de fichier inconsistant " "à la ligne %d" -#: builtin/apply.c:956 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" "git apply : mauvais format de git-diff - /dev/null attendu à la ligne %d" -#: builtin/apply.c:1419 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recomptage : ligne inattendue : %.*s" -#: builtin/apply.c:1476 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" -#: builtin/apply.c:1493 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2368,77 +3320,77 @@ msgstr[1] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composants de préfixe de chemin (ligne %d)" -#: builtin/apply.c:1659 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: builtin/apply.c:1661 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: builtin/apply.c:1687 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: builtin/apply.c:1723 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: builtin/apply.c:1725 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: builtin/apply.c:1728 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" -#: builtin/apply.c:1874 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: builtin/apply.c:1903 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: builtin/apply.c:2054 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: builtin/apply.c:2144 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: builtin/apply.c:2148 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: builtin/apply.c:2781 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: builtin/apply.c:2900 +#: builtin/apply.c:2894 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)." msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)." -#: builtin/apply.c:2912 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d" -#: builtin/apply.c:2918 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" @@ -2447,347 +3399,340 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: builtin/apply.c:2938 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: builtin/apply.c:3039 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: builtin/apply.c:3045 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s " "trouvé)" -#: builtin/apply.c:3066 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: builtin/apply.c:3190 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "échec de la lecture de %s" -#: builtin/apply.c:3243 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" -#: builtin/apply.c:3271 builtin/apply.c:3493 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: builtin/apply.c:3352 builtin/apply.c:3507 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "%s : %s" -#: builtin/apply.c:3361 builtin/apply.c:3515 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: builtin/apply.c:3463 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: builtin/apply.c:3532 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: builtin/apply.c:3534 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: builtin/apply.c:3693 builtin/apply.c:3695 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: builtin/apply.c:3750 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: builtin/apply.c:3753 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: builtin/apply.c:3773 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" -#: builtin/apply.c:3778 +#: builtin/apply.c:3772 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" -#: builtin/apply.c:3798 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique" -#: builtin/apply.c:3802 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: builtin/apply.c:3816 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "échec de make_cache_entry pour le chemin '%s'" -#: builtin/apply.c:4052 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: builtin/apply.c:4081 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: builtin/apply.c:4085 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: builtin/apply.c:4090 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "création du magasin de stockage pour le fichier nouvellement créé %s " "impossible" -#: builtin/apply.c:4093 builtin/apply.c:4201 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: builtin/apply.c:4126 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: builtin/apply.c:4175 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: builtin/apply.c:4262 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: builtin/apply.c:4270 +#: builtin/apply.c:4264 msgid "internal error" msgstr "erreur interne" -#: builtin/apply.c:4273 +#: builtin/apply.c:4267 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." -#: builtin/apply.c:4283 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: builtin/apply.c:4304 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "impossible d'ouvrir %s : %s" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: builtin/apply.c:4307 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: builtin/apply.c:4397 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "Chemin '%s' non traité." + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "entrée non reconnue" -#: builtin/apply.c:4408 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85 -#: builtin/fetch.c:92 -msgid "path" -msgstr "chemin" - -#: builtin/apply.c:4526 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4529 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: builtin/apply.c:4531 -msgid "num" -msgstr "num" - -#: builtin/apply.c:4532 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: builtin/apply.c:4535 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: builtin/apply.c:4537 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" -#: builtin/apply.c:4541 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "" "afficher le nombre de lignes ajoutées et supprimées en notation décimale" -#: builtin/apply.c:4543 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "au lieu d'appliquer le patch, afficher un résumer de l'entrée" -#: builtin/apply.c:4545 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "au lieu d'appliquer le patch, voir si le patch est applicable" -#: builtin/apply.c:4547 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" -#: builtin/apply.c:4549 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: builtin/apply.c:4551 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: builtin/apply.c:4553 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec ---stat/--summary/--check)" -#: builtin/apply.c:4555 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement" -#: builtin/apply.c:4557 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "" "construire un index temporaire fondé sur l'information de l'index embarqué" -#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: builtin/apply.c:4562 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: builtin/apply.c:4563 -msgid "action" -msgstr "action" - -#: builtin/apply.c:4564 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "" "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs " "d'espace" -#: builtin/apply.c:4567 builtin/apply.c:4570 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: builtin/apply.c:4573 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: builtin/apply.c:4575 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: builtin/apply.c:4577 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: builtin/apply.c:4579 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: builtin/apply.c:4582 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolérer des erreurs de détection de retours chariot manquants en fin de " "fichier" -#: builtin/apply.c:4585 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au compte de lignes dans les en-têtes de section" -#: builtin/apply.c:4587 -msgid "root" -msgstr "racine" - -#: builtin/apply.c:4588 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" -#: builtin/apply.c:4610 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "--3way hors d'un dépôt" -#: builtin/apply.c:4618 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "--index hors d'un dépôt" -#: builtin/apply.c:4621 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "--cached hors d'un dépôt" -#: builtin/apply.c:4640 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "ouverture impossible du patch '%s'" -#: builtin/apply.c:4654 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erreur d'espace ignorée" msgstr[1] "%d erreurs d'espace ignorées" -#: builtin/apply.c:4660 builtin/apply.c:4670 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2841,108 +3786,116 @@ msgstr "effectuer 'git bisect next'" msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel" -#: builtin/blame.c:31 +#: builtin/blame.c:33 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>" -#: builtin/blame.c:36 +#: builtin/blame.c:38 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:2500 +#: builtin/blame.c:1782 +msgid "Blaming lines" +msgstr "Assignation de blâme au lignes" + +#: builtin/blame.c:2531 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:2501 +#: builtin/blame.c:2532 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:2502 +#: builtin/blame.c:2533 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:2503 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:2504 +#: builtin/blame.c:2535 +msgid "Force progress reporting" +msgstr "Forcer l'affichage de l'état d'avancement" + +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:2505 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:2506 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:2507 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:2508 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:2509 +#: builtin/blame.c:2541 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:2510 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:2511 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:2512 +#: builtin/blame.c:2544 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:2513 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "Afficher l'e-mail de l'auteur au lieu du nom (Défaut : désactivé)" -#: builtin/blame.c:2514 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:2515 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:2516 +#: builtin/blame.c:2548 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:2517 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:2518 builtin/blame.c:2519 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "score" -#: builtin/blame.c:2518 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:2519 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:2520 +#: builtin/blame.c:2552 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2520 +#: builtin/blame.c:2552 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" @@ -2953,28 +3906,32 @@ msgstr "" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2601 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" -#: builtin/branch.c:24 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:25 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]" -#: builtin/branch.c:26 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<options>] [-r] (-d | -D) <nom-de-branche>..." -#: builtin/branch.c:27 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" "git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>" -#: builtin/branch.c:150 +#: builtin/branch.c:30 +msgid "git branch [<options>] [-r | -a] [--points-at]" +msgstr "git branch [<options>] [-r | -a] [--points-at]" + +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -2983,7 +3940,7 @@ msgstr "" "suppression de la branche '%s' qui a été fusionnée dans\n" " '%s', mais pas dans HEAD." -#: builtin/branch.c:154 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -2992,12 +3949,12 @@ msgstr "" "branche '%s' non supprimée car elle n'a pas été fusionnée dans\n" " '%s', même si elle est fusionnée dans HEAD." -#: builtin/branch.c:168 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Impossible de rechercher l'objet commit pour '%s'" -#: builtin/branch.c:172 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -3006,309 +3963,322 @@ msgstr "" "La branche '%s' n'est pas totalement fusionnée.\n" "Si vous êtes sur que vous voulez la supprimer, lancez 'git branch -D %s'." -#: builtin/branch.c:185 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "Échec de la mise à jour du fichier de configuration" -#: builtin/branch.c:213 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "impossible d'utiliser -a avec -d" -#: builtin/branch.c:219 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "Impossible de rechercher l'objet commit pour HEAD" -#: builtin/branch.c:227 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." -msgstr "Impossible de supprimer la branche '%s' sur laquelle vous êtes." +msgid "Cannot delete branch '%s' checked out at '%s'" +msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'" -#: builtin/branch.c:243 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "branche de suivi '%s' non trouvée." -#: builtin/branch.c:244 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "branche '%s' non trouvée." -#: builtin/branch.c:258 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Erreur lors de la suppression de la branche de suivi '%s'" -#: builtin/branch.c:259 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "Erreur lors de la suppression de la branche '%s'" -#: builtin/branch.c:266 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Branche de suivi %s supprimée (précédemment %s).\n" -#: builtin/branch.c:267 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branche %s supprimée (précédemment %s).\n" -#: builtin/branch.c:368 -#, c-format -msgid "branch '%s' does not point at a commit" -msgstr "la branche '%s' ne pointe pas sur un commit" - # féminin pour une branche -#: builtin/branch.c:451 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "[%s: disparue]" -#: builtin/branch.c:456 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "[%s]" -#: builtin/branch.c:461 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "[%s: en retard de %d]" -#: builtin/branch.c:463 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "[en retard de %d]" -#: builtin/branch.c:467 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "[%s : en avance de %d]" -#: builtin/branch.c:469 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "[en avance de %d]" -#: builtin/branch.c:472 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s : en avance de %d, en retard de %d]" -#: builtin/branch.c:475 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "[en avance de %d, en retard de %d]" -#: builtin/branch.c:488 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr " **** référence invalide ****" -#: builtin/branch.c:579 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "(aucune branche, rebasage de %s)" -#: builtin/branch.c:582 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(aucune branche, bisect a démarré sur %s)" -#: builtin/branch.c:588 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD détachée sur %s)" -#: builtin/branch.c:591 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD détachée depuis %s)" -#: builtin/branch.c:595 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "(aucune branche)" -#: builtin/branch.c:642 +#: builtin/branch.c:541 #, c-format -msgid "object '%s' does not point to a commit" -msgstr "l'objet '%s' ne pointe pas sur un commit" +msgid "Branch %s is being rebased at %s" +msgstr "La branche %s est en cours de rebasage sur %s" -#: builtin/branch.c:690 -msgid "some refs could not be read" -msgstr "des références n'ont pas pu être lues" +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "La branche %s est en cours de bissection sur %s" -#: builtin/branch.c:703 +#: builtin/branch.c:560 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:713 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branche invalide : '%s'" -#: builtin/branch.c:728 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "Échec de renommage de la branche" -#: builtin/branch.c:732 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Renommage d'un branche mal nommée '%s'" -#: builtin/branch.c:736 +#: builtin/branch.c:594 #, 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:743 +#: builtin/branch.c:601 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:758 -#, c-format -msgid "malformed object name %s" -msgstr "nom d'objet malformé %s" - -#: builtin/branch.c:780 -#, c-format -msgid "could not write branch description template: %s" -msgstr "impossible d'écrire le modèle de description de branche : %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" +msgstr "impossible d'écrire le modèle de description de branche" -#: builtin/branch.c:810 +#: builtin/branch.c:651 msgid "Generic options" msgstr "Options génériques" -#: builtin/branch.c:812 +#: builtin/branch.c:653 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:813 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "supprimer les messages d'information" -#: builtin/branch.c:814 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "régler le mode de suivi (voir git-pull(1))" -#: builtin/branch.c:816 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "modifier l'information amont" -#: builtin/branch.c:820 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "amont" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "modifier l'information amont" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "utiliser la coloration dans la sortie" -#: builtin/branch.c:821 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "agir sur les branches de suivi distantes" -#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851 -#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582 -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616 -#: builtin/tag.c:622 -msgid "commit" -msgstr "commit" - -#: builtin/branch.c:825 builtin/branch.c:831 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "afficher seulement les branches qui contiennent le commit" -#: builtin/branch.c:837 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "Actions spécifiques à git-branch :" -#: builtin/branch.c:838 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "afficher à la fois les branches de suivi et les branches locales" -#: builtin/branch.c:840 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "supprimer une branche totalement fusionnée" -#: builtin/branch.c:841 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "supprimer une branche (même non fusionnée)" -#: builtin/branch.c:842 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "déplacer/renommer une branche et son reflog" -#: builtin/branch.c:843 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "déplacer/renommer une branche, même si la cible existe" -#: builtin/branch.c:844 +#: builtin/branch.c:675 msgid "list branch names" msgstr "afficher les noms des branches" -#: builtin/branch.c:845 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "créer le reflog de la branche" -#: builtin/branch.c:847 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "éditer la description de la branche" -#: builtin/branch.c:848 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "forcer la création, le déplacement/renommage, ou la suppression" -#: builtin/branch.c:851 -msgid "print only not merged branches" -msgstr "afficher seulement les branches non fusionnées" +#: builtin/branch.c:680 +msgid "print only branches that are merged" +msgstr "afficher seulement les branches qui sont fusionnées" -#: builtin/branch.c:857 -msgid "print only merged branches" -msgstr "afficher seulement les branches fusionnées" +#: builtin/branch.c:681 +msgid "print only branches that are not merged" +msgstr "afficher seulement les branches qui ne sont pas fusionnées" -#: builtin/branch.c:861 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "afficher les branches en colonnes" -#: builtin/branch.c:874 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 +msgid "key" +msgstr "clé" + +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 +msgid "field name to sort on" +msgstr "nom du champ servant à trier" + +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 +#: builtin/tag.c:369 +msgid "object" +msgstr "objet" + +#: builtin/branch.c:687 +msgid "print only branches of the object" +msgstr "afficher seulement les branches de l'objet" + +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: builtin/branch.c:878 builtin/clone.c:622 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" -#: builtin/branch.c:900 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "--column et --verbose sont incompatibles" -#: builtin/branch.c:911 builtin/branch.c:950 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "le nom de branche est requis" -#: builtin/branch.c:926 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "Impossible de décrire une HEAD détachée" -#: builtin/branch.c:931 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "impossible d'éditer la description de plus d'une branche" -#: builtin/branch.c:938 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aucun commit sur la branche '%s'." -#: builtin/branch.c:941 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "Aucune branche nommée '%s'." -#: builtin/branch.c:956 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "trop de branches pour une opération de renommage" -#: builtin/branch.c:961 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "trop de branches pour spécifier une branche amont" -#: builtin/branch.c:965 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -3316,41 +4286,41 @@ msgstr "" "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur " "aucune branche." -#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "pas de branche '%s'" -#: builtin/branch.c:972 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "la branche '%s' n'existe pas" -#: builtin/branch.c:984 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "trop de branches pour désactiver un amont" -#: builtin/branch.c:988 +#: builtin/branch.c:820 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:994 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branche '%s' n'a aucune information de branche amont" -#: builtin/branch.c:1008 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "créer manuellement 'HEAD' n'a pas de sens" -#: builtin/branch.c:1014 +#: builtin/branch.c:846 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:1017 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -3359,7 +4329,7 @@ msgstr "" "l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --" "track ou --set-upstream-to\n" -#: builtin/branch.c:1034 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3370,16 +4340,6 @@ msgstr "" "Si vous vouliez que '%s' suive '%s', faîtes ceci :\n" "\n" -#: builtin/branch.c:1035 -#, c-format -msgid " git branch -d %s\n" -msgstr " git branch -d %s\n" - -#: builtin/branch.c:1036 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr " git branch --set-upstream-to %s\n" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -3393,7 +4353,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:369 +#: builtin/cat-file.c:428 msgid "" "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" "<type>|--textconv) <object>" @@ -3401,64 +4361,68 @@ msgstr "" "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p " "| <type> | --textconv) <objet>" -#: builtin/cat-file.c:370 -msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-" -"objects>" -msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] < <liste-d-objets>" +#: builtin/cat-file.c:429 +msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" +msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" -#: builtin/cat-file.c:407 +#: builtin/cat-file.c:466 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:408 +#: builtin/cat-file.c:467 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:409 +#: builtin/cat-file.c:468 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:411 +#: builtin/cat-file.c:470 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:412 +#: builtin/cat-file.c:471 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:414 +#: builtin/cat-file.c:473 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:416 +#: builtin/cat-file.c:475 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:418 +#: builtin/cat-file.c:476 +msgid "buffer --batch output" +msgstr "bufferiser la sortie de --batch" + +#: builtin/cat-file.c:478 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:421 +#: builtin/cat-file.c:481 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:424 +#: builtin/cat-file.c:484 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:486 +msgid "show all objects with --batch or --batch-check" +msgstr "montrer tous les objets avec --batch ou --batch-check" + #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" -msgstr "" -"git check-attr --stdin [-z] [-a | --all | <attr>...] < <liste-de-chemins>" +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" +msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -3468,7 +4432,7 @@ msgstr "afficher tous les attributs associés au fichier" msgid "use .gitattributes only from the index" msgstr "utiliser .gitattributes seulement depuis l'index" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 msgid "read file names from stdin" msgstr "lire les noms de fichier depuis l'entrée standard" @@ -3477,7 +4441,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:18 builtin/checkout.c:1202 builtin/gc.c:279 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -3530,57 +4494,64 @@ msgstr "impossible d'analyser le contact : %s" msgid "no contacts specified" msgstr "aucun contact spécifié" -#: builtin/checkout-index.c:126 +#: builtin/checkout-index.c:127 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<options>] [--] [<fichier>...]" -#: builtin/checkout-index.c:188 +#: builtin/checkout-index.c:144 +msgid "stage should be between 1 and 3 or all" +msgstr "stage doit valoir entre 1 et 3, ou all" + +#: builtin/checkout-index.c:160 msgid "check out all files in the index" msgstr "extraire tous les fichiers présents dans l'index" -#: builtin/checkout-index.c:189 +#: builtin/checkout-index.c:161 msgid "force overwrite of existing files" msgstr "forcer l'écrasement des fichiers existants" -#: builtin/checkout-index.c:191 +#: builtin/checkout-index.c:163 msgid "no warning for existing files and files not in index" msgstr "" "pas d'avertissement pour les fichiers existants et les fichiers absents de " "l'index" -#: builtin/checkout-index.c:193 +#: builtin/checkout-index.c:165 msgid "don't checkout new files" msgstr "ne pas extraire les nouveaux fichiers" -#: builtin/checkout-index.c:195 +#: builtin/checkout-index.c:167 msgid "update stat information in the index file" msgstr "mettre à jour l'information de stat dans le fichier d'index" -#: builtin/checkout-index.c:201 +#: builtin/checkout-index.c:171 msgid "read list of paths from the standard input" msgstr "lire la liste des chemins depuis l'entrée standard" -#: builtin/checkout-index.c:203 +#: builtin/checkout-index.c:173 msgid "write the content to temporary files" msgstr "écrire le contenu dans des fichiers temporaires" -#: builtin/checkout-index.c:204 builtin/column.c:30 +#: builtin/checkout-index.c:174 builtin/column.c:30 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 +#: builtin/submodule--helper.c:774 msgid "string" msgstr "chaîne" -#: builtin/checkout-index.c:205 +#: builtin/checkout-index.c:175 msgid "when creating files, prepend <string>" msgstr "lors de la création de fichiers, préfixer par <chaîne>" -#: builtin/checkout-index.c:208 +#: builtin/checkout-index.c:177 msgid "copy out the files from named stage" msgstr "copier les fichiers depuis l'index nommé" -#: builtin/checkout.c:24 +#: builtin/checkout.c:25 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<options>] <branche>" -#: builtin/checkout.c:25 +#: builtin/checkout.c:26 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<options>] [<branche>] -- <fichier>..." @@ -3614,77 +4585,81 @@ msgstr "chemin '%s' : impossible de fusionner" msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en " "même temps." -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "fichier d'index corrompu" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:627 +#: builtin/checkout.c:622 #, c-format -msgid "Can not do reflog for '%s'\n" -msgstr "Impossible de faire un reflog pour '%s'\n" +msgid "Can not do reflog for '%s': %s\n" +msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:663 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:670 +#: builtin/checkout.c:664 builtin/clone.c:661 +msgid "unable to update HEAD" +msgstr "impossible de mettre à jour HEAD" + +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:673 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:677 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:679 builtin/checkout.c:1134 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:681 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:733 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:739 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -3707,7 +4682,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:758 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -3736,150 +4711,151 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:794 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:798 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:825 builtin/checkout.c:1129 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:931 -#, c-format -msgid "'%s' is already checked out at '%s'" -msgstr "'%s' est déjà extrait dans '%s'" - -#: builtin/checkout.c:1036 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "une seule référence attendue, %d fournies." -#: builtin/checkout.c:1075 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1146 builtin/checkout.c:1150 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, 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:1154 builtin/checkout.c:1157 builtin/checkout.c:1162 -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1170 +#: builtin/checkout.c:1103 #, 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:1203 builtin/checkout.c:1205 builtin/clone.c:83 -#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282 -#: builtin/worktree.c:284 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 +#: builtin/worktree.c:325 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1204 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1206 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1207 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1208 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "détacher la HEAD à la validation nommée" -#: builtin/checkout.c:1209 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1214 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1216 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1217 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1218 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "style" -#: builtin/checkout.c:1220 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" -msgstr "style de conflit (fusion ou diff3)" +msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1223 +#: builtin/checkout.c:1156 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:1225 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'" -#: builtin/checkout.c:1227 +#: builtin/checkout.c:1160 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:1252 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 +#: builtin/send-pack.c:168 +msgid "force progress reporting" +msgstr "forcer l'affichage de l'état d'avancement" + +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1269 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1274 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "Nom de branche manquant ; essayez -b" -#: builtin/checkout.c:1310 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1317 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -3889,12 +4865,12 @@ msgstr "" "en même temps.\n" "Souhaitiez-vous extraire '%s' qui ne peut être résolu comme commit ?" -#: builtin/checkout.c:1322 +#: builtin/checkout.c:1262 #, 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:1326 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -3902,38 +4878,38 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." -#: builtin/clean.c:26 +#: builtin/clean.c:25 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <motif>] [-x | -X] [--] <chemins>..." -#: builtin/clean.c:30 +#: builtin/clean.c:29 #, c-format msgid "Removing %s\n" msgstr "Suppression de %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:30 #, c-format msgid "Would remove %s\n" msgstr "Supprimerait %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:31 #, c-format msgid "Skipping repository %s\n" msgstr "Ignore le dépôt %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:32 #, c-format msgid "Would skip repository %s\n" msgstr "Ignorerait le dépôt %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:33 #, c-format msgid "failed to remove %s" msgstr "échec de la suppression de %s" -#: builtin/clean.c:295 +#: builtin/clean.c:291 msgid "" "Prompt help:\n" "1 - select a numbered item\n" @@ -3945,7 +4921,7 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" " - (vide) ne rien sélectionner" -#: builtin/clean.c:299 +#: builtin/clean.c:295 msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -3965,36 +4941,36 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection" -#: builtin/clean.c:515 +#: builtin/clean.c:511 #, c-format msgid "Huh (%s)?" msgstr "Hein (%s) ?" -#: builtin/clean.c:657 +#: builtin/clean.c:653 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs à ignorer>> " -#: builtin/clean.c:694 +#: builtin/clean.c:690 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" -#: builtin/clean.c:715 +#: builtin/clean.c:711 msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:756 +#: builtin/clean.c:752 #, c-format msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:781 +#: builtin/clean.c:777 msgid "Bye." msgstr "Au revoir." -#: builtin/clean.c:789 +#: builtin/clean.c:785 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -4012,62 +4988,62 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:816 +#: builtin/clean.c:812 msgid "*** Commands ***" msgstr "*** Commandes ***" -#: builtin/clean.c:817 +#: builtin/clean.c:813 msgid "What now" msgstr "Et maintenant ?" -#: builtin/clean.c:825 +#: builtin/clean.c:821 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Supprimerait l'élément suivant :" msgstr[1] "Supprimerait les éléments suivants :" -#: builtin/clean.c:842 +#: builtin/clean.c:838 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:873 +#: builtin/clean.c:869 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:875 +#: builtin/clean.c:871 msgid "force" msgstr "forcer" -#: builtin/clean.c:876 +#: builtin/clean.c:872 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:878 +#: builtin/clean.c:874 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" msgstr "motif" -#: builtin/clean.c:880 +#: builtin/clean.c:876 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:881 +#: builtin/clean.c:877 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:883 +#: builtin/clean.c:879 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:901 +#: builtin/clean.c:897 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" -#: builtin/clean.c:905 +#: builtin/clean.c:901 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -4075,7 +5051,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:908 +#: builtin/clean.c:904 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -4087,150 +5063,167 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" -#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224 -#: builtin/push.c:523 -msgid "force progress reporting" -msgstr "forcer l'affichage de l'état d'avancement" - -#: builtin/clone.c:59 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "ne pas créer d'extraction" -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "créer un dépôt nu" -#: builtin/clone.c:64 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "créer un dépôt miroir (implique dépôt nu)" -#: builtin/clone.c:66 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "pour cloner depuis un dépôt local" -#: builtin/clone.c:68 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "ne pas utiliser de liens durs locaux, toujours copier" -#: builtin/clone.c:70 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "régler comme dépôt partagé" -#: builtin/clone.c:72 builtin/clone.c:74 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "initialiser les sous-modules dans le clone" -#: builtin/clone.c:75 builtin/init-db.c:500 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "nombre de sous-modules clonés en parallèle" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "répertoire-modèle" -#: builtin/clone.c:76 builtin/init-db.c:501 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:78 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:80 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" -#: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "nom" -#: builtin/clone.c:82 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont" -#: builtin/clone.c:84 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" -#: builtin/clone.c:86 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 builtin/pull.c:201 msgid "depth" msgstr "profondeur" -#: builtin/clone.c:88 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:90 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" -#: builtin/clone.c:91 builtin/init-db.c:509 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "tous les sous-modules clonés seront superficiels" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:92 builtin/init-db.c:510 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "séparer le répertoire git de la copie de travail" -#: builtin/clone.c:93 +#: builtin/clone.c:100 msgid "key=value" msgstr "clé=valeur" -#: builtin/clone.c:94 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:240 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 +msgid "use IPv4 addresses only" +msgstr "n'utiliser que des adresses IPv4" + +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 +msgid "use IPv6 addresses only" +msgstr "n'utiliser que des adresses IPv6" + +#: builtin/clone.c:241 +msgid "" +"No directory name could be guessed.\n" +"Please specify a directory on the command line" +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:307 +#, 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é." + +#: builtin/clone.c:309 #, 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." -#: builtin/clone.c:244 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: builtin/clone.c:247 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: builtin/clone.c:310 -#, c-format -msgid "failed to create directory '%s'" -msgstr "échec de la création du répertoire '%s'" - -#: builtin/clone.c:312 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "échec du stat de '%s'" - -#: builtin/clone.c:314 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:328 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "échec du stat de %s\n" -#: builtin/clone.c:350 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:354 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:377 builtin/clone.c:551 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:389 +#: builtin/clone.c:461 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -4240,125 +5233,130 @@ 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:466 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:546 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "Vérification de la connectivité... " -#: builtin/clone.c:549 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: builtin/clone.c:613 +#: builtin/clone.c:649 +#, c-format +msgid "unable to update %s" +msgstr "impossible de mettre à jour %s" + +#: builtin/clone.c:698 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:644 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:731 +#: builtin/clone.c:767 +msgid "unable to write parameters to config file" +msgstr "impossible d'écrire les paramètres dans le fichier de configuration" + +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" -#: builtin/clone.c:733 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "impossible de unlinker le fichier temporaire alternates" -#: builtin/clone.c:763 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:767 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:778 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:781 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:794 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:800 builtin/fetch.c:1160 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:810 +#: builtin/clone.c:911 #, 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:820 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193 -#: builtin/worktree.c:220 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, 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:838 +#: builtin/clone.c:939 #, 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:856 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:858 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:883 -msgid "--dissociate given, but there is no --reference" -msgstr "--dissociate est spécifié, mais --reference est absent" - -#: builtin/clone.c:900 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." -#: builtin/clone.c:903 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:908 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:912 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "Je ne sais pas cloner %s" -#: builtin/clone.c:961 builtin/clone.c:969 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" -#: builtin/clone.c:972 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -4394,15 +5392,15 @@ msgstr "Remplissage d'espace entre les colonnes" msgid "--command must be the first argument" msgstr "--command doit être le premier argument" -#: builtin/commit.c:37 +#: builtin/commit.c:38 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<options>] [--] <spécification-de-chemin>..." -#: builtin/commit.c:42 +#: builtin/commit.c:43 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<options>] [--] <spécification-de-chemin>..." -#: builtin/commit.c:47 +#: builtin/commit.c:48 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4429,7 +5427,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:60 +#: builtin/commit.c:61 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -4455,7 +5453,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:72 +#: builtin/commit.c:73 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -4466,7 +5464,7 @@ msgstr "" "vide. Vous pouvez répéter votre commande avec --allow-empty, ou vous pouvez\n" "supprimer complètement le commit avec \"git reset HEAD^\".\n" -#: builtin/commit.c:77 +#: builtin/commit.c:78 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -4481,11 +5479,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:84 +#: builtin/commit.c:85 msgid "Otherwise, please use 'git reset'\n" msgstr "Sinon, veuillez utiliser 'git reset'\n" -#: builtin/commit.c:87 +#: builtin/commit.c:88 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -4501,70 +5499,66 @@ msgstr "" "Puis \"git cherry-pick --continue\" continuera le picorage \n" "des commits restants.\n" -#: builtin/commit.c:304 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" -#: builtin/commit.c:344 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "impossible de créer l'index temporaire" -#: builtin/commit.c:350 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "échec de l'ajout interactif" -#: builtin/commit.c:361 -msgid "unable to write index file" -msgstr "impossible d'écrire le fichier d'index" - -#: builtin/commit.c:363 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "impossible de mettre à jour l'index temporaire" -#: builtin/commit.c:365 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "Impossible de mettre à jour l'arbre de cache principal" -#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "impossible d'écrire le fichier new_index" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "impossible de lire l'index" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "entête d'auteur manquant dans le commit '%s'" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "le commit '%s' a une ligne d'auteur malformée" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -4572,43 +5566,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:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:702 builtin/shortlog.c:273 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, 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:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" -msgstr "impossible de lire MERGE_MSG" - -#: builtin/commit.c:734 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:738 builtin/merge.c:1079 -#, c-format -msgid "could not read '%s'" -msgstr "impossible de lire '%s'" +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" +msgstr "impossible de lire MERGE_MSG" -#: builtin/commit.c:785 +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -4623,7 +5612,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -4638,7 +5627,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4648,7 +5637,7 @@ msgstr "" "commençant par '%c' seront ignorées, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4659,149 +5648,150 @@ 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:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:953 builtin/tag.c:495 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, 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:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 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:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 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:1154 +#: builtin/commit.c:1165 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:1164 +#: builtin/commit.c:1175 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:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup." -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 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:1191 +#: builtin/commit.c:1202 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:1193 +#: builtin/commit.c:1204 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:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "Malin... correction du dernier avec un index sale." -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..." -#: builtin/commit.c:1209 builtin/tag.c:728 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 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:1324 builtin/commit.c:1603 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "afficher le statut avec concision" -#: builtin/commit.c:1326 builtin/commit.c:1605 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1331 builtin/commit.c:1609 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "afficher le statut en format long (par défaut)" -#: builtin/commit.c:1334 builtin/commit.c:1612 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980 -#: builtin/fast-export.c:983 builtin/tag.c:603 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 +#: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "mode" -#: builtin/commit.c:1337 builtin/commit.c:1615 +#: builtin/commit.c:1348 builtin/commit.c:1633 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:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "afficher les fichiers ignorés" -#: builtin/commit.c:1341 parse-options.h:152 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "quand" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -4809,209 +5799,201 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "HEAD détachée" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr " (commit racine)" -#: builtin/commit.c:1573 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1574 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1576 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1577 builtin/tag.c:601 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1578 +#: builtin/commit.c:1596 msgid "author" msgstr "auteur" -#: builtin/commit.c:1578 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1579 builtin/gc.c:280 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "date" -#: builtin/commit.c:1579 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391 -#: builtin/notes.c:554 builtin/tag.c:599 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 +#: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "message" -#: builtin/commit.c:1580 +#: builtin/commit.c:1598 msgid "commit message" msgstr "message de validation" -#: builtin/commit.c:1581 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 +msgid "commit" +msgstr "commit" + +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1582 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1583 +#: builtin/commit.c:1601 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:1584 +#: builtin/commit.c:1602 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:1585 +#: builtin/commit.c:1603 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:1586 builtin/log.c:1191 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1587 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1588 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1589 +#: builtin/commit.c:1607 msgid "default" msgstr "défaut" -#: builtin/commit.c:1589 builtin/tag.c:604 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" -#: builtin/commit.c:1590 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "inclure le statut dans le modèle de message de validation" -#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92 -#: builtin/tag.c:605 -msgid "key-id" -msgstr "id de clé" - -#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 +#: builtin/revert.c:93 msgid "GPG sign commit" msgstr "signer la validation avec GPG" -#: builtin/commit.c:1595 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1596 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1597 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1598 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1599 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1600 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1601 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "éviter d'utiliser le crochet pre-commit" -#: builtin/commit.c:1602 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1613 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1614 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1619 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1621 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1650 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: builtin/commit.c:1689 builtin/merge.c:1076 -#, c-format -msgid "could not open '%s' for reading" -msgstr "impossible d'ouvrir '%s' en lecture" - -#: builtin/commit.c:1696 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1703 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1722 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1733 +#: builtin/commit.c:1755 #, 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:1738 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abandon de la validation du à un message de validation vide\n" -#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854 -msgid "failed to write commit object" -msgstr "échec de l'écriture de l'objet commit" - -#: builtin/commit.c:1786 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5021,136 +6003,146 @@ 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/config.c:8 +#: builtin/config.c:9 msgid "git config [<options>]" msgstr "git config [<options>]" -#: builtin/config.c:53 +#: builtin/config.c:56 msgid "Config file location" msgstr "Emplacement du fichier de configuration" -#: builtin/config.c:54 +#: builtin/config.c:57 msgid "use global config file" msgstr "utiliser les fichier de configuration global" -#: builtin/config.c:55 +#: builtin/config.c:58 msgid "use system config file" msgstr "utiliser le fichier de configuration du système" -#: builtin/config.c:56 +#: builtin/config.c:59 msgid "use repository config file" msgstr "utiliser le fichier de configuration du dépôt" -#: builtin/config.c:57 +#: builtin/config.c:60 msgid "use given config file" msgstr "utiliser le fichier de configuration spécifié" -#: builtin/config.c:58 +#: builtin/config.c:61 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:58 +#: builtin/config.c:61 msgid "read config from given blob object" msgstr "lire la configuration depuis l'objet blob fourni" -#: builtin/config.c:59 +#: builtin/config.c:62 msgid "Action" msgstr "Action" -#: builtin/config.c:60 +#: builtin/config.c:63 msgid "get value: name [value-regex]" msgstr "obtenir la valeur : nom [regex-de-valeur]" -#: builtin/config.c:61 +#: builtin/config.c:64 msgid "get all values: key [value-regex]" msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]" -#: builtin/config.c:62 +#: builtin/config.c:65 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:63 +#: builtin/config.c:66 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:64 +#: builtin/config.c:67 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]" -#: builtin/config.c:65 +#: builtin/config.c:68 msgid "add a new variable: name value" msgstr "ajouter une nouvelle variable : nom valeur" -#: builtin/config.c:66 +#: builtin/config.c:69 msgid "remove a variable: name [value-regex]" msgstr "supprimer une variable : nom [regex-de-valeur]" -#: builtin/config.c:67 +#: builtin/config.c:70 msgid "remove all matches: name [value-regex]" msgstr "supprimer toutes les correspondances nom [regex-de-valeur]" -#: builtin/config.c:68 +#: builtin/config.c:71 msgid "rename section: old-name new-name" msgstr "renommer une section : ancien-nom nouveau-nom" -#: builtin/config.c:69 +#: builtin/config.c:72 msgid "remove a section: name" msgstr "supprimer une section : nom" -#: builtin/config.c:70 +#: builtin/config.c:73 msgid "list all" msgstr "afficher tout" -#: builtin/config.c:71 +#: builtin/config.c:74 msgid "open an editor" msgstr "ouvrir un éditeur" -#: builtin/config.c:72 +#: builtin/config.c:75 msgid "find the color configured: slot [default]" msgstr "trouver la couleur configurée : slot [par défaut]" -#: builtin/config.c:73 +#: builtin/config.c:76 msgid "find the color setting: slot [stdout-is-tty]" msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]" -#: builtin/config.c:74 +#: builtin/config.c:77 msgid "Type" msgstr "Type" -#: builtin/config.c:75 +#: builtin/config.c:78 msgid "value is \"true\" or \"false\"" msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)" -#: builtin/config.c:76 +#: builtin/config.c:79 msgid "value is decimal number" msgstr "la valeur est un nombre décimal" -#: builtin/config.c:77 +#: builtin/config.c:80 msgid "value is --bool or --int" msgstr "la valeur est --bool ou --int" -#: builtin/config.c:78 +#: builtin/config.c:81 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:79 +#: builtin/config.c:82 msgid "Other" msgstr "Autre" -#: builtin/config.c:80 +#: builtin/config.c:83 msgid "terminate values with NUL byte" msgstr "terminer les valeurs avec un caractère NUL" -#: builtin/config.c:81 +#: builtin/config.c:84 +msgid "show variable names only" +msgstr "n'afficher que les noms de variable" + +#: builtin/config.c:85 msgid "respect include directives on lookup" msgstr "respecter les directives d'inclusion lors de la recherche" -#: builtin/config.c:316 +#: builtin/config.c:86 +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:328 msgid "unable to parse default color value" msgstr "impossible de lire la valeur de couleur par défaut" -#: builtin/config.c:457 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5165,16 +6157,16 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:587 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "création impossible du fichier de configuration '%s'" -#: builtin/count-objects.c:55 +#: builtin/count-objects.c:77 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:65 +#: builtin/count-objects.c:87 msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" @@ -5201,7 +6193,7 @@ msgstr "l'étiquette annotée %s n'a pas de nom embarqué" msgid "tag '%s' is really '%s' here" msgstr "l'étiquette '%s' est en fait '%s'" -#: builtin/describe.c:250 builtin/log.c:452 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "%s n'est pas un nom d'objet valide" @@ -5296,7 +6288,7 @@ msgstr "" msgid "only consider tags matching <pattern>" msgstr "ne considérer que les étiquettes correspondant à <motif>" -#: builtin/describe.c:410 builtin/name-rev.c:318 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrégés en dernier recours" @@ -5330,252 +6322,251 @@ msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique" msgid "invalid option: %s" msgstr "option invalide : %s" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "Ce n'est pas un dépôt git !" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "objet spécifié '%s' invalide." -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "plus de deux blobs spécifiés : '%s'" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "objet non géré '%s' spécifié." -#: builtin/fast-export.c:24 +#: builtin/fast-export.c:25 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [options-de-liste-de-révisions]" -#: builtin/fast-export.c:979 +#: builtin/fast-export.c:980 msgid "show progress after <n> objects" msgstr "afficher la progression après <n> objets" -#: builtin/fast-export.c:981 +#: builtin/fast-export.c:982 msgid "select handling of signed tags" msgstr "sélectionner la gestion des étiquettes signées" -#: builtin/fast-export.c:984 +#: builtin/fast-export.c:985 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:987 +#: builtin/fast-export.c:988 msgid "Dump marks to this file" msgstr "Enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:989 +#: builtin/fast-export.c:990 msgid "Import marks from this file" msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:991 +#: builtin/fast-export.c:992 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:993 +#: builtin/fast-export.c:994 msgid "Output full tree for each commit" msgstr "Afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:995 +#: builtin/fast-export.c:996 msgid "Use the done feature to terminate the stream" msgstr "Utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:996 +#: builtin/fast-export.c:997 msgid "Skip output of blob data" msgstr "Sauter l'affichage de données de blob" -#: builtin/fast-export.c:997 +#: builtin/fast-export.c:998 msgid "refspec" msgstr "spécificateur de référence" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:999 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:999 +#: builtin/fast-export.c:1000 msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fetch.c:19 +#: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/fetch.c:20 +#: builtin/fetch.c:21 msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -#: builtin/fetch.c:21 +#: builtin/fetch.c:22 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" -#: builtin/fetch.c:22 +#: builtin/fetch.c:23 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:89 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" -msgstr "récupérer depuis tous le dépôts distants" +msgstr "récupérer depuis tous les dépôts distants" -#: builtin/fetch.c:91 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:93 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:94 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:96 +#: builtin/fetch.c:99 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:98 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:100 +#: builtin/fetch.c:103 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:102 +#: builtin/fetch.c:105 +msgid "number of submodules fetched in parallel" +msgstr "nombre de sous-modules récupérés en parallèle" + +#: builtin/fetch.c:107 builtin/pull.c:187 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:103 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:104 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:108 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:110 +#: builtin/fetch.c:115 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:113 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:115 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:117 builtin/log.c:1208 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" -msgstr "dir" +msgstr "répertoire" -#: builtin/fetch.c:118 +#: builtin/fetch.c:123 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:121 +#: builtin/fetch.c:126 msgid "default mode for recursion" msgstr "mode par défaut pour la récursion" -#: builtin/fetch.c:123 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:124 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:125 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:377 +#: builtin/fetch.c:386 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:457 +#: builtin/fetch.c:466 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:462 +#: builtin/fetch.c:471 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:476 +#: builtin/fetch.c:485 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (impossible de récupérer la branche actuelle)" -#: builtin/fetch.c:477 builtin/fetch.c:563 +#: builtin/fetch.c:486 builtin/fetch.c:574 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:488 +#: builtin/fetch.c:497 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543 +#: builtin/fetch.c:499 builtin/fetch.c:534 builtin/fetch.c:552 msgid " (unable to update local ref)" msgstr " (impossible de mettre à jour la référence locale)" -#: builtin/fetch.c:508 +#: builtin/fetch.c:517 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:511 +#: builtin/fetch.c:520 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:514 +#: builtin/fetch.c:523 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:559 +#: builtin/fetch.c:569 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:559 +#: builtin/fetch.c:569 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:565 +#: builtin/fetch.c:576 msgid "(non-fast-forward)" msgstr "(pas d'avance rapide)" -#: builtin/fetch.c:599 builtin/fetch.c:832 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "impossible d'ouvrir %s : %s\n" - -#: builtin/fetch.c:608 +#: builtin/fetch.c:619 #, 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:626 +#: builtin/fetch.c:637 #, 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:714 builtin/fetch.c:797 +#: builtin/fetch.c:724 builtin/fetch.c:816 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:725 +#: builtin/fetch.c:735 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -5584,55 +6575,55 @@ 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:777 +#: builtin/fetch.c:787 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:778 +#: builtin/fetch.c:788 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:802 +#: builtin/fetch.c:820 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:803 builtin/remote.c:1057 +#: builtin/fetch.c:821 builtin/remote.c:1025 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:822 +#: builtin/fetch.c:841 #, 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:841 +#: builtin/fetch.c:860 #, 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:844 +#: builtin/fetch.c:863 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:900 +#: builtin/fetch.c:920 #, c-format msgid "Don't know how to fetch from %s" msgstr "Je ne sais pas récupérer depuis %s" -#: builtin/fetch.c:1063 +#: builtin/fetch.c:1080 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1065 builtin/remote.c:90 +#: builtin/fetch.c:1082 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1083 +#: builtin/fetch.c:1100 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -5640,221 +6631,246 @@ 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:1106 +#: builtin/fetch.c:1123 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1148 +#: builtin/fetch.c:1165 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1150 +#: builtin/fetch.c:1167 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:1173 +#: builtin/fetch.c:1187 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1175 +#: builtin/fetch.c:1189 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:1186 +#: builtin/fetch.c:1200 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1194 +#: builtin/fetch.c:1208 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "La récupération d'un groupe et les spécifications de référence n'ont pas de " "sens" -#: builtin/fmt-merge-msg.c:13 +#: builtin/fmt-merge-msg.c:14 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]" -#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698 -#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182 -#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590 -#: parse-options.h:131 parse-options.h:238 -msgid "n" -msgstr "n" - -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:667 msgid "populate log with at most <n> entries from shortlog" msgstr "peupler le journal avec au plus <n> éléments depuis le journal court" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:670 msgid "alias for --log (deprecated)" msgstr "alias pour --log (obsolète)" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:673 msgid "text" msgstr "texte" -#: builtin/fmt-merge-msg.c:676 +#: builtin/fmt-merge-msg.c:674 msgid "use <text> as start of message" msgstr "utiliser <texte> comme début de message" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:675 msgid "file to read from" msgstr "fichier d'où lire" -#: builtin/for-each-ref.c:687 -msgid "unable to parse format" -msgstr "impossible d'analyser le format" - -#: builtin/for-each-ref.c:1083 +#: builtin/for-each-ref.c:9 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<options>] [<motif>]" -#: builtin/for-each-ref.c:1098 +#: builtin/for-each-ref.c:10 +msgid "git for-each-ref [--points-at <object>]" +msgstr "git for-each-ref [--point-at <objet>]" + +#: builtin/for-each-ref.c:11 +msgid "git for-each-ref [(--merged | --no-merged) [<object>]]" +msgstr "git for-each-ref [(--merged | --no-merged) [<objet>]]" + +#: builtin/for-each-ref.c:12 +msgid "git for-each-ref [--contains [<object>]]" +msgstr "git for-each-ref [--contains [<objet>]]" + +#: builtin/for-each-ref.c:27 msgid "quote placeholders suitably for shells" msgstr "échapper les champs réservés pour les interpréteurs de commandes" -#: builtin/for-each-ref.c:1100 +#: builtin/for-each-ref.c:29 msgid "quote placeholders suitably for perl" msgstr "échapper les champs réservés pour perl" -#: builtin/for-each-ref.c:1102 +#: builtin/for-each-ref.c:31 msgid "quote placeholders suitably for python" msgstr "échapper les champs réservés pour python" -#: builtin/for-each-ref.c:1104 +#: builtin/for-each-ref.c:33 msgid "quote placeholders suitably for Tcl" msgstr "échapper les champs réservés pour compatibilité avec Tcl" -#: builtin/for-each-ref.c:1107 +#: builtin/for-each-ref.c:36 msgid "show only <n> matched refs" msgstr "n'afficher que <n> références correspondant" -#: builtin/for-each-ref.c:1108 builtin/replace.c:438 -msgid "format" -msgstr "format" - -#: builtin/for-each-ref.c:1108 +#: builtin/for-each-ref.c:37 builtin/tag.c:372 msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/for-each-ref.c:1109 -msgid "key" -msgstr "clé" +#: builtin/for-each-ref.c:41 +msgid "print only refs which points at the given object" +msgstr "afficher seulement les références pointant sur l'objet" -#: builtin/for-each-ref.c:1110 -msgid "field name to sort on" -msgstr "nom du champ servant à trier" +#: builtin/for-each-ref.c:43 +msgid "print only refs that are merged" +msgstr "afficher seulement les références qui sont fusionnées" -#: builtin/fsck.c:147 builtin/prune.c:137 +#: builtin/for-each-ref.c:44 +msgid "print only refs that are not merged" +msgstr "afficher seulement les références qui ne sont pas fusionnées" + +#: builtin/for-each-ref.c:45 +msgid "print only refs which contain the commit" +msgstr "afficher seulement les références qui contiennent le commit" + +#: builtin/fsck.c:156 builtin/prune.c:140 msgid "Checking connectivity" msgstr "Vérification de la connectivité" -#: builtin/fsck.c:548 +#: builtin/fsck.c:486 msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" -#: builtin/fsck.c:611 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<options>] [<objet>...]" -#: builtin/fsck.c:617 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:618 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "afficher les objets en suspens" -#: builtin/fsck.c:619 +#: builtin/fsck.c:560 msgid "report tags" msgstr "afficher les étiquettes" -#: builtin/fsck.c:620 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "signaler les nœuds racines" -#: builtin/fsck.c:621 +#: builtin/fsck.c:562 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:622 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "considérer les reflogs comme nœuds tête (par défaut)" -#: builtin/fsck.c:623 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:624 +#: builtin/fsck.c:565 +msgid "check only connectivity" +msgstr "ne vérifier que la connectivité" + +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "activer une vérification plus strict" -#: builtin/fsck.c:626 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:627 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "afficher la progression" -#: builtin/fsck.c:677 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "Vérification des objets" -#: builtin/gc.c:24 +#: builtin/gc.c:25 msgid "git gc [<options>]" msgstr "git gc [<options>]" -#: builtin/gc.c:67 +#: builtin/gc.c:72 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: builtin/gc.c:112 +#: builtin/gc.c:139 #, c-format msgid "insanely long object directory %.*s" msgstr "objet répertoire démentiellement long %.*s" -#: builtin/gc.c:281 +#: builtin/gc.c:290 +#, c-format +msgid "" +"The last gc run reported the following. Please correct the root cause\n" +"and remove %s.\n" +"Automatic cleanup will not be performed until the file is removed.\n" +"\n" +"%s" +msgstr "" +"Le dernier lancement de gc a rapporter l'erreur suivante. Veuillez corriger\n" +"la cause et supprimer %s.\n" +"Le nettoyage automatique n'aura pas lieu jusqu'à ce que le fichier soit " +"supprimé.\n" +"\n" +"%s" + +#: builtin/gc.c:327 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:283 +#: builtin/gc.c:329 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:284 +#: builtin/gc.c:330 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:285 +#: builtin/gc.c:331 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:327 +#: builtin/gc.c:373 #, 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:329 +#: builtin/gc.c:375 #, 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:330 +#: builtin/gc.c:376 #, 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:348 +#: builtin/gc.c:397 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -5862,7 +6878,7 @@ 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:376 +#: builtin/gc.c:441 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -5873,237 +6889,247 @@ msgstr "" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]" -#: builtin/grep.c:218 +#: builtin/grep.c:219 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep : échec de création du fil: %s" -#: builtin/grep.c:441 builtin/grep.c:476 +#: builtin/grep.c:277 +#, c-format +msgid "invalid number of threads specified (%d) for %s" +msgstr "nombre de fils spécifié invalide (%d) pour %s" + +#: builtin/grep.c:452 builtin/grep.c:487 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" -#: builtin/grep.c:491 +#: builtin/grep.c:502 #, c-format msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" -#: builtin/grep.c:547 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend un valeur numérique" -#: builtin/grep.c:564 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: builtin/grep.c:638 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "rechercher dans l'index plutôt que dans la copie de travail" -#: builtin/grep.c:640 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:642 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:644 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" -#: builtin/grep.c:647 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:649 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" -#: builtin/grep.c:651 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:653 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:655 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:658 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:660 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:664 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:667 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:670 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:673 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:676 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:677 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:678 +#: builtin/grep.c:686 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:680 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:682 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:684 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:687 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:689 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:691 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:692 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:694 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:696 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "" "afficher le nom de fichier une fois au dessus des correspondances du même " "fichier" -#: builtin/grep.c:699 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:702 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:704 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:705 +#: builtin/grep.c:714 +msgid "use <n> worker threads" +msgstr "utiliser <n> fils de travail" + +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:708 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "" "afficher une ligne avec le nom de la fonction avant les correspondances" -#: builtin/grep.c:710 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:713 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:715 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:717 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:729 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:731 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "" "n'afficher que les correspondances de fichiers qui correspondent à tous les " "motifs" -#: builtin/grep.c:733 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:737 +#: builtin/grep.c:747 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:737 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:740 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:741 builtin/show-ref.c:189 -msgid "show usage" -msgstr "afficher l'usage" - -#: builtin/grep.c:808 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "aucun motif fourni." -#: builtin/grep.c:866 +#: builtin/grep.c:845 builtin/index-pack.c:1477 +#, c-format +msgid "invalid number of threads specified (%d)" +msgstr "nombre de fils spécifié invalide (%d)" + +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail" -#: builtin/grep.c:892 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index." -#: builtin/grep.c:897 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "" "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions." -#: builtin/grep.c:900 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi." -#: builtin/grep.c:908 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "--cached et des arbres sont fournis en même temps." -#: builtin/hash-object.c:80 +#: builtin/hash-object.c:81 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -6111,38 +7137,38 @@ msgstr "" "git hash-object [-t <type>] [-w] [--path=<fichier> | --no-filters] [--stdin] " "[--] <fichier>..." -#: builtin/hash-object.c:81 -msgid "git hash-object --stdin-paths < <list-of-paths>" -msgstr "git hash-object --stdin-paths < <liste-de-chemins>" +#: builtin/hash-object.c:82 +msgid "git hash-object --stdin-paths" +msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:92 builtin/tag.c:612 +#: builtin/hash-object.c:93 msgid "type" msgstr "type" -#: builtin/hash-object.c:92 +#: builtin/hash-object.c:93 msgid "object type" msgstr "type d'objet" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "write the object into the object database" msgstr "écrire l'objet dans la base de donnée d'objets" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:96 msgid "read the object from stdin" msgstr "lire l'objet depuis l'entrée standard" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "store file as is without filters" msgstr "stocker le fichier tel quel sans filtrage" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "juste hasher n'importe quel contenu pour créer des objets corrompus pour " "debugger Git" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "process file as it were from this path" msgstr "traiter le fichier comme s'il venait de ce chemin" @@ -6188,12 +7214,12 @@ msgstr "échec d'analyse de la version d'emacsclient." msgid "emacsclient version '%d' too old (< 22)." msgstr "la version d'emacsclient '%d' est trop ancienne (<22)." -#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 +#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" -msgstr "échec de l'exécution de '%s' : %s" +msgid "failed to exec '%s'" +msgstr "échec de l'exécution de '%s'" -#: builtin/help.c:215 +#: builtin/help.c:205 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -6202,7 +7228,7 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n" "Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:227 +#: builtin/help.c:217 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -6211,189 +7237,189 @@ msgstr "" "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n" "Veuillez utiliser plutôt 'man.<outil>.cmd'." -#: builtin/help.c:354 +#: builtin/help.c:334 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s' : visualiseur de manuel inconnu." -#: builtin/help.c:371 +#: builtin/help.c:351 msgid "no man viewer handled the request" msgstr "aucun visualiseur de manuel n'a pris en charge la demande" -#: builtin/help.c:379 +#: builtin/help.c:359 msgid "no info viewer handled the request" msgstr "aucun visualiseur de 'info' n'a pris en charge la demande" -#: builtin/help.c:428 +#: builtin/help.c:408 msgid "Defining attributes per path" msgstr "Définition des attributs par chemin" -#: builtin/help.c:429 +#: builtin/help.c:409 msgid "Everyday Git With 20 Commands Or So" msgstr "Git de tous les jours avec à peu près 20 commandes" -#: builtin/help.c:430 +#: builtin/help.c:410 msgid "A Git glossary" msgstr "Un glossaire Git" -#: builtin/help.c:431 +#: builtin/help.c:411 msgid "Specifies intentionally untracked files to ignore" msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement" -#: builtin/help.c:432 +#: builtin/help.c:412 msgid "Defining submodule properties" msgstr "Définition des propriétés de sous-module" -#: builtin/help.c:433 +#: builtin/help.c:413 msgid "Specifying revisions and ranges for Git" msgstr "Spécification des révisions et portées pour Git" -#: builtin/help.c:434 +#: builtin/help.c:414 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "" "Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)" -#: builtin/help.c:435 +#: builtin/help.c:415 msgid "An overview of recommended workflows with Git" msgstr "Un aperçu des flux de travail recommandés avec Git" -#: builtin/help.c:447 +#: builtin/help.c:427 msgid "The common Git guides are:\n" msgstr "Les guides Git populaires sont : \n" -#: builtin/help.c:468 builtin/help.c:485 +#: builtin/help.c:448 builtin/help.c:465 #, c-format msgid "usage: %s%s" msgstr "usage : %s%s" -#: builtin/help.c:501 +#: builtin/help.c:481 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s\" est un alias de `%s'" -#: builtin/index-pack.c:151 +#: builtin/index-pack.c:152 #, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" -#: builtin/index-pack.c:201 +#: builtin/index-pack.c:202 #, c-format msgid "object type mismatch at %s" msgstr "type d'objet non correspondant à %s" -#: builtin/index-pack.c:221 +#: builtin/index-pack.c:222 #, c-format msgid "did not receive expected object %s" msgstr "objet attendu non reçu %s" -#: builtin/index-pack.c:224 +#: builtin/index-pack.c:225 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objet %s : type attendu %s, reçu %s" -#: builtin/index-pack.c:266 +#: builtin/index-pack.c:267 #, 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:276 +#: builtin/index-pack.c:277 msgid "early EOF" msgstr "fin de fichier prématurée" -#: builtin/index-pack.c:277 +#: builtin/index-pack.c:278 msgid "read error on input" msgstr "erreur de lecture sur l'entrée" -#: builtin/index-pack.c:289 +#: builtin/index-pack.c:290 msgid "used more bytes than were available" msgstr "plus d'octets utilisés que disponibles" -#: builtin/index-pack.c:296 +#: builtin/index-pack.c:297 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:312 +#: builtin/index-pack.c:313 #, c-format msgid "unable to create '%s'" msgstr "impossible de créer '%s'" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:318 #, c-format msgid "cannot open packfile '%s'" msgstr "impossible d'ouvrir le fichier paquet '%s'" -#: builtin/index-pack.c:331 +#: builtin/index-pack.c:332 msgid "pack signature mismatch" msgstr "la signature du paquet ne correspond pas" -#: builtin/index-pack.c:333 +#: builtin/index-pack.c:334 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "la version de paquet %<PRIu32> non supportée" -#: builtin/index-pack.c:351 +#: builtin/index-pack.c:352 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "le paquet a un mauvais objet à l'offset %lu: %s" -#: builtin/index-pack.c:472 +#: builtin/index-pack.c:473 #, c-format msgid "inflate returned %d" msgstr "la décompression (inflate) a retourné %d" -#: builtin/index-pack.c:521 +#: builtin/index-pack.c:522 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:529 +#: builtin/index-pack.c:530 msgid "delta base offset is out of bound" msgstr "l'objet delta de base est hors limite" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:538 #, c-format msgid "unknown object type %d" msgstr "type d'objet inconnu %d" -#: builtin/index-pack.c:568 +#: builtin/index-pack.c:569 msgid "cannot pread pack file" msgstr "impossible de lire (pread) le fichier paquet" -#: builtin/index-pack.c:570 +#: builtin/index-pack.c:571 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "fin prématurée du fichier paquet, %lu octet lu" msgstr[1] "fin prématurée du fichier paquet, %lu octets lus" -#: builtin/index-pack.c:596 +#: builtin/index-pack.c:597 msgid "serious inflate inconsistency" msgstr "grave incohérence dans la décompression (inflate)" -#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771 -#: builtin/index-pack.c:805 builtin/index-pack.c:814 +#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772 +#: builtin/index-pack.c:806 builtin/index-pack.c:815 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:745 builtin/pack-objects.c:162 +#: builtin/index-pack.c:746 builtin/pack-objects.c:162 #: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" -#: builtin/index-pack.c:811 +#: builtin/index-pack.c:812 #, c-format msgid "cannot read existing object %s" msgstr "impossible de lire l'objet existant %s" -#: builtin/index-pack.c:825 +#: builtin/index-pack.c:826 #, c-format msgid "invalid blob object %s" msgstr "objet blob invalide %s" -#: builtin/index-pack.c:839 +#: builtin/index-pack.c:840 #, c-format msgid "invalid %s" msgstr "%s invalide" @@ -6450,198 +7476,169 @@ msgstr "confusion extrême" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "complété avec %d objets locaux" +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:1263 +#: builtin/index-pack.c:1265 #, 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:1267 +#: builtin/index-pack.c:1269 #, 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:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "impossible d'écrire le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "impossible de fermer le fichier \"keep\" '%s'" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1475 -#, c-format -msgid "invalid number of threads specified (%d)" -msgstr "nombre de fils spécifié invalide (%d)" - -#: builtin/index-pack.c:1479 builtin/index-pack.c:1658 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/index-pack.c:1537 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1539 +#: builtin/index-pack.c:1542 #, 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:1586 +#: builtin/index-pack.c:1589 #, 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:1593 +#: builtin/index-pack.c:1596 #, 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:1622 +#: builtin/index-pack.c:1609 +#, 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:1638 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1670 builtin/index-pack.c:1673 -#: builtin/index-pack.c:1685 builtin/index-pack.c:1689 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1703 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1707 builtin/index-pack.c:1716 -#, 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:1724 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" -#: builtin/init-db.c:35 -#, c-format -msgid "Could not make %s writable by group" -msgstr "Impossible de rendre %s inscriptible pour le groupe" - -#: builtin/init-db.c:62 -#, c-format -msgid "insanely long template name %s" -msgstr "nom de modèle démentiellement long %s" - -#: builtin/init-db.c:67 +#: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "impossible de faire un stat de '%s'" -#: builtin/init-db.c:73 +#: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" msgstr "impossible de faire un stat du modèle '%s'" -#: builtin/init-db.c:80 +#: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "impossible d'ouvrir (opendir) '%s'" -#: builtin/init-db.c:97 +#: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "impossible de readlink '%s'" -#: builtin/init-db.c:99 -#, c-format -msgid "insanely long symlink %s" -msgstr "lien symbolique démentiellement long %s" - -#: builtin/init-db.c:102 +#: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "impossible de créer un lien symbolique de '%s' '%s'" -#: builtin/init-db.c:106 +#: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: builtin/init-db.c:110 +#: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "modèle %s ignoré" -#: builtin/init-db.c:136 -#, c-format -msgid "insanely long template path %s" -msgstr "chemin de modèle %s démentiellement long" - -#: builtin/init-db.c:144 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "modèles non trouvés %s" -#: builtin/init-db.c:157 -#, c-format -msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "" -"pas de copie des modèles étant dans une mauvaise version du format %d de '%s'" - -#: builtin/init-db.c:211 +#: builtin/init-db.c:135 #, c-format -msgid "insane git directory %s" -msgstr "répertoire git démentiel %s" +msgid "not copying templates from '%s': %s" +msgstr "pas de copie des modèles depuis '%s' : %s" -#: builtin/init-db.c:343 builtin/init-db.c:346 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "%s existe déjà" -#: builtin/init-db.c:374 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "impossible de traiter le fichier de type %d" -#: builtin/init-db.c:377 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "impossible de déplacer %s vers %s" @@ -6649,24 +7646,24 @@ msgstr "impossible de déplacer %s vers %s" #. TRANSLATORS: The first '%s' is either "Reinitialized #. existing" or "Initialized empty", the second " shared" or #. "", and the last '%s%s' is the verbatim directory name. -#: builtin/init-db.c:433 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "Dépôt Git%2$s %1$s dans %3$s%4$s\n" -#: builtin/init-db.c:434 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "existant réinitialisé" -#: builtin/init-db.c:434 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "vide initialisé" -#: builtin/init-db.c:435 +#: builtin/init-db.c:405 msgid " shared" msgstr " partagé" -#: builtin/init-db.c:482 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -6674,29 +7671,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--" "shared[=<permissions>]] [<répertoire>]" -#: builtin/init-db.c:505 +#: builtin/init-db.c:475 msgid "permissions" msgstr "permissions" -#: builtin/init-db.c:506 +#: builtin/init-db.c:476 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:508 builtin/prune-packed.c:57 builtin/repack.c:171 -msgid "be quiet" -msgstr "être silencieux" - -#: builtin/init-db.c:540 builtin/init-db.c:545 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "impossible de créer le répertoire (mkdir) %s" -#: builtin/init-db.c:549 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "impossible de se déplacer vers le répertoire (chdir) %s" -#: builtin/init-db.c:570 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -6705,307 +7698,365 @@ msgstr "" "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --" "git-dir=<répertoire>)" -#: builtin/init-db.c:598 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossible d'accéder à l'arbre de travail '%s'" #: builtin/interpret-trailers.c:15 msgid "" -"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " -"[<file>...]" +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " +"<token>[(=|:)<value>])...] [<file>...]" msgstr "" -"git interpret-trailers [--trim-empty] [(--trailer " +"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<symbole>[(=|:)<valeur>])...] [<fichier>...]" -#: builtin/interpret-trailers.c:25 +#: builtin/interpret-trailers.c:26 +msgid "edit files in place" +msgstr "éditer les fichiers sur place" + +#: builtin/interpret-trailers.c:27 msgid "trim empty trailers" msgstr "éliminer les lignes de fin vides" -#: builtin/interpret-trailers.c:26 +#: builtin/interpret-trailers.c:28 msgid "trailer" msgstr "ligne de fin" -#: builtin/interpret-trailers.c:27 +#: builtin/interpret-trailers.c:29 msgid "trailer(s) to add" msgstr "ligne(s) de fin à ajouter" -#: builtin/log.c:41 +#: builtin/interpret-trailers.c:42 +msgid "no input file given for in-place editing" +msgstr "aucun fichier en entrée pour l'éditon sur place" + +#: builtin/log.c:43 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]" -#: builtin/log.c:42 +#: builtin/log.c:44 msgid "git show [<options>] <object>..." msgstr "git show [<options>] <objet>..." -#: builtin/log.c:81 +#: builtin/log.c:83 #, c-format msgid "invalid --decorate option: %s" msgstr "option --decorate invalide : %s" -#: builtin/log.c:127 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: builtin/log.c:128 +#: builtin/log.c:138 msgid "show source" msgstr "afficher la source" -#: builtin/log.c:129 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "Utiliser le fichier de correspondance de mail" -#: builtin/log.c:130 +#: builtin/log.c:140 msgid "decorate options" msgstr "décorer les options" -#: builtin/log.c:133 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "" "Traiter seulement l'intervalle de lignes n,m du fichier en commençant le " "compte à 1" -#: builtin/log.c:229 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:458 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:472 builtin/log.c:564 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "Impossible de lire l'objet %s" -#: builtin/log.c:588 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "Type inconnu : %d" -#: builtin/log.c:689 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:773 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "le nom du répertoire de sortie est trop long" -#: builtin/log.c:789 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "Impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:803 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "Exactement une plage nécessaire." -#: builtin/log.c:813 +#: builtin/log.c:851 msgid "Not a range." msgstr "Ceci n'est pas une plage." -#: builtin/log.c:919 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "La lettre de motivation doit être au format e-mail" -#: builtin/log.c:998 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1026 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1071 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "Deux répertoires de sortie ?" -#: builtin/log.c:1186 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "Commit inconnu %s" + +#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 +#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 +#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 +#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Impossible de résoudre '%s' comme une référence valide." + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "Impossible de trouver la base de fusion exacte." + +#: builtin/log.c:1235 +msgid "" +"Failed to get upstream, if you want to record base commit automatically,\n" +"please use git branch --set-upstream-to to track a remote branch.\n" +"Or you could specify base commit by --base=<base-commit-id> manually." +msgstr "" +"Impossible de récupérer l'amont, si vous voulez enregistrer le commit de base automatiquement,\n" +"veuillez utiliser git branch --set-upstream-to pour suivre une branche distante\n" +"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> manuellement." + +#: builtin/log.c:1255 +msgid "Failed to find exact merge base" +msgstr "Impossible de trouver la base de fusion exacte" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "le commit de base devrait être l'ancêtre de la liste de révisions" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "le commit de base ne devrait pas faire partie de la liste de révisions" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "impossible d'obtenir l'id du patch" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1189 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1193 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1195 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1197 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "" "utiliser une séquence simple de nombres pour les nom des fichiers de sortie" -#: builtin/log.c:1198 +#: builtin/log.c:1389 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1199 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1201 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "démarrer la numérotation des patchs à <n> au lieu de 1" -#: builtin/log.c:1203 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1205 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1208 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1211 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1214 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1216 +#: builtin/log.c:1407 +msgid "output all-zero hash in From header" +msgstr "écrire une empreinte à zéro dans l'entête From" + +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1218 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "afficher le format du patch au lieu du défaut (patch + stat)" -#: builtin/log.c:1220 +#: builtin/log.c:1413 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1221 +#: builtin/log.c:1414 msgid "header" msgstr "en-tête" -#: builtin/log.c:1222 +#: builtin/log.c:1415 msgid "add email header" msgstr "ajouter l'en-tête d'e-mail" -#: builtin/log.c:1223 builtin/log.c:1225 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "e-mail" -#: builtin/log.c:1223 +#: builtin/log.c:1416 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1225 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1227 +#: builtin/log.c:1420 msgid "ident" msgstr "ident" -#: builtin/log.c:1228 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" -#: builtin/log.c:1230 +#: builtin/log.c:1423 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1231 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1232 builtin/log.c:1235 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "limite" -#: builtin/log.c:1233 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1236 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1240 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1242 +#: builtin/log.c:1435 msgid "signature" msgstr "signature" -#: builtin/log.c:1243 +#: builtin/log.c:1436 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1245 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "commit-de-base" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "Ajouter un arbre prérequis à la série de patchs" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1246 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1320 -#, c-format -msgid "invalid ident line: %s" -msgstr "ligne d'identification invalide : %s" - -#: builtin/log.c:1335 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "-n et -k sont mutuellement exclusifs." -#: builtin/log.c:1337 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix et -k sont mutuellement exclusifs." -#: builtin/log.c:1345 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1347 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1349 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1372 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "sortie standard, ou répertoire, lequel ?" -#: builtin/log.c:1374 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "Impossible de créer le répertoire '%s'" -#: builtin/log.c:1472 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:1535 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "Échec de création des fichiers en sortie" -#: builtin/log.c:1583 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:1637 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -7013,139 +8064,186 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spécifier " "<branche_amont> manuellement.\n" -#: builtin/log.c:1648 builtin/log.c:1650 builtin/log.c:1662 -#, c-format -msgid "Unknown commit %s" -msgstr "Commit inconnu %s" - -#: builtin/ls-files.c:358 +#: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<options>] [<fichier>...]" -#: builtin/ls-files.c:415 +#: builtin/ls-files.c:427 msgid "identify the file status with tags" msgstr "identifier le statut de fichier avec les étiquettes" -#: builtin/ls-files.c:417 +#: builtin/ls-files.c:429 msgid "use lowercase letters for 'assume unchanged' files" msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'" -#: builtin/ls-files.c:419 +#: builtin/ls-files.c:431 msgid "show cached files in the output (default)" msgstr "afficher les fichiers mis en cache dans la sortie (défaut)" -#: builtin/ls-files.c:421 +#: builtin/ls-files.c:433 msgid "show deleted files in the output" msgstr "afficher les fichiers supprimés dans la sortie" -#: builtin/ls-files.c:423 +#: builtin/ls-files.c:435 msgid "show modified files in the output" msgstr "afficher les fichiers modifiés dans la sortie" -#: builtin/ls-files.c:425 +#: builtin/ls-files.c:437 msgid "show other files in the output" msgstr "afficher les autres fichiers dans la sortie" -#: builtin/ls-files.c:427 +#: builtin/ls-files.c:439 msgid "show ignored files in the output" msgstr "afficher les fichiers ignorés dans la sortie" -#: builtin/ls-files.c:430 +#: builtin/ls-files.c:442 msgid "show staged contents' object name in the output" msgstr "afficher les nom des objets indexés dans la sortie" -#: builtin/ls-files.c:432 +#: builtin/ls-files.c:444 msgid "show files on the filesystem that need to be removed" msgstr "" "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés" -#: builtin/ls-files.c:434 +#: builtin/ls-files.c:446 msgid "show 'other' directories' names only" msgstr "afficher seulement les noms des répertoires 'other'" -#: builtin/ls-files.c:437 +#: builtin/ls-files.c:448 +msgid "show line endings of files" +msgstr "afficher les fins de lignes des fichiers" + +#: builtin/ls-files.c:450 msgid "don't show empty directories" msgstr "ne pas afficher les répertoires vides" -#: builtin/ls-files.c:440 +#: builtin/ls-files.c:453 msgid "show unmerged files in the output" msgstr "afficher les fichiers non fusionnés dans la sortie" -#: builtin/ls-files.c:442 +#: builtin/ls-files.c:455 msgid "show resolve-undo information" msgstr "afficher l'information resolv-undo" -#: builtin/ls-files.c:444 +#: builtin/ls-files.c:457 msgid "skip files matching pattern" msgstr "sauter les fichiers correspondant au motif" -#: builtin/ls-files.c:447 +#: builtin/ls-files.c:460 msgid "exclude patterns are read from <file>" msgstr "les motifs d'exclusion sont lus depuis <fichier>" -#: builtin/ls-files.c:450 +#: builtin/ls-files.c:463 msgid "read additional per-directory exclude patterns in <file>" msgstr "lire des motifs d'exclusion additionnels par répertoire dans <fichier>" -#: builtin/ls-files.c:452 +#: builtin/ls-files.c:465 msgid "add the standard git exclusions" msgstr "ajouter les exclusions git standard" -#: builtin/ls-files.c:455 +#: builtin/ls-files.c:468 msgid "make the output relative to the project top directory" msgstr "afficher en relatif par rapport au répertoire racine du projet" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:471 msgid "if any <file> is not in the index, treat this as an error" msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur" -#: builtin/ls-files.c:459 +#: builtin/ls-files.c:472 msgid "tree-ish" msgstr "arbre ou apparenté" -#: builtin/ls-files.c:460 +#: builtin/ls-files.c:473 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "considérer que les chemins supprimés depuis <arbre ou apparenté> sont " "toujours présents" -#: builtin/ls-files.c:462 +#: builtin/ls-files.c:475 msgid "show debugging data" msgstr "afficher les données de débogage" +#: builtin/ls-remote.c:7 +msgid "" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<repository> [<refs>...]]" +msgstr "" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<dépôt> [<références>...]]" + +#: builtin/ls-remote.c:50 +msgid "do not print remote URL" +msgstr "ne pas afficher les URL distantes" + +#: builtin/ls-remote.c:51 builtin/ls-remote.c:53 +msgid "exec" +msgstr "exécutable" + +#: builtin/ls-remote.c:52 builtin/ls-remote.c:54 +msgid "path of git-upload-pack on the remote host" +msgstr "chemin vers git-upload-pack sur le serveur distant" + +#: builtin/ls-remote.c:56 +msgid "limit to tags" +msgstr "limiter aux étiquettes" + +#: builtin/ls-remote.c:57 +msgid "limit to heads" +msgstr "limiter aux heads" + +#: builtin/ls-remote.c:58 +msgid "do not show peeled tags" +msgstr "ne pas afficher les étiquettes pelées" + +#: builtin/ls-remote.c:60 +msgid "take url.<base>.insteadOf into account" +msgstr "prendre en compte url.<base>.insteadOf" + +#: builtin/ls-remote.c:62 +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:64 +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" + #: builtin/ls-tree.c:28 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<options>] <arbre ou apparenté> [<chemin>...]" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "only show trees" msgstr "afficher seulement les arbres" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "recurse into subtrees" msgstr "parcourir les sous-arbres" -#: builtin/ls-tree.c:131 +#: builtin/ls-tree.c:132 msgid "show trees when recursing" msgstr "afficher les arbres en les parcourant" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" msgstr "terminer les éléments avec un octet NUL" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:136 msgid "include object size" msgstr "inclure la taille d'objet" -#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" msgstr "afficher seulement les noms de fichiers" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:143 msgid "use full path names" msgstr "utiliser les noms de chemins complets" -#: builtin/ls-tree.c:144 +#: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" "afficher l'arbre entier ; pas seulement le répertoire courant (implique --" @@ -7163,172 +8261,179 @@ msgstr "git merge [<options>] <message> HEAD <commit>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "Les stratégies disponibles sont :" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:193 +#: builtin/merge.c:194 builtin/pull.c:126 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:196 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:197 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:199 +#: builtin/merge.c:200 builtin/pull.c:135 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:202 +#: builtin/merge.c:203 builtin/pull.c:138 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:204 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:206 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "éditer le message avant la validation" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:209 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "Vérifier que la validation a une signature GPG valide" -#: builtin/merge.c:214 builtin/notes.c:753 builtin/revert.c:89 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 +#: builtin/revert.c:89 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:215 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:216 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:217 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:219 +#: builtin/merge.c:220 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:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "permettre la fusion d'historiques sans rapport" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "échec du remisage" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "read-tree a échoué" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr " (rien à compresser)" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressée -- HEAD non mise à jour\n" -#: builtin/merge.c:372 +#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 +#: builtin/merge.c:1000 +#, c-format +msgid "Could not write to '%s'" +msgstr "Impossible d'écrire dans '%s'" + +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "Écriture de SQUASH_MSG" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "Finition de SQUASH_MSG" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, 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:447 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:537 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" -#: builtin/merge.c:632 -msgid "git write-tree failed to write a tree" -msgstr "git write-tree a échoué à écrire un arbre" - -#: builtin/merge.c:656 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "Impossible de gérer autre chose que la fusion de deux têtes." -#: builtin/merge.c:670 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Options inconnue pour merge-recursive : -X%s" -#: builtin/merge.c:683 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "impossible d'écrire %s" -#: builtin/merge.c:772 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "Impossible de lire depuis '%s'" -#: builtin/merge.c:781 +#: builtin/merge.c:785 #, 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:787 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7345,54 +8450,54 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:811 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:823 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:878 +#: builtin/merge.c:890 #, 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:894 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "'%s' n'est pas une validation" -#: builtin/merge.c:935 +#: builtin/merge.c:947 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:937 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:939 +#: builtin/merge.c:951 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:944 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1081 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: builtin/merge.c:1208 +#: builtin/merge.c:1219 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:1224 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7400,11 +8505,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1227 git-pull.sh:74 -msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." - -#: builtin/merge.c:1231 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -7412,102 +8513,106 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1234 +#: builtin/merge.c:1245 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:1243 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1251 +#: builtin/merge.c:1262 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:1268 +#: builtin/merge.c:1279 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:1270 +#: builtin/merge.c:1281 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:1276 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1278 +#: builtin/merge.c:1288 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:1333 +#: builtin/merge.c:1344 #, 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:1336 +#: builtin/merge.c:1347 #, 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:1339 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: builtin/merge.c:1342 +#: builtin/merge.c:1353 #, 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:1423 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "refus de fusionner des historiques sans relation" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1462 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1469 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1501 +#: builtin/merge.c:1515 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:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1528 +#: builtin/merge.c:1542 #, 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:1608 #, 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:1610 #, 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:1619 #, 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:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7593,19 +8698,19 @@ msgstr "ne pas avertir à propos des conflits" msgid "set labels for file1/orig-file/file2" msgstr "définir les labels pour fichier1/fichier-orig/fichier2" -#: builtin/mktree.c:64 +#: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:150 +#: builtin/mktree.c:152 msgid "input is NUL terminated" msgstr "l'entrée se termine par NUL" -#: builtin/mktree.c:151 builtin/write-tree.c:24 +#: builtin/mktree.c:153 builtin/write-tree.c:24 msgid "allow missing objects" msgstr "autoriser les objets manquants" -#: builtin/mktree.c:152 +#: builtin/mktree.c:154 msgid "allow creation of more than one tree" msgstr "autoriser la création de plus d'un arbre" @@ -7613,142 +8718,142 @@ 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:69 +#: builtin/mv.c:70 #, 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:71 +#: builtin/mv.c:72 builtin/rm.c:317 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:89 +#: builtin/mv.c:90 #, c-format msgid "%.*s is in index" msgstr "%.*s est dans l'index" -#: builtin/mv.c:111 +#: builtin/mv.c:112 msgid "force move/rename even if target exists" msgstr "forcer le déplacement/renommage même si la cible existe" -#: builtin/mv.c:112 +#: builtin/mv.c:113 msgid "skip move/rename errors" msgstr "sauter les erreurs de déplacement/renommage" -#: builtin/mv.c:151 +#: builtin/mv.c:152 #, c-format msgid "destination '%s' is not a directory" msgstr "la destination '%s' n'est pas un répertoire" -#: builtin/mv.c:162 +#: builtin/mv.c:163 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Vérification du renommage de '%s' en '%s'\n" -#: builtin/mv.c:166 +#: builtin/mv.c:167 msgid "bad source" msgstr "mauvaise source" -#: builtin/mv.c:169 +#: builtin/mv.c:170 msgid "can not move directory into itself" msgstr "impossible de déplacer un répertoire dans lui-même" -#: builtin/mv.c:172 +#: builtin/mv.c:173 msgid "cannot move directory over file" msgstr "impossible de déplacer un répertoire sur un fichier" -#: builtin/mv.c:181 +#: builtin/mv.c:182 msgid "source directory is empty" msgstr "le répertoire source est vide" -#: builtin/mv.c:206 +#: builtin/mv.c:207 msgid "not under version control" msgstr "pas sous le contrôle de version" -#: builtin/mv.c:209 +#: builtin/mv.c:210 msgid "destination exists" msgstr "la destination existe" -#: builtin/mv.c:217 +#: builtin/mv.c:218 #, c-format msgid "overwriting '%s'" msgstr "écrasement de '%s'" -#: builtin/mv.c:220 +#: builtin/mv.c:221 msgid "Cannot overwrite" msgstr "Impossible d'écraser" -#: builtin/mv.c:223 +#: builtin/mv.c:224 msgid "multiple sources for the same target" msgstr "multiples sources pour la même destination" -#: builtin/mv.c:225 +#: builtin/mv.c:226 msgid "destination directory does not exist" msgstr "le répertoire de destination n'existe pas" -#: builtin/mv.c:232 +#: builtin/mv.c:233 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, source=%s, destination=%s" -#: builtin/mv.c:253 +#: builtin/mv.c:254 #, c-format msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:256 builtin/remote.c:725 builtin/repack.c:361 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" -#: builtin/name-rev.c:255 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<options>] <validation>..." -#: builtin/name-rev.c:256 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<options>] --all" -#: builtin/name-rev.c:257 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<options>] --stdin" -#: builtin/name-rev.c:309 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "afficher seulement les noms (pas de SHA-1)" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "utiliser seulement les étiquettes pour nommer les validations" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "utiliser seulement les références correspondant à <motif>" -#: builtin/name-rev.c:314 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" "afficher toutes les validations accessibles depuis toutes les références" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "lire depuis l'entrée standard" -#: builtin/name-rev.c:316 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "autoriser l'affichage des noms `non définis` (par défaut)" -#: builtin/name-rev.c:322 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" -#: builtin/notes.c:24 +#: builtin/notes.c:25 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <références-notes>] [list [<object>]]" -#: builtin/notes.c:25 +#: builtin/notes.c:26 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" @@ -7756,12 +8861,12 @@ msgstr "" "git notes [--ref <références-notes>] add [-f] [--allow-empty] [-m <message> " "| -F <fichier> | (-c | -C) <objet>] [<objet>]" -#: builtin/notes.c:26 +#: builtin/notes.c:27 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" "git notes [--ref <références-notes>] copy [-f] <depuis-objet> <vers-objet>" -#: builtin/notes.c:27 +#: builtin/notes.c:28 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" @@ -7769,204 +8874,181 @@ msgstr "" "git notes [--ref <références-notes>] append [--allow-empty] [-m <message> | -" "F <fichier> | (-c | -C) <objet>] [<objet>]" -#: builtin/notes.c:28 +#: builtin/notes.c:29 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <références-notes>] edit [--allow-empty] [<objet>]" -#: builtin/notes.c:29 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <références-notes>] show [<objet>]" -#: builtin/notes.c:30 +#: builtin/notes.c:31 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" "git notes [--ref <références-notes>] merge [-v | -q] [-s <stratégie> ] " "<références-notes>" -#: builtin/notes.c:31 +#: builtin/notes.c:32 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:32 +#: builtin/notes.c:33 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:33 +#: builtin/notes.c:34 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <références-notes>] remove [<objet>...]" -#: builtin/notes.c:34 +#: builtin/notes.c:35 msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <références-notes>] prune [-n | -v]" -#: builtin/notes.c:35 +#: builtin/notes.c:36 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <références-notes>] get-ref" -#: builtin/notes.c:40 +#: builtin/notes.c:41 msgid "git notes [list [<object>]]" msgstr "git notes [list [<objet>]]" -#: builtin/notes.c:45 +#: builtin/notes.c:46 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<options>] [<objet>]" -#: builtin/notes.c:50 +#: builtin/notes.c:51 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<options>] <depuis-objet> <vers-objet>" -#: builtin/notes.c:51 +#: builtin/notes.c:52 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<depuis-objet> <vers-objet>]..." -#: builtin/notes.c:56 +#: builtin/notes.c:57 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<options>] [<objet>]" -#: builtin/notes.c:61 +#: builtin/notes.c:62 msgid "git notes edit [<object>]" msgstr "git notes edit [<objet>]" -#: builtin/notes.c:66 +#: builtin/notes.c:67 msgid "git notes show [<object>]" msgstr "git notes show [<objet>]" -#: builtin/notes.c:71 +#: builtin/notes.c:72 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<options>] <références-notes>" -#: builtin/notes.c:72 +#: builtin/notes.c:73 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<options>]" -#: builtin/notes.c:73 +#: builtin/notes.c:74 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<options>]" -#: builtin/notes.c:78 +#: builtin/notes.c:79 msgid "git notes remove [<object>]" msgstr "git notes remove [<objet>]" -#: builtin/notes.c:83 +#: builtin/notes.c:84 msgid "git notes prune [<options>]" msgstr "git notes prune [<options>]" -#: builtin/notes.c:88 +#: builtin/notes.c:89 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:146 +#: builtin/notes.c:147 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "impossible de démarrer 'show' pour l'objet '%s'" -#: builtin/notes.c:150 +#: builtin/notes.c:151 msgid "could not read 'show' output" msgstr "impossible de lire la sortie de 'show'" -#: builtin/notes.c:158 +#: builtin/notes.c:159 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "impossible de finir 'show' pour l'objet '%s'" -#: builtin/notes.c:173 builtin/tag.c:477 +#: builtin/notes.c:174 builtin/tag.c:248 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" -#: builtin/notes.c:192 +#: builtin/notes.c:193 msgid "Please supply the note contents using either -m or -F option" msgstr "Veuillez fournir le contenu de la note en utilisant l'option -m ou -F" -#: builtin/notes.c:201 +#: builtin/notes.c:202 msgid "unable to write note object" msgstr "impossible d'écrire l'objet note" -#: builtin/notes.c:203 +#: builtin/notes.c:204 #, c-format msgid "The note contents have been left in %s" msgstr "Le contenu de la note a été laissé dans %s" -#: builtin/notes.c:231 builtin/tag.c:693 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: builtin/notes.c:233 builtin/tag.c:696 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "impossible d'ouvrir ou lire '%s'" -#: builtin/notes.c:252 builtin/notes.c:303 builtin/notes.c:305 -#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:506 -#: builtin/notes.c:511 builtin/notes.c:589 builtin/notes.c:652 -#: builtin/notes.c:854 builtin/tag.c:709 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "Impossible de résoudre '%s' comme une référence valide." - -#: builtin/notes.c:255 +#: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." msgstr "Impossible de lire l'objet '%s'." -#: builtin/notes.c:259 +#: builtin/notes.c:260 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "Impossible de lire les informations de note d'un objet non-blob '%s'." -#: builtin/notes.c:299 -#, c-format -msgid "Malformed input line: '%s'." -msgstr "Ligne en entrée malformée : '%s'." - -#: builtin/notes.c:314 -#, c-format -msgid "Failed to copy notes from '%s' to '%s'" -msgstr "Impossible de copier les notes de '%s' vers '%s'" - -#: builtin/notes.c:358 builtin/notes.c:413 builtin/notes.c:489 -#: builtin/notes.c:501 builtin/notes.c:577 builtin/notes.c:645 -#: builtin/notes.c:919 +#: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 +#: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "trop de paramètres" -#: builtin/notes.c:371 builtin/notes.c:658 +#: builtin/notes.c:375 builtin/notes.c:662 #, c-format msgid "No note found for object %s." msgstr "Pas de note trouvée pour l'objet %s." -#: builtin/notes.c:392 builtin/notes.c:555 +#: builtin/notes.c:396 builtin/notes.c:559 msgid "note contents as a string" msgstr "contenu de la note sous forme de chaîne" -#: builtin/notes.c:395 builtin/notes.c:558 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "note contents in a file" msgstr "contenu de la note dans un fichier" -#: builtin/notes.c:397 builtin/notes.c:400 builtin/notes.c:560 -#: builtin/notes.c:563 builtin/tag.c:628 -msgid "object" -msgstr "objet" - -#: builtin/notes.c:398 builtin/notes.c:561 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "reuse and edit specified note object" msgstr "réutiliser et éditer l'objet de note spécifié" -#: builtin/notes.c:401 builtin/notes.c:564 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "reuse specified note object" msgstr "réutiliser l'objet de note spécifié" -#: builtin/notes.c:404 builtin/notes.c:567 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "allow storing empty note" msgstr "permettre de stocker une note vide" -#: builtin/notes.c:405 builtin/notes.c:476 +#: builtin/notes.c:409 builtin/notes.c:480 msgid "replace existing notes" msgstr "remplacer les notes existantes" -#: builtin/notes.c:430 +#: builtin/notes.c:434 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -7975,30 +9057,30 @@ msgstr "" "Impossible d'ajouter des notes. Des notes ont été trouvées pour l'objet %s. " "Utilisez '-f' pour écraser les notes existantes" -#: builtin/notes.c:445 builtin/notes.c:524 +#: builtin/notes.c:449 builtin/notes.c:528 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Écrasement des notes existantes pour l'objet %s\n" -#: builtin/notes.c:456 builtin/notes.c:617 builtin/notes.c:859 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "Suppression de la note pour l'objet %s\n" -#: builtin/notes.c:477 +#: builtin/notes.c:481 msgid "read objects from stdin" msgstr "lire les objets depuis l'entrée standard" -#: builtin/notes.c:479 +#: builtin/notes.c:483 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "charger la configuration de réécriture pour <commande> (implique --stdin)" -#: builtin/notes.c:497 +#: builtin/notes.c:501 msgid "too few parameters" msgstr "pas assez de paramètres" -#: builtin/notes.c:518 +#: builtin/notes.c:522 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -8007,12 +9089,12 @@ msgstr "" "Impossible de copier des notes. Des notes ont été trouvées pour l'objet %s. " "Utilisez '-f' pour écraser les notes existantes" -#: builtin/notes.c:530 +#: builtin/notes.c:534 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Notes manquantes sur l'objet source %s. Impossible de copier." -#: builtin/notes.c:582 +#: builtin/notes.c:586 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -8021,15 +9103,15 @@ msgstr "" "Les options -m/-F/-c/-C sont obsolètes pour la sous-commande 'edit'.\n" "Veuillez utiliser 'git notes add -f -m/-F/-c/-C' à la place.\n" -#: builtin/notes.c:750 +#: builtin/notes.c:768 msgid "General options" msgstr "Options générales" -#: builtin/notes.c:752 +#: builtin/notes.c:770 msgid "Merge options" msgstr "Options de fusion" -#: builtin/notes.c:754 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -8037,243 +9119,246 @@ msgstr "" "résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:756 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "Validation des notes non fusionnées" -#: builtin/notes.c:758 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "finaliser la fusion de notes en validant les notes non fusionnées" -#: builtin/notes.c:760 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "Abandon de la résolution de fusion des notes" -#: builtin/notes.c:762 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "abandonner la fusion de notes" #: builtin/notes.c:857 #, c-format +msgid "A notes merge into %s is already in-progress at %s" +msgstr "Une fusion de notes dans %s est déjà en cours avec %s" + +#: builtin/notes.c:884 +#, c-format msgid "Object %s has no note\n" msgstr "L'objet %s n'a pas de note\n" -#: builtin/notes.c:869 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "" "la tentative de suppression d'une note non existante n'est pas une erreur" -#: builtin/notes.c:872 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:953 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "références-notes" -#: builtin/notes.c:954 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" -#: builtin/notes.c:989 builtin/remote.c:1618 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "Sous-commande inconnue : %s" #: builtin/pack-objects.c:28 -msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" +msgid "" +"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" -"git pack-objects --stdout [options...] [< liste-références | < liste-objets]" +"git pack-objects --stdout [options...] [< <liste-références> | < <liste-" +"objets>]" #: builtin/pack-objects.c:29 -msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" +msgid "" +"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -"git pack-objects [options...] base-name [< liste-références | < liste-objets]" +"git pack-objects [options...] base-name [< <liste-références> | < <liste-" +"objets>]" #: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: builtin/pack-objects.c:771 +#: builtin/pack-objects.c:763 +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:776 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1011 +#: builtin/pack-objects.c:1017 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:2171 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2568 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:2595 -#, c-format -msgid "option %s does not accept negative form" -msgstr "l'option %s n'accepte pas de valeur négative" - -#: builtin/pack-objects.c:2599 -#, c-format -msgid "unable to parse value '%s' for option %s" -msgstr "impossible d'analyser la valeur '%s' pour l'option %s" - -#: builtin/pack-objects.c:2619 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" -#: builtin/pack-objects.c:2621 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "afficher la barre de progression" -#: builtin/pack-objects.c:2623 +#: builtin/pack-objects.c:2601 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:2626 +#: builtin/pack-objects.c:2604 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:2627 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2606 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:2631 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:2633 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:2635 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:2639 +#: builtin/pack-objects.c:2617 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:2641 +#: builtin/pack-objects.c:2619 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:2643 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2627 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:2651 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2633 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:2658 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2639 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:2664 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2647 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:2671 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:2672 parse-options.h:139 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "heure" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:2676 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:2678 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:2680 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:2682 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:2684 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:2686 +#: builtin/pack-objects.c:2664 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:2688 +#: builtin/pack-objects.c:2666 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:2779 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "Décompte des objets" @@ -8301,31 +9386,214 @@ msgstr "Suppression des objets dupliqués" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]" -#: builtin/prune.c:105 builtin/worktree.c:112 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" -#: builtin/prune.c:106 builtin/worktree.c:113 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "afficher les objets éliminés" -#: builtin/prune.c:109 builtin/worktree.c:115 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "faire expirer les objets plus vieux que <heure>" -#: builtin/push.c:14 +#: builtin/prune.c:123 +msgid "cannot prune in a precious-objects repo" +msgstr "impossible de nettoyer dans un dépôt d'objets précieux" + +#: builtin/pull.c:72 +msgid "git pull [<options>] [<repository> [<refspec>...]]" +msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]" + +#: builtin/pull.c:120 +msgid "Options related to merging" +msgstr "Options relatives à la fusion" + +#: builtin/pull.c:123 +msgid "incorporate changes by rebasing rather than merging" +msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" + +#: builtin/pull.c:147 builtin/revert.c:105 +msgid "allow fast-forward" +msgstr "autoriser l'avance rapide" + +#: builtin/pull.c:153 +msgid "verify that the named commit has a valid GPG signature" +msgstr "vérifier que le commit nommé a une signature GPG valide" + +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "remiser avant et réappliquer après le rebasage automatiquement" + +#: builtin/pull.c:172 +msgid "Options related to fetching" +msgstr "Options relatives au rapatriement" + +#: builtin/pull.c:194 +msgid "number of submodules pulled in parallel" +msgstr "nombre de sous-modules tirés en parallèle" + +#: builtin/pull.c:283 +#, c-format +msgid "Invalid value for pull.ff: %s" +msgstr "Valeur invalide pour pull.ff : %s" + +#: builtin/pull.c:379 +msgid "Cannot pull with rebase: You have unstaged changes." +msgstr "" +"impossible de tirer avec rebasage. Vous avez des modifications non indexées." + +#: builtin/pull.c:385 +msgid "Additionally, your index contains uncommitted changes." +msgstr "De plus, votre index contient des modifications non validées." + +#: builtin/pull.c:387 +msgid "Cannot pull with rebase: Your index contains uncommitted changes." +msgstr "" +"impossible de tirer avec rebasage : votre index contient des modifications " +"non validées." + +#: builtin/pull.c:463 +msgid "" +"There is no candidate for rebasing against among the refs that you just " +"fetched." +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:465 +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:466 +msgid "" +"Generally this means that you provided a wildcard refspec which had no\n" +"matches on the remote end." +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:469 +#, c-format +msgid "" +"You asked to pull from the remote '%s', but did not specify\n" +"a branch. Because this is not the default configured remote\n" +"for your current branch, you must specify a branch on the command line." +msgstr "" +"Vous avez demandé de tirer depuis le dépôt distant '%s', mais sans indiquer\n" +"la branche. Comme ce n'est pas le dépôt distant par défaut dans la " +"configuration\n" +"pour la branche actuelle, vous devez spécifier la branche avec la commande." + +#: builtin/pull.c:474 git-parse-remote.sh:73 +msgid "You are not currently on a branch." +msgstr "Vous n'êtes actuellement sur aucune branche." + +#: builtin/pull.c:476 builtin/pull.c:491 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:478 builtin/pull.c:493 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:479 builtin/pull.c:494 +msgid "See git-pull(1) for details." +msgstr "Référez-vous à git-pull(1) pour de plus amples détails." + +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "<distant>" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "<branche>" + +#: builtin/pull.c:489 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:498 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:503 +#, c-format +msgid "" +"Your configuration specifies to merge with the ref '%s'\n" +"from the remote, but no such ref was fetched." +msgstr "" +"Votre information de configuration indique de fusionner avec la référence " +"'%s'\n" +"du serveur distant, mais cette référence n'a pas été récupérée." + +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase." + +#: builtin/pull.c:872 +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:900 +#, c-format +msgid "" +"fetch updated the current branch head.\n" +"fast-forwarding your working tree from\n" +"commit %s." +msgstr "" +"la récupération a mis à jour la tête de la branche actuelle.\n" +"avance rapide de votre copie de travail\n" +"depuis le commit %s." + +#: builtin/pull.c:905 +#, c-format +msgid "" +"Cannot fast-forward your working tree.\n" +"After making sure that you saved anything precious from\n" +"$ git diff %s\n" +"output, run\n" +"$ git reset --hard\n" +"to recover." +msgstr "" +"Avance rapide de votre arbre de travail impossible.\n" +"Après vous être assuré que toute modification précieuse a été sauvegardée " +"avec\n" +"$ git diff %s\n" +"lancez\n" +"$ git reset --hard\n" +"pour régénérer." + +#: builtin/pull.c:920 +msgid "Cannot merge multiple branches into empty head." +msgstr "Impossible de fusionner de multiples branches sur une tête vide." + +#: builtin/pull.c:924 +msgid "Cannot rebase onto multiple branches." +msgstr "Impossible de rebaser sur de multiples branches." + +#: builtin/push.c:16 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/push.c:85 +#: builtin/push.c:89 msgid "tag shorthand without <tag>" msgstr "raccourci d'étiquette sans <étiquette>" -#: builtin/push.c:95 +#: builtin/push.c:99 msgid "--delete only accepts plain target ref names" msgstr "--delete accepte seulement des noms entiers de références cibles" -#: builtin/push.c:139 +#: builtin/push.c:143 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -8334,7 +9602,7 @@ msgstr "" "Pour choisir l'option de manière permanente, voir push.default dans 'git " "help config'." -#: builtin/push.c:142 +#: builtin/push.c:146 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -8359,7 +9627,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:157 +#: builtin/push.c:161 #, c-format msgid "" "You are not currently on a branch.\n" @@ -8374,7 +9642,7 @@ msgstr "" "\n" " git push %s HEAD:<nom-de-la-branche-amont>\n" -#: builtin/push.c:171 +#: builtin/push.c:175 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -8388,13 +9656,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:179 +#: builtin/push.c:183 #, 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:182 +#: builtin/push.c:186 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -8405,65 +9673,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:205 -msgid "" -"push.default is unset; its implicit value has changed in\n" -"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" -"and maintain the traditional behavior, use:\n" -"\n" -" git config --global push.default matching\n" -"\n" -"To squelch this message and adopt the new behavior now, use:\n" -"\n" -" git config --global push.default simple\n" -"\n" -"When push.default is set to 'matching', git will push local branches\n" -"to the remote branches that already exist with the same name.\n" -"\n" -"Since Git 2.0, Git defaults to the more conservative 'simple'\n" -"behavior, which only pushes the current branch to the corresponding\n" -"remote branch that 'git pull' uses to update the current branch.\n" -"\n" -"See 'git help config' and search for 'push.default' for further " -"information.\n" -"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" -"'current' instead of 'simple' if you sometimes use older versions of Git)" -msgstr "" -"push.default n'est pas défini ; sa valeur implicite a changé dans Git 2.0\n" -"de 'matching' vers 'simple'. Pour supprimer ce message et maintenir\n" -"le comportement actuel après la modification de la valeur de défaut, " -"utilisez :\n" -"\n" -" git config --global push.default matching\n" -"\n" -"Pour supprimer ce message et adopter le nouveau comportement maintenant, " -"utilisez :\n" -"\n" -" git config --global push.default simple\n" -"\n" -"Quand push.default vaudra 'matching', git poussera les branches locales\n" -"sur les branches distantes qui existent déjà avec le même nom.\n" -"\n" -"Depuis Git 2.0, Git utilise par défaut le comportement plus conservatif " -"'simple'\n" -"qui ne pousse la branche courante que vers la branche distante " -"correspondante\n" -"que 'git pull' utilise pour mettre à jour la branche courante.\n" -" \n" -"Voir 'git help config' et chercher 'push.default' pour plus d'information.\n" -"(le mode 'simple' a été introduit dans Git 1.7.11. Utilisez le mode " -"similaire\n" -"'current' au lieu de 'simple' si vous utilisez de temps en temps d'anciennes " -"versions de Git)" - -#: builtin/push.c:272 +#: builtin/push.c:242 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:279 +#: builtin/push.c:249 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -8478,7 +9695,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:285 +#: builtin/push.c:255 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" @@ -8487,13 +9704,13 @@ msgid "" msgstr "" "Les mises à jour ont été rejetées car la pointe de la branche courante est " "derrière\n" -"son homologue distant. Extrayez cette branche et Intégrez les changements " +"son homologue distant. Extrayez cette branche et intégrez les changements " "distants\n" "(par exemple 'git pull ...') avant de pousser à nouveau.\n" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:291 +#: builtin/push.c:261 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" @@ -8511,13 +9728,13 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:298 +#: builtin/push.c:268 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:301 +#: builtin/push.c:271 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" @@ -8529,22 +9746,22 @@ msgstr "" "pointer\n" "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" -#: builtin/push.c:360 +#: builtin/push.c:331 #, c-format msgid "Pushing to %s\n" msgstr "Poussée vers %s\n" -#: builtin/push.c:364 +#: builtin/push.c:335 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:394 +#: builtin/push.c:365 #, c-format msgid "bad repository '%s'" msgstr "mauvais dépôt '%s'" -#: builtin/push.c:395 +#: builtin/push.c:366 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -8566,111 +9783,112 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:410 +#: builtin/push.c:381 msgid "--all and --tags are incompatible" msgstr "--all et --tags sont incompatibles" -#: builtin/push.c:411 +#: builtin/push.c:382 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:416 +#: builtin/push.c:387 msgid "--mirror and --tags are incompatible" msgstr "--mirror et --tags sont incompatibles" -#: builtin/push.c:417 +#: builtin/push.c:388 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:422 +#: builtin/push.c:393 msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:502 +#: builtin/push.c:505 msgid "repository" msgstr "dépôt" -#: builtin/push.c:503 +#: builtin/push.c:506 builtin/send-pack.c:161 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:504 +#: builtin/push.c:507 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:506 +#: builtin/push.c:509 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:507 +#: builtin/push.c:510 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:510 +#: builtin/push.c:513 builtin/send-pack.c:164 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:512 +#: builtin/push.c:515 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "nom de référence>:<attendu" -#: builtin/push.c:513 +#: builtin/push.c:516 builtin/send-pack.c:176 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:516 +#: builtin/push.c:519 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:518 +#: builtin/push.c:521 builtin/send-pack.c:169 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:519 builtin/push.c:520 +#: builtin/push.c:522 builtin/push.c:523 builtin/send-pack.c:158 +#: builtin/send-pack.c:159 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:521 +#: builtin/push.c:524 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:524 +#: builtin/push.c:527 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:526 +#: builtin/push.c:529 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:527 +#: builtin/push.c:530 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:529 +#: builtin/push.c:533 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "signer la poussée avec GPG" -#: builtin/push.c:530 +#: builtin/push.c:535 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "demande une transaction atomique sur le serveur distant" -#: builtin/push.c:539 +#: builtin/push.c:549 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:541 +#: builtin/push.c:551 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" #: builtin/read-tree.c:37 msgid "" -"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" -"git read-tree [[-m [--trivial] [--aggressive] | --reset | --" -"prefix=<préfixe>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<préfixe>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-" "sparse-checkout] [--index-output=<fichier>] (--empty | <arbre ou apparenté " "1> [<arbre ou apparenté 2> [<arbre ou apparenté 3>]])" @@ -8738,12 +9956,24 @@ msgstr "sauter l'application du filtre d'extraction creuse" msgid "debug unpack-trees" msgstr "déboguer unpack-trees" -#: builtin/reflog.c:430 +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "git receive-pack <répertoire-git>" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "quiet" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "Vous devez spécifier un répertoire." + +#: builtin/reflog.c:423 #, c-format -msgid "%s' for '%s' is not a valid timestamp" -msgstr "%s' pour '%s' n'est pas un horodatage valide" +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "'%s' pour '%s' n'est pas un horodatage valide" -#: builtin/reflog.c:547 builtin/reflog.c:552 +#: builtin/reflog.c:540 builtin/reflog.c:545 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' n'est pas un horodatage valide" @@ -8760,15 +9990,15 @@ msgstr "" "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nom> <url>" -#: builtin/remote.c:14 builtin/remote.c:33 +#: builtin/remote.c:14 builtin/remote.c:34 msgid "git remote rename <old> <new>" msgstr "git remote rename <ancienne> <nouvelle>" -#: builtin/remote.c:15 builtin/remote.c:38 +#: builtin/remote.c:15 builtin/remote.c:39 msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: builtin/remote.c:16 builtin/remote.c:43 +#: builtin/remote.c:16 builtin/remote.c:44 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)" @@ -8791,48 +10021,52 @@ msgstr "" msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nom> <branche>..." -#: builtin/remote.c:21 builtin/remote.c:69 +#: builtin/remote.c:21 builtin/remote.c:70 +msgid "git remote get-url [--push] [--all] <name>" +msgstr "git remote get-url [--push] [--all] <nom>" + +#: builtin/remote.c:22 builtin/remote.c:75 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]" -#: builtin/remote.c:22 builtin/remote.c:70 +#: builtin/remote.c:23 builtin/remote.c:76 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nom> <nouvelle-URL>" -#: builtin/remote.c:23 builtin/remote.c:71 +#: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nom> <URL>" -#: builtin/remote.c:28 +#: builtin/remote.c:29 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<options>] <nom> <URL>" -#: builtin/remote.c:48 +#: builtin/remote.c:49 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branche>..." -#: builtin/remote.c:49 +#: builtin/remote.c:50 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nom> <branche>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote show [<options>] <name>" msgstr "git remote show [<options>] <nom>" -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<options>] <nom>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<options>] [<groupe> | <distante>]..." -#: builtin/remote.c:88 +#: builtin/remote.c:94 #, c-format msgid "Updating %s" msgstr "Mise à jour de %s" -#: builtin/remote.c:120 +#: builtin/remote.c:126 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -8840,102 +10074,92 @@ msgstr "" "--mirror est dangereux et obsolète ; merci\n" "\t d'utiliser --mirror=fetch ou --mirror=push à la place" -#: builtin/remote.c:137 +#: builtin/remote.c:143 #, c-format msgid "unknown mirror argument: %s" msgstr "argument miroir inconnu : %s" -#: builtin/remote.c:153 +#: builtin/remote.c:159 msgid "fetch the remote branches" msgstr "rapatrier les branches distantes" -#: builtin/remote.c:155 +#: builtin/remote.c:161 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:158 +#: builtin/remote.c:164 msgid "or do not fetch any tag at all (--no-tags)" msgstr "ou ne rapatrier aucune étiquette (--no-tags)" -#: builtin/remote.c:160 +#: builtin/remote.c:166 msgid "branch(es) to track" msgstr "branche(s) à suivre" -#: builtin/remote.c:161 +#: builtin/remote.c:167 msgid "master branch" msgstr "branche maîtresse" -#: builtin/remote.c:162 +#: builtin/remote.c:168 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:163 +#: builtin/remote.c:169 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:175 +#: builtin/remote.c:181 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:177 +#: builtin/remote.c:183 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:187 builtin/remote.c:640 +#: builtin/remote.c:190 builtin/remote.c:633 #, c-format msgid "remote %s already exists." msgstr "la distante %s existe déjà." -#: builtin/remote.c:191 builtin/remote.c:644 +#: builtin/remote.c:194 builtin/remote.c:637 #, 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:234 #, c-format msgid "Could not setup master '%s'" msgstr "Impossible de paramétrer la maîtresse '%s'" -#: builtin/remote.c:335 +#: builtin/remote.c:336 #, 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:436 builtin/remote.c:444 +#: builtin/remote.c:437 builtin/remote.c:445 msgid "(matching)" msgstr "(correspond)" -#: builtin/remote.c:448 +#: builtin/remote.c:449 msgid "(delete)" msgstr "(supprimer)" -#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601 -#, c-format -msgid "Could not append '%s' to '%s'" -msgstr "Impossible d'ajouter '%s' à '%s'" - -#: builtin/remote.c:633 builtin/remote.c:792 builtin/remote.c:892 +#: builtin/remote.c:626 builtin/remote.c:761 builtin/remote.c:858 #, c-format msgid "No such remote: %s" msgstr "Distante inconnue : %s" -#: builtin/remote.c:650 +#: builtin/remote.c:643 #, 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:656 builtin/remote.c:844 -#, c-format -msgid "Could not remove config section '%s'" -msgstr "Impossible de supprimer la section de configuration '%s'" - -#: builtin/remote.c:671 +#: builtin/remote.c:663 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -8946,32 +10170,17 @@ msgstr "" "\t%s\n" "\tVeuillez mettre à jour la configuration manuellement si nécessaire." -#: builtin/remote.c:677 -#, c-format -msgid "Could not append '%s'" -msgstr "Impossible d'ajouter '%s'" - -#: builtin/remote.c:688 -#, c-format -msgid "Could not set '%s'" -msgstr "Impossible de définir '%s'" - -#: builtin/remote.c:710 +#: builtin/remote.c:699 #, c-format msgid "deleting '%s' failed" msgstr "échec de suppression de '%s'" -#: builtin/remote.c:744 +#: builtin/remote.c:733 #, c-format msgid "creating '%s' failed" msgstr "échec de création de '%s'" -#: builtin/remote.c:763 -#, c-format -msgid "Could not remove branch %s" -msgstr "Impossible de supprimer la branche %s" - -#: builtin/remote.c:830 +#: builtin/remote.c:796 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -8986,120 +10195,127 @@ msgstr[1] "" "supprimées ;\n" "pour les supprimer, utilisez :" -#: builtin/remote.c:945 +#: builtin/remote.c:810 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Impossible de supprimer la section de configuration '%s'" + +#: builtin/remote.c:911 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)" -#: builtin/remote.c:948 +#: builtin/remote.c:914 msgid " tracked" msgstr " suivi" -#: builtin/remote.c:950 +#: builtin/remote.c:916 msgid " stale (use 'git remote prune' to remove)" msgstr " dépassé (utilisez 'git remote prune' pour supprimer)" -#: builtin/remote.c:952 +#: builtin/remote.c:918 msgid " ???" msgstr " ???" -#: builtin/remote.c:993 +#: builtin/remote.c:959 #, 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:1000 +#: builtin/remote.c:967 #, c-format -msgid "rebases onto remote %s" -msgstr "rebase sur la distante %s" +msgid "rebases interactively onto remote %s" +msgstr "rebase de manière interactive sur la distante %s" -#: builtin/remote.c:1003 +#: builtin/remote.c:971 #, c-format msgid " merges with remote %s" msgstr " fusionne avec la distante %s" -#: builtin/remote.c:1004 +#: builtin/remote.c:972 msgid " and with remote" msgstr " et avec la distante" -#: builtin/remote.c:1006 +#: builtin/remote.c:974 #, c-format msgid "merges with remote %s" msgstr "fusionne avec la distante %s" -#: builtin/remote.c:1007 +#: builtin/remote.c:975 msgid " and with remote" msgstr " et avec la distante" -#: builtin/remote.c:1053 +#: builtin/remote.c:1021 msgid "create" msgstr "créer" -#: builtin/remote.c:1056 +#: builtin/remote.c:1024 msgid "delete" msgstr "supprimer" -#: builtin/remote.c:1060 +#: builtin/remote.c:1028 msgid "up to date" msgstr "à jour" -#: builtin/remote.c:1063 +#: builtin/remote.c:1031 msgid "fast-forwardable" msgstr "peut être mis à jour en avance rapide" -#: builtin/remote.c:1066 +#: builtin/remote.c:1034 msgid "local out of date" msgstr "le local n'est pas à jour" -#: builtin/remote.c:1073 +#: builtin/remote.c:1041 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s force vers %-*s (%s)" -#: builtin/remote.c:1076 +#: builtin/remote.c:1044 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s pousse vers %-*s (%s)" -#: builtin/remote.c:1080 +#: builtin/remote.c:1048 #, c-format msgid " %-*s forces to %s" msgstr " %-*s force vers %s" -#: builtin/remote.c:1083 +#: builtin/remote.c:1051 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s pousse vers %s" -#: builtin/remote.c:1151 +#: builtin/remote.c:1119 msgid "do not query remotes" msgstr "ne pas interroger les distantes" -#: builtin/remote.c:1178 +#: builtin/remote.c:1146 #, c-format msgid "* remote %s" msgstr "* distante %s" -#: builtin/remote.c:1179 +#: builtin/remote.c:1147 #, c-format msgid " Fetch URL: %s" msgstr " URL de rapatriement : %s" -#: builtin/remote.c:1180 builtin/remote.c:1331 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "(pas d'URL)" -#: builtin/remote.c:1189 builtin/remote.c:1191 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr " URL push : %s" -#: builtin/remote.c:1193 builtin/remote.c:1195 builtin/remote.c:1197 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr " Branche HEAD : %s" -#: builtin/remote.c:1199 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -9107,145 +10323,158 @@ msgstr "" " Branche HEAD (la HEAD distante est ambiguë, peut être l'une des " "suivantes) :\n" -#: builtin/remote.c:1211 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branche distante :%s" msgstr[1] " Branches distantes :%s" -#: builtin/remote.c:1214 builtin/remote.c:1241 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr " (statut non demandé)" -#: builtin/remote.c:1223 +#: builtin/remote.c:1193 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:1231 +#: builtin/remote.c:1201 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:1238 +#: builtin/remote.c:1208 #, 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:1259 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "définir refs/remotes/<nom>/HEAD selon la distante" -#: builtin/remote.c:1261 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "supprimer refs/remotes/<nom>/HEAD" -#: builtin/remote.c:1276 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "Impossible de déterminer la HEAD distante" -#: builtin/remote.c:1278 +#: builtin/remote.c:1248 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:1288 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "Impossible de supprimer %s" -#: builtin/remote.c:1296 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "Référence non valide : %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "Impossible de paramétrer %s" -#: builtin/remote.c:1316 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr " %s se retrouvera en suspens !" -#: builtin/remote.c:1317 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr " %s se retrouve en suspens !" -#: builtin/remote.c:1327 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "Élimination de %s" -#: builtin/remote.c:1328 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "URL : %s" -#: builtin/remote.c:1351 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr " * [serait éliminé] %s" -#: builtin/remote.c:1354 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr " * [éliminé] %s" -#: builtin/remote.c:1399 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "éliminer les distants après le rapatriement" -#: builtin/remote.c:1465 builtin/remote.c:1539 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "Pas de serveur remote '%s'" -#: builtin/remote.c:1485 +#: builtin/remote.c:1441 msgid "add branch" msgstr "ajouter une branche" -#: builtin/remote.c:1492 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "pas de serveur distant spécifié" -#: builtin/remote.c:1514 +#: builtin/remote.c:1465 +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:1467 +msgid "return all URLs" +msgstr "retourner toutes les URLs" + +#: builtin/remote.c:1495 +#, c-format +msgid "no URLs configured for remote '%s'" +msgstr "aucune URL configurée pour le dépôt distant '%s'" + +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "manipuler les URLs push" -#: builtin/remote.c:1516 +#: builtin/remote.c:1523 msgid "add URL" msgstr "ajouter une URL" -#: builtin/remote.c:1518 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "supprimer des URLs" -#: builtin/remote.c:1525 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "--add --delete n'a aucun sens" -#: builtin/remote.c:1565 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Motif d'URL ancien invalide : %s" -#: builtin/remote.c:1573 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "Pas d'URL trouvée : %s" -#: builtin/remote.c:1575 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "Pas de suppression de toutes les URLs non-push" -#: builtin/remote.c:1589 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "être verbeux : doit être placé avant une sous-commande" @@ -9318,7 +10547,11 @@ msgstr "taille maximum de chaque fichier paquet" msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:377 +#: builtin/repack.c:197 +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:381 #, c-format msgid "removing '%s' failed" msgstr "la suppression de '%s' a échoué" @@ -9414,7 +10647,7 @@ msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" "git rerere [clear | forget <chemin>... | status | remaining | diff | gc]" -#: builtin/rerere.c:57 +#: builtin/rerere.c:58 msgid "register clean resolutions in index" msgstr "enregistrer des résolutions propres dans l'index" @@ -9506,11 +10739,6 @@ msgstr "" msgid "Failed to resolve '%s' as a valid revision." msgstr "Échec de résolution de '%s' comme une révision valide." -#: builtin/reset.c:308 builtin/reset.c:316 -#, c-format -msgid "Could not parse object '%s'." -msgstr "Impossible d'analyser l'objet '%s'." - #: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." @@ -9553,19 +10781,23 @@ msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'." msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." -#: builtin/rev-parse.c:361 +#: builtin/rev-list.c:350 +msgid "rev-list does not support display of notes" +msgstr "rev-list ne supporte l'affichage des notes" + +#: builtin/rev-parse.c:358 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]" -#: builtin/rev-parse.c:366 +#: builtin/rev-parse.c:363 msgid "keep the `--` passed as an arg" msgstr "garder le `--` passé en argument" -#: builtin/rev-parse.c:368 +#: builtin/rev-parse.c:365 msgid "stop parsing after the first non-option argument" msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option" -#: builtin/rev-parse.c:371 +#: builtin/rev-parse.c:368 msgid "output in stuck long form" msgstr "sortie en forme longue fixée" @@ -9645,10 +10877,6 @@ msgstr "option pour la stratégie de fusion" msgid "append commit name" msgstr "ajouter le nom de validation" -#: builtin/revert.c:105 -msgid "allow fast-forward" -msgstr "autoriser l'avance rapide" - #: builtin/revert.c:106 msgid "preserve initially empty commits" msgstr "préserver les validations vides initialement" @@ -9762,12 +10990,6 @@ msgstr "autoriser la suppression récursive" msgid "exit with a zero status even if nothing matched" msgstr "sortir avec un statut zéro même si rien ne correspondait" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"Veuillez indexer vos modifications de .gitmodules ou remisez-les pour " -"continuer" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -9778,38 +11000,62 @@ msgstr "pas de suppression récursive de '%s' sans -r" msgid "git rm: unable to remove %s" msgstr "git rm : impossible de supprimer %s" +#: builtin/send-pack.c:18 +msgid "" +"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" +"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " +"[<ref>...]\n" +" --all and explicit <ref> specification are mutually exclusive." +msgstr "" +"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" +"receive-pack>] [--verbose] [--thin] [--atomic] [<hôte>:]<répertoire> " +"[<référence>...]\n" +" --all et la spécification explicite de <référence> sont mutuellement " +"exclusifs." + +#: builtin/send-pack.c:160 +msgid "remote name" +msgstr "nom distant" + +#: builtin/send-pack.c:171 +msgid "use stateless RPC protocol" +msgstr "utiliser un protocole RPC sans état" + +#: builtin/send-pack.c:172 +msgid "read refs from stdin" +msgstr "lire les références depuis l'entrée standard" + +#: builtin/send-pack.c:173 +msgid "print status from remote helper" +msgstr "afficher les messages du greffon de protocole distant" + #: builtin/shortlog.c:13 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]" -#: builtin/shortlog.c:131 -#, c-format -msgid "Missing author: %s" -msgstr "Auteur manquant : %s" - -#: builtin/shortlog.c:230 +#: builtin/shortlog.c:242 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:232 +#: builtin/shortlog.c:244 msgid "Suppress commit descriptions, only provides commit count" msgstr "" "Supprimer les descriptions de validation, fournit seulement le nombre de " "validations" -#: builtin/shortlog.c:234 +#: builtin/shortlog.c:246 msgid "Show the email address of each author" msgstr "Afficher l'adresse e-mail de chaque auteur" -#: builtin/shortlog.c:235 +#: builtin/shortlog.c:247 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:236 +#: builtin/shortlog.c:248 msgid "Linewrap output" msgstr "Couper les lignes" -#: builtin/show-branch.c:9 +#: builtin/show-branch.c:10 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -9821,72 +11067,72 @@ msgstr "" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]" -#: builtin/show-branch.c:13 +#: builtin/show-branch.c:14 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<référence>]" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:640 msgid "show remote-tracking and local branches" msgstr "afficher les branches de suivi distantes et les branches locales" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:642 msgid "show remote-tracking branches" msgstr "afficher les branches de suivi distantes" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:644 msgid "color '*!+-' corresponding to the branch" msgstr "couleur '*!+-' correspondant à la branche" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:646 msgid "show <n> more commits after the common ancestor" msgstr "afficher <n> validations de plus après l'ancêtre commun" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c:648 msgid "synonym to more=-1" msgstr "synonyme de more=-1" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:649 msgid "suppress naming strings" msgstr "supprimer les chaînes de nommage" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:651 msgid "include the current branch" msgstr "inclure la branche courante" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:653 msgid "name commits with their object names" msgstr "nommer les validations avec leurs noms d'objet" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:655 msgid "show possible merge bases" msgstr "afficher les bases possibles de fusion" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:657 msgid "show refs unreachable from any other ref" msgstr "afficher les références inaccessibles depuis toute autre référence" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:659 msgid "show commits in topological order" msgstr "afficher les validations dans l'ordre topologique" -#: builtin/show-branch.c:681 +#: builtin/show-branch.c:662 msgid "show only commits not on the first branch" msgstr "" "afficher seulement les validations qui ne sont pas sur la première branche" -#: builtin/show-branch.c:683 +#: builtin/show-branch.c:664 msgid "show merges reachable from only one tip" msgstr "afficher les fusions accessibles depuis une seule pointe" -#: builtin/show-branch.c:685 +#: builtin/show-branch.c:666 msgid "topologically sort, maintaining date order where possible" msgstr "tri topologique, maintenant l'ordre par date si possible" -#: builtin/show-branch.c:688 +#: builtin/show-branch.c:669 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:689 +#: builtin/show-branch.c:670 msgid "show <n> most recent ref-log entries starting at base" msgstr "" "afficher les <n> plus récents éléments de ref-log en commençant à la base" @@ -9900,46 +11146,239 @@ msgstr "" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<motif>...]" #: builtin/show-ref.c:11 -msgid "git show-ref --exclude-existing[=pattern] < ref-list" -msgstr "git show-ref --exclude-existing[=motif] < liste-références" +msgid "git show-ref --exclude-existing[=<pattern>]" +msgstr "git show-ref --exclude-existing[=<motif>]" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:165 msgid "only show tags (can be combined with heads)" -msgstr "afficher seulement les étiquettes (peut être combiné avec des têtes)" +msgstr "afficher seulement les étiquettes (peut être combiné avec heads)" -#: builtin/show-ref.c:171 +#: builtin/show-ref.c:166 msgid "only show heads (can be combined with tags)" -msgstr "afficher seulement les têtes (peut être combiné avec des étiquettes)" +msgstr "afficher seulement les têtes (peut être combiné avec tags)" -#: builtin/show-ref.c:172 +#: builtin/show-ref.c:167 msgid "stricter reference checking, requires exact ref path" msgstr "" "vérification de référence plus stricte, nécessite un chemin de référence " "exact" -#: builtin/show-ref.c:175 builtin/show-ref.c:177 +#: builtin/show-ref.c:170 builtin/show-ref.c:172 msgid "show the HEAD reference, even if it would be filtered out" msgstr "afficher la référence HEAD, même si elle serait filtrée" -#: builtin/show-ref.c:179 +#: builtin/show-ref.c:174 msgid "dereference tags into object IDs" msgstr "déréférencer les étiquettes en IDs d'objet" -#: builtin/show-ref.c:181 +#: builtin/show-ref.c:176 msgid "only show SHA1 hash using <n> digits" msgstr "afficher seulement le hachage SHA1 en utilisant <n> chiffres" -#: builtin/show-ref.c:185 +#: builtin/show-ref.c:180 msgid "do not print results to stdout (useful with --verify)" msgstr "" "ne pas afficher les résultats sur la sortie standard (pratique avec --verify)" -#: builtin/show-ref.c:187 +#: builtin/show-ref.c:182 msgid "show refs from stdin that aren't in local repository" msgstr "" "afficher les références de l'entrée standard qui ne sont pas dans le dépôt " "local" +#: builtin/stripspace.c:17 +msgid "git stripspace [-s | --strip-comments]" +msgstr "git stripspace [-s | --strip-comments]" + +#: builtin/stripspace.c:18 +msgid "git stripspace [-c | --comment-lines]" +msgstr "git stripspace [-c | --comment-lines]" + +#: builtin/stripspace.c:35 +msgid "skip and remove all lines starting with comment character" +msgstr "" +"sauter et supprimer toutes les lignes commençant par le caractère de " +"commentaire" + +#: builtin/stripspace.c:38 +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:24 +#, c-format +msgid "No such ref: %s" +msgstr "Référence inexistante : %s" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "Nom de référence complet attendu, %s obtenu" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "impossible de supprimer un composant de l'URL '%s'" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 +msgid "alternative anchor for relative paths" +msgstr "ancre alternative pour les chemins relatifs" + +#: builtin/submodule--helper.c:283 +msgid "git submodule--helper list [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" + +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, 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:366 +#, 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:370 +#, 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:380 +#, 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:387 +#, 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:406 +msgid "Suppress output for initializing a submodule" +msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "git submodule--helper init [<chemin>]" + +#: builtin/submodule--helper.c:432 +msgid "git submodule--helper name <path>" +msgstr "git submodule--helper <nom> <chemin>" + +#: builtin/submodule--helper.c:438 +#, 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:489 +msgid "where the new submodule will be cloned to" +msgstr "emplacement où le sous-module sera cloné" + +#: builtin/submodule--helper.c:492 +msgid "name of the new submodule" +msgstr "nom du nouveau sous-module" + +#: builtin/submodule--helper.c:495 +msgid "url where to clone the submodule from" +msgstr "URL depuis laquelle cloner le sous-module" + +#: builtin/submodule--helper.c:501 +msgid "depth for shallow clones" +msgstr "profondeur de l'historique des clones superficiels" + +#: builtin/submodule--helper.c:507 +msgid "" +"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +msgstr "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference <dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>" + +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 +#, c-format +msgid "could not create directory '%s'" +msgstr "impossible de créer le répertoire '%s'" + +#: builtin/submodule--helper.c:534 +#, 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:550 +#, c-format +msgid "cannot open file '%s'" +msgstr "impossible d'ouvrir le fichier '%s'" + +#: builtin/submodule--helper.c:555 +#, c-format +msgid "could not close file %s" +msgstr "impossible de fermer le fichier %s" + +#: builtin/submodule--helper.c:562 +#, 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:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "Le chemin de sous-module '%s' n'est pas initialisé" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "Vous voudriez sûrement utiliser 'update --init' ?" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "Sous-module non fusionné %s non traité" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "Sous-module '%s' non traité" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "chemin dans la copie de travail" + +#: builtin/submodule--helper.c:771 +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:775 +msgid "rebase, merge, checkout or none" +msgstr "valeurs possibles : rebase, merge, checkout ou none" + +#: builtin/submodule--helper.c:779 +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:782 +msgid "parallel jobs" +msgstr "jobs parallèles" + +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "ne pas afficher la progression du clonage" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "valeur invalide pour la mise à jour du paramètre" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "la sous-commande submodule--helper doit être appelée avec une sous-commande" + +#: builtin/submodule--helper.c:862 +#, c-format +msgid "'%s' is not a valid submodule--helper subcommand" +msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" + #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "git symbolic-ref [<options>] nom [<référence>]" @@ -9961,15 +11400,15 @@ msgstr "supprimer la référence symbolique" msgid "shorten ref output" msgstr "raccourcir l'affichage de la référence" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "raison" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:358 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "raison de la mise à jour" -#: builtin/tag.c:22 +#: builtin/tag.c:23 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" @@ -9977,48 +11416,38 @@ msgstr "" "git tag [-a | -s | -u <id-clé>] [-f] [-m <message> | -F <file>] <nom-" "étiquette> [<head>]" -#: builtin/tag.c:23 +#: builtin/tag.c:24 msgid "git tag -d <tagname>..." msgstr "git tag -d <nométiquette>..." -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" -"\t\t[<pattern>...]" +"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "" "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <objet>]\n" -"\t\t[<motif>...]" +"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<motif>...]" -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "git tag -v <tagname>..." msgstr "git tag -v <nométiquette>..." -#: builtin/tag.c:69 -#, c-format -msgid "malformed object at '%s'" -msgstr "objet malformé à '%s'" - -#: builtin/tag.c:301 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "nom d'étiquette trop long : %.*s..." -#: builtin/tag.c:306 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "étiquette '%s' non trouvée." -#: builtin/tag.c:321 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Étiquette '%s' supprimée (elle était sur %s)\n" -#: builtin/tag.c:333 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "impossible de vérifier l'étiquette '%s'" - -#: builtin/tag.c:343 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10031,7 +11460,7 @@ msgstr "" " %s\n" "Les lignes commençant par '%c' seront ignorées.\n" -#: builtin/tag.c:347 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10046,351 +11475,353 @@ 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:371 -#, c-format -msgid "unsupported sort specification '%s'" -msgstr "spécification de tri non supportée '%s'" - -#: builtin/tag.c:373 -#, c-format -msgid "unsupported sort specification '%s' in variable '%s'" -msgstr "spécification de tri non supportée '%s' dans le variable '%s'" - -#: builtin/tag.c:428 +#: builtin/tag.c:199 msgid "unable to sign the tag" msgstr "impossible de signer l'étiquette" -#: builtin/tag.c:430 +#: builtin/tag.c:201 msgid "unable to write tag file" msgstr "impossible d'écrire le fichier d'étiquettes" -#: builtin/tag.c:455 +#: builtin/tag.c:226 msgid "bad object type." msgstr "mauvais type d'objet." -#: builtin/tag.c:468 +#: builtin/tag.c:239 msgid "tag header too big." msgstr "en-tête d'étiquette trop gros." -#: builtin/tag.c:504 +#: builtin/tag.c:275 msgid "no tag message?" msgstr "pas de message pour l'étiquette ?" -#: builtin/tag.c:510 +#: builtin/tag.c:281 #, 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:559 -msgid "switch 'points-at' requires an object" -msgstr "le commutateur 'points-at' a besoin d'un objet" - -#: builtin/tag.c:561 -#, c-format -msgid "malformed object name '%s'" -msgstr "nom d'objet malformé '%s'" - -#: builtin/tag.c:589 +#: builtin/tag.c:339 msgid "list tag names" msgstr "afficher les noms des étiquettes" -#: builtin/tag.c:591 +#: builtin/tag.c:341 msgid "print <n> lines of each tag message" msgstr "affiche <n> lignes de chaque message d'étiquette" -#: builtin/tag.c:593 +#: builtin/tag.c:343 msgid "delete tags" msgstr "supprimer des étiquettes" -#: builtin/tag.c:594 +#: builtin/tag.c:344 msgid "verify tags" msgstr "vérifier des étiquettes" -#: builtin/tag.c:596 +#: builtin/tag.c:346 msgid "Tag creation options" msgstr "Options de création de l'étiquette" -#: builtin/tag.c:598 +#: builtin/tag.c:348 msgid "annotated tag, needs a message" msgstr "étiquette annotée, nécessite un message" -#: builtin/tag.c:600 +#: builtin/tag.c:350 msgid "tag message" msgstr "message pour l'étiquette" -#: builtin/tag.c:602 +#: builtin/tag.c:352 msgid "annotated and GPG-signed tag" msgstr "étiquette annotée et signée avec GPG" -#: builtin/tag.c:606 +#: builtin/tag.c:356 msgid "use another key to sign the tag" msgstr "utiliser une autre clé pour signer l'étiquette" -#: builtin/tag.c:607 +#: builtin/tag.c:357 msgid "replace the tag if exists" msgstr "remplacer l'étiquette si elle existe" -#: builtin/tag.c:609 +#: builtin/tag.c:358 builtin/update-ref.c:368 +msgid "create a reflog" +msgstr "créer un reflog" + +#: builtin/tag.c:360 msgid "Tag listing options" msgstr "Options d'affichage des étiquettes" -#: builtin/tag.c:610 +#: builtin/tag.c:361 msgid "show tag list in columns" msgstr "afficher la liste des étiquettes sous forme de colonnes" -#: builtin/tag.c:612 -msgid "sort tags" -msgstr "trier les étiquettes" - -#: builtin/tag.c:617 builtin/tag.c:623 +#: builtin/tag.c:362 builtin/tag.c:363 msgid "print only tags that contain the commit" msgstr "afficher seulement les étiquettes qui contiennent la validation" -#: builtin/tag.c:629 +#: builtin/tag.c:364 +msgid "print only tags that are merged" +msgstr "afficher seulement les étiquettes qui sont fusionnées" + +#: builtin/tag.c:365 +msgid "print only tags that are not merged" +msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées" + +#: builtin/tag.c:370 msgid "print only tags of the object" msgstr "afficher seulement les étiquettes de l'objet" -#: builtin/tag.c:655 +#: builtin/tag.c:399 msgid "--column and -n are incompatible" msgstr "--column et -n sont incompatibles" -#: builtin/tag.c:667 -msgid "--sort and -n are incompatible" -msgstr "--sort et -n sont incompatibles" - -#: builtin/tag.c:674 +#: builtin/tag.c:419 msgid "-n option is only allowed with -l." msgstr "l'option -n est autorisée seulement avec -l." -#: builtin/tag.c:676 +#: builtin/tag.c:421 msgid "--contains option is only allowed with -l." msgstr "l'option --contains est autorisée seulement avec -l." -#: builtin/tag.c:678 +#: builtin/tag.c:423 msgid "--points-at option is only allowed with -l." msgstr "l'option --points-at est autorisée seulement avec -l." -#: builtin/tag.c:686 +#: builtin/tag.c:425 +msgid "--merged and --no-merged option are only allowed with -l" +msgstr "les options --merged et --no-merged ne sont autorisées qu'avec -l" + +#: builtin/tag.c:433 msgid "only one -F or -m option is allowed." msgstr "une seule option -F ou -m est autorisée." -#: builtin/tag.c:706 +#: builtin/tag.c:452 msgid "too many params" msgstr "trop de paramètres" -#: builtin/tag.c:712 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' n'est pas un nom d'étiquette valide." -#: builtin/tag.c:717 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "l'étiquette '%s' existe déjà" -#: builtin/tag.c:741 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" -#: builtin/unpack-objects.c:489 +#: builtin/unpack-objects.c:490 msgid "Unpacking objects" msgstr "Dépaquetage des objets" -#: builtin/update-index.c:70 +#: builtin/update-index.c:79 #, c-format msgid "failed to create directory %s" msgstr "échec de la création du répertoire %s" -#: builtin/update-index.c:76 +#: builtin/update-index.c:85 #, c-format msgid "failed to stat %s" msgstr "échec du stat de %s" -#: builtin/update-index.c:86 +#: builtin/update-index.c:95 #, c-format msgid "failed to create file %s" msgstr "échec de la création du fichier %s" -#: builtin/update-index.c:94 +#: builtin/update-index.c:103 #, c-format msgid "failed to delete file %s" msgstr "échec de la suppression du fichier %s" -#: builtin/update-index.c:101 builtin/update-index.c:203 +#: builtin/update-index.c:110 builtin/update-index.c:212 #, c-format msgid "failed to delete directory %s" msgstr "échec de la suppression du répertoire %s" -#: builtin/update-index.c:124 +#: builtin/update-index.c:133 #, c-format -msgid "Testing " -msgstr "Test en cours " +msgid "Testing mtime in '%s' " +msgstr "Test du mtime dans '%s' " -#: builtin/update-index.c:136 +#: builtin/update-index.c:145 msgid "directory stat info does not change after adding a new file" msgstr "" "l'information de stat du répertoire ne change pas après ajout d'un fichier" -#: builtin/update-index.c:149 +#: builtin/update-index.c:158 msgid "directory stat info does not change after adding a new directory" msgstr "" "l'information de stat du répertoire ne change pas après ajout d'un répertoire" -#: builtin/update-index.c:162 +#: builtin/update-index.c:171 msgid "directory stat info changes after updating a file" msgstr "" "l'information de stat du répertoire change après mise à jour d'un fichier" -#: builtin/update-index.c:173 +#: builtin/update-index.c:182 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "l'information de stat du répertoire change après l'ajout d'un fichier dans " "un sous-répertoire" -#: builtin/update-index.c:184 +#: builtin/update-index.c:193 msgid "directory stat info does not change after deleting a file" msgstr "" "l'information de stat du répertoire ne change pas après la suppression d'un " "fichier<" -#: builtin/update-index.c:197 +#: builtin/update-index.c:206 msgid "directory stat info does not change after deleting a directory" msgstr "" "l'information de stat du répertoire ne change pas après la suppression d'un " "répertoire" -#: builtin/update-index.c:204 +#: builtin/update-index.c:213 msgid " OK" msgstr " OK" -#: builtin/update-index.c:564 +#: builtin/update-index.c:575 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<options>] [--] [<fichier>...]" -#: builtin/update-index.c:918 +#: builtin/update-index.c:930 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:921 +#: builtin/update-index.c:933 msgid "refresh: ignore submodules" msgstr "rafraîchir : ignorer les sous-modules" -#: builtin/update-index.c:924 +#: builtin/update-index.c:936 msgid "do not ignore new files" msgstr "ne pas ignorer les nouveaux fichiers" -#: builtin/update-index.c:926 +#: builtin/update-index.c:938 msgid "let files replace directories and vice-versa" msgstr "laisser les fichiers remplacer des répertoires et vice-versa" -#: builtin/update-index.c:928 +#: builtin/update-index.c:940 msgid "notice files missing from worktree" msgstr "aviser des fichiers manquants dans la copie de travail" -#: builtin/update-index.c:930 +#: builtin/update-index.c:942 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:933 +#: builtin/update-index.c:945 msgid "refresh stat information" msgstr "rafraîchir l'information de stat" -#: builtin/update-index.c:937 +#: builtin/update-index.c:949 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "comme --refresh, mais en ignorant l'option assume-unchanged" -#: builtin/update-index.c:941 +#: builtin/update-index.c:953 msgid "<mode>,<object>,<path>" msgstr "<mode>, <objet>, <chemin>" -#: builtin/update-index.c:942 +#: builtin/update-index.c:954 msgid "add the specified entry to the index" msgstr "ajouter l'élément spécifié dans l'index" -#: builtin/update-index.c:946 +#: builtin/update-index.c:958 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/update-index.c:947 +#: builtin/update-index.c:959 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exécutable pour les fichiers listés" -#: builtin/update-index.c:951 +#: builtin/update-index.c:963 msgid "mark files as \"not changing\"" msgstr "marquer les fichiers comme \"non changeants\"" -#: builtin/update-index.c:954 +#: builtin/update-index.c:966 msgid "clear assumed-unchanged bit" msgstr "mettre à zéro le bit supposé-non-modifié" -#: builtin/update-index.c:957 +#: builtin/update-index.c:969 msgid "mark files as \"index-only\"" msgstr "marquer les fichiers comme \"index seulement\"" -#: builtin/update-index.c:960 +#: builtin/update-index.c:972 msgid "clear skip-worktree bit" msgstr "mettre à zéro le bit sauter-la-copie-de travail" -#: builtin/update-index.c:963 +#: builtin/update-index.c:975 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:965 +#: builtin/update-index.c:977 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:967 +#: builtin/update-index.c:979 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:969 +#: builtin/update-index.c:981 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:973 +#: builtin/update-index.c:985 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:977 +#: builtin/update-index.c:989 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:981 +#: builtin/update-index.c:993 msgid "only update entries that differ from HEAD" msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD" -#: builtin/update-index.c:985 +#: builtin/update-index.c:997 msgid "ignore files missing from worktree" msgstr "ignorer les fichiers manquants dans la copie de travail" -#: builtin/update-index.c:988 +#: builtin/update-index.c:1000 msgid "report actions to standard output" msgstr "afficher les actions sur la sortie standard" -#: builtin/update-index.c:990 +#: builtin/update-index.c:1002 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus" -#: builtin/update-index.c:994 +#: builtin/update-index.c:1006 msgid "write index in this format" msgstr "écrire l'index dans ce format" -#: builtin/update-index.c:996 +#: builtin/update-index.c:1008 msgid "enable or disable split index" msgstr "activer ou désactiver l'index divisé" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1010 msgid "enable/disable untracked cache" -msgstr "activer ou désactiver le cache non-suivi" +msgstr "activer ou désactiver le cache de non-suivis" -#: builtin/update-index.c:1000 +#: builtin/update-index.c:1012 +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:1014 msgid "enable untracked cache without testing the filesystem" -msgstr "activer le cache non-suivi sans tester le système de fichier" +msgstr "activer le cache de non-suivis sans tester le système de fichier" + +#: builtin/update-index.c:1134 +msgid "Untracked cache disabled" +msgstr "Le cache non suivi est désactivé" + +#: builtin/update-index.c:1146 +#, c-format +msgid "Untracked cache enabled for '%s'" +msgstr "Le cache non suivi est activé pour '%s'" #: builtin/update-ref.c:9 msgid "git update-ref [<options>] -d <refname> [<old-val>]" @@ -10406,19 +11837,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<options>] --stdin [-z]" -#: builtin/update-ref.c:359 +#: builtin/update-ref.c:363 msgid "delete the reference" msgstr "supprimer la référence" -#: builtin/update-ref.c:361 +#: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "mettre à jour <nomréférence> et non la référence pointée par lui" -#: builtin/update-ref.c:362 +#: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "l'entrée standard a des arguments qui se terminent par NUL" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "lire les mises à jour depuis l'entrée standard" @@ -10434,10 +11865,14 @@ msgstr "mettre à jour les fichiers d'information à partir de zéro" msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <commit>..." -#: builtin/verify-commit.c:75 +#: builtin/verify-commit.c:72 msgid "print commit contents" msgstr "afficher le contenu du commit" +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 +msgid "print raw gpg status output" +msgstr "afficher les messages bruts de gpg" + #: builtin/verify-pack.c:54 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." @@ -10454,89 +11889,95 @@ msgstr "afficher seulement les statistiques" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <étiquette>..." -#: builtin/verify-tag.c:73 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "afficher le contenu de l'étiquette" -#: builtin/worktree.c:11 -msgid "git worktree add [<options>] <path> <branch>" -msgstr "git worktree add [<options>] <chemin> <branche>" +#: builtin/worktree.c:15 +msgid "git worktree add [<options>] <path> [<branch>]" +msgstr "git worktree add [<options>] <chemin> [<branche>]" -#: builtin/worktree.c:12 +#: builtin/worktree.c:16 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<options>]" -#: builtin/worktree.c:27 +#: builtin/worktree.c:17 +msgid "git worktree list [<options>]" +msgstr "git worktree prune [<options>]" + +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Suppression de worktrees/%s : répertoire invalide" -#: builtin/worktree.c:33 +#: builtin/worktree.c:46 #, 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:38 +#: builtin/worktree.c:51 #, 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:49 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Suppression de worktrees/%s : fichier gitdir invalide" -#: builtin/worktree.c:65 +#: builtin/worktree.c:78 #, 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:100 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" -msgstr "échec de la suppression de %s" +msgid "failed to remove '%s'" +msgstr "échec de la suppression de '%s'" -#: builtin/worktree.c:186 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "'%s' existe déjà" -#: builtin/worktree.c:207 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:241 -msgid "unable to resolve HEAD" -msgstr "impossible de résoudre HEAD" - -#: builtin/worktree.c:249 +#: builtin/worktree.c:270 #, c-format -msgid "Enter %s (identifier %s)" -msgstr "Saisir %s (identifiant %s)" +msgid "Preparing %s (identifier %s)" +msgstr "Préparation de %s (identifiant %s)" -#: builtin/worktree.c:281 +#: builtin/worktree.c:322 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" +msgstr "" +"extraire la <branche> même si elle est déjà extraite dans une autre copie de " +"travail" -#: builtin/worktree.c:283 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:285 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:286 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" -#: builtin/worktree.c:292 -msgid "-b and -B are mutually exclusive" -msgstr "-b et -B sont mutuellement exclusifs" +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "remplissage de la nouvelle copie de travail" + +#: builtin/worktree.c:336 +msgid "-b, -B, and --detach are mutually exclusive" +msgstr "-b, -B et --detach sont mutuellement exclusifs" #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" @@ -10554,7 +11995,7 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le débogage" -#: credential-cache--daemon.c:267 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "afficher les messages de debug sur stderr" @@ -10568,350 +12009,169 @@ 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." -#: common-cmds.h:10 +#: http.c:322 +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" + +#: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "démarrer une zone de travail (voir aussi : git help tutorial)" -#: common-cmds.h:11 +#: common-cmds.h:10 msgid "work on the current change (see also: git help everyday)" msgstr "" "travailler sur la modification actuelle (voir aussi : git help revisions)" -#: common-cmds.h:12 +#: common-cmds.h:11 msgid "examine the history and state (see also: git help revisions)" msgstr "examiner l'historique et l'état (voir aussi : git help revisions)" -#: common-cmds.h:13 +#: common-cmds.h:12 msgid "grow, mark and tweak your common history" msgstr "agrandir, marquer et modifier votre historique" -#: common-cmds.h:14 +#: common-cmds.h:13 msgid "collaborate (see also: git help workflows)" msgstr "collaborer (voir aussi : git help workflows)" -#: common-cmds.h:18 +#: common-cmds.h:17 msgid "Add file contents to the index" msgstr "Ajouter le contenu de fichiers dans l'index" -#: common-cmds.h:19 -msgid "Find by binary search the change that introduced a bug" +#: common-cmds.h:18 +msgid "Use binary search to find the commit that introduced a bug" msgstr "Trouver par recherche binaire la modification qui a introduit un bogue" -#: common-cmds.h:20 +#: common-cmds.h:19 msgid "List, create, or delete branches" msgstr "Lister, créer ou supprimer des branches" -#: common-cmds.h:21 +#: common-cmds.h:20 msgid "Switch branches or restore working tree files" msgstr "Basculer de branche ou restaurer la copie de travail" -#: common-cmds.h:22 +#: common-cmds.h:21 msgid "Clone a repository into a new directory" msgstr "Cloner un dépôt dans un nouveau répertoire" -#: common-cmds.h:23 +#: common-cmds.h:22 msgid "Record changes to the repository" msgstr "Enregistrer les modifications dans le dépôt" -#: common-cmds.h:24 +#: common-cmds.h:23 msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Afficher les changements entre les validations, entre validation et copie de " "travail, etc" -#: common-cmds.h:25 +#: common-cmds.h:24 msgid "Download objects and refs from another repository" msgstr "Télécharger les objets et références depuis un autre dépôt" -#: common-cmds.h:26 +#: common-cmds.h:25 msgid "Print lines matching a pattern" msgstr "Afficher les lignes correspondant à un motif" -#: common-cmds.h:27 +#: common-cmds.h:26 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Créer un dépôt Git vide ou réinitialiser un existant" -#: common-cmds.h:28 +#: common-cmds.h:27 msgid "Show commit logs" msgstr "Afficher l'historique des validations" -#: common-cmds.h:29 +#: common-cmds.h:28 msgid "Join two or more development histories together" msgstr "Fusionner deux ou plusieurs historiques de développement ensemble" -#: common-cmds.h:30 +#: common-cmds.h:29 msgid "Move or rename a file, a directory, or a symlink" msgstr "Déplacer ou renommer un fichier, un répertoire, ou un lien symbolique" -#: common-cmds.h:31 +#: common-cmds.h:30 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Rapatrier et intégrer un autre dépôt ou une branche locale" -#: common-cmds.h:32 +#: common-cmds.h:31 msgid "Update remote refs along with associated objects" msgstr "Mettre à jour les références distantes ainsi que les objets associés" -#: common-cmds.h:33 -msgid "Forward-port local commits to the updated upstream head" -msgstr "" -"Reporter les validations locales sur le sommet mis à jour d'une branche amont" +#: common-cmds.h:32 +msgid "Reapply commits on top of another base tip" +msgstr "Réapplication des commits sur le sommet de l'autre base" -#: common-cmds.h:34 +#: common-cmds.h:33 msgid "Reset current HEAD to the specified state" msgstr "Réinitialiser la HEAD courante à l'état spécifié" -#: common-cmds.h:35 +#: common-cmds.h:34 msgid "Remove files from the working tree and from the index" msgstr "Supprimer des fichiers de la copie de travail et de l'index" -#: common-cmds.h:36 +#: common-cmds.h:35 msgid "Show various types of objects" msgstr "Afficher différents types d'objets" -#: common-cmds.h:37 +#: common-cmds.h:36 msgid "Show the working tree status" msgstr "Afficher le statut de la copie de travail" -#: common-cmds.h:38 +#: common-cmds.h:37 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" "Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG" -#: parse-options.h:142 +#: parse-options.h:145 msgid "expiry-date" msgstr "date-d'expiration" -#: parse-options.h:157 +#: parse-options.h:160 msgid "no-op (backward compatibility)" msgstr "sans action (rétrocompatibilité)" -#: parse-options.h:231 +#: parse-options.h:237 msgid "be more verbose" msgstr "être plus verbeux" -#: parse-options.h:233 +#: parse-options.h:239 msgid "be more quiet" msgstr "être plus silencieux" -#: parse-options.h:239 +#: parse-options.h:245 msgid "use <n> digits to display SHA-1s" msgstr "utiliser <n> chiffres pour afficher les SHA-1s" -#: rerere.h:27 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "" "met à jour l'index avec les résolutions de conflit réutilisées si possible" -#: git-am.sh:53 -msgid "You need to set your committer info first" -msgstr "Vous devez d'abord définir vos informations de validateur" - -#: git-am.sh:100 -msgid "" -"You seem to have moved HEAD since the last 'am' failure.\n" -"Not rewinding to ORIG_HEAD" -msgstr "" -"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" -"Pas de retour à ORIG_HEAD" - -#: git-am.sh:110 -#, sh-format -msgid "" -"When you have resolved this problem, run \"$cmdline --continue\".\n" -"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" -"To restore the original branch and stop patching, run \"$cmdline --abort\"." -msgstr "" -"Lorsque vous aurez résolu ce problème, lancez \"$cmdline --continue\".\n" -"Si vous préférez sauter ce patch, lancez \"$cmdline --skip\" à la place.\n" -"Pour restaurer la branche d'origine et stopper le patchage, lancez " -"\"$cmdline --abort\"." - -#: git-am.sh:126 -msgid "Cannot fall back to three-way merge." -msgstr "Impossible de retourner à une fusion à 3 points." - -#: git-am.sh:142 -msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "" -"Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " -"points." - -#: git-am.sh:144 -msgid "Using index info to reconstruct a base tree..." -msgstr "" -"Utilisation de l'information de l'index pour reconstruire un arbre de base..." - -#: git-am.sh:159 -msgid "" -"Did you hand edit your patch?\n" -"It does not apply to blobs recorded in its index." -msgstr "" -"Avez-vous édité le patch à la main ?\n" -"Il ne s'applique pas aux blobs enregistrés dans son index." - -#: git-am.sh:168 -msgid "Falling back to patching base and 3-way merge..." -msgstr "Retour à un patch de la base et fusion à 3 points..." - -#: git-am.sh:185 -msgid "Failed to merge in the changes." -msgstr "Échec d'intégration des modifications." - -#: git-am.sh:280 -msgid "Only one StGIT patch series can be applied at once" -msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois" - -#: git-am.sh:367 -#, sh-format -msgid "Patch format $patch_format is not supported." -msgstr "Le format de patch $patch_format n'est pas supporté." - -#: git-am.sh:369 -msgid "Patch format detection failed." -msgstr "Échec de détection du format du patch." - -#: git-am.sh:407 -msgid "" -"The -b/--binary option has been a no-op for long time, and\n" -"it will be removed. Please do not use it anymore." -msgstr "" -"L'option -b/--binary ne fait plus rien depuis longtemps,\n" -"et elle sera supprimée. Veuillez ne plus l'utiliser." - -#: git-am.sh:507 -#, sh-format -msgid "previous rebase directory $dotest still exists but mbox given." -msgstr "" -"le répertoire précédent de rebasage $dotest existe toujours mais mbox donnée." - -#: git-am.sh:512 -msgid "Please make up your mind. --skip or --abort?" -msgstr "Décidez-vous. --skip ou --abort ?" - -#: git-am.sh:560 -#, sh-format -msgid "" -"Stray $dotest directory found.\n" -"Use \"git am --abort\" to remove it." -msgstr "" -"Répertoire abandonné $dotest trouvé.\n" -"Utilisez \"git am --abort\" pour le supprimer." - -#: git-am.sh:568 -msgid "Resolve operation not in progress, we are not resuming." -msgstr "" -"Pas de résolution de l'opération en cours, nous ne sommes pas dans une " -"reprise." - -#: git-am.sh:635 -#, sh-format -msgid "Dirty index: cannot apply patches (dirty: $files)" -msgstr "Index sale : impossible d'appliquer des patchs (sales : $files)" - -#: git-am.sh:747 -#, sh-format -msgid "" -"Patch is empty. Was it split wrong?\n" -"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" -"To restore the original branch and stop patching run \"$cmdline --abort\"." -msgstr "" -"Le patch est vide. Était-il mal découpé ?\n" -"Si vous préférez sauter ce patch, lancez plutôt \"$cmdline --skip\".\n" -"Pour restaurer la branche d'origine et stopper le patchage, lancez " -"\"$cmdline --abort\"." - -#: git-am.sh:774 -msgid "Patch does not have a valid e-mail address." -msgstr "Le patch n'a pas d'adresse e-mail valide." - -#: git-am.sh:821 -msgid "cannot be interactive without stdin connected to a terminal." -msgstr "" -"impossible d'être interactif sans entrée standard connectée à un terminal." - -#: git-am.sh:825 -msgid "Commit Body is:" -msgstr "Le corps de la validation est :" - -#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] -#. in your translation. The program will only accept English -#. input at this point. -#: git-am.sh:832 -msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " - -#: git-am.sh:868 -#, sh-format -msgid "Applying: $FIRSTLINE" -msgstr "Application : $FIRSTLINE" - -#: git-am.sh:889 -msgid "" -"No changes - did you forget to use 'git add'?\n" -"If there is nothing left to stage, chances are that something else\n" -"already introduced the same changes; you might want to skip this patch." -msgstr "" -"Aucun changement - avez-vous oublié d'utiliser 'git add' ?\n" -"S'il n'y a plus rien à indexer, il se peut qu'autre chose ait déjà\n" -"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " -"patch." - -#: git-am.sh:897 -msgid "" -"You still have unmerged paths in your index\n" -"did you forget to use 'git add'?" -msgstr "" -"Vous avez toujours des chemins non fusionnés dans votre index\n" -"auriez-vous oublié de faire 'git add' ?" - -#: git-am.sh:913 -msgid "No changes -- Patch already applied." -msgstr "Pas de changement -- Patch déjà appliqué." - -#: git-am.sh:923 -#, sh-format -msgid "Patch failed at $msgnum $FIRSTLINE" -msgstr "Le patch a échoué à $msgnum $FIRSTLINE" - -#: git-am.sh:926 -#, sh-format -msgid "" -"The copy of the patch that failed is found in:\n" -" $dotest/patch" -msgstr "" -"La copie du patch qui a échoué se trouve dans :\n" -" $dotest/patch" - -#: git-am.sh:945 -msgid "applying to an empty history" -msgstr "application à un historique vide" - -#: git-bisect.sh:48 +#: git-bisect.sh:55 msgid "You need to start by \"git bisect start\"" msgstr "Vous devez démarrer avec \"git bisect start\"" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:54 +#: git-bisect.sh:61 msgid "Do you want me to do it for you [Y/n]? " msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? " -#: git-bisect.sh:95 +#: git-bisect.sh:122 #, sh-format msgid "unrecognised option: '$arg'" msgstr "option inconnue : '$arg'" -#: git-bisect.sh:99 +#: git-bisect.sh:126 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "'$arg' ne semble être une révision valide" -#: git-bisect.sh:117 +#: git-bisect.sh:155 msgid "Bad HEAD - I need a HEAD" msgstr "Mauvaise HEAD - j'ai besoin d'une HEAD" -#: git-bisect.sh:130 +#: git-bisect.sh:168 #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." @@ -10919,76 +12179,84 @@ msgstr "" "L'extraction de '$start_head' a échoué. Essayez 'git bisect reset <branche-" "valide>'." -#: git-bisect.sh:140 +#: git-bisect.sh:178 msgid "won't bisect on cg-seek'ed tree" msgstr "refus de bissecter sur un arbre 'cg-seeked'" -#: git-bisect.sh:144 +#: git-bisect.sh:182 msgid "Bad HEAD - strange symbolic ref" msgstr "Mauvaise HEAD - référence symbolique douteuse" -#: git-bisect.sh:189 +#: git-bisect.sh:234 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "Mauvais argument pour bisect_write : $state" -#: git-bisect.sh:218 +#: git-bisect.sh:263 #, sh-format msgid "Bad rev input: $arg" msgstr "Mauvaise révision en entrée : $arg" -#: git-bisect.sh:232 +#: git-bisect.sh:278 msgid "Please call 'bisect_state' with at least one argument." msgstr "Veuillez appeler 'bisect_state' avec au moins un argument." -#: git-bisect.sh:244 +#: git-bisect.sh:290 #, sh-format msgid "Bad rev input: $rev" msgstr "Mauvaise révision en entrée : $rev" -#: git-bisect.sh:253 -msgid "'git bisect bad' can take only one argument." -msgstr "'git bisect bad' n'accepte qu'un seul argument." +#: git-bisect.sh:299 +#, sh-format +msgid "'git bisect $TERM_BAD' can take only one argument." +msgstr "'git bisect $TERM_BAD' n'accepte qu'un seul argument." -#: git-bisect.sh:276 -msgid "Warning: bisecting only with a bad commit." -msgstr "Attention : bissection avec seulement une mauvaise validation." +#: git-bisect.sh:322 +#, sh-format +msgid "Warning: bisecting only with a $TERM_BAD commit." +msgstr "Attention : bissection avec seulement une validation $TERM_BAD." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:282 +#: git-bisect.sh:328 msgid "Are you sure [Y/n]? " msgstr "Êtes-vous sûr [Y/n] ? " -#: git-bisect.sh:292 +#: git-bisect.sh:340 +#, sh-format msgid "" -"You need to give me at least one good and one bad revision.\n" -"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +"You need to give me at least one $bad_syn and one $good_syn revision.\n" +"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" -"Vous devez me donner au moins une bonne et une mauvaise révision.\n" -"(Vous pouvez utiliser \"git bisect bad\" et \"git bisect good\" pour cela.)" +"Vous devez me donner au moins une révision $bad_syn et une révision " +"$good_syn.\n" +"(Vous pouvez utiliser \"git bisect $bad_syn\" et \"git bisect $good_syn\" " +"pour cela.)" -#: git-bisect.sh:295 +#: git-bisect.sh:343 +#, sh-format msgid "" "You need to start by \"git bisect start\".\n" -"You then need to give me at least one good and one bad revision.\n" -"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +"You then need to give me at least one $good_syn and one $bad_syn revision.\n" +"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" "Vous devez démarrer avec \"git bisect start\".\n" -"Puis vous devez me donner au moins une bonne et une mauvaise révision.\n" -"(Vous pouvez utiliser \"git bisect bad\" et \"git bisect good\" pour cela.)" +"Puis vous devez me donner au moins une révision $good_syn et une révision " +"$bad_syn.\n" +"(Vous pouvez utiliser \"git bisect $bad_syn\" et \"git bisect $good_syn\" " +"pour cela.)" -#: git-bisect.sh:366 git-bisect.sh:493 +#: git-bisect.sh:414 git-bisect.sh:546 msgid "We are not bisecting." msgstr "Pas de bissection en cours." -#: git-bisect.sh:373 +#: git-bisect.sh:421 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "'$invalid' n'est pas une validation valide" -#: git-bisect.sh:382 +#: git-bisect.sh:430 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" @@ -10997,25 +12265,25 @@ msgstr "" "Échec d'extraction de la HEAD d'origine '$branch'.\n" "Essayez 'git bisect reset <commit>'." -#: git-bisect.sh:409 +#: git-bisect.sh:458 msgid "No logfile given" msgstr "Pas de fichier de log donné" -#: git-bisect.sh:410 +#: git-bisect.sh:459 #, sh-format msgid "cannot read $file for replaying" msgstr "impossible de lire $file pour rejouer" -#: git-bisect.sh:427 +#: git-bisect.sh:480 msgid "?? what are you talking about?" msgstr "?? de quoi parlez-vous ?" -#: git-bisect.sh:439 +#: git-bisect.sh:492 #, sh-format msgid "running $command" msgstr "lancement de $command" -#: git-bisect.sh:446 +#: git-bisect.sh:499 #, sh-format msgid "" "bisect run failed:\n" @@ -11024,11 +12292,11 @@ msgstr "" "la bissection a échoué :\n" "le code retour $res de '$command' est < 0 ou >= 128" -#: git-bisect.sh:472 +#: git-bisect.sh:525 msgid "bisect run cannot continue any more" msgstr "la bissection ne peut plus continuer" -#: git-bisect.sh:478 +#: git-bisect.sh:531 #, sh-format msgid "" "bisect run failed:\n" @@ -11037,57 +12305,49 @@ msgstr "" "la bissection a échoué :\n" "'bisect_state $state' a retourné le code erreur $res" -#: git-bisect.sh:485 +#: git-bisect.sh:538 msgid "bisect run success" msgstr "succès de la bissection" -#: git-pull.sh:61 -msgid "" -"Pull is not possible because you have unmerged files.\n" -"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" -"as appropriate to mark resolution and make a commit." -msgstr "" -"Le tirage n'est pas possible car vous avez des fichiers non fusionnés.\n" -"Veuillez les corriger dans votre copie de travail, utiliser alors 'git add/" -"rm <fichier>'\n" -"si nécessaire pour marquer comme résolu et valider." +#: git-bisect.sh:565 +msgid "please use two different terms" +msgstr "veuillez utiliser deux termes différents" -#: git-pull.sh:65 -msgid "Pull is not possible because you have unmerged files." -msgstr "Le pull n'est pas possible car vous avez des fichiers non fusionnés." +#: git-bisect.sh:575 +#, sh-format +msgid "'$term' is not a valid term" +msgstr "'$term' n'est pas un terme valide" -#: git-pull.sh:71 -msgid "" -"You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you can merge." -msgstr "" -"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" -"Veuillez valider vos changements avant de pouvoir fusionner." +#: git-bisect.sh:578 +#, sh-format +msgid "can't use the builtin command '$term' as a term" +msgstr "impossible d'utiliser la commande incluse '$term' comme terme" -#: git-pull.sh:285 -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" +#: git-bisect.sh:587 git-bisect.sh:593 +#, sh-format +msgid "can't change the meaning of term '$term'" +msgstr "impossible de modifier la signification du terme '$term'" -#: git-pull.sh:311 +#: git-bisect.sh:606 #, sh-format -msgid "" -"Warning: fetch updated the current branch head.\n" -"Warning: fast-forwarding your working tree from\n" -"Warning: commit $orig_head." +msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" -"Attention : fetch a mis à jour la tête de la branche courante.\n" -"Attention : mise à jour en avance rapide de votre copie de travail\n" -"Attention : depuis la validation $orig_head." +"Commande invalide : vous êtes actuellement dans une bissection $TERM_BAD/" +"$TERM_GOOD." -#: git-pull.sh:336 -msgid "Cannot merge multiple branches into empty head" -msgstr "Impossible de fusionner de multiples branches sur une tête vide" +#: git-bisect.sh:636 +msgid "no terms defined" +msgstr "aucun terme défini" -#: git-pull.sh:340 -msgid "Cannot rebase onto multiple branches" -msgstr "Impossible de rebaser sur de multiples branches" +#: git-bisect.sh:653 +#, sh-format +msgid "" +"invalid argument $arg for 'git bisect terms'.\n" +"Supported options are: --term-good|--term-old and --term-bad|--term-new." +msgstr "" +"argument invalide $arg pour 'git bisect terms'.\n" +"Les options supportées sont : --term-good|--term-old et --term-bad|--term-" +"new." #: git-rebase.sh:57 msgid "" @@ -11101,16 +12361,16 @@ msgstr "" "Pour extraire la branche d'origine et stopper le rebasage, lancez \"git " "rebase --abort\"." -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "Autoremisage appliqué." -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Impossible de stocker $stash_sha1" -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -11120,33 +12380,29 @@ msgstr "" "Vos modifications sont à l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: git-rebase.sh:213 +#: git-rebase.sh:216 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:351 -msgid "The --exec option must be used with the --interactive option" -msgstr "L'option --exec doit être utilisée avec l'option --interactive" - -#: git-rebase.sh:356 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: git-rebase.sh:367 +#: git-rebase.sh:368 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:374 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: git-rebase.sh:377 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -11154,12 +12410,12 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: git-rebase.sh:395 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "Impossible de revenir à $head_name" -#: git-rebase.sh:414 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11181,65 +12437,65 @@ msgstr "" "chose\n" "d'important ici." -#: git-rebase.sh:465 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "invalide $upstream_name en amont" -#: git-rebase.sh:489 +#: git-rebase.sh:490 #, 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:492 git-rebase.sh:496 +#: git-rebase.sh:493 git-rebase.sh:497 #, 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:501 +#: git-rebase.sh:502 #, 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:524 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "fatal : pas de branche : $branch_name" -#: git-rebase.sh:557 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: git-rebase.sh:562 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Autoremisage créé : $stash_abbrev" -#: git-rebase.sh:566 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: git-rebase.sh:586 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La branche courante $branch_name est à jour." -#: git-rebase.sh:590 +#: git-rebase.sh:591 #, 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:601 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Changements de $mb sur $onto :" -#: git-rebase.sh:610 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Premièrement, rembobinons head pour rejouer votre travail par-dessus..." -#: git-rebase.sh:620 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name mise à jour en avance rapide sur $onto_name." @@ -11272,7 +12528,7 @@ msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)" msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'état de la copie de travail" -#: git-stash.sh:191 +#: git-stash.sh:189 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Impossible de mettre à jour $ref_stash avec $w_commit" @@ -11287,7 +12543,7 @@ msgstr "Impossible de mettre à jour $ref_stash avec $w_commit" #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:241 +#: git-stash.sh:239 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" @@ -11296,134 +12552,110 @@ msgstr "" "erreur: option inconnue pour 'stash save': $option\n" " Pour fournir un message, utilisez git stash save -- '$option'" -#: git-stash.sh:262 +#: git-stash.sh:260 msgid "No local changes to save" msgstr "Pas de modifications locales à sauver" -#: git-stash.sh:266 +#: git-stash.sh:264 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: git-stash.sh:270 +#: git-stash.sh:268 msgid "Cannot save the current status" msgstr "Impossible de sauver le statut courant" -#: git-stash.sh:288 +#: git-stash.sh:286 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: git-stash.sh:389 +#: git-stash.sh:405 #, sh-format msgid "unknown option: $opt" msgstr "option inconnue : $opt" -#: git-stash.sh:399 +#: git-stash.sh:415 msgid "No stash found." msgstr "Pas de remisage trouvé." -#: git-stash.sh:406 +#: git-stash.sh:422 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Trop de révisions spécifiées : $REV" -#: git-stash.sh:412 +#: git-stash.sh:428 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference n'est pas une référence valide" -#: git-stash.sh:440 +#: git-stash.sh:456 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' n'est pas une validation de type remisage" -#: git-stash.sh:451 +#: git-stash.sh:467 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' n'est pas une référence de remisage" -#: git-stash.sh:459 +#: git-stash.sh:475 msgid "unable to refresh index" msgstr "impossible de rafraîchir l'index" -#: git-stash.sh:463 +#: git-stash.sh:479 msgid "Cannot apply a stash in the middle of a merge" msgstr "Impossible d'appliquer un remisage en cours de fusion" -#: git-stash.sh:471 +#: git-stash.sh:487 msgid "Conflicts in index. Try without --index." msgstr "Conflits dans l'index. Essayez sans --index." -#: git-stash.sh:473 +#: git-stash.sh:489 msgid "Could not save index tree" msgstr "Impossible de sauvegarder l'arbre d'index" -#: git-stash.sh:507 +#: git-stash.sh:523 msgid "Cannot unstage modified files" msgstr "Impossible de désindexer les fichiers modifiés" -#: git-stash.sh:522 +#: git-stash.sh:538 msgid "Index was not unstashed." msgstr "L'index n'a pas été sorti de remise." -#: git-stash.sh:545 +#: git-stash.sh:561 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} supprimé ($s)" -#: git-stash.sh:546 +#: git-stash.sh:562 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Impossible de supprimer l'élément de stash" -#: git-stash.sh:554 +#: git-stash.sh:570 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: git-stash.sh:626 +#: git-stash.sh:642 msgid "(To restore them type \"git stash apply\")" msgstr "(Pour les restaurer tapez \"git stash apply\")" -#: git-submodule.sh:95 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "impossible de supprimer un composant de l'URL '$remoteurl'" - -#: git-submodule.sh:237 -#, sh-format -msgid "No submodule mapping found in .gitmodules for path '$sm_path'" -msgstr "" -"Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le " -"chemin '$sm_path'" - -#: git-submodule.sh:287 -#, sh-format -msgid "Clone of '$url' into submodule path '$sm_path' failed" -msgstr "Le clonage de '$url' dans le chemin de sous-module '$sm_path' a échoué" - -#: git-submodule.sh:296 -#, sh-format -msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" -msgstr "" -"Le répertoire Git '$a' fait partie du chemin de sous-module '$b' ou vice-" -"versa" - -#: git-submodule.sh:406 +#: git-submodule.sh:219 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:416 +#: git-submodule.sh:229 #, 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:433 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' existe déjà dans l'index" -#: git-submodule.sh:437 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11434,24 +12666,24 @@ msgstr "" "$sm_path\n" "Utilisez -f si vous voulez vraiment l'ajouter." -#: git-submodule.sh:455 +#: git-submodule.sh:268 #, 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:457 +#: git-submodule.sh:270 #, 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:465 +#: git-submodule.sh:278 #, 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:467 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" @@ -11459,7 +12691,7 @@ msgstr "" "Si vous voulez réutiliser ce répertoire git local au lieu de cloner à " "nouveau depuis" -#: git-submodule.sh:469 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" @@ -11467,7 +12699,7 @@ msgstr "" "utilisez l'option '--force'. Si le répertoire local git n'est pas le dépôt " "correct" -#: git-submodule.sh:470 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -11476,74 +12708,53 @@ msgstr "" "ou vous ne savez pas ce que cela signifie de choisir un autre nom avec " "l'option '--name'." -#: git-submodule.sh:472 +#: git-submodule.sh:285 #, 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:484 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Impossible d'extraire le sous-module '$sm_path'" -#: git-submodule.sh:489 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Échec d'ajout du sous-module '$sm_path'" -#: git-submodule.sh:498 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Échec d'enregistrement du sous-module '$sm_path'" -#: git-submodule.sh:542 +#: git-submodule.sh:355 #, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "Entrée dans '$prefix$displaypath'" +msgid "Entering '$displaypath'" +msgstr "Entrée dans '$displaypath'" -#: git-submodule.sh:562 +#: git-submodule.sh:375 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." -msgstr "" -"Arrêt sur '$prefix$displaypath' ; le script a retourné un statut non nul." +msgid "Stopping at '$displaypath'; script returned non-zero status." +msgstr "Arrêt sur '$displaypath' ; le script a retourné un statut non nul." -#: git-submodule.sh:608 +#: git-submodule.sh:448 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" -msgstr "" -"URL non trouvée pour le chemin de sous-module '$displaypath' dans .gitmodules" +msgid "pathspec and --all are incompatible" +msgstr "un spécificateur de chemin et --all sont incompatibles" -#: git-submodule.sh:617 +#: git-submodule.sh:453 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" -msgstr "" -"Échec d'enregistrement de l'URL pour le chemin de sous-module '$displaypath'" +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules" -#: git-submodule.sh:619 -#, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" -msgstr "Sous-module '$name' ($url) enregistré pour le chemin '$displaypath'" - -#: git-submodule.sh:636 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" -"Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module " -"'$displaypath'" - -#: git-submodule.sh:674 -#, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "" -"Utilisez '.' si vous voulez vraiment réinitialiser tous les sous-modules" - -#: git-submodule.sh:691 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" "La copie de travail du sous-module '$displaypath' contient un répertoire .git" -#: git-submodule.sh:692 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" @@ -11551,7 +12762,7 @@ msgstr "" "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " "historique)" -#: git-submodule.sh:698 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -11560,146 +12771,388 @@ msgstr "" "La copie de travail du sous-module '$displaypath' contient des modifications " "locales ; utilisez '-f' pour les annuler" -#: git-submodule.sh:701 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Répertoire '$displaypath' nettoyé" -#: git-submodule.sh:702 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" "Impossible de supprimer la copie de travail du sous-module '$displaypath'" -#: git-submodule.sh:705 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Impossible de créer le répertoire vide du sous-module '$displaypath'" -#: git-submodule.sh:714 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Le sous-module '$name' ($url) n'est pas enregistré pour le chemin " "'$displaypath'" -#: git-submodule.sh:830 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" -"Chemin de sous-module '$displaypath' non initialisé\n" -"Peut-être souhaitez-vous utiliser 'update --init' ?" - -#: git-submodule.sh:843 +#: git-submodule.sh:635 #, 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:852 +#: git-submodule.sh:644 #, 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:876 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:890 +#: git-submodule.sh:680 #, 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:891 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" -#: git-submodule.sh:895 +#: git-submodule.sh:685 #, 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:896 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'" -#: git-submodule.sh:901 +#: git-submodule.sh:691 #, 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:902 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'" -#: git-submodule.sh:907 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" -msgstr "" -"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module " -"'$prefix$sm_path'" +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:908 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" -msgstr "Chemin de sous-module '$prefix$sm_path' : '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" +msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'" -#: git-submodule.sh:938 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" -#: git-submodule.sh:1046 +#: git-submodule.sh:837 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:1098 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode $mod_dst inattendu" -#: git-submodule.sh:1118 +#: git-submodule.sh:909 #, 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:1121 +#: git-submodule.sh:912 #, 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:1124 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Attention : $display_name ne contient pas les validations $sha1_src et " "$sha1_dst" -#: git-submodule.sh:1149 +#: git-submodule.sh:940 msgid "blob" msgstr "blob" -#: git-submodule.sh:1267 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'" -#: git-submodule.sh:1331 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails." + +#~ msgid "'%s': %s" +#~ msgstr "'%s' : %s" + +#~ msgid "unable to access '%s': %s" +#~ msgstr "impossible d'accéder à '%s' : %s" + +#~ msgid "could not open '%s' for reading: %s" +#~ msgstr "impossible d'ouvrir '%s' en lecture : %s" + +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "impossible d'ouvrir '%s' en écriture : %s" + +#~ msgid " git branch -d %s\n" +#~ msgstr " git branch -d %s\n" + +#~ msgid " git branch --set-upstream-to %s\n" +#~ msgstr " git branch --set-upstream-to %s\n" + +#~ msgid "cannot open %s: %s\n" +#~ msgstr "impossible d'ouvrir %s : %s\n" + +#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed" +#~ msgstr "" +#~ "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" + +#~ msgid "The --exec option must be used with the --interactive option" +#~ msgstr "L'option --exec doit être utilisée avec l'option --interactive" + +#~ msgid "" +#~ "Submodule path '$displaypath' not initialized\n" +#~ "Maybe you want to use 'update --init'?" +#~ msgstr "" +#~ "Chemin de sous-module '$displaypath' non initialisé\n" +#~ "Peut-être souhaitez-vous utiliser 'update --init' ?" + +#~ msgid "Forward-port local commits to the updated upstream head" +#~ msgstr "" +#~ "Reporter les validations locales sur le sommet mis à jour d'une branche " +#~ "amont" + +#~ msgid "unable to parse format" +#~ msgstr "impossible d'analyser le format" + +#~ msgid "improper format entered align:%s" +#~ msgstr "format non convenable align:%s" + +#~ msgid "Could not set core.worktree in %s" +#~ msgstr "Impossible de paramétrer core.worktree dans %s" + +#~ msgid "" +#~ "push.default is unset; its implicit value has changed in\n" +#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" +#~ "and maintain the traditional behavior, use:\n" +#~ "\n" +#~ " git config --global push.default matching\n" +#~ "\n" +#~ "To squelch this message and adopt the new behavior now, use:\n" +#~ "\n" +#~ " git config --global push.default simple\n" +#~ "\n" +#~ "When push.default is set to 'matching', git will push local branches\n" +#~ "to the remote branches that already exist with the same name.\n" +#~ "\n" +#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n" +#~ "behavior, which only pushes the current branch to the corresponding\n" +#~ "remote branch that 'git pull' uses to update the current branch.\n" +#~ "\n" +#~ "See 'git help config' and search for 'push.default' for further " +#~ "information.\n" +#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" +#~ "'current' instead of 'simple' if you sometimes use older versions of Git)" +#~ msgstr "" +#~ "push.default n'est pas défini ; sa valeur implicite a changé dans Git " +#~ "2.0\n" +#~ "de 'matching' vers 'simple'. Pour supprimer ce message et maintenir\n" +#~ "le comportement actuel après la modification de la valeur de défaut, " +#~ "utilisez :\n" +#~ "\n" +#~ " git config --global push.default matching\n" +#~ "\n" +#~ "Pour supprimer ce message et adopter le nouveau comportement maintenant, " +#~ "utilisez :\n" +#~ "\n" +#~ " git config --global push.default simple\n" +#~ "\n" +#~ "Quand push.default vaudra 'matching', git poussera les branches locales\n" +#~ "sur les branches distantes qui existent déjà avec le même nom.\n" +#~ "\n" +#~ "Depuis Git 2.0, Git utilise par défaut le comportement plus conservatif " +#~ "'simple'\n" +#~ "qui ne pousse la branche courante que vers la branche distante " +#~ "correspondante\n" +#~ "que 'git pull' utilise pour mettre à jour la branche courante.\n" +#~ " \n" +#~ "Voir 'git help config' et chercher 'push.default' pour plus " +#~ "d'information.\n" +#~ "(le mode 'simple' a été introduit dans Git 1.7.11. Utilisez le mode " +#~ "similaire\n" +#~ "'current' au lieu de 'simple' si vous utilisez de temps en temps " +#~ "d'anciennes versions de Git)" + +#~ msgid "check|on-demand|no" +#~ msgstr "check|on-demand|no" + +#~ msgid "Could not append '%s'" +#~ msgstr "Impossible d'ajouter '%s'" + +#~ msgid "Missing author: %s" +#~ msgstr "Auteur manquant : %s" + +#~ msgid "Testing " +#~ msgstr "Test en cours " + +#~ msgid "unable to look up current user in the passwd file: %s" +#~ msgstr "" +#~ "impossible de rechercher l'utilisateur actuel dans le fichier de mots de " +#~ "passe : %s" + +#~ msgid "no such user" +#~ msgstr "utilisateur inconnu" + +#~ msgid "branch '%s' does not point at a commit" +#~ msgstr "la branche '%s' ne pointe pas sur un commit" + +#~ msgid "object '%s' does not point to a commit" +#~ msgstr "l'objet '%s' ne pointe pas sur un commit" + +#~ msgid "some refs could not be read" +#~ msgstr "des références n'ont pas pu être lues" + +#~ msgid "print only merged branches" +#~ msgstr "afficher seulement les branches fusionnées" + +#~ msgid "--dissociate given, but there is no --reference" +#~ msgstr "--dissociate est spécifié, mais --reference est absent" + +#~ msgid "show usage" +#~ msgstr "afficher l'usage" + +#~ msgid "insanely long template name %s" +#~ msgstr "nom de modèle démentiellement long %s" + +#~ msgid "insanely long symlink %s" +#~ msgstr "lien symbolique démentiellement long %s" + +#~ msgid "insanely long template path %s" +#~ msgstr "chemin de modèle %s démentiellement long" + +#~ msgid "insane git directory %s" +#~ msgstr "répertoire git démentiel %s" + +#~ msgid "unsupported sort specification '%s'" +#~ msgstr "spécification de tri non supportée '%s'" + +#~ msgid "unsupported sort specification '%s' in variable '%s'" +#~ msgstr "spécification de tri non supportée '%s' dans le variable '%s'" + +#~ msgid "switch 'points-at' requires an object" +#~ msgstr "le commutateur 'points-at' a besoin d'un objet" + +#~ msgid "sort tags" +#~ msgstr "trier les étiquettes" + +#~ msgid "--sort and -n are incompatible" +#~ msgstr "--sort et -n sont incompatibles" + +#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +#~ msgstr "" +#~ "Le répertoire Git '$a' fait partie du chemin de sous-module '$b' ou vice-" +#~ "versa" + +#~ msgid "false|true|preserve" +#~ msgstr "false|true|preserve" + +#~ msgid "BUG: reopen a lockfile that is still open" +#~ msgstr "BUG: réouverture d'un fichier verrou déjà ouvert" + +#~ msgid "BUG: reopen a lockfile that has been committed" +#~ msgstr "BUG: réouverture d'un fichier verrou validé" + +#~ msgid "option %s does not accept negative form" +#~ msgstr "l'option %s n'accepte pas de valeur négative" + +#~ msgid "unable to parse value '%s' for option %s" +#~ msgstr "impossible d'analyser la valeur '%s' pour l'option %s" + +#~ msgid "-b and -B are mutually exclusive" +#~ msgstr "-b et -B sont mutuellement exclusifs" + +#~ msgid "You need to set your committer info first" +#~ msgstr "Vous devez d'abord définir vos informations de validateur" + +#~ msgid "" +#~ "When you have resolved this problem, run \"$cmdline --continue\".\n" +#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" +#~ "To restore the original branch and stop patching, run \"$cmdline --abort" +#~ "\"." +#~ msgstr "" +#~ "Lorsque vous aurez résolu ce problème, lancez \"$cmdline --continue\".\n" +#~ "Si vous préférez sauter ce patch, lancez \"$cmdline --skip\" à la place.\n" +#~ "Pour restaurer la branche d'origine et stopper le patchage, lancez " +#~ "\"$cmdline --abort\"." + +#~ msgid "Patch format $patch_format is not supported." +#~ msgstr "Le format de patch $patch_format n'est pas supporté." + +#~ msgid "Please make up your mind. --skip or --abort?" +#~ msgstr "Décidez-vous. --skip ou --abort ?" + +#~ msgid "" +#~ "Patch is empty. Was it split wrong?\n" +#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +#~ "To restore the original branch and stop patching run \"$cmdline --abort\"." +#~ msgstr "" +#~ "Le patch est vide. Était-il mal découpé ?\n" +#~ "Si vous préférez sauter ce patch, lancez plutôt \"$cmdline --skip\".\n" +#~ "Pour restaurer la branche d'origine et stopper le patchage, lancez " +#~ "\"$cmdline --abort\"." + +#~ msgid "Patch does not have a valid e-mail address." +#~ msgstr "Le patch n'a pas d'adresse e-mail valide." + +#~ msgid "Applying: $FIRSTLINE" +#~ msgstr "Application : $FIRSTLINE" + +#~ msgid "Patch failed at $msgnum $FIRSTLINE" +#~ msgstr "Le patch a échoué à $msgnum $FIRSTLINE" + +#~ msgid "" +#~ "Pull is not possible because you have unmerged files.\n" +#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" +#~ "as appropriate to mark resolution and make a commit." +#~ msgstr "" +#~ "Le tirage n'est pas possible car vous avez des fichiers non fusionnés.\n" +#~ "Veuillez les corriger dans votre copie de travail, utiliser alors 'git " +#~ "add/rm <fichier>'\n" +#~ "si nécessaire pour marquer comme résolu et valider." + +#~ msgid "Pull is not possible because you have unmerged files." +#~ msgstr "" +#~ "Le pull n'est pas possible car vous avez des fichiers non fusionnés." + #~ msgid "no branch specified" #~ msgstr "aucune branche spécifiée" @@ -11709,9 +13162,6 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" #~ msgid "prune .git/worktrees" #~ msgstr "éliminer .git/worktrees" -#~ msgid "--worktrees does not take extra arguments" -#~ msgstr "--worktrees n'accepte pas d'argument supplémentaire" - #~ msgid "The most commonly used git commands are:" #~ msgstr "Les commandes git les plus utilisées sont :" @@ -11724,9 +13174,6 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" #~ msgid "Invalid gc.pruneexpire: '%s'" #~ msgstr "gc.pruneexpire invalide : '%s'" -#~ msgid "server does not support --atomic push" -#~ msgstr "le serveur ne gère pas push --atomic" - #~ msgid "(detached from %s)" #~ msgstr "(détaché de %s)" @@ -11745,9 +13192,6 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" #~ msgid "force creation (when already exists)" #~ msgstr "forcer la création (même si la cible existe)" -#~ msgid "Malformed ident string: '%s'" -#~ msgstr "Chaîne ident mal formée : '%s'" - #~ msgid "slot" #~ msgstr "emplacement" @@ -11805,9 +13249,6 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" #~ msgid "bug" #~ msgstr "bogue" -#~ msgid "ahead " -#~ msgstr "devant " - #~ msgid ", behind " #~ msgstr ", derrière " @@ -11919,12 +13360,5 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'" #~ msgstr "les chemins en entrée sont terminés par le caractère nul" #~ msgid "" -#~ "The following untracked files would NOT be saved but need to be removed " -#~ "by stash save:" -#~ msgstr "" -#~ "Les fichiers suivants non suivis ne seront PAS sauvés mais doivent être " -#~ "supprimés par le remisage :" - -#~ msgid "" #~ "Aborting. Consider using either the --force or --include-untracked option." #~ msgstr "Abandon. Utilisez l'option --force ou --include-untracked." |