piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Some more translations

Browse Source
This commit is contained in:
3djc
2019-04-20 10:05:29 +02:00
parent 6466531e74
commit ba4f15be43
14 changed files with 152 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_setup.cpp
+9 -11
View File
@@ -244,8 +244,6 @@ enum MenuModelSetupItems {
#endif
#if defined(PXX2)
const char * STR_BIND = "Bind";
const char * STR_SHARE = "Share";
bool isPXX2ReceiverEmpty(uint8_t moduleIdx, uint8_t receiverIdx)
{
@@ -317,7 +315,7 @@ void onPXX2ReceiverMenu(const char * result)
memclear(&reusableBuffer.moduleSetup.pxx2, sizeof(reusableBuffer.moduleSetup.pxx2));
reusableBuffer.moduleSetup.pxx2.resetReceiverIndex = receiverIdx;
reusableBuffer.moduleSetup.pxx2.resetReceiverFlags = (result == STR_RESET ? 0xFF : 0x01);
POPUP_CONFIRMATION(result == STR_RESET ? "Reset receiver?" : "Delete receiver?", onResetReceiverConfirm);
POPUP_CONFIRMATION(result == STR_RESET ? STR_RECEIVER_RESET : STR_RECEIVER_DELETE, onResetReceiverConfirm);
}
else {
removePXX2ReceiverIfEmpty(moduleIdx, receiverIdx);
@@ -412,7 +410,7 @@ void runPopupRegister(event_t event)
// RX name
if (reusableBuffer.moduleSetup.pxx2.registerStep < REGISTER_RX_NAME_RECEIVED) {
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 4 + 2 * FH, "Waiting ...");
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 4 + 2 * FH, STR_WAITING);
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + 3 * FH, TR_EXIT, menuVerticalPosition == ITEM_REGISTER_BUTTONS ? INVERS : 0);
}
else {
@@ -1136,7 +1134,7 @@ void menuModelSetup(event_t event)
}
if (bluetoothDistantAddr[0]) {
lcdDrawText(INDENT_WIDTH, y+1, bluetoothDistantAddr, TINSIZE);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON("Clear"), attr);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BUTTON_CLEAR, attr);
if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
bluetoothState = BLUETOOTH_STATE_OFF;
memclear(bluetoothDistantAddr, sizeof(bluetoothDistantAddr));
@@ -1145,9 +1143,9 @@ void menuModelSetup(event_t event)
else {
lcdDrawText(INDENT_WIDTH, y, "---");
if (bluetoothState < BLUETOOTH_STATE_IDLE)
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON("Init"), attr);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BUTTON_INIT, attr);
else
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON("Discover"), attr);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BUTTON_DISCOVER, attr);
if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
if (bluetoothState < BLUETOOTH_STATE_IDLE) {
bluetoothState = BLUETOOTH_STATE_OFF;
@@ -1163,7 +1161,7 @@ void menuModelSetup(event_t event)
for (uint8_t i=0; i<popupMenuItemsCount; i++) {
popupMenuItems[i] = reusableBuffer.moduleSetup.bt.devices[i];
}
popupMenuTitle = "Select device...";
popupMenuTitle = STR_BT_SELECT_DEVICE;
POPUP_MENU_START(onBluetoothConnectMenu);
}
}
@@ -1259,7 +1257,7 @@ void menuModelSetup(event_t event)
case ITEM_MODEL_REGISTRATION_ID:
lcdDrawTextAlignedLeft(y, STR_REG_ID);
if (isDefaultModelRegistrationID())
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, "<default>");
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_PXX2_DEFAULT);
else
lcdDrawSizedText(MODEL_SETUP_2ND_COLUMN, y, g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID, ZCHAR);
break;
@@ -1330,7 +1328,7 @@ void menuModelSetup(event_t event)
drawStringWithIndex(INDENT_WIDTH, y, STR_RECEIVER, receiverIdx + 1);
if (!(g_model.moduleData[moduleIdx].pxx2.receivers & (1 << receiverIdx))) {
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON("Bind"), attr);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_BIND), attr);
if (attr && s_editMode > 0) {
s_editMode = 0;
killEvents(event);
@@ -1361,7 +1359,7 @@ void menuModelSetup(event_t event)
for (uint8_t i=0; i<popupMenuItemsCount; i++) {
popupMenuItems[i] = reusableBuffer.moduleSetup.pxx2.bindCandidateReceiversNames[i];
}
popupMenuTitle = "Select RX...";
popupMenuTitle = STR_PXX2_SELECT_RX;
POPUP_MENU_START(onPXX2BindMenu);
}
}
radio/src/translations.cpp
+11
View File
@@ -595,6 +595,17 @@ const char STR_BLCOLOR[] = TR_BLCOLOR;
const char STR_TRAINER[] = TR_TRAINER;
const char STR_MODULE_BIND[] = TR_MODULE_BIND;
const char STR_PXX2_SELECT_RX[] = TR_PXX2_SELECT_RX;
const char STR_PXX2_DEFAULT[] = TR_PXX2_DEFAULT;
const char STR_BT_SELECT_DEVICE[] = TR_BT_SELECT_DEVICE;
const char STR_BUTTON_DISCOVER[] = TR_BUTTON_DISCOVER;
const char STR_BUTTON_INIT[] = TR_BUTTON_INIT;
const char STR_BUTTON_CLEAR[] = TR_BUTTON_CLEAR;
const char STR_WAITING[] = TR_WAITING;
const char STR_RECEIVER_DELETE[] = TR_RECEIVER_DELETE;
const char STR_RECEIVER_RESET[] = TR_RECEIVER_RESET;
const char STR_SHARE[] = TR_SHARE;
const char STR_BIND[] = TR_BIND;
const char STR_TRANSFER_BUTTON[] = TR_TRANSFER_BUTTON;
const char STR_REGISTER_BUTTON[] = TR_REGISTER_BUTTON;
const char STR_RXADD_BUTTON[] = TR_RXADD_BUTTON;
radio/src/translations.h
+11
View File
@@ -861,6 +861,17 @@ extern const char STR_EXPONAME[];
extern const char STR_TRAINER[];
extern const char STR_MODULE_BIND[];
extern const char STR_PXX2_SELECT_RX[];
extern const char STR_PXX2_DEFAULT[];
extern const char STR_BT_SELECT_DEVICE[];
extern const char STR_BUTTON_DISCOVER[];
extern const char STR_BUTTON_INIT[];
extern const char STR_BUTTON_CLEAR[];
extern const char STR_WAITING[];
extern const char STR_RECEIVER_DELETE[];
extern const char STR_RECEIVER_RESET[];
extern const char STR_SHARE[];
extern const char STR_BIND[];
extern const char STR_TRANSFER_BUTTON[];
extern const char STR_REGISTER_BUTTON[];
extern const char STR_RXADD_BUTTON[];
radio/src/translations/cz.h.txt
+11
View File
@@ -980,6 +980,17 @@
#define TR_BUZZER INDENT"Pípák"
#define TR_BYTES "[B]"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_PXX2_SELECT_RX "Select RX..."
#define TR_PXX2_DEFAULT "<default>"
#define TR_BT_SELECT_DEVICE "Select device..."
#define TR_BUTTON_DISCOVER BUTTON("Discover")
#define TR_BUTTON_INIT BUTTON("Init")
#define TR_BUTTON_CLEAR BUTTON("clear")
#define TR_WAITING "Waiting..."
#define TR_RECEIVER_DELETE "Delete receiver?"
#define TR_RECEIVER_RESET "Reset receiver?"
#define TR_SHARE "Share"
#define TR_BIND "Bind"
#define TR_TRANSFER_BUTTON BUTTON("Transfer")
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
radio/src/translations/de.h.txt
+11
View File
@@ -985,6 +985,17 @@
#define TR_BUZZER INDENT "Summer"
#define TR_BYTES "Bytes"
#define TR_MODULE_BIND BUTTON(TR("Bnd","Bind")) //9XR-Pro
#define TR_PXX2_SELECT_RX "Select RX..."
#define TR_PXX2_DEFAULT "<default>"
#define TR_BT_SELECT_DEVICE "Select device..."
#define TR_BUTTON_DISCOVER BUTTON("Discover")
#define TR_BUTTON_INIT BUTTON("Init")
#define TR_BUTTON_CLEAR BUTTON("clear")
#define TR_WAITING "Waiting..."
#define TR_RECEIVER_DELETE "Delete receiver?"
#define TR_RECEIVER_RESET "Reset receiver?"
#define TR_SHARE "Share"
#define TR_BIND "Bind"
#define TR_TRANSFER_BUTTON BUTTON("Transfer")
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
radio/src/translations/en.h.txt
+11
View File
@@ -996,6 +996,17 @@
#define TR_BUZZER INDENT "Buzzer"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_PXX2_SELECT_RX "Select RX..."
#define TR_PXX2_DEFAULT "<default>"
#define TR_BT_SELECT_DEVICE "Select device..."
#define TR_BUTTON_DISCOVER BUTTON("Discover")
#define TR_BUTTON_INIT BUTTON("Init")
#define TR_BUTTON_CLEAR BUTTON("clear")
#define TR_WAITING "Waiting..."
#define TR_RECEIVER_DELETE "Delete receiver?"
#define TR_RECEIVER_RESET "Reset receiver?"
#define TR_SHARE "Share"
#define TR_BIND "Bind"
#define TR_TRANSFER_BUTTON BUTTON("Transfer")
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON BUTTON("Add")
radio/src/translations/es.h.txt
+11
View File
@@ -991,6 +991,17 @@
#define TR_BUZZER INDENT"Zumbador"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND "[Enlace]"
#define TR_PXX2_SELECT_RX "Select RX..."
#define TR_PXX2_DEFAULT "<default>"
#define TR_BT_SELECT_DEVICE "Select device..."
#define TR_BUTTON_DISCOVER BUTTON("Discover")
#define TR_BUTTON_INIT BUTTON("Init")
#define TR_BUTTON_CLEAR BUTTON("clear")
#define TR_WAITING "Waiting..."
#define TR_RECEIVER_DELETE "Delete receiver?"
#define TR_RECEIVER_RESET "Reset receiver?"
#define TR_SHARE "Share"
#define TR_BIND "Bind"
#define TR_TRANSFER_BUTTON BUTTON("Transfer")
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
radio/src/translations/fi.h.txt
+11
View File
@@ -983,6 +983,17 @@
#define TR_BUZZER INDENT"Buzzer"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND "[Bind]"
#define TR_PXX2_SELECT_RX "Select RX..."
#define TR_PXX2_DEFAULT "<default>"
#define TR_BT_SELECT_DEVICE "Select device..."
#define TR_BUTTON_DISCOVER BUTTON("Discover")
#define TR_BUTTON_INIT BUTTON("Init")
#define TR_BUTTON_CLEAR BUTTON("clear")
#define TR_WAITING "Waiting..."
#define TR_RECEIVER_DELETE "Delete receiver?"
#define TR_RECEIVER_RESET "Reset receiver?"
#define TR_SHARE "Share"
#define TR_BIND "Bind"
#define TR_TRANSFER_BUTTON BUTTON("Transfer")
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
radio/src/translations/fr.h.txt
+11
View File
@@ -995,6 +995,17 @@
#define TR_BUZZER INDENT "Bipeur"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_PXX2_SELECT_RX "Select RX..."
#define TR_PXX2_DEFAULT "<default>"
#define TR_BT_SELECT_DEVICE "Select device..."
#define TR_BUTTON_DISCOVER BUTTON("Discover")
#define TR_BUTTON_INIT BUTTON("Init")
#define TR_BUTTON_CLEAR BUTTON("clear")
#define TR_WAITING "Waiting..."
#define TR_RECEIVER_DELETE "Delete receiver?"
#define TR_RECEIVER_RESET "Reset receiver?"
#define TR_SHARE "Share"
#define TR_BIND "Bind"
#define TR_TRANSFER_BUTTON BUTTON("Transfer")
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
radio/src/translations/it.h.txt
+11
View File
@@ -985,6 +985,17 @@
#define TR_BUZZER INDENT"Buzzer"
#define TR_BYTES "Bytes"
#define TR_MODULE_BIND "[Bind]"
#define TR_PXX2_SELECT_RX "Select RX..."
#define TR_PXX2_DEFAULT "<default>"
#define TR_BT_SELECT_DEVICE "Select device..."
#define TR_BUTTON_DISCOVER BUTTON("Discover")
#define TR_BUTTON_INIT BUTTON("Init")
#define TR_BUTTON_CLEAR BUTTON("clear")
#define TR_WAITING "Waiting..."
#define TR_RECEIVER_DELETE "Delete receiver?"
#define TR_RECEIVER_RESET "Reset receiver?"
#define TR_SHARE "Share"
#define TR_BIND "Bind"
#define TR_TRANSFER_BUTTON BUTTON("Transfer")
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
radio/src/translations/nl.h.txt
+11
View File
@@ -986,6 +986,17 @@
#define TR_BUZZER INDENT "Zoemer"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND TR("[Bnd]", "[Bind]")
#define TR_PXX2_SELECT_RX "Select RX..."
#define TR_PXX2_DEFAULT "<default>"
#define TR_BT_SELECT_DEVICE "Select device..."
#define TR_BUTTON_DISCOVER BUTTON("Discover")
#define TR_BUTTON_INIT BUTTON("Init")
#define TR_BUTTON_CLEAR BUTTON("clear")
#define TR_WAITING "Waiting..."
#define TR_RECEIVER_DELETE "Delete receiver?"
#define TR_RECEIVER_RESET "Reset receiver?"
#define TR_SHARE "Share"
#define TR_BIND "Bind"
#define TR_TRANSFER_BUTTON BUTTON("Transfer")
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
radio/src/translations/pl.h.txt
+11
View File
@@ -986,6 +986,17 @@
#define TR_BUZZER INDENT"Brzęczyk"
#define TR_BYTES "bajty"
#define TR_MODULE_BIND TR("[BND]","[Bind]")
#define TR_PXX2_SELECT_RX "Select RX..."
#define TR_PXX2_DEFAULT "<default>"
#define TR_BT_SELECT_DEVICE "Select device..."
#define TR_BUTTON_DISCOVER BUTTON("Discover")
#define TR_BUTTON_INIT BUTTON("Init")
#define TR_BUTTON_CLEAR BUTTON("clear")
#define TR_WAITING "Waiting..."
#define TR_RECEIVER_DELETE "Delete receiver?"
#define TR_RECEIVER_RESET "Reset receiver?"
#define TR_SHARE "Share"
#define TR_BIND "Bind"
#define TR_TRANSFER_BUTTON BUTTON("Transfert)
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
radio/src/translations/pt.h.txt
+11
View File
@@ -990,6 +990,17 @@
#define TR_BUZZER INDENT"Buzzer"
#define TR_BYTES "bytes"
#define TR_MODULE_BIND "[Bind]"
#define TR_PXX2_SELECT_RX "Select RX..."
#define TR_PXX2_DEFAULT "<default>"
#define TR_BT_SELECT_DEVICE "Select device..."
#define TR_BUTTON_DISCOVER BUTTON("Discover")
#define TR_BUTTON_INIT BUTTON("Init")
#define TR_BUTTON_CLEAR BUTTON("clear")
#define TR_WAITING "Waiting..."
#define TR_RECEIVER_DELETE "Delete receiver?"
#define TR_RECEIVER_RESET "Reset receiver?"
#define TR_SHARE "Share"
#define TR_BIND "Bind"
#define TR_TRANSFER_BUTTON BUTTON("Transfer")
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"
radio/src/translations/se.h.txt
+11
View File
@@ -999,6 +999,17 @@
#define TR_BUZZER INDENT"Summer"
#define TR_BYTES "byte"
#define TR_MODULE_BIND TR("[Bnd]", "[Bind]")
#define TR_PXX2_SELECT_RX "Select RX..."
#define TR_PXX2_DEFAULT "<default>"
#define TR_BT_SELECT_DEVICE "Select device..."
#define TR_BUTTON_DISCOVER BUTTON("Discover")
#define TR_BUTTON_INIT BUTTON("Init")
#define TR_BUTTON_CLEAR BUTTON("clear")
#define TR_WAITING "Waiting..."
#define TR_RECEIVER_DELETE "Delete receiver?"
#define TR_RECEIVER_RESET "Reset receiver?"
#define TR_SHARE "Share"
#define TR_BIND "Bind"
#define TR_TRANSFER_BUTTON BUTTON("Transfer")
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)"