From 0e009d81d843625429a68eacee8497b0a669df20 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 20 Apr 2019 16:12:16 +0200 Subject: [PATCH] Reuses previous translations for [Clear] button --- radio/src/gui/128x64/model_setup.cpp | 4 ++-- radio/src/translations.cpp | 1 - radio/src/translations.h | 1 - radio/src/translations/cz.h.txt | 1 - radio/src/translations/de.h.txt | 1 - radio/src/translations/en.h.txt | 1 - radio/src/translations/es.h.txt | 1 - radio/src/translations/fi.h.txt | 1 - radio/src/translations/fr.h.txt | 1 - radio/src/translations/it.h.txt | 1 - radio/src/translations/nl.h.txt | 1 - radio/src/translations/pl.h.txt | 1 - radio/src/translations/pt.h.txt | 1 - radio/src/translations/se.h.txt | 1 - 14 files changed, 2 insertions(+), 15 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 99c0b3f38..b75feaa5b 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -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); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 958b4e2b1..f826bdf0a 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -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; diff --git a/radio/src/translations.h b/radio/src/translations.h index 08a74915a..5a2fd9ecb 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -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[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 4ce964427..50c381b9c 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -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?" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 374c3c255..fc4f4db41 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -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?" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 9ea53fde0..f0dd1ade3 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -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?" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 81d7ce025..4711b2688 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -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?" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index efdedace9..cbf684ceb 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -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?" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 2dfeed617..123805b8c 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -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?" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index a04452836..16b495038 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -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?" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 47cbdaa1b..27f86269c 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -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?" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 905446a0f..47ec0afec 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -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?" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index f66775cf3..1d53538fa 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -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?" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 287afb4b5..e513e5aa3 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -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?"