From 697f1a94116e4fe6effb325e96507cbe70fe0b19 Mon Sep 17 00:00:00 2001
From: Lilian <lilian.faedi@hotmail.fr>
Date: Tue, 17 May 2022 16:00:17 +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 b24f9308..f229461d 100644
--- a/omegat/project_save.tmx
+++ b/omegat/project_save.tmx
@@ -13378,6 +13378,14 @@ plus.</seg>
         <seg>@xref{Serveur Emacs}.</seg>
       </tuv>
     </tu>
+    <tu>
+      <tuv lang="en">
+        <seg>@xref{Emerge,,, emacs-xtra, Specialized Emacs Features},</seg>
+      </tuv>
+      <tuv lang="fr" changeid="Lilian" changedate="20220517T140016Z" creationid="Lilian" creationdate="20220517T140016Z">
+        <seg>@xref{Emerge,,, emacs-xtra, Caractéristiques spécialisées d'Emacs},</seg>
+      </tuv>
+    </tu>
     <tu>
       <tuv lang="en">
         <seg>@xref{Equality Predicates}.</seg>
@@ -59031,6 +59039,14 @@ machine.</seg>
         <seg>Mode « Smerge »</seg>
       </tuv>
     </tu>
+    <tu>
+      <tuv lang="en">
+        <seg>Smerge mode provides commands to resolve conflicts by selecting specific changes.</seg>
+      </tuv>
+      <tuv lang="fr" changeid="Lilian" changedate="20220517T140002Z" creationid="Lilian" creationdate="20220517T140002Z">
+        <seg>Le mode « Smerge » fournit des commandes pour résoudre des conflits en sélectionnant des changements spécifiques.</seg>
+      </tuv>
+    </tu>
     <tu>
       <tuv lang="en">
         <seg>So @code{(mode .</seg>