From ac8b056bb2f2f30c1fc0cd9df7bc0f8779181878 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 20 Jul 2019 09:14:50 +0200 Subject: [PATCH] Cosmetics --- radio/src/gui/common/stdlcd/radio_version.cpp | 5 ++--- radio/src/translations.cpp | 2 +- radio/src/translations.h | 2 +- radio/src/translations/cz.h.txt | 2 +- radio/src/translations/de.h.txt | 2 +- radio/src/translations/en.h.txt | 2 +- radio/src/translations/es.h.txt | 2 +- radio/src/translations/fi.h.txt | 2 +- radio/src/translations/fr.h.txt | 2 +- radio/src/translations/it.h.txt | 2 +- radio/src/translations/nl.h.txt | 2 +- radio/src/translations/pl.h.txt | 2 +- radio/src/translations/pt.h.txt | 2 +- radio/src/translations/se.h.txt | 2 +- 14 files changed, 15 insertions(+), 16 deletions(-) diff --git a/radio/src/gui/common/stdlcd/radio_version.cpp b/radio/src/gui/common/stdlcd/radio_version.cpp index 65407bf6b..d63d3cd9a 100644 --- a/radio/src/gui/common/stdlcd/radio_version.cpp +++ b/radio/src/gui/common/stdlcd/radio_version.cpp @@ -85,7 +85,6 @@ void menuRadioModulesVersion(event_t event) coord_t y = (FH + 1) - menuVerticalOffset * FH; for (uint8_t module=0; module= MENU_BODY_TOP && y < MENU_BODY_BOTTOM) { if (module == INTERNAL_MODULE) @@ -105,7 +104,7 @@ void menuRadioModulesVersion(event_t event) continue; } if (!isModulePXX2(INTERNAL_MODULE)) { - lcdDrawText(COLUMN2_X, y, TR("no info", "no information")); + lcdDrawText(COLUMN2_X, y, STR_NO_INFORMATION); y += FH; continue; } @@ -117,7 +116,7 @@ void menuRadioModulesVersion(event_t event) continue; } if (!isModulePXX2(EXTERNAL_MODULE)) { - lcdDrawText(COLUMN2_X, y, "no information"); + lcdDrawText(COLUMN2_X, y, STR_NO_INFORMATION); y += FH; continue; } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 2dd6d7de1..6e81cf4d5 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -117,7 +117,6 @@ ISTR(BLUETOOTH_MODES); const char STR_POPUPS_ENTER_EXIT[] = TR_POPUPS_ENTER_EXIT; const char STR_OK[] = TR_OK; const char STR_FREE[] = TR_FREE; -const char STR_NO_INFO[] = TR_NO_INFO; const char STR_DELETEMODEL[] = TR_DELETEMODEL; const char STR_COPYINGMODEL[] = TR_COPYINGMODEL; const char STR_MOVINGMODEL[] = TR_MOVINGMODEL; @@ -154,6 +153,7 @@ const char STR_CURVE[] = TR_CURVE; const char STR_FLMODE[] = TR_FLMODE; const char STR_MIXWARNING[] = TR_MIXWARNING; const char STR_OFF[] = TR_OFF; +const char STR_NO_INFORMATION[] = TR_NO_INFORMATION; const char STR_MULTPX[] = TR_MULTPX; const char STR_DELAYDOWN[] = TR_DELAYDOWN; const char STR_DELAYUP[] = TR_DELAYUP; diff --git a/radio/src/translations.h b/radio/src/translations.h index 2e0a54ae1..de6a071d1 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -193,7 +193,6 @@ extern const char STR_MENUWHENDONE[]; #endif extern const char STR_FREE[]; -extern const char STR_NO_INFO[]; #define LEN_FREE PSIZE(TR_FREE) extern const char STR_DELETEMODEL[]; extern const char STR_COPYINGMODEL[]; @@ -250,6 +249,7 @@ extern const char STR_CURVE[]; extern const char STR_FLMODE[]; extern const char STR_MIXWARNING[]; extern const char STR_OFF[]; +extern const char STR_NO_INFORMATION[]; extern const char STR_MULTPX[]; extern const char STR_DELAYDOWN[]; extern const char STR_DELAYUP[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 7c1270848..06848aac4 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -481,7 +481,6 @@ #define TR_MENUWHENDONE CENTER "\011" TR_ENTER " > DALŠÍ" #define TR_FREE TR("volné:", "volných") -#define TR_NO_INFO TR("no info", "no information") #define TR_DELETEMODEL "SMAZAT" BREAKSPACE "MODEL" #define TR_COPYINGMODEL "Kopíruji model.." #define TR_MOVINGMODEL "Přesouvám model." @@ -543,6 +542,7 @@ #define TR_FLMODE "Režim" #define TR_MIXWARNING "Varování" #define TR_OFF "VYP" +#define TR_NO_INFORMATION TR("No info", "No information") #define TR_MULTPX TR("Mat.operace", "Operace") #define TR_DELAYDOWN TR3("Zpoždění Vyp", "Zdržet(x)", "Zpoždění Vyp") #define TR_DELAYUP TR3("Zpoždění Zap", "Zdržet(\43)", "Zpoždění Zap") diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index a581a91d3..86707e2e9 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -492,7 +492,6 @@ #endif #define TR_FREE "frei" -#define TR_NO_INFO TR("no info", "no information") #define TR_DELETEMODEL "Modell löschen?" #define TR_COPYINGMODEL "Kopiere Modell" #define TR_MOVINGMODEL "Schiebe Modell" @@ -554,6 +553,7 @@ #define TR_FLMODE TR("Phase", "Phasen") #define TR_MIXWARNING "Warnung" #define TR_OFF "AUS" +#define TR_NO_INFORMATION TR("No info", "No information") #define TR_MULTPX "Wirkung" #define TR_DELAYDOWN "Verz. Dn" #define TR_DELAYUP "Verz. Up" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index d0ded1ce5..da981762f 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -483,7 +483,6 @@ #endif #define TR_FREE "free" -#define TR_NO_INFO TR("no info", "no information") #define TR_DELETEMODEL "DELETE" BREAKSPACE "MODEL" #define TR_COPYINGMODEL "Copying model..." #define TR_MOVINGMODEL "Moving model..." @@ -545,6 +544,7 @@ #define TR_FLMODE TR("Mode", "Modes") #define TR_MIXWARNING "Warning" #define TR_OFF "OFF" +#define TR_NO_INFORMATION TR("No info", "No information") #define TR_MULTPX "Multiplex" #define TR_DELAYDOWN "Delay dn" #define TR_DELAYUP "Delay up" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 782beb765..1b0e4b59d 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -499,7 +499,6 @@ #define TR_MENUWHENDONE CENTER "\007" TR_ENTER " AL ACABAR " #define TR_FREE "libre" -#define TR_NO_INFO TR("no info", "no information") #define TR_DELETEMODEL "BORRAR MODELO" #define TR_COPYINGMODEL "Copiando modelo.." #define TR_MOVINGMODEL "Mover modelo..." @@ -565,6 +564,7 @@ #define TR_FLMODE TR("Modo","Modos") #define TR_MIXWARNING "Aviso" #define TR_OFF "OFF" +#define TR_NO_INFORMATION TR("No info", "No information") #define TR_MULTPX "Multpx" #define TR_DELAYDOWN "Delay Dn" #define TR_DELAYUP "Delay Up" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index bbf35a7c6..10283b122 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -491,7 +491,6 @@ #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " WHEN DONE" #define TR_FREE "free" -#define TR_NO_INFO TR("no info", "no information") #define TR_DELETEMODEL "DELETE MODEL" #define TR_COPYINGMODEL "Copying model..." #define TR_MOVINGMODEL "Moving model..." @@ -557,6 +556,7 @@ #define TR_FLMODE TR("Mode","Modes") #define TR_MIXWARNING "Warning" #define TR_OFF "OFF" +#define TR_NO_INFORMATION TR("No info", "No information") #define TR_MULTPX "Multpx" #define TR_DELAYDOWN "Delay Dn" #define TR_DELAYUP "Delay Up" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index a8a951449..de1ad96bc 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -501,7 +501,6 @@ #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " QUAND PRET" #define TR_FREE "disp" -#define TR_NO_INFO TR("no info", "no information") #define TR_DELETEMODEL "SUPPRIMER" BREAKSPACE "MODELE" #define TR_COPYINGMODEL "Copie..." #define TR_MOVINGMODEL "Déplacement..." @@ -563,6 +562,7 @@ #define TR_FLMODE TR("Phase", "Phases") #define TR_MIXWARNING "Alerte" #define TR_OFF "OFF" +#define TR_NO_INFORMATION TR("No info", "No information") #define TR_MULTPX "Opération" #define TR_DELAYDOWN "Retard bas" #define TR_DELAYUP "Retard haut" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 7b1b2b157..585a3df4e 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -502,7 +502,6 @@ #define TR_MENUWHENDONE CENTER "\007" TR_ENTER " Conferma" #define TR_FREE "disp" -#define TR_NO_INFO TR("no info", "no information") #define TR_DELETEMODEL "Elimina modello?" #define TR_COPYINGMODEL "Copia in corso.." #define TR_MOVINGMODEL "Spostamento..." @@ -564,6 +563,7 @@ #define TR_FLMODE "Fase" #define TR_MIXWARNING "Avviso" #define TR_OFF "OFF" +#define TR_NO_INFORMATION TR("No info", "No information") #define TR_MULTPX "MultPx" #define TR_DELAYDOWN "Post.Giù " #define TR_DELAYUP "Post.Sù" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 9e2eaa0bc..f6f627e2d 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -484,7 +484,6 @@ TR_GYR_VSRCRAW #endif #define TR_FREE "vrij" -#define TR_NO_INFO TR("no info", "no information") #define TR_DELETEMODEL "WIS" BREAKSPACE "MODEL" #define TR_COPYINGMODEL "Kopieer Model" #define TR_MOVINGMODEL "Verplaats Model" @@ -546,6 +545,7 @@ TR_GYR_VSRCRAW #define TR_FLMODE TR("Mode", "Modes") #define TR_MIXWARNING "Melding" #define TR_OFF "UIT" +#define TR_NO_INFORMATION TR("No info", "No information") #define TR_MULTPX "Multpx" #define TR_DELAYDOWN "Vertr.Dn" #define TR_DELAYUP "Vertr.Up" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index a1b82d84f..f037f5ffd 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -502,7 +502,6 @@ #define TR_MENUWHENDONE CENTER "\006" TR_ENTER " > DALEJ" #define TR_FREE "woln" -#define TR_NO_INFO TR("no info", "no information") #define TR_DELETEMODEL "SKASUJ MODEL" #define TR_COPYINGMODEL "Kopiuj model.." #define TR_MOVINGMODEL "Przenieś model." @@ -564,6 +563,7 @@ #define TR_FLMODE "Tryb" #define TR_MIXWARNING "UWAGA" #define TR_OFF "Wył." +#define TR_NO_INFORMATION TR("No info", "No information") #define TR_MULTPX "Złącz." #define TR_DELAYDOWN "Opózn.(-)" #define TR_DELAYUP "Opózn.(+)" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index c66343693..52a0052a7 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -484,7 +484,6 @@ #define TR_MENUWHENDONE CENTER"\006" TR_ENTER "QDO PRONTO" #define TR_FREE "Livre" -#define TR_NO_INFO TR("no info", "no information") #define TR_DELETEMODEL "EXCLUI MODELO" #define TR_COPYINGMODEL "Copiando modelo" #define TR_MOVINGMODEL "Movendo modelo" @@ -550,6 +549,7 @@ #define TR_FLMODE "Fase" #define TR_MIXWARNING "Aviso" #define TR_OFF "OFF" +#define TR_NO_INFORMATION TR("No info", "No information") #define TR_MULTPX "Aplicar" #define TR_DELAYDOWN "Atraso Dn" #define TR_DELAYUP "Atraso Up" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 170456051..f06553846 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -497,7 +497,6 @@ #define TR_MENUWHENDONE CENTER "\011" TR_ENTER " Avslutar " #define TR_FREE "kvar" -#define TR_NO_INFO TR("no info", "no information") #define TR_DELETEMODEL "Radera Modell" #define TR_COPYINGMODEL "Kopierar Modell " #define TR_MOVINGMODEL "Flyttar Modell " @@ -563,6 +562,7 @@ #define TR_FLMODE TR("Läge","Flyglägen") #define TR_MIXWARNING "Varning" #define TR_OFF "Av " +#define TR_NO_INFORMATION TR("No info", "No information") #define TR_MULTPX "Multpx" #define TR_DELAYDOWN "Dröj Ned" #define TR_DELAYUP "Dröj Upp"