From: Vasco Almeida <redacted>
Date: Tue, 15 Mar 2016 00:34:22 +0000 (-0100)
Subject: l10n: fr: don't translate "merge" as a parameter
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=bb310722467d0adda499cb70429d86fbaa755dac;p=git.git

l10n: fr: don't translate "merge" as a parameter

At builtin/checkout.c:1154, merge is a parameter to --conflict=<style>
(git checkout --conflict=merge).

Signed-off-by: Vasco Almeida <redacted>
---

diff --git a/po/fr.po b/po/fr.po
index 868514e924..55ca387ba4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4545,7 +4545,7 @@ msgstr "style"
 
 #: builtin/checkout.c:1154
 msgid "conflict style (merge or diff3)"
-msgstr "style de conflit (fusion ou diff3)"
+msgstr "style de conflit (merge (fusion) ou diff3)"
 
 #: builtin/checkout.c:1157
 msgid "do not limit pathspecs to sparse entries only"