diff --git a/src/Makefile b/src/Makefile index 7686bab6d..2607e9bff 100644 --- a/src/Makefile +++ b/src/Makefile @@ -652,7 +652,7 @@ TARGET = opentx # List C++ source files here. (C dependencies are automatically generated.) ifeq ($(PCB), $(filter $(PCB), SKY9X TARANIS)) - TTS_SRC = translations/tts_cz.cpp translations/tts_de.cpp translations/tts_en.cpp translations/tts_fr.cpp translations/tts_it.cpp + TTS_SRC = translations/tts_cz.cpp translations/tts_de.cpp translations/tts_en.cpp translations/tts_es.cpp translations/tts_fr.cpp translations/tts_it.cpp translations/tts_pt.cpp translations/tts_sk.cpp else STD_TTS_SRC = translations/tts_$(shell sh -c "echo $(TTS) | tr '[:upper:]' '[:lower:]'").cpp TTS_SRC = $(shell sh -c "if test -f $(STD_TTS_SRC); then echo $(STD_TTS_SRC); else echo translations/tts_en.cpp; fi") diff --git a/src/gui/menu_general.cpp b/src/gui/menu_general.cpp index e2e1f5b26..6302c0fcc 100644 --- a/src/gui/menu_general.cpp +++ b/src/gui/menu_general.cpp @@ -43,16 +43,23 @@ const pm_uchar sticks[] PROGMEM = { #if defined(CPUARM) extern LanguagePack czLanguagePack; extern LanguagePack enLanguagePack; +extern LanguagePack esLanguagePack; extern LanguagePack frLanguagePack; extern LanguagePack deLanguagePack; extern LanguagePack itLanguagePack; +extern LanguagePack ptLanguagePack; +extern LanguagePack skLanguagePack; + LanguagePack * languagePacks[] = { // alphabetical order &czLanguagePack, &enLanguagePack, + &esLanguagePack, &frLanguagePack, &deLanguagePack, &itLanguagePack, + &ptLanguagePack, + &skLanguagePack, NULL }; #endif diff --git a/src/translations/tts_cz.cpp b/src/translations/tts_cz.cpp index f2d63304f..2bff413d0 100644 --- a/src/translations/tts_cz.cpp +++ b/src/translations/tts_cz.cpp @@ -88,11 +88,13 @@ enum CzechPrompts { #if defined(VOICE) +#if not defined PUSH_UNIT_PROMPT #if defined(CPUARM) #define PUSH_UNIT_PROMPT(p, u) cz_pushUnitPrompt((p), (u), id) #else #define PUSH_UNIT_PROMPT(p, u) pushUnitPrompt((p), (u)) #endif +#endif #define MUZSKY 0x80 #define ZENSKY 0x81 diff --git a/src/translations/tts_en.cpp b/src/translations/tts_en.cpp index b4b8409f6..8cabaa55e 100644 --- a/src/translations/tts_en.cpp +++ b/src/translations/tts_en.cpp @@ -72,11 +72,13 @@ enum EnglishPrompts { #if defined(VOICE) +#if not defined PUSH_UNIT_PROMPT #if defined(CPUARM) #define PUSH_UNIT_PROMPT(p, u) pushUnitPrompt((p), (u), id) #else #define PUSH_UNIT_PROMPT(p, u) pushUnitPrompt((p), (u)) #endif +#endif PLAY_FUNCTION(pushUnitPrompt, int16_t number, uint8_t unitprompt) { diff --git a/src/translations/tts_es.cpp b/src/translations/tts_es.cpp index ace411408..f2768f437 100644 --- a/src/translations/tts_es.cpp +++ b/src/translations/tts_es.cpp @@ -37,83 +37,83 @@ #include "../opentx.h" enum SpanishPrompts { - PROMPT_NUMBERS_BASE = 0, - PROMPT_ZERO = PROMPT_NUMBERS_BASE+0, - PROMPT_CIEN = PROMPT_NUMBERS_BASE+100, - PROMPT_CIENTO = PROMPT_NUMBERS_BASE+101, - PROMPT_DOSCIENTOS = PROMPT_NUMBERS_BASE+102, - PROMPT_TRESCIENTOS, - PROMPT_CUATROCIENTOS, - PROMPT_QUINIENTOS, - PROMPT_SESCIENTOS, - PROMPT_SETECIENTOS, - PROMPT_OCHOCIENTOS, - PROMPT_NUEVECIENTOS, - PROMPT_MIL = PROMPT_NUMBERS_BASE+110, - PROMPT_VIRGOLA = 111, - PROMPT_UN, - PROMPT_UNA, - PROMPT_Y, - PROMPT_MENO, - PROMPT_HORA, - PROMPT_HORAS, - PROMPT_MINUTO, - PROMPT_MINUTOS, - PROMPT_SEGUNDO, - PROMPT_SEGUNDOS, + ES_PROMPT_NUMBERS_BASE = 0, + ES_PROMPT_ZERO = ES_PROMPT_NUMBERS_BASE+0, + ES_PROMPT_CIEN = ES_PROMPT_NUMBERS_BASE+100, + ES_PROMPT_CIENTO = ES_PROMPT_NUMBERS_BASE+101, + ES_PROMPT_DOSCIENTOS = ES_PROMPT_NUMBERS_BASE+102, + ES_PROMPT_TRESCIENTOS, + ES_PROMPT_CUATROCIENTOS, + ES_PROMPT_QUINIENTOS, + ES_PROMPT_SESCIENTOS, + ES_PROMPT_SETECIENTOS, + ES_PROMPT_OCHOCIENTOS, + ES_PROMPT_NUEVECIENTOS, + ES_PROMPT_MIL = ES_PROMPT_NUMBERS_BASE+110, + ES_PROMPT_VIRGOLA = 111, + ES_PROMPT_UN, + ES_PROMPT_UNA, + ES_PROMPT_Y, + ES_PROMPT_MENO, + ES_PROMPT_HORA, + ES_PROMPT_HORAS, + ES_PROMPT_MINUTO, + ES_PROMPT_MINUTOS, + ES_PROMPT_SEGUNDO, + ES_PROMPT_SEGUNDOS, - PROMPT_UNITS_BASE = 122, - PROMPT_VOLTS = PROMPT_UNITS_BASE+UNIT_VOLTS, - PROMPT_AMPS = PROMPT_UNITS_BASE+UNIT_AMPS, - PROMPT_METERS_PER_SECOND = PROMPT_UNITS_BASE+UNIT_METERS_PER_SECOND, - PROMPT_SPARE1 = PROMPT_UNITS_BASE+UNIT_RAW, - PROMPT_KMH = PROMPT_UNITS_BASE+UNIT_KMH, - PROMPT_METERS = PROMPT_UNITS_BASE+UNIT_METERS, - PROMPT_DEGREES = PROMPT_UNITS_BASE+UNIT_DEGREES, - PROMPT_PERCENT = PROMPT_UNITS_BASE+UNIT_PERCENT, - PROMPT_MILLIAMPS = PROMPT_UNITS_BASE+UNIT_MILLIAMPS, - PROMPT_MAH = PROMPT_UNITS_BASE+UNIT_MAH, - PROMPT_WATTS = PROMPT_UNITS_BASE+UNIT_WATTS, - PROMPT_FEET = PROMPT_UNITS_BASE+UNIT_FEET, - PROMPT_KTS = PROMPT_UNITS_BASE+UNIT_KTS, - PROMPT_HOURS = PROMPT_UNITS_BASE+UNIT_HOURS, - PROMPT_MINUTES = PROMPT_UNITS_BASE+UNIT_MINUTES, - PROMPT_SECONDS = PROMPT_UNITS_BASE+UNIT_SECONDS, - PROMPT_RPMS = PROMPT_UNITS_BASE+UNIT_RPMS, - PROMPT_G= PROMPT_UNITS_BASE+UNIT_G, + ES_PROMPT_UNITS_BASE = 122, + ES_PROMPT_VOLTS = ES_PROMPT_UNITS_BASE+UNIT_VOLTS, + ES_PROMPT_AMPS = ES_PROMPT_UNITS_BASE+UNIT_AMPS, + ES_PROMPT_METERS_PER_SECOND = ES_PROMPT_UNITS_BASE+UNIT_METERS_PER_SECOND, + ES_PROMPT_SPARE1 = ES_PROMPT_UNITS_BASE+UNIT_RAW, + ES_PROMPT_KMH = ES_PROMPT_UNITS_BASE+UNIT_KMH, + ES_PROMPT_METERS = ES_PROMPT_UNITS_BASE+UNIT_METERS, + ES_PROMPT_DEGREES = ES_PROMPT_UNITS_BASE+UNIT_DEGREES, + ES_PROMPT_PERCENT = ES_PROMPT_UNITS_BASE+UNIT_PERCENT, + ES_PROMPT_MILLIAMPS = ES_PROMPT_UNITS_BASE+UNIT_MILLIAMPS, + ES_PROMPT_MAH = ES_PROMPT_UNITS_BASE+UNIT_MAH, + ES_PROMPT_WATTS = ES_PROMPT_UNITS_BASE+UNIT_WATTS, + ES_PROMPT_FEET = ES_PROMPT_UNITS_BASE+UNIT_FEET, + ES_PROMPT_KTS = ES_PROMPT_UNITS_BASE+UNIT_KTS, + ES_PROMPT_HOURS = ES_PROMPT_UNITS_BASE+UNIT_HOURS, + ES_PROMPT_MINUTES = ES_PROMPT_UNITS_BASE+UNIT_MINUTES, + ES_PROMPT_SECONDS = ES_PROMPT_UNITS_BASE+UNIT_SECONDS, + ES_PROMPT_RPMS = ES_PROMPT_UNITS_BASE+UNIT_RPMS, + ES_PROMPT_G= ES_PROMPT_UNITS_BASE+UNIT_G, - PROMPT_LABELS_BASE = 139, - PROMPT_TIMER1 = PROMPT_LABELS_BASE+TELEM_TM1, - PROMPT_TIMER2 = PROMPT_LABELS_BASE+TELEM_TM2, - PROMPT_RSSI_TX = PROMPT_LABELS_BASE+TELEM_RSSI_TX, - PROMPT_RSSI_RX = PROMPT_LABELS_BASE+TELEM_RSSI_RX, - PROMPT_A1 = PROMPT_LABELS_BASE+TELEM_A1, - PROMPT_A2 = PROMPT_LABELS_BASE+TELEM_A2, - PROMPT_ALTITUDE = PROMPT_LABELS_BASE+TELEM_ALT, - PROMPT_RPM = PROMPT_LABELS_BASE+TELEM_RPM, - PROMPT_ESSENCE = PROMPT_LABELS_BASE+TELEM_FUEL, - PROMPT_T1 = PROMPT_LABELS_BASE+TELEM_T1, - PROMPT_T2 = PROMPT_LABELS_BASE+TELEM_T2, - PROMPT_VITESSE = PROMPT_LABELS_BASE+TELEM_SPEED, - PROMPT_DISTANCE = PROMPT_LABELS_BASE+TELEM_DIST, - PROMPT_GPSALTITUDE = PROMPT_LABELS_BASE+TELEM_GPSALT, - PROMPT_ELEMENTS_LIPO = PROMPT_LABELS_BASE+TELEM_CELL, - PROMPT_TOTAL_LIPO = PROMPT_LABELS_BASE+TELEM_CELLS_SUM, - PROMPT_VFAS = PROMPT_LABELS_BASE+TELEM_VFAS, - PROMPT_COURANT = PROMPT_LABELS_BASE+TELEM_CURRENT, - PROMPT_CONSOMMATION = PROMPT_LABELS_BASE+TELEM_CONSUMPTION, - PROMPT_PUISSANCE = PROMPT_LABELS_BASE+TELEM_POWER, - PROMPT_ACCELx = PROMPT_LABELS_BASE+TELEM_ACCx, - PROMPT_ACCELy = PROMPT_LABELS_BASE+TELEM_ACCy, - PROMPT_ACCELz = PROMPT_LABELS_BASE+TELEM_ACCz, - PROMPT_HDG = PROMPT_LABELS_BASE+TELEM_HDG, - PROMPT_VARIO = PROMPT_LABELS_BASE+TELEM_VSPD, + ES_PROMPT_LABELS_BASE = 139, + ES_PROMPT_TIMER1 = ES_PROMPT_LABELS_BASE+TELEM_TM1, + ES_PROMPT_TIMER2 = ES_PROMPT_LABELS_BASE+TELEM_TM2, + ES_PROMPT_RSSI_TX = ES_PROMPT_LABELS_BASE+TELEM_RSSI_TX, + ES_PROMPT_RSSI_RX = ES_PROMPT_LABELS_BASE+TELEM_RSSI_RX, + ES_PROMPT_A1 = ES_PROMPT_LABELS_BASE+TELEM_A1, + ES_PROMPT_A2 = ES_PROMPT_LABELS_BASE+TELEM_A2, + ES_PROMPT_ALTITUDE = ES_PROMPT_LABELS_BASE+TELEM_ALT, + ES_PROMPT_RPM = ES_PROMPT_LABELS_BASE+TELEM_RPM, + ES_PROMPT_ESSENCE = ES_PROMPT_LABELS_BASE+TELEM_FUEL, + ES_PROMPT_T1 = ES_PROMPT_LABELS_BASE+TELEM_T1, + ES_PROMPT_T2 = ES_PROMPT_LABELS_BASE+TELEM_T2, + ES_PROMPT_VITESSE = ES_PROMPT_LABELS_BASE+TELEM_SPEED, + ES_PROMPT_DISTANCE = ES_PROMPT_LABELS_BASE+TELEM_DIST, + ES_PROMPT_GPSALTITUDE = ES_PROMPT_LABELS_BASE+TELEM_GPSALT, + ES_PROMPT_ELEMENTS_LIPO = ES_PROMPT_LABELS_BASE+TELEM_CELL, + ES_PROMPT_TOTAL_LIPO = ES_PROMPT_LABELS_BASE+TELEM_CELLS_SUM, + ES_PROMPT_VFAS = ES_PROMPT_LABELS_BASE+TELEM_VFAS, + ES_PROMPT_COURANT = ES_PROMPT_LABELS_BASE+TELEM_CURRENT, + ES_PROMPT_CONSOMMATION = ES_PROMPT_LABELS_BASE+TELEM_CONSUMPTION, + ES_PROMPT_PUISSANCE = ES_PROMPT_LABELS_BASE+TELEM_POWER, + ES_PROMPT_ACCELx = ES_PROMPT_LABELS_BASE+TELEM_ACCx, + ES_PROMPT_ACCELy = ES_PROMPT_LABELS_BASE+TELEM_ACCy, + ES_PROMPT_ACCELz = ES_PROMPT_LABELS_BASE+TELEM_ACCz, + ES_PROMPT_HDG = ES_PROMPT_LABELS_BASE+TELEM_HDG, + ES_PROMPT_VARIO = ES_PROMPT_LABELS_BASE+TELEM_VSPD, }; #if defined(VOICE) -PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) +I18N_PLAY_FUNCTION(es, playNumber, getvalue_t number, uint8_t unit, uint8_t att) { /* if digit >= 1000000000: temp_digit, digit = divmod(digit, 1000000000) @@ -126,7 +126,7 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) */ if (number < 0) { - PUSH_NUMBER_PROMPT(PROMPT_MENO); + PUSH_NUMBER_PROMPT(ES_PROMPT_MENO); number = -number; } @@ -146,9 +146,9 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) div_t qr = div(number, (mode == 1 ? 10 : 100)); if (qr.rem > 0) { PLAY_NUMBER(qr.quot, 0, 0); - PUSH_NUMBER_PROMPT(PROMPT_VIRGOLA); + PUSH_NUMBER_PROMPT(ES_PROMPT_VIRGOLA); if (mode==2 && qr.rem < 10) - PUSH_NUMBER_PROMPT(PROMPT_ZERO); + PUSH_NUMBER_PROMPT(ES_PROMPT_ZERO); PLAY_NUMBER(qr.rem, unit, 0); } else { @@ -160,31 +160,31 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) if (number >= 1000) { if (number >= 2000) { PLAY_NUMBER(number / 1000, 0, 0); - PUSH_NUMBER_PROMPT(PROMPT_MIL); + PUSH_NUMBER_PROMPT(ES_PROMPT_MIL); } else { - PUSH_NUMBER_PROMPT(PROMPT_MIL); + PUSH_NUMBER_PROMPT(ES_PROMPT_MIL); } number %= 1000; if (number == 0) number = -1; } if (number >= 100) { - PUSH_NUMBER_PROMPT(PROMPT_CIENTO + number/100); + PUSH_NUMBER_PROMPT(ES_PROMPT_CIENTO + number/100); number %= 100; if (number == 0) number = -1; } - PUSH_NUMBER_PROMPT(PROMPT_ZERO+number); + PUSH_NUMBER_PROMPT(ES_PROMPT_ZERO+number); if (unit) { - PUSH_NUMBER_PROMPT(PROMPT_UNITS_BASE+unit-1); + PUSH_NUMBER_PROMPT(ES_PROMPT_UNITS_BASE+unit-1); } } -PLAY_FUNCTION(playDuration, int16_t seconds) +I18N_PLAY_FUNCTION(es, playDuration, int16_t seconds) { if (seconds < 0) { - PUSH_NUMBER_PROMPT(PROMPT_MENO); + PUSH_NUMBER_PROMPT(ES_PROMPT_MENO); seconds = -seconds; } @@ -195,10 +195,10 @@ PLAY_FUNCTION(playDuration, int16_t seconds) ore=tmp; if (tmp > 1) { PLAY_NUMBER(tmp, 0, 0); - PUSH_NUMBER_PROMPT(PROMPT_HORAS); + PUSH_NUMBER_PROMPT(ES_PROMPT_HORAS); } else { - PUSH_NUMBER_PROMPT(PROMPT_UNA); - PUSH_NUMBER_PROMPT(PROMPT_HORA); + PUSH_NUMBER_PROMPT(ES_PROMPT_UNA); + PUSH_NUMBER_PROMPT(ES_PROMPT_HORA); } } @@ -207,21 +207,23 @@ PLAY_FUNCTION(playDuration, int16_t seconds) if (tmp > 0 || ore >0) { if (tmp != 1) { PLAY_NUMBER(tmp, 0, 0); - PUSH_NUMBER_PROMPT(PROMPT_MINUTOS); + PUSH_NUMBER_PROMPT(ES_PROMPT_MINUTOS); } else { - PUSH_NUMBER_PROMPT(PROMPT_UN); - PUSH_NUMBER_PROMPT(PROMPT_MINUTO); + PUSH_NUMBER_PROMPT(ES_PROMPT_UN); + PUSH_NUMBER_PROMPT(ES_PROMPT_MINUTO); } - PUSH_NUMBER_PROMPT(PROMPT_Y); + PUSH_NUMBER_PROMPT(ES_PROMPT_Y); } if (seconds != 1) { PLAY_NUMBER(seconds, 0, 0); - PUSH_NUMBER_PROMPT(PROMPT_SEGUNDOS); + PUSH_NUMBER_PROMPT(ES_PROMPT_SEGUNDOS); } else { - PUSH_NUMBER_PROMPT(PROMPT_UN); - PUSH_NUMBER_PROMPT(PROMPT_SEGUNDO); + PUSH_NUMBER_PROMPT(ES_PROMPT_UN); + PUSH_NUMBER_PROMPT(ES_PROMPT_SEGUNDO); } } +LANGUAGE_PACK_DECLARE(es, "spanish"); + #endif diff --git a/src/translations/tts_pt.cpp b/src/translations/tts_pt.cpp index b00c08721..9a82a6acc 100644 --- a/src/translations/tts_pt.cpp +++ b/src/translations/tts_pt.cpp @@ -37,81 +37,81 @@ #include "../opentx.h" enum PortuguesePrompts { - PROMPT_NUMBERS_BASE = 0, - PROMPT_ZERO = PROMPT_NUMBERS_BASE+0, - PROMPT_CEM = PROMPT_NUMBERS_BASE+100, - PROMPT_CENTO = PROMPT_NUMBERS_BASE+101, - PROMPT_DUZENTOS = PROMPT_NUMBERS_BASE+102, - PROMPT_TREZCENTOS, - PROMPT_QUATROCENTOS, - PROMPT_QUINHENTOS, - PROMPT_SEISCENTOS, - PROMPT_SETECENTOS, - PROMPT_OITOCENTOS, - PROMPT_NUEVECENTOS, - PROMPT_MIL = PROMPT_NUMBERS_BASE+110, - PROMPT_VIRGULA = 111, - PROMPT_UMA, - PROMPT_DUAS, - PROMPT_E, - PROMPT_MENOS, - PROMPT_HORA, - PROMPT_HORAS, - PROMPT_MINUTO, - PROMPT_MINUTOS, - PROMPT_SEGUNDO, - PROMPT_SEGUNDOS, + PT_PROMPT_NUMBERS_BASE = 0, + PT_PROMPT_ZERO = PT_PROMPT_NUMBERS_BASE+0, + PT_PROMPT_CEM = PT_PROMPT_NUMBERS_BASE+100, + PT_PROMPT_CENTO = PT_PROMPT_NUMBERS_BASE+101, + PT_PROMPT_DUZENTOS = PT_PROMPT_NUMBERS_BASE+102, + PT_PROMPT_TREZCENTOS, + PT_PROMPT_QUATROCENTOS, + PT_PROMPT_QUINHENTOS, + PT_PROMPT_SEISCENTOS, + PT_PROMPT_SETECENTOS, + PT_PROMPT_OITOCENTOS, + PT_PROMPT_NUEVECENTOS, + PT_PROMPT_MIL = PT_PROMPT_NUMBERS_BASE+110, + PT_PROMPT_VIRGULA = 111, + PT_PROMPT_UMA, + PT_PROMPT_DUAS, + PT_PROMPT_E, + PT_PROMPT_MENOS, + PT_PROMPT_HORA, + PT_PROMPT_HORAS, + PT_PROMPT_MINUTO, + PT_PROMPT_MINUTOS, + PT_PROMPT_SEGUNDO, + PT_PROMPT_SEGUNDOS, - PROMPT_UNITS_BASE = 122, - PROMPT_VOLTS = PROMPT_UNITS_BASE+UNIT_VOLTS, - PROMPT_AMPS = PROMPT_UNITS_BASE+UNIT_AMPS, - PROMPT_METERS_PER_SECOND = PROMPT_UNITS_BASE+UNIT_METERS_PER_SECOND, - PROMPT_SPARE1 = PROMPT_UNITS_BASE+UNIT_RAW, - PROMPT_KMH = PROMPT_UNITS_BASE+UNIT_KMH, - PROMPT_METERS = PROMPT_UNITS_BASE+UNIT_METERS, - PROMPT_DEGREES = PROMPT_UNITS_BASE+UNIT_DEGREES, - PROMPT_PERCENT = PROMPT_UNITS_BASE+UNIT_PERCENT, - PROMPT_MILLIAMPS = PROMPT_UNITS_BASE+UNIT_MILLIAMPS, - PROMPT_MAH = PROMPT_UNITS_BASE+UNIT_MAH, - PROMPT_WATTS = PROMPT_UNITS_BASE+UNIT_WATTS, - PROMPT_FEET = PROMPT_UNITS_BASE+UNIT_FEET, - PROMPT_KTS = PROMPT_UNITS_BASE+UNIT_KTS, + PT_PROMPT_UNITS_BASE = 122, + PT_PROMPT_VOLTS = PT_PROMPT_UNITS_BASE+UNIT_VOLTS, + PT_PROMPT_AMPS = PT_PROMPT_UNITS_BASE+UNIT_AMPS, + PT_PROMPT_METERS_PER_SECOND = PT_PROMPT_UNITS_BASE+UNIT_METERS_PER_SECOND, + PT_PROMPT_SPARE1 = PT_PROMPT_UNITS_BASE+UNIT_RAW, + PT_PROMPT_KMH = PT_PROMPT_UNITS_BASE+UNIT_KMH, + PT_PROMPT_METERS = PT_PROMPT_UNITS_BASE+UNIT_METERS, + PT_PROMPT_DEGREES = PT_PROMPT_UNITS_BASE+UNIT_DEGREES, + PT_PROMPT_PERCENT = PT_PROMPT_UNITS_BASE+UNIT_PERCENT, + PT_PROMPT_MILLIAMPS = PT_PROMPT_UNITS_BASE+UNIT_MILLIAMPS, + PT_PROMPT_MAH = PT_PROMPT_UNITS_BASE+UNIT_MAH, + PT_PROMPT_WATTS = PT_PROMPT_UNITS_BASE+UNIT_WATTS, + PT_PROMPT_FEET = PT_PROMPT_UNITS_BASE+UNIT_FEET, + PT_PROMPT_KTS = PT_PROMPT_UNITS_BASE+UNIT_KTS, - PROMPT_LABELS_BASE = 140, - PROMPT_TIMER1 = PROMPT_LABELS_BASE+TELEM_TM1, - PROMPT_TIMER2 = PROMPT_LABELS_BASE+TELEM_TM2, - PROMPT_RSSI_TX = PROMPT_LABELS_BASE+TELEM_RSSI_TX, - PROMPT_RSSI_RX = PROMPT_LABELS_BASE+TELEM_RSSI_RX, - PROMPT_A1 = PROMPT_LABELS_BASE+TELEM_A1, - PROMPT_A2 = PROMPT_LABELS_BASE+TELEM_A2, - PROMPT_ALTITUDE = PROMPT_LABELS_BASE+TELEM_ALT, - PROMPT_RPM = PROMPT_LABELS_BASE+TELEM_RPM, - PROMPT_ESSENCE = PROMPT_LABELS_BASE+TELEM_FUEL, - PROMPT_T1 = PROMPT_LABELS_BASE+TELEM_T1, - PROMPT_T2 = PROMPT_LABELS_BASE+TELEM_T2, - PROMPT_VITESSE = PROMPT_LABELS_BASE+TELEM_SPEED, - PROMPT_DISTANCE = PROMPT_LABELS_BASE+TELEM_DIST, - PROMPT_GPSALTITUDE = PROMPT_LABELS_BASE+TELEM_GPSALT, - PROMPT_ELEMENTS_LIPO = PROMPT_LABELS_BASE+TELEM_CELL, - PROMPT_TOTAL_LIPO = PROMPT_LABELS_BASE+TELEM_CELLS_SUM, - PROMPT_VFAS = PROMPT_LABELS_BASE+TELEM_VFAS, - PROMPT_COURANT = PROMPT_LABELS_BASE+TELEM_CURRENT, - PROMPT_CONSOMMATION = PROMPT_LABELS_BASE+TELEM_CONSUMPTION, - PROMPT_PUISSANCE = PROMPT_LABELS_BASE+TELEM_POWER, - PROMPT_ACCELx = PROMPT_LABELS_BASE+TELEM_ACCx, - PROMPT_ACCELy = PROMPT_LABELS_BASE+TELEM_ACCy, - PROMPT_ACCELz = PROMPT_LABELS_BASE+TELEM_ACCz, - PROMPT_HDG = PROMPT_LABELS_BASE+TELEM_HDG, - PROMPT_VARIO = PROMPT_LABELS_BASE+TELEM_VSPD, + PT_PROMPT_LABELS_BASE = 140, + PT_PROMPT_TIMER1 = PT_PROMPT_LABELS_BASE+TELEM_TM1, + PT_PROMPT_TIMER2 = PT_PROMPT_LABELS_BASE+TELEM_TM2, + PT_PROMPT_RSSI_TX = PT_PROMPT_LABELS_BASE+TELEM_RSSI_TX, + PT_PROMPT_RSSI_RX = PT_PROMPT_LABELS_BASE+TELEM_RSSI_RX, + PT_PROMPT_A1 = PT_PROMPT_LABELS_BASE+TELEM_A1, + PT_PROMPT_A2 = PT_PROMPT_LABELS_BASE+TELEM_A2, + PT_PROMPT_ALTITUDE = PT_PROMPT_LABELS_BASE+TELEM_ALT, + PT_PROMPT_RPM = PT_PROMPT_LABELS_BASE+TELEM_RPM, + PT_PROMPT_ESSENCE = PT_PROMPT_LABELS_BASE+TELEM_FUEL, + PT_PROMPT_T1 = PT_PROMPT_LABELS_BASE+TELEM_T1, + PT_PROMPT_T2 = PT_PROMPT_LABELS_BASE+TELEM_T2, + PT_PROMPT_VITESSE = PT_PROMPT_LABELS_BASE+TELEM_SPEED, + PT_PROMPT_DISTANCE = PT_PROMPT_LABELS_BASE+TELEM_DIST, + PT_PROMPT_GPSALTITUDE = PT_PROMPT_LABELS_BASE+TELEM_GPSALT, + PT_PROMPT_ELEMENTS_LIPO = PT_PROMPT_LABELS_BASE+TELEM_CELL, + PT_PROMPT_TOTAL_LIPO = PT_PROMPT_LABELS_BASE+TELEM_CELLS_SUM, + PT_PROMPT_VFAS = PT_PROMPT_LABELS_BASE+TELEM_VFAS, + PT_PROMPT_COURANT = PT_PROMPT_LABELS_BASE+TELEM_CURRENT, + PT_PROMPT_CONSOMMATION = PT_PROMPT_LABELS_BASE+TELEM_CONSUMPTION, + PT_PROMPT_PUISSANCE = PT_PROMPT_LABELS_BASE+TELEM_POWER, + PT_PROMPT_ACCELx = PT_PROMPT_LABELS_BASE+TELEM_ACCx, + PT_PROMPT_ACCELy = PT_PROMPT_LABELS_BASE+TELEM_ACCy, + PT_PROMPT_ACCELz = PT_PROMPT_LABELS_BASE+TELEM_ACCz, + PT_PROMPT_HDG = PT_PROMPT_LABELS_BASE+TELEM_HDG, + PT_PROMPT_VARIO = PT_PROMPT_LABELS_BASE+TELEM_VSPD, }; #if defined(VOICE) -PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) +I18N_PLAY_FUNCTION(pt, playNumber, getvalue_t number, uint8_t unit, uint8_t att) { if (number < 0) { - PUSH_NUMBER_PROMPT(PROMPT_MENOS); + PUSH_NUMBER_PROMPT(PT_PROMPT_MENOS); number = -number; } @@ -131,9 +131,9 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) div_t qr = div(number, (mode == 1 ? 10 : 100)); if (qr.rem > 0) { PLAY_NUMBER(qr.quot, 0, 0); - PUSH_NUMBER_PROMPT(PROMPT_VIRGULA); + PUSH_NUMBER_PROMPT(PT_PROMPT_VIRGULA); if (mode==2 && qr.rem < 10) - PUSH_NUMBER_PROMPT(PROMPT_ZERO); + PUSH_NUMBER_PROMPT(PT_PROMPT_ZERO); PLAY_NUMBER(qr.rem, unit, 0); } else { @@ -145,31 +145,31 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) if (number >= 1000) { if (number >= 2000) { PLAY_NUMBER(number / 1000, 0, 0); - PUSH_NUMBER_PROMPT(PROMPT_MIL); + PUSH_NUMBER_PROMPT(PT_PROMPT_MIL); } else { - PUSH_NUMBER_PROMPT(PROMPT_MIL); + PUSH_NUMBER_PROMPT(PT_PROMPT_MIL); } number %= 1000; if (number == 0) number = -1; } if (number >= 100) { - PUSH_NUMBER_PROMPT(PROMPT_CENTO + number/100); + PUSH_NUMBER_PROMPT(PT_PROMPT_CENTO + number/100); number %= 100; if (number == 0) number = -1; } - PUSH_NUMBER_PROMPT(PROMPT_ZERO+number); + PUSH_NUMBER_PROMPT(PT_PROMPT_ZERO+number); if (unit) { - PUSH_NUMBER_PROMPT(PROMPT_UNITS_BASE+unit-1); + PUSH_NUMBER_PROMPT(PT_PROMPT_UNITS_BASE+unit-1); } } -PLAY_FUNCTION(playDuration, int16_t seconds) +I18N_PLAY_FUNCTION(pt, playDuration, int16_t seconds) { if (seconds < 0) { - PUSH_NUMBER_PROMPT(PROMPT_MENOS); + PUSH_NUMBER_PROMPT(PT_PROMPT_MENOS); seconds = -seconds; } @@ -180,13 +180,13 @@ PLAY_FUNCTION(playDuration, int16_t seconds) ore=tmp; if (tmp > 2) { PLAY_NUMBER(tmp, 0, 0); - PUSH_NUMBER_PROMPT(PROMPT_HORAS); + PUSH_NUMBER_PROMPT(PT_PROMPT_HORAS); } else if (tmp==2) { - PUSH_NUMBER_PROMPT(PROMPT_DUAS); - PUSH_NUMBER_PROMPT(PROMPT_HORAS); + PUSH_NUMBER_PROMPT(PT_PROMPT_DUAS); + PUSH_NUMBER_PROMPT(PT_PROMPT_HORAS); } else if (tmp==1) { - PUSH_NUMBER_PROMPT(PROMPT_UMA); - PUSH_NUMBER_PROMPT(PROMPT_HORA); + PUSH_NUMBER_PROMPT(PT_PROMPT_UMA); + PUSH_NUMBER_PROMPT(PT_PROMPT_HORA); } } @@ -195,21 +195,23 @@ PLAY_FUNCTION(playDuration, int16_t seconds) if (tmp > 0 || ore >0) { if (tmp != 1) { PLAY_NUMBER(tmp, 0, 0); - PUSH_NUMBER_PROMPT(PROMPT_MINUTOS); + PUSH_NUMBER_PROMPT(PT_PROMPT_MINUTOS); } else { - PUSH_NUMBER_PROMPT(PROMPT_NUMBERS_BASE+1); - PUSH_NUMBER_PROMPT(PROMPT_MINUTO); + PUSH_NUMBER_PROMPT(PT_PROMPT_NUMBERS_BASE+1); + PUSH_NUMBER_PROMPT(PT_PROMPT_MINUTO); } - PUSH_NUMBER_PROMPT(PROMPT_E); + PUSH_NUMBER_PROMPT(PT_PROMPT_E); } if (seconds != 1) { PLAY_NUMBER(seconds, 0, 0); - PUSH_NUMBER_PROMPT(PROMPT_SEGUNDOS); + PUSH_NUMBER_PROMPT(PT_PROMPT_SEGUNDOS); } else { - PUSH_NUMBER_PROMPT(PROMPT_NUMBERS_BASE+1); - PUSH_NUMBER_PROMPT(PROMPT_SEGUNDO); + PUSH_NUMBER_PROMPT(PT_PROMPT_NUMBERS_BASE+1); + PUSH_NUMBER_PROMPT(PT_PROMPT_SEGUNDO); } } +LANGUAGE_PACK_DECLARE(pt, "portuguese"); + #endif diff --git a/src/translations/tts_sk.cpp b/src/translations/tts_sk.cpp index f6699209e..ff47dabad 100644 --- a/src/translations/tts_sk.cpp +++ b/src/translations/tts_sk.cpp @@ -38,82 +38,84 @@ #include "../opentx.h" enum SlovakPrompts { - PROMPT_NUMBERS_BASE = 0, - PROMPT_NULA = PROMPT_NUMBERS_BASE+0, //0-99 - PROMPT_STO = PROMPT_NUMBERS_BASE+100, //100,200 .. 900 - PROMPT_TISIC = PROMPT_NUMBERS_BASE+109, //1000 - PROMPT_DVETISIC = PROMPT_NUMBERS_BASE+110, - PROMPT_JEDEN = PROMPT_NUMBERS_BASE+111, - PROMPT_JEDNO = PROMPT_NUMBERS_BASE+112, - PROMPT_DVE = PROMPT_NUMBERS_BASE+113, - PROMPT_CELA = PROMPT_NUMBERS_BASE+114, - PROMPT_CELE = PROMPT_NUMBERS_BASE+115, - PROMPT_CELYCH = PROMPT_NUMBERS_BASE+116, - PROMPT_MINUS = PROMPT_NUMBERS_BASE+117, + SK_PROMPT_NUMBERS_BASE = 0, + SK_PROMPT_NULA = SK_PROMPT_NUMBERS_BASE+0, //0-99 + SK_PROMPT_STO = SK_PROMPT_NUMBERS_BASE+100, //100,200 .. 900 + SK_PROMPT_TISIC = SK_PROMPT_NUMBERS_BASE+109, //1000 + SK_PROMPT_DVETISIC = SK_PROMPT_NUMBERS_BASE+110, + SK_PROMPT_JEDEN = SK_PROMPT_NUMBERS_BASE+111, + SK_PROMPT_JEDNO = SK_PROMPT_NUMBERS_BASE+112, + SK_PROMPT_DVE = SK_PROMPT_NUMBERS_BASE+113, + SK_PROMPT_CELA = SK_PROMPT_NUMBERS_BASE+114, + SK_PROMPT_CELE = SK_PROMPT_NUMBERS_BASE+115, + SK_PROMPT_CELYCH = SK_PROMPT_NUMBERS_BASE+116, + SK_PROMPT_MINUS = SK_PROMPT_NUMBERS_BASE+117, - PROMPT_UNITS_BASE = 118, - PROMPT_VOLTS = PROMPT_UNITS_BASE+UNIT_VOLTS, //(jeden)volt,(dva)volty,(pet)voltu,(desetina)voltu - PROMPT_AMPS = PROMPT_UNITS_BASE+(UNIT_AMPS*4), - PROMPT_METERS_PER_SECOND = PROMPT_UNITS_BASE+(UNIT_METERS_PER_SECOND*4), - PROMPT_SPARE1 = PROMPT_UNITS_BASE+(UNIT_RAW*4), - PROMPT_KMH = PROMPT_UNITS_BASE+(UNIT_KMH*4), - PROMPT_METERS = PROMPT_UNITS_BASE+(UNIT_METERS*4), - PROMPT_DEGREES = PROMPT_UNITS_BASE+(UNIT_DEGREES*4), - PROMPT_PERCENT = PROMPT_UNITS_BASE+(UNIT_PERCENT*4), - PROMPT_MILLIAMPS = PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*4), - PROMPT_MAH = PROMPT_UNITS_BASE+(UNIT_MAH*4), - PROMPT_WATTS = PROMPT_UNITS_BASE+(UNIT_WATTS*4), - PROMPT_DB = PROMPT_UNITS_BASE+(UNIT_DBM*4), - PROMPT_FEET = PROMPT_UNITS_BASE+(UNIT_FEET*4), - PROMPT_KTS = PROMPT_UNITS_BASE+(UNIT_KTS*4), - PROMPT_HOURS = PROMPT_UNITS_BASE+(UNIT_HOURS*4), - PROMPT_MINUTES = PROMPT_UNITS_BASE+(UNIT_MINUTES*4), - PROMPT_SECONDS = PROMPT_UNITS_BASE+(UNIT_SECONDS*4), - PROMPT_RPMS = PROMPT_UNITS_BASE+(UNIT_RPMS*4), - PROMPT_G = PROMPT_UNITS_BASE+(UNIT_G*4), + SK_PROMPT_UNITS_BASE = 118, + SK_PROMPT_VOLTS = SK_PROMPT_UNITS_BASE+UNIT_VOLTS, //(jeden)volt,(dva)volty,(pet)voltu,(desetina)voltu + SK_PROMPT_AMPS = SK_PROMPT_UNITS_BASE+(UNIT_AMPS*4), + SK_PROMPT_METERS_PER_SECOND = SK_PROMPT_UNITS_BASE+(UNIT_METERS_PER_SECOND*4), + SK_PROMPT_SPARE1 = SK_PROMPT_UNITS_BASE+(UNIT_RAW*4), + SK_PROMPT_KMH = SK_PROMPT_UNITS_BASE+(UNIT_KMH*4), + SK_PROMPT_METERS = SK_PROMPT_UNITS_BASE+(UNIT_METERS*4), + SK_PROMPT_DEGREES = SK_PROMPT_UNITS_BASE+(UNIT_DEGREES*4), + SK_PROMPT_PERCENT = SK_PROMPT_UNITS_BASE+(UNIT_PERCENT*4), + SK_PROMPT_MILLIAMPS = SK_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*4), + SK_PROMPT_MAH = SK_PROMPT_UNITS_BASE+(UNIT_MAH*4), + SK_PROMPT_WATTS = SK_PROMPT_UNITS_BASE+(UNIT_WATTS*4), + SK_PROMPT_DB = SK_PROMPT_UNITS_BASE+(UNIT_DBM*4), + SK_PROMPT_FEET = SK_PROMPT_UNITS_BASE+(UNIT_FEET*4), + SK_PROMPT_KTS = SK_PROMPT_UNITS_BASE+(UNIT_KTS*4), + SK_PROMPT_HOURS = SK_PROMPT_UNITS_BASE+(UNIT_HOURS*4), + SK_PROMPT_MINUTES = SK_PROMPT_UNITS_BASE+(UNIT_MINUTES*4), + SK_PROMPT_SECONDS = SK_PROMPT_UNITS_BASE+(UNIT_SECONDS*4), + SK_PROMPT_RPMS = SK_PROMPT_UNITS_BASE+(UNIT_RPMS*4), + SK_PROMPT_G = SK_PROMPT_UNITS_BASE+(UNIT_G*4), - PROMPT_LABELS_BASE = 194, - PROMPT_TIMER1 = PROMPT_LABELS_BASE+TELEM_TM1, - PROMPT_TIMER2 = PROMPT_LABELS_BASE+TELEM_TM2, - PROMPT_RSSI_TX = PROMPT_LABELS_BASE+TELEM_RSSI_TX, - PROMPT_RSSI_RX = PROMPT_LABELS_BASE+TELEM_RSSI_RX, - PROMPT_A1 = PROMPT_LABELS_BASE+TELEM_A1, - PROMPT_A2 = PROMPT_LABELS_BASE+TELEM_A2, - PROMPT_ALTITUDE = PROMPT_LABELS_BASE+TELEM_ALT, - PROMPT_RPM = PROMPT_LABELS_BASE+TELEM_RPM, - PROMPT_ESSENCE = PROMPT_LABELS_BASE+TELEM_FUEL, - PROMPT_T1 = PROMPT_LABELS_BASE+TELEM_T1, - PROMPT_T2 = PROMPT_LABELS_BASE+TELEM_T2, - PROMPT_VITESSE = PROMPT_LABELS_BASE+TELEM_SPEED, - PROMPT_DISTANCE = PROMPT_LABELS_BASE+TELEM_DIST, - PROMPT_GPSALTITUDE = PROMPT_LABELS_BASE+TELEM_GPSALT, - PROMPT_ELEMENTS_LIPO = PROMPT_LABELS_BASE+TELEM_CELL, - PROMPT_TOTAL_LIPO = PROMPT_LABELS_BASE+TELEM_CELLS_SUM, - PROMPT_VFAS = PROMPT_LABELS_BASE+TELEM_VFAS, - PROMPT_COURANT = PROMPT_LABELS_BASE+TELEM_CURRENT, - PROMPT_CONSOMMATION = PROMPT_LABELS_BASE+TELEM_CONSUMPTION, - PROMPT_PUISSANCE = PROMPT_LABELS_BASE+TELEM_POWER, - PROMPT_ACCELx = PROMPT_LABELS_BASE+TELEM_ACCx, - PROMPT_ACCELy = PROMPT_LABELS_BASE+TELEM_ACCy, - PROMPT_ACCELz = PROMPT_LABELS_BASE+TELEM_ACCz, - PROMPT_HDG = PROMPT_LABELS_BASE+TELEM_HDG, - PROMPT_VARIO = PROMPT_LABELS_BASE+TELEM_VSPD, + SK_PROMPT_LABELS_BASE = 194, + SK_PROMPT_TIMER1 = SK_PROMPT_LABELS_BASE+TELEM_TM1, + SK_PROMPT_TIMER2 = SK_PROMPT_LABELS_BASE+TELEM_TM2, + SK_PROMPT_RSSI_TX = SK_PROMPT_LABELS_BASE+TELEM_RSSI_TX, + SK_PROMPT_RSSI_RX = SK_PROMPT_LABELS_BASE+TELEM_RSSI_RX, + SK_PROMPT_A1 = SK_PROMPT_LABELS_BASE+TELEM_A1, + SK_PROMPT_A2 = SK_PROMPT_LABELS_BASE+TELEM_A2, + SK_PROMPT_ALTITUDE = SK_PROMPT_LABELS_BASE+TELEM_ALT, + SK_PROMPT_RPM = SK_PROMPT_LABELS_BASE+TELEM_RPM, + SK_PROMPT_ESSENCE = SK_PROMPT_LABELS_BASE+TELEM_FUEL, + SK_PROMPT_T1 = SK_PROMPT_LABELS_BASE+TELEM_T1, + SK_PROMPT_T2 = SK_PROMPT_LABELS_BASE+TELEM_T2, + SK_PROMPT_VITESSE = SK_PROMPT_LABELS_BASE+TELEM_SPEED, + SK_PROMPT_DISTANCE = SK_PROMPT_LABELS_BASE+TELEM_DIST, + SK_PROMPT_GPSALTITUDE = SK_PROMPT_LABELS_BASE+TELEM_GPSALT, + SK_PROMPT_ELEMENTS_LIPO = SK_PROMPT_LABELS_BASE+TELEM_CELL, + SK_PROMPT_TOTAL_LIPO = SK_PROMPT_LABELS_BASE+TELEM_CELLS_SUM, + SK_PROMPT_VFAS = SK_PROMPT_LABELS_BASE+TELEM_VFAS, + SK_PROMPT_COURANT = SK_PROMPT_LABELS_BASE+TELEM_CURRENT, + SK_PROMPT_CONSOMMATION = SK_PROMPT_LABELS_BASE+TELEM_CONSUMPTION, + SK_PROMPT_PUISSANCE = SK_PROMPT_LABELS_BASE+TELEM_POWER, + SK_PROMPT_ACCELx = SK_PROMPT_LABELS_BASE+TELEM_ACCx, + SK_PROMPT_ACCELy = SK_PROMPT_LABELS_BASE+TELEM_ACCy, + SK_PROMPT_ACCELz = SK_PROMPT_LABELS_BASE+TELEM_ACCz, + SK_PROMPT_HDG = SK_PROMPT_LABELS_BASE+TELEM_HDG, + SK_PROMPT_VARIO = SK_PROMPT_LABELS_BASE+TELEM_VSPD, }; #if defined(VOICE) +#if not defined PUSH_UNIT_PROMPT #if defined(CPUARM) #define PUSH_UNIT_PROMPT(p, u) pushUnitPrompt((p), (u), id) #else #define PUSH_UNIT_PROMPT(p, u) pushUnitPrompt((p), (u)) #endif +#endif #define MUZSKY 0x80 #define ZENSKY 0x81 #define STREDNI 0x82 -PLAY_FUNCTION(pushUnitPrompt, int16_t number, uint8_t unitprompt) +I18N_PLAY_FUNCTION(sk, pushUnitPrompt, int16_t number, uint8_t unitprompt) { if (number == 1) PUSH_NUMBER_PROMPT(unitprompt); @@ -123,11 +125,11 @@ PLAY_FUNCTION(pushUnitPrompt, int16_t number, uint8_t unitprompt) PUSH_NUMBER_PROMPT(unitprompt+2); } -PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) +I18N_PLAY_FUNCTION(sk, playNumber, getvalue_t number, uint8_t unit, uint8_t att) { if (number < 0) { - PUSH_NUMBER_PROMPT(PROMPT_MINUS); + PUSH_NUMBER_PROMPT(SK_PROMPT_MINUS); number = -number; } @@ -149,11 +151,11 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) if (qr.rem) { PLAY_NUMBER(qr.quot, 0, ZENSKY); if (qr.quot == 0) - PUSH_NUMBER_PROMPT(PROMPT_CELA); + PUSH_NUMBER_PROMPT(SK_PROMPT_CELA); else - PUSH_UNIT_PROMPT(qr.quot, PROMPT_CELA); + PUSH_UNIT_PROMPT(qr.quot, SK_PROMPT_CELA); PLAY_NUMBER(qr.rem, 0, ZENSKY); - PUSH_NUMBER_PROMPT(PROMPT_UNITS_BASE+((unit-1)*4)+3); + PUSH_NUMBER_PROMPT(SK_PROMPT_UNITS_BASE+((unit-1)*4)+3); return; } else @@ -184,17 +186,17 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) } if ((number == 1) && (att == MUZSKY)) { - PUSH_NUMBER_PROMPT(PROMPT_JEDEN); + PUSH_NUMBER_PROMPT(SK_PROMPT_JEDEN); number = -1; } if ((number == 1) && (att == STREDNI)) { - PUSH_NUMBER_PROMPT(PROMPT_JEDNO); + PUSH_NUMBER_PROMPT(SK_PROMPT_JEDNO); number = -1; } if ((number == 2) && ((att == ZENSKY) || (att == STREDNI))) { - PUSH_NUMBER_PROMPT(PROMPT_DVE); + PUSH_NUMBER_PROMPT(SK_PROMPT_DVE); number = -1; } @@ -202,34 +204,34 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) if (number >= 3000) PLAY_NUMBER(number / 1000, 0, 0); if (number >= 2000 && number < 3000) - PUSH_NUMBER_PROMPT(PROMPT_DVETISIC); + PUSH_NUMBER_PROMPT(SK_PROMPT_DVETISIC); else - PUSH_NUMBER_PROMPT(PROMPT_TISIC); + PUSH_NUMBER_PROMPT(SK_PROMPT_TISIC); number %= 1000; if (number == 0) number = -1; } if (number >= 100) { - PUSH_NUMBER_PROMPT(PROMPT_STO + (number/100)-1); + PUSH_NUMBER_PROMPT(SK_PROMPT_STO + (number/100)-1); number %= 100; if (number == 0) number = -1; } if (number >= 0) { - PUSH_NUMBER_PROMPT(PROMPT_NULA+number); + PUSH_NUMBER_PROMPT(SK_PROMPT_NULA+number); } if (unit) { - PUSH_UNIT_PROMPT(tmp, (PROMPT_UNITS_BASE+((unit-1)*4))); + PUSH_UNIT_PROMPT(tmp, (SK_PROMPT_UNITS_BASE+((unit-1)*4))); } } -PLAY_FUNCTION(playDuration, int16_t seconds) +I18N_PLAY_FUNCTION(sk, playDuration, int16_t seconds) { if (seconds < 0) { - PUSH_NUMBER_PROMPT(PROMPT_MINUS); + PUSH_NUMBER_PROMPT(SK_PROMPT_MINUS); seconds = -seconds; } @@ -250,4 +252,6 @@ PLAY_FUNCTION(playDuration, int16_t seconds) } } +LANGUAGE_PACK_DECLARE(sk, "slovak"); + #endif