From ad215a2e95bfaaa36e93c504124aab1d4fbfaf23 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 17 Jun 2019 17:22:09 +0200 Subject: [PATCH] Cosmetics --- radio/src/gui/128x64/model_setup.cpp | 2 +- radio/src/gui/212x64/model_setup.cpp | 6 +++--- radio/src/gui/480x272/model_setup.cpp | 6 +++--- 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, 18 insertions(+), 18 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index cfb95e554..67b045780 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -458,7 +458,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_TIMER3_MINUTE_BEEP: { TimerData * timer = &g_model.timers[k>=ITEM_MODEL_SETUP_TIMER3 ? 2 : (k>=ITEM_MODEL_SETUP_TIMER2 ? 1 : 0)]; - timer->minuteBeep = editCheckBox(timer->minuteBeep, MODEL_SETUP_2ND_COLUMN, y, STR_MINUTEBEEP, attr, event); + timer->minuteBeep = editCheckBox(timer->minuteBeep, MODEL_SETUP_2ND_COLUMN, y, INDENT TR_MINUTEBEEP, attr, event); break; } diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index cc6aefead..3b2885d4b 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -405,7 +405,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TIMER1_MINUTE_BEEP: - g_model.timers[0].minuteBeep = editCheckBox(g_model.timers[0].minuteBeep, MODEL_SETUP_2ND_COLUMN, y, STR_MINUTEBEEP, attr, event); + g_model.timers[0].minuteBeep = editCheckBox(g_model.timers[0].minuteBeep, MODEL_SETUP_2ND_COLUMN, y, INDENT TR_MINUTEBEEP, attr, event); break; case ITEM_MODEL_SETUP_TIMER1_COUNTDOWN_BEEP: @@ -426,7 +426,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TIMER2_MINUTE_BEEP: - g_model.timers[1].minuteBeep = editCheckBox(g_model.timers[1].minuteBeep, MODEL_SETUP_2ND_COLUMN, y, STR_MINUTEBEEP, attr, event); + g_model.timers[1].minuteBeep = editCheckBox(g_model.timers[1].minuteBeep, MODEL_SETUP_2ND_COLUMN, y, INDENT TR_MINUTEBEEP, attr, event); break; case ITEM_MODEL_SETUP_TIMER2_COUNTDOWN_BEEP: @@ -448,7 +448,7 @@ void menuModelSetup(event_t event) break; case ITEM_MODEL_SETUP_TIMER3_MINUTE_BEEP: - g_model.timers[2].minuteBeep = editCheckBox(g_model.timers[2].minuteBeep, MODEL_SETUP_2ND_COLUMN, y, STR_MINUTEBEEP, attr, event); + g_model.timers[2].minuteBeep = editCheckBox(g_model.timers[2].minuteBeep, MODEL_SETUP_2ND_COLUMN, y, INDENT TR_MINUTEBEEP, attr, event); break; case ITEM_MODEL_SETUP_TIMER3_COUNTDOWN_BEEP: diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp index 0364e935f..630d9971d 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -347,7 +347,7 @@ bool menuModelSetup(event_t event) break; case ITEM_MODEL_TIMER1_MINUTE_BEEP: - lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MINUTEBEEP); + lcdDrawText(MENUS_MARGIN_LEFT, y, INDENT TR_MINUTEBEEP); g_model.timers[0].minuteBeep = editCheckBox(g_model.timers[0].minuteBeep, MODEL_SETUP_2ND_COLUMN, y, attr, event); break; @@ -371,7 +371,7 @@ bool menuModelSetup(event_t event) break; case ITEM_MODEL_TIMER2_MINUTE_BEEP: - lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MINUTEBEEP); + lcdDrawText(MENUS_MARGIN_LEFT, y, INDENT TR_MINUTEBEEP); g_model.timers[1].minuteBeep = editCheckBox(g_model.timers[1].minuteBeep, MODEL_SETUP_2ND_COLUMN, y, attr, event); break; @@ -396,7 +396,7 @@ bool menuModelSetup(event_t event) break; case ITEM_MODEL_TIMER3_MINUTE_BEEP: - lcdDrawText(MENUS_MARGIN_LEFT, y, STR_MINUTEBEEP); + lcdDrawText(MENUS_MARGIN_LEFT, y, INDENT TR_MINUTEBEEP); g_model.timers[2].minuteBeep = editCheckBox(g_model.timers[2].minuteBeep, MODEL_SETUP_2ND_COLUMN, y, attr, event); break; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index eaeb9c3e8..9ae720a08 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -588,7 +588,7 @@ #define TR_RENAVIG "Navig. RotEnc" #define TR_THROTTLE_LABEL "Plyn" #define TR_THROTTLEREVERSE TR("ReversPlyn", INDENT"Revers plynu") -#define TR_MINUTEBEEP TR(INDENT"Minuta", INDENT"Oznamovat minuty") +#define TR_MINUTEBEEP TR("Minuta", "Oznamovat minuty") #define TR_BEEPCOUNTDOWN INDENT"Odpočet" #define TR_PERSISTENT INDENT"Trvalé" #define TR_BACKLIGHT_LABEL "Podsvětlení" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 534644682..22dcaae24 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -595,7 +595,7 @@ #define TR_RENAVIG "Drehgeb. Navig." #define TR_THROTTLE_LABEL "Gas-Kontrolle" #define TR_THROTTLEREVERSE TR("Gas invers", INDENT "Vollgas hinten?") //Änderung wg TH9x, Taranis -#define TR_MINUTEBEEP TR(INDENT "Min-Alarm", INDENT "Minuten-Alarm") +#define TR_MINUTEBEEP TR("Min-Alarm", "Minuten-Alarm") #define TR_BEEPCOUNTDOWN INDENT "Countdown" #define TR_PERSISTENT TR(INDENT "Permanent", INDENT "Permanent") #define TR_BACKLIGHT_LABEL "LCD-Beleuchtung" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 006561031..522df75a9 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -590,7 +590,7 @@ #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" #define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Reverse") -#define TR_MINUTEBEEP TR(INDENT "Minute", INDENT "Minute call") +#define TR_MINUTEBEEP TR("Minute", "Minute call") #define TR_BEEPCOUNTDOWN INDENT "Countdown" #define TR_PERSISTENT TR(INDENT "Persist.", INDENT "Persistent") #define TR_BACKLIGHT_LABEL "Backlight" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index e247bb789..b4ea0f867 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -606,7 +606,7 @@ #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" #define TR_THROTTLEREVERSE TR("Invert_Acel", INDENT "Invertir Acel.") -#define TR_MINUTEBEEP TR(INDENT"Minuto", INDENT"Cada Minuto") +#define TR_MINUTEBEEP TR("Minuto", "Cada Minuto") #define TR_BEEPCOUNTDOWN INDENT"Cuentaatras" #define TR_PERSISTENT TR(INDENT"Persist.", INDENT"Persistente") #define TR_BACKLIGHT_LABEL "Luz Fondo" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 62eeda86a..fa03cff4b 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -598,7 +598,7 @@ #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" #define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Throttle reverse") -#define TR_MINUTEBEEP TR(INDENT"Minute", INDENT"Minute call") +#define TR_MINUTEBEEP TR("Minute", "Minute call") #define TR_BEEPCOUNTDOWN INDENT"Countdown" #define TR_PERSISTENT TR(INDENT"Persist.", INDENT"Persistent") #define TR_BACKLIGHT_LABEL "Backlight" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index eaa4cb9a9..fd5ca33e8 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -604,7 +604,7 @@ #define TR_RENAVIG "Navig EncRot" #define TR_THROTTLE_LABEL "Gaz" #define TR_THROTTLEREVERSE TR("Inv. gaz", INDENT "Inversion gaz") -#define TR_MINUTEBEEP TR(INDENT "Bip min.", INDENT "Annonces minutes") +#define TR_MINUTEBEEP TR("Bip min.", "Annonces minutes") #define TR_BEEPCOUNTDOWN TR(INDENT "Bip fin", INDENT "Compte à rebours") #define TR_PERSISTENT TR(INDENT "Persist.", INDENT "Persistant") #define TR_BACKLIGHT_LABEL "Rétroéclairage" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index bdcc05350..d6b21ae07 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -605,7 +605,7 @@ #define TR_RENAVIG "Navig EncRot " #define TR_THROTTLE_LABEL "Motore" #define TR_THROTTLEREVERSE TR("Mot inv.", INDENT "Motore Inverso") -#define TR_MINUTEBEEP INDENT"Minuto" +#define TR_MINUTEBEEP "Minuto" #define TR_BEEPCOUNTDOWN TR(INDENT"Conto rov", INDENT"Conto rovescia") #define TR_PERSISTENT TR(INDENT"Persist.", INDENT"Persistente") #define TR_BACKLIGHT_LABEL TR("Retroillum.", "Retroilluminazione") diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index f085e70a5..aea5b781a 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -589,7 +589,7 @@ TR_GYR_VSRCRAW #define TR_RENAVIG "Stappenschakelaar" #define TR_THROTTLE_LABEL "Gas" #define TR_THROTTLEREVERSE TR("Reverse", INDENT "Omgekeerd") -#define TR_MINUTEBEEP TR(INDENT "Min-Alarm", INDENT "Minuten-Alarm") +#define TR_MINUTEBEEP TR("Min-Alarm", "Minuten-Alarm") #define TR_BEEPCOUNTDOWN INDENT "Countdown" #define TR_PERSISTENT TR(INDENT "Vasth.", INDENT "Vasthouden") #define TR_BACKLIGHT_LABEL "LCD-Verlichting" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 210abc63a..5eabd8fbd 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -605,7 +605,7 @@ #define TR_RENAVIG "Nawigacja potencjometrem" #define TR_THROTTLE_LABEL "Gaz " #define TR_THROTTLEREVERSE TR("OdwrGaz", INDENT "OdwrGaz") -#define TR_MINUTEBEEP TR(INDENT "Minuta", INDENT "PikCoMinutę") +#define TR_MINUTEBEEP TR("Minuta", "PikCoMinutę") #define TR_BEEPCOUNTDOWN INDENT "Odliczanie" #define TR_PERSISTENT TR(INDENT "Dokł.", INDENT "Dokładny") #define TR_BACKLIGHT_LABEL "Podświetl" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 192e59226..34db69a29 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -591,7 +591,7 @@ #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" #define TR_THROTTLEREVERSE TR("Inverte Acel.", INDENT "Inverte Acel.") -#define TR_MINUTEBEEP INDENT "Beep Minuto" +#define TR_MINUTEBEEP "Beep Minuto" #define TR_BEEPCOUNTDOWN INDENT "Beep Regressivo" #define TR_PERSISTENT INDENT "Persist." #define TR_BACKLIGHT_LABEL "Backlight" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 328cdbfc5..7c3bd6351 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -604,7 +604,7 @@ #define TR_RENAVIG "RotEnk Navig" #define TR_THROTTLE_LABEL "Gas" #define TR_THROTTLEREVERSE TR("Inv.Gas", INDENT "Inverterad Gas") -#define TR_MINUTEBEEP INDENT "Minutpip" +#define TR_MINUTEBEEP "Minutpip" #define TR_BEEPCOUNTDOWN INDENT "Nedräkning" #define TR_PERSISTENT TR("Jämt på ", INDENT"Alltid På") #define TR_BACKLIGHT_LABEL "Belysning"