docs(#6026): Try to locally resolve conflict

02680825 · Arnaud Pauget · 4c76e6f9 · 02680825
Verified Commit 02680825 authored Jun 18, 2019 by Arnaud Pauget
--- a/src/presentation/maarchRM/Resources/locale/fr/recordsManagement/messages.po
+++ b/src/presentation/maarchRM/Resources/locale/fr/recordsManagement/messages.po
@@ -1071,6 +1071,9 @@ msgstr "Voulez-vous vraiment supprimer cette ressource ?"
 msgid "This action will be irreversible."
 msgstr "Cette action sera irréversible."

+msgid "Modification request sent"
+msgstr "Demande de modification envoyée"
+
 msgid "Click to add '%1$s'"
 msgstr "Cliquer pour ajouter '%1$s'"