diff --git a/src/translations/cz.h b/src/translations/cz.h index d0b5936d4..768351b1b 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -103,10 +103,10 @@ #endif #if defined(VOICE) #define TR_PLAY_TRACK "Hr\200t Stopu\0 " -#define TR_PLAY_VALUE "Hr\200t Hodnotu\0" +#define TR_PLAY_VALUE "Hr\200t TTS\0 " #else #define TR_PLAY_TRACK "[Hr\200t Stopu]\0" -#define TR_PLAY_VALUE "[Hr\200t Hodn.]\0" +#define TR_PLAY_VALUE "[Hr\200t TTS]\0 " #endif #if defined(PCBSKY9X) #if defined(SDCARD) @@ -115,10 +115,10 @@ #define TR_SDCLOGS "[Logov\200n\204 SD]" #endif #define TR_FSW_VOLUME "Hlasitost\0 " -#define TR_FSW_BG_MUSIC "Hudba BG\0 ""BgMusic Pause" +#define TR_FSW_BG_MUSIC "BgHudba\0 ""BgHudba Pauza" #elif defined(PCBGRUVIN9X) #if defined(SDCARD) -#define TR_SDCLOGS "Logování SD " +#define TR_SDCLOGS "Logování SD\0 " #else #define TR_SDCLOGS "[Logování SD]" #endif @@ -139,7 +139,7 @@ #else #define TR_FSW_TEST #endif -#define TR_VFSWFUNC "Bezpe\201\0 ""Tren\202r\0 ""Instant Trim " TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_FSW_VOLUME "Podsv\203tlen\204\0 " TR_FSW_BG_MUSIC TR_FSW_ADJUST_GVAR TR_FSW_TEST +#define TR_VFSWFUNC "Bezpe\201\0 ""Tren\202r \0 ""Instant Trim\0" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_FSW_VOLUME "Podsv\203tlen\204\0 " TR_FSW_BG_MUSIC TR_FSW_ADJUST_GVAR TR_FSW_TEST #define LEN_VFSWRESET "\006" #define TR_VFSWRESET "Timer1""Timer2""V\207e ""Telem." @@ -347,7 +347,7 @@ #define TR_TMAINMAXMS "Tmain max\012ms" #endif #define TR_T10MSUS "T10ms\016us" -#define TR_FREESTACKMINB "Free Stack\010b" +#define TR_FREESTACKMINB "Free Stack\010b" #define TR_MENUTORESET "[MENU] >> Reset" #define TR_PPM "PPM" #define TR_CH "CH" @@ -364,7 +364,7 @@ #define TR_EEPROMOVERFLOW "P\206etekla EEPROM" #define TR_MENURADIOSETUP "NASTAVEN\214 R\213DIA" #define TR_MENUDATEANDTIME "DATUM A \201AS" -#define TR_MENUTRAINER "TRENER" +#define TR_MENUTRAINER "TREN\220R" #define TR_MENUVERSION "VERZE" #define TR_MENUDIAG "DIAG" #define TR_MENUANA "ANALOGY" @@ -372,16 +372,16 @@ #define TR_TRIMS2OFFSETS "Trimy => Subtrimy" #define TR_MENUMODELSEL "MODEL" #define TR_MENUSETUP "NASTAVEN\214" -#define TR_MENUFLIGHTPHASE "F\213ZE LETU" -#define TR_MENUFLIGHTPHASES "F\213ZE LETU" -#define TR_MENUHELISETUP "NASTAVEN\214 HELI" -#define TR_MENUDREXPO "DV/EXPO" // TODO flash saving this string is 2 times here -#define TR_MENULIMITS "LIMITY" +#define TR_MENUFLIGHTPHASE "LETOV\213 F\213ZE" +#define TR_MENUFLIGHTPHASES "LETOV\220 F\213ZE" +#define TR_MENUHELISETUP "HELI" +#define TR_MENUDREXPO "DV/EXPO" +#define TR_MENULIMITS "SERVA" #define TR_MENUCURVES "K\215IVKY" #define TR_MENUCURVE "\003CV" #define TR_MENUCUSTOMSWITCH "VLASTN\214 SP\214NA\201" #define TR_MENUCUSTOMSWITCHES "VLASTN\214 SP\214NA\201E" -#define TR_MENUCUSTOMFUNC "FUNK\201.SP\214NA\201E" +#define TR_MENUCUSTOMFUNC "FUNKCE" #define TR_MENUTELEMETRY "TELEMETRIE" #define TR_MENUTEMPLATES "\207ABLONY" #define TR_MENUSTAT "STATISTIKA" @@ -452,5 +452,5 @@ #define TR_SD_SECTORS "Sektor\211 :" #define TR_SD_SIZE "Velikost:" #define TR_CURVE_TYPE TR_SD_TYPE -#define TR_GLOBAL_VARS "Global Variables" -#define TR_OWN "Own" +#define TR_GLOBAL_VARS "Glob\200ln\204 prom\203nn\202" +#define TR_OWN "Sv\200" diff --git a/src/translations/font_cz.lbm b/src/translations/font_cz.lbm index d59fa1bab..c4dad8811 100644 --- a/src/translations/font_cz.lbm +++ b/src/translations/font_cz.lbm @@ -1 +1 @@ -0x20,0x54,0x56,0x55,0x78,0x38,0x45,0x46,0x45,0x20,0x38,0x54,0x56,0x55,0x18,0x38,0x55,0x56,0x55,0x18,0x00,0x44,0x7e,0x41,0x00,0x38,0x44,0x46,0x45,0x38,0x7c,0x09,0x06,0x05,0x08,0x48,0x55,0x56,0x55,0x20,0x3c,0x40,0x42,0x21,0x7c,0x3c,0x40,0x43,0x23,0x7c,0x0c,0x50,0x52,0x51,0x3c,0x78,0x14,0x16,0x15,0x78,0x00,0x44,0x7e,0x45,0x00,0x7c,0x15,0x16,0x35,0x48,0x0c,0x10,0x62,0x11,0x0c,0x44,0x65,0x56,0x4d,0x44, +0x20,0x54,0x56,0x55,0x78,0x38,0x45,0x46,0x45,0x20,0x38,0x54,0x56,0x55,0x18,0x38,0x55,0x56,0x55,0x18,0x00,0x44,0x7e,0x41,0x00,0x38,0x44,0x46,0x45,0x38,0x7c,0x09,0x06,0x05,0x08,0x48,0x55,0x56,0x55,0x20,0x3c,0x40,0x42,0x21,0x7c,0x3c,0x40,0x43,0x23,0x7c,0x0c,0x50,0x52,0x51,0x3c,0x78,0x14,0x16,0x15,0x78,0x00,0x44,0x7e,0x45,0x00,0x7c,0x15,0x16,0x35,0x48,0x0c,0x10,0x62,0x11,0x0c,0x44,0x65,0x56,0x4d,0x44,0x7c,0x54,0x56,0x55,0x44, diff --git a/src/translations/font_cz.xbm b/src/translations/font_cz.xbm index e6bc2010b..ebc7dc1a6 100644 --- a/src/translations/font_cz.xbm +++ b/src/translations/font_cz.xbm @@ -1,10 +1,11 @@ -#define font_cz_width 80 +#define font_cz_width 85 #define font_cz_height 8 static unsigned char font_cz_bits[] = { - 0x48, 0x21, 0x85, 0x90, 0x52, 0x88, 0x21, 0x84, 0x14, 0x52, 0x84, 0x10, - 0x42, 0x08, 0x21, 0x84, 0x11, 0x42, 0x08, 0x21, 0xce, 0x39, 0x67, 0x5c, - 0x73, 0x31, 0x46, 0xe7, 0x5e, 0xfc, 0x30, 0xc4, 0x48, 0xe2, 0x0c, 0x31, - 0xc6, 0x48, 0x62, 0x44, 0x3e, 0xfc, 0x4f, 0x62, 0x70, 0x31, 0xfa, 0x4f, - 0x9e, 0x22, 0x31, 0x86, 0x40, 0x62, 0x80, 0x39, 0xc3, 0x48, 0x12, 0x11, - 0xde, 0x39, 0xe7, 0x5c, 0x78, 0xd6, 0xba, 0xe8, 0x22, 0xf9, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + 0x48, 0x21, 0x85, 0x90, 0x52, 0x88, 0x21, 0x84, 0x14, 0x52, 0x08, 0x84, + 0x10, 0x42, 0x08, 0x21, 0x84, 0x11, 0x42, 0x08, 0x21, 0x04, 0xce, 0x39, + 0x67, 0x5c, 0x73, 0x31, 0x46, 0xe7, 0x5e, 0xfc, 0x1f, 0x30, 0xc4, 0x48, + 0xe2, 0x0c, 0x31, 0xc6, 0x48, 0x62, 0x44, 0x01, 0x3e, 0xfc, 0x4f, 0x62, + 0x70, 0x31, 0xfa, 0x4f, 0x9e, 0x22, 0x0f, 0x31, 0x86, 0x40, 0x62, 0x80, + 0x39, 0xc3, 0x48, 0x12, 0x11, 0x01, 0xde, 0x39, 0xe7, 0x5c, 0x78, 0xd6, + 0xba, 0xe8, 0x22, 0xf9, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; diff --git a/src/translations/tts_cz.cpp b/src/translations/tts_cz.cpp index 0224ec116..403b6b671 100644 --- a/src/translations/tts_cz.cpp +++ b/src/translations/tts_cz.cpp @@ -122,15 +122,6 @@ PLAY_FUNCTION(pushUnitPrompt, int16_t number, uint8_t unitprompt) PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att) { -/* if digit >= 1000000000: - temp_digit, digit = divmod(digit, 1000000000) - prompts.extend(self.getNumberPrompt(temp_digit)) - prompts.append(Prompt(GUIDE_00_BILLION, dir=2)) - if digit >= 1000000: - temp_digit, digit = divmod(digit, 1000000) - prompts.extend(self.getNumberPrompt(temp_digit)) - prompts.append(Prompt(GUIDE_00_MILLION, dir=2)) -*/ if (number < 0) { PUSH_PROMPT(PROMPT_MINUS); @@ -139,21 +130,20 @@ PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att) int8_t mode = MODE(att); if (mode > 0) { - div_t qr = div(number, (mode == 1 ? 10 : 100)); + // we assume that we are PREC1 + div_t qr = div(number, 10); if (qr.rem) { - PLAY_NUMBER(qr.quot, 0, 0); + PLAY_NUMBER(qr.quot, 0, ZENSKY); if (qr.quot == 0) PUSH_PROMPT(PROMPT_CELA); else PUSH_UNIT_PROMPT(qr.quot, PROMPT_CELA); - if (mode == 2 && qr.rem < 10) - PUSH_PROMPT(PROMPT_NULA); PLAY_NUMBER(qr.rem, 0, ZENSKY); PUSH_PROMPT(PROMPT_UNITS_BASE+((unit-1)*4)+3); + return; } else - PLAY_NUMBER(qr.quot, unit, 0); - return; + number = qr.quot; } int16_t tmp = number; @@ -231,20 +221,17 @@ PLAY_FUNCTION(playDuration, int16_t seconds) uint8_t tmp = seconds / 3600; seconds %= 3600; if (tmp > 0) { - PLAY_NUMBER(tmp, 0, ZENSKY); - PUSH_UNIT_PROMPT(tmp, PROMPT_HOURS); + PLAY_NUMBER(tmp, UNIT_HOURS+1, ZENSKY); } tmp = seconds / 60; seconds %= 60; if (tmp > 0) { - PLAY_NUMBER(tmp, 0, ZENSKY); - PUSH_UNIT_PROMPT(tmp, PROMPT_MINUTES); + PLAY_NUMBER(tmp, UNIT_MINUTES+1, ZENSKY); } if (seconds > 0) { - PLAY_NUMBER(seconds, 0, ZENSKY); - PUSH_UNIT_PROMPT(seconds, PROMPT_SECONDS); + PLAY_NUMBER(seconds, UNIT_SECONDS+1, ZENSKY); } } diff --git a/src/translations/tts_sk.cpp b/src/translations/tts_sk.cpp index f18e47a96..ac74d0886 100644 --- a/src/translations/tts_sk.cpp +++ b/src/translations/tts_sk.cpp @@ -122,15 +122,6 @@ PLAY_FUNCTION(pushUnitPrompt, int16_t number, uint8_t unitprompt) PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att) { -/* if digit >= 1000000000: - temp_digit, digit = divmod(digit, 1000000000) - prompts.extend(self.getNumberPrompt(temp_digit)) - prompts.append(Prompt(GUIDE_00_BILLION, dir=2)) - if digit >= 1000000: - temp_digit, digit = divmod(digit, 1000000) - prompts.extend(self.getNumberPrompt(temp_digit)) - prompts.append(Prompt(GUIDE_00_MILLION, dir=2)) -*/ if (number < 0) { PUSH_PROMPT(PROMPT_MINUS); @@ -139,21 +130,20 @@ PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att) int8_t mode = MODE(att); if (mode > 0) { - div_t qr = div(number, (mode == 1 ? 10 : 100)); + // we assume that we are PREC1 + div_t qr = div(number, 10); if (qr.rem) { - PLAY_NUMBER(qr.quot, 0, 0); + PLAY_NUMBER(qr.quot, 0, ZENSKY); if (qr.quot == 0) PUSH_PROMPT(PROMPT_CELA); else PUSH_UNIT_PROMPT(qr.quot, PROMPT_CELA); - if (mode == 2 && qr.rem < 10) - PUSH_PROMPT(PROMPT_NULA); PLAY_NUMBER(qr.rem, 0, ZENSKY); PUSH_PROMPT(PROMPT_UNITS_BASE+((unit-1)*4)+3); + return; } else - PLAY_NUMBER(qr.quot, unit, 0); - return; + number = qr.quot; } int16_t tmp = number; @@ -197,7 +187,7 @@ PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att) if (number >= 1000) { if (number >= 3000) PLAY_NUMBER(number / 1000, 0, 0); - if (number >= 2000) + if (number >= 2000 && number < 3000) PUSH_PROMPT(PROMPT_DVETISIC); else PUSH_PROMPT(PROMPT_TISIC);