diff --git a/po/documentation.fr.po b/po/documentation.fr.po index d7c6651bfd7fb46ec2c9302aaf07d1099b8d3971..6c8d21e45938c15093166c59e15f2574aabc7eb8 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" "POT-Creation-Date: 2019-08-26 23:13+0200\n" -"PO-Revision-Date: 2019-10-01 20:56+0000\n" +"PO-Revision-Date: 2019-10-05 21:56+0000\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" @@ -57962,323 +57962,386 @@ msgstr "(comme `git log --source`), ne fonctionne qu'avec `git log`" #: en/pretty-formats.txt:188 #, no-wrap, priority:260 msgid "'%e'" -msgstr "" +msgstr "'%e'" #. type: Plain text #: en/pretty-formats.txt:189 #, priority:260 msgid "encoding" -msgstr "" +msgstr "encodage" #. type: Plain text #: en/pretty-formats.txt:190 -#, fuzzy, priority:260 -#| msgid "--keep-subject" +#, 260, priority msgid "subject" -msgstr "--keep-subject" +msgstr "titre" #. type: Labeled list #: en/pretty-formats.txt:190 #, no-wrap, priority:260 msgid "'%f'" -msgstr "" +msgstr "'%f'" #. type: Plain text #: en/pretty-formats.txt:191 #, priority:260 msgid "sanitized subject line, suitable for a filename" -msgstr "" +msgstr "ligne de titre aseptis챕e, convenant pour un nom de fichier" #. type: Labeled list #: en/pretty-formats.txt:191 #, no-wrap, priority:260 msgid "'%b'" -msgstr "" +msgstr "'%b'" #. type: Plain text #: en/pretty-formats.txt:192 #, priority:260 msgid "body" -msgstr "" +msgstr "corps" #. type: Labeled list #: en/pretty-formats.txt:192 #, no-wrap, priority:260 msgid "'%B'" -msgstr "" +msgstr "'%B'" #. type: Plain text #: en/pretty-formats.txt:193 #, priority:260 msgid "raw body (unwrapped subject and body)" -msgstr "" +msgstr "corps brut (sujet et corps non envelopp챕s)" #. type: Labeled list #: en/pretty-formats.txt:194 #, no-wrap, priority:260 msgid "'%N'" -msgstr "" +msgstr "'%N'" #. type: Plain text #: en/pretty-formats.txt:195 -#, fuzzy, priority:260 -#| msgid "commit it" +#, 260, priority msgid "commit notes" -msgstr "le valider" +msgstr "notes du commit" #. type: Labeled list #: en/pretty-formats.txt:196 #, no-wrap, priority:260 msgid "'%GG'" -msgstr "" +msgstr "'%GG'" #. type: Plain text #: en/pretty-formats.txt:197 #, priority:260 msgid "raw verification message from GPG for a signed commit" -msgstr "" +msgstr "message de v챕rification brut de GPG pour un commit sign챕" #. type: Labeled list #: en/pretty-formats.txt:197 #, no-wrap, priority:260 msgid "'%G?'" -msgstr "" +msgstr "'%G?'" #. type: Plain text #: en/pretty-formats.txt:198 #, priority:260 msgid "show \"G\" for a good (valid) signature," -msgstr "" +msgstr "afficher \"G\" pour une bonne signature (valide)," #. type: Plain text #: en/pretty-formats.txt:205 #, priority:260 msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature" msgstr "" +"\"B\" pour une mauvaise signature, \"U\" pour une bonne signature avec une " +"validit챕 inconnue, \"X\" pour une bonne signature qui a expir챕, \"Y\" pour " +"une bonne signature faite par une cl챕 expir챕e, \"R\" pour une bonne " +"signature faite par une cl챕 r챕voqu챕e, \"E\" si la signature ne peut pas 챗tre " +"v챕rifi챕e (par exemple la cl챕 est manquante) et \"N\" pour aucune signature" #. type: Labeled list #: en/pretty-formats.txt:205 #, no-wrap, priority:260 msgid "'%GS'" -msgstr "" +msgstr "'%GS'" #. type: Plain text #: en/pretty-formats.txt:206 #, priority:260 msgid "show the name of the signer for a signed commit" -msgstr "" +msgstr "affiche le nom du signataire d'un commit sign챕" #. type: Labeled list #: en/pretty-formats.txt:206 #, no-wrap, priority:260 msgid "'%GK'" -msgstr "" +msgstr "'%GK'" #. type: Plain text #: en/pretty-formats.txt:207 -#, fuzzy, priority:260 -#| msgid "but can be used to amend a merge commit." +#, 260, priority msgid "show the key used to sign a signed commit" -msgstr "mais peut 챗tre utilis챕 pour corriger un commit de fusion." +msgstr "afficher la cl챕 utilis챕e pour signer un commit sign챕" #. type: Labeled list #: en/pretty-formats.txt:207 #, no-wrap, priority:260 msgid "'%GF'" -msgstr "" +msgstr "'%GF'" #. type: Plain text #: en/pretty-formats.txt:208 #, priority:260 msgid "show the fingerprint of the key used to sign a signed commit" msgstr "" +"afficher l'empreinte digitale de la cl챕 utilis챕e pour signer un commit sign챕" #. type: Labeled list #: en/pretty-formats.txt:208 #, no-wrap, priority:260 msgid "'%GP'" -msgstr "" +msgstr "'%GP'" #. type: Plain text #: en/pretty-formats.txt:209 #, priority:260 msgid "show the fingerprint of the primary key whose subkey was used" msgstr "" +"afficher l'empreinte digitale de la cl챕 primaire dont la sous-cl챕 a 챕t챕 " +"utilis챕e" #. type: Plain text #: en/pretty-formats.txt:210 -#, fuzzy, priority:260 -#| msgid "--origin <commit>" +#, 260, priority msgid "to sign a signed commit" -msgstr "--origin <commit>" +msgstr "pour signer un commit sign챕" #. type: Labeled list #: en/pretty-formats.txt:210 #, no-wrap, priority:260 msgid "'%gD'" -msgstr "" +msgstr "'%gD'" #. type: Plain text #: en/pretty-formats.txt:211 #, priority:260 msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2" -msgstr "" +msgstr "s챕lecteur de reflog, par exemple, `refs/stash@{1}`` ou `refs/stash@{2" #. type: Plain text #: en/pretty-formats.txt:215 #, priority:260 msgid "minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)." msgstr "" +"minutes ago`} ; le format suit les r챔gles d챕crites pour l'option `-g'. La " +"partie avant `@' est le refname tel qu'il est donn챕 sur la ligne de commande " +"(donc `git log -g refs/heads/master` produirait `refs/heads/master@{0}`)." #. type: Labeled list #: en/pretty-formats.txt:215 #, no-wrap, priority:260 msgid "'%gd'" -msgstr "" +msgstr "'%gd'" #. type: Plain text #: en/pretty-formats.txt:216 #, priority:260 msgid "shortened reflog selector; same as `%gD`, but the refname" msgstr "" +"s챕lecteur de reflog raccourci ; identique 횪 `%gD', mais la partie du nom du " +"reflog" #. type: Plain text #: en/pretty-formats.txt:218 #, priority:260 msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)." msgstr "" +"est raccourcie pour la lisibilit챕 humaine (ainsi `refs/heads/master` devient " +"simplement `master`)." #. type: Labeled list #: en/pretty-formats.txt:218 #, no-wrap, priority:260 msgid "'%gn'" -msgstr "" +msgstr "'%gn'" #. type: Plain text #: en/pretty-formats.txt:219 #, priority:260 msgid "reflog identity name" -msgstr "" +msgstr "nom de l'identit챕 reflog" #. type: Labeled list #: en/pretty-formats.txt:219 #, no-wrap, priority:260 msgid "'%gN'" -msgstr "" +msgstr "'%gN'" #. type: Plain text #: en/pretty-formats.txt:220 #, priority:260 msgid "reflog identity name (respecting .mailmap, see" -msgstr "" +msgstr "nom de l'identit챕 du reflog (en respectant le fichier.mailmap, voir" #. type: Labeled list #: en/pretty-formats.txt:221 #, no-wrap, priority:260 msgid "'%ge'" -msgstr "" +msgstr "'%ge'" #. type: Plain text #: en/pretty-formats.txt:222 #, priority:260 msgid "reflog identity email" -msgstr "" +msgstr "adresse de courriel d'identit챕 reflog" #. type: Labeled list #: en/pretty-formats.txt:222 #, no-wrap, priority:260 msgid "'%gE'" -msgstr "" +msgstr "'%gE'" #. type: Plain text #: en/pretty-formats.txt:223 #, priority:260 msgid "reflog identity email (respecting .mailmap, see" msgstr "" +"adresse de courriel de l'identit챕 reflog (en respectant le fichier .mailmap, " +"voir" #. type: Labeled list #: en/pretty-formats.txt:224 #, no-wrap, priority:260 msgid "'%gs'" -msgstr "" +msgstr "'%gs'" #. type: Plain text #: en/pretty-formats.txt:225 #, priority:260 msgid "reflog subject" -msgstr "" +msgstr "titre du reflog" #. type: Labeled list #: en/pretty-formats.txt:225 #, no-wrap, priority:260 msgid "'%(trailers[:options])'" -msgstr "" +msgstr "'%(trailers[:options])'" #. type: Plain text #: en/pretty-formats.txt:226 #, priority:260 msgid "display the trailers of the body as" -msgstr "" +msgstr "afficher les lignes d'attribut du corps comme" #. type: Plain text #: en/pretty-formats.txt:230 #, priority:260 msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:" msgstr "" +"interpr챕t챕s par linkgit:git-interpret-trailers[1]. La cha챤ne `trailers` peut " +"챗tre suivie de deux-points et de z챕ro ou plus d'options s챕par챕es par des " +"virgules :" #. type: Plain text #: en/pretty-formats.txt:238 #, priority:260 msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`." msgstr "" +"key=<K>' : affiche uniquement les cha챤nes d'attributs avec la cl챕 sp챕cifi챕e. " +"L'appariement se fait de fa챌on insensible 횪 la casse et la virgule finale " +"est facultative. Si l'option est donn챕e plusieurs fois, les lignes " +"d'attributs correspondant 횪 l'une des cl챕s sont affich챕es. Cette option " +"active automatiquement l'option `only` de sorte que les lignes non-attribut " +"dans le bloc d'attributs soient masqu챕es. Si ce n'est pas d챕sir챕, ce peut " +"챗tre d챕sactiv챕 avec `only=false`. Par exemple, `%(trailers:key=Reviewed-by)`" +" affiche les lignes d'attribut avec la cl챕 `Reviewed-by`." #. type: Plain text #: en/pretty-formats.txt:244 #, priority:260 msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used." msgstr "" +"'only[=val]' : permet de s챕lectionner si les lignes non-attribut du bloc " +"d'attributs doivent 챗tre incluses. Le mot-cl챕 `only` peut 챗tre " +"챕ventuellement suivi d'un signe 챕gal et d'une valeur `true`, `on`, `yes` " +"pour omettre ou `false`, `off`, `no` pour afficher les lignes non-attribut. " +"Si l'option est donn챕e sans valeur, elle est activ챕e. Si elle est donn챕e " +"plusieurs fois, la derni챔re valeur est utilis챕e." #. type: Plain text #: en/pretty-formats.txt:253 #, priority:260 msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space." msgstr "" +"'separator=<SEP>' : sp챕cifie un s챕parateur ins챕r챕 entre les lignes " +"d'attributs. Lorsque cette option n'est pas activ챕e, chaque ligne d'attribut " +"est termin챕e par un caract챔re de saut de ligne. La cha챤ne SEP peut contenir " +"les codes de formatage litt챕ral d챕crits ci-dessus. Pour utiliser la virgule " +"comme s챕parateur, il faut utiliser `%x2C` car sinon elle serait analys챕e " +"comme option suivante. Si l'option s챕parateur est donn챕e plusieurs fois, " +"seule la derni챔re est utilis챕e. Par exemple, " +"`%(trailers:key=Ticket,separator=%x2C )` affiche toutes les lignes " +"d'attributs dont la cl챕 est 짬혻Ticket혻쨩 s챕par챕es par une virgule et un espace." #. type: Plain text #: en/pretty-formats.txt:257 #, priority:260 msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines." msgstr "" +"'unfold[=val]' : se comporter comme si l'option `--unfold` d'interpr챕tation " +"des attributs 챕tait donn챕e. De la m챗me mani챔re que pour `only`, il peut " +"챗tre suivi d'un signe 챕gal et d'une valeur explicite. Par exemple, " +"`%(trailers:only,unfold=true)` d챕plie et affiche toutes les lignes " +"d'attributs." #. type: Plain text #: en/pretty-formats.txt:259 #, priority:260 msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value." msgstr "" +"'valueonly[=val]' : sauter la partie cl챕 de la ligne d'attribut et " +"n'afficher que la partie valeur. Ceci permet aussi optionnellement une " +"valeur explicite." #. type: Plain text #: en/pretty-formats.txt:266 #, priority:260 msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line." msgstr "" +"Certains espaces r챕serv챕s peuvent d챕pendre d'autres options donn챕es au " +"moteur de travers챕e de r챕visions. Par exemple, les options de reflog `%g*` " +"ins챕reront une cha챤ne vide 횪 moins que nous ne traversions des entr챕es de " +"reflog (par exemple, par `git log -g`). Les caract챔res de remplissage `%d` " +"et `%D` utiliseront le format de d챕coration 짬혻short혻쨩 si `--decorate` n'a " +"pas d챕j횪 챕t챕 fourni sur la ligne de commande." #. type: Plain text #: en/pretty-formats.txt:270 #, priority:260 msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string." msgstr "" +"Si vous ajoutez un `+` (signe plus) apr챔s'%' d'un espace r챕serv챕, un saut de " +"ligne est ins챕r챕 imm챕diatement avant l'expansion si et seulement si l'espace " +"r챕serv챕 se d챕veloppe en une cha챤ne non vide." #. type: Plain text #: en/pretty-formats.txt:274 #, priority:260 msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string." msgstr "" +"Si vous ajoutez un `-` (signe moins) apr챔s'%' d'un caract챔re de remplissage, " +"tous les sauts de ligne cons챕cutifs pr챕c챕dant imm챕diatement l'expansion sont " +"supprim챕s si et seulement si l'espace r챕serv챕 se d챕veloppe en une cha챤ne " +"vide." #. type: Plain text #: en/pretty-formats.txt:278 #, priority:260 msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string." msgstr "" +"Si vous ajoutez un ``(espace) apr챔s'%' d'un espace r챕serv챕, un espace est " +"ins챕r챕 imm챕diatement avant l'expansion si et seulement si l'espace r챕serv챕 " +"se d챕veloppe en une cha챤ne non vide." #. type: Plain text #: en/pretty-formats.txt:280 @@ -58291,6 +58354,13 @@ msgstr "'tformat:'" #, priority:260 msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:" msgstr "" +"Le format'tformat:' fonctionne exactement comme'format:', sauf qu'il fournit " +"une s챕mantique 짬혻terminator혻쨩 au lieu de 짬혻separator혻쨩. En d'autres termes, " +"chaque commit a le caract챔re de fin de message (habituellement une nouvelle " +"ligne) ajout챕, plut척t qu'un s챕parateur plac챕 entre les entr챕es. Cela " +"signifie que l'entr챕e finale d'un format 횪 une ligne se terminera " +"correctement par une nouvelle ligne, tout comme le format \"oneline\". Par " +"exemple :" #. type: delimited block - #: en/pretty-formats.txt:294 @@ -58301,6 +58371,12 @@ msgid "" "4da45be\n" "7134973 -- NO NEWLINE\n" msgstr "" +"$ git log -2 --pretty=format:%h 4da45bef \\\n" +" | perl -pe '$_ .= \" -- NO NEWLINE\\n" +"\" unless /\\n" +"/'\n" +"4da45be\n" +"7134973 -- NO NEWLINE\n" #. type: delimited block - #: en/pretty-formats.txt:299 @@ -58311,12 +58387,21 @@ msgid "" "4da45be\n" "7134973\n" msgstr "" +"$ git log -2 --pretty=tformat:%h 4da45bef \\\n" +" | perl -pe '$_ .= \" -- NO NEWLINE\\n" +"\" unless /\\n" +"/'\n" +"4da45be\n" +"7134973\n" #. type: Plain text #: en/pretty-formats.txt:304 #, priority:260 msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it. For example, these two are equivalent:" msgstr "" +"De plus, toute cha챤ne non reconnue qui contient un `%` est interpr챕t챕e comme " +"si elle avait `tformat:` devant elle. Par exemple, ces deux 챕l챕ments sont " +"챕quivalents :" #. type: delimited block - #: en/pretty-formats.txt:308 @@ -58325,24 +58410,33 @@ msgid "" "$ git log -2 --pretty=tformat:%h 4da45bef\n" "$ git log -2 --pretty=%h 4da45bef\n" msgstr "" +"$ git log -2 --pretty=tformat:%h 4da45bef\n" +"$ git log -2 --pretty=%h 4da45bef\n" #. type: Labeled list #: en/pretty-options.txt:1 #, no-wrap, priority:260 msgid "--pretty[=<format>]" -msgstr "" +msgstr "--pretty[=<format>]" #. type: Plain text #: en/pretty-options.txt:10 #, priority:260 msgid "Pretty-print the contents of the commit logs in a given format, where '<format>' can be one of 'oneline', 'short', 'medium', 'full', 'fuller', 'email', 'raw', 'format:<string>' and 'tformat:<string>'. When '<format>' is none of the above, and has '%placeholder' in it, it acts as if '--pretty=tformat:<format>' were given." msgstr "" +"Formater le contenu des journaux de commits dans un format donn챕, o첫 " +"'<format>' peut 챗tre au choix parmi 'oneline', 'short', 'medium', 'full', " +"'fuller', 'email', 'raw', 'format:<cha챤ne>' et 'tformat:<cha챤ne>'. Lorsque " +"'<format>' n'est rien de ce qui pr챕c챔de, et qu'il contient'%format', il agit " +"comme si '--pretty=tformat:<format>' 챕tait donn챕." #. type: Plain text #: en/pretty-options.txt:13 #, priority:260 msgid "See the \"PRETTY FORMATS\" section for some additional details for each format. When '=<format>' part is omitted, it defaults to 'medium'." msgstr "" +"Voir la section \"MISE EN FORME\" pour plus de d챕tails pour chaque format. " +"Lorsque la partie'=<format>' est omise, la valeur par d챕faut est'medium'." #. type: Plain text #: en/pretty-options.txt:16 @@ -58361,12 +58455,18 @@ msgstr "--abbrev-commit" #, priority:260 msgid "Instead of showing the full 40-byte hexadecimal commit object name, show only a partial prefix. Non default number of digits can be specified with \"--abbrev=<n>\" (which also modifies diff output, if it is displayed)." msgstr "" +"Au lieu d'afficher le nom complet hexad챕cimal de 40 octets de l'objet " +"commit, afficher seulement un pr챕fixe partiel. Le nombre de chiffres peut " +"챗tre sp챕cifi챕 avec \"--abbrev=<n>\". (qui modifie 챕galement la sortie diff, " +"si elle est affich챕e)." #. type: Plain text #: en/pretty-options.txt:25 #, priority:260 msgid "This should make \"--pretty=oneline\" a whole lot more readable for people using 80-column terminals." msgstr "" +"Cela devrait rendre \"--pretty=online\" beaucoup plus lisible pour les " +"personnes utilisant des terminaux 횪 80 colonnes." #. type: Labeled list #: en/pretty-options.txt:26 @@ -58379,24 +58479,37 @@ msgstr "--no-abbrev-commit" #, priority:260 msgid "Show the full 40-byte hexadecimal commit object name. This negates `--abbrev-commit` and those options which imply it such as \"--oneline\". It also overrides the `log.abbrevCommit` variable." msgstr "" +"Afficher le nom complet hexad챕cimal de 40 octets de l'objet commit. Ceci " +"annule `--abbrev-commit` et les options qui l'impliquent telles que \"--" +"online\". Elle remplace 챕galement la variable `log.abbrevCommit`." #. type: Plain text #: en/pretty-options.txt:34 #, priority:260 msgid "This is a shorthand for \"--pretty=oneline --abbrev-commit\" used together." msgstr "" +"C'est un raccourci pour \"--pretty=online --abbrev-commit\" utilis챕s " +"ensemble." #. type: Plain text #: en/pretty-options.txt:44 #, priority:260 msgid "The commit objects record the encoding used for the log message in their encoding header; this option can be used to tell the command to re-code the commit log message in the encoding preferred by the user. For non plumbing commands this defaults to UTF-8. Note that if an object claims to be encoded in `X` and we are outputting in `X`, we will output the object verbatim; this means that invalid sequences in the original commit may be copied to the output." msgstr "" +"Les objets commit enregistrent l'encodage utilis챕 pour le message de log " +"dans leur en-t챗te d'encodage ; cette option peut 챗tre utilis챕e pour indiquer " +"횪 la commande de recoder le message de log du commit dans l'encodage " +"pr챕f챕r챕 par l'utilisateur. Pour les commandes hors plomberie, cette valeur " +"par d챕faut est UTF-8. Notez que si un objet pr챕tend 챗tre encod챕 en `X` et " +"que nous sortons en `X`, nous allons sortir l'objet 횪 l'identique ; cela " +"signifie que les s챕quences invalides dans la livraison originale peuvent " +"챗tre copi챕es dans la sortie." #. type: Labeled list #: en/pretty-options.txt:45 -#, fuzzy, no-wrap, priority:260 +#, 260, no-wrap, priority msgid "--expand-tabs=<n>" -msgstr "--expand-tabs" +msgstr "--expand-tabs=<n>" #. type: Labeled list #: en/pretty-options.txt:46 @@ -58415,54 +58528,85 @@ msgstr "--no-expand-tabs" #, priority:260 msgid "Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is multiple of '<n>') in the log message before showing it in the output. `--expand-tabs` is a short-hand for `--expand-tabs=8`, and `--no-expand-tabs` is a short-hand for `--expand-tabs=0`, which disables tab expansion." msgstr "" +"Effectuer une extension de tabulation (remplacer chaque tabulation par " +"suffisamment d'espaces pour remplir jusqu'횪 la colonne d'affichage suivante " +"qui est multiple de'<n>') dans le message de journal avant de l'afficher " +"dans la sortie. `--expand-tabs` est un raccourci pour `--expand-tabs=8`, " +"et `--no-expand-tabs` est un raccourci pour `--expand-tabs=0`, qui d챕sactive " +"l'extension des tabulations." #. type: Plain text #: en/pretty-options.txt:58 #, priority:260 msgid "By default, tabs are expanded in pretty formats that indent the log message by 4 spaces (i.e. 'medium', which is the default, 'full', and 'fuller')." msgstr "" +"Par d챕faut, les tabulations sont d챕velopp챕es par les formatages qui " +"indentent le message de log par 4 espaces (c'est-횪-dire 'medium', qui est le " +"format par d챕faut, 'full', 'fuller')." #. type: Labeled list #: en/pretty-options.txt:60 #, no-wrap, priority:260 msgid "--notes[=<treeish>]" -msgstr "" +msgstr "--notes[=<arbre-esque>]" #. type: Plain text #: en/pretty-options.txt:66 #, priority:260 msgid "Show the notes (see linkgit:git-notes[1]) that annotate the commit, when showing the commit log message. This is the default for `git log`, `git show` and `git whatchanged` commands when there is no `--pretty`, `--format`, or `--oneline` option given on the command line." msgstr "" +"Afficher les notes (voir linkgit:git-notes[1]) qui annotent le commit, lors " +"de l'affichage du message du journal de commit. C'est la valeur par d챕faut " +"pour les commandes `git log`, `git show` et `git whatchanged` lorsqu'il n'y " +"a pas d'option `--pretty`, `--format` ou `--online` sur la ligne de commande." #. type: Plain text #: en/pretty-options.txt:70 #, priority:260 msgid "By default, the notes shown are from the notes refs listed in the `core.notesRef` and `notes.displayRef` variables (or corresponding environment overrides). See linkgit:git-config[1] for more details." msgstr "" +"Par d챕faut, les notes affich챕es proviennent des r챕f챕rences de notes list챕es " +"dans les variables `core.notesRef` et `notes.displayRef` (ou les " +"substitutions d'environnement correspondantes). Voir linkgit:git-config[1] " +"pour plus de d챕tails." #. type: Plain text #: en/pretty-options.txt:75 #, priority:260 msgid "With an optional '<treeish>' argument, use the treeish to find the notes to display. The treeish can specify the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref." msgstr "" +"Avec un argument optionnel'<arbre-esque>', utiliser l'arbre-esque pour " +"trouver les notes 횪 afficher. L'arbre-esque peut sp챕cifier le nom complet " +"du ref quand il commence par `refs/notes/` ; quand il commence par `notes/`, " +"`refs/` et sinon `refs/notes/` est pr챕fix챕 pour former un nom complet de la " +"r챕f챕rence." #. type: Plain text #: en/pretty-options.txt:80 #, priority:260 msgid "Multiple --notes options can be combined to control which notes are being displayed. Examples: \"--notes=foo\" will show only notes from \"refs/notes/foo\"; \"--notes=foo --notes\" will show both notes from \"refs/notes/foo\" and from the default notes ref(s)." msgstr "" +"Plusieurs options --notes peuvent 챗tre combin챕es pour contr척ler quelles " +"notes sont affich챕es. Exemples : \"--notes=foo\" affichera uniquement les " +"notes de \"refs/notes/foo\" ; \"--notes=foo --notes\" affichera les notes de " +"\"refs/notes/foo\" et des ref(s) de notes par d챕faut." #. type: Plain text #: en/pretty-options.txt:87 #, priority:260 msgid "Do not show notes. This negates the above `--notes` option, by resetting the list of notes refs from which notes are shown. Options are parsed in the order given on the command line, so e.g. \"--notes --notes=foo --no-notes --notes=bar\" will only show notes from \"refs/notes/bar\"." msgstr "" +"Ne pas afficher les notes. Ceci annule l'option `--notes` ci-dessus, en " +"r챕initialisant la liste des r챕f챕rences de notes 횪 partir desquelles les " +"notes sont affich챕es. Les options sont analys챕es dans l'ordre donn챕 sur la " +"ligne de commande, par exemple \"--notes --notes --notes=foo --no-notes " +"--notes=bar\" n'affichera que les notes \"refs/notes/bar\"." #. type: Labeled list #: en/pretty-options.txt:88 #, no-wrap, priority:260 msgid "--show-notes[=<treeish>]" -msgstr "" +msgstr "--show-notes[=<arbre-esque>]" #. type: Labeled list #: en/pretty-options.txt:89 @@ -58475,6 +58619,8 @@ msgstr "--[no-]standard-notes" #, priority:260 msgid "These options are deprecated. Use the above --notes/--no-notes options instead." msgstr "" +"Ces options sont obsol챔tes. Utilisez plut척t les options --notes/--no-notes " +"ci-dessus." #. type: Labeled list #: en/pretty-options.txt:94 @@ -58487,6 +58633,8 @@ msgstr "--show-signature" #, priority:260 msgid "Check the validity of a signed commit object by passing the signature to `gpg --verify` and show the output." msgstr "" +"V챕rifier la validit챕 d'un objet commit sign챕 en passant la signature 횪 `gpg " +"--verify' et afficher le r챕sultat." #. type: Plain text #: en/pull-fetch-param.txt:6