diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 61afcff512776ae4fb25b3e20704b7fcdaff4947..225b0922c7edb1cda71ceb160b7d0d97975c88eb 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -8,7 +8,7 @@ msgstr "" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" "POT-Creation-Date: 2020-10-09 18:58+0200\n" "PO-Revision-Date: 2020-10-10 11:21+0000\n" -"Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n" +"Last-Translator: Guillaume D챕murg챕 <gdemurge@gmail.com>\n" "Language-Team: Jean-No챘l Avila <jn.avila@free.fr>\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -31146,8 +31146,7 @@ msgstr "Ce drapeau fait que les commits de fusion montrent la diff챕rence compl #. type: Labeled list #: en/git-log.txt:158 -#, fuzzy, no-wrap, priority:260 -#| msgid "diffmerge" +#, no-wrap, priority:260 msgid "--diff-merges=off" msgstr "--diff-merges=off" @@ -31159,9 +31158,11 @@ msgstr "--no-diff-merges" #. type: Plain text #: en/git-log.txt:162 -#, priority:260 +#, fuzzy, priority:260 msgid "Disable output of diffs for merge commits (default). Useful to override `-m`, `-c`, or `--cc`." msgstr "" +"D챕sactive la sortie des diffs pour des commits de fusion (par d챕faut). Utile " +"pour passer outre `-m`, `-c`, ou `--cc`." #. type: Labeled list #: en/git-log.txt:170 @@ -47411,33 +47412,45 @@ msgstr "--group=<type>" #. type: Plain text #: en/git-shortlog.txt:53 -#, priority:260 +#, fuzzy, priority:260 msgid "Group commits based on `<type>`. If no `--group` option is specified, the default is `author`. `<type>` is one of:" msgstr "" +"Groupe les commits bas챕s sur `<type>`. Si aucune option `--group` n'est " +"sp챕cifi챕e, la valeur par d챕faut est `author`. `<type>` peut 챗tre :" #. type: Plain text #: en/git-shortlog.txt:56 #, priority:260 msgid "`author`, commits are grouped by author" -msgstr "" +msgstr "`author`, les commits sont group챕s par auteur" #. type: Plain text #: en/git-shortlog.txt:57 -#, priority:260 +#, fuzzy, priority:260 msgid "`committer`, commits are grouped by committer (the same as `-c`)" msgstr "" +"`committer`, les commits sont group챕s par committeur (챕quivalent 횪 `-c`)" #. type: Plain text #: en/git-shortlog.txt:62 -#, priority:260 +#, fuzzy, priority:260 msgid "`trailer:<field>`, the `<field>` is interpreted as a case-insensitive commit message trailer (see linkgit:git-interpret-trailers[1]). For example, if your project uses `Reviewed-by` trailers, you might want to see who has been reviewing with `git shortlog -ns --group=trailer:reviewed-by`." msgstr "" +"`trailer:<field>`, Le champ `<field>` est interpr챕t챕 comme un message de fin " +"de commit sans prise en compte de la case (voir linkgit:git-interpret-" +"trailers[1]). Par exemple, si votre projet utilise des fins de messages " +"`Reviewed-by`, vous voulez sans doute voir qui les a examin챕 avec `git " +"shortlog -ns --group=trailer:reviewed-by`." #. type: Plain text #: en/git-shortlog.txt:67 -#, priority:260 +#, fuzzy, priority:260 msgid "Note that commits that do not include the trailer will not be counted. Likewise, commits with multiple trailers (e.g., multiple signoffs) may be counted more than once (but only once per unique trailer value in that commit)." msgstr "" +"Notez que les commits qui n'incluent pas de fin de message ne seront pas " +"compt챕s. De la m챗me fa챌on, les commits avec plusieurs fins de message (" +"e.g., plusieurs approbations) peuvent 챗tre compt챕s plus d'une fois (mais " +"seulement une fois par valeur unique de fin de message sur ce commit)." #. type: Plain text #: en/git-shortlog.txt:72