From 1a7bb8e96692de3b916dda55264a1ec8da60727e Mon Sep 17 00:00:00 2001
From: "bernet.andre@gmail.com"
 <bernet.andre@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Mon, 1 Apr 2013 19:19:09 +0000
Subject: [PATCH] [Taranis] Overlap French translations

---
 src/menu_model.cpp    | 6 +++---
 src/translations/fr.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/menu_model.cpp b/src/menu_model.cpp
index 9d9e2dd3d..ac8b9aa66 100644
--- a/src/menu_model.cpp
+++ b/src/menu_model.cpp
@@ -3211,9 +3211,9 @@ enum CustomSwitchFields {
 
 #if LCD_W >= 212
   #define CSW_1ST_COLUMN  (4*FW-3)
-  #define CSW_2ND_COLUMN  (10*FW+1)
-  #define CSW_3RD_COLUMN  (18*FW+2)
-  #define CSW_4TH_COLUMN  (20*FW+1)
+  #define CSW_2ND_COLUMN  (8*FW+1)
+  #define CSW_3RD_COLUMN  (16*FW+2)
+  #define CSW_4TH_COLUMN  (21*FW+1)
   #define CSW_5TH_COLUMN  (26*FW+1)
   #define CSW_6TH_COLUMN  (31*FW+1)
 #else
diff --git a/src/translations/fr.h b/src/translations/fr.h
index e311000a2..5e2cfd227 100644
--- a/src/translations/fr.h
+++ b/src/translations/fr.h
@@ -135,8 +135,8 @@
 #define LEN_VMIXTRIMS    "\003"
 #define TR_VMIXTRIMS     "OFF""ON\0""Dir""Prf""Gaz""Ail"
 
-#define LEN_VCSWFUNC     "\006"
-#define TR_VCSWFUNC      "---\0  ""v1==x\0""v1>x\0 ""v1<x\0 ""|v1|>x""|v1|<x""ET\0   ""OU\0   ""OU Exc""v1==v2""v1>v2\0""v1<v2\0""d>=x\0 ""|d|>=x"
+#define LEN_VCSWFUNC     "\005"
+#define TR_VCSWFUNC      "---\0 ""a{x\0 ""a>x\0 ""a<x\0 ""|a|>x""|a|<x""AND\0 ""OR\0  ""XOR\0 ""a=b\0 ""a>b\0 ""a<b\0 ""d}x\0 ""|d|}x"
 
 #define LEN_VFSWFUNC     "\015"