From 6cc287b4eb7474576da09766c6aa91c0b657198c Mon Sep 17 00:00:00 2001 From: bsongis Date: Wed, 18 Jul 2012 16:01:40 +0000 Subject: [PATCH] Some work ready for translators --- src/general_menus.cpp | 19 +- src/model_menus.cpp | 28 +-- src/statistics_views.cpp | 2 +- src/translations.cpp | 21 +++ src/translations.h | 25 ++- src/translations/cz.h | 22 +++ src/translations/de.h | 24 ++- src/translations/en.h | 387 +++++++++++++++++++++------------------ src/translations/fr.h | 26 ++- src/translations/it.h | 22 +++ src/translations/se.h | 22 +++ 11 files changed, 387 insertions(+), 211 deletions(-) diff --git a/src/general_menus.cpp b/src/general_menus.cpp index 7cde67267..cd4078cee 100644 --- a/src/general_menus.cpp +++ b/src/general_menus.cpp @@ -215,7 +215,7 @@ void menuProcSetup(uint8_t event) #if defined(PCBARM) case ITEM_SETUP_SPEAKER_VOLUME: { - lcd_putsLeft(y, PSTR("Speaker Volume")); // TODO translations + lcd_putsLeft(y, STR_SPEAKER_VOLUME); lcd_outdezAtt(GENERAL_PARAM_OFS, y, g_eeGeneral.speakerVolume, attr|LEFT); if (attr) { CHECK_INCDEC_GENVAR(event, g_eeGeneral.speakerVolume, 0, NUM_VOL_LEVELS-1); @@ -258,11 +258,11 @@ void menuProcSetup(uint8_t event) #if defined(PCBARM) case ITEM_SETUP_OPTREX_DISPLAY: - g_eeGeneral.optrexDisplay = onoffMenuItem( g_eeGeneral.optrexDisplay, y, PSTR("Optrex Display"), attr, event ) ; + g_eeGeneral.optrexDisplay = onoffMenuItem( g_eeGeneral.optrexDisplay, y, STR_OPTREX_DISPLAY, attr, event ) ; break; case ITEM_SETUP_BRIGHTNESS: - lcd_putsLeft(y, PSTR("Brightness")); // TODO translations in the whole file ... + lcd_putsLeft(y, STR_BRIGHTNESS); lcd_outdezAtt(GENERAL_PARAM_OFS, y, 100-g_eeGeneral.backlightBright, attr|LEFT) ; if(attr) { uint8_t b ; @@ -331,7 +331,7 @@ void menuProcSetup(uint8_t event) break; case ITEM_SETUP_BACKLIGHT_MODE: - g_eeGeneral.backlightMode = selectMenuItem(y, STR_BLMODE, PSTR("\004OFF KeysStksBothON\0"), g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr, event); + g_eeGeneral.backlightMode = selectMenuItem(y, STR_BLMODE, STR_VBLMODE, g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr, event); break; case ITEM_SETUP_BACKLIGHT_DELAY: @@ -512,11 +512,6 @@ extern uint32_t Cmd_A41_resp; #define OCR_SD_CCS (0) #endif -const pm_char STR_PLAY_FILE[] PROGMEM = "Play"; -const pm_char STR_DELETE_FILE[] PROGMEM = "Delete"; -const pm_char STR_COPY_FILE[] PROGMEM = "Copy"; -const pm_char STR_RENAME_FILE[] PROGMEM = "Rename"; - void menuProcSd(uint8_t event) { FILINFO fno; @@ -535,7 +530,7 @@ void menuProcSd(uint8_t event) event = 0; } - SIMPLE_MENU(Cmd_A41_resp & OCR_SD_CCS ? PSTR("SD-HC Card") : PSTR("SD Card"), menuTabDiag, e_Sd, 1+reusableBuffer.sd.count); + SIMPLE_MENU(Cmd_A41_resp & OCR_SD_CCS ? STR_SDHC_CARD : STR_SD_CARD, menuTabDiag, e_Sd, 1+reusableBuffer.sd.count); if (s_editMode > 0) s_editMode = 0; @@ -580,7 +575,7 @@ void menuProcSd(uint8_t event) #if defined(PCBARM) uint8_t index = m_posVert-1-s_pgOfs; char * line = reusableBuffer.sd.lines[index]; - if (!strcmp(line+strlen(line)-4, ".wav")) { + if (!strcmp(line+strlen(line)-4, SOUNDS_EXT)) { s_menu[s_menu_count++] = STR_PLAY_FILE; } #endif @@ -643,7 +638,7 @@ void menuProcSd(uint8_t event) strcat(lfn, reusableBuffer.sd.lines[index]); f_unlink(lfn); strncpy(statusLineMsg, reusableBuffer.sd.lines[index], 13); - strcpy_P(statusLineMsg+min((uint8_t)strlen(statusLineMsg), (uint8_t)13), PSTR(" removed")); + strcpy_P(statusLineMsg+min((uint8_t)strlen(statusLineMsg), (uint8_t)13), STR_REMOVED); showStatusLine(); if ((uint16_t)m_posVert == reusableBuffer.sd.count) m_posVert--; reusableBuffer.sd.offset = s_pgOfs-1; diff --git a/src/model_menus.cpp b/src/model_menus.cpp index 3398d2391..a131b0c4b 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -477,7 +477,7 @@ void menuProcModelSelect(uint8_t event) } else if (result == STR_RESTORE_MODEL || result == STR_UPDATE_LIST) { if (!listSdFiles(MODELS_PATH, MODELS_EXT)) { - s_sdcard_error = PSTR("No Models on SD"); + s_sdcard_error = STR_NO_MODELS_ON_SD; s_menu_flags = 0; } } @@ -2155,7 +2155,7 @@ enum CustomSwitchFields { #define CSW_2ND_COLUMN (9*FW) void menuProcCustomSwitchOne(uint8_t event) { - TITLEP("CUSTOM SWITCH"); + TITLEP(STR_MENUCUSTOMSWITCH); CustomSwData &cs = g_model.customSw[s_currIdx]; uint8_t sw = DSW_SW1+s_currIdx; putsSwitches(14*FW, 0, sw, (getSwitch(sw, 0) ? BOLD : 0)); @@ -2170,7 +2170,7 @@ void menuProcCustomSwitchOne(uint8_t event) uint8_t cstate = CS_STATE(cs.func); switch(i) { case CSW_FIELD_FUNCTION: - lcd_putsLeft(y, "Func"); + lcd_putsLeft(y, STR_FUNC); lcd_putsiAtt(CSW_2ND_COLUMN, y, STR_VCSWFUNC, cs.func, attr); if (attr) { CHECK_INCDEC_MODELVAR(event, cs.func, 0, CS_MAXF); @@ -2182,7 +2182,7 @@ void menuProcCustomSwitchOne(uint8_t event) break; case CSW_FIELD_V1: { - lcd_putsLeft(y, "V1"); + lcd_putsLeft(y, STR_V1); int8_t v1_min=0, v1_max=NUM_XCHNCSW; if (cstate == CS_VBOOL) { putsSwitches(CSW_2ND_COLUMN, y, cs.v1, attr); @@ -2198,7 +2198,7 @@ void menuProcCustomSwitchOne(uint8_t event) } case CSW_FIELD_V2: { - lcd_putsLeft(y, "V2"); + lcd_putsLeft(y, STR_V2); int8_t v2_min=0, v2_max=NUM_XCHNCSW; if (cstate == CS_VBOOL) { putsSwitches(CSW_2ND_COLUMN, y, cs.v2, attr); @@ -2230,13 +2230,19 @@ void menuProcCustomSwitchOne(uint8_t event) break; } case CSW_FIELD_DURATION: - lcd_putsLeft(y, "Duration"); - lcd_outdezAtt(CSW_2ND_COLUMN, y, 5*cs.duration, attr|PREC1|LEFT); + lcd_putsLeft(y, STR_DURATION); + if (cs.duration > 0) + lcd_outdezAtt(CSW_2ND_COLUMN, y, 5*cs.duration, attr|PREC1|LEFT); + else + lcd_putsiAtt(CSW_2ND_COLUMN, y, STR_MMMINV, 0, attr); if (attr) CHECK_INCDEC_MODELVAR(event, cs.duration, 0, MAX_CSW_DURATION); break; case CSW_FIELD_DELAY: - lcd_putsLeft(y, "Delay"); - lcd_outdezAtt(CSW_2ND_COLUMN, y, 5*cs.delay, attr|PREC1|LEFT); + lcd_putsLeft(y, STR_DELAY); + if (cs.delay > 0) + lcd_outdezAtt(CSW_2ND_COLUMN, y, 5*cs.delay, attr|PREC1|LEFT); + else + lcd_putsiAtt(CSW_2ND_COLUMN, y, STR_MMMINV, 0, attr); if (attr) CHECK_INCDEC_MODELVAR(event, cs.delay, 0, MAX_CSW_DELAY); break; } @@ -2477,7 +2483,7 @@ void menuProcFunctionSwitches(uint8_t event) if (active && event==EVT_KEY_BREAK(KEY_MENU)) { s_editMode = 0; if (!listSdFiles(SOUNDS_PATH, SOUNDS_EXT)) { - s_warning = PSTR("No Sounds on SD"); + s_warning = STR_NO_SOUNDS_ON_SD; s_menu_flags = 0; } } @@ -2554,7 +2560,7 @@ void menuProcFunctionSwitches(uint8_t event) if (result) { if (result == STR_UPDATE_LIST) { if (!listSdFiles(SOUNDS_PATH, SOUNDS_EXT)) { - s_warning = PSTR("No Sounds on SD"); + s_warning = STR_NO_SOUNDS_ON_SD; s_menu_flags = 0; } } diff --git a/src/statistics_views.cpp b/src/statistics_views.cpp index e6944e470..9b4ffe791 100644 --- a/src/statistics_views.cpp +++ b/src/statistics_views.cpp @@ -124,7 +124,7 @@ void menuProcDebug(uint8_t event) putsTelemetryValue(MENU_DEBUG_COL_OFS, 2*FH, getCurrent(), UNIT_MILLIAMPS, 0) ; #endif - lcd_putsLeft(3*FH, PSTR("CPU temp.\010>")); + lcd_putsLeft(3*FH, STR_CPU_TEMP); putsTelemetryValue(MENU_DEBUG_COL_OFS, 3*FH, (((((int32_t)Temperature - 838 ) * 621 ) >> 11 ) - 20), UNIT_DEGREES, 0 ) ; putsTelemetryValue(20*FW+2, 3*FH, (((((int32_t)maxTemperature - 838 ) * 621 ) >> 11 ) - 20), UNIT_DEGREES, 0 ) ; // TODO mAh, Battery from ersky9x? diff --git a/src/translations.cpp b/src/translations.cpp index 61104c462..a1baa8af8 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -55,6 +55,7 @@ const pm_char STR_OPEN9X[] PROGMEM = ISTR(RETA123) ISTR(VPROTOS) ISTR(POSNEG) + ISTR(VBLMODE) ISTR(VCURVEFUNC) ISTR(CURVMODES) ISTR(EXPLABELS) @@ -254,6 +255,7 @@ const pm_char STR_MENUDREXPO[] PROGMEM = TR_MENUDREXPO; const pm_char STR_MENULIMITS[] PROGMEM = TR_MENULIMITS; const pm_char STR_MENUCURVES[] PROGMEM = TR_MENUCURVES; const pm_char STR_MENUCURVE[] PROGMEM = TR_MENUCURVE; +const pm_char STR_MENUCUSTOMSWITCH[] PROGMEM = TR_MENUCUSTOMSWITCH; const pm_char STR_MENUCUSTOMSWITCHES[] PROGMEM = TR_MENUCUSTOMSWITCHES; const pm_char STR_MENUFUNCSWITCHES[] PROGMEM = TR_MENUFUNCSWITCHES; @@ -333,6 +335,25 @@ const pm_char STR_THROTTLEWARN[] PROGMEM = TR_THROTTLEWARN; 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_BRIGHTNESS[] PROGMEM = TR_BRIGHTNESS; +const pm_char STR_CPU_TEMP[] PROGMEM = TR_CPU_TEMP; +const pm_char STR_FUNC[] PROGMEM = TR_FUNC; +const pm_char STR_V1[] PROGMEM = TR_V1; +const pm_char STR_V2[] PROGMEM = TR_V2; +const pm_char STR_DURATION[] PROGMEM = TR_DURATION; +const pm_char STR_DELAY[] PROGMEM = TR_DELAY; +const pm_char STR_SD_CARD[] PROGMEM = TR_SD_CARD; +const pm_char STR_SDHC_CARD[] PROGMEM = TR_SDHC_CARD; +const pm_char STR_NO_SOUNDS_ON_SD[] PROGMEM = TR_NO_SOUNDS_ON_SD; +const pm_char STR_NO_MODELS_ON_SD[] PROGMEM = TR_NO_MODELS_ON_SD; +const pm_char STR_PLAY_FILE[] PROGMEM = TR_PLAY_FILE; +const pm_char STR_DELETE_FILE[] PROGMEM = TR_DELETE_FILE; +const pm_char STR_COPY_FILE[] PROGMEM = TR_COPY_FILE; +const pm_char STR_RENAME_FILE[] PROGMEM = TR_RENAME_FILE; +const pm_char STR_REMOVED[] PROGMEM = TR_REMOVED; + const pm_uchar font[] PROGMEM = { #include "font.lbm" #if defined(TRANSLATIONS_SE) diff --git a/src/translations.h b/src/translations.h index 951618cb4..7d26a16f6 100644 --- a/src/translations.h +++ b/src/translations.h @@ -82,7 +82,8 @@ extern const pm_char STR_OPEN9X[]; #define OFS_RETA123 (OFS_VTRIMINC + sizeof(TR_VTRIMINC)) #define OFS_VPROTOS (OFS_RETA123 + sizeof(TR_RETA123)) #define OFS_POSNEG (OFS_VPROTOS + sizeof(TR_VPROTOS)) -#define OFS_VCURVEFUNC (OFS_POSNEG + sizeof(TR_POSNEG)) +#define OFS_VBLMODE (OFS_POSNEG + sizeof(TR_POSNEG)) +#define OFS_VCURVEFUNC (OFS_VBLMODE + sizeof(TR_VBLMODE)) #define OFS_CURVMODES (OFS_VCURVEFUNC + sizeof(TR_VCURVEFUNC)) #define OFS_EXPLABELS (OFS_CURVMODES + sizeof(TR_CURVMODES)) #define OFS_VMLTPX (OFS_EXPLABELS + sizeof(TR_EXPLABELS)) @@ -145,6 +146,7 @@ extern const pm_char STR_OPEN9X[]; #define STR_RETA123 (STR_OPEN9X + OFS_RETA123) #define STR_VPROTOS (STR_OPEN9X + OFS_VPROTOS) #define STR_POSNEG (STR_OPEN9X + OFS_POSNEG) +#define STR_VBLMODE (STR_OPEN9X + OFS_VBLMODE) #define STR_VCURVEFUNC (STR_OPEN9X + OFS_VCURVEFUNC) #define STR_VWHEN STR_VCURVEFUNC #define LEN_VWHEN LEN_VCURVEFUNC @@ -342,6 +344,7 @@ extern const pm_char STR_MENUDREXPO[]; extern const pm_char STR_MENULIMITS[]; extern const pm_char STR_MENUCURVES[]; extern const pm_char STR_MENUCURVE[]; +extern const pm_char STR_MENUCUSTOMSWITCH[]; extern const pm_char STR_MENUCUSTOMSWITCHES[]; extern const pm_char STR_MENUFUNCSWITCHES[]; extern const pm_char STR_MENUTELEMETRY[]; @@ -415,6 +418,26 @@ extern const pm_char STR_THROTTLEWARN[]; 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_BRIGHTNESS[]; +extern const pm_char STR_CPU_TEMP[]; +extern const pm_char STR_FUNC[]; +extern const pm_char STR_V1[]; +extern const pm_char STR_V2[]; +extern const pm_char STR_DURATION[]; +extern const pm_char STR_DELAY[]; +extern const pm_char STR_SD_CARD[]; +extern const pm_char STR_SDHC_CARD[]; +extern const pm_char STR_NO_SOUNDS_ON_SD[]; +extern const pm_char STR_NO_MODELS_ON_SD[]; +extern const pm_char STR_PLAY_FILE[]; +extern const pm_char STR_DELETE_FILE[]; +extern const pm_char STR_COPY_FILE[]; +extern const pm_char STR_RENAME_FILE[]; +extern const pm_char STR_REMOVED[]; + + #if defined(SOMO) || defined(PCBARM) void playNumber(int16_t number, uint8_t unit=0, uint8_t att=0); void playDuration(int16_t seconds); diff --git a/src/translations/cz.h b/src/translations/cz.h index 8ec99b615..eaf64b8cf 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -20,6 +20,9 @@ #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_TRNMODE "\003" #define TR_TRNMODE " X "" +="" :=" @@ -388,6 +391,7 @@ #define TR_MENULIMITS "LIMITY" #define TR_MENUCURVES "K\215IVKY" #define TR_MENUCURVE "\003CV" +#define TR_MENUCUSTOMSWITCH "CUSTOM SWITCH" #define TR_MENUCUSTOMSWITCHES "VLASTN\214 SP\214NA\201E" #define TR_MENUFUNCSWITCHES "FUNK\201.SP\214NA\201E" #define TR_MENUTELEMETRY "TELEMETRIE" @@ -424,3 +428,21 @@ #define TR_ALARMSWARN "ALARMU" #define TR_SWITCHWARN "POZICE" #define TR_INVERT_THR "Invertovat Plyn?" +#define TR_SPEAKER_VOLUME "Speaker Volume" +#define TR_OPTREX_DISPLAY "Optrex Display" +#define TR_BRIGHTNESS "Brightness" +#define TR_CPU_TEMP "CPU temp.\010>" +#define TR_FUNC "Func" +#define TR_V1 "V1" +#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_NO_SOUNDS_ON_SD "No Sounds on SD" +#define TR_NO_MODELS_ON_SD "No Models on SD" +#define TR_PLAY_FILE "Play" +#define TR_DELETE_FILE "Delete" +#define TR_COPY_FILE "Copy" +#define TR_RENAME_FILE "Rename" +#define TR_REMOVED " removed" diff --git a/src/translations/de.h b/src/translations/de.h index c27260903..0817ed5b7 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -20,6 +20,9 @@ #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_TRNMODE "\003" #define TR_TRNMODE "AUS"" +="" :=" @@ -387,7 +390,8 @@ #define TR_MENUDREXPO "DR/EXPO" // TODO flash saving this string is 2 times here #define TR_MENULIMITS "LIMITS" #define TR_MENUCURVES "KURVEN" -#define TR_MENUCURVE "KURVE" +#define TR_MENUCURVE "KURVE" +#define TR_MENUCUSTOMSWITCH "CUSTOM SWITCH" #define TR_MENUCUSTOMSWITCHES "CUSTOM SWITCHES" #define TR_MENUFUNCSWITCHES "FUNC SWITCHES" #define TR_MENUTELEMETRY "TELEMETRY" @@ -424,3 +428,21 @@ #define TR_ALARMSWARN "ALARM" #define TR_SWITCHWARN "SCHALTER" #define TR_INVERT_THR "Invert Thr?" +#define TR_SPEAKER_VOLUME "Speaker Volume" +#define TR_OPTREX_DISPLAY "Optrex Display" +#define TR_BRIGHTNESS "Brightness" +#define TR_CPU_TEMP "CPU temp.\010>" +#define TR_FUNC "Func" +#define TR_V1 "V1" +#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_NO_SOUNDS_ON_SD "No Sounds on SD" +#define TR_NO_MODELS_ON_SD "No Models on SD" +#define TR_PLAY_FILE "Play" +#define TR_DELETE_FILE "Delete" +#define TR_COPY_FILE "Copy" +#define TR_RENAME_FILE "Rename" +#define TR_REMOVED " removed" diff --git a/src/translations/en.h b/src/translations/en.h index 86ad43063..e689e3d3b 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -20,6 +20,9 @@ #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_TRNMODE "\003" #define TR_TRNMODE "off"" +="" :=" @@ -93,7 +96,7 @@ #define TR_VMIXTRIMS "OFF""ON ""Rud""Ele""Thr""Ail" #define LEN_VCSWFUNC "\007" -#define TR_VCSWFUNC "----\0 ""v>ofs\0 ""vofs""|v|v2 ""v1=v2 ""v1<=v2 " +#define TR_VCSWFUNC "---\0 ""v>ofs\0 ""vofs""|v|v2 ""v1=v2 ""v1<=v2 " #define LEN_VFSWFUNC "\015" #if defined(VARIO) @@ -240,189 +243,207 @@ #define TR_DSM2MODE "LP4/LP5DSMonlyDSMX " // ZERO TERMINATED STRINGS -#define TR_POPUPS "[MENU]\004[EXIT]" -#define OFS_EXIT 7 -#define TR_MENUWHENDONE "[MENU] WHEN DONE" -#define TR_FREE "free" -#define TR_DELETEMODEL "DELETE MODEL" -#define TR_COPYINGMODEL "Copying model..." -#define TR_MOVINGMODEL "Moving model..." -#define TR_LOADINGMODEL "Loading model..." -#define TR_NAME "Name" -#define TR_TIMER "Timer" -#define TR_ELIMITS "E.Limits" -#define TR_ETRIMS "E.Trims" -#define TR_TRIMINC "Trim Inc" -#define TR_TTRACE "T-Trace" -#define TR_TTRIM "T-Trim" -#define TR_BEEPCTR "Beep Ctr" -#define TR_PROTO "Proto" -#define TR_PPMFRAME "PPM frame" -#define TR_MS "ms" -#define TR_SWITCH "Switch" -#define TR_TRIMS "Trims" -#define TR_FADEIN "Fade In" -#define TR_FADEOUT "Fade Out" -#define TR_DEFAULT "(default)" -#define TR_CHECKTRIMS "Check\005Trims" -#define TR_SWASHTYPE "Swash Type" -#define TR_COLLECTIVE "Collective" -#define TR_SWASHRING "Swash Ring" -#define TR_ELEDIRECTION "ELE Direction" -#define TR_AILDIRECTION "AIL Direction" -#define TR_COLDIRECTION "COL Direction" -#define TR_MODE "Mode" -#define TR_NOFREEEXPO "No free expo!" -#define TR_NOFREEMIXER "No free mixer!" -#define TR_INSERTMIX "INSERT MIX " -#define TR_EDITMIX "EDIT MIX " -#define TR_SOURCE "Source" -#define TR_WEIGHT "Weight" -#define TR_MIXERWEIGHT "Mixer Weight" -#define TR_DIFFERENTIAL "Differ" -#define TR_OFFSET "Offset" -#define TR_MIXEROFFSET "Mixer Offset" -#define TR_DRWEIGHT "DR Weight" -#define TR_DREXPO "DR Expo" -#define TR_TRIM "Trim" -#define TR_CURVES "Curves" -#define TR_FPHASE "F.Phase" -#define TR_MIXWARNING "Warning" -#define TR_OFF "OFF" -#define TR_MULTPX "Multpx" -#define TR_DELAYDOWN "Delay Dn" -#define TR_DELAYUP "Delay Up" -#define TR_SLOWDOWN "Slow Dn" -#define TR_SLOWUP "Slow Up" -#define TR_MIXER "MIXER" -#define TR_CV "CV" -#define TR_ACHANNEL "A\002channel" -#define TR_RANGE "Range" -#define TR_BAR "Bar" -#define TR_ALARM "Alarm" -#define TR_USRDATA "UsrData" -#define TR_BLADES "Blades" -#define TR_BARS "Bars" -#define TR_DISPLAY "Display" +#define TR_POPUPS "[MENU]\004[EXIT]" +#define OFS_EXIT 7 +#define TR_MENUWHENDONE "[MENU] WHEN DONE" +#define TR_FREE "free" +#define TR_DELETEMODEL "DELETE MODEL" +#define TR_COPYINGMODEL "Copying model..." +#define TR_MOVINGMODEL "Moving model..." +#define TR_LOADINGMODEL "Loading model..." +#define TR_NAME "Name" +#define TR_TIMER "Timer" +#define TR_ELIMITS "E.Limits" +#define TR_ETRIMS "E.Trims" +#define TR_TRIMINC "Trim Inc" +#define TR_TTRACE "T-Trace" +#define TR_TTRIM "T-Trim" +#define TR_BEEPCTR "Beep Ctr" +#define TR_PROTO "Proto" +#define TR_PPMFRAME "PPM frame" +#define TR_MS "ms" +#define TR_SWITCH "Switch" +#define TR_TRIMS "Trims" +#define TR_FADEIN "Fade In" +#define TR_FADEOUT "Fade Out" +#define TR_DEFAULT "(default)" +#define TR_CHECKTRIMS "Check\005Trims" +#define TR_SWASHTYPE "Swash Type" +#define TR_COLLECTIVE "Collective" +#define TR_SWASHRING "Swash Ring" +#define TR_ELEDIRECTION "ELE Direction" +#define TR_AILDIRECTION "AIL Direction" +#define TR_COLDIRECTION "COL Direction" +#define TR_MODE "Mode" +#define TR_NOFREEEXPO "No free expo!" +#define TR_NOFREEMIXER "No free mixer!" +#define TR_INSERTMIX "INSERT MIX " +#define TR_EDITMIX "EDIT MIX " +#define TR_SOURCE "Source" +#define TR_WEIGHT "Weight" +#define TR_MIXERWEIGHT "Mixer Weight" +#define TR_DIFFERENTIAL "Differ" +#define TR_OFFSET "Offset" +#define TR_MIXEROFFSET "Mixer Offset" +#define TR_DRWEIGHT "DR Weight" +#define TR_DREXPO "DR Expo" +#define TR_TRIM "Trim" +#define TR_CURVES "Curves" +#define TR_FPHASE "F.Phase" +#define TR_MIXWARNING "Warning" +#define TR_OFF "OFF" +#define TR_MULTPX "Multpx" +#define TR_DELAYDOWN "Delay Dn" +#define TR_DELAYUP "Delay Up" +#define TR_SLOWDOWN "Slow Dn" +#define TR_SLOWUP "Slow Up" +#define TR_MIXER "MIXER" +#define TR_CV "CV" +#define TR_ACHANNEL "A\002channel" +#define TR_RANGE "Range" +#define TR_BAR "Bar" +#define TR_ALARM "Alarm" +#define TR_USRDATA "UsrData" +#define TR_BLADES "Blades" +#define TR_BARS "Bars" +#define TR_DISPLAY "Display" #ifdef AUDIO -#define TR_BEEPERMODE "Speaker Mode" -#define TR_BEEPERLEN "Speaker Length" -#define TR_SPKRPITCH "Speaker Pitch" +#define TR_BEEPERMODE "Speaker Mode" +#define TR_BEEPERLEN "Speaker Length" +#define TR_SPKRPITCH "Speaker Pitch" #else -#define TR_BEEPERMODE "Beeper Mode" -#define TR_BEEPERLEN "Beeper Length" +#define TR_BEEPERMODE "Beeper Mode" +#define TR_BEEPERLEN "Beeper Length" #endif -#define TR_HAPTICMODE "Haptic Mode" -#define TR_HAPTICSTRENGTH "Haptic Strength" -#define TR_HAPTICLENGTH "Haptic Length" -#define TR_CONTRAST "Contrast" -#define TR_BATTERYWARNING "Battery Warning" -#define TR_INACTIVITYALARM "Inactivity alrm" -#define TR_RENAVIG "Navig RotEnc" -#define TR_FILTERADC "Filter ADC" -#define TR_THROTTLEREVERSE "Thr reverse" -#define TR_MINUTEBEEP "Minute beep" -#define TR_BEEPCOUNTDOWN "Beep countdown" -#define TR_FLASHONBEEP "Flash on beep" -#define TR_BLMODE "Backlight mode" -#define TR_BLDELAY "Backlight delay" -#define TR_SPLASHSCREEN "Splash screen" -#define TR_THROTTLEWARNING "T-Warning" -#define TR_SWITCHWARNING "S-Warning" -#define TR_MEMORYWARNING "Memory Warning" -#define TR_ALARMWARNING "Alarm Warning" -#define TR_TIMEZONE "Time Zone" -#define TR_RXCHANNELORD "Rx Channel Ord" -#define TR_SLAVE "Slave" -#define TR_MODESRC "mode\003% src" -#define TR_MULTIPLIER "Multiplier" -#define TR_CAL "Cal" -#define TR_EEPROMV "EEPROM v" -#define TR_VTRIM "Trim- +" -#define TR_BG "BG:" -#define TR_MENUTOSTART "[MENU] TO START" -#define TR_SETMIDPOINT "SET MIDPOINT" -#define TR_MOVESTICKSPOTS "MOVE STICKS/POTS" -#define TR_RXBATT "Rx Batt:" -#define TR_TXnRX "Tx:\0Rx:" -#define OFS_RX 4 -#define TR_ACCEL "Acc:" -#define TR_NODATA "NO DATA" -#define TR_TM1TM2 "TM1\015TM2" -#define TR_THRTHP "THR\015TH%" -#define TR_TOT "TOT" -#define TR_TMR1LATMAXUS "Tmr1Lat max\003us" +#define TR_HAPTICMODE "Haptic Mode" +#define TR_HAPTICSTRENGTH "Haptic Strength" +#define TR_HAPTICLENGTH "Haptic Length" +#define TR_CONTRAST "Contrast" +#define TR_BATTERYWARNING "Battery Warning" +#define TR_INACTIVITYALARM "Inactivity alrm" +#define TR_RENAVIG "Navig RotEnc" +#define TR_FILTERADC "Filter ADC" +#define TR_THROTTLEREVERSE "Thr reverse" +#define TR_MINUTEBEEP "Minute beep" +#define TR_BEEPCOUNTDOWN "Beep countdown" +#define TR_FLASHONBEEP "Flash on beep" +#define TR_BLMODE "Backlight mode" +#define TR_BLDELAY "Backlight delay" +#define TR_SPLASHSCREEN "Splash screen" +#define TR_THROTTLEWARNING "T-Warning" +#define TR_SWITCHWARNING "S-Warning" +#define TR_MEMORYWARNING "Memory Warning" +#define TR_ALARMWARNING "Alarm Warning" +#define TR_TIMEZONE "Time Zone" +#define TR_RXCHANNELORD "Rx Channel Ord" +#define TR_SLAVE "Slave" +#define TR_MODESRC "mode\003% src" +#define TR_MULTIPLIER "Multiplier" +#define TR_CAL "Cal" +#define TR_EEPROMV "EEPROM v" +#define TR_VTRIM "Trim- +" +#define TR_BG "BG:" +#define TR_MENUTOSTART "[MENU] TO START" +#define TR_SETMIDPOINT "SET MIDPOINT" +#define TR_MOVESTICKSPOTS "MOVE STICKS/POTS" +#define TR_RXBATT "Rx Batt:" +#define TR_TXnRX "Tx:\0Rx:" +#define OFS_RX 4 +#define TR_ACCEL "Acc:" +#define TR_NODATA "NO DATA" +#define TR_TM1TM2 "TM1\015TM2" +#define TR_THRTHP "THR\015TH%" +#define TR_TOT "TOT" +#define TR_TMR1LATMAXUS "Tmr1Lat max\003us" #define STR_US (STR_TMR1LATMAXUS+12) -#define TR_TMR1LATMINUS "Tmr1Lat min\003us" -#define TR_TMR1JITTERUS "Tmr1 Jitter\003us" -#define TR_TMAINMAXMS "Tmain max\005ms" -#define TR_T10MSUS "T10ms\007us" -#define TR_FREESTACKMINB "Free Stack\004b" -#define TR_MENUTORESET "[MENU] to reset" -#define TR_PPM "PPM" -#define TR_CH "CH" -#define TR_MODEL "MODEL" -#define TR_FP "FP" -#define TR_EEPROMLOWMEM "EEPROM low mem" -#define TR_ALERT "\007ALERT" -#define TR_PRESSANYKEYTOSKIP "Press any key to skip" -#define TR_THROTTLENOTIDLE "Throttle not idle" -#define TR_ALARMSDISABLED "Alarms Disabled" -#define TR_PRESSANYKEY "\004Press any Key" -#define TR_BADEEPROMDATA "Bad EEprom Data" -#define TR_EEPROMFORMATTING "Formatting EEPROM" -#define TR_EEPROMOVERFLOW "EEPROM overflow" -#define TR_MENURADIOSETUP "RADIO SETUP" -#define TR_MENUDATEANDTIME "DATE AND TIME" -#define TR_MENUTRAINER "TRAINER" -#define TR_MENUVERSION "VERSION" -#define TR_MENUDIAG "DIAG" -#define TR_MENUANA "ANAS" -#define TR_MENUCALIBRATION "CALIBRATION" -#define TR_TRIMS2OFFSETS "Trims => Offsets" -#define TR_MENUMODELSEL "MODELSEL" -#define TR_MENUSETUP "SETUP" -#define TR_MENUFLIGHTPHASE "FLIGHT PHASE" -#define TR_MENUFLIGHTPHASES "FLIGHT PHASES" -#define TR_MENUHELISETUP "HELI SETUP" -#define TR_MENUDREXPO "DR/EXPO" // TODO flash saving this string is 2 times here -#define TR_MENULIMITS "LIMITS" -#define TR_MENUCURVES "CURVES" -#define TR_MENUCURVE "CURVE" -#define TR_MENUCUSTOMSWITCHES "CUSTOM SWITCHES" -#define TR_MENUFUNCSWITCHES "FUNC SWITCHES" -#define TR_MENUTELEMETRY "TELEMETRY" -#define TR_MENUTEMPLATES "TEMPLATES" -#define TR_MENUSTAT "STATS" -#define TR_MENUDEBUG "DEBUG" -#define TR_RXNUM "RxNum" -#define TR_SYNCMENU "Sync [MENU]" -#define TR_BACK "Back" -#define TR_MINLIMIT "Min Limit" -#define STR_LIMIT (STR_MINLIMIT+4) -#define TR_MAXLIMIT "Max Limit" -#define TR_MINRSSI "Min Rssi" -#define TR_LATITUDE "Latitude" -#define TR_LONGITUDE "Longitude" -#define TR_GPSCOORD "Gps Coords" -#define TR_VARIO "Vario" -#define TR_SHUTDOWN "SHUTTING DOWN" -#define TR_BATT_CALIB "Battery Calib" -#define TR_CURRENT_CALIB "Current Calib" -#define TR_VOLTAGE "Voltage" -#define TR_CURRENT "Current" -#define TR_SELECT_MODEL "Select Model" -#define TR_CREATE_MODEL "Create Model" -#define TR_BACKUP_MODEL "Backup Model" -#define TR_DELETE_MODEL "Delete Model" // TODO merged into DELETEMODEL? -#define TR_RESTORE_MODEL "Restore Model" -#define TR_SDCARD_ERROR "SDCARD Error" -#define TR_NO_SDCARD "No SDCARD" -#define TR_INCOMPATIBLE "Incompatible" -#define TR_WARNING "WARNING" -#define TR_EEPROMWARN "EEPROM" -#define TR_THROTTLEWARN "THROTTLE" -#define TR_ALARMSWARN "ALARMS" -#define TR_SWITCHWARN "SWITCH" -#define TR_INVERT_THR "Invert Thr?" -#define TR_INCOMPATIBLE_FILE +#define TR_TMR1LATMINUS "Tmr1Lat min\003us" +#define TR_TMR1JITTERUS "Tmr1 Jitter\003us" +#define TR_TMAINMAXMS "Tmain max\005ms" +#define TR_T10MSUS "T10ms\007us" +#define TR_FREESTACKMINB "Free Stack\004b" +#define TR_MENUTORESET "[MENU] to reset" +#define TR_PPM "PPM" +#define TR_CH "CH" +#define TR_MODEL "MODEL" +#define TR_FP "FP" +#define TR_EEPROMLOWMEM "EEPROM low mem" +#define TR_ALERT "\007ALERT" +#define TR_PRESSANYKEYTOSKIP "Press any key to skip" +#define TR_THROTTLENOTIDLE "Throttle not idle" +#define TR_ALARMSDISABLED "Alarms Disabled" +#define TR_PRESSANYKEY "\004Press any Key" +#define TR_BADEEPROMDATA "Bad EEprom Data" +#define TR_EEPROMFORMATTING "Formatting EEPROM" +#define TR_EEPROMOVERFLOW "EEPROM overflow" +#define TR_MENURADIOSETUP "RADIO SETUP" +#define TR_MENUDATEANDTIME "DATE AND TIME" +#define TR_MENUTRAINER "TRAINER" +#define TR_MENUVERSION "VERSION" +#define TR_MENUDIAG "DIAG" +#define TR_MENUANA "ANAS" +#define TR_MENUCALIBRATION "CALIBRATION" +#define TR_TRIMS2OFFSETS "Trims => Offsets" +#define TR_MENUMODELSEL "MODELSEL" +#define TR_MENUSETUP "SETUP" +#define TR_MENUFLIGHTPHASE "FLIGHT PHASE" +#define TR_MENUFLIGHTPHASES "FLIGHT PHASES" +#define TR_MENUHELISETUP "HELI SETUP" +#define TR_MENUDREXPO "DR/EXPO" // TODO flash saving this string is 2 times here +#define TR_MENULIMITS "LIMITS" +#define TR_MENUCURVES "CURVES" +#define TR_MENUCURVE "CURVE" +#define TR_MENUCUSTOMSWITCH "CUSTOM SWITCH" +#define TR_MENUCUSTOMSWITCHES "CUSTOM SWITCHES" +#define TR_MENUFUNCSWITCHES "FUNC SWITCHES" +#define TR_MENUTELEMETRY "TELEMETRY" +#define TR_MENUTEMPLATES "TEMPLATES" +#define TR_MENUSTAT "STATS" +#define TR_MENUDEBUG "DEBUG" +#define TR_RXNUM "RxNum" +#define TR_SYNCMENU "Sync [MENU]" +#define TR_BACK "Back" +#define TR_MINLIMIT "Min Limit" +#define STR_LIMIT (STR_MINLIMIT+4) +#define TR_MAXLIMIT "Max Limit" +#define TR_MINRSSI "Min Rssi" +#define TR_LATITUDE "Latitude" +#define TR_LONGITUDE "Longitude" +#define TR_GPSCOORD "Gps Coords" +#define TR_VARIO "Vario" +#define TR_SHUTDOWN "SHUTTING DOWN" +#define TR_BATT_CALIB "Battery Calib" +#define TR_CURRENT_CALIB "Current Calib" +#define TR_VOLTAGE "Voltage" +#define TR_CURRENT "Current" +#define TR_SELECT_MODEL "Select Model" +#define TR_CREATE_MODEL "Create Model" +#define TR_BACKUP_MODEL "Backup Model" +#define TR_DELETE_MODEL "Delete Model" // TODO merged into DELETEMODEL? +#define TR_RESTORE_MODEL "Restore Model" +#define TR_SDCARD_ERROR "SDCARD Error" +#define TR_NO_SDCARD "No SDCARD" +#define TR_INCOMPATIBLE "Incompatible" +#define TR_WARNING "WARNING" +#define TR_EEPROMWARN "EEPROM" +#define TR_THROTTLEWARN "THROTTLE" +#define TR_ALARMSWARN "ALARMS" +#define TR_SWITCHWARN "SWITCH" +#define TR_INVERT_THR "Invert Thr?" +#define TR_SPEAKER_VOLUME "Speaker Volume" +#define TR_OPTREX_DISPLAY "Optrex Display" +#define TR_BRIGHTNESS "Brightness" +#define TR_CPU_TEMP "CPU temp.\010>" +#define TR_FUNC "Func" +#define TR_V1 "V1" +#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_NO_SOUNDS_ON_SD "No Sounds on SD" +#define TR_NO_MODELS_ON_SD "No Models on SD" +#define TR_PLAY_FILE "Play" +#define TR_DELETE_FILE "Delete" +#define TR_COPY_FILE "Copy" +#define TR_RENAME_FILE "Rename" +#define TR_REMOVED " removed" diff --git a/src/translations/fr.h b/src/translations/fr.h index 74ddc3163..b78cc665c 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -20,6 +20,9 @@ #define LEN_VFILTERADC "\004" #define TR_VFILTERADC "SIMP""OSMP""FILT" +#define LEN_VBLMODE "\004" +#define TR_VBLMODE "OFF ""Keys""Stks""Both""ON\0" + #define LEN_TRNMODE "\003" #define TR_TRNMODE "OFF"" +="" :=" @@ -271,8 +274,8 @@ #define TR_COLDIRECTION "Direction COL" #define TR_NOFREEEXPO "Max expos atteint!" #define TR_NOFREEMIXER "Max mixages atteint!" -#define TR_INSERTMIX "INSERER MIXAGE " -#define TR_EDITMIX "EDITER MIXAGE " +#define TR_INSERTMIX "INSERER MIXAGE" +#define TR_EDITMIX "EDITER MIXAGE" #define TR_SOURCE "Source" #define TR_WEIGHT "Ratio" #define TR_MIXERWEIGHT "Ratio Mixage" @@ -386,6 +389,7 @@ #define TR_MENULIMITS "LIMITES" #define TR_MENUCURVES "COURBES" #define TR_MENUCURVE "COURBE" +#define TR_MENUCUSTOMSWITCH "INTERS PERS" #define TR_MENUCUSTOMSWITCHES "INTERS PERS" #define TR_MENUFUNCSWITCHES "INTERS FONCTIONS" #define TR_MENUTELEMETRY "TELEMESURE" @@ -423,3 +427,21 @@ #define TR_ALARMSWARN "ALARMES" #define TR_SWITCHWARN "INTERS" #define TR_INVERT_THR "Inverser Gaz?" +#define TR_SPEAKER_VOLUME "Speaker Volume" +#define TR_OPTREX_DISPLAY "Afficheur Optrex" +#define TR_BRIGHTNESS "Brightness" +#define TR_CPU_TEMP "Temp. CPU\010>" +#define TR_FUNC "Fonc" +#define TR_V1 "V1" +#define TR_V2 "V2" +#define TR_DURATION "Dur\200e" +#define TR_DELAY "D\200lai" +#define TR_SD_CARD "Carte SD" +#define TR_SDHC_CARD "Carte SD-HC" +#define TR_NO_SOUNDS_ON_SD "No Sounds on SD" +#define TR_NO_MODELS_ON_SD "No Models on SD" +#define TR_PLAY_FILE "Jouer" +#define TR_DELETE_FILE "Supprimer" +#define TR_COPY_FILE "Copier" +#define TR_RENAME_FILE "Renommer" +#define TR_REMOVED " supprim\200" diff --git a/src/translations/it.h b/src/translations/it.h index 7d8b3a3c2..99d084906 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -20,6 +20,9 @@ #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_TRNMODE "\003" #define TR_TRNMODE "off"" +="" :=" @@ -388,6 +391,7 @@ #define TR_MENULIMITS "LIMITI" #define TR_MENUCURVES "CURVE" #define TR_MENUCURVE "CURVA" +#define TR_MENUCUSTOMSWITCH "SWITCH PERSON." #define TR_MENUCUSTOMSWITCHES "SWITCH PERSON." #define TR_MENUFUNCSWITCHES "SWITCH FUNZIONE" #define TR_MENUTELEMETRY "TELEMETRIA" @@ -424,3 +428,21 @@ #define TR_ALARMSWARN "ALLARMI" #define TR_SWITCHWARN "SWITCH" #define TR_INVERT_THR "Invert Thr?" +#define TR_SPEAKER_VOLUME "Speaker Volume" +#define TR_OPTREX_DISPLAY "Optrex Display" +#define TR_BRIGHTNESS "Brightness" +#define TR_CPU_TEMP "CPU temp.\010>" +#define TR_FUNC "Func" +#define TR_V1 "V1" +#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_NO_SOUNDS_ON_SD "No Sounds on SD" +#define TR_NO_MODELS_ON_SD "No Models on SD" +#define TR_PLAY_FILE "Play" +#define TR_DELETE_FILE "Delete" +#define TR_COPY_FILE "Copy" +#define TR_RENAME_FILE "Rename" +#define TR_REMOVED " removed" diff --git a/src/translations/se.h b/src/translations/se.h index 9282eff58..1ab92f656 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -20,6 +20,9 @@ #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_TRNMODE "\003" #define TR_TRNMODE " AV"" +="" :=" @@ -385,6 +388,7 @@ #define TR_MENULIMITS "GR\204NSER" #define TR_MENUCURVES "KURVOR" #define TR_MENUCURVE "KURVA" +#define TR_MENUCUSTOMSWITCH "LOGISKA BRYTAR" #define TR_MENUCUSTOMSWITCHES "LOGISKA BRYTARE" #define TR_MENUFUNCSWITCHES "BRYTAR-EFFEKTER" #define TR_MENUTELEMETRY "TELEMETRI" @@ -422,3 +426,21 @@ #define TR_ALARMSWARN "ALARM" #define TR_SWITCHWARN "BRYTARE" #define TR_INVERT_THR "Revers.Gas?" +#define TR_SPEAKER_VOLUME "Speaker Volume" +#define TR_OPTREX_DISPLAY "Optrex Display" +#define TR_BRIGHTNESS "Brightness" +#define TR_CPU_TEMP "CPU temp.\010>" +#define TR_FUNC "Func" +#define TR_V1 "V1" +#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_NO_SOUNDS_ON_SD "No Sounds on SD" +#define TR_NO_MODELS_ON_SD "No Models on SD" +#define TR_PLAY_FILE "Play" +#define TR_DELETE_FILE "Delete" +#define TR_COPY_FILE "Copy" +#define TR_RENAME_FILE "Rename" +#define TR_REMOVED " removed"