diff --git a/src/general_menus.cpp b/src/general_menus.cpp index b97157305..b6d41ea5e 100644 --- a/src/general_menus.cpp +++ b/src/general_menus.cpp @@ -461,7 +461,7 @@ void menuGeneralSetup(uint8_t event) #if defined(PXX) case ITEM_SETUP_COUNTRYCODE: - g_eeGeneral.countryCode = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, PSTR("Country Code"), STR_COUNTRYCODES, g_eeGeneral.countryCode, 0, 2, attr, event); + g_eeGeneral.countryCode = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_COUNTRYCODE, STR_COUNTRYCODES, g_eeGeneral.countryCode, 0, 2, attr, event); break; #endif diff --git a/src/model_menus.cpp b/src/model_menus.cpp index edcde8dc1..23db0d900 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -889,7 +889,7 @@ void menuModelSetup(uint8_t event) case ITEM_MODEL_TIMER2_PERSISTENT: { TimerData &timer = g_model.timers[k==ITEM_MODEL_TIMER2_PERSISTENT]; - timer.persistent = onoffMenuItem(timer.persistent, MODEL_SETUP_2ND_COLUMN, y, PSTR(INDENT"Persist."), attr, event); + timer.persistent = onoffMenuItem(timer.persistent, MODEL_SETUP_2ND_COLUMN, y, STR_PERSISTENT, attr, event); break; } #endif @@ -994,7 +994,7 @@ void menuModelSetup(uint8_t event) #if defined(PCBX9D) case ITEM_MODE_INTERNAL_MODULE_LABEL: - lcd_putsLeft(y, PSTR("Internal Module")); + lcd_putsLeft(y, TR_INTERNALRF); break; case ITEM_MODE_INTERNAL_MODULE_MODE: @@ -1051,7 +1051,7 @@ void menuModelSetup(uint8_t event) break; case ITEM_MODE_INTERNAL_MODULE_FAILSAFE: - lcd_putsLeft(y, PSTR("\001FailSafe")); + lcd_putsLeft(y, TR_FAILSAFE); lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, PSTR("\011""Hold\0 ""Custom\0 ""No pulses"), g_model.failsafeMode, (m_posHorz==0 || g_model.failsafeMode!=FAILSAFE_CUSTOM) ? attr : 0); if (g_model.failsafeMode == FAILSAFE_CUSTOM) lcd_putsAtt(MODEL_SETUP_2ND_COLUMN + 10*FW, y, PSTR("[Set]"), m_posHorz==1 ? attr : 0); if (attr) { diff --git a/src/translations.cpp b/src/translations.cpp index 635936712..a2be89452 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -191,6 +191,7 @@ const pm_char STR_RENAVIG[] PROGMEM = TR_RENAVIG; const pm_char STR_THROTTLEREVERSE[] PROGMEM = TR_THROTTLEREVERSE; const pm_char STR_MINUTEBEEP[] PROGMEM = TR_MINUTEBEEP; const pm_char STR_BEEPCOUNTDOWN[] PROGMEM = TR_BEEPCOUNTDOWN; +const pm_char STR_PERSISTENT[] PROGMEM = TR_PERSISTENT; const pm_char STR_BACKLIGHT_LABEL[] PROGMEM = TR_BACKLIGHT_LABEL; const pm_char STR_BLDELAY[] PROGMEM = TR_BLDELAY; @@ -291,7 +292,6 @@ const pm_char STR_MENUDEBUG[] PROGMEM = TR_MENUDEBUG; #if defined(DSM2) || defined(PXX) const pm_char STR_RXNUM[] PROGMEM = TR_RXNUM; -const pm_char STR_BIND[] PROGMEM = TR_BIND; #endif #if defined(PXX) @@ -299,12 +299,8 @@ const pm_char STR_SYNCMENU[] PROGMEM = TR_SYNCMENU; const pm_char STR_INTERNALRF[] PROGMEM = TR_INTERNALRF; const pm_char STR_EXTERNALRF[] PROGMEM = TR_EXTERNALRF; const pm_char STR_FAILSAFE[] PROGMEM = TR_FAILSAFE; -const pm_char STR_HOLD[] PROGMEM = TR_HOLD; -const pm_char STR_NOPULSES[] PROGMEM = TR_NOPULSES; -const pm_char STR_CUSTOMFS[] PROGMEM = TR_CUSTOMFS; const pm_char STR_FAILSAFESET[] PROGMEM = TR_FAILSAFESET; -const pm_char STR_SET[] PROGMEM = TR_SET; -const pm_char STR_RANGECHECK[] PROGMEM = TR_RANGECHECK; +const pm_char STR_COUNTRYCODE[] PROGMEM = TR_COUNTRYCODE; #endif const pm_char STR_INVERT_THR[] PROGMEM = TR_INVERT_THR; diff --git a/src/translations.h b/src/translations.h index 53963dc5c..aeb4273b7 100644 --- a/src/translations.h +++ b/src/translations.h @@ -312,6 +312,7 @@ extern const pm_char STR_RENAVIG[]; extern const pm_char STR_THROTTLEREVERSE[]; extern const pm_char STR_MINUTEBEEP[]; extern const pm_char STR_BEEPCOUNTDOWN[]; +extern const pm_char STR_PERSISTENT[]; extern const pm_char STR_BACKLIGHT_LABEL[]; extern const pm_char STR_BLDELAY[]; #if defined(PWM_BACKLIGHT) @@ -395,7 +396,6 @@ extern const pm_char STR_INVERT_THR[]; #if defined(DSM2) || defined(PXX) extern const pm_char STR_RXNUM[]; -extern const pm_char STR_BIND[]; #endif #if defined(PXX) @@ -403,12 +403,8 @@ extern const pm_char STR_SYNCMENU[]; extern const pm_char STR_INTERNALRF[]; extern const pm_char STR_EXTERNALRF[]; extern const pm_char STR_FAILSAFE[]; -extern const pm_char STR_HOLD[]; -extern const pm_char STR_NOPULSES[]; -extern const pm_char STR_CUSTOMFS[]; extern const pm_char STR_FAILSAFESET[]; -extern const pm_char STR_SET[]; -extern const pm_char STR_RANGECHECK[]; +extern const pm_char STR_COUNTRYCODE[]; #endif #if defined(FRSKY) diff --git a/src/translations/cz.h b/src/translations/cz.h index 71f06ce97..a44490018 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -407,6 +407,7 @@ #define TR_THROTTLEREVERSE "Revers Plynu" #define TR_MINUTEBEEP INDENT"Minuta" #define TR_BEEPCOUNTDOWN INDENT"Odpo\201et" +#define TR_PERSISTENT INDENT"Persist." #define TR_BACKLIGHT_LABEL "Podsv\203tlen\204" #define TR_BLDELAY INDENT"Zhasnout po" #define TR_BLONBRIGHTNESS INDENT"Jas Zap." @@ -574,10 +575,5 @@ #define TR_INTERNALRF "Internal RF" #define TR_EXTERNALRF "External RF" #define TR_FAILSAFE "Failsafe mode" -#define TR_HOLD "Hold" -#define TR_NOPULSES "Pulses off" -#define TR_CUSTOMFS "Custom" -#define TR_SET "SET" #define TR_FAILSAFESET "FAILSAFE SETTINGS" -#define TR_RANGECHECK "R. Check" -#define TR_BIND "BIND" +#define TR_COUNTRYCODE "Country Code" diff --git a/src/translations/de.h b/src/translations/de.h index 459bec6d4..3f7296c95 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -409,7 +409,8 @@ #define TR_THROTTLEREVERSE "Gasumkehrung" #define TR_MINUTEBEEP INDENT"Minuten" #define TR_BEEPCOUNTDOWN INDENT"Countdown" -#define TR_BACKLIGHT_LABEL "Beleuchtung" +#define TR_PERSISTENT INDENT"Persist." +#define TR_BACKLIGHT_LABEL "Beleuchtung" #define TR_BLDELAY INDENT"Dauer" #define TR_BLONBRIGHTNESS INDENT"An Helligkeit" #define TR_BLOFFBRIGHTNESS INDENT"Aus Helligkeit" @@ -576,10 +577,5 @@ #define TR_INTERNALRF "Internal RF" #define TR_EXTERNALRF "External RF" #define TR_FAILSAFE "Failsafe mode" -#define TR_HOLD "Hold" -#define TR_NOPULSES "Pulses off" -#define TR_CUSTOMFS "Custom" -#define TR_SET "SET" #define TR_FAILSAFESET "FAILSAFE SETTINGS" -#define TR_RANGECHECK "R. Check" -#define TR_BIND "BIND" +#define TR_COUNTRYCODE "Country Code" diff --git a/src/translations/en.h b/src/translations/en.h index 4803c86ca..8055d8c44 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -421,6 +421,7 @@ #define TR_THROTTLEREVERSE TR("Thr reverse","Throttle reverse") #define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Every minute") #define TR_BEEPCOUNTDOWN INDENT"Countdown" +#define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistent") #define TR_BACKLIGHT_LABEL "Backlight" #define TR_BLDELAY INDENT"Duration" #define TR_BLONBRIGHTNESS INDENT"ON Brightness" @@ -582,10 +583,5 @@ #define TR_INTERNALRF "Internal RF" #define TR_EXTERNALRF "External RF" #define TR_FAILSAFE "Failsafe mode" -#define TR_HOLD "Hold" -#define TR_NOPULSES "Pulses off" -#define TR_CUSTOMFS "Custom" -#define TR_SET "SET" #define TR_FAILSAFESET "FAILSAFE SETTINGS" -#define TR_RANGECHECK "R. Check" -#define TR_BIND "BIND" +#define TR_COUNTRYCODE "Country Code" diff --git a/src/translations/es.h b/src/translations/es.h index 572d3ee05..a92fa1e71 100644 --- a/src/translations/es.h +++ b/src/translations/es.h @@ -407,6 +407,7 @@ #define TR_THROTTLEREVERSE TR("Acel Invert","Invertir Acel.") #define TR_MINUTEBEEP TR(INDENT"Minuto",INDENT"Cada minuto") #define TR_BEEPCOUNTDOWN INDENT"Cuentaatras" +#define TR_PERSISTENT INDENT"Persist." #define TR_BACKLIGHT_LABEL "Luz Fondo" #define TR_BLDELAY INDENT"Duracion" #define TR_BLONBRIGHTNESS INDENT"ON Brightness" @@ -574,10 +575,5 @@ #define TR_INTERNALRF "Internal RF" #define TR_EXTERNALRF "External RF" #define TR_FAILSAFE "Failsafe mode" -#define TR_HOLD "Hold" -#define TR_NOPULSES "Pulses off" -#define TR_CUSTOMFS "Custom" -#define TR_SET "SET" #define TR_FAILSAFESET "FAILSAFE SETTINGS" -#define TR_RANGECHECK "R. Check" -#define TR_BIND "BIND" \ No newline at end of file +#define TR_COUNTRYCODE "Country Code" \ No newline at end of file diff --git a/src/translations/fr.h b/src/translations/fr.h index d6c3843e1..d6e554ceb 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -412,20 +412,21 @@ #define TR_HAPTICSTRENGTH INDENT"Force" #define TR_CONTRAST "Contraste" #define TR_ALARMS_LABEL "Alarmes" -#define TR_BATTERY_RANGE "Battery Range" -#define TR_BATTERYWARNING INDENT"Batterie faible" +#define TR_BATTERY_RANGE "Plage batterie" +#define TR_BATTERYWARNING TR(INDENT"Batterie",INDENT"Batterie faible") #define TR_INACTIVITYALARM INDENT"Inactivit\200" #define TR_MEMORYWARNING INDENT"M\200moire faible" -#define TR_ALARMWARNING INDENT"Sons d\200sactiv\200s" +#define TR_ALARMWARNING TR(INDENT"Silence",INDENT"Sons d\200sactiv\200s") #define TR_RENAVIG "Navig EncRot" #define TR_THROTTLEREVERSE "Inversion gaz" -#define TR_MINUTEBEEP TR(INDENT"Bip minute",INDENT"Chaque minute") -#define TR_BEEPCOUNTDOWN TR(INDENT"Bip rebours",INDENT"Compte \202 rebours") +#define TR_MINUTEBEEP TR(INDENT"Bip min.",INDENT"Chaque minute") +#define TR_BEEPCOUNTDOWN TR(INDENT"Bip fin",INDENT"Compte \202 rebours") +#define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistant") #define TR_BACKLIGHT_LABEL "R\200tro\200clairage" #define TR_BLDELAY INDENT"Dur\200e" #define TR_BLONBRIGHTNESS INDENT"Luminosit\200 ON" #define TR_BLOFFBRIGHTNESS INDENT"Luminosit\200 OFF" -#define TR_SPLASHSCREEN "Ecran d'accueil" +#define TR_SPLASHSCREEN "Logo d'accueil" #define TR_THROTTLEWARNING "Alerte gaz" #define TR_SWITCHWARNING TR("Alerte int","Alerte interrupt.") #define TR_TIMEZONE "Fuseau horaire" @@ -490,7 +491,7 @@ #define TR_MENUCALIBRATION "CALIBRATION" #define TR_TRIMS2OFFSETS "\006Trims => Offsets" #define TR_MENUMODELSEL "MODELES" -#define TR_MENUSETUP TR("CONF.","CONFIGURATION") +#define TR_MENUSETUP TR("CONF. MODELE","CONFIGURATION") #define TR_MENUFLIGHTPHASE "PHASE DE VOL" #define TR_MENUFLIGHTPHASES "PHASES DE VOL" #define TR_MENUHELISETUP TR("CONF.HELI","CONFIGURATION HELICO") @@ -518,7 +519,7 @@ #define TR_MINRSSI "RSSI Min." #define TR_LATITUDE "Latitude" #define TR_LONGITUDE "Longitude" -#define TR_GPSCOORD "Coordonn\200es GPS" +#define TR_GPSCOORD TR("Coordonn\200es","Coordonn\200es GPS") #define TR_VARIO TR("Vario","Variom\201tre") #define TR_SHUTDOWN "ARRET EN COURS" #define TR_BATT_CALIB "Calib. Batterie" @@ -588,10 +589,5 @@ #define TR_INTERNALRF "HF interne" #define TR_EXTERNALRF "HF externe" #define TR_FAILSAFE "Type failsafe" -#define TR_HOLD "Maintien" -#define TR_NOPULSES "Sorties off" -#define TR_CUSTOMFS "Prédéfini" -#define TR_SET "SET" #define TR_FAILSAFESET "REGLAGES FAILSAFE" -#define TR_RANGECHECK "Test port\200e" -#define TR_BIND "BIND" \ No newline at end of file +#define TR_COUNTRYCODE "Zone g\200o." \ No newline at end of file diff --git a/src/translations/it.h b/src/translations/it.h index eb725d675..6426ba7dd 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -406,6 +406,7 @@ #define TR_THROTTLEREVERSE "Thr inverso" #define TR_MINUTEBEEP INDENT"Minuto" #define TR_BEEPCOUNTDOWN INDENT"Conto rov." +#define TR_PERSISTENT INDENT"Persist." #define TR_BACKLIGHT_LABEL "Retroillum." #define TR_BLDELAY INDENT"Durata" #define TR_BLONBRIGHTNESS INDENT"ON Brightness" @@ -573,10 +574,5 @@ #define TR_INTERNALRF "Internal RF" #define TR_EXTERNALRF "External RF" #define TR_FAILSAFE "Failsafe mode" -#define TR_HOLD "Hold" -#define TR_NOPULSES "Pulses off" -#define TR_CUSTOMFS "Custom" -#define TR_SET "SET" #define TR_FAILSAFESET "FAILSAFE SETTINGS" -#define TR_RANGECHECK "R. Check" -#define TR_BIND "BIND" \ No newline at end of file +#define TR_COUNTRYCODE "Country Code" \ No newline at end of file diff --git a/src/translations/pt.h b/src/translations/pt.h index f4b9d7c3a..6ebf4d0b0 100644 --- a/src/translations/pt.h +++ b/src/translations/pt.h @@ -385,6 +385,7 @@ #define TR_THROTTLEREVERSE "Inverte Acel." #define TR_MINUTEBEEP INDENT"Beep Minuto" #define TR_BEEPCOUNTDOWN INDENT"Beep Regressivo" +#define TR_PERSISTENT INDENT"Persist." #define TR_BACKLIGHT_LABEL "Backlight" #define TR_BLDELAY INDENT"Tempo Backlight" #define TR_BLONBRIGHTNESS INDENT"ON Brightness" @@ -552,10 +553,5 @@ #define TR_INTERNALRF "Internal RF" #define TR_EXTERNALRF "External RF" #define TR_FAILSAFE "Failsafe mode" -#define TR_HOLD "Hold" -#define TR_NOPULSES "Pulses off" -#define TR_CUSTOMFS "Custom" -#define TR_SET "SET" #define TR_FAILSAFESET "FAILSAFE SETTINGS" -#define TR_RANGECHECK "R. Check" -#define TR_BIND "BIND" \ No newline at end of file +#define TR_COUNTRYCODE "Country Code" \ No newline at end of file diff --git a/src/translations/se.h b/src/translations/se.h index f43e10cff..6c8d1fc22 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -407,6 +407,7 @@ #define TR_THROTTLEREVERSE "Reverserad Gas" #define TR_MINUTEBEEP INDENT"Varje Minut" #define TR_BEEPCOUNTDOWN INDENT"R\201kna Ned" +#define TR_PERSISTENT INDENT"Persist." #define TR_BACKLIGHT_LABEL "Belysning" #define TR_BLDELAY INDENT"Av efter" #define TR_BLONBRIGHTNESS INDENT"ON Brightness" @@ -574,10 +575,5 @@ #define TR_INTERNALRF "Internal RF" #define TR_EXTERNALRF "External RF" #define TR_FAILSAFE "Failsafe mode" -#define TR_HOLD "Hold" -#define TR_NOPULSES "Pulses off" -#define TR_CUSTOMFS "Custom" -#define TR_SET "SET" #define TR_FAILSAFESET "FAILSAFE SETTINGS" -#define TR_RANGECHECK "R. Check" -#define TR_BIND "BIND" \ No newline at end of file +#define TR_COUNTRYCODE "Country Code" \ No newline at end of file