From 9b4f78658658727b9a18b0c126d48cb78b5e1f4a Mon Sep 17 00:00:00 2001
From: Lilian <Lilian@DESKTOP-VD31EEE.home>
Date: Mon, 4 Apr 2022 13:02:18 +0200
Subject: [PATCH] =?UTF-8?q?Translated=20by=20Lilian=20Ajout=C3=A9s=C2=A0:?=
 =?UTF-8?q?=202,=20Supprim=C3=A9s=C2=A0:=200,=20Modifi=C3=A9s=C2=A0:=201?=
 =?UTF-8?q?=20(Conflits=C2=A0:=200)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 omegat/project_save.tmx | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/omegat/project_save.tmx b/omegat/project_save.tmx
index ad317f9..4948f95 100644
--- a/omegat/project_save.tmx
+++ b/omegat/project_save.tmx
@@ -6403,6 +6403,14 @@ Debugger entered--Lisp error: (void-variable +)</seg>
         <seg>.@: @r{(Point)}</seg>
       </tuv>
     </tu>
+    <tu>
+      <tuv lang="en">
+        <seg>.emacs file</seg>
+      </tuv>
+      <tuv lang="fr" changeid="Lilian" changedate="20220404T110217Z" creationid="Lilian" creationdate="20220404T110217Z">
+        <seg>.emacs file</seg>
+      </tuv>
+    </tu>
     <tu>
       <tuv lang="en">
         <seg>/</seg>
@@ -59645,8 +59653,8 @@ des nombres négatifs à virgule flottante, comme dans @samp{- 1.0}.</seg>
       <tuv lang="en">
         <seg>You can make a command disabled either by editing the initialization file directly, or with the command @kbd{M-x disable-command}, which edits the initialization file for you.</seg>
       </tuv>
-      <tuv lang="fr" changeid="Lilian" changedate="20220404T090039Z" creationid="Lilian" creationdate="20220404T090039Z">
-        <seg>Vous pouvez désactiver une commande soit en modifiant directement le fichier d'initialisation, ou avec la commande @kbd{M-x disable-command}, ce qui le modifie pour vous.</seg>
+      <tuv lang="fr" changeid="Lilian" changedate="20220404T105536Z" creationid="Lilian" creationdate="20220404T090039Z">
+        <seg>Vous pouvez désactiver une commande soit en modifiant directement le fichier d'initialisation, soit avec la commande @kbd{M-x disable-command}, ce qui le modifie pour vous.</seg>
       </tuv>
     </tu>
     <tu>
@@ -70178,6 +70186,14 @@ plus tard.</seg>
         <seg>inhibit-startup-message</seg>
       </tuv>
     </tu>
+    <tu>
+      <tuv lang="en">
+        <seg>init file</seg>
+      </tuv>
+      <tuv lang="fr" changeid="Lilian" changedate="20220404T105508Z" creationid="Lilian" creationdate="20220404T105508Z">
+        <seg>fichier d'initialisation</seg>
+      </tuv>
+    </tu>
     <tu>
       <tuv lang="en">
         <seg>init file, not loading</seg>