From 05b7bbfa462968c0bc0851a920f7e8b9b7741861 Mon Sep 17 00:00:00 2001
From: Lilian <lilian.faedi@hotmail.fr>
Date: Tue, 3 May 2022 13:44:53 +0200
Subject: [PATCH] Translated by Lilian

---
 omegat/project_save.tmx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/omegat/project_save.tmx b/omegat/project_save.tmx
index 39134cd..e754cbe 100644
--- a/omegat/project_save.tmx
+++ b/omegat/project_save.tmx
@@ -74334,6 +74334,14 @@ des nombres négatifs à virgule flottante, comme dans @samp{- 1.0}.</seg>
         <seg>Vous pouvez fournir à n'importe quelle commande Emacs un @dfn{argument numérique} (aussi appelé @dfn{argument préfixe}).</seg>
       </tuv>
     </tu>
+    <tu>
+      <tuv lang="en">
+        <seg>You can have any number of merges going at once---just don't use any one buffer as input to more than one merge at once, since the temporary changes made in these buffers would get in each other's way.</seg>
+      </tuv>
+      <tuv lang="fr" changeid="Lilian" changedate="20220503T114452Z" creationid="Lilian" creationdate="20220503T114452Z">
+        <seg>Vous pouvez lancer n'importe quel nombre de fusions - n'utilisez juste pas un tampon comme entrée pour plus d'une fusion à la fois, puisque les modifications temporaires réalisées dans ces tampons entreraient en conflit avec chaque.</seg>
+      </tuv>
+    </tu>
     <tu>
       <tuv lang="en">
         <seg>You can have either a single list shared between all buffers (the default) or a separate list for each buffer, by customizing the user option @code{goto-line-history-local}.</seg>