merge conflit

This commit is contained in:
Herculino Trotta
2025-04-27 16:48:38 -03:00
parent 72eb59d24f
commit 3662fb030a

View File

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