From ba4f15be43bbd55e384861ccd2b2d9a30ebf254b Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 20 Apr 2019 10:05:16 +0200 Subject: [PATCH] Some more translations --- radio/src/gui/128x64/model_setup.cpp | 20 +++++++++----------- radio/src/translations.cpp | 11 +++++++++++ radio/src/translations.h | 11 +++++++++++ radio/src/translations/cz.h.txt | 11 +++++++++++ radio/src/translations/de.h.txt | 11 +++++++++++ radio/src/translations/en.h.txt | 11 +++++++++++ radio/src/translations/es.h.txt | 11 +++++++++++ radio/src/translations/fi.h.txt | 11 +++++++++++ radio/src/translations/fr.h.txt | 11 +++++++++++ radio/src/translations/it.h.txt | 11 +++++++++++ radio/src/translations/nl.h.txt | 11 +++++++++++ radio/src/translations/pl.h.txt | 11 +++++++++++ radio/src/translations/pt.h.txt | 11 +++++++++++ radio/src/translations/se.h.txt | 11 +++++++++++ 14 files changed, 152 insertions(+), 11 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index ed7f15657..99c0b3f38 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -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"); + 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" +#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)" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index e67d7a0de..374c3c255 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -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 "" +#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)" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 22cbce33a..9ea53fde0 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -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 "" +#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") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 8ea899205..81d7ce025 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -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 "" +#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)" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 5fc0fef94..efdedace9 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -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 "" +#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)" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 5b873be1b..2dfeed617 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -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 "" +#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)" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 0d9a0f428..a04452836 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -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 "" +#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)" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 1232ec9f9..47cbdaa1b 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -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 "" +#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)" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index fcd8ea835..905446a0f 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -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 "" +#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)" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 9f285cbd8..f66775cf3 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -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 "" +#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)" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index e7aaf6ad0..287afb4b5 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -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 "" +#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)"