From c03950c0fa820b67bc98da6457603ee317bc0fce Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 2 Mar 2012 08:14:58 +0000
Subject: [PATCH] Label "MAX" for mixers source changed to "HALF". Idea pulled
 from er9x.

---
 src/myeeprom.h        |  2 +-
 src/open9x.cpp        |  4 ++--
 src/translations/en.h |  4 ++--
 src/translations/fr.h | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/myeeprom.h b/src/myeeprom.h
index 2673a95a4..50133c840 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -145,7 +145,7 @@ PACK(typedef struct t_LimitData {
 #define MIX_P1    5
 #define MIX_P2    6
 #define MIX_P3    7
-#define MIX_MAX   8
+#define MIX_HALF  8
 #define MIX_FULL  9
 #define MIX_CYC1  10
 #define MIX_CYC2  11
diff --git a/src/open9x.cpp b/src/open9x.cpp
index efe171439..f268aacf5 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -1122,7 +1122,7 @@ void perOut(int16_t *chanOut, uint8_t phase)
   if(((bpanaCenter ^ anaCenter) & anaCenter)) AUDIO_POT_STICK_MIDDLE();
   bpanaCenter = anaCenter;
 
-  anas[MIX_MAX-1]  = RESX;     // MAX
+  anas[MIX_HALF-1] = RESX;     // HALF
   anas[MIX_FULL-1] = RESX;     // FULL
 
 #ifdef HELI
@@ -1228,7 +1228,7 @@ void perOut(int16_t *chanOut, uint8_t phase)
     if (!getSwitch(md->swtch,1)) { // switch on?  if no switch selected => on
       swTog = swOn[i];
       swOn[i] = false;
-      if(md->srcRaw!=MIX_MAX && md->srcRaw!=MIX_FULL) continue;// if not MAX or FULL - next loop
+      if(md->srcRaw!=MIX_HALF && md->srcRaw!=MIX_FULL) continue;// if not MAX or FULL - next loop
       if(md->mltpx==MLTPX_REP) continue; // if switch is off and REPLACE then off
       v = (md->srcRaw == MIX_FULL ? -RESX : 0); // switch is off and it is either MAX=0 or FULL=-512
     }
diff --git a/src/translations/en.h b/src/translations/en.h
index 579b362e8..c96841806 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -120,7 +120,7 @@
 #define TR_VSWITCHES     "THR""RUD""ELE""ID0""ID1""ID2""AIL""GEA""TRN""SW1""SW2""SW3""SW4""SW5""SW6""SW7""SW8""SW9""SWA""SWB""SWC"
 
 #define LEN_VSRCRAW      "\004"
-#define TR_VSRCRAW       "RUD ""ELE ""THR ""AIL ""P1  ""P2  ""P3  ""MAX ""FULL""CYC1""CYC2""CYC3"
+#define TR_VSRCRAW       "RUD ""ELE ""THR ""AIL ""P1  ""P2  ""P3  ""HALF""FULL""CYC1""CYC2""CYC3"
 
 #define LEN_VTMRMODES    "\003"
 #define TR_VTMRMODES     "OFF""ABS""THs""TH%""THt"
@@ -215,7 +215,7 @@
 #define TR_HAPTICMODE   "Haptic Mode"
 #define TR_HAPTICSTRENGTH "Haptic Strength"
 #define TR_CONTRAST     "Contrast"
-#define TR_BATTERYWARNING "Battery warning"
+#define TR_BATTERYWARNING "Battery Warning"
 #define TR_INACTIVITYALARM "Inactivity alarm"
 #define TR_FILTERADC    "Filter ADC"
 #define TR_THROTTLEREVERSE "Throttle reverse"
diff --git a/src/translations/fr.h b/src/translations/fr.h
index b0d0b3f35..ca01b7443 100644
--- a/src/translations/fr.h
+++ b/src/translations/fr.h
@@ -120,7 +120,7 @@
 #define TR_VSWITCHES     "GAZ""DIR""PRF""ID0""ID1""ID2""AIL""GEA""TRN""SW1""SW2""SW3""SW4""SW5""SW6""SW7""SW8""SW9""SWA""SWB""SWC"
 
 #define LEN_VSRCRAW      "\004"
-#define TR_VSRCRAW       "DIR ""PRF ""GAZ ""AIL ""P1  ""P2  ""P3  ""MAX ""FULL""CYC1""CYC2""CYC3"
+#define TR_VSRCRAW       "DIR ""PRF ""GAZ ""AIL ""P1  ""P2  ""P3  ""DEMI""TOUT""CYC1""CYC2""CYC3"
 
 #define LEN_VTMRMODES    "\003"
 #define TR_VTMRMODES     "OFF""ABS""GZs""GZ%""GZt"
@@ -140,7 +140,7 @@
 #define TR_DSM2MODE      "LP4/LP5DSMonlyDSMX   "
 
 // ZERO TERMINATED STRINGS
-#define TR_POPUPS       "[MENU]\004[EXIT]"
+#define TR_POPUPS       "[MENU]\004[QUIT]"
 #define OFS_EXIT        7
 #define TR_MENUWHENDONE "[MENU]Quand PRET"
 #define TR_FREE         "libre"
@@ -201,7 +201,7 @@
 #define TR_ALARM        "Alarme"
 #define TR_USRDATA      "UsrData"
 #define TR_BLADES       "Blades"
-#define TR_BARS         "Bars"
+#define TR_BARS         "Gauges"
 #define TR_CLEARMIXMENU "EFFACER MIXAGES[MENU]"
 #ifdef AUDIO
 #define TR_BEEPERMODE   "Speaker Mode"
@@ -212,10 +212,10 @@
 #define TR_BEEPERLEN    "Beeper Length"
 #endif
 #define TR_HAPTICMODE   "Mode Vibreur"
-#define TR_HAPTICSTRENGTH "Haptic Strength"
+#define TR_HAPTICSTRENGTH "Force Vibreur"
 #define TR_CONTRAST     "Contraste"
 #define TR_BATTERYWARNING "Alarme Batterie"
-#define TR_INACTIVITYALARM "Alarme inactivite"
+#define TR_INACTIVITYALARM "Alarme Inactivite"
 #define TR_FILTERADC    "Filtre ADC"
 #define TR_THROTTLEREVERSE "Inversion Gaz"
 #define TR_MINUTEBEEP   "Bip t.minutes"