From 14ca8f34272bec9f0656d294ea9d242771cd5040 Mon Sep 17 00:00:00 2001 From: Romolo Manfredini Date: Sun, 5 Jul 2015 21:17:32 +0200 Subject: [PATCH] Italian translations - fix reading of time. --- radio/src/translations/it.h.txt | 48 +++++++++++++++---------------- radio/src/translations/tts_it.cpp | 41 +++++++++++++++----------- radio/util/tts.py | 10 +++++-- 3 files changed, 55 insertions(+), 44 deletions(-) diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 0264cc8b4..a6900dfcc 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -502,7 +502,7 @@ #define TR_VTMRMODES "OFF""ABS""MOs""MO%""MOt" #define LEN_VTRAINERMODES "\022" -#define TR_VTRAINERMODES "Maestro/Jack\0 ""Allievo/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0" +#define TR_VTRAINERMODES "Maestro/Jack\0 ""Allievo/Jack\0 ""Master/Modulo SBUS""Master/Modulo CPPM""Master/Batteria" #define LEN_VFAILSAFE "\013" #define TR_VFAILSAFE "Not set\0 ""Mantieni\0 ""Personali\0 ""No impulsi\0""Ricevente\0 " @@ -517,16 +517,16 @@ #endif #define LEN_VSENSORTYPES "\012" -#define TR_VSENSORTYPES "Custom\0 ""Calculated" +#define TR_VSENSORTYPES "Custom\0 ""Calcolato\0" -#define LEN_VFORMULAS "\010" -#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Totalize""Cell\0 ""Consumpt""Distance" +#define LEN_VFORMULAS "\011" +#define TR_VFORMULAS "Somma\0 ""Media\0 ""Min\0 ""Max\0 ""Moltipl\0 ""Totalizza""Cella\0 ""Consumo\0 ""Distanza\0" #define LEN_VPREC "\005" #define TR_VPREC "PREC0""PREC1""PREC2" -#define LEN_VCELLINDEX "\007" -#define TR_VCELLINDEX "Lowest\0""1\0 ""2\0 ""3\0 ""4\0 ""5\0 ""6\0 ""Highest""Delta\0" +#define LEN_VCELLINDEX "\010" +#define TR_VCELLINDEX "Minore\0 ""1\0 ""2\0 ""3\0 ""4\0 ""5\0 ""6\0 ""Maggiore""Delta\0" // ZERO TERMINATED STRINGS #define INDENT "\001" @@ -573,7 +573,7 @@ #define TR_TTRACE TR("T-Source", INDENT "Sorgente Motore") #define TR_TTRIM TR("T-Trim", INDENT "Trim Motore") #define TR_BEEPCTR TR("Ctr Beep","Beep al centro") -#define TR_USE_GLOBAL_FUNCS "Use Global Funcs" +#define TR_USE_GLOBAL_FUNCS "Usa Funz Globali" #if defined(PCBSKY9X) && defined(REVX) #define TR_OUTPUT_TYPE INDENT "Output" #endif @@ -1018,37 +1018,37 @@ #define TR_MODS_FORBIDDEN "Modifica proibita!" #define TR_UNLOCKED "Sbloccato" #define TR_ID "ID" -#define TR_PRECISION "Precision" +#define TR_PRECISION "Precisione" #define TR_RATIO "Ratio" #define TR_FORMULA "Formula" -#define TR_CELLINDEX "Cell index" +#define TR_CELLINDEX "Indice cella" #define TR_LOGS "Logs" -#define TR_OPTIONS "Options" +#define TR_OPTIONS "Opzioni" -#define TR_ALTSENSOR "Alt sensor" -#define TR_CELLSENSOR "Cell sensor" -#define TR_GPSSENSOR "GPS sensor" -#define TR_CURRENTSENSOR "Current sensor" +#define TR_ALTSENSOR "Sensore Alt" +#define TR_CELLSENSOR "Sensore Cell" +#define TR_GPSSENSOR "Sensore GPS" +#define TR_CURRENTSENSOR "Sensore Currente" #define TR_AUTOOFFSET "Auto Offset" -#define TR_ONLYPOSITIVE "Positive" -#define TR_FILTER "Filter" -#define TR_TELEMETRYFULL "All telemetry slots full!" +#define TR_ONLYPOSITIVE "Positivo" +#define TR_FILTER "Filtro" +#define TR_TELEMETRYFULL "Tutti gli slot sono pieni!" -#define TR_MENU_INPUTS "\314Inputs" +#define TR_MENU_INPUTS "\314Ingressi" #define TR_MENU_LUA "\322Lua scripts" #define TR_MENU_STICKS "\307Sticks" #define TR_MENU_POTS "\310Pots" #define TR_MENU_MAX "\315MAX" -#define TR_MENU_HELI "\316Cyclic" +#define TR_MENU_HELI "\316Ciclico" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Switches" -#define TR_MENU_LOGICAL_SWITCHES "\312Logical Switches" +#define TR_MENU_LOGICAL_SWITCHES "\312Switches Logici" #define TR_MENU_TRAINER "\317Trainer" -#define TR_MENU_CHANNELS "\320Channels" +#define TR_MENU_CHANNELS "\320Canali" #define TR_MENU_GVARS "\311GVars" #define TR_MENU_TELEMETRY "\321Telemetry" -#define TR_MENU_OTHER "Other" -#define TR_MENU_INVERT "Invert" +#define TR_MENU_OTHER "Altro" +#define TR_MENU_INVERT "Inverti" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" @@ -1072,5 +1072,5 @@ #define ZSTR_HDG "Hdg" #define ZSTR_CELLS "Cels" #define ZSTR_GPSALT "GAlt" -#define ZSTR_GPSDATETIME "Date" +#define ZSTR_GPSDATETIME "Data" #define ZSTR_GPS "GPS" diff --git a/radio/src/translations/tts_it.cpp b/radio/src/translations/tts_it.cpp index b2845a39c..34b4e9376 100644 --- a/radio/src/translations/tts_it.cpp +++ b/radio/src/translations/tts_it.cpp @@ -165,26 +165,33 @@ I18N_PLAY_FUNCTION(it, playDuration, int seconds PLAY_DURATION_ATT) PUSH_NUMBER_PROMPT(IT_PROMPT_ORA); } } - - tmp = seconds / 60; - seconds %= 60; - if (tmp > 0 || ore >0) { - if (tmp != 1) { - PLAY_NUMBER(tmp, 0, 0); - PUSH_NUMBER_PROMPT(IT_PROMPT_MINUTI); + if (seconds>0) { + tmp = seconds / 60; + seconds %= 60; + if (tmp>0 && seconds==0 && ore>0) { + PUSH_NUMBER_PROMPT(IT_PROMPT_E); + } + if (tmp > 0) { + if (tmp != 1) { + PLAY_NUMBER(tmp, 0, 0); + PUSH_NUMBER_PROMPT(IT_PROMPT_MINUTI); + } else { + PUSH_NUMBER_PROMPT(IT_PROMPT_UN); + PUSH_NUMBER_PROMPT(IT_PROMPT_MINUTO); + } + } + if ((tmp>0 || ore>0) && seconds>0) { + PUSH_NUMBER_PROMPT(IT_PROMPT_E); + } + } + if (seconds != 0 || (ore==0 && tmp==0)) { + if (seconds != 1) { + PLAY_NUMBER(seconds, 0, 0); + PUSH_NUMBER_PROMPT(IT_PROMPT_SECONDI); } else { PUSH_NUMBER_PROMPT(IT_PROMPT_UN); - PUSH_NUMBER_PROMPT(IT_PROMPT_MINUTO); + PUSH_NUMBER_PROMPT(IT_PROMPT_SECONDO); } - PUSH_NUMBER_PROMPT(IT_PROMPT_E); - } - - if (seconds != 1) { - PLAY_NUMBER(seconds, 0, 0); - PUSH_NUMBER_PROMPT(IT_PROMPT_SECONDI); - } else { - PUSH_NUMBER_PROMPT(IT_PROMPT_UN); - PUSH_NUMBER_PROMPT(IT_PROMPT_SECONDO); } } diff --git a/radio/util/tts.py b/radio/util/tts.py index ebb2da5ec..5a50325ea 100644 --- a/radio/util/tts.py +++ b/radio/util/tts.py @@ -312,7 +312,7 @@ def ttsIt(): systemSounds.append(("mille", filename(PROMPT_SYSTEM_BASE+102))) for i, s in enumerate(["virgola", "un", "e", "meno", "ora", "ore", "minuto", "minuti", "secondo", "secondi"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+103+i))) - for i, s in enumerate(["volt", "ampere", "metri per secondo", "", "chilometri/ora", "metri", "gradi", "percento", "milliampere", "milliampere/ora", "watt", "db", "piedi", "nodi", "ore", "minuti", "secondi", "R P M", "g", "millilitri", "once"]): + for i, s in enumerate(["", "volt", "ampere", "milliampers", "nodi", "metri al secondo", "piedi al secondo", "chilometri ora", "miglia per ora", "metri", "piedi", "gradi celsius","gradi fahrenheit", "percento", "milliampere ora", "watt", "db", "R P M", "g", "gradi", "millilitri", "once"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+113+i))) for s, f, a in [(u"radio inattiva controllare", "inactiv", 486), (u"batteria della radio scarica", "lowbatt", 485), @@ -332,6 +332,10 @@ def ttsIt(): (u"A1 critico", "a1_red", NO_ALTERNATE), (u"A2 in allarme", "a2_org", NO_ALTERNATE), (u"A2 critico", "a2_red", NO_ALTERNATE), + (u"A3 in allarme", "a3_org", NO_ALTERNATE), + (u"A3 critico", "a3_red", NO_ALTERNATE), + (u"A4 in allarme", "a4_org", NO_ALTERNATE), + (u"A4 critico", "a4_red", NO_ALTERNATE), (u"Segnale radio basso", "rssi_org", NO_ALTERNATE), (u"Segnale radio critico", "rssi_red", NO_ALTERNATE), (u"Problema all'antenna della radio", "swr_red", NO_ALTERNATE), @@ -339,11 +343,11 @@ def ttsIt(): (u"Telemetria disponibile", "telemok", NO_ALTERNATE), ]: systemSounds.append((s, filename(f, a))) - for i, s in enumerate([u"timer", u"timer", u"trasmissione", u"ricezione", u"A1", u"A2", u"altitudine", u"motore", + for i, s in enumerate([u"timer", u"", u"tensione", u"tensione", u"trasmissione", u"ricezione", u"altitudine", u"motore", u"carburante", u"temperatura", u"temperatura", u"velocità", "distanza", u"altitudine", u"cella lipo", u"totale lipo", u"tensione", u"corrente", u"consumo", u"potenza", u"accellerazione X", u"accellerazione Y", u"accellerazione Z", u"direzione", u"variometro",u"minimo",u"massimo"]): - systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+132+i))) + systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+135+i))) for i, (s, f) in enumerate([ (u"carrello chiuso", "gearup"), (u"carrello aperto", "geardn"),