diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp index 63ca2c775..f04d8eb3c 100644 --- a/companion/src/helpers.cpp +++ b/companion/src/helpers.cpp @@ -370,7 +370,7 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin b->clear(); - if (context != MixesContext) { + if (context != MixesContext && context != GlobalFunctionsContext) { // !FMx if (IS_ARM(GetCurrentFirmware()->getBoard())) { for (int i=-GetCurrentFirmware()->getCapability(FlightModes); i<0; i++) { @@ -381,10 +381,12 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin } } - for (int i=-GetCurrentFirmware()->getCapability(LogicalSwitches); i<0; i++) { - item = RawSwitch(SWITCH_TYPE_VIRTUAL, i); - b->addItem(item.toString(), item.toValue()); - if (item == value) b->setCurrentIndex(b->count()-1); + if (context != GlobalFunctionsContext) { + for (int i=-GetCurrentFirmware()->getCapability(LogicalSwitches); i<0; i++) { + item = RawSwitch(SWITCH_TYPE_VIRTUAL, i); + b->addItem(item.toString(), item.toValue()); + if (item == value) b->setCurrentIndex(b->count()-1); + } } for (int i=-GetCurrentFirmware()->getCapability(RotaryEncoders); i<0; i++) { @@ -460,13 +462,15 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin if (item == value) b->setCurrentIndex(b->count()-1); } - for (int i=1; i<=GetCurrentFirmware()->getCapability(LogicalSwitches); i++) { - item = RawSwitch(SWITCH_TYPE_VIRTUAL, i); - b->addItem(item.toString(), item.toValue()); - if (item == value) b->setCurrentIndex(b->count()-1); + if (context != GlobalFunctionsContext) { + for (int i=1; i<=GetCurrentFirmware()->getCapability(LogicalSwitches); i++) { + item = RawSwitch(SWITCH_TYPE_VIRTUAL, i); + b->addItem(item.toString(), item.toValue()); + if (item == value) b->setCurrentIndex(b->count()-1); + } } - if (context == CustomFunctionsContext) { + if (context == SpecialFunctionsContext || context == GlobalFunctionsContext) { // ON item = RawSwitch(SWITCH_TYPE_ON); b->addItem(item.toString(), item.toValue()); @@ -478,7 +482,7 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin } // FMx - if (context != MixesContext) { + if (context != MixesContext && context != GlobalFunctionsContext) { if (IS_ARM(GetCurrentFirmware()->getBoard())) { for (int i=1; i<=GetCurrentFirmware()->getCapability(FlightModes); i++) { item = RawSwitch(SWITCH_TYPE_FLIGHT_MODE, i); diff --git a/companion/src/helpers.h b/companion/src/helpers.h index 45a1bf9b5..f831f5190 100644 --- a/companion/src/helpers.h +++ b/companion/src/helpers.h @@ -88,7 +88,8 @@ class CurveGroup : public QObject { enum SwitchContext { LogicalSwitchesContext, - CustomFunctionsContext, + SpecialFunctionsContext, + GlobalFunctionsContext, TimersContext, MixesContext }; diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp index f9b4b0f7f..bae50a3ac 100644 --- a/companion/src/modeledit/customfunctions.cpp +++ b/companion/src/modeledit/customfunctions.cpp @@ -110,7 +110,10 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model, label->setContextMenuPolicy(Qt::CustomContextMenu); label->setMouseTracking(true); label->setProperty("index", i); - label->setText(tr("SF%1").arg(i+1)); + if (model) + label->setText(tr("SF%1").arg(i+1)); + else + label->setText(tr("GF%1").arg(i+1)); label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum); connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(fsw_customContextMenuRequested(QPoint))); gridLayout->addWidget(label, i+1, 0); @@ -524,7 +527,7 @@ void CustomFunctionsPanel::update() lock = true; for (int i=0; igetCapability(CustomFunctions); i++) { if (!initialized) { - populateSwitchCB(fswtchSwtch[i], functions[i].swtch, generalSettings, CustomFunctionsContext); + populateSwitchCB(fswtchSwtch[i], functions[i].swtch, generalSettings, model ? SpecialFunctionsContext : GlobalFunctionsContext); populateFuncCB(fswtchFunc[i], functions[i].func); populateGVmodeCB(fswtchGVmode[i], functions[i].adjustMode); populateFuncParamCB(fswtchParamT[i], functions[i].func, functions[i].param, functions[i].adjustMode); @@ -545,7 +548,7 @@ void CustomFunctionsPanel::fswPaste() CustomFunctionData *fsw = &functions[selectedFunction]; memcpy(fsw, fswData.mid(0, sizeof(CustomFunctionData)).constData(), sizeof(CustomFunctionData)); lock = true; - populateSwitchCB(fswtchSwtch[selectedFunction], functions[selectedFunction].swtch, generalSettings, CustomFunctionsContext); + populateSwitchCB(fswtchSwtch[selectedFunction], functions[selectedFunction].swtch, generalSettings, model ? SpecialFunctionsContext : GlobalFunctionsContext); populateFuncCB(fswtchFunc[selectedFunction], functions[selectedFunction].func); populateGVmodeCB(fswtchGVmode[selectedFunction], functions[selectedFunction].adjustMode); populateFuncParamCB(fswtchParamT[selectedFunction], functions[selectedFunction].func, functions[selectedFunction].param, functions[selectedFunction].adjustMode); @@ -561,7 +564,7 @@ void CustomFunctionsPanel::fswDelete() functions[selectedFunction].clear(); // TODO update switch and func lock = true; - populateSwitchCB(fswtchSwtch[selectedFunction], functions[selectedFunction].swtch, generalSettings, CustomFunctionsContext); + populateSwitchCB(fswtchSwtch[selectedFunction], functions[selectedFunction].swtch, generalSettings, model ? SpecialFunctionsContext : GlobalFunctionsContext); populateFuncCB(fswtchFunc[selectedFunction], functions[selectedFunction].func); refreshCustomFunction(selectedFunction); lock = false; diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index c2120ddca..791b6cac5 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -5165,7 +5165,7 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu uint8_t k = i+s_pgOfs; #if LCD_W >= 212 - putsStrIdx(0, y, STR_CF, k+1, (sub==k && m_posHorz<0) ? INVERS : 0); + putsStrIdx(0, y, functions == g_model.customFn ? STR_SF : STR_GF, k+1, (sub==k && m_posHorz<0) ? INVERS : 0); #endif CustomFunctionData *cfn = &functions[k]; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 74763b42e..a4a0dcda2 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -350,7 +350,8 @@ const pm_char STR_MENUSENSOR[] PROGMEM = TR_MENUSENSOR; const pm_char STR_INVERT_THR[] PROGMEM = TR_INVERT_THR; const pm_char STR_AND_SWITCH[] PROGMEM = TR_AND_SWITCH; -extern const pm_char STR_CF[] PROGMEM = TR_CF; +const pm_char STR_SF[] PROGMEM = TR_SF; +const pm_char STR_GF[] PROGMEM = TR_GF; #if defined(FRSKY_HUB) const pm_char STR_MINRSSI[] PROGMEM = TR_MINRSSI; diff --git a/radio/src/translations.h b/radio/src/translations.h index 67193bc03..414f500ce 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -489,7 +489,8 @@ extern const pm_char STR_MENUDEBUG[]; extern const pm_char STR_MENUGLOBALVARS[]; extern const pm_char STR_INVERT_THR[]; extern const pm_char STR_AND_SWITCH[]; -extern const pm_char STR_CF[]; +extern const pm_char STR_SF[]; +extern const pm_char STR_GF[]; #if defined(FAS_OFFSET) || !defined(CPUM64) extern const pm_char STR_FAS_OFFSET[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index d20d88d18..59a92b34e 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -238,7 +238,7 @@ #define TR_PLAY_VALUE "[\221\222TTS]\0 " #endif -#define TR_CFN_BG_MUSIC "BgHudba\0 ""BgHudba ||\0" +#define TR_SF_BG_MUSIC "BgHudba\0 ""BgHudba ||\0" #if defined(SDCARD) #define TR_SDCLOGS "Log na SD\0 " @@ -253,31 +253,31 @@ #endif #if defined(LUA) - #define TR_CFN_PLAY_SCRIPT "Lua Skript\0" + #define TR_SF_PLAY_SCRIPT "Lua Skript\0" #else - #define TR_CFN_PLAY_SCRIPT "[Lua]\0 " + #define TR_SF_PLAY_SCRIPT "[Lua]\0 " #endif #if defined(DEBUG) - #define TR_CFN_TEST "Test\0 " + #define TR_SF_TEST "Test\0 " #else - #define TR_CFN_TEST + #define TR_SF_TEST #endif #if defined(OVERRIDE_CHANNEL_FUNCTION) - #define TR_CFN_SAFETY "Zámek \0 " + #define TR_SF_SAFETY "Zámek \0 " #else - #define TR_CFN_SAFETY "---\0 " + #define TR_SF_SAFETY "---\0 " #endif -#define TR_CFN_RESERVE "[rezerva]\0 " +#define TR_SF_RESERVE "[rezerva]\0 " #if defined(CPUARM) - #define TR_VFSWFUNC TR_CFN_SAFETY "Trenér \0 ""Insta-Trim\0""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Hlasitost\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_PLAY_SCRIPT TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podsvětlení" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trenér \0 ""Insta-Trim\0""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Hlasitost\0 " TR_SF_RESERVE TR_SF_RESERVE TR_SF_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podsvětlení" TR_SF_TEST #elif defined(PCBGRUVIN9X) - #define TR_VFSWFUNC TR_CFN_SAFETY "Trenér \0 ""Insta-Trim\0""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podsvětlení" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trenér \0 ""Insta-Trim\0""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podsvětlení" TR_SF_TEST #else - #define TR_VFSWFUNC TR_CFN_SAFETY "Trenér \0 ""Insta-Trim\0""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Podsvětlení" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trenér \0 ""Insta-Trim\0""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Podsvětlení" TR_SF_TEST #endif #define LEN_VFSWRESET TR("\004", "\012") @@ -809,7 +809,8 @@ #define TR_STATISTICS "Statistika" #define TR_ABOUT_US "O nás" #define TR_AND_SWITCH "AND Spínač" -#define TR_CF "SF" +#define TR_SF "SF" +#define TR_GF "GF" #define TR_SPEAKER INDENT"Repro" #define TR_BUZZER INDENT"Pípák" #define TR_BYTES "[B]" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 7cce54797..00ae755b9 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -238,7 +238,7 @@ #define TR_PLAY_VALUE "[Sag Wert]" #endif -#define TR_CFN_BG_MUSIC "StartMusik""Stop Musik" +#define TR_SF_BG_MUSIC "StartMusik""Stop Musik" #if defined(SDCARD) #define TR_SDCLOGS "SD-Aufz.\0 " @@ -253,33 +253,33 @@ #endif #if defined(LUA) - #define TR_CFN_PLAY_SCRIPT "Lua Script" + #define TR_SF_PLAY_SCRIPT "Lua Script" #else - #define TR_CFN_PLAY_SCRIPT "[Lua]\0 " + #define TR_SF_PLAY_SCRIPT "[Lua]\0 " #endif #if defined(DEBUG) - #define TR_CFN_TEST "Test\0 " + #define TR_SF_TEST "Test\0 " #else - #define TR_CFN_TEST + #define TR_SF_TEST #endif #if defined(OVERRIDE_CHANNEL_FUNCTION) && LCD_W >= 212 - #define TR_CFN_SAFETY "Override\0 " //"Override\0 " + #define TR_SF_SAFETY "Override\0 " //"Override\0 " #elif defined(OVERRIDE_CHANNEL_FUNCTION) - #define TR_CFN_SAFETY "Overr.\0 " //"Overr.\0 " + #define TR_SF_SAFETY "Overr.\0 " //"Overr.\0 " #else - #define TR_CFN_SAFETY "---\0 " + #define TR_SF_SAFETY "---\0 " #endif -#define TR_CFN_RESERVE "[Reserve]\0" +#define TR_SF_RESERVE "[Reserve]\0" #if defined(CPUARM) - #define TR_VFSWFUNC TR_CFN_SAFETY "Lehrer \0 ""Inst. Trim""Rücksetz.\0""Setze \0 " TR_ADJUST_GVAR "Lautstr.\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_PLAY_SCRIPT TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "LCD Licht\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Lehrer \0 ""Inst. Trim""Rücksetz.\0""Setze \0 " TR_ADJUST_GVAR "Lautstr.\0 " TR_SF_RESERVE TR_SF_RESERVE TR_SF_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "LCD Licht\0" TR_SF_TEST #elif defined(PCBGRUVIN9X) - #define TR_VFSWFUNC TR_CFN_SAFETY "Lehrer \0 ""Inst. Trim""Rücksetz.\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "LCD Licht\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Lehrer \0 ""Inst. Trim""Rücksetz.\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "LCD Licht\0" TR_SF_TEST #else - #define TR_VFSWFUNC TR_CFN_SAFETY "Lehrer \0 ""Inst. Trim""Rücksetz.\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "LCD Licht\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Lehrer \0 ""Inst. Trim""Rücksetz.\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "LCD Licht\0" TR_SF_TEST #endif #define LEN_VFSWRESET TR("\004", "\011") @@ -813,7 +813,8 @@ #define TR_STATISTICS "Statistik und Gas" #define TR_ABOUT_US "Die Programmierer" #define TR_AND_SWITCH "UND Schalt" //UND mit weiterem Schaltern -#define TR_CF "SF" //Spezial Funktionen engl. CF +#define TR_SF "SF" //Spezial Funktionen engl. CF +#define TR_GF "GF" #define TR_SPEAKER INDENT"Lautspr" #define TR_BUZZER INDENT"Summer" #define TR_BYTES "Bytes" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 54ff0b12f..540aec04d 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -238,7 +238,7 @@ #define TR_PLAY_VALUE "[Play Val]" #endif -#define TR_CFN_BG_MUSIC "BgMusic\0 ""BgMusic ||" +#define TR_SF_BG_MUSIC "BgMusic\0 ""BgMusic ||" #if defined(SDCARD) #define TR_SDCLOGS "SD Logs\0 " @@ -253,33 +253,33 @@ #endif #if defined(LUA) - #define TR_CFN_PLAY_SCRIPT "Lua Script" + #define TR_SF_PLAY_SCRIPT "Lua Script" #else - #define TR_CFN_PLAY_SCRIPT "[Lua]\0 " + #define TR_SF_PLAY_SCRIPT "[Lua]\0 " #endif #if defined(DEBUG) - #define TR_CFN_TEST "Test\0" + #define TR_SF_TEST "Test\0" #else - #define TR_CFN_TEST + #define TR_SF_TEST #endif #if defined(OVERRIDE_CHANNEL_FUNCTION) && LCD_W >= 212 - #define TR_CFN_SAFETY "Override\0 " + #define TR_SF_SAFETY "Override\0 " #elif defined(OVERRIDE_CHANNEL_FUNCTION) - #define TR_CFN_SAFETY "Overr.\0 " + #define TR_SF_SAFETY "Overr.\0 " #else - #define TR_CFN_SAFETY "---\0 " + #define TR_SF_SAFETY "---\0 " #endif -#define TR_CFN_RESERVE "[reserve]\0" +#define TR_SF_RESERVE "[reserve]\0" #if defined(CPUARM) - #define TR_VFSWFUNC TR_CFN_SAFETY "Trainer\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_PLAY_SCRIPT TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trainer\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_SF_RESERVE TR_SF_RESERVE TR_SF_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_SF_TEST #elif defined(PCBGRUVIN9X) - #define TR_VFSWFUNC TR_CFN_SAFETY "Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_SF_TEST #else - #define TR_VFSWFUNC TR_CFN_SAFETY "Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Backlight\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Backlight\0" TR_SF_TEST #endif #define LEN_VFSWRESET TR("\004", "\011") @@ -826,7 +826,8 @@ #define TR_STATISTICS "Statistics" #define TR_ABOUT_US "About" #define TR_AND_SWITCH "AND Switch" -#define TR_CF "SF" +#define TR_SF "SF" +#define TR_GF "GF" #define TR_SPEAKER INDENT "Speaker" #define TR_BUZZER INDENT "Buzzer" #define TR_BYTES "bytes" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index bbbe40c2d..f3e70d197 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -238,7 +238,7 @@ #define TR_PLAY_VALUE "[OirValor]" #endif -#define TR_CFN_BG_MUSIC "BgMusica\0 ""BgMusica||" +#define TR_SF_BG_MUSIC "BgMusica\0 ""BgMusica||" #if defined(SDCARD) #define TR_SDCLOGS "SD Logs\0 " @@ -253,31 +253,31 @@ #endif #if defined(LUA) - #define TR_CFN_PLAY_SCRIPT "Lua Script" + #define TR_SF_PLAY_SCRIPT "Lua Script" #else - #define TR_CFN_PLAY_SCRIPT "[Lua]\0 " + #define TR_SF_PLAY_SCRIPT "[Lua]\0 " #endif #if defined(DEBUG) - #define TR_CFN_TEST "Test\0" + #define TR_SF_TEST "Test\0" #else - #define TR_CFN_TEST + #define TR_SF_TEST #endif #if defined(OVERRIDE_CHANNEL_FUNCTION) - #define TR_CFN_SAFETY "Seguro\0 " + #define TR_SF_SAFETY "Seguro\0 " #else - #define TR_CFN_SAFETY "---\0 " + #define TR_SF_SAFETY "---\0 " #endif -#define TR_CFN_RESERVE "[reserve]\0" +#define TR_SF_RESERVE "[reserve]\0" #if defined(CPUARM) - #define TR_VFSWFUNC TR_CFN_SAFETY "Aprendiz\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volumen\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_PLAY_SCRIPT TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Luz fondo\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Aprendiz\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volumen\0 " TR_SF_RESERVE TR_SF_RESERVE TR_SF_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Luz fondo\0" TR_SF_TEST #elif defined(PCBGRUVIN9X) - #define TR_VFSWFUNC TR_CFN_SAFETY "Aprendiz\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Luz fondo\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Aprendiz\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Luz fondo\0" TR_SF_TEST #else - #define TR_VFSWFUNC TR_CFN_SAFETY "Aprendiz\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Luz fondo\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Aprendiz\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Luz fondo\0" TR_SF_TEST #endif #define LEN_VFSWRESET TR("\004", "\011") @@ -806,7 +806,8 @@ #define TR_STATISTICS "Estadisticas" #define TR_ABOUT_US "Nosotros" #define TR_AND_SWITCH "AND Inter." -#define TR_CF "CF" +#define TR_SF "CF" +#define TR_GF "GF" #define TR_SPEAKER INDENT"Altavoz" #define TR_BUZZER INDENT"Zumbador" #define TR_BYTES "bytes" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 5ee817af8..5d293bdf7 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -238,7 +238,7 @@ #define TR_PLAY_VALUE "[Play Val]" #endif -#define TR_CFN_BG_MUSIC "BgMusic\0 ""BgMusic ||" +#define TR_SF_BG_MUSIC "BgMusic\0 ""BgMusic ||" #if defined(SDCARD) #define TR_SDCLOGS "SD Logs\0 " @@ -253,31 +253,31 @@ #endif #if defined(LUA) - #define TR_CFN_PLAY_SCRIPT "Lua Script" + #define TR_SF_PLAY_SCRIPT "Lua Script" #else - #define TR_CFN_PLAY_SCRIPT "[Lua]\0 " + #define TR_SF_PLAY_SCRIPT "[Lua]\0 " #endif #if defined(DEBUG) - #define TR_CFN_TEST "Test\0" + #define TR_SF_TEST "Test\0" #else - #define TR_CFN_TEST + #define TR_SF_TEST #endif #if defined(OVERRIDE_CHANNEL_FUNCTION) - #define TR_CFN_SAFETY "Safety\0 " + #define TR_SF_SAFETY "Safety\0 " #else - #define TR_CFN_SAFETY "---\0 " + #define TR_SF_SAFETY "---\0 " #endif -#define TR_CFN_RESERVE "[reserve]\0" +#define TR_SF_RESERVE "[reserve]\0" #if defined(CPUARM) - #define TR_VFSWFUNC TR_CFN_SAFETY "Trainer\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_PLAY_SCRIPT TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trainer\0 ""Inst. Trim""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_SF_RESERVE TR_SF_RESERVE TR_SF_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_SF_TEST #elif defined(PCBGRUVIN9X) - #define TR_VFSWFUNC TR_CFN_SAFETY "Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0" TR_SF_TEST #else - #define TR_VFSWFUNC TR_CFN_SAFETY "Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Backlight\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trainer\0 ""Inst. Trim""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Backlight\0" TR_SF_TEST #endif #define LEN_VFSWRESET TR("\004", "\011") @@ -806,7 +806,8 @@ #define TR_STATISTICS "Statistics" #define TR_ABOUT_US "About" #define TR_AND_SWITCH "AND Switch" -#define TR_CF "CF" +#define TR_SF "CF" +#define TR_GF "GF" #define TR_SPEAKER INDENT"Speaker" #define TR_BUZZER INDENT"Buzzer" #define TR_BYTES "bytes" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index ca5614948..612d53b8c 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -238,7 +238,7 @@ #define TR_PLAY_VALUE "[Dire valeur]" #endif -#define TR_CFN_BG_MUSIC "Musique\0 ""Pause Musique" +#define TR_SF_BG_MUSIC "Musique\0 ""Pause Musique" #if defined(SDCARD) #define TR_SDCLOGS "Logs SD\0 " @@ -253,31 +253,31 @@ #endif #if defined(LUA) - #define TR_CFN_PLAY_SCRIPT "Script Lua\0 " + #define TR_SF_PLAY_SCRIPT "Script Lua\0 " #else - #define TR_CFN_PLAY_SCRIPT "[Lua]\0 " + #define TR_SF_PLAY_SCRIPT "[Lua]\0 " #endif #if defined(DEBUG) - #define TR_CFN_TEST "Test\0 " + #define TR_SF_TEST "Test\0 " #else - #define TR_CFN_TEST + #define TR_SF_TEST #endif #if defined(OVERRIDE_CHANNEL_FUNCTION) - #define TR_CFN_SAFETY "Rempl.\0 " + #define TR_SF_SAFETY "Rempl.\0 " #else - #define TR_CFN_SAFETY "---\0 " + #define TR_SF_SAFETY "---\0 " #endif -#define TR_CFN_RESERVE "[reserve]\0 " +#define TR_SF_RESERVE "[reserve]\0 " #if defined(CPUARM) - #define TR_VFSWFUNC TR_CFN_SAFETY "Ecolage\0 ""Trim instant.""Remise à 0\0 ""Déf.\0 " TR_ADJUST_GVAR "Volume\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_PLAY_SCRIPT TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Rétroécl.\0 " TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Ecolage\0 ""Trim instant.""Remise à 0\0 ""Déf.\0 " TR_ADJUST_GVAR "Volume\0 " TR_SF_RESERVE TR_SF_RESERVE TR_SF_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Rétroécl.\0 " TR_SF_TEST #elif defined(PCBGRUVIN9X) - #define TR_VFSWFUNC TR_CFN_SAFETY "Ecolage\0 ""Trim instant.""Remise à 0\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Rétroécl.\0 " TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Ecolage\0 ""Trim instant.""Remise à 0\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Rétroécl.\0 " TR_SF_TEST #else - #define TR_VFSWFUNC TR_CFN_SAFETY "Ecolage\0 ""Trim instant.""Remise à 0\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Rétroécl.\0 " TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Ecolage\0 ""Trim instant.""Remise à 0\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Rétroécl.\0 " TR_SF_TEST #endif #define LEN_VFSWRESET TR("\004", "\012") @@ -806,7 +806,8 @@ #define TR_STATISTICS "Statistiques" #define TR_ABOUT_US "A propos" #define TR_AND_SWITCH "ET suppl." -#define TR_CF "FS" +#define TR_SF "FS" +#define TR_GF "GF" #define TR_SPEAKER INDENT "Haut-p." #define TR_BUZZER INDENT "Bipeur" #define TR_BYTES "bytes" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 392ea9848..d7fc4d0b0 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -238,7 +238,7 @@ #define TR_PLAY_VALUE "[LeggiValore]" #endif -#define TR_CFN_BG_MUSIC "Musica Sf\0 ""Musica Sf ||\0" +#define TR_SF_BG_MUSIC "Musica Sf\0 ""Musica Sf ||\0" #if defined(SDCARD) #define TR_SDCLOGS "SDCARD Logs\0 " @@ -253,31 +253,31 @@ #endif #if defined(LUA) - #define TR_CFN_PLAY_SCRIPT "Script Lua\0 " + #define TR_SF_PLAY_SCRIPT "Script Lua\0 " #else - #define TR_CFN_PLAY_SCRIPT "[Lua]\0 " + #define TR_SF_PLAY_SCRIPT "[Lua]\0 " #endif #if defined(DEBUG) - #define TR_CFN_TEST "Test\0 " + #define TR_SF_TEST "Test\0 " #else - #define TR_CFN_TEST + #define TR_SF_TEST #endif #if defined(OVERRIDE_CHANNEL_FUNCTION) - #define TR_CFN_SAFETY "Blocco\0 " + #define TR_SF_SAFETY "Blocco\0 " #else - #define TR_CFN_SAFETY "---\0 " + #define TR_SF_SAFETY "---\0 " #endif -#define TR_CFN_RESERVE "[riserva] \0" +#define TR_SF_RESERVE "[riserva] \0" #if defined(CPUARM) - #define TR_VFSWFUNC TR_CFN_SAFETY "Maestro \0 ""Trim Instant.""Azzera\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_PLAY_SCRIPT TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Retroillum.\0 " TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Maestro \0 ""Trim Instant.""Azzera\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_SF_RESERVE TR_SF_RESERVE TR_SF_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Retroillum.\0 " TR_SF_TEST #elif defined(PCBGRUVIN9X) - #define TR_VFSWFUNC TR_CFN_SAFETY "Maestro \0 ""Trim Instant.""Azzera\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Retroillum.\0 " TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Maestro \0 ""Trim Instant.""Azzera\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Retroillum.\0 " TR_SF_TEST #else - #define TR_VFSWFUNC TR_CFN_SAFETY "Maestro \0 ""Trim Instant.""Azzera\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Retroillum.\0 " TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Maestro \0 ""Trim Instant.""Azzera\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Retroillum.\0 " TR_SF_TEST #endif #define LEN_VFSWRESET TR("\004", "\011") @@ -806,7 +806,8 @@ #define TR_STATISTICS "Statistiche" #define TR_ABOUT_US "Info su" #define TR_AND_SWITCH "Inter. AND" -#define TR_CF "CF" +#define TR_SF "CF" +#define TR_GF "GF" #define TR_SPEAKER INDENT"Speaker" #define TR_BUZZER INDENT"Buzzer" #define TR_BYTES "Bytes" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 5ee7b4e5d..5ff146353 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -238,7 +238,7 @@ #define TR_PLAY_VALUE "[Graj War]" #endif -#define TR_CFN_BG_MUSIC "Muz. tła\0 ""Muz.tła ||" +#define TR_SF_BG_MUSIC "Muz. tła\0 ""Muz.tła ||" #if defined(SDCARD) #define TR_SDCLOGS "Logi->SD\0 " @@ -253,31 +253,31 @@ #endif #if defined(LUA) - #define TR_CFN_PLAY_SCRIPT "Skrypty Lua" + #define TR_SF_PLAY_SCRIPT "Skrypty Lua" #else - #define TR_CFN_PLAY_SCRIPT "[Lua]\0 " + #define TR_SF_PLAY_SCRIPT "[Lua]\0 " #endif #if defined(DEBUG) - #define TR_CFN_TEST "Test\0" + #define TR_SF_TEST "Test\0" #else - #define TR_CFN_TEST + #define TR_SF_TEST #endif #if defined(OVERRIDE_CHANNEL_FUNCTION) - #define TR_CFN_SAFETY "Bezp.\0 " + #define TR_SF_SAFETY "Bezp.\0 " #else - #define TR_CFN_SAFETY "---\0 " + #define TR_SF_SAFETY "---\0 " #endif -#define TR_CFN_RESERVE "[rezerwa]\0" +#define TR_SF_RESERVE "[rezerwa]\0" #if defined(CPUARM) - #define TR_VFSWFUNC TR_CFN_SAFETY "Trener \0 ""Inst-Trim ""Resetuj\0 ""Ustaw\0 " TR_ADJUST_GVAR "Głośność\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_PLAY_SCRIPT TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trener \0 ""Inst-Trim ""Resetuj\0 ""Ustaw\0 " TR_ADJUST_GVAR "Głośność\0 " TR_SF_RESERVE TR_SF_RESERVE TR_SF_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl\0" TR_SF_TEST #elif defined(PCBGRUVIN9X) - #define TR_VFSWFUNC TR_CFN_SAFETY "Trener \0 ""Inst-Trim ""Resetuj\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trener \0 ""Inst-Trim ""Resetuj\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Podświetl\0" TR_SF_TEST #else - #define TR_VFSWFUNC TR_CFN_SAFETY "Trener \0 ""Inst-Trim ""Resetuj\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Podświetl\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trener \0 ""Inst-Trim ""Resetuj\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Podświetl\0" TR_SF_TEST #endif #define LEN_VFSWRESET TR("\004", "\011") @@ -806,7 +806,8 @@ #define TR_STATISTICS "Statystyki" #define TR_ABOUT_US "O nas" #define TR_AND_SWITCH "Przełącznik AND" -#define TR_CF "FS" +#define TR_SF "FS" +#define TR_GF "GF" #define TR_SPEAKER INDENT"Głośnik" #define TR_BUZZER INDENT"Brzęczyk" #define TR_BYTES "bajty" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 491abbf37..ed555c8f1 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -238,7 +238,7 @@ #define TR_PLAY_VALUE "[Tocar Valor]" #endif -#define TR_CFN_BG_MUSIC "BgMusic\0 ""BgMusic ||\0 " +#define TR_SF_BG_MUSIC "BgMusic\0 ""BgMusic ||\0 " #if defined(SDCARD) #define TR_SDCLOGS "SDCARD Logs\0 " @@ -253,31 +253,31 @@ #endif #if defined(LUA) - #define TR_CFN_PLAY_SCRIPT "Lua Script\0 " + #define TR_SF_PLAY_SCRIPT "Lua Script\0 " #else - #define TR_CFN_PLAY_SCRIPT "[Lua]\0 " + #define TR_SF_PLAY_SCRIPT "[Lua]\0 " #endif #if defined(DEBUG) - #define TR_CFN_TEST "Teste\0 " + #define TR_SF_TEST "Teste\0 " #else - #define TR_CFN_TEST + #define TR_SF_TEST #endif #if defined(OVERRIDE_CHANNEL_FUNCTION) - #define TR_CFN_SAFETY "Seguro\0 " + #define TR_SF_SAFETY "Seguro\0 " #else - #define TR_CFN_SAFETY "---\0 " + #define TR_SF_SAFETY "---\0 " #endif -#define TR_CFN_RESERVE "[reserve]\0 " +#define TR_SF_RESERVE "[reserve]\0 " #if defined(CPUARM) - #define TR_VFSWFUNC TR_CFN_SAFETY "Aprendiz\0 ""Ajuste Rapido""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_PLAY_SCRIPT TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0 " TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Aprendiz\0 ""Ajuste Rapido""Reset\0 ""Set \0 " TR_ADJUST_GVAR "Volume\0 " TR_SF_RESERVE TR_SF_RESERVE TR_SF_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0 " TR_SF_TEST #elif defined(PCBGRUVIN9X) - #define TR_VFSWFUNC TR_CFN_SAFETY "Aprendiz\0 ""Ajuste Rapido""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0 " TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Aprendiz\0 ""Ajuste Rapido""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Backlight\0 " TR_SF_TEST #else - #define TR_VFSWFUNC TR_CFN_SAFETY "Aprendiz\0 ""Ajuste Rapido""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Backlight\0 " TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Aprendiz\0 ""Ajuste Rapido""Reset\0 " TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Backlight\0 " TR_SF_TEST #endif #define LEN_VFSWRESET TR("\004", "\011") @@ -806,7 +806,8 @@ #define TR_STATISTICS "Statistics" #define TR_ABOUT_US "About Us" #define TR_AND_SWITCH "AND Switch" -#define TR_CF "CF" +#define TR_SF "CF" +#define TR_GF "GF" #define TR_SPEAKER INDENT"Speaker" #define TR_BUZZER INDENT"Buzzer" #define TR_BYTES "bytes" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 25f890961..985a45c23 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -238,7 +238,7 @@ #define TR_PLAY_VALUE "[Sp. Värd]" #endif -#define TR_CFN_BG_MUSIC "BgMusik\0 ""BgMusik ||" +#define TR_SF_BG_MUSIC "BgMusik\0 ""BgMusik ||" #if defined(SDCARD) #define TR_SDCLOGS "SD Loggar\0" @@ -253,31 +253,31 @@ #endif #if defined(LUA) - #define TR_CFN_PLAY_SCRIPT "Lua Script" + #define TR_SF_PLAY_SCRIPT "Lua Script" #else - #define TR_CFN_PLAY_SCRIPT "[Lua]\0 " + #define TR_SF_PLAY_SCRIPT "[Lua]\0 " #endif #if defined(DEBUG) - #define TR_CFN_TEST "Test\0" + #define TR_SF_TEST "Test\0" #else - #define TR_CFN_TEST + #define TR_SF_TEST #endif #if defined(OVERRIDE_CHANNEL_FUNCTION) - #define TR_CFN_SAFETY "Säkra \0 " + #define TR_SF_SAFETY "Säkra \0 " #else - #define TR_CFN_SAFETY "---\0 " + #define TR_SF_SAFETY "---\0 " #endif -#define TR_CFN_RESERVE "[reserve]\0" +#define TR_SF_RESERVE "[reserve]\0" #if defined(CPUARM) - #define TR_VFSWFUNC TR_CFN_SAFETY "Trainer\0 ""Sätt Trim\0""Nollställ\0""Sätt\0 " TR_ADJUST_GVAR "Volym\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_PLAY_SCRIPT TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Belysning\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trainer\0 ""Sätt Trim\0""Nollställ\0""Sätt\0 " TR_ADJUST_GVAR "Volym\0 " TR_SF_RESERVE TR_SF_RESERVE TR_SF_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "Belysning\0" TR_SF_TEST #elif defined(PCBGRUVIN9X) - #define TR_VFSWFUNC TR_CFN_SAFETY "Trainer \0 ""Sätt Trim\0""Nollställ\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Belysning\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trainer \0 ""Sätt Trim\0""Nollställ\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "Belysning\0" TR_SF_TEST #else - #define TR_VFSWFUNC TR_CFN_SAFETY "Trainer \0 ""Sätt Trim\0""Nollställ\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Belysning\0" TR_CFN_TEST + #define TR_VFSWFUNC TR_SF_SAFETY "Trainer \0 ""Sätt Trim\0""Nollställ\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "Belysning\0" TR_SF_TEST #endif #define LEN_VFSWRESET TR("\004", "\011") @@ -806,7 +806,8 @@ #define TR_STATISTICS "Statistik" #define TR_ABOUT_US "Om Oss" #define TR_AND_SWITCH "OCH Brytare" -#define TR_CF "BF" +#define TR_SF "BF" +#define TR_GF "GF" #define TR_SPEAKER INDENT"Högtalare" #define TR_BUZZER INDENT"Summer" #define TR_BYTES "byte"