From f60b98b8999ff9fc80e365591f9a3b30ace61f90 Mon Sep 17 00:00:00 2001
From: Lilian <lilian.faedi@hotmail.fr>
Date: Mon, 2 May 2022 11:46:49 +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 3b7d8ac..8d3352d 100644
--- a/omegat/project_save.tmx
+++ b/omegat/project_save.tmx
@@ -73326,6 +73326,14 @@ des nombres négatifs à virgule flottante, comme dans @samp{- 1.0}.</seg>
         <seg>Tapez @kbd{c} pour commenter un fichier à partir du tampon de miniature.</seg>
       </tuv>
     </tu>
+    <tu>
+      <tuv lang="en">
+        <seg>You control the merging by typing special @dfn{merge commands} in the merge buffer (@pxref{Merge Commands}).</seg>
+      </tuv>
+      <tuv lang="fr" changeid="Lilian" changedate="20220502T094648Z" creationid="Lilian" creationdate="20220502T094348Z">
+        <seg>Vous contrôlez la fusion en tapant des @dfn{commandes de fusion} spéciales dans le tampon de fusion (@pxref{Commandes de fusion}).</seg>
+      </tuv>
+    </tu>
     <tu>
       <tuv lang="en">
         <seg>You could also compare files using @code{ediff-files}, see @ref{Major Entry Points,,, ediff, Ediff User's Manual}.</seg>