rebase fusionning

jamulussoftware · Jul 6, 2022 · 4be25ef · 4be25ef
2 parents a275d35 + 545fa83
commit 4be25ef
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/translation/translation_fr_FR.ts b/src/translation/translation_fr_FR.ts
@@ -3632,11 +3632,15 @@ Nous avons coupé votre canal et activé &quot;Me silencer&quot;. Veuillez d&apo
     </message>
     <message>
         <source>Directory Server full</source>
+<<<<<<< HEAD
 <<<<<<< HEAD
         <translation type="vanished">Serveur annuaire plein</translation>
 =======
         <translation>Annuaire plein</translation>
 >>>>>>> 545fa83c (Replace serveur annuaire by annuaire)
+=======
+        <translation>Annuaire plein</translation>
+>>>>>>> 545fa83cd34cbf33555319395a957ba88563e202
     </message>
     <message>
         <location filename="../util.h" line="651"/>