diff --git a/src/translations/cz.h b/src/translations/cz.h index 4fdcb8274..ab1183192 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -138,7 +138,9 @@ #define TR_SOUND "P\204pnout\0 " #endif -#if defined(HAPTIC) +#if defined(PCBTARANIS) + #define TR_HAPTIC +#elif defined(HAPTIC) #define TR_HAPTIC "Vibrovat\0 " #else #define TR_HAPTIC "[Vibrovat]\0" @@ -195,8 +197,10 @@ #define TR_FSW_RESET_TELEM #endif -#if ROTARY_ENCODERS > 0 -#define TR_FSW_RESET_ROTENC "R.Enc" +#if ROTARY_ENCODERS == 2 + #define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") +#elif ROTARY_ENCODERS == 1 + #define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc\0 ") #else #define TR_FSW_RESET_ROTENC #endif @@ -251,7 +255,7 @@ #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define LEN_VKEYS "\005" -#define TR_VKEYS " Menu"" Exit"" Dol\211""Nhoru""Vprvo""Vlevo" +#define TR_VKEYS TR(" Menu"" Exit"" Dol\211""Nhoru""Vprvo""Vlevo", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define LEN_VRENCODERS "\003" #define TR_VRENCODERS "REa""REb" @@ -450,7 +454,7 @@ #define TR_T10MSUS "T10ms\016us" #define TR_FREESTACKMINB "Free Stack\010b" -#define TR_MENUTORESET "[MENU] >> Reset" +#define TR_MENUTORESET CENTER TR_ENTER" >> Reset" #define TR_PPM "PPM" #define TR_CH "CH" #define TR_MODEL "MODEL" diff --git a/src/translations/de.h b/src/translations/de.h index b8cde7ab8..790bf33b2 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -199,8 +199,10 @@ #define TR_FSW_RESET_TELEM #endif -#if ROTARY_ENCODERS > 0 - #define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc ") +#if ROTARY_ENCODERS == 2 + #define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") +#elif ROTARY_ENCODERS == 1 + #define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc\0 ") #else #define TR_FSW_RESET_ROTENC #endif @@ -448,7 +450,7 @@ #define TR_T10MSUS "T10ms\016us" #define TR_FREESTACKMINB "Free Stack\010b" -#define TR_MENUTORESET "[MENU] f\205r Reset" +#define TR_MENUTORESET CENTER TR_ENTER" f\205r Reset" #define TR_PPM "PPM" #define TR_CH "CH" #define TR_MODEL "MODELL" diff --git a/src/translations/es.h b/src/translations/es.h index 3e007b3ec..1b31464c7 100644 --- a/src/translations/es.h +++ b/src/translations/es.h @@ -138,7 +138,9 @@ #define TR_SOUND "Beep\0 " #endif -#if defined(HAPTIC) +#if defined(PCBTARANIS) + #define TR_HAPTIC +#elif defined(HAPTIC) #define TR_HAPTIC "Tactil\0 " #else #define TR_HAPTIC "[Tactil]\0 " @@ -195,8 +197,10 @@ #define TR_FSW_RESET_TELEM #endif -#if ROTARY_ENCODERS > 0 - #define TR_FSW_RESET_ROTENC "R.Enc" +#if ROTARY_ENCODERS == 2 + #define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") +#elif ROTARY_ENCODERS == 1 + #define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc\0 ") #else #define TR_FSW_RESET_ROTENC #endif @@ -251,7 +255,7 @@ #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define LEN_VKEYS "\005" -#define TR_VKEYS " Menu""Salir""Abajo""Arrib""Dcha.""Izqd." +#define TR_VKEYS TR(" Menu""Salir""Abajo""Arrib""Dcha.""Izqd.", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define LEN_VRENCODERS "\003" #define TR_VRENCODERS "REa""REb" @@ -450,7 +454,7 @@ #define TR_T10MSUS "T10ms\016us" #define TR_FREESTACKMINB "Pila libre\010b" -#define TR_MENUTORESET "[MENU] Resetea" +#define TR_MENUTORESET CENTER TR_ENTER" Resetea" #define TR_PPM "PPM" #define TR_CH "CH" #define TR_MODEL "MODELO" diff --git a/src/translations/fr.h b/src/translations/fr.h index 5e2cfd227..55bbaf809 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -152,7 +152,9 @@ #define TR_SOUND "Bip\0 " #endif -#if defined(HAPTIC) +#if defined(PCBTARANIS) + #define TR_HAPTIC +#elif defined(HAPTIC) #define TR_HAPTIC "Vibreur\0 " #else #define TR_HAPTIC "[Vibreur]\0 " @@ -209,8 +211,10 @@ #define TR_FSW_RESET_TELEM #endif -#if ROTARY_ENCODERS > 0 - #define TR_FSW_RESET_ROTENC "Enc.r" +#if ROTARY_ENCODERS == 2 + #define TR_FSW_RESET_ROTENC TR("ERa\0 ""ERb\0 ", "EncRot A\0""EncRot B\0") +#elif ROTARY_ENCODERS == 1 + #define TR_FSW_RESET_ROTENC TR("Enc.r", "EncRot\0 ") #else #define TR_FSW_RESET_ROTENC #endif @@ -265,7 +269,7 @@ #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define LEN_VKEYS "\005" -#define TR_VKEYS " Menu"" Exit"" Bas"" Haut""Droit""Gauch" +#define TR_VKEYS TR(" Menu"" Exit"" Bas"" Haut""Droit""Gauch", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define LEN_VRENCODERS "\003" #define TR_VRENCODERS "REa""REb" @@ -464,7 +468,7 @@ #define TR_T10MSUS "T10ms\016us" #define TR_FREESTACKMINB "Free Stack\010b" -#define TR_MENUTORESET "[MENU] pour reset" +#define TR_MENUTORESET CENTER TR_ENTER" pour reset" #define TR_PPM "PPM" #define TR_CH "CH" #define TR_MODEL "MODELE" diff --git a/src/translations/it.h b/src/translations/it.h index 33df2eb90..8a14636b3 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -137,7 +137,9 @@ #define TR_SOUND "Beep\0 " #endif -#if defined(HAPTIC) +#if defined(PCBTARANIS) + #define TR_HAPTIC +#elif defined(HAPTIC) #define TR_HAPTIC "Vibrazione\0 " #else #define TR_HAPTIC "[Vibrazione]\0" @@ -194,8 +196,10 @@ #define TR_FSW_RESET_TELEM #endif -#if ROTARY_ENCODERS > 0 - #define TR_FSW_RESET_ROTENC "R.Enc" +#if ROTARY_ENCODERS == 2 + #define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") +#elif ROTARY_ENCODERS == 1 + #define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc\0 ") #else #define TR_FSW_RESET_ROTENC #endif @@ -250,7 +254,7 @@ #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define LEN_VKEYS "\005" -#define TR_VKEYS " Men\200"" EXIT"" DN "" UP"" SX"" DX" +#define TR_VKEYS TR(" Men\200"" EXIT"" DN "" UP"" SX"" DX", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define LEN_VRENCODERS "\003" #define TR_VRENCODERS "REa""REb" @@ -449,7 +453,7 @@ #define TR_T10MSUS "T10ms\007us" #define TR_FREESTACKMINB "Free Stack\004b" -#define TR_MENUTORESET "[Men\200] x Azzerare" +#define TR_MENUTORESET CENTER TR_ENTER" x Azzerare" #define TR_PPM "PPM" #define TR_CH "CH" #define TR_MODEL "MODELLO" diff --git a/src/translations/pt.h b/src/translations/pt.h index ea00bfe2e..9ba5fca96 100644 --- a/src/translations/pt.h +++ b/src/translations/pt.h @@ -116,7 +116,9 @@ #define TR_SOUND "Beep\0 " #endif -#if defined(HAPTIC) +#if defined(PCBTARANIS) + #define TR_HAPTIC +#elif defined(HAPTIC) #define TR_HAPTIC "Vibrar\0 " #else #define TR_HAPTIC "[Vibrar]\0 " @@ -173,8 +175,10 @@ #define TR_FSW_RESET_TELEM #endif -#if ROTARY_ENCODERS > 0 - #define TR_FSW_RESET_ROTENC "R.Enc" +#if ROTARY_ENCODERS == 2 + #define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") +#elif ROTARY_ENCODERS == 1 + #define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc\0 ") #else #define TR_FSW_RESET_ROTENC #endif @@ -229,7 +233,7 @@ #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define LEN_VKEYS "\005" -#define TR_VKEYS " Menu"" Sair""Desce"" Sobe""Direi""Esqda" +#define TR_VKEYS TR(" Menu"" Sair""Desce"" Sobe""Direi""Esqda", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define LEN_VRENCODERS "\003" #define TR_VRENCODERS "REa""REb" @@ -428,7 +432,7 @@ #define TR_T10MSUS "T10ms\016us" #define TR_FREESTACKMINB "Pilha Livre\010b" -#define TR_MENUTORESET "[MENU] Reinicia" +#define TR_MENUTORESET CENTER TR_ENTER" Reinicia" #define TR_PPM "PPM" #define TR_CH "CH" #define TR_MODEL "MODEL" diff --git a/src/translations/se.h b/src/translations/se.h index 84a3139de..23d935815 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -152,7 +152,9 @@ #define TR_SOUND "Pip\0 " #endif -#if defined(HAPTIC) +#if defined(PCBTARANIS) + #define TR_HAPTIC +#elif defined(HAPTIC) #define TR_HAPTIC "Vibrator\0 " #else #define TR_HAPTIC "[Vibrator]\0" @@ -209,8 +211,10 @@ #define TR_FSW_RESET_TELEM #endif -#if ROTARY_ENCODERS > 0 - #define TR_FSW_RESET_ROTENC "R.Enc" +#if ROTARY_ENCODERS == 2 + #define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") +#elif ROTARY_ENCODERS == 1 + #define TR_FSW_RESET_ROTENC TR("R.Enc", "RotEnc\0 ") #else #define TR_FSW_RESET_ROTENC #endif @@ -265,7 +269,7 @@ #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define LEN_VKEYS "\005" -#define TR_VKEYS " MENU"" EXIT"" Ned"" Upp""H\202ger""V\201nst" +#define TR_VKEYS TR(" MENU"" EXIT"" Ned"" Upp""H\202ger""V\201nst", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define LEN_VRENCODERS "\003" #define TR_VRENCODERS "REa""REb" @@ -458,7 +462,7 @@ #define TR_T10MSUS "T10ms\016us" #define TR_FREESTACKMINB "Free Stack\010b" -#define TR_MENUTORESET "[MENU] Nollar " +#define TR_MENUTORESET CENTER TR_ENTER" Nollar" #define TR_PPM "PPM" #define TR_CH "KN" #define TR_MODEL "Modell" diff --git a/src/translations/tts_cz.cpp b/src/translations/tts_cz.cpp index 68e54e7ee..c2fd8cdbb 100644 --- a/src/translations/tts_cz.cpp +++ b/src/translations/tts_cz.cpp @@ -116,6 +116,8 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) number = -number; } + convertUnit(number, unit); + int8_t mode = MODE(att); if (mode > 0) { // we assume that we are PREC1 diff --git a/src/translations/tts_de.cpp b/src/translations/tts_de.cpp index b51a9c41d..d6331950b 100644 --- a/src/translations/tts_de.cpp +++ b/src/translations/tts_de.cpp @@ -105,6 +105,9 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) PUSH_NUMBER_PROMPT(PROMPT_MINUS); number = -number; } + + convertUnit(number, unit); + int8_t mode = MODE(att); if (mode > 0) { div_t qr = div(number, (mode == 1 ? 10 : 100)); diff --git a/src/translations/tts_es.cpp b/src/translations/tts_es.cpp index 888479cb2..04783d074 100644 --- a/src/translations/tts_es.cpp +++ b/src/translations/tts_es.cpp @@ -129,6 +129,9 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) PUSH_NUMBER_PROMPT(PROMPT_MENO); number = -number; } + + convertUnit(number, unit); + int8_t mode = MODE(att); if (mode > 0) { div_t qr = div(number, (mode == 1 ? 10 : 100)); diff --git a/src/translations/tts_fr.cpp b/src/translations/tts_fr.cpp index 2692805c5..956e01dec 100644 --- a/src/translations/tts_fr.cpp +++ b/src/translations/tts_fr.cpp @@ -112,6 +112,8 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) number = -number; } + convertUnit(number, unit); + int8_t mode = MODE(att); if (mode > 0) { // we assume that we are PREC1 diff --git a/src/translations/tts_it.cpp b/src/translations/tts_it.cpp index f3a57df9d..f097c5066 100644 --- a/src/translations/tts_it.cpp +++ b/src/translations/tts_it.cpp @@ -101,6 +101,9 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) PUSH_NUMBER_PROMPT(PROMPT_MENO); number = -number; } + + convertUnit(number, unit); + int8_t mode = MODE(att); if (mode > 0) { div_t qr = div(number, (mode == 1 ? 10 : 100)); diff --git a/src/translations/tts_pt.cpp b/src/translations/tts_pt.cpp index ba1d9a942..ee472c01e 100644 --- a/src/translations/tts_pt.cpp +++ b/src/translations/tts_pt.cpp @@ -114,6 +114,9 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) PUSH_NUMBER_PROMPT(PROMPT_MENOS); number = -number; } + + convertUnit(number, unit); + int8_t mode = MODE(att); if (mode > 0) { div_t qr = div(number, (mode == 1 ? 10 : 100)); diff --git a/src/translations/tts_sk.cpp b/src/translations/tts_sk.cpp index 5bf8a6a2c..e7fbd193d 100644 --- a/src/translations/tts_sk.cpp +++ b/src/translations/tts_sk.cpp @@ -131,6 +131,8 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) number = -number; } + convertUnit(number, unit); + int8_t mode = MODE(att); if (mode > 0) { // we assume that we are PREC1