From efc947da63e8d83e2b702b434a19841843cb71b3 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Wed, 23 Jun 2021 16:26:40 +0200 Subject: [PATCH] Changed "About" screen --- radio/src/bitmaps/480x272/CMakeLists.txt | 6 +- .../480x272/default_theme/mask_qrcode.png | Bin 0 -> 20412 bytes radio/src/gui/128x64/view_about.cpp | 137 ++-------------- radio/src/gui/212x64/view_about.cpp | 126 ++------------- radio/src/gui/colorlcd/CMakeLists.txt | 1 + radio/src/gui/colorlcd/view_about.cpp | 149 +++--------------- radio/src/gui/colorlcd/view_about.h | 31 ++++ radio/src/gui/colorlcd/view_main_menu.cpp | 3 +- radio/src/translations.cpp | 42 ----- radio/src/translations/cn.h.txt | 49 ------ radio/src/translations/cz.h.txt | 57 ------- radio/src/translations/de.h.txt | 57 ------- radio/src/translations/en.h.txt | 65 -------- radio/src/translations/es.h.txt | 57 ------- radio/src/translations/fi.h.txt | 57 ------- radio/src/translations/fr.h.txt | 65 -------- radio/src/translations/it.h.txt | 57 ------- radio/src/translations/nl.h.txt | 56 ------- radio/src/translations/pl.h.txt | 57 ------- radio/src/translations/pt.h.txt | 57 ------- radio/src/translations/se.h.txt | 57 ------- radio/src/translations/tw.h.txt | 57 ------- 22 files changed, 81 insertions(+), 1162 deletions(-) create mode 100644 radio/src/bitmaps/480x272/default_theme/mask_qrcode.png create mode 100644 radio/src/gui/colorlcd/view_about.h diff --git a/radio/src/bitmaps/480x272/CMakeLists.txt b/radio/src/bitmaps/480x272/CMakeLists.txt index 32e10bb5f..0563ea339 100644 --- a/radio/src/bitmaps/480x272/CMakeLists.txt +++ b/radio/src/bitmaps/480x272/CMakeLists.txt @@ -26,7 +26,7 @@ add_bitmaps_target(${BITMAP_TARGET_PREFIX}_calibration_bitmaps "${RADIO_SRC_DIR} add_bitmaps_target(${BITMAP_TARGET_PREFIX}_button_bitmaps "${RADIO_SRC_DIR}/bitmaps/480x272/button/alpha_*.png" "4/4/4/4" "${BITMAP_ARGS}") add_bitmaps_target(${BITMAP_TARGET_PREFIX}_alpha_bitmaps "${RADIO_SRC_DIR}/bitmaps/480x272/alpha_*.png" "4/4/4/4" "${BITMAP_ARGS}") add_bitmaps_target(${BITMAP_TARGET_PREFIX}_alpha_calibration_bitmaps "${RADIO_SRC_DIR}/bitmaps/480x272/calibration/alpha_*.png" "4/4/4/4" "${BITMAP_ARGS}") -add_bitmaps_target(${BITMAP_TARGET_PREFIX}_masks ${RADIO_SRC_DIR}/bitmaps/480x272/mask_*.png 8bits "${MASK_ARGS}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_masks "${RADIO_SRC_DIR}/bitmaps/480x272/mask_*.png" 8bits "${MASK_ARGS}") add_bitmaps_target(${BITMAP_TARGET_PREFIX}_slider_masks "${RADIO_SRC_DIR}/bitmaps/480x272/slider/*.png" 8bits "${MASK_ARGS}") add_bitmaps_target(${BITMAP_TARGET_PREFIX}_layouts_masks "${RADIO_SRC_DIR}/gui/colorlcd/layouts/*.png" 8bits "${MASK_ARGS}") add_bitmaps_target(${BITMAP_TARGET_PREFIX}_fonts ${RADIO_SRC_DIR}/fonts/truetype/*.png 8bits "${MASK_RLE_ARGS}") @@ -35,8 +35,8 @@ add_bitmaps_target(${BITMAP_TARGET_PREFIX}_volume_masks ${RADIO_SRC_DIR}/bitmaps add_bitmaps_target(${BITMAP_TARGET_PREFIX}_themes_masks "${RADIO_SRC_DIR}/bitmaps/480x272/default_theme/mask_*.png" 8bits "${BITMAPS_ARGS}") add_png_target(${BITMAP_TARGET_PREFIX}_themes_alpha "${RADIO_SRC_DIR}/bitmaps/480x272/default_theme/alpha_*.png") -add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_bitmaps ${RADIO_SRC_DIR}/bitmaps/480x272/bootloader/bmp_*.png "4/4/4/4" "${BITMAP_RLE_ARGS}") -add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_icons ${RADIO_SRC_DIR}/bitmaps/480x272/bootloader/icon_*.png 8bits "${MASK_ARGS}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_bitmaps "${RADIO_SRC_DIR}/bitmaps/480x272/bootloader/bmp_*.png" "4/4/4/4" "${BITMAP_RLE_ARGS}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_icons "${RADIO_SRC_DIR}/bitmaps/480x272/bootloader/icon_*.png" 8bits "${MASK_ARGS}") add_dependencies(${BITMAP_TARGET_PREFIX}_bitmaps ${BITMAP_TARGET_PREFIX}_calibration_bitmaps ${BITMAP_TARGET_PREFIX}_button_bitmaps ${BITMAP_TARGET_PREFIX}_alpha_bitmaps ${BITMAP_TARGET_PREFIX}_alpha_calibration_bitmaps ${BITMAP_TARGET_PREFIX}_masks ${BITMAP_TARGET_PREFIX}_slider_masks ${BITMAP_TARGET_PREFIX}_layouts_masks diff --git a/radio/src/bitmaps/480x272/default_theme/mask_qrcode.png b/radio/src/bitmaps/480x272/default_theme/mask_qrcode.png new file mode 100644 index 0000000000000000000000000000000000000000..515f1b395e329ca47f502db50fc091cad0c41af6 GIT binary patch literal 20412 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 literal 0 HcmV?d00001 diff --git a/radio/src/gui/128x64/view_about.cpp b/radio/src/gui/128x64/view_about.cpp index b168f91fb..5913945c6 100644 --- a/radio/src/gui/128x64/view_about.cpp +++ b/radio/src/gui/128x64/view_about.cpp @@ -20,145 +20,26 @@ #include "opentx.h" -const unsigned char about_bmp[] = { -#include "about.lbm" -}; - -enum AboutScreens { - ABOUT_OPENTX, - ABOUT_HARDWARE, - ABOUT_BERTRAND, - ABOUT_ANDRE, - ABOUT_MIKE, - ABOUT_KJELL, - ABOUT_MARTIN, - ABOUT_ROMOLO, - ABOUT_ROB, - ABOUT_PARENTS, - ABOUT_END, - ABOUT_COUNT, -}; - -#define ABOUT_X 2 #define ABOUT_INDENT 4 -#if defined(KEYS_GPIO_REG_PAGEDN) -#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_BREAK(KEY_PAGEUP) -#define EVT_KEY_NEXT_VIEW EVT_KEY_BREAK(KEY_PAGEDN) -#elif defined(NAVIGATION_X7) -#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 +const char ABOUT_VERSION_1[] = "EdgeTX Endeavour (2.4.0)"; +const char ABOUT_VERSION_2[] = "Copyright (C) 2021 EdgeTX"; +const char ABOUT_VERSION_3[] = "https://edge-tx.org"; void menuAboutView(event_t event) { - static uint8_t screenIndex; - static uint8_t greyIndex; - switch(event) { - case EVT_ENTRY: - screenIndex = 0; - greyIndex = 0; - break; - case EVT_KEY_NEXT_VIEW: - screenIndex < ABOUT_PARENTS ? screenIndex++ : screenIndex = ABOUT_OPENTX; - greyIndex = 0; - break; - 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; case EVT_KEY_FIRST(KEY_EXIT): + case EVT_KEY_FIRST(KEY_ENTER): chainMenu(menuMainView); break; } - lcdDrawText(17, 0, STR_ABOUTUS, DBLSIZE|INVERS); - lcdDrawSolidHorizontalLine(17, 16, LCD_W-17); - lcdDraw1bitBitmap(8, 0, about_bmp, 0); - LcdFlags att = 0; + lcdDrawText(2, 0, STR_ABOUTUS, DBLSIZE|INVERS); + lcdDrawSolidHorizontalLine(0, 16, LCD_W-17); - uint8_t screenDuration = 150; - - switch (screenIndex) { - case ABOUT_OPENTX: - case ABOUT_END: - lcdDrawText(ABOUT_X, 22, STR_ABOUT_OPENTX_1, SMLSIZE); - lcdDrawText(ABOUT_X, 30, STR_ABOUT_OPENTX_2, SMLSIZE); - lcdDrawText(ABOUT_X, 38, STR_ABOUT_OPENTX_3, SMLSIZE); - lcdDrawText(ABOUT_X, 46, STR_ABOUT_OPENTX_4, SMLSIZE); - lcdDrawText(ABOUT_X, 54, STR_ABOUT_OPENTX_5, SMLSIZE); - screenDuration = 255; - break; - - case ABOUT_BERTRAND: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_BERTRAND_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_BERTRAND_2, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_BERTRAND_3, att|SMLSIZE); - break; - - case ABOUT_ANDRE: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_ANDRE_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ANDRE_2, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_ANDRE_3, att|SMLSIZE); - break; - - case ABOUT_MIKE: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_MIKE_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_MIKE_2, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_MIKE_3, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_MIKE_4, att|SMLSIZE); - break; - - case ABOUT_KJELL: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_KJELL_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_KJELL_2, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_KJELL_3, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_KJELL_4, att|SMLSIZE); - break; - - case ABOUT_MARTIN: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_MARTIN_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_MARTIN_2, att|SMLSIZE); - break; - - case ABOUT_ROMOLO: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_ROMOLO_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ROMOLO_2, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_ROMOLO_3, att|SMLSIZE); - break; - - case ABOUT_ROB: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_ROB_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ROB_2, att|SMLSIZE); - break; - - case ABOUT_HARDWARE: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_HARDWARE_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_HARDWARE_2, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_HARDWARE_3, att|SMLSIZE); - break; - - case ABOUT_PARENTS: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_PARENTS_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_PARENTS_2, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_PARENTS_3, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_PARENTS_4, att|SMLSIZE); - screenDuration = 255; - break; - } - - if (++greyIndex == screenDuration) { - greyIndex = 0; - if (++screenIndex == ABOUT_COUNT) { - chainMenu(menuMainView); - } - } + lcdDrawText(ABOUT_INDENT, 22, ABOUT_VERSION_1, SMLSIZE); + lcdDrawText(ABOUT_INDENT, 30, ABOUT_VERSION_2, SMLSIZE); + lcdDrawText(ABOUT_INDENT, 38, ABOUT_VERSION_3, SMLSIZE); } diff --git a/radio/src/gui/212x64/view_about.cpp b/radio/src/gui/212x64/view_about.cpp index b75ff1095..078c26ab1 100644 --- a/radio/src/gui/212x64/view_about.cpp +++ b/radio/src/gui/212x64/view_about.cpp @@ -20,132 +20,26 @@ #include "opentx.h" -const unsigned char about_bmp[] = { -#include "about.lbm" -}; - -enum AboutScreens { - ABOUT_OPENTX, - ABOUT_HARDWARE, - ABOUT_BERTRAND, - ABOUT_ANDRE, - ABOUT_MIKE, - ABOUT_KJELL, - ABOUT_MARTIN, - ABOUT_ROMOLO, - ABOUT_ROB, - ABOUT_PARENTS, - ABOUT_END, - ABOUT_COUNT, -}; - -#define ABOUT_X 62 #define ABOUT_INDENT 6 +const char ABOUT_VERSION_1[] = "EdgeTX Endeavour (2.4.0)"; +const char ABOUT_VERSION_2[] = "Copyright (C) 2021 EdgeTX"; +const char ABOUT_VERSION_3[] = "https://edge-tx.org"; + void menuAboutView(event_t event) { - static uint8_t screenIndex; - static uint8_t greyIndex; - switch(event) { - case EVT_ENTRY: - screenIndex = 0; - greyIndex = 0; - break; - case EVT_KEY_FIRST(KEY_DOWN): - screenIndex < ABOUT_PARENTS ? screenIndex++ : screenIndex = ABOUT_OPENTX; - greyIndex = 0; - break; - case EVT_KEY_FIRST(KEY_UP): - screenIndex > ABOUT_OPENTX ? screenIndex-- : screenIndex = ABOUT_PARENTS; - greyIndex = 0; - break; + case EVT_KEY_FIRST(KEY_ENTER): case EVT_KEY_FIRST(KEY_EXIT): chainMenu(menuMainView); break; } - lcdDrawBitmap(0, 0, about_bmp); - lcdDrawText(64, 0, STR_ABOUTUS, DBLSIZE); - lcdDrawSolidHorizontalLine(ABOUT_X, 18, 120); - lcdDrawSolidHorizontalLine(ABOUT_X, 19, 130, GREY_DEFAULT); - LcdFlags att = GREY(max(0, 15-greyIndex/2)); + lcdDrawText(2, 2, STR_ABOUTUS, BOLD); + lcdDrawSolidHorizontalLine(0, 11, 130, GREY_DEFAULT); - uint8_t screenDuration = 150; - - switch (screenIndex) { - case ABOUT_OPENTX: - case ABOUT_END: - lcdDrawText(ABOUT_X, 22, STR_ABOUT_OPENTX_1, SMLSIZE); - lcdDrawText(ABOUT_X, 30, STR_ABOUT_OPENTX_2, SMLSIZE); - lcdDrawText(ABOUT_X, 38, STR_ABOUT_OPENTX_3, SMLSIZE); - lcdDrawText(ABOUT_X, 46, STR_ABOUT_OPENTX_4, SMLSIZE); - lcdDrawText(ABOUT_X, 54, STR_ABOUT_OPENTX_5, SMLSIZE); - screenDuration = 255; - break; - - case ABOUT_BERTRAND: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_BERTRAND_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_BERTRAND_2, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_BERTRAND_3, att|SMLSIZE); - break; - - case ABOUT_ANDRE: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_ANDRE_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ANDRE_2, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_ANDRE_3, att|SMLSIZE); - break; - - case ABOUT_MIKE: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_MIKE_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_MIKE_2, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_MIKE_3, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_MIKE_4, att|SMLSIZE); - break; - - case ABOUT_KJELL: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_KJELL_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_KJELL_2, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_KJELL_3, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_KJELL_4, att|SMLSIZE); - break; - - case ABOUT_MARTIN: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_MARTIN_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_MARTIN_2, att|SMLSIZE); - break; - - case ABOUT_ROMOLO: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_ROMOLO_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ROMOLO_2, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_ROMOLO_3, att|SMLSIZE); - break; - - case ABOUT_ROB: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_ROB_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ROB_2, att|SMLSIZE); - break; - - case ABOUT_HARDWARE: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_HARDWARE_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_HARDWARE_2, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_HARDWARE_3, att|SMLSIZE); - break; - - case ABOUT_PARENTS: - lcdDrawText(ABOUT_X, 24, STR_ABOUT_PARENTS_1, att); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_PARENTS_2, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_PARENTS_3, att|SMLSIZE); - lcdDrawText(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_PARENTS_4, att|SMLSIZE); - screenDuration = 255; - break; - } - - if (++greyIndex == screenDuration) { - greyIndex = 0; - if (++screenIndex == ABOUT_COUNT) { - chainMenu(menuMainView); - } - } + lcdDrawText(ABOUT_INDENT, 22, ABOUT_VERSION_1); + lcdDrawText(ABOUT_INDENT, 32, ABOUT_VERSION_2, SMLSIZE); + lcdDrawText(ABOUT_INDENT, 42, ABOUT_VERSION_3); } diff --git a/radio/src/gui/colorlcd/CMakeLists.txt b/radio/src/gui/colorlcd/CMakeLists.txt index 79af1169c..de3a1d804 100644 --- a/radio/src/gui/colorlcd/CMakeLists.txt +++ b/radio/src/gui/colorlcd/CMakeLists.txt @@ -55,6 +55,7 @@ set(GUI_SRC radio_diagkeys.cpp radio_diaganas.cpp radio_calibration.cpp + view_about.cpp view_main.cpp view_main_menu.cpp view_main_decoration.cpp diff --git a/radio/src/gui/colorlcd/view_about.cpp b/radio/src/gui/colorlcd/view_about.cpp index ea3561188..48be1477f 100644 --- a/radio/src/gui/colorlcd/view_about.cpp +++ b/radio/src/gui/colorlcd/view_about.cpp @@ -1,7 +1,8 @@ /* - * Copyright (C) OpenTX + * Copyright (C) EdgeTX * * Based on code named + * opentx - https://github.com/opentx/opentx * th9x - http://code.google.com/p/th9x * er9x - http://code.google.com/p/er9x * gruvin9x - http://code.google.com/p/gruvin9x @@ -18,136 +19,36 @@ * GNU General Public License for more details. */ +#include "view_about.h" #include "opentx.h" -enum AboutScreens { - ABOUT_OPENTX, - ABOUT_HARDWARE, - ABOUT_BERTRAND, - ABOUT_ANDRE, - ABOUT_MIKE, - ABOUT_KJELL, - ABOUT_MARTIN, - ABOUT_ROMOLO, - ABOUT_ROB, - ABOUT_PARENTS, - ABOUT_END, - ABOUT_COUNT, +const uint8_t mask_qrcode[] = { +#include "mask_qrcode.lbm" }; -#define ABOUT_X 62 -#define ABOUT_INDENT 16 +constexpr coord_t ABOUT_WIDTH = 220; -bool menuAboutView(event_t event) +AboutUs::AboutUs() : + MessageDialog(MainWindow::instance(), STR_ABOUT_US, "") { - static uint8_t screenIndex = 0; - static uint8_t greyIndex = 0; + content->setRect({(LCD_W - ABOUT_WIDTH) / 2, 20, ABOUT_WIDTH, LCD_H - 40}); - switch (event) { - case EVT_ENTRY: - screenIndex = 0; - greyIndex = 0; - break; -#if defined(PCBX12S) - case EVT_KEY_FIRST(KEY_PGDN): -#elif defined(PCBX10) - case EVT_KEY_BREAK(KEY_PGDN): -#endif - screenIndex < ABOUT_PARENTS ? screenIndex++ : screenIndex = ABOUT_OPENTX; - greyIndex = 0; - break; - case EVT_KEY_FIRST(KEY_PGUP): -#if defined(PCBX10) - case EVT_KEY_LONG(KEY_PGDN): -#endif - screenIndex > ABOUT_OPENTX ? screenIndex-- : screenIndex = ABOUT_PARENTS; - greyIndex = 0; - killEvents(event); - break; - case EVT_KEY_FIRST(KEY_EXIT): - chainMenu(menuMainView); - break; - } + messageWidget->setTextFlags(CENTERED | FONT(BOLD) | DEFAULT_COLOR); + messageWidget->setTop(content->top() + 40); + messageWidget->setHeight(2*PAGE_LINE_HEIGHT); - theme->drawBackground(); - theme->drawTopbarBackground(0); + messageWidget->setText("EdgeTX Endeavour (2.4.0)\n" + "Copyright (C) 2021 EdgeTX"); - uint8_t screenDuration = 150; - - switch (screenIndex) { - case ABOUT_OPENTX: - case ABOUT_END: - lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_OPENTX_1); - lcdDrawText(ABOUT_X, MENU_CONTENT_TOP + FH, STR_ABOUT_OPENTX_2); - lcdDrawText(ABOUT_X, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_OPENTX_3); - lcdDrawText(ABOUT_X, MENU_CONTENT_TOP + 3*FH, STR_ABOUT_OPENTX_4); - lcdDrawText(ABOUT_X, MENU_CONTENT_TOP + 4*FH, STR_ABOUT_OPENTX_5); - screenDuration = 255; - break; - - case ABOUT_BERTRAND: - lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_BERTRAND_1, INVERS); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_BERTRAND_2); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_BERTRAND_3); - break; - - case ABOUT_ANDRE: - lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_ANDRE_1, INVERS); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_ANDRE_2); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_ANDRE_3); - break; - - case ABOUT_MIKE: - lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_MIKE_1, INVERS); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_MIKE_2); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_MIKE_3); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 3*FH, STR_ABOUT_MIKE_4); - break; - - case ABOUT_KJELL: - lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_KJELL_1, INVERS); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_KJELL_2); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_KJELL_3); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 3*FH, STR_ABOUT_KJELL_4); - break; - - case ABOUT_MARTIN: - lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_MARTIN_1, INVERS); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_MARTIN_2); - break; - - case ABOUT_ROMOLO: - lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_ROMOLO_1, INVERS); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_ROMOLO_2); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_ROMOLO_3); - break; - - case ABOUT_ROB: - lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_ROB_1, INVERS); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_ROB_2); - break; - - case ABOUT_HARDWARE: - lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_HARDWARE_1, INVERS); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_HARDWARE_2); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_HARDWARE_3); - break; - - case ABOUT_PARENTS: - lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_PARENTS_1, INVERS); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_PARENTS_2); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_PARENTS_3); - lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 3*FH, STR_ABOUT_PARENTS_4); - screenDuration = 255; - break; - } - - if (++greyIndex == screenDuration) { - greyIndex = 0; - if (++screenIndex == ABOUT_COUNT) { - chainMenu(menuMainView); - } - } - - return true; + qrcode = BitmapBuffer::load8bitMaskOnBackground(mask_qrcode, DEFAULT_COLOR, + DEFAULT_BGCOLOR); + new StaticBitmap(content, + rect_t{ content->width() / 2 - qrcode->width() / 2, 80, + qrcode->width(), qrcode->height()}, + qrcode); +} + +AboutUs::~AboutUs() +{ + delete qrcode; } diff --git a/radio/src/gui/colorlcd/view_about.h b/radio/src/gui/colorlcd/view_about.h new file mode 100644 index 000000000..e76048878 --- /dev/null +++ b/radio/src/gui/colorlcd/view_about.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) EdgeTX + * + * Based on code named + * opentx - https://github.com/opentx/opentx + * th9x - http://code.google.com/p/th9x + * er9x - http://code.google.com/p/er9x + * gruvin9x - http://code.google.com/p/gruvin9x + * + * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include "libopenui.h" + +class AboutUs : public MessageDialog +{ + BitmapBuffer* qrcode = nullptr; + + public: + AboutUs(); + ~AboutUs(); +}; diff --git a/radio/src/gui/colorlcd/view_main_menu.cpp b/radio/src/gui/colorlcd/view_main_menu.cpp index 569baa0a8..6c26e2f4f 100644 --- a/radio/src/gui/colorlcd/view_main_menu.cpp +++ b/radio/src/gui/colorlcd/view_main_menu.cpp @@ -26,6 +26,7 @@ #include "menu_model.h" #include "menu_radio.h" #include "menu_screen.h" +#include "view_about.h" #include "view_channels.h" #include "view_statistics.h" #include "select_fab_carousel.h" @@ -101,7 +102,7 @@ ViewMainMenu::ViewMainMenu(Window* parent) : carousel->addButton(ICON_OPENTX, "About\nEdgeTX", [=]() -> uint8_t { deleteLater(); - //TODO: new AboutUs(); + new AboutUs(); return 0; }); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index b97d27c48..e44692d2a 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -926,48 +926,6 @@ const char STR_BLUETOOTH_PIN_CODE[] = TR_BLUETOOTH_PIN_CODE; #endif const char STR_ABOUTUS[] = TR_ABOUTUS; -const char STR_ABOUT_OPENTX_1[] = TR_ABOUT_OPENTX_1; -const char STR_ABOUT_OPENTX_2[] = TR_ABOUT_OPENTX_2; -const char STR_ABOUT_OPENTX_3[] = TR_ABOUT_OPENTX_3; -const char STR_ABOUT_OPENTX_4[] = TR_ABOUT_OPENTX_4; -const char STR_ABOUT_OPENTX_5[] = TR_ABOUT_OPENTX_5; - -const char STR_ABOUT_BERTRAND_1[] = TR_ABOUT_BERTRAND_1; -const char STR_ABOUT_BERTRAND_2[] = TR_ABOUT_BERTRAND_2; -const char STR_ABOUT_BERTRAND_3[] = TR_ABOUT_BERTRAND_3; - -const char STR_ABOUT_MIKE_1[] = TR_ABOUT_MIKE_1; -const char STR_ABOUT_MIKE_2[] = TR_ABOUT_MIKE_2; -const char STR_ABOUT_MIKE_3[] = TR_ABOUT_MIKE_3; -const char STR_ABOUT_MIKE_4[] = TR_ABOUT_MIKE_4; - -const char STR_ABOUT_ROMOLO_1[] = TR_ABOUT_ROMOLO_1; -const char STR_ABOUT_ROMOLO_2[] = TR_ABOUT_ROMOLO_2; -const char STR_ABOUT_ROMOLO_3[] = TR_ABOUT_ROMOLO_3; - -const char STR_ABOUT_ANDRE_1[] = TR_ABOUT_ANDRE_1; -const char STR_ABOUT_ANDRE_2[] = TR_ABOUT_ANDRE_2; -const char STR_ABOUT_ANDRE_3[] = TR_ABOUT_ANDRE_3; - -const char STR_ABOUT_ROB_1[] = TR_ABOUT_ROB_1; -const char STR_ABOUT_ROB_2[] = TR_ABOUT_ROB_2; - -const char STR_ABOUT_MARTIN_1[] = TR_ABOUT_MARTIN_1; -const char STR_ABOUT_MARTIN_2[] = TR_ABOUT_MARTIN_2; - -const char STR_ABOUT_KJELL_1[] = TR_ABOUT_KJELL_1; -const char STR_ABOUT_KJELL_2[] = TR_ABOUT_KJELL_2; -const char STR_ABOUT_KJELL_3[] = TR_ABOUT_KJELL_3; -const char STR_ABOUT_KJELL_4[] = TR_ABOUT_KJELL_4; - -const char STR_ABOUT_HARDWARE_1[] = TR_ABOUT_HARDWARE_1; -const char STR_ABOUT_HARDWARE_2[] = TR_ABOUT_HARDWARE_2; -const char STR_ABOUT_HARDWARE_3[] = TR_ABOUT_HARDWARE_3; - -const char STR_ABOUT_PARENTS_1[] = TR_ABOUT_PARENTS_1; -const char STR_ABOUT_PARENTS_2[] = TR_ABOUT_PARENTS_2; -const char STR_ABOUT_PARENTS_3[] = TR_ABOUT_PARENTS_3; -const char STR_ABOUT_PARENTS_4[] = TR_ABOUT_PARENTS_4; const char STR_AUTH_FAILURE[] = TR_AUTH_FAILURE; const char STR_PROTOCOL[] = TR_PROTOCOL; diff --git a/radio/src/translations/cn.h.txt b/radio/src/translations/cn.h.txt index 1f0e07dd3..9ae808ca3 100644 --- a/radio/src/translations/cn.h.txt +++ b/radio/src/translations/cn.h.txt @@ -1027,55 +1027,6 @@ // About screen #define TR_ABOUTUS TR(" 关于 ", "关于") -#define TR_ABOUT_OPENTX_1 TR("OpenTX\001is\001open\001source,\001non", "OpenTX is open source, non-") -#define TR_ABOUT_OPENTX_2 TR("commercial,\001wo\001warranties.", "commercial and comes with no") -#define TR_ABOUT_OPENTX_3 TR("It\001was\001developed\001for\001free.", "warranties. It was developed") -#define TR_ABOUT_OPENTX_4 TR("Support through donations", "for free. Support through") -#define TR_ABOUT_OPENTX_5 TR("is welcome!", "donations is welcome!") - -#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 "OpenTX main 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" -#define TR_ABOUT_MIKE_3 TR("Arguably,\001one\001of\001the\001best", "Arguably, one of the best") -#define TR_ABOUT_MIKE_4 "Inspirational" - -#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Companion co-author" -#define TR_ABOUT_ROMOLO_3 "" - -#define TR_ABOUT_ANDRE_1 "Andre Bernet" -#define TR_ABOUT_ANDRE_2 "Functionality, usability," -#define TR_ABOUT_ANDRE_3 "debugging, documentation" - -#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 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" - -#define TR_ABOUT_MARTIN_1 "Martin Hotar" -#define TR_ABOUT_MARTIN_2 "Graphics designer" - -#if defined(PCBFRSKY) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #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" - #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" - #define TR_ABOUT_HARDWARE_3 "" -#endif - -#define TR_ABOUT_PARENTS_1 "Parent projects" -#define TR_ABOUT_PARENTS_2 TR("Ersky9x (Mike Blandford)", "Ersky9x (Mike Blandford)") -#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" -#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" - #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 67ba25ac1..aad86571b 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -1121,63 +1121,6 @@ // Taranis About screen #define TR_ABOUTUS TR(" O nás ", "O nás") -#define TR_ABOUT_OPENTX_1 TR3("OpenTX je nekomerční,", "OpenTX\001je\001open-source,", "OpenTX je open-source,") -#define TR_ABOUT_OPENTX_2 TR3("opensource bez záruky.", "nekomerční a bez\001záruky.", "nekomerční a bez záruky.") -#define TR_ABOUT_OPENTX_3 TR3("Vytvořen ve volném čase.", "Byl\001vytvořen\001nadšenými\001modeláři", "Byl vytvořen nadšenými modeláři") -#define TR_ABOUT_OPENTX_4 TR3("Podpora vývoje pomocí", "Podpora\001vývoje\001pomocí", "Podpora vývoje pomocí") -#define TR_ABOUT_OPENTX_5 TR3("finančního daru je vítána!", "drobného\001daru\001je\001vítána!", "drobného daru je vítána!") - -#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 "Hlavní vývojář OpenTX" -#define TR_ABOUT_BERTRAND_3 "Spoluautor Companion" - -#define TR_ABOUT_MIKE_1 "Mike Blandford" -#define TR_ABOUT_MIKE_2 "Specialista na kód," -#define TR_ABOUT_MIKE_3 " a ovladače hardwaru." -#define TR_ABOUT_MIKE_4 "" - -#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Hlavní vývojář" -#define TR_ABOUT_ROMOLO_3 "Companion" - -#define TR_ABOUT_ANDRE_1 "Andre Bernet" -#define TR_ABOUT_ANDRE_2 "Funkčnost, použitelnost," -#define TR_ABOUT_ANDRE_3 "ladění a dokumentace" - -#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 "autor www.open-tx.org" -#define TR_ABOUT_KJELL_3 "autor OpenTX Recorder" -#define TR_ABOUT_KJELL_4 "Spoluautor Companion" - -#define TR_ABOUT_MARTIN_1 "Martin Hotař" -#define TR_ABOUT_MARTIN_2 "Design, Čeština" - -#if defined(MANUFACTURER_FRSKY) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Vývoj a výroba Hardware" - #define TR_ABOUT_HARDWARE_3 "Přispěvatel firmware" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 "Vývoj a výroba Hardware" - #define TR_ABOUT_HARDWARE_3 "Přispěvatel firmware" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #define TR_ABOUT_HARDWARE_2 "Vývoj a výroba Hardware" - #define TR_ABOUT_HARDWARE_3 "Přispěvatel firmware" -#else - #define TR_ABOUT_HARDWARE_1 "Brent Nelson" - #define TR_ABOUT_HARDWARE_2 "Sky9x designer/výrobce" - #define TR_ABOUT_HARDWARE_3 "" -#endif - -#define TR_ABOUT_PARENTS_1 "Mateřské projekty" -#define TR_ABOUT_PARENTS_2 "ersky9x (Mike Blandford)" -#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" -#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" - #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 7486afd00..de1c9e9cb 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -1131,63 +1131,6 @@ //Taranis About screen #define TR_ABOUTUS "Über OpenTx" -#define TR_ABOUT_OPENTX_1 "OpenTX ist Open Source," -#define TR_ABOUT_OPENTX_2 "nicht kommerziell, ohne" -#define TR_ABOUT_OPENTX_3 "Funktionsgarantie, frei" -#define TR_ABOUT_OPENTX_4 "verfügbar. Unterstützung" -#define TR_ABOUT_OPENTX_5 "durch Spenden willkommen" - -#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 "OpenTX Hauptauthor" -#define TR_ABOUT_BERTRAND_3 "Companion-Mitentwickler" - -#define TR_ABOUT_MIKE_1 "Mike Blandford" -#define TR_ABOUT_MIKE_2 "Code- und Treiber-Guru" -#define TR_ABOUT_MIKE_3 "Wohl einer der Besten." -#define TR_ABOUT_MIKE_4 "Sehr inspirierend." - -#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Companion-Hauptentwickler" -#define TR_ABOUT_ROMOLO_3 "" - -#define TR_ABOUT_ANDRE_1 "Andre Bernet" -#define TR_ABOUT_ANDRE_2 "Funktionalität und Tests," -#define TR_ABOUT_ANDRE_3 "Debugging, Dokumentation" - -#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 Hauptautor" -#define TR_ABOUT_KJELL_3 "Author von OpenTX Recorder" -#define TR_ABOUT_KJELL_4 "Companion contributor" - -#define TR_ABOUT_MARTIN_1 "Martin Hotar" -#define TR_ABOUT_MARTIN_2 "Grafikdesigner" - -#if defined(MANUFACTURER_FRSKY) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #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" - #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" - #define TR_ABOUT_HARDWARE_3 "" -#endif - -#define TR_ABOUT_PARENTS_1 "Vorgänger-Projekte" -#define TR_ABOUT_PARENTS_2 "Ersky9x (Mike Blandford)" -#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" -#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" - #define TR_CHR_SHORT 's' // Taste short #define TR_CHR_LONG 'l' // Taste long #define TR_CHR_TOGGLE 't' // Taste als togglefunktion = Ein Aus Ein diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index b990e4484..c37f99bf4 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -1130,71 +1130,6 @@ // About screen #define TR_ABOUTUS TR(" ABOUT ", "ABOUT") -#define TR_ABOUT_OPENTX_1 TR("OpenTX\001is\001open\001source,\001non", "OpenTX is open source, non-") -#define TR_ABOUT_OPENTX_2 TR("commercial,\001wo\001warranties.", "commercial and comes with no") -#define TR_ABOUT_OPENTX_3 TR("It\001was\001developed\001for\001free.", "warranties. It was developed") -#define TR_ABOUT_OPENTX_4 TR("Support through donations", "for free. Support through") -#define TR_ABOUT_OPENTX_5 TR("is welcome!", "donations is welcome!") - -#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 "OpenTX main 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" -#define TR_ABOUT_MIKE_3 TR("Arguably,\001one\001of\001the\001best", "Arguably, one of the best") -#define TR_ABOUT_MIKE_4 "Inspirational" - -#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Companion co-author" -#define TR_ABOUT_ROMOLO_3 "" - -#define TR_ABOUT_ANDRE_1 "Andre Bernet" -#define TR_ABOUT_ANDRE_2 "Functionality, usability," -#define TR_ABOUT_ANDRE_3 "debugging, documentation" - -#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 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" - -#define TR_ABOUT_MARTIN_1 "Martin Hotar" -#define TR_ABOUT_MARTIN_2 "Graphics designer" - -#if defined(MANUFACTURER_FRSKY) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #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" - #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" - #define TR_ABOUT_HARDWARE_3 "" -#endif - -#define TR_ABOUT_PARENTS_1 "Parent projects" -#define TR_ABOUT_PARENTS_2 TR("Ersky9x (Mike Blandford)", "Ersky9x (Mike Blandford)") -#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" -#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" - #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index cdfdc068f..de969b1a6 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -1126,63 +1126,6 @@ // Taranis About screen #define TR_ABOUTUS "Nosotros" -#define TR_ABOUT_OPENTX_1 "OpenTX es open source, no-" -#define TR_ABOUT_OPENTX_2 "comercial y viene sin " -#define TR_ABOUT_OPENTX_3 "garantias. Fue desarrollado" -#define TR_ABOUT_OPENTX_4 "libremente. Ayudas a través" -#define TR_ABOUT_OPENTX_5 "de donaciones son bienvenidas!" - -#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 "Autor principal OpenTX" -#define TR_ABOUT_BERTRAND_3 "Companion codesarrollador" - -#define TR_ABOUT_MIKE_1 "Mike Blandford" -#define TR_ABOUT_MIKE_2 "Gurú de codigo y drivers" -#define TR_ABOUT_MIKE_3 "Seguramente uno de los" -#define TR_ABOUT_MIKE_4 "mejores inspiradores" - -#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Desarrollador principal" -#define TR_ABOUT_ROMOLO_3 "Companion" - -#define TR_ABOUT_ANDRE_1 "Andre Bernet" -#define TR_ABOUT_ANDRE_2 "Funcionalidad, usabilidad," -#define TR_ABOUT_ANDRE_3 "depurado, documentación" - -#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 "Autor OpenTX Recorder" -#define TR_ABOUT_KJELL_4 "Colaborador Companion" - -#define TR_ABOUT_MARTIN_1 "Martin Hotar" -#define TR_ABOUT_MARTIN_2 "Dise\201o gráfico" - -#if defined(MANUFACTURER_FRSKY) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Productor dise\201o de hardware" - #define TR_ABOUT_HARDWARE_3 "Colaborador firmware" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 "Productor dise\201o de hardware" - #define TR_ABOUT_HARDWARE_3 "Colaborador firmware" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #define TR_ABOUT_HARDWARE_2 "Productor dise\201o de hardware" - #define TR_ABOUT_HARDWARE_3 "Colaborador firmware" -#else - #define TR_ABOUT_HARDWARE_1 "Brent Nelson" - #define TR_ABOUT_HARDWARE_2 "Sky9x dise\201ador/productor" - #define TR_ABOUT_HARDWARE_3 "" -#endif - -#define TR_ABOUT_PARENTS_1 "Padres del proyecto" -#define TR_ABOUT_PARENTS_2 "ersky9x (Mike Blandford)" -#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" -#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" - #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 17bd0b0c1..06c3476bc 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -1142,63 +1142,6 @@ // About screen #define TR_ABOUTUS TR(" ABOUT ", "ABOUT") -#define TR_ABOUT_OPENTX_1 TR("OpenTX\001is\001open\001source,\001non", "OpenTX is open source, non-") -#define TR_ABOUT_OPENTX_2 TR("commercial,\001wo\001warranties.", "commercial and comes with no") -#define TR_ABOUT_OPENTX_3 TR("It\001was\001developed\001for\001free.", "warranties. It was developed") -#define TR_ABOUT_OPENTX_4 TR("Support through donations", "for free. Support through") -#define TR_ABOUT_OPENTX_5 TR("is welcome!", "donations is welcome!") - -#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 "OpenTX main 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" -#define TR_ABOUT_MIKE_3 TR("Arguably,\001one\001of\001the\001best", "Arguably, one of the best") -#define TR_ABOUT_MIKE_4 "Inspirational" - -#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Companion co-author" -#define TR_ABOUT_ROMOLO_3 "" - -#define TR_ABOUT_ANDRE_1 "Andre Bernet" -#define TR_ABOUT_ANDRE_2 "Functionality, usability," -#define TR_ABOUT_ANDRE_3 "debugging, documentation" - -#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" - -#if defined(MANUFACTURER_FRSKY) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #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" - #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" - #define TR_ABOUT_HARDWARE_3 "" -#endif - -#define TR_ABOUT_PARENTS_1 "Parent projects" -#define TR_ABOUT_PARENTS_2 TR("Ersky9x (Mike Blandford)", "Ersky9x (Mike Blandford)") -#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" -#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" - #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index d2ac7ff04..546ebaf41 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -1154,71 +1154,6 @@ // Taranis About screen #define TR_ABOUTUS TR(" A PROPOS ", "A PROPOS") -#define TR_ABOUT_OPENTX_1 TR("OpenTX\001est\001libre,\001non-", "OpenTX est libre, non-") -#define TR_ABOUT_OPENTX_2 TR("commercial,\001et\001offert\001sans", "commercial et n'offre aucune") -#define TR_ABOUT_OPENTX_3 TR("garantie.\001Il\001est\001développé", "garantie. Il a été développé") -#define TR_ABOUT_OPENTX_4 TR("gratuitement.\001Donations", "gratuitement. Vos donations") -#define TR_ABOUT_OPENTX_5 TR("bienvenues!", "sont bienvenues!") - -#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 TR("Auteur\001principal\001d'OpenTX", "Auteur principal d'OpenTX") -#define TR_ABOUT_BERTRAND_3 TR("Codéveloppeur\001de\001C9X", "Codéveloppeur de Companion") - -#define TR_ABOUT_MIKE_1 "Mike Blandford" -#define TR_ABOUT_MIKE_2 "Maître du code et des" -#define TR_ABOUT_MIKE_3 "drivers" -#define TR_ABOUT_MIKE_4 "" - -#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Développeur principal de" -#define TR_ABOUT_ROMOLO_3 "OpenTX Companion" - -#define TR_ABOUT_ANDRE_1 "André Bernet" -#define TR_ABOUT_ANDRE_2 TR("Fonctionsé,\001usabilité,","Fonctionnalités, usabilité,") -#define TR_ABOUT_ANDRE_3 TR("débogage,\001documentation","débogage, documentation") - -#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 "Auteur de www.open-tx.org" -#define TR_ABOUT_KJELL_3 "Auteur de OpenTX Recorder" -#define TR_ABOUT_KJELL_4 "Développeur Companion" - -#define TR_ABOUT_MARTIN_1 "Martin Hotar" -#define TR_ABOUT_MARTIN_2 "Design graphique" - -#if defined(MANUFACTURER_FRSKY) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" - #define TR_ABOUT_HARDWARE_3 "du matériel" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" - #define TR_ABOUT_HARDWARE_3 "du matériel" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" - #define TR_ABOUT_HARDWARE_3 "du matériel" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" - #define TR_ABOUT_HARDWARE_3 "du matériel" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" - #define TR_ABOUT_HARDWARE_3 "du matériel" -#else - #define TR_ABOUT_HARDWARE_1 "Brent Nelson" - #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" - #define TR_ABOUT_HARDWARE_3 "de la carte Sky9x" -#endif - -#define TR_ABOUT_PARENTS_1 "Projets parents" -#define TR_ABOUT_PARENTS_2 "ersky9x (Mike Blandford)" -#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" -#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" - #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index db28fde80..e1b095635 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -1149,63 +1149,6 @@ // About screen #define TR_ABOUTUS TR(" INFO ", "INFO SU") -#define TR_ABOUT_OPENTX_1 TR("OpenTX\001e'\001open\001source,\001non", "OpenTX e' open source, non-") -#define TR_ABOUT_OPENTX_2 TR("commercial,\001wo\001warranties.", "commerciale, fornito senza") -#define TR_ABOUT_OPENTX_3 TR("It\001was\001developed\001for\001free.", "garanzie. E' stato sviluppato") -#define TR_ABOUT_OPENTX_4 TR("Support through donations", "gratuitamente. Il supporto") -#define TR_ABOUT_OPENTX_5 TR("is welcome!", "mediante donazioni e' gradito!") - -#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 "Autore principale OpenTX" -#define TR_ABOUT_BERTRAND_3 "Co-autore Companion" - -#define TR_ABOUT_MIKE_1 "Mike Blandford" -#define TR_ABOUT_MIKE_2 "Guru codice e driver" -#define TR_ABOUT_MIKE_3 "esperto a basso livello" -#define TR_ABOUT_MIKE_4 "Ispiratore" - -#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Autore Companion" -#define TR_ABOUT_ROMOLO_3 "" - -#define TR_ABOUT_ANDRE_1 "Andre Bernet" -#define TR_ABOUT_ANDRE_2 "Funzionalità, usabilità," -#define TR_ABOUT_ANDRE_3 "debugging, documentazione" - -#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" - -#if defined(MANUFACTURER_FRSKY) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Disegno/produzione Hardware" - #define TR_ABOUT_HARDWARE_3 "Contributi al Firmware" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 "Disegno/produzione Hardware" - #define TR_ABOUT_HARDWARE_3 "Contributi al Firmware" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #define TR_ABOUT_HARDWARE_2 "Disegno/produzione Hardware" - #define TR_ABOUT_HARDWARE_3 "Contributi al Firmware" -#else - #define TR_ABOUT_HARDWARE_1 "Brent Nelson" - #define TR_ABOUT_HARDWARE_2 "Designer/Produttore SKY9X" - #define TR_ABOUT_HARDWARE_3 "" -#endif - -#define TR_ABOUT_PARENTS_1 "Progetti correlati" -#define TR_ABOUT_PARENTS_2 "ersky9x (Mike Blandford)" -#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" -#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" - #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 4b4783a38..f40c93a1a 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -1136,62 +1136,6 @@ // About screen #define TR_ABOUTUS TR(" ABOUT ", "ABOUT") -#define TR_ABOUT_OPENTX_1 TR("OpenTX\001is\001open\001source,\001non", "OpenTX is open source, non-") -#define TR_ABOUT_OPENTX_2 TR("commercial,\001wo\001warranties.", "commercial and comes with no") -#define TR_ABOUT_OPENTX_3 TR("It\001was\001developed\001for\001free.", "warranties. It was developed") -#define TR_ABOUT_OPENTX_4 TR("Support through donations", "for free. Support through") -#define TR_ABOUT_OPENTX_5 TR("is welcome!", "donations is welcome!") - -#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 "OpenTX main 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" -#define TR_ABOUT_MIKE_3 TR("Arguably,\001one\001of\001the\001best", "Arguably, one of the best") -#define TR_ABOUT_MIKE_4 "Inspirational" - -#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Companion co-author" -#define TR_ABOUT_ROMOLO_3 "" - -#define TR_ABOUT_ANDRE_1 "Andre Bernet" -#define TR_ABOUT_ANDRE_2 "Functionality, usability," -#define TR_ABOUT_ANDRE_3 "debugging, documentation" - -#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" - -#if defined(MANUFACTURER_FRSKY) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #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" - #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" - #define TR_ABOUT_HARDWARE_3 "" -#endif -#define TR_ABOUT_PARENTS_1 "Parent projects" -#define TR_ABOUT_PARENTS_2 TR("Ersky9x (Mike Blandford)", "Ersky9x (Mike Blandford)") -#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" -#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" - #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 4b14f6f25..7e74be8e5 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -1145,63 +1145,6 @@ // About screen #define TR_ABOUTUS TR(" O ", " O ") -#define TR_ABOUT_OPENTX_1 TR("OpenTX\001is\001open\001source,\001non", "OpenTX is open source, non-") -#define TR_ABOUT_OPENTX_2 TR("commercial,\001wo\001warranties.", "commercial and comes with no") -#define TR_ABOUT_OPENTX_3 TR("It\001was\001developed\001for\001free.", "warranties. It was developed") -#define TR_ABOUT_OPENTX_4 TR("Support through donations", "for free. Support through") -#define TR_ABOUT_OPENTX_5 TR("is welcome!", "donations is welcome!") - -#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 "OpenTX główny 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" -#define TR_ABOUT_MIKE_3 TR("Arguably,\001one\001of\001the\001best", "Arguably, one of the best") -#define TR_ABOUT_MIKE_4 "Inspirational" - -#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Companion współ-autor" -#define TR_ABOUT_ROMOLO_3 "" - -#define TR_ABOUT_ANDRE_1 "Andre Bernet" -#define TR_ABOUT_ANDRE_2 "Funkcjonalność, użytkowość," -#define TR_ABOUT_ANDRE_3 "debugging, documentacja" - -#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 "Projekty graficzne" - -#if defined(MANUFACTURER_FRSKY) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Proucent/projektant Hardware" - #define TR_ABOUT_HARDWARE_3 "Współautor firmware" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 "Proucent/projektant Hardware" - #define TR_ABOUT_HARDWARE_3 "Współautor firmware" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #define TR_ABOUT_HARDWARE_2 "Proucent/projektant Hardware" - #define TR_ABOUT_HARDWARE_3 "Współautor firmware" -#else - #define TR_ABOUT_HARDWARE_1 "Brent Nelson" - #define TR_ABOUT_HARDWARE_2 "Sky9x designer/výrobce" - #define TR_ABOUT_HARDWARE_3 "" -#endif - -#define TR_ABOUT_PARENTS_1 "Projekty macierzyste" -#define TR_ABOUT_PARENTS_2 TR("Ersky9x (Mike Blandford)", "Ersky9x (Mike Blandford)") -#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" -#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" - #define TR_CHR_SHORT 'k' #define TR_CHR_LONG 'd' #define TR_CHR_TOGGLE 't' diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 0669c02c4..b301eb6ab 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -1146,63 +1146,6 @@ // Taranis About screen #define TR_ABOUTUS "ABOUT US" -#define TR_ABOUT_OPENTX_1 "OpenTX is open source, non-" -#define TR_ABOUT_OPENTX_2 "commercial and comes with no" -#define TR_ABOUT_OPENTX_3 "warranties. It was developed" -#define TR_ABOUT_OPENTX_4 "for free. Support through" -#define TR_ABOUT_OPENTX_5 "donations is welcome!" - -#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 "OpenTX main author" -#define TR_ABOUT_BERTRAND_3 "Companion co-developer" - -#define TR_ABOUT_MIKE_1 "Mike Blandford" -#define TR_ABOUT_MIKE_2 "Code and drivers guru" -#define TR_ABOUT_MIKE_3 "Arguably, one of the best" -#define TR_ABOUT_MIKE_4 "Inspirational" - -#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Companion main developer" -#define TR_ABOUT_ROMOLO_3 "" - -#define TR_ABOUT_ANDRE_1 "Andre Bernet" -#define TR_ABOUT_ANDRE_2 "Functionality, usability," -#define TR_ABOUT_ANDRE_3 "debugging, documentation" - -#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" - -#if defined(MANUFACTURER_FRSKY) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #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" - #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" - #define TR_ABOUT_HARDWARE_3 "" -#endif - -#define TR_ABOUT_PARENTS_1 "Parent projects" -#define TR_ABOUT_PARENTS_2 "ersky9x (Mike Blandford)" -#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" -#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" - #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index c39926ca7..bf6604dec 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -1148,63 +1148,6 @@ // About screen #define TR_ABOUTUS "Om Oss" -#define TR_ABOUT_OPENTX_1 "OpenTX är icke-kommersiell," -#define TR_ABOUT_OPENTX_2 "öppen programvara utan" -#define TR_ABOUT_OPENTX_3 "garantier som uvecklas helt" -#define TR_ABOUT_OPENTX_4 "ideellt. Stöd i form av" -#define TR_ABOUT_OPENTX_5 "donationer välkomnas!" - -#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 "Chefsutvecklare av OpenTX" -#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" -#define TR_ABOUT_MIKE_3 "Stor inspirationskälla" -#define TR_ABOUT_MIKE_4 "" - -#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Chefsutvecklare av Companion" -#define TR_ABOUT_ROMOLO_3 "" - -#define TR_ABOUT_ANDRE_1 "Andre Bernet" -#define TR_ABOUT_ANDRE_2 "Funktionalitet, Användbarhet," -#define TR_ABOUT_ANDRE_3 "Felsökning, Dokumentation" - -#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 "Utvecklare av www.open-tx.org" -#define TR_ABOUT_KJELL_3 "Utvecklare av OpenTX Recorder" -#define TR_ABOUT_KJELL_4 "Hjälputvecklare av Companion" - -#define TR_ABOUT_MARTIN_1 "Martin Hotar" -#define TR_ABOUT_MARTIN_2 "Grafikdesigner" - -#if defined(MANUFACTURER_FRSKY) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Hårdvarudesign/producent" - #define TR_ABOUT_HARDWARE_3 "" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 "Hårdvarudesign/producent" - #define TR_ABOUT_HARDWARE_3 "" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #define TR_ABOUT_HARDWARE_2 "Hårdvarudesign/producent" - #define TR_ABOUT_HARDWARE_3 "" -#else - #define TR_ABOUT_HARDWARE_1 "Brent Nelson" - #define TR_ABOUT_HARDWARE_2 "Sky9x design/producent" - #define TR_ABOUT_HARDWARE_3 "" -#endif - -#define TR_ABOUT_PARENTS_1 "Ursprungsprojekt" -#define TR_ABOUT_PARENTS_2 "ersky9x (Mike Blandford)" -#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" -#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" - #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/radio/src/translations/tw.h.txt b/radio/src/translations/tw.h.txt index 0913cd8f4..32d4c3a97 100644 --- a/radio/src/translations/tw.h.txt +++ b/radio/src/translations/tw.h.txt @@ -1027,63 +1027,6 @@ // About screen #define TR_ABOUTUS TR(" 關於 ", "關於") -#define TR_ABOUT_OPENTX_1 TR("OpenTX\001is\001open\001source,\001non", "OpenTX is open source, non-") -#define TR_ABOUT_OPENTX_2 TR("commercial,\001wo\001warranties.", "commercial and comes with no") -#define TR_ABOUT_OPENTX_3 TR("It\001was\001developed\001for\001free.", "warranties. It was developed") -#define TR_ABOUT_OPENTX_4 TR("Support through donations", "for free. Support through") -#define TR_ABOUT_OPENTX_5 TR("is welcome!", "donations is welcome!") - -#define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 "OpenTX main 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" -#define TR_ABOUT_MIKE_3 TR("Arguably,\001one\001of\001the\001best", "Arguably, one of the best") -#define TR_ABOUT_MIKE_4 "Inspirational" - -#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini" -#define TR_ABOUT_ROMOLO_2 "Companion co-author" -#define TR_ABOUT_ROMOLO_3 "" - -#define TR_ABOUT_ANDRE_1 "Andre Bernet" -#define TR_ABOUT_ANDRE_2 "Functionality, usability," -#define TR_ABOUT_ANDRE_3 "debugging, documentation" - -#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 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" - -#define TR_ABOUT_MARTIN_1 "Martin Hotar" -#define TR_ABOUT_MARTIN_2 "Graphics designer" - -#if defined(MANUFACTURER_FRSKY) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #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" - #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" - #define TR_ABOUT_HARDWARE_3 "" -#endif - -#define TR_ABOUT_PARENTS_1 "Parent projects" -#define TR_ABOUT_PARENTS_2 TR("Ersky9x (Mike Blandford)", "Ersky9x (Mike Blandford)") -#define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" -#define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" - #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't'