diff --git a/radio/src/gui/colorlcd/radio_setup.cpp b/radio/src/gui/colorlcd/radio_setup.cpp index b52baabde..810dcbf17 100644 --- a/radio/src/gui/colorlcd/radio_setup.cpp +++ b/radio/src/gui/colorlcd/radio_setup.cpp @@ -733,12 +733,10 @@ void RadioSetupPage::build(FormWindow * window) resumePulses(); }); choice->setTextHandler([](uint8_t value) { - return std::to_string(1 + value) + ": left=" + + return std::to_string(1 + value) + ": " + STR_LEFT_STICK + " = " + std::string(&getSourceString(MIXSRC_Rud + modn12x3[4 * value])[1]) + "+" + std::string( &getSourceString(MIXSRC_Rud + modn12x3[4 * value + 1])[1]); }); } - - diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 45dbe1724..5484a982a 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -810,6 +810,7 @@ const char STR_WIDGET_TEXT[] = TR_WIDGET_TEXT; const char STR_WIDGET_TIMER[] = TR_WIDGET_TIMER; const char STR_WIDGET_VALUE[] = TR_WIDGET_VALUE; const char STR_MODULES_RX_VERSION[] = TR_MODULES_RX_VERSION; +const char STR_LEFT_STICK[] = TR_LEFT_STICK; #endif #if !defined(COLORLCD) diff --git a/radio/src/translations.h b/radio/src/translations.h index 4dc91bd19..3dba81607 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -719,6 +719,7 @@ extern const char STR_WIDGET_TEXT[]; extern const char STR_WIDGET_TIMER[]; extern const char STR_WIDGET_VALUE[]; extern const char STR_MODULES_RX_VERSION[]; +extern const char STR_LEFT_STICK[]; #endif extern const char STR_EXECUTE_FILE[]; extern const char STR_DELETE_FILE[]; diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index 505274e5c..29b7e0ed6 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -363,6 +363,11 @@ #define TR_AILDIRECTION "横滚方向" #define TR_COLDIRECTION "螺距方向" #define TR_MODE "模式" +#if LCD_W > LCD_H + #define TR_LEFT_STICK "左摇杆" +#else + #define TR_LEFT_STICK "左摇杆" +#endif #define TR_SUBTYPE INDENT "子类型" #define TR_NOFREEEXPO "指数曲线已满!" #define TR_NOFREEMIXER "混控数量已满!" diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index bc413d84b..8f0e7ec63 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -383,6 +383,11 @@ #define TR_AILDIRECTION "\012Křidélka" #define TR_COLDIRECTION "\012Kolektiv" #define TR_MODE "Mód" +#if LCD_W > LCD_H + #define TR_LEFT_STICK "Vlevo" +#else + #define TR_LEFT_STICK "Vlevo" +#endif #define TR_SUBTYPE INDENT "Subtyp" #define TR_NOFREEEXPO "Není volné expo!" #define TR_NOFREEMIXER "Není volný mix!" diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index 3a8aaaa2c..31d1503b4 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -368,6 +368,11 @@ #define TR_AILDIRECTION "KRÆ retning" #define TR_COLDIRECTION "PIT retning" #define TR_MODE "Tilst." +#if LCD_W > LCD_H + #define TR_LEFT_STICK "Venstre" +#else + #define TR_LEFT_STICK "Ven" +#endif #define TR_SUBTYPE INDENT "Subtype" #define TR_NOFREEEXPO "Ingen fri expo!" #define TR_NOFREEMIXER "Ingen fri mix!" diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index b0c98ca7d..312ae7e83 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -369,6 +369,11 @@ #define TR_AILDIRECTION TR("Roll Richtung", "Roll Servo Richtung") #define TR_COLDIRECTION TR("Pitch Richtung", "Pitch Servo Richtung") #define TR_MODE "Modus" +#if LCD_W > LCD_H + #define TR_LEFT_STICK "Links" +#else + #define TR_LEFT_STICK "Li" +#endif #define TR_SUBTYPE INDENT "Subtype" #define TR_NOFREEEXPO "Expos voll!" #define TR_NOFREEMIXER "Mischer voll!" diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 40c97f280..92d65ee48 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -363,6 +363,11 @@ #define TR_AILDIRECTION "AIL Direction" #define TR_COLDIRECTION "PIT Direction" #define TR_MODE "Mode" +#if LCD_W > LCD_H + #define TR_LEFT_STICK "Left" +#else + #define TR_LEFT_STICK "Left" +#endif #define TR_SUBTYPE INDENT "Subtype" #define TR_NOFREEEXPO "No free expo!" #define TR_NOFREEMIXER "No free mixer!" diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index 9c28280fe..7e248c2c5 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -365,6 +365,11 @@ #define TR_AILDIRECTION TR("AIL Dirección", "Lateral cyc. dirección") #define TR_COLDIRECTION TR("PIT Dirección", "Coll. pitch dirección") #define TR_MODE "Modo" +#if LCD_W > LCD_H + #define TR_LEFT_STICK "Izquierdo" +#else + #define TR_LEFT_STICK "Izq" +#endif #define TR_SUBTYPE INDENT "Subtipo" #define TR_NOFREEEXPO "No expo libre!" #define TR_NOFREEMIXER "No mezcla lib!" diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index a571e8bc2..835a02b45 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -391,6 +391,11 @@ #define TR_AILDIRECTION TR("AIL Direction","Lateral cyc. direction") #define TR_COLDIRECTION TR("PIT Direction","Coll. pitch direction") #define TR_MODE "Mode" +#if LCD_W > LCD_H + #define TR_LEFT_STICK "Vasemmalle" +#else + #define TR_LEFT_STICK "Va" +#endif #define TR_SUBTYPE INDENT "Subtype" #define TR_NOFREEEXPO "No free expo!" #define TR_NOFREEMIXER "No free mixer!" diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index 94371323f..b42493a49 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -386,6 +386,11 @@ #define TR_AILDIRECTION TR("Inv. latéral", "Inversion latéral") #define TR_COLDIRECTION TR("Inv. collectif", "Inversion collectif") #define TR_MODE "Mode" +#if LCD_W > LCD_H + #define TR_LEFT_STICK "Gauche" +#else + #define TR_LEFT_STICK "Gauche" +#endif #define TR_SUBTYPE INDENT "Sous-type" #define TR_NOFREEEXPO "Max expos atteint!" #define TR_NOFREEMIXER "Max mixages atteint!" diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index 688162313..f1be3174b 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -370,6 +370,11 @@ #define TR_AILDIRECTION TR("Direzione AIL", "Direzione cic. lat.") #define TR_COLDIRECTION TR("Direzione PIT", "Direzione passo coll.") #define TR_MODE "Modo" +#if LCD_W > LCD_H + #define TR_LEFT_STICK "Sinistro" +#else + #define TR_LEFT_STICK "Sx" +#endif #define TR_SUBTYPE INDENT "Sottotipo" #define TR_NOFREEEXPO "Expo pieni!" #define TR_NOFREEMIXER "Mixer pieni!" diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index 8a10c92c8..6beeb3fe6 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -375,6 +375,11 @@ #define TR_AILDIRECTION "エルロン" #define TR_COLDIRECTION "ピッチ" #define TR_MODE "モード" +#if LCD_W > LCD_H + #define TR_LEFT_STICK "Left" +#else + #define TR_LEFT_STICK "Left" +#endif #define TR_SUBTYPE INDENT "サブタイプ" #define TR_NOFREEEXPO "Expoが未設定です!!" #define TR_NOFREEMIXER "ミキサーが未設定です!!" diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 07c65dff9..a38190340 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -368,6 +368,11 @@ #define TR_AILDIRECTION "AIL Direction" #define TR_COLDIRECTION "PIT Direction" #define TR_MODE "Mode" +#if LCD_W > LCD_H + #define TR_LEFT_STICK "Linkerkant" +#else + #define TR_LEFT_STICK "Li" +#endif #define TR_SUBTYPE INDENT "Subtype" #define TR_NOFREEEXPO "Geen vrije expo!" #define TR_NOFREEMIXER "Geen vrije mixer!" diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 7c488693c..2752d86be 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -365,6 +365,11 @@ #define TR_AILDIRECTION TR("Kierunek Lotk","Lateral cyc. direction") #define TR_COLDIRECTION TR("PIT Direction","Coll. pitch direction") #define TR_MODE "Tryb" +#if LCD_W > LCD_H + #define TR_LEFT_STICK "Lewy" +#else + #define TR_LEFT_STICK "Lewy" +#endif #define TR_SUBTYPE INDENT "Podtyp" #define TR_NOFREEEXPO "BrakWoln.Expo!" #define TR_NOFREEMIXER "BrakWoln.Mixów!" diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index 29ab5cac3..ba32b1c49 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -367,6 +367,11 @@ #define TR_AILDIRECTION "AIL Sentido" #define TR_COLDIRECTION "COL Sentido" #define TR_MODE "Modo" +#if LCD_W > LCD_H + #define TR_LEFT_STICK "Esquerda" +#else + #define TR_LEFT_STICK "Esq" +#endif #define TR_SUBTYPE INDENT "Subtype" #define TR_NOFREEEXPO "No free expo!" #define TR_NOFREEMIXER "No free mixer!" diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index bcb984640..a15a4227e 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -392,7 +392,12 @@ #define TR_ELEDIRECTION "HöJD riktning" #define TR_AILDIRECTION "SKEV riktning" #define TR_COLDIRECTION TR("PITCH riktn.","PITCH riktning") -#define TR_MODE "Typ" +#define TR_MODE TR("Typ","Spakfunktioner") +#if LCD_W > LCD_H + #define TR_LEFT_STICK "Vänster" +#else + #define TR_LEFT_STICK "Vä" +#endif #define TR_SUBTYPE INDENT "Subtyp" #define TR_NOFREEEXPO "Ingen ledig expo!" #define TR_NOFREEMIXER "Ingen ledig mixer!" @@ -473,8 +478,8 @@ #define TR_BLOFFBRIGHTNESS INDENT "Ljusstyrka av" #define TR_KEYS_BACKLIGHT "Tangentbelysning" #define TR_SPLASHSCREEN "Startbild" -#define TR_PWR_ON_DELAY "Start fördröjn." -#define TR_PWR_OFF_DELAY "Avslut fördröjn." +#define TR_PWR_ON_DELAY "Fördröj start" +#define TR_PWR_OFF_DELAY "Fördröj avslut" #define TR_BLCOLOR "Färg" #define TR_THROTTLE_WARNING TR(INDENT "Gasvarn.", INDENT "Gasvarning") #define TR_CUSTOM_THROTTLE_WARNING TR(INDENT INDENT INDENT INDENT "Egen pos", INDENT INDENT INDENT INDENT "Egen position?") @@ -490,8 +495,7 @@ #define TR_STICKS "Spakar" #define TR_POTS "Vred" #define TR_SWITCHES "Brytare" -//#define TR_SWITCHES_DELAY TR("Brytarfördröj.", "Brytarfördröjning") -#define TR_SWITCHES_DELAY TR("Play delay", "Play delay (sw. mid pos)") +#define TR_SWITCHES_DELAY TR("Fördröj ljud", "Fördröj ljuduppspelning") #define TR_SLAVE "Elev" #define TR_MODESRC "Läge\006% källa" #define TR_MULTIPLIER "Styrka" @@ -598,7 +602,7 @@ #define TR_MONITOR_CHANNELS4 "KANALÖVERSIKT - KA 25-32" #define TR_MONITOR_SWITCHES "ÖVERSIKT - LOGISKA BRYTARE" #define TR_MONITOR_OUTPUT_DESC "Utdata" -#define TR_MONITOR_MIXER_DESC "Mixrar" +#define TR_MONITOR_MIXER_DESC "Mixar" #define TR_RECEIVER_NUM TR("RxNum","Mottagare nr.") #define TR_RECEIVER "Mottagare" #define TR_SYNCMENU "Synk [MENY]" diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index bc62557ab..3f6d4ce17 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -363,6 +363,11 @@ #define TR_AILDIRECTION "橫滾方向" #define TR_COLDIRECTION "螺距方向" #define TR_MODE "模式" +#if LCD_W > LCD_H + #define TR_LEFT_STICK "左搖桿" +#else + #define TR_LEFT_STICK "左搖桿" +#endif #define TR_SUBTYPE INDENT "子類型" #define TR_NOFREEEXPO "指數曲線已滿!" #define TR_NOFREEMIXER "混控數量已滿!"