From fc18519543b115fd91f67e79cdf26069b487c690 Mon Sep 17 00:00:00 2001
From: Lilian <lilian.faedi@hotmail.fr>
Date: Mon, 2 May 2022 11:15:42 +0200
Subject: [PATCH] Translated by Lilian

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

diff --git a/omegat/project_save.tmx b/omegat/project_save.tmx
index bda4707..4360fea 100644
--- a/omegat/project_save.tmx
+++ b/omegat/project_save.tmx
@@ -28112,6 +28112,14 @@ chaque passe d'Emacs !</seg>
         <seg>Emacs : (emacs)</seg>
       </tuv>
     </tu>
+    <tu>
+      <tuv lang="en">
+        <seg>Emerge</seg>
+      </tuv>
+      <tuv lang="fr" changeid="Lilian" changedate="20220502T091035Z" creationid="Lilian" creationdate="20220502T091035Z">
+        <seg>Emerge</seg>
+      </tuv>
+    </tu>
     <tu>
       <tuv lang="en">
         <seg>Enable Flyspell mode, which highlights all misspelled words.</seg>
@@ -40083,6 +40091,14 @@ autrement.</seg>
         <seg>C'est juste une copie de l'entrée du le presse-papiers, vous pouvez donc l'éditer dans le tampon sans modifier le contenu du presse-papiers.</seg>
       </tuv>
     </tu>
+    <tu>
+      <tuv lang="en">
+        <seg>It's not unusual for programmers to get their signals crossed and modify the same program in two different directions.</seg>
+      </tuv>
+      <tuv lang="fr" changeid="Lilian" changedate="20220502T091540Z" creationid="Lilian" creationdate="20220502T091540Z">
+        <seg>Il n'est pas rare pour des programmeurs d'avoir un malentendu en modifiant le même programme de deux façons différentes.</seg>
+      </tuv>
+    </tu>
     <tu>
       <tuv lang="en">
         <seg>Iteration</seg>
@@ -89348,6 +89364,14 @@ April 15, 2016 Income tax due.</seg>
         <seg>menu-bar</seg>
       </tuv>
     </tu>
+    <tu>
+      <tuv lang="en">
+        <seg>merging files</seg>
+      </tuv>
+      <tuv lang="fr" changeid="Lilian" changedate="20220502T091126Z" creationid="Lilian" creationdate="20220502T091126Z">
+        <seg>fusionner des fichiers </seg>
+      </tuv>
+    </tu>
     <tu>
       <tuv lang="en">
         <seg>message</seg>