diff --git a/src/model_menus.cpp b/src/model_menus.cpp index 492c15268..3dfd43559 100644 --- a/src/model_menus.cpp +++ b/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); } diff --git a/src/translations.cpp b/src/translations.cpp index a19a400d8..f7b13482c 100644 --- a/src/translations.cpp +++ b/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; diff --git a/src/translations.h b/src/translations.h index 21c051446..fbbccd77e 100644 --- a/src/translations.h +++ b/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[]; diff --git a/src/translations/cz.h b/src/translations/cz.h index 05d42e7dc..2130faca8 100644 --- a/src/translations/cz.h +++ b/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" diff --git a/src/translations/de.h b/src/translations/de.h index 69faacb32..933becdc5 100644 --- a/src/translations/de.h +++ b/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" diff --git a/src/translations/en.h b/src/translations/en.h index b6fd0d8e9..c9b46fa43 100644 --- a/src/translations/en.h +++ b/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" diff --git a/src/translations/fr.h b/src/translations/fr.h index 387d50508..a30a72653 100644 --- a/src/translations/fr.h +++ b/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" diff --git a/src/translations/it.h b/src/translations/it.h index d82191024..3bc9f90c9 100644 --- a/src/translations/it.h +++ b/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" diff --git a/src/translations/se.h b/src/translations/se.h index 414e8d0e1..84da80fb0 100644 --- a/src/translations/se.h +++ b/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" diff --git a/util/tts.py b/util/tts.py index e4395679d..e1ce4b684 100644 --- a/util/tts.py +++ b/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",