l10n: fr v2.42.0 rnd 2

Signed-off-by: Jean-Noël Avila <[email protected]>
jnavila · Aug 16, 2023 · 87afb88 · 87afb88
1 parent f846e08
commit 87afb88
Showing 1 changed file with 8 additions and 5 deletions.
diff --git 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 <[email protected]>\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 <[email protected]>\n"
 "Language-Team: Jean-Noël Avila <[email protected]>\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 <file>'\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."