diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index b0d7b6b1b..e49b6e0fc 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -3186,7 +3186,7 @@ void menuModelMixOne(uint8_t event) if (attr && m_posHorz==0 && (not_stick || editMode>0)) md2->carryTrim = -checkIncDecModel(event, carryTrim, not_stick ? TRIM_ON : -TRIM_OFF, -TRIM_AIL); if (!not_stick) { lcd_puts(COLUMN_X+MIXES_2ND_COLUMN, y, STR_DREX); - menu_lcd_onoff(COLUMN_X+MIXES_2ND_COLUMN+5*FW, y, !md2->noExpo, m_posHorz==1 ? attr : 0); + menu_lcd_onoff(COLUMN_X+MIXES_2ND_COLUMN+DREX_CHBOX_OFFSET, y, !md2->noExpo, m_posHorz==1 ? attr : 0); if (attr && m_posHorz==1 && editMode>0) md2->noExpo = !checkIncDecModel(event, !md2->noExpo, 0, 1); } else if (attr) { diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index ac2bd377b..1d5dfcccd 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -500,7 +500,8 @@ #define TR_DIFFERENTIAL "Dif.výchylek" #define TR_OFFSET INDENT"Ofset" #define TR_TRIM "Trim" -#define TR_DREX "DRex" +#define TR_DREX "DR/Expo" +#define DREX_CHBOX_OFFSET 45 #define TR_CURVE "Křivka" #define TR_FLMODE "Režim" #define TR_MIXWARNING "Varování" @@ -605,13 +606,13 @@ #define TR_MENUFLIGHTPHASES "LETOVÉ REŽIMY" #define TR_MENUHELISETUP "HELI" - -#define TR_MENUINPUTS "VSTUPY" #define TR_MENULIMITS "SERVA" - - - +#if defined(PCBTARANIS) + #define TR_MENUINPUTS "VSTUPY" +#else + #define TR_MENUINPUTS "DR/EXPO" +#endif diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 65eea4c2d..81f8dac61 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -505,6 +505,7 @@ #define TR_OFFSET INDENT"Offset" #define TR_TRIM "Trim" #define TR_DREX "DRex" +#define DREX_CHBOX_OFFSET 30 #define TR_CURVE "Kurve" #define TR_FLMODE TR("Phase","Phasen") #define TR_MIXWARNING "Warnung" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 3ed7c9d0e..6d21e7a0d 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -505,6 +505,7 @@ #define TR_OFFSET INDENT "Offset" #define TR_TRIM "Trim" #define TR_DREX "DRex" +#define DREX_CHBOX_OFFSET 30 #define TR_CURVE "Curve" #define TR_FLMODE TR("Mode","Modes") #define TR_MIXWARNING "Warning" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index f91ef07e2..7161e510a 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -501,6 +501,7 @@ #define TR_OFFSET INDENT"Offset" #define TR_TRIM "Trim" #define TR_DREX "DRex" +#define DREX_CHBOX_OFFSET 30 #define TR_CURVE "Curva" #define TR_FLMODE TR("Modo","Modos") #define TR_MIXWARNING "Aviso" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 54558a30e..d377cc52d 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -501,6 +501,7 @@ #define TR_OFFSET INDENT"Offset" #define TR_TRIM "Trim" #define TR_DREX "DRex" +#define DREX_CHBOX_OFFSET 30 #define TR_CURVE "Curve" #define TR_FLMODE TR("Mode","Modes") #define TR_MIXWARNING "Warning" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 6fc1521dc..97d7ae07e 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -501,6 +501,7 @@ #define TR_OFFSET INDENT "Décalage" #define TR_TRIM "Trim" #define TR_DREX "DRex" +#define DREX_CHBOX_OFFSET 30 #define TR_CURVE "Courbe" #define TR_FLMODE TR("Phase", "Phases") #define TR_MIXWARNING "Alerte" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index a1552b616..0f3e3bdba 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -501,6 +501,7 @@ #define TR_OFFSET INDENT"Offset" #define TR_TRIM "Trim" #define TR_DREX "DRex" +#define DREX_CHBOX_OFFSET 30 #define TR_CURVE "Curva" #define TR_FLMODE "Fase" #define TR_MIXWARNING "Avviso" @@ -621,8 +622,8 @@ #define TR_MENULOGICALSWITCH "SWITCH PERSON." #define TR_MENULOGICALSWITCHES TR("SWITCH PERSON.","SWITCH PERSONALIZZATI") #define TR_MENUCUSTOMFUNC TR("FUNZ. PERSON.","FUNZIONI PERSONALIZZATE") -#define TR_MENUCUSTOMSCRIPTS "CUSTOM SCRIPTS" -#define TR_MENUCUSTOMSCRIPT "CUSTOM SCRIPT" +#define TR_MENUCUSTOMSCRIPTS "CUSTOM SCRIPTS" +#define TR_MENUCUSTOMSCRIPT "CUSTOM SCRIPT" #define TR_MENUTELEMETRY "TELEMETRIA" #define TR_MENUTEMPLATES "ESEMPI GUIDA" #define TR_MENUSTAT "STATS" @@ -635,9 +636,9 @@ #define TR_LONGITUDE "Longitud." #define TR_GPSCOORD "Coord. GPS" #define TR_VARIO "Vario" -#define TR_PITCH_AT_ZERO INDENT "Pitch at Zero" -#define TR_PITCH_AT_MAX INDENT "Pitch at Max" -#define TR_REPEAT_AT_ZERO INDENT "Repeat at Zero" +#define TR_PITCH_AT_ZERO INDENT "Pitch at Zero" +#define TR_PITCH_AT_MAX INDENT "Pitch at Max" +#define TR_REPEAT_AT_ZERO INDENT "Repeat at Zero" #define TR_SHUTDOWN "ARRESTO.." #define TR_BATT_CALIB "Calibra batt." #define TR_CURRENT_CALIB "Calibra corr." @@ -655,7 +656,7 @@ #define TR_INCOMPATIBLE "Incompatibile" #define TR_WARNING "AVVISO" #define TR_EEPROMWARN "EEPROM" -#define TR_EEPROM_CONVERTING "EEPROM Converting" +#define TR_EEPROM_CONVERTING "EEPROM Converting" #define TR_THROTTLEWARN "MOTORE" #define TR_ALARMSWARN "ALLARMI" #define TR_SWITCHWARN "SWITCH" @@ -680,13 +681,13 @@ #define TR_NO_SOUNDS_ON_SD "No Suoni su SD" #define TR_NO_MODELS_ON_SD "No Model. su SD" #define TR_NO_BITMAPS_ON_SD "no Immag. su SD" -#define TR_NO_SCRIPTS_ON_SD "No Scripts on SD" +#define TR_NO_SCRIPTS_ON_SD "No Scripts on SD" #define TR_PLAY_FILE "Suona" #define TR_DELETE_FILE "Cancella" #define TR_COPY_FILE "Copia" #define TR_RENAME_FILE "Rinomomina" #define TR_ASSIGN_BITMAP "Assegna Immagine" -#define TR_EXECUTE_FILE "Execute" +#define TR_EXECUTE_FILE "Execute" #define TR_REMOVED " rimosso" #define TR_SD_INFO "Informazioni" #define TR_SD_FORMAT "Format" @@ -710,11 +711,11 @@ #define TR_DATE "Data" #define TR_ROTARY_ENCODER "R.Encs" #define TR_CHANNELS_MONITOR "CHANNELS MONITOR" -#define TR_PATH_TOO_LONG "Path too long" -#define TR_VIEW_TEXT "View text" -#define TR_FLASH_BOOTLOADER "Flash BootLoader" -#define TR_WRITING "\032Writing..." -#define TR_CONFIRM_FORMAT "Confirm Format?" +#define TR_PATH_TOO_LONG "Path too long" +#define TR_VIEW_TEXT "View text" +#define TR_FLASH_BOOTLOADER "Flash BootLoader" +#define TR_WRITING "\032Writing..." +#define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Modulo Interno" #define TR_EXTERNALRF "Modulo esterno" #define TR_FAILSAFE "Modo failsafe" @@ -752,19 +753,19 @@ #define TR_CHANNELRANGE INDENT "Numero Canali" #define TR_LOWALARM INDENT "Allarme Basso" #define TR_CRITICALALARM INDENT "Allarme Critico" -#define TR_ENABLE_POPUP "Enable Popup" -#define TR_DISABLE_POPUP "Disable Popup" -#define TR_CURVE_PRESET "Preset..." -#define TR_PRESET "Preset" -#define TR_MIRROR "Mirror" -#define TR_CLEAR "Clear" -#define TR_RESET "Reset" -#define TR_RESET_SUBMENU "Reset..." -#define TR_COUNT "Count" -#define TR_PT "pt" -#define TR_PTS "pts" -#define TR_SMOOTH "Smooth" -#define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset" +#define TR_ENABLE_POPUP "Enable Popup" +#define TR_DISABLE_POPUP "Disable Popup" +#define TR_CURVE_PRESET "Preset..." +#define TR_PRESET "Preset" +#define TR_MIRROR "Mirror" +#define TR_CLEAR "Clear" +#define TR_RESET "Reset" +#define TR_RESET_SUBMENU "Reset..." +#define TR_COUNT "Count" +#define TR_PT "pt" +#define TR_PTS "pts" +#define TR_SMOOTH "Smooth" +#define TR_COPY_TRIMS_TO_OFS "Copy Trims To Offset" #define TR_PERSISTENT_MAH INDENT "Store mAh" #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST INDENT "Display Checklist" @@ -865,8 +866,8 @@ #define TR_TOP_BAR "Top Bar" #define TR_ALTITUDE INDENT "Altitude" -#define TR_SCALE "Scale" -#define TR_VIEW_CHANNELS "View Channels" -#define TR_VIEW_NOTES "View Notes" +#define TR_SCALE "Scale" +#define TR_VIEW_CHANNELS "View Channels" +#define TR_VIEW_NOTES "View Notes" #define TR_MODS_FORBIDDEN "Modifications forbidden!" #define TR_UNLOCKED "Unlocked" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 4c7845b36..3826858c2 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -501,6 +501,7 @@ #define TR_OFFSET INDENT"Ofset" #define TR_TRIM "Trymer" #define TR_DREX "DRex" +#define DREX_CHBOX_OFFSET 30 #define TR_CURVE "Krzywa" #define TR_FLMODE "Tryb" #define TR_MIXWARNING "UWAGA" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index b895ba6e7..b0f7a242b 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -501,6 +501,7 @@ #define TR_OFFSET INDENT"Desvio" #define TR_TRIM "Trim" #define TR_DREX "DRex" +#define DREX_CHBOX_OFFSET 30 #define TR_CURVE "Curvas" #define TR_FLMODE "Fase" #define TR_MIXWARNING "Aviso" @@ -712,9 +713,9 @@ #define TR_CHANNELS_MONITOR "CHANNELS MONITOR" #define TR_PATH_TOO_LONG "Path too long" #define TR_VIEW_TEXT "View text" -#define TR_FLASH_BOOTLOADER "Flash BootLoader" -#define TR_WRITING "\032Writing..." -#define TR_CONFIRM_FORMAT "Confirm Format?" +#define TR_FLASH_BOOTLOADER "Flash BootLoader" +#define TR_WRITING "\032Writing..." +#define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Internal RF" #define TR_EXTERNALRF "External RF" #define TR_FAILSAFE "Failsafe mode" @@ -759,7 +760,7 @@ #define TR_MIRROR "Mirror" #define TR_CLEAR "Clear" #define TR_RESET "Reset" -#define TR_RESET_SUBMENU "Reset..." +#define TR_RESET_SUBMENU "Reset..." #define TR_COUNT "Count" #define TR_PT "pt" #define TR_PTS "pts" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index b892839dd..82265b1cf 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -501,6 +501,7 @@ #define TR_OFFSET INDENT"Offset" #define TR_TRIM "Trim" #define TR_DREX "DRex" +#define DREX_CHBOX_OFFSET 30 #define TR_CURVE "Kurva" #define TR_FLMODE TR("Läge","Flyglägen") #define TR_MIXWARNING "Varning" @@ -712,9 +713,9 @@ #define TR_CHANNELS_MONITOR "Kanalöversikt" #define TR_PATH_TOO_LONG "För lång sökväg" #define TR_VIEW_TEXT "Visa Text" -#define TR_FLASH_BOOTLOADER "Flash BootLoader" -#define TR_WRITING "\032Writing..." -#define TR_CONFIRM_FORMAT "Confirm Format?" +#define TR_FLASH_BOOTLOADER "Flash BootLoader" +#define TR_WRITING "\032Writing..." +#define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Intern Radio" #define TR_EXTERNALRF "Extern Radiomodul" #define TR_FAILSAFE "Failsafeläge" @@ -759,12 +760,12 @@ #define TR_MIRROR "Spegla" #define TR_CLEAR "Töm" #define TR_RESET "Nollställ" -#define TR_RESET_SUBMENU "Reset..." +#define TR_RESET_SUBMENU "Reset..." #define TR_COUNT "Antal" #define TR_PT "pt" #define TR_PTS "pkt" #define TR_SMOOTH "Mjuk" -#define TR_COPY_TRIMS_TO_OFS "Spara trimmar som offset" +#define TR_COPY_TRIMS_TO_OFS "Spara trimmar som offset" #define TR_PERSISTENT_MAH INDENT "Lagra mAh" #define TR_PREFLIGHT "Startkontroller" #define TR_CHECKLIST INDENT "Visa checklisa"