diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 10b8f90fef5a5ae7e3c85f2fa5dff116336e1c07..249294a4372f392688cc098dc0fa793f1631f249 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: git documentation\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n" "POT-Creation-Date: 2020-10-09 18:58+0200\n" -"PO-Revision-Date: 2020-10-06 19:26+0000\n" -"Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n" +"PO-Revision-Date: 2020-10-10 08:58+0000\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" @@ -31112,15 +31112,25 @@ msgstr "INFORMATION DE VALIDATION" #. type: Plain text #: en/git-log.txt:122 -#, priority:260 +#, fuzzy, priority:260 msgid "By default, `git log` does not generate any diff output. The options below can be used to show the changes made by each commit." msgstr "" +"Par d챕faut, `git log` ne g챕n챔re aucune sortie de diff. Les options ci-" +"dessous peuvent 챗tre utilis챕es pour afficher les modifications faites par " +"chaque commit." #. type: Plain text #: en/git-log.txt:129 -#, priority:260 +#, fuzzy, priority:260 msgid "Note that unless one of `-c`, `--cc`, or `-m` is given, merge commits will never show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which merges are treated like normal single-parent commits (this can be overridden by providing a combined-diff option or with `--no-diff-merges`)." msgstr "" +"Notez que sauf si une des options `-c`, `--cc`, ou `-m` est donn챕e, les " +"commits de fusion ne vont pas afficher de diff, m챗me si un format de diff " +"tel que `--patch` est s챕lectionn챕, et ils ne correspondront pas aux options " +"telles que `-S`. L'exception sera l'utilisation de `--first-parent`, pour " +"laquelle les fusions sont trait챕s comme des commits normaux 횪 un seul parent " +"(ceci peut 챗tre modifi챕 en donnant une option de diff combin챕 ou avec `--no-" +"diff-merges`)." #. type: Plain text #: en/git-log.txt:136