From 2a3409ac8bcb3e53943560daa5a2b762e6edf564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr> Date: Mon, 1 Mar 2021 20:44:59 +0000 Subject: [PATCH] Translated using Weblate (French) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 49.2% (5223 of 10602 strings) Translation: Git Manpages/Translations Translate-URL: https://hosted.weblate.org/projects/git-manpages/translations/fr/ Signed-off-by: Jean-No챘l Avila <jn.avila@free.fr> --- po/documentation.fr.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/po/documentation.fr.po b/po/documentation.fr.po index 344e60a..0382113 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the Git package. # Jean-No챘l Avila <jn.avila@free.fr>, 2019. msgid "" -msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-02-27 18:16+0100\nPO-Revision-Date: 2021-02-28 15:18+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.5\n" +msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-02-27 18:16+0100\nPO-Revision-Date: 2021-03-02 12:11+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.5\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:738 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31 @@ -4027,10 +4027,9 @@ msgstr "--no-diff-merges:" #. type: Plain text #: en/diff-options.txt:47 -#, fuzzy, priority:280 -#| msgid "Disable output of diffs for merge commits (default). Useful to override `-m`, `-c`, or `--cc`." +#, priority:280 msgid "Disable output of diffs for merge commits. Useful to override implied value." -msgstr "D챕sactive la sortie des diffs pour des commits de fusion (par d챕faut). Utile pour passer outre `-m`, `-c`, ou `--cc`." +msgstr "D챕sactive la sortie des diffs pour des commits de fusion. Utile pour passer outre la valeur sous-entendue." #. type: Labeled list #: en/diff-options.txt:48 @@ -4094,10 +4093,9 @@ msgstr "-c:" #. type: Plain text #: en/diff-options.txt:69 -#, fuzzy, priority:280 -#| msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents." +#, priority:280 msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents. `-c` implies `-p`." -msgstr "Avec cette option, la sortie de diff pour un commit de fusion montre les diff챕rences de chacun des parents vers le r챕sultat de la fusion simultan챕ment au lieu de montrer une 횪 une les diff챕rences par paires entre un parent et le r챕sultat. De plus, il ne r챕pertorie que les fichiers qui ont 챕t챕 modifi챕s par tous les parents." +msgstr "Avec cette option, la sortie de diff pour un commit de fusion montre les diff챕rences de chacun des parents vers le r챕sultat de la fusion simultan챕ment au lieu de montrer une 횪 une les diff챕rences par paires entre un parent et le r챕sultat. De plus, il ne r챕pertorie que les fichiers qui ont 챕t챕 modifi챕s par tous les parents.`-c` implique `-p`." #. type: Labeled list #: en/diff-options.txt:70 -- GitLab