Skip to content
Snippets Groups Projects
Unverified Commit 2d2deae3 authored by Guillaume Démurgé's avatar Guillaume Démurgé Committed by Hosted Weblate
Browse files

Translated using Weblate (French)

Currently translated at 46.2% (4824 of 10425 strings)

Translation: Git Manpages/Translations
Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/fr/


Signed-off-by: default avatarGuillaume Démurgé <gdemurge@gmail.com>
parent 6e77d22b
No related branches found
No related tags found
No related merge requests found
...@@ -7,8 +7,8 @@ msgstr "" ...@@ -7,8 +7,8 @@ msgstr ""
"Project-Id-Version: git documentation\n" "Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n" "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
"POT-Creation-Date: 2020-10-09 18:58+0200\n" "POT-Creation-Date: 2020-10-09 18:58+0200\n"
"PO-Revision-Date: 2020-10-06 19:26+0000\n" "PO-Revision-Date: 2020-10-10 08:58+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-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n" "Language: fr\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
...@@ -31112,15 +31112,25 @@ msgstr "INFORMATION DE VALIDATION" ...@@ -31112,15 +31112,25 @@ msgstr "INFORMATION DE VALIDATION"
   
#. type: Plain text #. type: Plain text
#: en/git-log.txt:122 #: 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." 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 "" 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 #. type: Plain text
#: en/git-log.txt:129 #: 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`)." 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 "" 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 #. type: Plain text
#: en/git-log.txt:136 #: en/git-log.txt:136
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment