piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

3djc/columns hints (#3561)

Browse Source 
* Fix columns trim5 and trim6 for Horus

* - Try a more translator friendly way to deal with the Horus increased columns size

* Fix commit

* Proof of concept

* More languages

* -Introduce HINT()
-Remove HR instead of TR
This commit is contained in:
3djc
2016-06-02 23:01:44 +02:00
committed by Bertrand Songis
parent f1d1bc9d95
commit cfcdf3c3f8
12 changed files with 147 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/translations.h
+12
View File
@@ -59,6 +59,12 @@
#define PSIZE(x) ( sizeof(x) - 1 )
#define EOFS(x) ( OFS_##x + sizeof(TR_##x) )
#if defined(PCBTARANIS)
#define HINT(s) " " s " "
#else
#define HINT(s) s
#endif
#if LCD_W >= 212
#define TR(x, y) y
#else
@@ -827,6 +833,12 @@ extern const pm_char STR_BLCOLOR[];
#define STR_EXPONAME STR_NAME
#endif
#if defined(PCBHORUS)
#define TR_PHASES_HEADERS { TR_PHASES_HEADERS_NAME, TR_PHASES_HEADERS_SW, TR_PHASES_HEADERS_RUD_TRIM, TR_PHASES_HEADERS_ELE_TRIM, TR_PHASES_HEADERS_THT_TRIM, TR_PHASES_HEADERS_AIL_TRIM, TR_PHASES_HEADERS_CH5_TRIM, TR_PHASES_HEADERS_CH6_TRIM, TR_PHASES_HEADERS_FAD_IN, TR_PHASES_HEADERS_FAD_OUT }
#elif defined(PCBTARANIS)
#define TR_PHASES_HEADERS { HINT(TR_PHASES_HEADERS_NAME), HINT(TR_PHASES_HEADERS_SW), HINT(TR_PHASES_HEADERS_RUD_TRIM), HINT(TR_PHASES_HEADERS_ELE_TRIM), HINT(TR_PHASES_HEADERS_THT_TRIM), HINT(TR_PHASES_HEADERS_AIL_TRIM), HINT(TR_PHASES_HEADERS_FAD_IN), HINT(TR_PHASES_HEADERS_FAD_OUT) }
#endif
#if LCD_W >= 212
extern const char * const STR_PHASES_HEADERS[];
extern const char * const STR_LIMITS_HEADERS[];
radio/src/translations/cz.h.txt
+13 -1
View File
@@ -1075,8 +1075,20 @@
#define TR_MAVLINK_LON "LON"
#endif
// Horus and Taranis specific column headers
#define TR_PHASES_HEADERS_NAME "Název"
#define TR_PHASES_HEADERS_SW "Spínač"
#define TR_PHASES_HEADERS_RUD_TRIM "Trim směrovky"
#define TR_PHASES_HEADERS_ELE_TRIM "Trim výškovky"
#define TR_PHASES_HEADERS_THT_TRIM "Trim plynu"
#define TR_PHASES_HEADERS_AIL_TRIM "Trim křidélek"
#define TR_PHASES_HEADERS_CH5_TRIM "Trim 5"
#define TR_PHASES_HEADERS_CH6_TRIM "Trim 6"
#define TR_PHASES_HEADERS_FAD_IN "Přechod náběhu"
#define TR_PHASES_HEADERS_FAD_OUT "Přechod konce"
// Taranis column headers
#define TR_PHASES_HEADERS { " Název ", " Spínač ", " Trim směrovky ", " Trim výškovky ", " Trim plynu ", " Trim křidélek ", " Přechod náběhu ", " Přechod konce " }
#define TR_LIMITS_HEADERS { " Název ", " Subtrim ", " Min ", " Max ", " Invertovat ", " Křivka ", " Střed PPM ", " Symetrické " }
#define TR_LSW_HEADERS { " Funkce ", " Hodnota 1 ", " Hodnota 2 ", " Hodnota 2 ", " AND Spínač ", " Trvání ", " Zpoždění " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
radio/src/translations/de.h.txt
+13 -1
View File
@@ -1079,8 +1079,20 @@
#define TR_MAVLINK_LON "LON"
#endif
// Horus and Taranis specific column headers
#define TR_PHASES_HEADERS_NAME "Name "
#define TR_PHASES_HEADERS_SW "Schalter"
#define TR_PHASES_HEADERS_RUD_TRIM "Trim Seite"
#define TR_PHASES_HEADERS_ELE_TRIM "Trim Höhe"
#define TR_PHASES_HEADERS_THT_TRIM "Trim Gas"
#define TR_PHASES_HEADERS_AIL_TRIM "Trim Quer"
#define TR_PHASES_HEADERS_CH5_TRIM "Trim 5"
#define TR_PHASES_HEADERS_CH6_TRIM "Trim 6"
#define TR_PHASES_HEADERS_FAD_IN "Fade In"
#define TR_PHASES_HEADERS_FAD_OUT "Fade Out"
// Taranis Info Zeile Anzeigen
#define TR_PHASES_HEADERS { " Name ", " Schalter ", " Trim Seite ", " Trim Höhe ", " Trim Gas ", " Trim Quer ", " Fade In ", " Fade Out " }
#define TR_LIMITS_HEADERS { " Name ", " Mitte ", " Min ", " Max ", " Richtung ", " Kurve ", " PPM-Mitte ", " Mitte-Mode " }
#define TR_LSW_HEADERS { " Funktion ", " Var1 ", " Var2 ", " Var2 ", " UND-Schalter ", " Dauer ", " Verzögerung " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
radio/src/translations/en.h.txt
+12 -2
View File
@@ -1089,12 +1089,22 @@
#define TR_MAVLINK_LON "LON"
#endif
// Horus and Taranis specific column headers
#define TR_PHASES_HEADERS_NAME "Name"
#define TR_PHASES_HEADERS_SW "Switch"
#define TR_PHASES_HEADERS_RUD_TRIM "Rudder Trim"
#define TR_PHASES_HEADERS_ELE_TRIM "Elevator Trim"
#define TR_PHASES_HEADERS_THT_TRIM "Throttle Trim"
#define TR_PHASES_HEADERS_AIL_TRIM "Aileron Trim"
#define TR_PHASES_HEADERS_CH5_TRIM "Trim 5"
#define TR_PHASES_HEADERS_CH6_TRIM "Trim 6"
#define TR_PHASES_HEADERS_FAD_IN "Fade In"
#define TR_PHASES_HEADERS_FAD_OUT "Fade Out"
// Taranis column headers
#define TR_PHASES_HEADERS { " Name ", " Switch ", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Fade In ", " Fade Out " }
#define TR_LIMITS_HEADERS { " Name ", " Subtrim ", " Min ", " Max ", " Direction ", " Curve ", " PPM Center ", " Subtrim mode " }
#define TR_LSW_HEADERS { " Function ", " V1 ", " V2 ", " V2 ", " AND Switch ", " Duration ", " Delay " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
// About screen
#define TR_ABOUTUS TR(" ABOUT ", "ABOUT")
radio/src/translations/es.h.txt
+12 -1
View File
@@ -1039,8 +1039,19 @@
#define TR_MAVLINK_LON "LON"
#endif
// Horus and Taranis specific column headers
#define TR_PHASES_HEADERS_NAME "Nombre"
#define TR_PHASES_HEADERS_SW "Interrup"
#define TR_PHASES_HEADERS_RUD_TRIM "Rudder Trim"
#define TR_PHASES_HEADERS_ELE_TRIM "Elevator Trim"
#define TR_PHASES_HEADERS_THT_TRIM "Throttle Trim"
#define TR_PHASES_HEADERS_AIL_TRIM "Aileron Trim"
#define TR_PHASES_HEADERS_CH5_TRIM "Trim 5"
#define TR_PHASES_HEADERS_CH6_TRIM "Trim 6"
#define TR_PHASES_HEADERS_FAD_IN "Aparecer"
#define TR_PHASES_HEADERS_FAD_OUT "Desparecer"
// Taranis column headers
#define TR_PHASES_HEADERS { " Nombre ", " Interrup.", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Aparecer ", " Desparecer " }
#define TR_LIMITS_HEADERS { " Nombre ", " Compensacion", " Min ", " Max ", " Direccion ", " Curve ", " Centrado PPM ", " Simetrica " }
#define TR_LSW_HEADERS { " Funcion ", " V1 ", " V2 ", " V2 ", " AND Interrup. ", " Duracion ", " Retardo " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
radio/src/translations/fi.h.txt
+12 -1
View File
@@ -1039,8 +1039,19 @@
#define TR_MAVLINK_LON "LON"
#endif
// Horus and Taranis specific column headers
#define TR_PHASES_HEADERS_NAME "Name"
#define TR_PHASES_HEADERS_SW "Switch"
#define TR_PHASES_HEADERS_RUD_TRIM "Rudder Trim"
#define TR_PHASES_HEADERS_ELE_TRIM "Elevator Trim"
#define TR_PHASES_HEADERS_THT_TRIM "Throttle Trim"
#define TR_PHASES_HEADERS_AIL_TRIM "Aileron Trim"
#define TR_PHASES_HEADERS_CH5_TRIM "Trim 5"
#define TR_PHASES_HEADERS_CH6_TRIM "Trim 6"
#define TR_PHASES_HEADERS_FAD_IN "Fade In"
#define TR_PHASES_HEADERS_FAD_OUT "Fade Out"
// Taranis column headers
#define TR_PHASES_HEADERS { " Name ", " Switch ", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Fade In ", " Fade Out " }
#define TR_LIMITS_HEADERS { " Name ", " Subtrim ", " Min ", " Max ", " Direction ", " Curve ", " PPM Center ", " Subtrim mode " }
#define TR_LSW_HEADERS { " Function ", " V1 ", " V2 ", " V2 ", " AND Switch ", " Duration ", " Delay " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
radio/src/translations/fr.h.txt
+12 -1
View File
@@ -1066,8 +1066,19 @@
#define TR_MAVLINK_LON "LON"
#endif
// Horus and Taranis specific column headers
#define TR_PHASES_HEADERS_NAME "Nom"
#define TR_PHASES_HEADERS_SW "Inter"
#define TR_PHASES_HEADERS_RUD_TRIM "Trim Dir"
#define TR_PHASES_HEADERS_ELE_TRIM "Trim Prf"
#define TR_PHASES_HEADERS_THT_TRIM "Trim Gaz"
#define TR_PHASES_HEADERS_AIL_TRIM "Trim Ail"
#define TR_PHASES_HEADERS_CH5_TRIM "Trim 5"
#define TR_PHASES_HEADERS_CH6_TRIM "Trim 6"
#define TR_PHASES_HEADERS_FAD_IN "Fondu ON"
#define TR_PHASES_HEADERS_FAD_OUT "Fondu OFF"
// Taranis column headers
#define TR_PHASES_HEADERS { " Nom ", " Inter ", " Trim Dir ", " Trim Prf ", " Trim Gaz ", " Trim Ail ", " Fondu ON ", " Fondu OFF " }
#define TR_LIMITS_HEADERS { " Nom ", " Subtrim ", " Min ", " Max ", " Direction ", " Courbe ", " Neutre PPM ", " Mode subtrim " }
#define TR_LSW_HEADERS { " Fonction ", " V1 ", " V2 ", " V2 ", " ET suppl. ", " Durée ", " Délai " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
radio/src/translations/it.h.txt
+12 -1
View File
@@ -1074,8 +1074,19 @@
#define TR_MAVLINK_LON "LON"
#endif
// Horus and Taranis specific column headers
#define TR_PHASES_HEADERS_NAME "Nome"
#define TR_PHASES_HEADERS_SW "Inter"
#define TR_PHASES_HEADERS_RUD_TRIM "Trim Deriva"
#define TR_PHASES_HEADERS_ELE_TRIM "Trim Elevator"
#define TR_PHASES_HEADERS_THT_TRIM "Trim Motore"
#define TR_PHASES_HEADERS_AIL_TRIM "Trim Alettoni"
#define TR_PHASES_HEADERS_CH5_TRIM "Trim 5"
#define TR_PHASES_HEADERS_CH6_TRIM "Trim 6"
#define TR_PHASES_HEADERS_FAD_IN "Disolv. In"
#define TR_PHASES_HEADERS_FAD_OUT "Dissolv. Out"
// Taranis column headers
#define TR_PHASES_HEADERS { " Nome ", " Inter. ", " Trim Deriva ", " Trim Elevator ", " Trim Motore ", " Trim Alettoni ", " Disolv. In ", " Dissolv. Out " }
#define TR_LIMITS_HEADERS { " Nome ", " Offset ", " Min ", " Max ", " Direzione ", " Curve ", " Centro PPM ", " Simmetria " }
#define TR_LSW_HEADERS { " Funzione ", " V1 ", " V2 ", " V2 ", " Inter. AND ", " Durata ", " Ritardo " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
radio/src/translations/nl.h.txt
+12 -1
View File
@@ -1088,8 +1088,19 @@
#define TR_MAVLINK_LON "LON"
#endif
// Horus and Taranis specific column headers
#define TR_PHASES_HEADERS_NAME "Name"
#define TR_PHASES_HEADERS_SW "Switch"
#define TR_PHASES_HEADERS_RUD_TRIM "Rudder Trim"
#define TR_PHASES_HEADERS_ELE_TRIM "Elevator Trim"
#define TR_PHASES_HEADERS_THT_TRIM "Throttle Trim"
#define TR_PHASES_HEADERS_AIL_TRIM "Aileron Trim"
#define TR_PHASES_HEADERS_CH5_TRIM "Trim 5"
#define TR_PHASES_HEADERS_CH6_TRIM "Trim 6"
#define TR_PHASES_HEADERS_FAD_IN "Fade In"
#define TR_PHASES_HEADERS_FAD_OUT "Fade Out"
// Taranis column headers
#define TR_PHASES_HEADERS { " Name ", " Switch ", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Fade In ", " Fade Out " }
#define TR_LIMITS_HEADERS { " Name ", " Subtrim ", " Min ", " Max ", " Richtung ", " Curve ", " PPM-Midden ", " Subtrim Mode " }
#define TR_LSW_HEADERS { " Funktie ", " Var1 ", " Var2 ", " Var2 ", " EN-Schakelaar ", " Duur ", " Vertraging " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
radio/src/translations/pl.h.txt
+12 -1
View File
@@ -1076,8 +1076,19 @@
#define TR_MAVLINK_LON "DLG"
#endif
// Horus and Taranis specific column headers
#define TR_PHASES_HEADERS_NAME "Nazwa"
#define TR_PHASES_HEADERS_SW "Przełą"
#define TR_PHASES_HEADERS_RUD_TRIM "Trymer SK"
#define TR_PHASES_HEADERS_ELE_TRIM "Trymer SW"
#define TR_PHASES_HEADERS_THT_TRIM "Trymer Gazu"
#define TR_PHASES_HEADERS_AIL_TRIM "Trymer Lotek"
#define TR_PHASES_HEADERS_CH5_TRIM "Trymer 5"
#define TR_PHASES_HEADERS_CH6_TRIM "Trymer 6"
#define TR_PHASES_HEADERS_FAD_IN "Pojawian"
#define TR_PHASES_HEADERS_FAD_OUT "Zanik"
// Taranis column headers
#define TR_PHASES_HEADERS { " Nazwa", " Przełą.", " Trymer SK ", " Trymer SW ", " Trymer Gazu ", " Trymer Lotek ", " Pojawian", " Zanik " }
#define TR_LIMITS_HEADERS { " Nazwa", " Subtrim ", " Min ", " Max ", " Kierunek ", " Krzywa", " Środek PPM ", " Tryb subtrim " }
#define TR_LSW_HEADERS { " Funkcja ", " V1 ", " V2 ", " V2 ", " AND Przełą ", " CzasTrwa ", " Opóźn " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
radio/src/translations/pt.h.txt
+13 -1
View File
@@ -1035,8 +1035,20 @@
#define TR_MAVLINK_LON "LON"
#endif
// Horus and Taranis specific column headers
#define TR_PHASES_HEADERS_NAME "Name"
#define TR_PHASES_HEADERS_SW "Switch"
#define TR_PHASES_HEADERS_RUD_TRIM "Rudder Trim"
#define TR_PHASES_HEADERS_ELE_TRIM "Elevator Trim"
#define TR_PHASES_HEADERS_THT_TRIM "Throttle Trim"
#define TR_PHASES_HEADERS_AIL_TRIM "Aileron Trim"
#define TR_PHASES_HEADERS_CH5_TRIM "Trim 5"
#define TR_PHASES_HEADERS_CH6_TRIM "Trim 6"
#define TR_PHASES_HEADERS_FAD_IN "Fade In"
#define TR_PHASES_HEADERS_FAD_OUT "Fade Out"
// Taranis column headers
#define TR_PHASES_HEADERS { " Name ", " Switch ", " Rudder Trim ", " Elevator Trim ", " Throttle Trim ", " Aileron Trim ", " Fade In ", " Fade Out " }
#define TR_LIMITS_HEADERS { " Name ", " Offset ", " Min ", " Max ", " Direction ", " Curve ", " PPM Center ", " Symmetrical " }
#define TR_LSW_HEADERS { " Function ", " V1 ", " V2 ", " V2 ", " AND Switch ", " Duration ", " Delay " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }
radio/src/translations/se.h.txt
+12 -1
View File
@@ -1087,8 +1087,19 @@
#define TR_MAVLINK_LON "LON"
#endif
// Horus and Taranis specific column headers
#define TR_PHASES_HEADERS_NAME "Namn"
#define TR_PHASES_HEADERS_SW "Brytare"
#define TR_PHASES_HEADERS_RUD_TRIM "Rodertrim"
#define TR_PHASES_HEADERS_ELE_TRIM "Höjdrodertrim"
#define TR_PHASES_HEADERS_THT_TRIM "Gastrim"
#define TR_PHASES_HEADERS_AIL_TRIM "Skevrodertrim"
#define TR_PHASES_HEADERS_CH5_TRIM "Trim 5"
#define TR_PHASES_HEADERS_CH6_TRIM "Trim 6"
#define TR_PHASES_HEADERS_FAD_IN "Tona Upp"
#define TR_PHASES_HEADERS_FAD_OUT "Tona Ned"
// Taranis column headers
#define TR_PHASES_HEADERS { " Namn ", " Brytare ", " Rodertrim ", " Höjdrodertrim ", " Gastrim ", " Skevrodertrim ", " Tona Upp ", " Tona Ned " }
#define TR_LIMITS_HEADERS { " Namn ", " Subtrim ", " Min ", " Max ", " Riktning ", " Kurva ", " PPM-center ", " Subtrim-läge " }
#define TR_LSW_HEADERS { " Funktion ", " V1 ", " V2 ", " V2 ", " OCH Brytare ", " Tidslängd ", " Fördröj " }
#define TR_LSW_DESCRIPTIONS { "Choose the function name", "", "", "", "Choose an AND condition", "Logical switch duration", "Logical switch delay" }