From 7127c00ff2a1e1db5488cb00021520117754b62e Mon Sep 17 00:00:00 2001
From: Lilian <lilian.faedi@hotmail.fr>
Date: Mon, 2 May 2022 12:01:23 +0200
Subject: [PATCH] Translated by Lilian

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

diff --git a/omegat/project_save.tmx b/omegat/project_save.tmx
index daa6d80..098b5f5 100644
--- a/omegat/project_save.tmx
+++ b/omegat/project_save.tmx
@@ -36322,6 +36322,14 @@ optionnellement.</seg>
         <seg>Si on divise 100 par 50, on peut écrire :</seg>
       </tuv>
     </tu>
+    <tu>
+      <tuv lang="en">
+        <seg>If you abort Emerge with @kbd{C-]}, the Emerge command does not save the output buffer, but you can save it yourself if you wish.</seg>
+      </tuv>
+      <tuv lang="fr" changeid="Lilian" changedate="20220502T100013Z" creationid="Lilian" creationdate="20220502T100013Z">
+        <seg>Si vous quittez Emerge avec @kbd{C-]}, la commande Emerge n'enregistre pas le tampon de sortie, mais vous pouvez le faire vous-même si vous le souhaitez.</seg>
+      </tuv>
+    </tu>
     <tu>
       <tuv lang="en">
         <seg>If you actually want the text of the abbrev in the buffer, rather than its expansion, you can accomplish this by inserting the following punctuation with @kbd{C-q}.</seg>
@@ -72234,6 +72242,14 @@ des nombres négatifs à virgule flottante, comme dans @samp{- 1.0}.</seg>
         <seg>Vous pouvez passer à un autre projet avec la commande @kbd{M-x timeclock-change}.</seg>
       </tuv>
     </tu>
+    <tu>
+      <tuv lang="en">
+        <seg>You can choose between two modes for giving merge commands: Fast mode and Edit mode.</seg>
+      </tuv>
+      <tuv lang="fr" changeid="Lilian" changedate="20220502T100123Z" creationid="Lilian" creationdate="20220502T100052Z">
+        <seg>Il est possible de choisir entre deux modes pour donner des commandes de fusion : le mode « rapide » et le mode « modifications ».</seg>
+      </tuv>
+    </tu>
     <tu>
       <tuv lang="en">
         <seg>You can choose from several different styles for constructing unique buffer names, by customizing the option @code{uniquify-buffer-name-style}.</seg>