From 4c8323abd87e673259ed0fce9447806955814aa3 Mon Sep 17 00:00:00 2001
From: Lilian <lilian.faedi@hotmail.fr>
Date: Tue, 3 May 2022 11:45:47 +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 bf8c559..91e56a4 100644
--- a/omegat/project_save.tmx
+++ b/omegat/project_save.tmx
@@ -67432,6 +67432,14 @@ si nous continuons,</seg>
         <seg>Ainsi, deux commandes @kbd{C-k} sans argument peuvent couper une ligne non vide, exactement comme @kbd{C-k} avec un argument de 1.</seg>
       </tuv>
     </tu>
+    <tu>
+      <tuv lang="en">
+        <seg>Thus, where the A buffer agrees with the common ancestor, the B version is preferred, because chances are it is the one that was actually changed.</seg>
+      </tuv>
+      <tuv lang="fr" changeid="Lilian" changedate="20220503T094547Z" creationid="Lilian" creationdate="20220503T094547Z">
+        <seg>Donc, lorsque le tampon A est en accord avec l'ancêtre commun, la version B est préférée car il est probable que celle-ci ait été en réalité modifiée.</seg>
+      </tuv>
+    </tu>
     <tu>
       <tuv lang="en">
         <seg>Thus, while moving sequentially, you can effectively make the A version the default for some sections of the merge buffer and the B version the default for others by using @kbd{d a} and @kbd{d b} between sections.</seg>