From d1e76d5ddcacdfc76bc247e7594e3fbaaa5ea9cc Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Sun, 26 Jun 2022 22:17:24 -0600 Subject: [PATCH] l10n: fr: don't say that merge is "the default strategy" The text of this message was changed in commit 71076d0edde43a7672a9a0f555753ff078602a64 to avoid making any suggestion about which strategy is better for the situation at hand. Update the Franch translation to match. Signed-off-by: Alex Henrie --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 9296b85329..8d92bf65a2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9600,7 +9600,7 @@ msgstr "" "les réconcilier. Vous pouvez le faire en lançant une des\n" "commandes suivantes avant votre prochain tirage :\n" "\n" -" git config pull.rebase false # fusion (stratégie par défaut)\n" +" git config pull.rebase false # fusion\n" " git config pull.rebase true # rebasage\n" " git config pull.ff only # avance rapide seulement\n" "\n"