diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index e09bb81eb..ec3cb6e2b 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -983,7 +983,7 @@ enum Functions { FUNC_SCREENSHOT, #endif #if defined(DEBUG) - FUNC_TEST, // should remain the last before MAX as not added in companion9x + FUNC_TEST, // should remain the last before MAX as not added in Companion #endif FUNC_MAX }; diff --git a/radio/src/gui/128x64/view_about.cpp b/radio/src/gui/128x64/view_about.cpp index 264cea550..4fe28b593 100644 --- a/radio/src/gui/128x64/view_about.cpp +++ b/radio/src/gui/128x64/view_about.cpp @@ -42,6 +42,14 @@ enum AboutScreens { #define ABOUT_X 2 #define ABOUT_INDENT 4 +#if defined(PCBX7D) +#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_LONG(KEY_PAGE) +#define EVT_KEY_NEXT_VIEW EVT_KEY_BREAK(KEY_PAGE) +#else +#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_FIRST(KEY_UP) +#define EVT_KEY_NEXT_VIEW EVT_KEY_FIRST(KEY_DOWN) +#endif + void menuAboutView(event_t event) { static uint8_t screenIndex; @@ -53,11 +61,14 @@ void menuAboutView(event_t event) screenIndex = 0; greyIndex = 0; break; - case EVT_KEY_FIRST(KEY_DOWN): + case EVT_KEY_NEXT_VIEW: screenIndex < ABOUT_PARENTS ? screenIndex++ : screenIndex = ABOUT_OPENTX; greyIndex = 0; break; - case EVT_KEY_FIRST(KEY_UP): + case EVT_KEY_PREVIOUS_VIEW: + if (IS_KEY_LONG(EVT_KEY_PREVIOUS_VIEW)) { + killEvents(event); + } screenIndex > ABOUT_OPENTX ? screenIndex-- : screenIndex = ABOUT_PARENTS; greyIndex = 0; break; diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 4eeb82070..3f0120153 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -1185,7 +1185,7 @@ #define TR_ABOUT_BERTRAND_1 "Bertrand Songis" #define TR_ABOUT_BERTRAND_2 "OpenTX Hauptauthor" -#define TR_ABOUT_BERTRAND_3 "Companion9x-Mitentwickler" +#define TR_ABOUT_BERTRAND_3 "Companion-Mitentwickler" #define TR_ABOUT_MIKE_1 "Mike Blandford" #define TR_ABOUT_MIKE_2 "Code- und Treiber-Guru" @@ -1193,7 +1193,7 @@ #define TR_ABOUT_MIKE_4 "Sehr inspirierend." #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Companion9x-Hauptentwickler" +#define TR_ABOUT_ROMOLO_2 "Companion-Hauptentwickler" #define TR_ABOUT_ROMOLO_3 "" #define TR_ABOUT_ANDRE_1 "Andre Bernet" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 83ec24296..2ffa59f57 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -1156,7 +1156,7 @@ #define TR_ABOUT_BERTRAND_1 "Bertrand Songis" #define TR_ABOUT_BERTRAND_2 "OpenTX main author" -#define TR_ABOUT_BERTRAND_3 "Companion9x co-author" +#define TR_ABOUT_BERTRAND_3 "Companion co-author" #define TR_ABOUT_MIKE_1 "Mike Blandford" #define TR_ABOUT_MIKE_2 "Code and drivers guru" @@ -1175,7 +1175,7 @@ #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_2 TR("www.open-tx.org author", "www.open-tx.org main author") #define TR_ABOUT_KJELL_3 "OpenTX Recorder author" #define TR_ABOUT_KJELL_4 "Companion contributor" @@ -1188,7 +1188,7 @@ #define TR_ABOUT_HARDWARE_3 "" #elif defined(PCBTARANIS) || defined(PCBHORUS) #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Hardware designer/producer" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") #define TR_ABOUT_HARDWARE_3 "Firmware contributor" #else #define TR_ABOUT_HARDWARE_1 "Brent Nelson" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index f17c02c03..686e9db7a 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -1130,7 +1130,7 @@ #define TR_ABOUT_BERTRAND_1 "Bertrand Songis" #define TR_ABOUT_BERTRAND_2 "Autor principal OpenTX" -#define TR_ABOUT_BERTRAND_3 "Companion9x codesarrollador" +#define TR_ABOUT_BERTRAND_3 "Companion codesarrollador" #define TR_ABOUT_MIKE_1 "Mike Blandford" #define TR_ABOUT_MIKE_2 "Guru de codigo y drivers" @@ -1139,7 +1139,7 @@ #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" #define TR_ABOUT_ROMOLO_2 "Desarrollador principal" -#define TR_ABOUT_ROMOLO_3 "Companion9x" +#define TR_ABOUT_ROMOLO_3 "Companion" #define TR_ABOUT_ANDRE_1 "Andre Bernet" #define TR_ABOUT_ANDRE_2 "Funcionalidad, usabilidad," diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 3367c743c..568db787e 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -1130,7 +1130,7 @@ #define TR_ABOUT_BERTRAND_1 "Bertrand Songis" #define TR_ABOUT_BERTRAND_2 "OpenTX main author" -#define TR_ABOUT_BERTRAND_3 "Companion9x co-author" +#define TR_ABOUT_BERTRAND_3 "Companion co-author" #define TR_ABOUT_MIKE_1 "Mike Blandford" #define TR_ABOUT_MIKE_2 "Code and drivers guru" @@ -1138,7 +1138,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" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 703493099..edc827087 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -1165,7 +1165,7 @@ #define TR_ABOUT_BERTRAND_1 "Bertrand Songis" #define TR_ABOUT_BERTRAND_2 "Autore principale OpenTX" -#define TR_ABOUT_BERTRAND_3 "Co-autore Companion9x" +#define TR_ABOUT_BERTRAND_3 "Co-autore Companion" #define TR_ABOUT_MIKE_1 "Mike Blandford" #define TR_ABOUT_MIKE_2 "Guru codice e driver" @@ -1173,7 +1173,7 @@ #define TR_ABOUT_MIKE_4 "Ispiratore" #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Autore Companion9x" +#define TR_ABOUT_ROMOLO_2 "Autore Companion" #define TR_ABOUT_ROMOLO_3 "" #define TR_ABOUT_ANDRE_1 "Andre Bernet" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index fe1435763..184844825 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -1165,7 +1165,7 @@ #define TR_ABOUT_BERTRAND_1 "Bertrand Songis" #define TR_ABOUT_BERTRAND_2 "OpenTX main author" -#define TR_ABOUT_BERTRAND_3 "Companion9x co-author" +#define TR_ABOUT_BERTRAND_3 "Companion co-author" #define TR_ABOUT_MIKE_1 "Mike Blandford" #define TR_ABOUT_MIKE_2 "Code and drivers guru" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index a55c055fa..b870eb8f8 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -1167,7 +1167,7 @@ #define TR_ABOUT_BERTRAND_1 "Bertrand Songis" #define TR_ABOUT_BERTRAND_2 "OpenTX główny autor" -#define TR_ABOUT_BERTRAND_3 "Companion9x współ-autor" +#define TR_ABOUT_BERTRAND_3 "Companion współ-autor" #define TR_ABOUT_MIKE_1 "Mike Blandford" #define TR_ABOUT_MIKE_2 "Guru kodu i driwerów" @@ -1175,7 +1175,7 @@ #define TR_ABOUT_MIKE_4 "Inspirational" #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Companion9x współ-autor" +#define TR_ABOUT_ROMOLO_2 "Companion współ-autor" #define TR_ABOUT_ROMOLO_3 "" #define TR_ABOUT_ANDRE_1 "Andre Bernet" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index f70924fa4..51587bd47 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -1125,7 +1125,7 @@ #define TR_ABOUT_BERTRAND_1 "Bertrand Songis" #define TR_ABOUT_BERTRAND_2 "OpenTX main author" -#define TR_ABOUT_BERTRAND_3 "Companion9x co-developer" +#define TR_ABOUT_BERTRAND_3 "Companion co-developer" #define TR_ABOUT_MIKE_1 "Mike Blandford" #define TR_ABOUT_MIKE_2 "Code and drivers guru" @@ -1133,7 +1133,7 @@ #define TR_ABOUT_MIKE_4 "Inspirational" #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Companion9x main developer" +#define TR_ABOUT_ROMOLO_2 "Companion main developer" #define TR_ABOUT_ROMOLO_3 "" #define TR_ABOUT_ANDRE_1 "Andre Bernet" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index fb7d2cdc6..d9dc088c1 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -1179,7 +1179,7 @@ #define TR_ABOUT_BERTRAND_1 "Bertrand Songis" #define TR_ABOUT_BERTRAND_2 "Chefsutvecklare av OpenTX" -#define TR_ABOUT_BERTRAND_3 "Hjälputvecklare av Companion9x" +#define TR_ABOUT_BERTRAND_3 "Hjälputvecklare av Companion" #define TR_ABOUT_MIKE_1 "Mike Blandford" #define TR_ABOUT_MIKE_2 "Kod och drivrutins-guru" @@ -1187,7 +1187,7 @@ #define TR_ABOUT_MIKE_4 "" #define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Chefsutvecklare av Companion9x" +#define TR_ABOUT_ROMOLO_2 "Chefsutvecklare av Companion" #define TR_ABOUT_ROMOLO_3 "" #define TR_ABOUT_ANDRE_1 "Andre Bernet"