From 87afb88801a89267e5cfe36c9f3923279dfc464b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Date: Wed, 16 Aug 2023 11:50:23 +0200 Subject: [PATCH] l10n: fr v2.42.0 rnd 2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-Noël Avila --- po/fr.po | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index 4c048404d44379..68a4d45fd8f6a7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -78,8 +78,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-08-05 19:16+0200\n" -"PO-Revision-Date: 2023-08-06 09:56+0200\n" +"POT-Creation-Date: 2023-08-16 11:48+0200\n" +"PO-Revision-Date: 2023-08-16 11:49+0200\n" "Last-Translator: Cédric Malard \n" "Language-Team: Jean-Noël Avila \n" "Language: fr\n" @@ -716,9 +716,8 @@ msgstr "Impossible de tirer car vous avez des fichiers non fusionnés." msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés." -#, c-format -msgid "It is not possible to %s because you have unmerged files." -msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés." +msgid "Rebasing is not possible because you have unmerged files." +msgstr "Impossible de rebaser, car vous avez des fichiers non fusionnés." msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" @@ -23037,6 +23036,10 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " +#, c-format +#~ msgid "It is not possible to %s because you have unmerged files." +#~ msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés." + #~ msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" #~ msgstr "" #~ "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am."