tts.py - milliamp-hours corrected

Mixer menu- separated label for DR/Expo added
DE,SE -2nd collumn shifted in Mixer layout

src/model_menus.cpp

@@ -833,10 +833,10 @@ void menuProcModel(uint8_t event)
 
 static uint8_t s_currIdx;
 
-#if defined(TRANSLATIONS_FR) || defined(TRANSLATIONS_CZ)
+#if defined(TRANSLATIONS_FR) || defined(TRANSLATIONS_CZ) || defined(TRANSLATIONS_SE) || defined(TRANSLATIONS_DE)
 #define MIXES_2ND_COLUMN    (13*FW)
 #else
-#define MIXES_2ND_COLUMN    (9*FW)
+#define MIXES_2ND_COLUMN    (10*FW)
 #endif
 
 #define EXPO_ONE_2ND_COLUMN (7*FW+2)
@@ -1667,9 +1667,10 @@ void menuProcMixOne(uint8_t event)
         uint8_t not_stick = (md2->srcRaw > NUM_STICKS);
         int8_t carryTrim = -md2->carryTrim;
         lcd_putsLeft(y, STR_TRIM);
-        lcd_putsiAtt(MIXES_2ND_COLUMN, y, STR_VMIXTRIMS, (not_stick && carryTrim == 0) ? 0 : carryTrim+1, m_posHorz==0 ? attr : 0);
+        lcd_putsiAtt((not_stick ? MIXES_2ND_COLUMN : MIXES_2ND_COLUMN-5*FW), y, STR_VMIXTRIMS, (not_stick && carryTrim == 0) ? 0 : carryTrim+1, m_posHorz==0 ? attr : 0);
         if (attr && m_posHorz==0 && (not_stick || s_editMode>0)) md2->carryTrim = -checkIncDecModel(event, carryTrim, not_stick ? TRIM_ON : -TRIM_OFF, -TRIM_AIL);
         if (!not_stick) {
+          lcd_puts(MIXES_2ND_COLUMN, y, STR_DREX);
           menu_lcd_onoff(MIXES_2ND_COLUMN+5*FW, y, !md2->noExpo, m_posHorz==1 ? attr : 0);
           if (attr && m_posHorz==1 && s_editMode>0) md2->noExpo = !checkIncDecModel(event, !md2->noExpo, 0, 1);
         }

src/translations.cpp

@@ -137,6 +137,7 @@ const pm_char STR_SIDE[] PROGMEM = TR_SIDE;
 const pm_char STR_DIFFERENTIAL[] PROGMEM = TR_DIFFERENTIAL;
 const pm_char STR_OFFSET[] PROGMEM = TR_OFFSET;
 const pm_char STR_TRIM[] PROGMEM = TR_TRIM;
+const pm_char STR_DREX[] PROGMEM = TR_DREX;
 const pm_char STR_CURVE[] PROGMEM = TR_CURVE;
 const pm_char STR_FPHASE[] PROGMEM = TR_FPHASE;
 const pm_char STR_MIXWARNING[] PROGMEM = TR_MIXWARNING;

src/translations.h

@@ -240,6 +240,7 @@ extern const pm_char STR_SIDE[];
 extern const pm_char STR_DIFFERENTIAL[];
 extern const pm_char STR_OFFSET[];
 extern const pm_char STR_TRIM[];
+extern const pm_char STR_DREX[];
 extern const pm_char STR_CURVE[];
 extern const pm_char STR_FPHASE[];
 extern const pm_char STR_MIXWARNING[];

src/translations/cz.h

@@ -266,7 +266,8 @@
 #define TR_MIXEROFFSET  "Ofset Mixu"
 #define TR_DRWEIGHT     "V\200ha DV"
 #define TR_DREXPO       "Expo DV"
-#define TR_TRIM         "Trim&DV/Expo"
+#define TR_TRIM         "Trim"
+#define TR_DREX         "DVex"
 #define TR_CURVE        "K\206ivka"
 #define TR_FPHASE       "F\200ze"
 #define TR_MIXWARNING   "Varov\200n\204"

src/translations/de.h

@@ -266,7 +266,8 @@
 #define TR_MIXEROFFSET                  "Mixer Offset"                                                        
 #define TR_DRWEIGHT                     "DR Weight"                                                           
 #define TR_DREXPO                       "DR Expo"                                                             
-#define TR_TRIM                         "Trim"                                                                
+#define TR_TRIM                         "Trim"
+#define TR_DREX                         "DRex"                                                                
 #define TR_CURVE                        "Kurve"
 #define TR_FPHASE                       "Phase"
 #define TR_MIXWARNING                   "Warnung"

src/translations/en.h

@@ -267,7 +267,8 @@
 #define TR_MIXEROFFSET         "Mixer Offset"
 #define TR_DRWEIGHT            "DR Weight"
 #define TR_DREXPO              "DR Expo"
-#define TR_TRIM                "Trim/DR"
+#define TR_TRIM                "Trim"
+#define TR_DREX                "DRex"
 #define TR_CURVE               "Curve"
 #define TR_FPHASE              "Phase"
 #define TR_MIXWARNING          "Warning"

src/translations/fr.h

@@ -264,7 +264,8 @@
 #define TR_MIXEROFFSET  "Offset Mixage"
 #define TR_DRWEIGHT     "Ratio DR"
 #define TR_DREXPO       "Expo DR"
-#define TR_TRIM         "Trim/DR"
+#define TR_TRIM         "Trim"
+#define TR_DREX         "DRex"
 #define TR_CURVE        "Courbe"
 #define TR_FPHASE       "Phase"
 #define TR_MIXWARNING   "Alerte"

src/translations/it.h

@@ -267,6 +267,7 @@
 #define TR_DRWEIGHT     "Peso DR  "
 #define TR_DREXPO       "Expo DR"
 #define TR_TRIM         "Trim"
+#define TR_DREX         "DRex"
 #define TR_CURVE       "Curva"
 #define TR_FPHASE       "Fase"
 #define TR_MIXWARNING   "Avviso"

src/translations/se.h

@@ -264,6 +264,7 @@
 #define TR_DRWEIGHT     "DR-vikt"
 #define TR_DREXPO       "DR-expo"
 #define TR_TRIM         "Trim"
+#define TR_DREX         "DRex"
 #define TR_CURVE        "Kurvor"
 #define TR_FPHASE       "Fl.Fas"
 #define TR_MIXWARNING   "Varning"

util/tts.py

@@ -151,7 +151,7 @@ if __name__ == "__main__":
         					   "degree", "degrees",
         					   "percent", "percent",
         					   "milliamp", "milliamps",
-        					   "milliamp per hour", "milliamps per hour",
+        					   "milliamp-hour", "milliamp-hours",
         					   "watt", "watts",
         					   "db", "db",
         					   "foot", "feet",