diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index 5e42edc11..61cba0a89 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -875,9 +875,7 @@ enum menuModelSetupItems { ITEM_MODEL_THROTTLE_TRACE, ITEM_MODEL_THROTTLE_TRIM, CASE_PCBTARANIS(ITEM_MODEL_PREFLIGHT_LABEL) -#if defined(PCBTARANIS) - ITEM_MODEL_CHECKLIST_DISPLAY, -#endif + CASE_PCBTARANIS(ITEM_MODEL_CHECKLIST_DISPLAY) ITEM_MODEL_THROTTLE_WARNING, ITEM_MODEL_SWITCHES_WARNING, CASE_PCBTARANIS(ITEM_MODEL_POT_WARNING) @@ -966,7 +964,7 @@ void menuModelSetup(uint8_t event) #define POT_WARN_ITEMS() ((g_model.nPotsToWarn >> 6) ? (uint8_t)NUM_POTS : (uint8_t)0) bool CURSOR_ON_CELL = (m_posHorz >= 0); - MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0,LABEL(Throttle), 0, 0, 0,LABEL(PreflightCheck), CASE_PCBTARANIS(0) 0, 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_PORT1_ON(1), IF_PORT1_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_PORT1_ON(FAILSAFE_ROWS(0)), LABEL(ExternalModule), (g_model.externalModule==MODULE_TYPE_XJT || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, PORT2_CHANNELS_ROWS(), (IS_MODULE_XJT(1) && IS_D8_RX(1)) ? (uint8_t)1 : (IS_MODULE_PPM(1) || IS_MODULE_XJT(1) || IS_MODULE_DSM2(1)) ? (uint8_t)2 : HIDDEN_ROW, IF_PORT2_XJT(FAILSAFE_ROWS(1)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)}); + MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0,CASE_PCBTARANIS(LABEL(Throttle)) 0, 0, 0,CASE_PCBTARANIS(LABEL(PreflightCheck)) CASE_PCBTARANIS(0) 0, 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_PORT1_ON(1), IF_PORT1_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_PORT1_ON(FAILSAFE_ROWS(0)), LABEL(ExternalModule), (g_model.externalModule==MODULE_TYPE_XJT || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, PORT2_CHANNELS_ROWS(), (IS_MODULE_XJT(1) && IS_D8_RX(1)) ? (uint8_t)1 : (IS_MODULE_PPM(1) || IS_MODULE_XJT(1) || IS_MODULE_DSM2(1)) ? (uint8_t)2 : HIDDEN_ROW, IF_PORT2_XJT(FAILSAFE_ROWS(1)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)}); #elif defined(CPUM64) #define CURSOR_ON_CELL (true) #define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX) diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index e93fcd68f..5cb0c795e 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -441,7 +441,7 @@ #define TR_ETRIMS TR("Erw.Trims","Erweit. Trimmung") #define TR_TRIMINC TR("Trim Schr.","Trimm Schritte") #define TR_TTRACE TR("Gasquelle", INDENT "Gas Quelle") -#define TR_TTRIM TR("Gastrim",INDENT "Gas Trimmung") +#define TR_TTRIM TR("Gastrim", INDENT "Gas Trimmung") #define TR_BEEPCTR TR("Mitt.Piep","Mittelst. Pieps") #define TR_PROTO TR(INDENT"Proto.",INDENT"Protokoll") #define TR_PPMFRAME "PPM Einst." @@ -515,7 +515,7 @@ #define TR_BLOFFBRIGHTNESS INDENT"Aus Helligkeit" #define TR_SPLASHSCREEN "Startbild" #define TR_THROTTLEWARNING TR("Gas Alarm", INDENT "Gas Alarm") -#define TR_SWITCHWARNING TR("Sch. Alarm",INDENT "Schalter Alarm") +#define TR_SWITCHWARNING TR("Sch. Alarm", INDENT "Schalter Alarm") #define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE TR("Zeitzone","GPS Zeit Zone") #define TR_RXCHANNELORD TR("Kanalanordnung","Kanalvoreinstellung") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index d0541e7f2..ced15354b 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -515,8 +515,8 @@ #define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness" #define TR_SPLASHSCREEN "Splash screen" #define TR_THROTTLEWARNING TR("T-Warning", INDENT "Throttle Warning") -#define TR_SWITCHWARNING TR("S-Warning",INDENT "Switch Warning") -#define TR_POTWARNING TR("Pot Warn.",INDENT "Pot Warning") +#define TR_SWITCHWARNING TR("S-Warning", INDENT "Switch Warning") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE TR("Time Zone","GPS Time zone") #define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order") #define TR_SLAVE "Slave" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 6fec8a7d7..6bbf97318 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limites ét","Limites étendues") #define TR_ETRIMS TR("Trims ét.","Trims étendus") #define TR_TRIMINC TR("Pas Trim","Pas des trims") -#define TR_TTRACE TR("Source gaz",INDENT"Source gaz") -#define TR_TTRIM TR("Trim gaz",INDENT"Trim gaz") +#define TR_TTRACE TR("Source gaz", INDENT "Source gaz") +#define TR_TTRIM TR("Trim gaz", INDENT "Trim gaz") #define TR_BEEPCTR TR("Bips centr","Bips centrage") #define TR_PROTO TR(INDENT"Proto.",INDENT"Protocole") #define TR_PPMFRAME INDENT"Trame PPM" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING TR(INDENT"Silence",INDENT"Sons désactivés") #define TR_RENAVIG "Navig EncRot" #define TR_THROTTLE_LABEL "Gaz" -#define TR_THROTTLEREVERSE TR("Inv. gaz",INDENT"Inversion gaz") +#define TR_THROTTLEREVERSE TR("Inv. gaz", INDENT "Inversion gaz") #define TR_MINUTEBEEP TR(INDENT"Bip min.",INDENT"Annonces minutes") #define TR_BEEPCOUNTDOWN TR(INDENT"Bip fin",INDENT"Compte à rebours") #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistant") @@ -514,9 +514,9 @@ #define TR_BLONBRIGHTNESS INDENT"Luminosité ON" #define TR_BLOFFBRIGHTNESS INDENT"Luminosité OFF" #define TR_SPLASHSCREEN "Logo d'accueil" -#define TR_THROTTLEWARNING TR("Alerte gaz",INDENT"Alerte gaz") -#define TR_SWITCHWARNING TR("Alerte int",INDENT"Alerte interrupt.") -#define TR_POTWARNING TR("Alerte pot",INDENT"Alerte potentiom.") +#define TR_THROTTLEWARNING TR("Alerte gaz", INDENT "Alerte gaz") +#define TR_SWITCHWARNING TR("Alerte int", INDENT "Alerte interrupt.") +#define TR_POTWARNING TR("Alerte pot", INDENT "Alerte potentiom.") #define TR_TIMEZONE "Fuseau horaire" #define TR_RXCHANNELORD TR("Ordre voies RX","Ordre des voies préféré") #define TR_SLAVE "Elève" @@ -712,7 +712,7 @@ #define TR_CRITICALALARM INDENT "Alarme critique" #define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh",INDENT "Enregistrer mAh") #define TR_PREFLIGHT "Preflight Checks" -#define TR_CHECKLIST INDENT"Afficher notes" +#define TR_CHECKLIST INDENT "Afficher notes" #define TR_FAS_OFFSET TR(INDENT "Corr FAS", INDENT "Correction FAS") #define TR_UART3MODE "Port série" #define TR_POT1TYPE "Type S1" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 7e3283647..555ce7bb9 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limiti.E","Limiti Estesi") #define TR_ETRIMS TR("Trim Ext","Trim Estesi") #define TR_TRIMINC "Trim Step" -#define TR_TTRACE TR("T-Source",INDENT "Throttle Source") -#define TR_TTRIM TR("T-Trim",INDENT "Throttle Trim") +#define TR_TTRACE TR("T-Source", INDENT "Throttle Source") +#define TR_TTRIM TR("T-Trim", INDENT "Throttle Trim") #define TR_BEEPCTR TR("Ctr Beep","Center Beep") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocollo") #define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") @@ -514,9 +514,9 @@ #define TR_BLONBRIGHTNESS TR(INDENT"Lumin. ON",INDENT"Luminosità ON") #define TR_BLOFFBRIGHTNESS TR(INDENT"Lumin. OFF",INDENT"Luminosità OFF") #define TR_SPLASHSCREEN TR("Schermo avvio", "Schermata di avvio") -#define TR_THROTTLEWARNING TR("All. Thr", INDENT"Allarme Throttle") -#define TR_SWITCHWARNING TR("Avv. Int.", INDENT"Avviso Interr.") -#define TR_POTWARNING TR("Pot Warn.", INDENT"Pot Warning") +#define TR_THROTTLEWARNING TR("All. Thr", INDENT "Allarme Throttle") +#define TR_SWITCHWARNING TR("Avv. Int.", INDENT "Avviso Interr.") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE "Ora locale" #define TR_RXCHANNELORD "Ordine ch RX" #define TR_SLAVE "Allievo" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 065201e6d..e81b30c8a 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limit+25%", "Kanał +/- 125%") #define TR_ETRIMS TR("Trymery 100%", "Poszerzone Trymery") #define TR_TRIMINC TR("Krok Trymera", "Krok trymera") -#define TR_TTRACE TR("Źródło gazu", INDENT"Źródło gazu") -#define TR_TTRIM TR("Trymer gazu", INDENT"Trymer gazu") +#define TR_TTRACE TR("Źródło gazu", INDENT "Źródło gazu") +#define TR_TTRIM TR("Trymer gazu", INDENT "Trymer gazu") #define TR_BEEPCTR "(\043)Pikanie środka" #define TR_PROTO INDENT"Protokól" #define TR_PPMFRAME "Ramka PPM" @@ -505,18 +505,18 @@ #define TR_ALARMWARNING INDENT"Wyłącz dźwięk" #define TR_RENAVIG "Nawigacja potencjometrem" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR("Odwróć gaz", INDENT"Odwróć gaz") -#define TR_MINUTEBEEP TR(INDENT"Minuta", INDENT"Pik co minutę") -#define TR_BEEPCOUNTDOWN TR(INDENT"Odliczanie", INDENT"Odliczanie") +#define TR_THROTTLEREVERSE TR("Odwróć gaz", INDENT "Odwróć gaz") +#define TR_MINUTEBEEP TR(INDENT "Minuta", INDENT "Pik co minutę") +#define TR_BEEPCOUNTDOWN TR(INDENT "Odliczanie", INDENT "Odliczanie") #define TR_PERSISTENT INDENT"Dokładny" #define TR_BACKLIGHT_LABEL "Podświetlenie" #define TR_BLDELAY INDENT"Czas trwania" #define TR_BLONBRIGHTNESS INDENT"Jasnośc wł." #define TR_BLOFFBRIGHTNESS INDENT"Jasność wył." #define TR_SPLASHSCREEN "Logo ekranu" -#define TR_THROTTLEWARNING TR("(\043)Gaz",INDENT"(\043)Gaz") -#define TR_SWITCHWARNING TR("(\043)Przełącznik",INDENT"(\043)Przełącznik") -#define TR_POTWARNING TR("Pot Warn.",INDENT"Pot Warning") +#define TR_THROTTLEWARNING TR("(\043)Gaz", INDENT "(\043)Gaz") +#define TR_SWITCHWARNING TR("(\043)Przełącznik", INDENT "(\043)Przełącznik") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE "Strefa czasowa" #define TR_RXCHANNELORD TR("Kolejność kanałów", "Bazowa kolejność kanałów") #define TR_SLAVE "Uczeń" @@ -712,7 +712,7 @@ #define TR_CRITICALALARM INDENT "Alarm krytyczny" #define TR_PERSISTENT_MAH INDENT "Zapisz mAh" #define TR_PREFLIGHT "Preflight Checks" -#define TR_CHECKLIST INDENT"Display Checklist" +#define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_UART3MODE "Port szreg." #define TR_POT1TYPE "Typ S1" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index aa6662795..6b6b9c89f 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS "E.Limits" #define TR_ETRIMS "E.Trims" #define TR_TRIMINC "Trim Step" -#define TR_TTRACE TR("T-Trace",INDENT"T-Trace") -#define TR_TTRIM TR("T-Trim",INDENT"T-Trim") +#define TR_TTRACE TR("T-Trace", INDENT "T-Trace") +#define TR_TTRIM TR("T-Trim", INDENT "T-Trim") #define TR_BEEPCTR "Ctr Beep" #define TR_PROTO INDENT"Proto" #define TR_PPMFRAME "PPM frame" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Som Off" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR("Inverte Acel.",INDENT"Inverte Acel.") +#define TR_THROTTLEREVERSE TR("Inverte Acel.", INDENT "Inverte Acel.") #define TR_MINUTEBEEP INDENT"Beep Minuto" #define TR_BEEPCOUNTDOWN INDENT"Beep Regressivo" #define TR_PERSISTENT INDENT"Persist." @@ -514,9 +514,9 @@ #define TR_BLONBRIGHTNESS INDENT"ON Brightness" #define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness" #define TR_SPLASHSCREEN "Splash screen" -#define TR_THROTTLEWARNING TR("Avisa Acel",INDENT"Avisa Acel") -#define TR_SWITCHWARNING TR("Avisa Chav",INDENT"Avisa Chav") -#define TR_POTWARNING TR("Pot Warn.",INDENT"Pot Warning") +#define TR_THROTTLEWARNING TR("Avisa Acel", INDENT "Avisa Acel") +#define TR_SWITCHWARNING TR("Avisa Chav", INDENT "Avisa Chav") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE "Time Zone" #define TR_RXCHANNELORD "Ordem Canal RX" #define TR_SLAVE "Escravo" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 024726df1..3d2e0df7b 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -440,10 +440,10 @@ #define TR_ELIMITS TR("Gränser++","Utökade Gränser") #define TR_ETRIMS TR("Trimmar++","Utökade Trimmar") #define TR_TRIMINC TR("Trimning","Trimökning") -#define TR_TTRACE TR("Följ Gas",INDENT"Följ Gas") -#define TR_TTRIM TR("Gastrim",INDENT"Gastrim") +#define TR_TTRACE TR("Följ Gas", INDENT "Följ Gas") +#define TR_TTRIM TR("Gastrim", INDENT "Gastrim") #define TR_BEEPCTR TR("Cent.pip", "Centerpip") -#define TR_PROTO TR(INDENT"Proto",INDENT"Protokoll") +#define TR_PROTO TR(INDENT "Proto", INDENT "Protokoll") #define TR_PPMFRAME "PPM-paket" #define TR_MS "ms" #define TR_SWITCH "Brytare" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Ljud Av" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR("Revers.Gas",INDENT"Revers.Gas") +#define TR_THROTTLEREVERSE TR("Revers.Gas", INDENT "Revers.Gas") #define TR_MINUTEBEEP INDENT"Minutpip" #define TR_BEEPCOUNTDOWN INDENT"Räkna Ned" #define TR_PERSISTENT TR("Jämt på ",INDENT"Alltid På") @@ -514,9 +514,9 @@ #define TR_BLONBRIGHTNESS INDENT"På Ljusstyrka" #define TR_BLOFFBRIGHTNESS INDENT"Av Ljusstyrka" #define TR_SPLASHSCREEN "Startbild" -#define TR_THROTTLEWARNING TR("Gasvarning",INDENT"Gasvarning") -#define TR_SWITCHWARNING TR("Bryt.varn.",INDENT"Brytarvarning") -#define TR_POTWARNING TR("Pot Warn.",INDENT"Pot Warning") +#define TR_THROTTLEWARNING TR("Gasvarning", INDENT "Gasvarning") +#define TR_SWITCHWARNING TR("Bryt.varn.", INDENT "Brytarvarning") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE TR("Tidszon","GPS Tidszon") #define TR_RXCHANNELORD "Kanaler i RX" #define TR_SLAVE "Elev"