diff --git a/src/general_menus.cpp b/src/general_menus.cpp index 4a78c2d9d..330baff95 100644 --- a/src/general_menus.cpp +++ b/src/general_menus.cpp @@ -39,16 +39,12 @@ const pm_uchar sticks[] PROGMEM = { enum EnumTabDiag { e_Setup, -#if defined(SDCARD) - e_Sd, -#endif + IF_SDCARD(e_Sd) e_Trainer, e_Vers, e_Keys, e_Ana, -#if defined(PCBSKY9X) - e_Hardware, -#endif + IF_PCBSKY9X(e_Hardware) e_Calib }; @@ -65,16 +61,12 @@ void menuGeneralCalib(uint8_t event); const MenuFuncP_PROGMEM menuTabDiag[] PROGMEM = { menuGeneralSetup, -#if defined(SDCARD) - menuGeneralSdManager, -#endif + IF_SDCARD(menuGeneralSdManager) menuGeneralTrainer, menuGeneralVersion, menuGeneralDiagKeys, menuGeneralDiagAna, -#if defined(PCBSKY9X) - menuGeneralHardware, -#endif + IF_PCBSKY9X(menuGeneralHardware) menuGeneralCalib }; @@ -151,7 +143,7 @@ void menuGeneralSetup(uint8_t event) switch(k) { #if defined(RTCLOCK) case ITEM_SETUP_RTC: - lcd_putsLeft(y, PSTR("Time")); + lcd_putsLeft(y, STR_TIME); lcd_putc(FW*7+6, y, '-'); lcd_putc(FW*10+4, y, '-'); lcd_putc(FW*15+5, y, ':'); lcd_putc(FW*18+3, y, ':'); for (uint8_t j=0; j<6; j++) { // 3 settings each for date and time (YMD and HMS) @@ -315,7 +307,7 @@ void menuGeneralSetup(uint8_t event) #if defined(BLUETOOTH) case ITEM_SETUP_BT_BAUDRATE: - g_eeGeneral.btBaudrate = selectMenuItem(GENERAL_PARAM_OFS, y, PSTR("BT Baudrate"), PSTR("\005115k 9600 19200"), g_eeGeneral.btBaudrate, 0, 2, attr, event); + g_eeGeneral.btBaudrate = selectMenuItem(GENERAL_PARAM_OFS, y, STR_BAUDRATE, PSTR("\005115k 9600 19200"), g_eeGeneral.btBaudrate, 0, 2, attr, event); if (attr && checkIncDec_Ret) { btInit(); } @@ -437,20 +429,20 @@ extern uint32_t sdAvailableAudioFiles; // TODO move that! #if defined(SDCARD) void menuGeneralSdManagerInfo(uint8_t event) { - SIMPLE_SUBMENU(PSTR("SD INFO"), 1); + SIMPLE_SUBMENU(STR_SD_INFO_TITLE, 1); - lcd_putsLeft(2*FH, PSTR("Type:")); + lcd_putsLeft(2*FH, STR_SD_TYPE); lcd_puts(10*FW, 2*FH, SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD); - lcd_putsLeft(3*FH, PSTR("Size:")); + lcd_putsLeft(3*FH, STR_SD_SIZE); lcd_outdezAtt(10*FW, 3*FH, SD_GET_SIZE_MB(), LEFT); lcd_putc(lcdLastPos, 3*FH, 'M'); - lcd_putsLeft(4*FH, PSTR("Sectors:")); + lcd_putsLeft(4*FH, STR_SD_SECTORS); lcd_outdezAtt(10*FW, 4*FH, SD_GET_BLOCKNR()/1000, LEFT); lcd_putc(lcdLastPos, 4*FH, 'k'); - lcd_putsLeft(5*FH, PSTR("Speed:")); + lcd_putsLeft(5*FH, STR_SD_SPEED); lcd_outdezAtt(10*FW, 5*FH, SD_GET_SPEED()/1000, LEFT); lcd_puts(lcdLastPos, 5*FH, "kb/s"); } @@ -657,7 +649,7 @@ void menuGeneralSdManager(uint8_t event) pushMenu(menuGeneralSdManagerInfo); } else if (result == STR_SD_FORMAT) { - displayPopup(PSTR("Formatting...")); // TODO translations + displayPopup(STR_FORMATTING); if (f_mkfs(0, 1, 0) == FR_OK) { #if defined(PCBSKY9X) sdAvailableAudioFiles = 0; @@ -777,10 +769,11 @@ void menuGeneralVersion(uint8_t event) lcd_putsLeft(4*FH, stamp3); lcd_putsLeft(5*FH, stamp4); #if defined(PCBSKY9X) - if (Coproc_valid!=1) { + if (Coproc_valid != 1) { lcd_putsLeft(6*FH, PSTR("CoPr:")); lcd_outdez8(10*FW, 6*FH, Coproc_read); - } else { + } + else { lcd_putsLeft(6*FH, PSTR("CoPr: ---")); } #endif @@ -883,7 +876,7 @@ void menuGeneralDiagAna(uint8_t event) #endif #if defined(PCBSKY9X) - lcd_putsLeft(7*FH, PSTR("Temp. Calib")); + lcd_putsLeft(7*FH, STR_TEMP_CALIB); putsTelemetryValue(LEN_CALIB_FIELDS*FW+4*FW, 7*FH, getTemperature(), UNIT_DEGREES, (m_posVert==3 ? INVERS : 0)) ; if (m_posVert==3) CHECK_INCDEC_GENVAR(event, g_eeGeneral.temperatureCalib, -100, 100); #endif @@ -898,7 +891,7 @@ enum menuGeneralHwItems { #define GENERAL_HW_PARAM_OFS (2+(15*FW)) void menuGeneralHardware(uint8_t event) { - MENU(PSTR("Hardware"), menuTabDiag, e_Hardware, ITEM_SETUP_HW_MAX+1, {0, (uint8_t)-1, 0}); + MENU(STR_HARDWARE, menuTabDiag, e_Hardware, ITEM_SETUP_HW_MAX+1, {0, 0}); uint8_t sub = m_posVert - 1; @@ -910,8 +903,7 @@ void menuGeneralHardware(uint8_t event) switch(k) { case ITEM_SETUP_HW_OPTREX_DISPLAY: - // TODO remove STR_OPTREX_DISPLAY + translations here - g_eeGeneral.optrexDisplay = selectMenuItem(GENERAL_HW_PARAM_OFS, y, PSTR("LCD"), PSTR("\006NormalOptrex"), g_eeGeneral.optrexDisplay, 0, 1, attr, event); + g_eeGeneral.optrexDisplay = selectMenuItem(GENERAL_HW_PARAM_OFS, y, STR_LCD, STR_VLCD, g_eeGeneral.optrexDisplay, 0, 1, attr, event); break; } } diff --git a/src/model_menus.cpp b/src/model_menus.cpp index 733e52349..88c325d0f 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -1228,7 +1228,7 @@ void menuModelCurveOne(uint8_t event) break; } - lcd_putsLeft(7*FH, PSTR("Type")); + lcd_putsLeft(7*FH, STR_CURVE_TYPE); uint8_t attr = (s_editMode <= 0 ? INVERS : 0); lcd_outdezAtt(5*FW-2, 7*FH, crv.points, LEFT|attr); lcd_putsAtt(lcdLastPos, 7*FH, crv.custom ? PSTR("pt'") : PSTR("pt"), attr); diff --git a/src/open9x.cpp b/src/open9x.cpp index 321a693fd..cb8e23131 100644 --- a/src/open9x.cpp +++ b/src/open9x.cpp @@ -3171,15 +3171,47 @@ void stack_paint() { for (uint16_t i=0; iTC_CHANNEL[0].TC_CV; } uint16_t getTmr16KHz(); #endif +#if defined(PCBSKY9X) +uint16_t stack_free(uint8_t tid); +#else uint16_t stack_free(); +#endif #if defined(PCBSTD) && !defined(M128) void memclear(void *ptr, uint8_t size); diff --git a/src/simpgmspace.cpp b/src/simpgmspace.cpp index 53f19a397..226bae3d6 100644 --- a/src/simpgmspace.cpp +++ b/src/simpgmspace.cpp @@ -260,7 +260,11 @@ void eeprom_read_block (void *pointer_ram, } } +#if defined(PCBSKY9X) +uint16_t stack_free(uint8_t) +#else uint16_t stack_free() +#endif { return 500; } diff --git a/src/statistics_views.cpp b/src/statistics_views.cpp index 890d1a9f1..c67abcaae 100644 --- a/src/statistics_views.cpp +++ b/src/statistics_views.cpp @@ -123,6 +123,7 @@ void menuStatisticsDebug(uint8_t event) putsTelemetryValue(MENU_DEBUG_COL_OFS, 1*FH, getCurrent(), UNIT_MILLIAMPS, 0); uint32_t current_scale = 488 + g_eeGeneral.currentCalib; putsTelemetryValue(20*FW+2, 1*FH, Current_max*10*current_scale/8192, UNIT_RAW, 0); + lcd_putsLeft(2*FH, STR_CPU_MAH); putsTelemetryValue(MENU_DEBUG_COL_OFS, 2*FH, g_eeGeneral.mAhUsed + Current_used*current_scale/8192/36, UNIT_MAH, PREC1); putsTime(17*FW, 2*FH, g_eeGeneral.globalTimer + sessionTimer, 0, 0); @@ -130,6 +131,7 @@ void menuStatisticsDebug(uint8_t event) lcd_putsLeft(3*FH, STR_CPU_TEMP); putsTelemetryValue(MENU_DEBUG_COL_OFS, 3*FH, getTemperature(), UNIT_DEGREES, 0); putsTelemetryValue(20*FW+2, 3*FH, maxTemperature+g_eeGeneral.temperatureCalib, UNIT_DEGREES, 0); + lcd_putsLeft(4*FH, STR_COPROC_TEMP); if (Coproc_read > 2) putsTelemetryValue(MENU_DEBUG_COL_OFS, 4*FH, Coproc_temp, UNIT_DEGREES, 0); @@ -139,10 +141,16 @@ void menuStatisticsDebug(uint8_t event) putsTelemetryValue(20*FW+2, 4*FH, Coproc_maxtemp, UNIT_DEGREES, 0); else lcd_puts(18*FW+2, 4*FH, PSTR("---")); + lcd_putsLeft(5*FH, STR_TMAINMAXMS); lcd_outdezAtt(MENU_DEBUG_COL_OFS, 5*FH, (g_timeMainMax)/20, PREC2); + lcd_putsLeft(6*FH, STR_FREESTACKMINB); - lcd_outdezAtt(14*FW, 6*FH, stack_free(), UNSIGN) ; + lcd_outdezAtt(13*FW, 6*FH, stack_free(0), UNSIGN); + lcd_putc(13*FW, 6*FH, '/'); + lcd_outdezAtt(13*FW+FWNUM, 6*FH, stack_free(1), UNSIGN|LEFT); + lcd_putc(lcdLastPos, 6*FH, '/'); + lcd_outdezAtt(lcdLastPos+FWNUM, 6*FH, stack_free(2), UNSIGN|LEFT); #else lcd_putsLeft(1*FH, STR_TMR1LATMAXUS); lcd_outdez8(MENU_DEBUG_COL_OFS , 1*FH, g_tmr1Latency_max/2 ); diff --git a/src/translations.cpp b/src/translations.cpp index 344bb85e1..525281a07 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -89,6 +89,9 @@ const pm_char STR_OPEN9X[] PROGMEM = #endif #if defined(PCBGRUVIN9X) || defined (PCBSKY9X) ISTR(DATETIME) +#endif +#if defined(PCBSKY9X) + ISTR(VLCD) #endif ; @@ -337,7 +340,7 @@ const pm_char STR_ALARMSWARN[] PROGMEM = TR_ALARMSWARN; const pm_char STR_SWITCHWARN[] PROGMEM = TR_SWITCHWARN; const pm_char STR_SPEAKER_VOLUME[] PROGMEM = TR_SPEAKER_VOLUME; -const pm_char STR_OPTREX_DISPLAY[] PROGMEM = TR_OPTREX_DISPLAY; +const pm_char STR_LCD[] PROGMEM = TR_LCD; const pm_char STR_BRIGHTNESS[] PROGMEM = TR_BRIGHTNESS; const pm_char STR_CPU_TEMP[] PROGMEM = TR_CPU_TEMP; const pm_char STR_CPU_CURRENT[] PROGMEM = TR_CPU_CURRENT; @@ -363,6 +366,17 @@ const pm_char STR_SD_INFO[] PROGMEM = TR_SD_INFO; const pm_char STR_SD_FORMAT[] PROGMEM = TR_SD_FORMAT; const pm_char STR_REMOVED[] PROGMEM = TR_REMOVED; const pm_char STR_NA[] PROGMEM = TR_NA; +const pm_char STR_HARDWARE[] PROGMEM = TR_HARDWARE; +const pm_char STR_FORMATTING[] PROGMEM = TR_FORMATTING; +const pm_char STR_TEMP_CALIB[] PROGMEM = TR_TEMP_CALIB; +const pm_char STR_TIME[] PROGMEM = TR_TIME; +const pm_char STR_BAUDRATE[] PROGMEM = TR_BAUDRATE; +const pm_char STR_SD_INFO_TITLE[] PROGMEM = TR_SD_INFO_TITLE; +const pm_char STR_SD_TYPE[] PROGMEM = TR_SD_TYPE; +const pm_char STR_SD_SPEED[] PROGMEM = TR_SD_SPEED; +const pm_char STR_SD_SECTORS[] PROGMEM = TR_SD_SECTORS; +const pm_char STR_SD_SIZE[] PROGMEM = TR_SD_SIZE; +const pm_char STR_CURVE_TYPE[] PROGMEM = TR_CURVE_TYPE; const pm_uchar font[] PROGMEM = { #include "font.lbm" diff --git a/src/translations.h b/src/translations.h index 3d776a9fb..5aaf5265f 100644 --- a/src/translations.h +++ b/src/translations.h @@ -129,6 +129,9 @@ extern const pm_char STR_OPEN9X[]; #if defined(PCBGRUVIN9X) || defined (PCBSKY9X) #define OFS_DATETIME (OFS_ENDDSM2) #endif +#if defined(PCBSKY9X) +#define OFS_VLCD (OFS_DATETIME + sizeof(TR_DATETIME)) +#endif #define STR_OFFON (STR_OPEN9X + OFS_OFFON) #define STR_MMMINV (STR_OPEN9X + OFS_MMMINV) @@ -194,6 +197,10 @@ extern const pm_char STR_OPEN9X[]; #define STR_DATETIME (STR_OPEN9X + OFS_DATETIME) #endif +#if defined(PCBSKY9X) +#define STR_VLCD (STR_OPEN9X + OFS_VLCD) +#endif + // The 0-terminated-strings extern const pm_char STR_POPUPS[]; @@ -418,7 +425,7 @@ extern const pm_char STR_ALARMSWARN[]; extern const pm_char STR_SWITCHWARN[]; extern const pm_char STR_SPEAKER_VOLUME[]; -extern const pm_char STR_OPTREX_DISPLAY[]; +extern const pm_char STR_LCD[]; extern const pm_char STR_BRIGHTNESS[]; extern const pm_char STR_CPU_TEMP[]; extern const pm_char STR_CPU_CURRENT[]; @@ -444,7 +451,17 @@ extern const pm_char STR_REMOVED[]; extern const pm_char STR_SD_INFO[]; extern const pm_char STR_SD_FORMAT[]; extern const pm_char STR_NA[]; - +extern const pm_char STR_HARDWARE[]; +extern const pm_char STR_FORMATTING[]; +extern const pm_char STR_TEMP_CALIB[]; +extern const pm_char STR_TIME[]; +extern const pm_char STR_BAUDRATE[]; +extern const pm_char STR_SD_INFO_TITLE[]; +extern const pm_char STR_SD_TYPE[]; +extern const pm_char STR_SD_SPEED[]; +extern const pm_char STR_SD_SECTORS[]; +extern const pm_char STR_SD_SIZE[]; +extern const pm_char STR_CURVE_TYPE[]; #if defined(VOICE) PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att); diff --git a/src/translations/cz.h b/src/translations/cz.h index 870ca4d26..b5471425f 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -32,6 +32,9 @@ #define LEN_DATETIME "\006" #define TR_DATETIME "DATUM:""\201AS: " +#define LEN_VLCD "\006" +#define TR_VLCD "NormalOptrex" + #define LEN_VTRIMINC "\007" #define TR_VTRIMINC "Exp ""ExJemn\212""Jemn\212 ""St\206edn\204""Hrub\212 " @@ -411,7 +414,7 @@ #define TR_SWITCHWARN "POZICE" #define TR_INVERT_THR "Invertovat Plyn?" #define TR_SPEAKER_VOLUME "Hlasitost" -#define TR_OPTREX_DISPLAY "Optrex Display" +#define TR_LCD "LCD" #define TR_BRIGHTNESS "Jas" #define TR_CPU_TEMP "tepl. CPU\007>" #define TR_CPU_CURRENT "Current\011>" @@ -437,3 +440,14 @@ #define TR_SD_INFO "Information" #define TR_SD_FORMAT "Format" #define TR_NA "[X]" +#define TR_HARDWARE "HARDWARE" +#define TR_FORMATTING "Formatting..." +#define TR_TEMP_CALIB "Temp. Calib" +#define TR_TIME "Time" +#define TR_BAUDRATE "BT Baudrate" +#define TR_SD_INFO_TITLE "SD INFO" +#define TR_SD_TYPE "Type:" +#define TR_SD_SPEED "Speed:" +#define TR_SD_SECTORS "Sectors:" +#define TR_SD_SIZE "Size:" +#define TR_CURVE_TYPE "Type" diff --git a/src/translations/de.h b/src/translations/de.h index b0383c671..d43153c23 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -20,8 +20,8 @@ #define LEN_VFILTERADC "\004" #define TR_VFILTERADC "SING""OSMP""FILT" -#define LEN_VBLMODE "\004" -#define TR_VBLMODE "OFF ""Keys""Stks""Both""ON\0" +#define LEN_VBLMODE "\004" +#define TR_VBLMODE "OFF ""Keys""Stks""Both""ON\0" #define LEN_TRNMODE "\003" #define TR_TRNMODE "AUS"" +="" :=" @@ -32,6 +32,9 @@ #define LEN_DATETIME "\005" #define TR_DATETIME "DATE:""TIME:" +#define LEN_VLCD "\006" +#define TR_VLCD "NormalOptrex" + #define LEN_VTRIMINC "\006" #define TR_VTRIMINC "Expo. ""X-Fein""Fein ""Mittel""Grob " @@ -107,12 +110,12 @@ #endif #if defined(PCBSKY9X) #if defined(SDCARD) -#define TR_SDCLOGS "SDCARD Logs\0 " +#define TR_SDCLOGS "SDCARD Logs\0 " #else -#define TR_SDCLOGS "[SDCARD Logs]" +#define TR_SDCLOGS "[SDCARD Logs]" #endif -#define TR_FSW_VOLUME "Volume\0 " -#define TR_FSW_BG_MUSIC "Bg Music\0 " +#define TR_FSW_VOLUME "Volume\0 " +#define TR_FSW_BG_MUSIC "Bg Music\0 " #elif defined(PCBGRUVIN9X) #if defined(SDCARD) #define TR_SDCLOGS "SDcard Logs " @@ -161,14 +164,14 @@ #define LEN_VALARMFN "\001" #define TR_VALARMFN "<>" -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "---\0 ""Hub\0 ""WSHHigh""Halcyon" +#define LEN_VTELPROTO "\007" +#define TR_VTELPROTO "---\0 ""Hub\0 ""WSHHigh""Halcyon" -#define LEN_VOLTSRC "\003" -#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel" +#define LEN_VOLTSRC "\003" +#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel" -#define LEN_VARIOSRC "\004" -#define TR_VARIOSRC "Data""A1\0 ""A2\0" +#define LEN_VARIOSRC "\004" +#define TR_VARIOSRC "Data""A1\0 ""A2\0" #define LEN_GPSFORMAT "\004" #define TR_GPSFORMAT "HMS NMEA" @@ -255,8 +258,8 @@ #define TR_EDITMIX "MIXER " #define TR_SOURCE "Quelle" #define TR_WEIGHT "Gewicht" -#define TR_EXPO "Expo" -#define TR_SIDE "Side" +#define TR_EXPO "Expo" +#define TR_SIDE "Side" #define TR_MIXERWEIGHT "Mixer Weight" #define TR_DIFFERENTIAL "Differ" #define TR_OFFSET "Offset" @@ -304,8 +307,8 @@ #define TR_MINUTEBEEP "Pieper Minuten" #define TR_BEEPCOUNTDOWN "Pieper Countdown" #define TR_FLASHONBEEP "Pieper+Blinken" -#define TR_BLMODE "Licht Steuerung" -#define TR_BLDELAY "Licht aus nach" +#define TR_BLMODE "Licht Steuerung" +#define TR_BLDELAY "Licht aus nach" #define TR_SPLASHSCREEN "Startbild" #define TR_THROTTLEWARNING "T-Warnung" #define TR_SWITCHWARNING "S-Warnung" @@ -336,9 +339,9 @@ #define TR_TMR1LATMINUS "Tmr1Lat min\003us" #define TR_TMR1JITTERUS "Tmr1 Jitter\003us" #if defined(PCBSKY9X) -#define TR_TMAINMAXMS "Tmain max\004ms" +#define TR_TMAINMAXMS "Tmain max\004ms" #else -#define TR_TMAINMAXMS "Tmain max\005ms" +#define TR_TMAINMAXMS "Tmain max\005ms" #endif #define TR_T10MSUS "T10ms\007us" #define TR_FREESTACKMINB "Free Stack\004b" @@ -411,7 +414,7 @@ #define TR_SWITCHWARN "SCHALTER" #define TR_INVERT_THR "Invert Thr?" #define TR_SPEAKER_VOLUME "Speaker Volume" -#define TR_OPTREX_DISPLAY "Optrex Display" +#define TR_LCD "LCD" #define TR_BRIGHTNESS "Brightness" #define TR_CPU_TEMP "CPU temp.\007>" #define TR_CPU_CURRENT "Current\011>" @@ -437,3 +440,14 @@ #define TR_SD_INFO "Information" #define TR_SD_FORMAT "Format" #define TR_NA "N/A" +#define TR_HARDWARE "HARDWARE" +#define TR_FORMATTING "Formatting..." +#define TR_TEMP_CALIB "Temp. Calib" +#define TR_TIME "Time" +#define TR_BAUDRATE "BT Baudrate" +#define TR_SD_INFO_TITLE "SD INFO" +#define TR_SD_TYPE "Type:" +#define TR_SD_SPEED "Speed:" +#define TR_SD_SECTORS "Sectors:" +#define TR_SD_SIZE "Size:" +#define TR_CURVE_TYPE "Type" diff --git a/src/translations/en.h b/src/translations/en.h index 382cfb028..3ef086e92 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -32,6 +32,9 @@ #define LEN_DATETIME "\005" #define TR_DATETIME "DATE:""TIME:" +#define LEN_VLCD "\006" +#define TR_VLCD "NormalOptrex" + #define LEN_VTRIMINC "\006" #define TR_VTRIMINC "Exp ""ExFine""Fine ""Medium""Coarse" @@ -416,7 +419,7 @@ #define TR_SWITCHWARN "SWITCH" #define TR_INVERT_THR "Invert Thr?" #define TR_SPEAKER_VOLUME "Speaker Volume" -#define TR_OPTREX_DISPLAY "Optrex Display" +#define TR_LCD "LCD" #define TR_BRIGHTNESS "Brightness" #define TR_CPU_TEMP "CPU Temp.\007>" #define TR_CPU_CURRENT "Current\011>" @@ -430,8 +433,8 @@ #define TR_V2 "V2" #define TR_DURATION "Duration" #define TR_DELAY "Delay" -#define TR_SD_CARD "SD Card" -#define TR_SDHC_CARD "SD-HC Card" +#define TR_SD_CARD "SD CARD" +#define TR_SDHC_CARD "SD-HC CARD" #define TR_NO_SOUNDS_ON_SD "No Sounds on SD" #define TR_NO_MODELS_ON_SD "No Models on SD" #define TR_PLAY_FILE "Play" @@ -442,3 +445,14 @@ #define TR_SD_INFO "Information" #define TR_SD_FORMAT "Format" #define TR_NA "N/A" +#define TR_HARDWARE "HARDWARE" +#define TR_FORMATTING "Formatting..." +#define TR_TEMP_CALIB "Temp. Calib" +#define TR_TIME "Time" +#define TR_BAUDRATE "BT Baudrate" +#define TR_SD_INFO_TITLE "SD INFO" +#define TR_SD_TYPE "Type:" +#define TR_SD_SPEED "Speed:" +#define TR_SD_SECTORS "Sectors:" +#define TR_SD_SIZE "Size:" +#define TR_CURVE_TYPE "Type" diff --git a/src/translations/fr.h b/src/translations/fr.h index e1deea953..ec10d2421 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -32,6 +32,9 @@ #define LEN_DATETIME "\005" #define TR_DATETIME "DATE:""HEURE" +#define LEN_VLCD "\006" +#define TR_VLCD "NormalOptrex" + #define LEN_VTRIMINC "\006" #define TR_VTRIMINC "Expo ""ExFin ""Fin ""Moyen ""Gros " @@ -410,7 +413,7 @@ #define TR_SWITCHWARN "INTERS" #define TR_INVERT_THR "Inverser Gaz?" #define TR_SPEAKER_VOLUME "Volume haut-p." -#define TR_OPTREX_DISPLAY "Afficheur Optrex" +#define TR_LCD "Afficheur" #define TR_BRIGHTNESS "Luminosit\200" #define TR_CPU_TEMP "Temp. CPU\007>" #define TR_CPU_CURRENT "Courant\011>" @@ -436,3 +439,14 @@ #define TR_SD_INFO "Information" #define TR_SD_FORMAT "Formatter" #define TR_NA "N/D" +#define TR_HARDWARE "HARDWARE" +#define TR_FORMATTING "Formatting..." +#define TR_TEMP_CALIB "Temp. Calib" +#define TR_TIME "Time" +#define TR_BAUDRATE "BT Baudrate" +#define TR_SD_INFO_TITLE "SD INFO" +#define TR_SD_TYPE "Type:" +#define TR_SD_SPEED "Speed:" +#define TR_SD_SECTORS "Sectors:" +#define TR_SD_SIZE "Size:" +#define TR_CURVE_TYPE "Type" diff --git a/src/translations/it.h b/src/translations/it.h index a4ac542fa..7c5967f5d 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -32,6 +32,9 @@ #define LEN_DATETIME "\005" #define TR_DATETIME "DATA:""ORA :" +#define LEN_VLCD "\006" +#define TR_VLCD "NormalOptrex" + #define LEN_VTRIMINC "\006" #define TR_VTRIMINC "Exp ""ExFine""Fine ""Medio ""Ampio " @@ -411,7 +414,7 @@ #define TR_SWITCHWARN "SWITCH" #define TR_INVERT_THR "Invert Thr?" #define TR_SPEAKER_VOLUME "Volume Audio" -#define TR_OPTREX_DISPLAY "Display Optrex" +#define TR_LCD "LCD" #define TR_BRIGHTNESS "Luminosita'" #define TR_CPU_TEMP "Temp CPU \007>" #define TR_CPU_CURRENT "Corrente\011>" @@ -437,3 +440,14 @@ #define TR_SD_INFO "Informazioni" #define TR_SD_FORMAT "Format" #define TR_NA "N/A" +#define TR_HARDWARE "HARDWARE" +#define TR_FORMATTING "Formatting..." +#define TR_TEMP_CALIB "Temp. Calib" +#define TR_TIME "Time" +#define TR_BAUDRATE "BT Baudrate" +#define TR_SD_INFO_TITLE "SD INFO" +#define TR_SD_TYPE "Type:" +#define TR_SD_SPEED "Speed:" +#define TR_SD_SECTORS "Sectors:" +#define TR_SD_SIZE "Size:" +#define TR_CURVE_TYPE "Type" diff --git a/src/translations/se.h b/src/translations/se.h index abafac908..413d9e1bd 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -32,6 +32,9 @@ #define LEN_DATETIME "\005" #define TR_DATETIME "DAG: ""TID: " +#define LEN_VLCD "\006" +#define TR_VLCD "NormalOptrex" + #define LEN_VTRIMINC "\006" #define TR_VTRIMINC "Exp ""xFin ""Fin ""Medium""Grov " @@ -409,7 +412,7 @@ #define TR_SWITCHWARN "BRYTARE" #define TR_INVERT_THR "Revers.Gas?" #define TR_SPEAKER_VOLUME "Ljudvolym " -#define TR_OPTREX_DISPLAY "Optrexdisplay " +#define TR_LCD "LCD" #define TR_BRIGHTNESS "Ljusstyrka" #define TR_CPU_TEMP "CPU temp.\007>" #define TR_CPU_CURRENT "Str\202m\013>" @@ -435,3 +438,14 @@ #define TR_SD_INFO "Information" #define TR_SD_FORMAT "Format" #define TR_NA "N/A" +#define TR_HARDWARE "HARDWARE" +#define TR_FORMATTING "Formatting..." +#define TR_TEMP_CALIB "Temp. Calib" +#define TR_TIME "Time" +#define TR_BAUDRATE "BT Baudrate" +#define TR_SD_INFO_TITLE "SD INFO" +#define TR_SD_TYPE "Type:" +#define TR_SD_SPEED "Speed:" +#define TR_SD_SECTORS "Sectors:" +#define TR_SD_SIZE "Size:" +#define TR_CURVE_TYPE "Type"