More translations

This commit is contained in:
Bertrand Songis
2019-05-10 16:12:42 +02:00
parent b73cb31f11
commit c9ab669f9b
15 changed files with 85 additions and 32 deletions
+10 -16
View File
@@ -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 {
+10 -16
View File
@@ -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 {
+5
View File
@@ -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;
+5
View File
@@ -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[];
+5
View File
@@ -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?"
+5
View File
@@ -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?"
+5
View File
@@ -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?"
+5
View File
@@ -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?"
+5
View File
@@ -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?"
+5
View File
@@ -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?"
+5
View File
@@ -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?"
+5
View File
@@ -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?"
+5
View File
@@ -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?"
+5
View File
@@ -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?"
+5
View File
@@ -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?"