diff --git a/radio/src/gui/view_about.cpp b/radio/src/gui/view_about.cpp index b87f7fbdd..aaa28df29 100644 --- a/radio/src/gui/view_about.cpp +++ b/radio/src/gui/view_about.cpp @@ -49,11 +49,12 @@ enum AboutScreens { ABOUT_OPENTX, ABOUT_BERTRAND, - ABOUT_MIKE, - ABOUT_ROMOLO, ABOUT_ANDRE, - ABOUT_ROB, + ABOUT_MIKE, + ABOUT_KJELL, ABOUT_MARTIN, + ABOUT_ROMOLO, + ABOUT_ROB, ABOUT_HARDWARE, ABOUT_PARENTS, ABOUT_END, @@ -124,11 +125,29 @@ void menuAboutView(uint8_t event) lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_BERTRAND_3, att|SMLSIZE); break; + case ABOUT_ANDRE: + lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_ANDRE_1, att); + lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ANDRE_2, att|SMLSIZE); + lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_ANDRE_3, att|SMLSIZE); + break; + case ABOUT_MIKE: lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_MIKE_1, att); lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_MIKE_2, att|SMLSIZE); lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_MIKE_3, att|SMLSIZE); - lcd_putsAtt(ABOUT_X+ABOUT_INDENT-1, 52, STR_ABOUT_MIKE_4, att|SMLSIZE); + lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_MIKE_4, att|SMLSIZE); + break; + + case ABOUT_KJELL: + lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_KJELL_1, att); + lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_KJELL_2, att|SMLSIZE); + lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_KJELL_3, att|SMLSIZE); + lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_KJELL_4, att|SMLSIZE); + break; + + case ABOUT_MARTIN: + lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_MARTIN_1, att); + lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_MARTIN_2, att|SMLSIZE); break; case ABOUT_ROMOLO: @@ -137,22 +156,11 @@ void menuAboutView(uint8_t event) lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_ROMOLO_3, att|SMLSIZE); break; - case ABOUT_ANDRE: - lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_ANDRE_1, att); - lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ANDRE_2, att|SMLSIZE); - lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_ANDRE_3, att|SMLSIZE); - break; - case ABOUT_ROB: lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_ROB_1, att); lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ROB_2, att|SMLSIZE); break; - case ABOUT_MARTIN: - lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_MARTIN_1, att); - lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_MARTIN_2, att|SMLSIZE); - break; - case ABOUT_HARDWARE: lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_HARDWARE_1, att); lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_HARDWARE_2, att|SMLSIZE); @@ -163,7 +171,7 @@ void menuAboutView(uint8_t event) lcd_putsAtt(ABOUT_X, 24, STR_ABOUT_PARENTS_1, att); lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_PARENTS_2, att|SMLSIZE); lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_PARENTS_3, att|SMLSIZE); - lcd_putsAtt(ABOUT_X+ABOUT_INDENT-1, 52, STR_ABOUT_PARENTS_4, att|SMLSIZE); + lcd_putsAtt(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_PARENTS_4, att|SMLSIZE); screenDuration = 255; break; } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index bb3964d68..1d804db1c 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -596,6 +596,11 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR; const pm_char STR_ABOUT_MARTIN_1[] PROGMEM = TR_ABOUT_MARTIN_1; const pm_char STR_ABOUT_MARTIN_2[] PROGMEM = TR_ABOUT_MARTIN_2; + const pm_char STR_ABOUT_KJELL_1[] PROGMEM = TR_ABOUT_KJELL_1; + const pm_char STR_ABOUT_KJELL_2[] PROGMEM = TR_ABOUT_KJELL_2; + const pm_char STR_ABOUT_KJELL_3[] PROGMEM = TR_ABOUT_KJELL_3; + const pm_char STR_ABOUT_KJELL_4[] PROGMEM = TR_ABOUT_KJELL_4; + const pm_char STR_ABOUT_HARDWARE_1[] PROGMEM = TR_ABOUT_HARDWARE_1; const pm_char STR_ABOUT_HARDWARE_2[] PROGMEM = TR_ABOUT_HARDWARE_2; const pm_char STR_ABOUT_HARDWARE_3[] PROGMEM = TR_ABOUT_HARDWARE_3; diff --git a/radio/src/translations.h b/radio/src/translations.h index 689e5859d..66be3940e 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -777,6 +777,11 @@ extern const pm_char STR_BLCOLOR[]; extern const pm_char STR_ABOUT_MARTIN_1[]; extern const pm_char STR_ABOUT_MARTIN_2[]; + extern const pm_char STR_ABOUT_KJELL_1[]; + extern const pm_char STR_ABOUT_KJELL_2[]; + extern const pm_char STR_ABOUT_KJELL_3[]; + extern const pm_char STR_ABOUT_KJELL_4[]; + extern const pm_char STR_ABOUT_HARDWARE_1[]; extern const pm_char STR_ABOUT_HARDWARE_2[]; extern const pm_char STR_ABOUT_HARDWARE_3[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 035791071..ca1d446ac 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -866,6 +866,11 @@ #define TR_ABOUT_ROB_1 "Rob Thomson" #define TR_ABOUT_ROB_2 "openrcforums webmaster" +#define TR_ABOUT_KJELL_1 "Kjell Kernen" +#define TR_ABOUT_KJELL_2 "www.open-tx.org main author" +#define TR_ABOUT_KJELL_3 "OpenTX Recorder author" +#define TR_ABOUT_KJELL_4 "Companion contributor" + #define TR_ABOUT_MARTIN_1 "Martin Hotař" #define TR_ABOUT_MARTIN_2 "Grafický design, Čeština" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 0d83883d2..249ea6b83 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -866,6 +866,11 @@ #define TR_ABOUT_ROB_1 "Rob Thomson" #define TR_ABOUT_ROB_2 "Openrcforums Webmaster" +#define TR_ABOUT_KJELL_1 "Kjell Kernen" +#define TR_ABOUT_KJELL_2 "www.open-tx.org main author" +#define TR_ABOUT_KJELL_3 "OpenTX Recorder author" +#define TR_ABOUT_KJELL_4 "Companion contributor" + #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Grafik Designer" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index ca35c00e8..1167bf60a 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -856,7 +856,7 @@ #define TR_ABOUT_MIKE_4 "Inspirational" #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Companion9x co-author" +#define TR_ABOUT_ROMOLO_2 "Companion co-author" #define TR_ABOUT_ROMOLO_3 "" #define TR_ABOUT_ANDRE_1 "Andre Bernet" @@ -866,7 +866,12 @@ #define TR_ABOUT_ROB_1 "Rob Thomson" #define TR_ABOUT_ROB_2 "openrcforums webmaster" -#define TR_ABOUT_MARTIN_1 "Martin Hotar" +#define TR_ABOUT_KJELL_1 "Kjell Kernen" +#define TR_ABOUT_KJELL_2 "www.open-tx.org main author" +#define TR_ABOUT_KJELL_3 "OpenTX Recorder author" +#define TR_ABOUT_KJELL_4 "Companion contributor" + +#define TR_ABOUT_MARTIN_1 "Kjell Martin Hotar" #define TR_ABOUT_MARTIN_2 "Graphics designer" #if defined(PCBTARANIS) diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index fb2b5d9d9..c8db9f0cf 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -866,6 +866,11 @@ #define TR_ABOUT_ROB_1 "Rob Thomson" #define TR_ABOUT_ROB_2 "openrcforums webmaster" +#define TR_ABOUT_KJELL_1 "Kjell Kernen" +#define TR_ABOUT_KJELL_2 "www.open-tx.org main author" +#define TR_ABOUT_KJELL_3 "OpenTX Recorder author" +#define TR_ABOUT_KJELL_4 "Companion contributor" + #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Dise\201o grafico" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 260a23681..f2a8140d9 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -866,6 +866,11 @@ #define TR_ABOUT_ROB_1 "Rob Thomson" #define TR_ABOUT_ROB_2 "openrcforums webmaster" +#define TR_ABOUT_KJELL_1 "Kjell Kernen" +#define TR_ABOUT_KJELL_2 "www.open-tx.org main author" +#define TR_ABOUT_KJELL_3 "OpenTX Recorder author" +#define TR_ABOUT_KJELL_4 "Companion contributor" + #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Graphics designer" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 3c9eca526..a7507843f 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -866,6 +866,11 @@ #define TR_ABOUT_ROB_1 "Rob Thomson" #define TR_ABOUT_ROB_2 "Webmaster d'openrcforums" +#define TR_ABOUT_KJELL_1 "Kjell Kernen" +#define TR_ABOUT_KJELL_2 "www.open-tx.org main author" +#define TR_ABOUT_KJELL_3 "OpenTX Recorder author" +#define TR_ABOUT_KJELL_4 "Companion contributor" + #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Design graphique" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 774fe04b4..a63c3e4f1 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -866,6 +866,11 @@ #define TR_ABOUT_ROB_1 "Rob Thomson" #define TR_ABOUT_ROB_2 "Webmaster openrcforums" +#define TR_ABOUT_KJELL_1 "Kjell Kernen" +#define TR_ABOUT_KJELL_2 "www.open-tx.org main author" +#define TR_ABOUT_KJELL_3 "OpenTX Recorder author" +#define TR_ABOUT_KJELL_4 "Companion contributor" + #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Graphic Designer" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 01ae260a0..f9815e13d 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -866,6 +866,11 @@ #define TR_ABOUT_ROB_1 "Rob Thomson" #define TR_ABOUT_ROB_2 "openrcforums webmaster" +#define TR_ABOUT_KJELL_1 "Kjell Kernen" +#define TR_ABOUT_KJELL_2 "www.open-tx.org main author" +#define TR_ABOUT_KJELL_3 "OpenTX Recorder author" +#define TR_ABOUT_KJELL_4 "Companion contributor" + #define TR_ABOUT_MARTIN_1 "Martin Hotař" #define TR_ABOUT_MARTIN_2 "Projekty graficzne" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 9bce5cc44..8d76cf421 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -866,6 +866,11 @@ #define TR_ABOUT_ROB_1 "Rob Thomson" #define TR_ABOUT_ROB_2 "openrcforums webmaster" +#define TR_ABOUT_KJELL_1 "Kjell Kernen" +#define TR_ABOUT_KJELL_2 "www.open-tx.org main author" +#define TR_ABOUT_KJELL_3 "OpenTX Recorder author" +#define TR_ABOUT_KJELL_4 "Companion contributor" + #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Graphics designer" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index d50669c73..57df65d19 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -866,6 +866,11 @@ #define TR_ABOUT_ROB_1 "Rob Thomson" #define TR_ABOUT_ROB_2 "Webmaster för openRCforums" +#define TR_ABOUT_KJELL_1 "Kjell Kernen" +#define TR_ABOUT_KJELL_2 "www.open-tx.org main author" +#define TR_ABOUT_KJELL_3 "OpenTX Recorder author" +#define TR_ABOUT_KJELL_4 "Companion contributor" + #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Grafikdesigner"