Reuses previous translations for [Clear] button

This commit is contained in:
Bertrand Songis
2019-04-20 16:12:16 +02:00
parent ba4f15be43
commit 0e009d81d8
14 changed files with 2 additions and 15 deletions
+2 -2
View File
@@ -1134,7 +1134,7 @@ void menuModelSetup(event_t event)
}
if (bluetoothDistantAddr[0]) {
lcdDrawText(INDENT_WIDTH, y+1, bluetoothDistantAddr, TINSIZE);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BUTTON_CLEAR, attr);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_CLEAR), attr);
if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) {
bluetoothState = BLUETOOTH_STATE_OFF;
memclear(bluetoothDistantAddr, sizeof(bluetoothDistantAddr));
@@ -1328,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, STR_MODULE_BIND), attr);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_BIND, attr);
if (attr && s_editMode > 0) {
s_editMode = 0;
killEvents(event);
-1
View File
@@ -600,7 +600,6 @@ 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;
-1
View File
@@ -866,7 +866,6 @@ 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[];
-1
View File
@@ -985,7 +985,6 @@
#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?"
-1
View File
@@ -990,7 +990,6 @@
#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?"
-1
View File
@@ -1001,7 +1001,6 @@
#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?"
-1
View File
@@ -996,7 +996,6 @@
#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?"
-1
View File
@@ -988,7 +988,6 @@
#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?"
-1
View File
@@ -1000,7 +1000,6 @@
#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?"
-1
View File
@@ -990,7 +990,6 @@
#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?"
-1
View File
@@ -991,7 +991,6 @@
#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?"
-1
View File
@@ -991,7 +991,6 @@
#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?"
-1
View File
@@ -995,7 +995,6 @@
#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?"
-1
View File
@@ -1004,7 +1004,6 @@
#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?"