From 3662fb030a3b002106ee4a26224e7f77f541f95a Mon Sep 17 00:00:00 2001
From: Herculino Trotta <netotrotta@gmail.com>
Date: Sun, 27 Apr 2025 16:48:38 -0300
Subject: [PATCH] merge conflit

---
 app/locale/fr/LC_MESSAGES/django.po | 37 +++++++++++++----------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/app/locale/fr/LC_MESSAGES/django.po b/app/locale/fr/LC_MESSAGES/django.po
index b6c8d49..bfa5d23 100644
--- a/app/locale/fr/LC_MESSAGES/django.po
+++ b/app/locale/fr/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2025-04-27 19:12+0000\n"
-"PO-Revision-Date: 2025-04-23 09:16+0000\n"
-"Last-Translator: H4ndrew <arun.s.ezhilarasan@gmail.com>\n"
+"PO-Revision-Date: 2025-04-27 19:12+0000\n"
+"Last-Translator: ThomasE <thomas-evano@hotmail.fr>\n"
 "Language-Team: French <https://translations.herculino.com/projects/wygiwyh/"
 "app/fr/>\n"
 "Language: fr\n"
@@ -1525,50 +1525,45 @@ msgstr[0] "%(count)s transaction marquée comme non payée"
 msgstr[1] "%(count)s transactions marquées comme non payées"
 
 #: apps/transactions/views/actions.py:72
-#, fuzzy, python-format
+#, python-format
 msgid "%(count)s transaction deleted successfully"
 msgid_plural "%(count)s transactions deleted successfully"
-msgstr[0] "%(count)s transaction deleted successfully"
-msgstr[1] "%(count)s transactions deleted successfully"
+msgstr[0] "%(count)s transaction supprimée avec succès"
+msgstr[1] "%(count)s transactions supprimées avec succès"
 
 #: apps/transactions/views/actions.py:96
-#, fuzzy, python-format
+#, python-format
 msgid "%(count)s transaction restored successfully"
 msgid_plural "%(count)s transactions restored successfully"
-msgstr[0] "%(count)s transaction restored successfully"
-msgstr[1] "%(count)s transactions restored successfully"
+msgstr[0] "%(count)s transaction restaurée avec succès"
+msgstr[1] "%(count)s transactions restaurées avec succès"
 
 #: apps/transactions/views/actions.py:131
-#, fuzzy, python-format
+#, python-format
 msgid "%(count)s transaction duplicated successfully"
 msgid_plural "%(count)s transactions duplicated successfully"
-msgstr[0] "%(count)s transaction duplicated successfully"
-msgstr[1] "%(count)s transactions duplicated successfully"
+msgstr[0] "%(count)s transaction dupliquée avec succès"
+msgstr[1] "%(count)s transactions dupliquées avec succès"
 
 #: apps/transactions/views/categories.py:66
-#, fuzzy
 msgid "Category added successfully"
-msgstr "Category added successfully"
+msgstr "Catégorie ajoutée avec succès"
 
 #: apps/transactions/views/categories.py:104
-#, fuzzy
 msgid "Category updated successfully"
-msgstr "Category updated successfully"
+msgstr "La catégorie a été mise à jour avec succès"
 
 #: apps/transactions/views/categories.py:171
-#, fuzzy
 msgid "Category deleted successfully"
-msgstr "Category deleted successfully"
+msgstr "Catégorie supprimée avec succès"
 
 #: apps/transactions/views/entities.py:66
-#, fuzzy
 msgid "Entity added successfully"
-msgstr "Entity added successfully"
+msgstr "Entité ajoutée avec succès"
 
 #: apps/transactions/views/entities.py:104
-#, fuzzy
 msgid "Entity updated successfully"
-msgstr "Entity updated successfully"
+msgstr "Entité mise à jour avec succès"
 
 #: apps/transactions/views/entities.py:133
 #, fuzzy