From a56411a837b88c7a00cff23f2544a633f684e082 Mon Sep 17 00:00:00 2001 From: 3djc Date: Wed, 27 Nov 2019 12:41:20 +0100 Subject: [PATCH] Cosmetics --- radio/src/telemetry/frsky_pxx2.cpp | 4 ++-- radio/src/telemetry/multi.cpp | 2 +- radio/src/translations.cpp | 4 ++-- radio/src/translations.h | 2 +- radio/src/translations/cz.h.txt | 4 ++-- radio/src/translations/de.h.txt | 4 ++-- radio/src/translations/en.h.txt | 4 ++-- radio/src/translations/es.h.txt | 4 ++-- radio/src/translations/fi.h.txt | 4 ++-- radio/src/translations/fr.h.txt | 4 ++-- radio/src/translations/it.h.txt | 4 ++-- radio/src/translations/nl.h.txt | 4 ++-- radio/src/translations/pl.h.txt | 4 ++-- radio/src/translations/pt.h.txt | 4 ++-- radio/src/translations/se.h.txt | 4 ++-- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/radio/src/telemetry/frsky_pxx2.cpp b/radio/src/telemetry/frsky_pxx2.cpp index 78cd3313b..7d596ecc4 100644 --- a/radio/src/telemetry/frsky_pxx2.cpp +++ b/radio/src/telemetry/frsky_pxx2.cpp @@ -38,7 +38,7 @@ void processGetHardwareInfoFrame(uint8_t module, const uint8_t * frame) if (!globalData.upgradeModulePopup && destination->information.modelID == PXX2_MODULE_ISRM_S_X10S && destination->information.swVersion.major == 0 && destination->information.swVersion.minor == 1 && destination->information.swVersion.revision < 5) { globalData.upgradeModulePopup = 1; - POPUP_WARNING(STR_MODULE_UPGRADE); + POPUP_WARNING(STR_MODULE_UPGRADE_ALERT); } } else if (index < PXX2_MAX_RECEIVERS_PER_MODULE && modelId < DIM(PXX2ReceiversNames)) { @@ -227,7 +227,7 @@ void processAuthenticationFrame(uint8_t module, const uint8_t * frame) if (!globalData.upgradeModulePopup) { if (globalData.authenticationCount >= 2) { globalData.upgradeModulePopup = 1; - POPUP_WARNING(STR_MODULE_UPGRADE); + POPUP_WARNING(STR_MODULE_UPGRADE_ALERT); } else { globalData.authenticationCount += 1; diff --git a/radio/src/telemetry/multi.cpp b/radio/src/telemetry/multi.cpp index cfd0c9a24..77ca485fe 100644 --- a/radio/src/telemetry/multi.cpp +++ b/radio/src/telemetry/multi.cpp @@ -549,7 +549,7 @@ void MultiModuleStatus::getStatusString(char * statusText) const } if (major == 1 && minor < 3 && SLOW_BLINK_ON_PHASE) { - strcpy(statusText, STR_MODULE_UPDATE); + strcpy(statusText, STR_MODULE_UPGRADE); } else { char * tmp = statusText; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 9ea8bb4be..ba23c2436 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -675,8 +675,8 @@ const char STR_MODULE_NO_INPUT[] = TR_MODULE_NO_INPUT; const char STR_MODULE_WAITFORBIND[] = TR_MODULE_WAITFORBIND; const char STR_MODULE_NO_TELEMETRY[] = TR_MODULE_NO_TELEMETRY; const char STR_MODULE_BINDING[] = TR_MODULE_BINDING; -const char STR_MODULE_UPGRADE[] = TR_MODULE_UPGRADE; -const char STR_MODULE_UPDATE[] = TR_MODULE_UPDATE; +const char STR_MODULE_UPGRADE_ALERT[] = TR_MODULE_UPGRADE_ALERT; +const char STR_MODULE_UPGRADE[] = TR_MODULE_UPGRADE; const char STR_PROTOCOL_INVALID[] = TR_PROTOCOL_INVALID; const char STR_MODULE_STATUS[] = TR_MODULE_STATUS; const char STR_MODULE_SYNC[] = TR_MODULE_SYNC; diff --git a/radio/src/translations.h b/radio/src/translations.h index 02af312be..e1e9e9c0f 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -398,8 +398,8 @@ extern const char STR_MODULE_NO_INPUT[]; extern const char STR_MODULE_WAITFORBIND[]; extern const char STR_MODULE_NO_TELEMETRY[]; extern const char STR_MODULE_BINDING[]; +extern const char STR_MODULE_UPGRADE_ALERT[]; extern const char STR_MODULE_UPGRADE[]; -extern const char STR_MODULE_UPDATE[]; extern const char STR_PROTOCOL_INVALID[]; extern const char STR_MODULE_STATUS[]; extern const char STR_MODULE_SYNC[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 4bb7e84e0..0c025e54f 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -643,8 +643,8 @@ #define TR_MODULE_NO_TELEMETRY TR3("Bez telemetrie", "Bez MULTI_TELEMETIE", "Nedetekována MULTI_TELEMETRIE") #define TR_MODULE_WAITFORBIND "Párovat při zavedení protokolu" #define TR_MODULE_BINDING TR("Bind...","Párování") -#define TR_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") -#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") +#define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") +#define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required") #define TR_REBIND "Nutno přepárovat" #define TR_REG_OK "Registrace ok" #define TR_BIND_OK "Úspěšné párovaní" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index cf2b19a13..49b1cc23d 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -645,8 +645,8 @@ #define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)") #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" -#define TR_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") -#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") +#define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") +#define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required") #define TR_REBIND "Rebinding required" #define TR_REG_OK "Registration ok" #define TR_BIND_OK "Bind successful" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 6ddc2262c..df483896c 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -644,8 +644,8 @@ #define TR_MODULE_NO_TELEMETRY TR3("No telemetry", "No MULTI_TELEMETRY", "No MULTI_TELEMETRY detected") #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING TR("Bind...","Binding") -#define TR_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") -#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") +#define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") +#define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required") #define TR_REBIND "Rebinding required" #define TR_REG_OK "Registration ok" #define TR_BIND_OK "Bind successful" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index a27942d5a..6c27fb9d7 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -668,8 +668,8 @@ #define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)") #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" -#define TR_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") -#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") +#define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") +#define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required") #define TR_REBIND "Rebinding required" #define TR_REG_OK "Registration ok" #define TR_BIND_OK "Bind successful" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 00308f29e..b7100ffe5 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -662,8 +662,8 @@ #define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)") #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" -#define TR_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") -#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") +#define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") +#define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required") #define TR_REBIND "Rebinding required" #define TR_REG_OK "Registration ok" #define TR_BIND_OK "Bind successful" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index bc0818358..ad3c43846 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -665,8 +665,8 @@ #define TR_MODULE_NO_TELEMETRY TR3("Pas de télm.", "Télémétrie absente", "Télémétrie absente(act. MULTI_TELEMETRY)") #define TR_MODULE_WAITFORBIND "Binder d'abord" #define TR_MODULE_BINDING "Bind..." -#define TR_MODULE_UPGRADE "Mise à jour requise" -#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") +#define TR_MODULE_UPGRADE_ALERT "Mise à jour requise" +#define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required") #define TR_REBIND "Rebind requis" #define TR_REG_OK "Enregistr. ok" #define TR_BIND_OK "Bind ok" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index da1bbc82a..ffd14059c 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -664,8 +664,8 @@ #define TR_MODULE_NO_TELEMETRY TR3("No telemetria", "MULTI_TELEMETRY disattivato", "Nessuna telem. (abilita MULTI_TELEMETRY)") #define TR_MODULE_WAITFORBIND "Associa per caricare il protocollo" #define TR_MODULE_BINDING "Associa" -#define TR_MODULE_UPGRADE TR3("Richiede agg.", "Richiede agg. modulo", "Modulo\nRichiede agg.") -#define TR_MODULE_UPDATE TR("Richiede agg.", "Richiede agg. modulo") +#define TR_MODULE_UPGRADE_ALERT TR3("Richiede agg.", "Richiede agg. modulo", "Modulo\nRichiede agg.") +#define TR_MODULE_UPGRADE TR("Richiede agg.", "Richiede agg. modulo") #define TR_REBIND "Richiede associazione" #define TR_REG_OK "Registrazione ok" #define TR_BIND_OK "Associazione riuscita" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 569c92208..268cc19f6 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -650,8 +650,8 @@ #define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)") #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" -#define TR_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") -#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") +#define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") +#define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required") #define TR_REBIND "Rebinding required" #define TR_REG_OK "Registration ok" #define TR_BIND_OK "Bind successful" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index a0b6c82c2..a16d9d15d 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -663,8 +663,8 @@ #define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)") #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" -#define TR_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") -#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") +#define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") +#define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required") #define TR_REBIND "Rebinding required" #define TR_REG_OK "Registration ok" #define TR_BIND_OK "Bind successful" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index c73bfcb71..30f5fa849 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -654,8 +654,8 @@ #define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)") #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" -#define TR_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") -#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") +#define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") +#define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required") #define TR_REBIND "Rebinding required" #define TR_REG_OK "Registration ok" #define TR_BIND_OK "Bind successful" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 08891b6d7..ff9a06f52 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -663,8 +663,8 @@ #define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)") #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" -#define TR_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") -#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") +#define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") +#define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required") #define TR_REBIND "Rebinding required" #define TR_REG_OK "Registration ok" #define TR_BIND_OK "Bind successful"