From c9ab669f9b185c353e3d818e009bfcfa874b0515 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 10 May 2019 16:12:42 +0200 Subject: [PATCH] More translations --- radio/src/gui/128x64/model_setup.cpp | 26 ++++++++++---------------- radio/src/gui/480x272/model_setup.cpp | 26 ++++++++++---------------- radio/src/translations.cpp | 5 +++++ radio/src/translations.h | 5 +++++ radio/src/translations/cz.h.txt | 5 +++++ radio/src/translations/de.h.txt | 5 +++++ radio/src/translations/en.h.txt | 5 +++++ radio/src/translations/es.h.txt | 5 +++++ radio/src/translations/fi.h.txt | 5 +++++ radio/src/translations/fr.h.txt | 5 +++++ radio/src/translations/it.h.txt | 5 +++++ radio/src/translations/nl.h.txt | 5 +++++ radio/src/translations/pl.h.txt | 5 +++++ radio/src/translations/pt.h.txt | 5 +++++ radio/src/translations/se.h.txt | 5 +++++ 15 files changed, 85 insertions(+), 32 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 0548d5fe2..4bc8d5e36 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -248,27 +248,21 @@ void removePXX2ReceiverIfEmpty(uint8_t moduleIdx, uint8_t receiverIdx) } } -const char * STR_BIND_8CH_WITH_TELEM = TR("8CH with telem.", "8CH with telemetry"); -const char * STR_BIND_16CH_WITH_TELEM = TR("16CH with telem.", "16CH with telemetry"); -const char * STR_BIND_16CH_WITHOUT_TELEM = TR("16CH without telem.", "16CH without telemetry"); -const char * STR_BIND_FLEX_868 = "Flex 868MHz"; -const char * STR_BIND_FLEX_915 = "Flex 915MHz"; - void onPXX2R9MBindModeMenu(const char * result) { - if (result == STR_BIND_8CH_WITH_TELEM) { + if (result == STR_8CH_WITH_TELEMETRY) { reusableBuffer.moduleSetup.bindInformation.lbtMode = 0; } - else if (result == STR_BIND_16CH_WITH_TELEM) { + else if (result == STR_16CH_WITH_TELEMETRY) { reusableBuffer.moduleSetup.bindInformation.lbtMode = 1; } - else if (result == STR_BIND_16CH_WITHOUT_TELEM) { + else if (result == STR_16CH_WITHOUT_TELEMETRY) { reusableBuffer.moduleSetup.bindInformation.lbtMode = 2; } - else if (result == STR_BIND_FLEX_868) { + else if (result == STR_FLEX_868) { reusableBuffer.moduleSetup.bindInformation.flexMode = 0; } - else if (result == STR_BIND_FLEX_915) { + else if (result == STR_FLEX_915) { reusableBuffer.moduleSetup.bindInformation.flexMode = 1; } else { @@ -300,15 +294,15 @@ void onPXX2BindMenu(const char * result) reusableBuffer.moduleSetup.bindInformation.selectedReceiverIndex = (result - reusableBuffer.moduleSetup.bindInformation.candidateReceiversNames[0]) / sizeof(reusableBuffer.moduleSetup.bindInformation.candidateReceiversNames[0]); if (isModuleR9M2(moduleIdx) && reusableBuffer.moduleSetup.pxx2.moduleInformation.information.variant == PXX2_VARIANT_EU) { reusableBuffer.moduleSetup.bindInformation.step = BIND_RX_NAME_SELECTED; - POPUP_MENU_ADD_ITEM(STR_BIND_8CH_WITH_TELEM); - POPUP_MENU_ADD_ITEM(STR_BIND_16CH_WITH_TELEM); - POPUP_MENU_ADD_ITEM(STR_BIND_16CH_WITHOUT_TELEM); + POPUP_MENU_ADD_ITEM(STR_8CH_WITH_TELEMETRY); + POPUP_MENU_ADD_ITEM(STR_16CH_WITH_TELEMETRY); + POPUP_MENU_ADD_ITEM(STR_16CH_WITHOUT_TELEMETRY); POPUP_MENU_START(onPXX2R9MBindModeMenu); } else if (isModuleR9M2(moduleIdx) && reusableBuffer.moduleSetup.pxx2.moduleInformation.information.variant == PXX2_VARIANT_FLEX) { reusableBuffer.moduleSetup.bindInformation.step = BIND_RX_NAME_SELECTED; - POPUP_MENU_ADD_ITEM(STR_BIND_FLEX_868); - POPUP_MENU_ADD_ITEM(STR_BIND_FLEX_915); + POPUP_MENU_ADD_ITEM(STR_FLEX_868); + POPUP_MENU_ADD_ITEM(STR_FLEX_915); POPUP_MENU_START(onPXX2R9MBindModeMenu); } else { diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp index 7bd3d1d6f..15dd24567 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -138,27 +138,21 @@ void removePXX2ReceiverIfEmpty(uint8_t moduleIdx, uint8_t receiverIdx) } } -const char * STR_BIND_8CH_WITH_TELEM = TR("8CH with telem.", "8CH with telemetry"); -const char * STR_BIND_16CH_WITH_TELEM = TR("16CH with telem.", "16CH with telemetry"); -const char * STR_BIND_16CH_WITHOUT_TELEM = TR("16CH without telem.", "16CH without telemetry"); -const char * STR_BIND_FLEX_868 = "Flex 868MHz"; -const char * STR_BIND_FLEX_915 = "Flex 915MHz"; - void onPXX2R9MBindModeMenu(const char * result) { - if (result == STR_BIND_8CH_WITH_TELEM) { + if (result == STR_8CH_WITH_TELEMETRY) { reusableBuffer.moduleSetup.bindInformation.lbtMode = 0; } - else if (result == STR_BIND_16CH_WITH_TELEM) { + else if (result == STR_16CH_WITH_TELEMETRY) { reusableBuffer.moduleSetup.bindInformation.lbtMode = 1; } - else if (result == STR_BIND_16CH_WITHOUT_TELEM) { + else if (result == STR_16CH_WITHOUT_TELEMETRY) { reusableBuffer.moduleSetup.bindInformation.lbtMode = 2; } - else if (result == STR_BIND_FLEX_868) { + else if (result == STR_FLEX_868) { reusableBuffer.moduleSetup.bindInformation.flexMode = 0; } - else if (result == STR_BIND_FLEX_915) { + else if (result == STR_FLEX_915) { reusableBuffer.moduleSetup.bindInformation.flexMode = 1; } else { @@ -298,15 +292,15 @@ void onPXX2BindMenu(const char * result) reusableBuffer.moduleSetup.bindInformation.selectedReceiverIndex = (result - reusableBuffer.moduleSetup.bindInformation.candidateReceiversNames[0]) / sizeof(reusableBuffer.moduleSetup.bindInformation.candidateReceiversNames[0]); if (isModuleR9M2(moduleIdx) && reusableBuffer.moduleSetup.pxx2.moduleInformation.information.variant == PXX2_VARIANT_EU) { reusableBuffer.moduleSetup.bindInformation.step = BIND_RX_NAME_SELECTED; - POPUP_MENU_ADD_ITEM(STR_BIND_8CH_WITH_TELEM); - POPUP_MENU_ADD_ITEM(STR_BIND_16CH_WITH_TELEM); - POPUP_MENU_ADD_ITEM(STR_BIND_16CH_WITHOUT_TELEM); + POPUP_MENU_ADD_ITEM(STR_8CH_WITH_TELEM); + POPUP_MENU_ADD_ITEM(STR_16CH_WITH_TELEM); + POPUP_MENU_ADD_ITEM(STR_16CH_WITHOUT_TELEM); POPUP_MENU_START(onPXX2R9MBindModeMenu); } else if (isModuleR9M2(moduleIdx) && reusableBuffer.moduleSetup.pxx2.moduleInformation.information.variant == PXX2_VARIANT_FLEX) { reusableBuffer.moduleSetup.bindInformation.step = BIND_RX_NAME_SELECTED; - POPUP_MENU_ADD_ITEM(STR_BIND_FLEX_868); - POPUP_MENU_ADD_ITEM(STR_BIND_FLEX_915); + POPUP_MENU_ADD_ITEM(STR_FLEX_868); + POPUP_MENU_ADD_ITEM(STR_FLEX_915); POPUP_MENU_START(onPXX2R9MBindModeMenu); } else { diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 5ed7464fa..82dd0deb6 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -475,6 +475,11 @@ const char STR_ANALOGS_BTN[] = TR_ANALOGS_BTN; const char STR_CALIB_BTN[] = TR_CALIB_BTN; const char STR_NO_TOOLS[] = TR_NO_TOOLS; +const char STR_FLEX_915[] = TR_FLEX_915; +const char STR_FLEX_868[] = TR_FLEX_868; +const char STR_16CH_WITHOUT_TELEMETRY[] = TR_16CH_WITHOUT_TELEMETRY; +const char STR_16CH_WITH_TELEMETRY[] = TR_16CH_WITH_TELEMETRY; +const char STR_8CH_WITH_TELEMETRY[] = TR_8CH_WITH_TELEMETRY; const char STR_EXT_ANTENNA[] = TR_EXT_ANTENNA; const char STR_PIN[] = TR_PIN; const char STR_UPDATE_RX_OPTIONS[] = TR_UPDATE_RX_OPTIONS; diff --git a/radio/src/translations.h b/radio/src/translations.h index 5cabec337..2161894c3 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -673,6 +673,11 @@ extern const char STR_ANALOGS_BTN[]; extern const char STR_CALIB_BTN[]; extern const char STR_NO_TOOLS[]; +extern const char STR_FLEX_915[]; +extern const char STR_FLEX_868[]; +extern const char STR_16CH_WITHOUT_TELEMETRY[]; +extern const char STR_16CH_WITH_TELEMETRY[]; +extern const char STR_8CH_WITH_TELEMETRY[]; extern const char STR_EXT_ANTENNA[]; extern const char STR_PIN[]; extern const char STR_UPDATE_RX_OPTIONS[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 2b7f0b706..bf4d1aa4a 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -833,6 +833,11 @@ #define TR_WAITING_FOR_RX "čekám na RX..." #define TR_WAITING_FOR_TX "Waiting for TX..." #define TR_NO_TOOLS "Žádné nástroje k dispozici" +#define TR_FLEX_915 "Flex 915MHz" +#define TR_FLEX_868 "Flex 868MHz" +#define TR_16CH_WITHOUT_TELEMETRY TR("16CH without telem.", "16CH without telemetry") +#define TR_16CH_WITH_TELEMETRY TR("16CH with telem.", "16CH with telemetry") +#define TR_8CH_WITH_TELEMETRY TR("8CH with telem.", "8CH with telemetry") #define TR_EXT_ANTENNA "Ext. antenna" #define TR_PIN "Pin" #define TR_UPDATE_RX_OPTIONS "Update RX options?" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 7779ef98e..aeb8cc4d5 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -845,6 +845,11 @@ #define TR_WAITING_FOR_RX "Waiting for RX..." #define TR_WAITING_FOR_TX "Waiting for TX..." #define TR_NO_TOOLS "No tools available" +#define TR_FLEX_915 "Flex 915MHz" +#define TR_FLEX_868 "Flex 868MHz" +#define TR_16CH_WITHOUT_TELEMETRY TR("16CH without telem.", "16CH without telemetry") +#define TR_16CH_WITH_TELEMETRY TR("16CH with telem.", "16CH with telemetry") +#define TR_8CH_WITH_TELEMETRY TR("8CH with telem.", "8CH with telemetry") #define TR_EXT_ANTENNA "Ext. antenna" #define TR_PIN "Pin" #define TR_UPDATE_RX_OPTIONS "Update RX options?" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 21f255941..e42f29c84 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -835,6 +835,11 @@ #define TR_WAITING_FOR_RX "Waiting for RX..." #define TR_WAITING_FOR_TX "Waiting for TX..." #define TR_NO_TOOLS "No tools available" +#define TR_FLEX_915 "Flex 915MHz" +#define TR_FLEX_868 "Flex 868MHz" +#define TR_16CH_WITHOUT_TELEMETRY TR("16CH without telem.", "16CH without telemetry") +#define TR_16CH_WITH_TELEMETRY TR("16CH with telem.", "16CH with telemetry") +#define TR_8CH_WITH_TELEMETRY TR("8CH with telem.", "8CH with telemetry") #define TR_EXT_ANTENNA "Ext. antenna" #define TR_PIN "Pin" #define TR_UPDATE_RX_OPTIONS "Update RX options?" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index ba2af4887..8d7c16235 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -847,6 +847,11 @@ #define TR_WAITING_FOR_RX "Waiting for RX..." #define TR_WAITING_FOR_TX "Waiting for TX..." #define TR_NO_TOOLS "No tools available" +#define TR_FLEX_915 "Flex 915MHz" +#define TR_FLEX_868 "Flex 868MHz" +#define TR_16CH_WITHOUT_TELEMETRY TR("16CH without telem.", "16CH without telemetry") +#define TR_16CH_WITH_TELEMETRY TR("16CH with telem.", "16CH with telemetry") +#define TR_8CH_WITH_TELEMETRY TR("8CH with telem.", "8CH with telemetry") #define TR_EXT_ANTENNA "Ext. antenna" #define TR_PIN "Pin" #define TR_UPDATE_RX_OPTIONS "Update RX options?" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 8e91d7773..ccc531ac3 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -835,6 +835,11 @@ #define TR_WAITING_FOR_RX "Waiting for RX..." #define TR_WAITING_FOR_TX "Waiting for TX..." #define TR_NO_TOOLS "No tools available" +#define TR_FLEX_915 "Flex 915MHz" +#define TR_FLEX_868 "Flex 868MHz" +#define TR_16CH_WITHOUT_TELEMETRY TR("16CH without telem.", "16CH without telemetry") +#define TR_16CH_WITH_TELEMETRY TR("16CH with telem.", "16CH with telemetry") +#define TR_8CH_WITH_TELEMETRY TR("8CH with telem.", "8CH with telemetry") #define TR_EXT_ANTENNA "Ext. antenna" #define TR_PIN "Pin" #define TR_UPDATE_RX_OPTIONS "Update RX options?" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index f3f40a5a5..b763dd9af 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -848,6 +848,11 @@ #define TR_WAITING_FOR_RX "Waiting for RX..." #define TR_WAITING_FOR_TX "Waiting for TX..." #define TR_NO_TOOLS "No tools available" +#define TR_FLEX_915 "Flex 915MHz" +#define TR_FLEX_868 "Flex 868MHz" +#define TR_16CH_WITHOUT_TELEMETRY TR("16CH without telem.", "16CH without telemetry") +#define TR_16CH_WITH_TELEMETRY TR("16CH with telem.", "16CH with telemetry") +#define TR_8CH_WITH_TELEMETRY TR("8CH with telem.", "8CH with telemetry") #define TR_EXT_ANTENNA "Ext. antenna" #define TR_PIN "Pin" #define TR_UPDATE_RX_OPTIONS "Update RX options?" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 4bed2f7ae..34f052b78 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -841,6 +841,11 @@ #define TR_WAITING_FOR_RX "Waiting for RX..." #define TR_WAITING_FOR_TX "Waiting for TX..." #define TR_NO_TOOLS "No tools available" +#define TR_FLEX_915 "Flex 915MHz" +#define TR_FLEX_868 "Flex 868MHz" +#define TR_16CH_WITHOUT_TELEMETRY TR("16CH without telem.", "16CH without telemetry") +#define TR_16CH_WITH_TELEMETRY TR("16CH with telem.", "16CH with telemetry") +#define TR_8CH_WITH_TELEMETRY TR("8CH with telem.", "8CH with telemetry") #define TR_EXT_ANTENNA "Ext. antenna" #define TR_PIN "Pin" #define TR_UPDATE_RX_OPTIONS "Update RX options?" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 836dbdd81..48c2189e0 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -842,6 +842,11 @@ TR_GYR_VSRCRAW #define TR_WAITING_FOR_RX "Waiting for RX..." #define TR_WAITING_FOR_TX "Waiting for TX..." #define TR_NO_TOOLS "No tools available" +#define TR_FLEX_915 "Flex 915MHz" +#define TR_FLEX_868 "Flex 868MHz" +#define TR_16CH_WITHOUT_TELEMETRY TR("16CH without telem.", "16CH without telemetry") +#define TR_16CH_WITH_TELEMETRY TR("16CH with telem.", "16CH with telemetry") +#define TR_8CH_WITH_TELEMETRY TR("8CH with telem.", "8CH with telemetry") #define TR_EXT_ANTENNA "Ext. antenna" #define TR_PIN "Pin" #define TR_UPDATE_RX_OPTIONS "Update RX options?" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 99dedcbb9..cee82a2db 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -842,6 +842,11 @@ #define TR_WAITING_FOR_RX "Waiting for RX..." #define TR_WAITING_FOR_TX "Waiting for TX..." #define TR_NO_TOOLS "No tools available" +#define TR_FLEX_915 "Flex 915MHz" +#define TR_FLEX_868 "Flex 868MHz" +#define TR_16CH_WITHOUT_TELEMETRY TR("16CH without telem.", "16CH without telemetry") +#define TR_16CH_WITH_TELEMETRY TR("16CH with telem.", "16CH with telemetry") +#define TR_8CH_WITH_TELEMETRY TR("8CH with telem.", "8CH with telemetry") #define TR_EXT_ANTENNA "Ext. antenna" #define TR_PIN "Pin" #define TR_UPDATE_RX_OPTIONS "Update RX options?" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 365239323..2ee8cc11c 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -846,6 +846,11 @@ #define TR_WAITING_FOR_RX "Waiting for RX..." #define TR_WAITING_FOR_TX "Waiting for TX..." #define TR_NO_TOOLS "No tools available" +#define TR_FLEX_915 "Flex 915MHz" +#define TR_FLEX_868 "Flex 868MHz" +#define TR_16CH_WITHOUT_TELEMETRY TR("16CH without telem.", "16CH without telemetry") +#define TR_16CH_WITH_TELEMETRY TR("16CH with telem.", "16CH with telemetry") +#define TR_8CH_WITH_TELEMETRY TR("8CH with telem.", "8CH with telemetry") #define TR_EXT_ANTENNA "Ext. antenna" #define TR_PIN "Pin" #define TR_UPDATE_RX_OPTIONS "Update RX options?" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index a3d5d218e..1ccc20eed 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -854,6 +854,11 @@ #define TR_WAITING_FOR_RX "Waiting for RX..." #define TR_WAITING_FOR_TX "Waiting for TX..." #define TR_NO_TOOLS "No tools available" +#define TR_FLEX_915 "Flex 915MHz" +#define TR_FLEX_868 "Flex 868MHz" +#define TR_16CH_WITHOUT_TELEMETRY TR("16CH without telem.", "16CH without telemetry") +#define TR_16CH_WITH_TELEMETRY TR("16CH with telem.", "16CH with telemetry") +#define TR_8CH_WITH_TELEMETRY TR("8CH with telem.", "8CH with telemetry") #define TR_EXT_ANTENNA "Ext. antenna" #define TR_PIN "Pin" #define TR_UPDATE_RX_OPTIONS "Update RX options?"