From b66fd75b504548a6bc7a89a8329fc6517b6d1a3c Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 22 Jan 2014 15:15:56 +0100 Subject: [PATCH 1/3] Issue #552 Radio part done --- radio/src/gui/menu_model.cpp | 4 +++- radio/src/opentx.cpp | 2 +- radio/src/translations/en.h | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index d1f9889fb..65fd8dcea 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -4933,11 +4933,13 @@ void menuModelCustomFunctions(uint8_t event) break; case 3: - if (sd->swtch && (CFN_FUNC(sd) <= FUNC_INSTANT_TRIM + if (sd->swtch && (CFN_FUNC(sd) <= FUNC_INSTANT_TRIM || CFN_FUNC(sd) == FUNC_RESET #if defined(GVARS) + // TODO #define || CFN_FUNC(sd) >= FUNC_ADJUST_GV1 #endif #if defined(CPUARM) + // TODO #define || CFN_FUNC(sd) == FUNC_VOLUME #endif )) { diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index ee634a7d2..78f6ed887 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -3129,7 +3129,7 @@ void evalFunctions() } } } - else if (CFN_FUNC(sd) <= FUNC_INSTANT_TRIM) { + else if (CFN_FUNC(sd) <= FUNC_INSTANT_TRIM || CFN_FUNC(sd) == FUNC_RESET) { active = false; } diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 62876daf9..fe5a929db 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -206,23 +206,23 @@ #define TR_VFSWFUNC "Safety\0 ""Trainer\0 ""Inst. Trim" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Backlight\0" TR_CFN_ADJUST_GVAR TR_CFN_TEST #endif -#define LEN_VFSWRESET TR("\005", "\011") +#define LEN_VFSWRESET TR("\004", "\011") #if defined(FRSKY) - #define TR_FSW_RESET_TELEM TR("Telem", "Telemetry") + #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") #else #define TR_FSW_RESET_TELEM #endif #if ROTARY_ENCODERS == 2 - #define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") + #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 ") + #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ") #else #define TR_FSW_RESET_ROTENC #endif -#define TR_VFSWRESET TR("Tmr1\0""Tmr2\0""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1 ""Timer 2 ""All " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) +#define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1 ""Timer 2 ""All " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define LEN_FUNCSOUNDS TR("\004", "\006") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") From f3060e72e4d54f4db226b884f573deddac0f5a15 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 22 Jan 2014 16:50:39 +0100 Subject: [PATCH 2/3] Issue #552 Companion part done --- companion/src/helpers.cpp | 8 ++++++++ companion/src/modeledit/customfunctions.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp index dc1046582..b150b0821 100644 --- a/companion/src/helpers.cpp +++ b/companion/src/helpers.cpp @@ -420,6 +420,14 @@ void populateFuncParamCB(QComboBox *b, const ModelData & model, uint function, u qs.append( QObject::tr("Timer2")); qs.append( QObject::tr("All")); qs.append( QObject::tr("Telemetry")); + int reCount = GetEepromInterface()->getCapability(RotaryEncoders); + if (reCount == 1) { + qs.append( QObject::tr("Rotary Encoder")); + } + else if (reCount == 2) { + qs.append( QObject::tr("REa")); + qs.append( QObject::tr("REb")); + } b->addItems(qs); b->setCurrentIndex(value); } diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp index 0f2466b4b..70ea33e0e 100644 --- a/companion/src/modeledit/customfunctions.cpp +++ b/companion/src/modeledit/customfunctions.cpp @@ -336,7 +336,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified) else if (index==FuncReset) { if (modified) model.funcSw[i].param = (uint8_t)fswtchParamT[i]->currentIndex(); populateFuncParamCB(fswtchParamT[i], model, index, model.funcSw[i].param); - widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM; + widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM | CUSTOM_FUNCTION_ENABLE; } else if (index==FuncVolume) { if (modified) model.funcSw[i].param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt(); From e695b92a50348c35f9271478d1a50917c901620c Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Thu, 23 Jan 2014 20:21:49 +0100 Subject: [PATCH 3/3] Issue #552 - Port string length change to all languages, please translate again as required --- radio/src/translations/cz.h.txt | 14 +++++++------- radio/src/translations/de.h.txt | 12 ++++++------ radio/src/translations/en.h | 2 +- radio/src/translations/es.h.txt | 10 +++++----- radio/src/translations/fr.h.txt | 10 +++++----- radio/src/translations/it.h.txt | 12 ++++++------ radio/src/translations/pl.h.txt | 14 +++++++------- radio/src/translations/pt.h.txt | 12 ++++++------ radio/src/translations/se.h.txt | 12 ++++++------ 9 files changed, 49 insertions(+), 49 deletions(-) diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 145783ff3..5127628bc 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -206,23 +206,23 @@ #define TR_VFSWFUNC "Zámek \0 ""Trenér \0 ""Insta-Trim\0" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Podsvětlení" TR_CFN_ADJUST_GVAR TR_CFN_TEST #endif -#define LEN_VFSWRESET "\005" +#define LEN_VFSWRESET TR("\004", "\011") #if defined(FRSKY) - #define TR_FSW_RESET_TELEM "Telem" -#else + #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") +#else #define TR_FSW_RESET_TELEM #endif #if ROTARY_ENCODERS == 2 - #define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") + #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 ") + #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ") #else -#define TR_FSW_RESET_ROTENC + #define TR_FSW_RESET_ROTENC #endif -#define TR_VFSWRESET "Tmr1\0""Tmr2\0""Vše\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC +#define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define LEN_FUNCSOUNDS TR("\004", "\006") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 8023eaf06..9d6005a81 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -206,23 +206,23 @@ #define TR_VFSWFUNC "Sicher\0 ""Lehrer \0 ""Inst. Trim" TR_SOUND TR_HAPTIC "R\205cksetz.\0" TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "LCD Licht\0" TR_CFN_ADJUST_GVAR TR_CFN_TEST #endif -#define LEN_VFSWRESET TR("\005", "\011") +#define LEN_VFSWRESET TR("\004", "\011") #if defined(FRSKY) - #define TR_FSW_RESET_TELEM TR("Telem", "Telemetrie ") //\200nderung + #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") #else - #define TR_FSW_RESET_TELEM + #define TR_FSW_RESET_TELEM #endif #if ROTARY_ENCODERS == 2 - #define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") + #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 ") + #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ") #else #define TR_FSW_RESET_ROTENC #endif -#define TR_VFSWRESET TR("Tmr1\0""Tmr2\0""Alle\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1 ""Timer 2 ""Alle Tmr." TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) +#define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define LEN_FUNCSOUNDS TR("\004", "\006") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Piep1\0""Piep2\0""Piep3\0""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index fe5a929db..55223f7a5 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -222,7 +222,7 @@ #define TR_FSW_RESET_ROTENC #endif -#define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1 ""Timer 2 ""All " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) +#define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define LEN_FUNCSOUNDS TR("\004", "\006") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 11f626168..dc972958a 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -206,23 +206,23 @@ #define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Inst. Trim" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Luz fondo\0" TR_CFN_ADJUST_GVAR TR_CFN_TEST #endif -#define LEN_VFSWRESET TR("\005", "\011") +#define LEN_VFSWRESET TR("\004", "\011") #if defined(FRSKY) - #define TR_FSW_RESET_TELEM TR("Telem", "Telemetria") + #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") #else #define TR_FSW_RESET_TELEM #endif #if ROTARY_ENCODERS == 2 - #define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") + #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 ") + #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ") #else #define TR_FSW_RESET_ROTENC #endif -#define TR_VFSWRESET TR("Tmr1\0""Tmr2\0""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Reloj 1 ""Reloj 2 ""Todo " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) +#define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define LEN_FUNCSOUNDS TR("\004", "\006") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Avs1""Avs2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Aviso1""Aviso2""Cheep ""Ratata""Tick ""Sirena""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 652776e6e..cead78369 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -206,23 +206,23 @@ #define TR_VFSWFUNC "Sécur.\0 ""Ecolage\0 ""Trim instant." TR_SOUND TR_HAPTIC "Remise à 0\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Rétroécl.\0 " TR_CFN_ADJUST_GVAR TR_CFN_TEST #endif -#define LEN_VFSWRESET "\006" +#define LEN_VFSWRESET TR("\004","\012") #if defined(FRSKY) - #define TR_FSW_RESET_TELEM "Télém." + #define TR_FSW_RESET_TELEM TR("Télm","Télémesure") #else #define TR_FSW_RESET_TELEM #endif #if ROTARY_ENCODERS == 2 - #define TR_FSW_RESET_ROTENC TR("ERa\0 ""ERb\0 ", "EncRot A\0""EncRot B\0") + #define TR_FSW_RESET_ROTENC TR("ERa\0""ERb\0","Enc.Rot.A\0""Enc.Rot.B\0") #elif ROTARY_ENCODERS == 1 - #define TR_FSW_RESET_ROTENC TR("Enc.r", "EncRot\0 ") + #define TR_FSW_RESET_ROTENC TR("EncR", "Enc.Rot\0 ") #else #define TR_FSW_RESET_ROTENC #endif -#define TR_VFSWRESET "Timer1""Timer2""Timers" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC +#define TR_VFSWRESET TR("Chr1""Chr2""Tout" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC,"Chrono 1\0 ""Chrono 2\0 ""Tout\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define LEN_FUNCSOUNDS TR("\004", "\006") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 3a2c62fca..77c3df905 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -206,23 +206,23 @@ #define TR_VFSWFUNC "Blocco\0 ""Maestro \0 ""Trim Instant " TR_SOUND TR_HAPTIC "Azzera\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Retroillum.\0 " TR_CFN_ADJUST_GVAR TR_CFN_TEST #endif -#define LEN_VFSWRESET "\006" +#define LEN_VFSWRESET TR("\004", "\011") #if defined(FRSKY) - #define TR_FSW_RESET_TELEM "Telem." + #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") #else - #define TR_FSW_RESET_TELEM + #define TR_FSW_RESET_TELEM #endif #if ROTARY_ENCODERS == 2 - #define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") + #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 ") + #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ") #else #define TR_FSW_RESET_ROTENC #endif -#define TR_VFSWRESET "Timer1""Timer2""Tutto " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC +#define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define LEN_FUNCSOUNDS TR("\004", "\006") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 5525754ed..0db88862e 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -207,23 +207,23 @@ #define TR_VFSWFUNC "Bezp.\0 ""Trener \0 ""Inst-Trim " TR_SOUND TR_HAPTIC "Reset " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Podświetl. " TR_CFN_ADJUST_GVAR TR_CFN_TEST #endif -#define LEN_VFSWRESET "\005" +#define LEN_VFSWRESET TR("\004", "\011") #if defined(FRSKY) - #define TR_FSW_RESET_TELEM "Telem" -#else + #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") +#else #define TR_FSW_RESET_TELEM #endif #if ROTARY_ENCODERS == 2 - #define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") + #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 ") + #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ") #else -#define TR_FSW_RESET_ROTENC + #define TR_FSW_RESET_ROTENC #endif -#define TR_VFSWRESET "Tmr1\0""Tmr2\0""ALL\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC +#define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define LEN_FUNCSOUNDS TR("\004", "\006") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 691c840af..dd367ea37 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -206,23 +206,23 @@ #define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Ajuste Rapido" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Backlight\0 " TR_CFN_ADJUST_GVAR TR_CFN_TEST #endif -#define LEN_VFSWRESET "\006" +#define LEN_VFSWRESET TR("\004", "\011") #if defined(FRSKY) - #define TR_FSW_RESET_TELEM "Telem." + #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") #else - #define TR_FSW_RESET_TELEM + #define TR_FSW_RESET_TELEM #endif #if ROTARY_ENCODERS == 2 - #define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") + #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 ") + #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ") #else #define TR_FSW_RESET_ROTENC #endif -#define TR_VFSWRESET "Tempo1""Tempo2""Todo " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC +#define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define LEN_FUNCSOUNDS TR("\004", "\006") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Avis1 ""Avis2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 68de29549..aef2acc3b 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -206,23 +206,23 @@ #define TR_VFSWFUNC "Säkra\0 ""Trainer\0 ""Sätt Trim\0" TR_SOUND TR_HAPTIC "Nollställ\0" TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Belysning\0" TR_CFN_ADJUST_GVAR TR_CFN_TEST #endif -#define LEN_VFSWRESET TR("\005", "\011") +#define LEN_VFSWRESET TR("\004", "\011") #if defined(FRSKY) - #define TR_FSW_RESET_TELEM TR("Telem", "Telemetri") + #define TR_FSW_RESET_TELEM TR("Telm", "Telemetry") #else - #define TR_FSW_RESET_TELEM + #define TR_FSW_RESET_TELEM #endif #if ROTARY_ENCODERS == 2 - #define TR_FSW_RESET_ROTENC TR("REa\0 ""REb\0 ", "RotEnc A\0""RotEnc B\0") + #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 ") + #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ") #else #define TR_FSW_RESET_ROTENC #endif -#define TR_VFSWRESET TR("Tmr1\0""Tmr2\0""Allt\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1 ""Timer 2 ""Allt " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) +#define TR_VFSWRESET TR("Tmr1""Tmr2""All\0" TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC, "Timer 1\0 ""Timer 2\0 ""All\0 " TR_FSW_RESET_TELEM TR_FSW_RESET_ROTENC) #define LEN_FUNCSOUNDS TR("\004", "\006") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk")