piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[Taranis] No TX RSSI on Taranis, some work on translations

Browse Source
This commit is contained in:
bernet.andre@gmail.com
2013-05-19 12:08:18 +00:00
parent ded8f237e0
commit 7b46be2118
22 changed files with 272 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/menu_general.cpp
+1 -1
View File
@@ -507,7 +507,7 @@ void menuGeneralSetup(uint8_t event)
#if defined(CPUARM)
case ITEM_SETUP_LANGUAGE:
lcd_putsLeft(y, PSTR("Voice Language"));
lcd_putsLeft(y, STR_VOICELANG);
lcd_putsAtt(RADIO_SETUP_2ND_COLUMN, y, currentLanguagePack->name, attr);
if (attr) {
currentLanguagePackIdx = checkIncDec(event, currentLanguagePackIdx, 0, DIM(languagePacks)-2, EE_GENERAL);
src/gui/menu_model.cpp
+1 -1
View File
@@ -1343,7 +1343,7 @@ void menuModelSetup(uint8_t event)
break;
case ITEM_MODEL_TRAINER_MODE:
g_model.trainerMode = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_MODE, PSTR("\006MasterSlave"), g_model.trainerMode, 0, 1, attr, event);
g_model.trainerMode = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_MODE, STR_VTRAINERMODES, g_model.trainerMode, 0, 1, attr, event);
break;
#else
src/gui/view_telemetry.cpp
+3 -8
View File
@@ -51,20 +51,15 @@ enum FrskyViews {
static uint8_t s_frsky_view = e_frsky_custom_screen_1;
#if LCD_W >= 212
#if defined(PCBTARANIS)
void displayRssiLine()
{
if (TELEMETRY_STREAMING()) {
lcd_hline(0, 55, 212, 0); // separator
uint8_t rssi = min((uint8_t)99, frskyData.rssi[1].value);
lcd_putsLeft(7*FH+1, STR_TX); lcd_outdezNAtt(4*FW, 7*FH+1, rssi, LEADING0, 2);
uint8_t rssi = min((uint8_t)99, frskyData.rssi[0].value);
lcd_putsLeft(7*FH+1, STR_RX); lcd_outdezNAtt(4*FW, 7*FH+1, rssi, LEADING0, 2);
lcd_rect(25, 57, 78, 7);
lcd_filled_rect(26, 58, 19*rssi/25, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID);
rssi = min((uint8_t)99, frskyData.rssi[0].value);
lcd_puts(190, 7*FH+1, STR_RX); lcd_outdezNAtt(189+4*FW-1, 7*FH+1, rssi, LEADING0, 2);
lcd_rect(110, 57, 78, 7);
uint8_t v = 19*rssi/25;
lcd_filled_rect(111+76-v, 58, v, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID);
}
else {
lcd_putsAtt(7*FW, 7*FH+1, STR_NODATA, BLINK);
src/opentx.cpp
+1 -1
View File
@@ -428,7 +428,7 @@ void checkModelIdUnique(uint8_t id)
{
for (uint8_t i=0; i<MAX_MODELS; i++) {
if (i!=id && g_model.header.modelId!=0 && g_model.header.modelId==modelHeaders[i].modelId) {
POPUP_WARNING(PSTR("Model ID already used"));
POPUP_WARNING(STR_MODELIDUSED);
}
}
}
src/translations.cpp
+8 -2
View File
@@ -99,9 +99,13 @@ const pm_char STR_OPEN9X[] PROGMEM =
#endif
#if defined(CPUARM)
ISTR(VLCD)
ISTR(VUNITSSYSTEM)
#endif
#if defined(PXX)
ISTR(COUNTRYCODES)
#endif
#if defined(PCBTARANIS)
ISTR(VTRAINERMODES)
#endif
;
@@ -336,8 +340,8 @@ const pm_char STR_CURRENT[] PROGMEM = TR_CURRENT;
#if defined(CPUARM)
const pm_char STR_CURRENT_CALIB[] PROGMEM = TR_CURRENT_CALIB;
const pm_char STR_UNITSSYSTEM[] PROGMEM = "Units";
const pm_char STR_VUNITSSYSTEM[] PROGMEM = TR("\006MetricImper.", "\010Metric\0 Imperial"); // TODO move it to non-zero terminated strings
const pm_char STR_UNITSSYSTEM[] PROGMEM = TR_UNITSSYSTEM;
const pm_char STR_VOICELANG[] PROGMEM = TR_VOICELANG;
#endif
#if defined(NAVIGATION_MENUS)
@@ -444,6 +448,8 @@ const pm_char STR_MODULE_BIND[] PROGMEM = "[Bind]";
const pm_char STR_MODULE_RANGE[] PROGMEM = "[Range]";
const pm_char STR_SET[] PROGMEM = "[Set]";
const pm_char STR_TRAINER[] PROGMEM = "Trainer";
const pm_char STR_ANTENNAPROBLEM[] PROGMEM = TR_ANTENNAPROBLEM;
const pm_char STR_MODELIDUSED[] PROGMEM = TR_MODELIDUSED;
#endif
const pm_uchar font_5x7[] PROGMEM = {
src/translations.h
+19 -5
View File
@@ -145,18 +145,25 @@ extern const pm_char STR_OPEN9X[];
#define OFS_DATETIME (OFS_VTMRMODES + sizeof(TR_VTMRMODES))
#if defined(PCBGRUVIN9X) || defined(CPUARM)
#define OFS_VLCD (OFS_DATETIME + sizeof(TR_DATETIME))
#define OFS_VUNITSSYSTEM (OFS_VLCD + sizeof(TR_VLCD))
#else
#define OFS_VLCD (OFS_DATETIME)
#define OFS_VUNITSSYSTEM (OFS_DATETIME)
#endif
#if defined(CPUARM)
#define OFS_COUNTRYCODES (OFS_VLCD + sizeof(TR_VLCD))
#define OFS_COUNTRYCODES (OFS_VUNITSSYSTEM + sizeof(TR_VUNITSSYSTEM))
#else
#define OFS_COUNTRYCODES (OFS_VLCD)
#define OFS_COUNTRYCODES (OFS_VUNITSSYSTEM)
#endif
#if defined(PXX)
#define OFS_SPARE (OFS_COUNTRYCODES + sizeof(TR_COUNTRYCODES))
#define OFS_VTRAINERMODES (OFS_COUNTRYCODES + sizeof(TR_COUNTRYCODES))
#else
#define OFS_SPARE (OFS_COUNTRYCODES)
#define OFS_VTRAINERMODES (OFS_COUNTRYCODES)
#endif
#if defined(PCBTARANIS)
#define OFS_SPARE (OFS_VTRAINERMODES + sizeof(TR_VTRAINERMODES))
#else
#define OFS_SPARE (OFS_VTRAINERMODES)
#endif
#define STR_OFFON (STR_OPEN9X + OFS_OFFON)
@@ -228,12 +235,17 @@ extern const pm_char STR_OPEN9X[];
#if defined(CPUARM)
#define STR_VLCD (STR_OPEN9X + OFS_VLCD)
#define STR_VUNITSSYSTEM (STR_OPEN9X + OFS_VUNITSSYSTEM)
#endif
#if defined(PXX)
#define STR_COUNTRYCODES (STR_OPEN9X + OFS_COUNTRYCODES)
#endif
#if defined(PCBTARANIS)
#define STR_VTRAINERMODES (STR_OPEN9X + OFS_VTRAINERMODES)
#endif
// The 0-terminated-strings
#define NO_INDENT(x) (x)+LEN_INDENT
@@ -451,7 +463,7 @@ extern const pm_char STR_CURRENT[];
extern const pm_char STR_CURRENT_CALIB[];
#define LEN_CALIB_FIELDS (PSIZE(TR_BATT_CALIB) > PSIZE(TR_CURRENT_CALIB) ? PSIZE(TR_BATT_CALIB) : PSIZE(TR_CURRENT_CALIB))
extern const pm_char STR_UNITSSYSTEM[];
extern const pm_char STR_VUNITSSYSTEM[];
extern const pm_char STR_VOICELANG[];
#else
#define LEN_CALIB_FIELDS PSIZE(TR_BATT_CALIB)
#endif
@@ -602,6 +614,8 @@ extern const pm_char STR_CHANNELS_MONITOR[];
extern const pm_char STR_MODULE_RANGE[];
extern const pm_char STR_SET[];
extern const pm_char STR_TRAINER[];
extern const pm_char STR_ANTENNAPROBLEM[];
extern const pm_char STR_MODELIDUSED[];
#endif
// TODO move to translations files
src/translations/cz.h
+38 -1
View File
@@ -20,6 +20,20 @@
*
*/
// NON ZERO TERMINATED STRINGS
#define LEN_OFFON "\003"
#define TR_OFFON "VYP""ZAP"
@@ -211,9 +225,18 @@
#define TR_FUNCSOUNDS "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""Siren ""AlmClk""Ratata""Tick "
#define LEN_VTELEMCHNS "\004"
#if defined(PCBTARANIS)
#define TR_RSSI_0 "SWR\0"
#define TR_RSSI_1 "RSSI"
#else
#define TR_RSSI_0 "Tx\0 "
#define TR_RSSI_1 "Rx\0 "
#endif
#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Acc\0""Time"
#if defined(CPUARM)
#define LEN_VUNITSSYSTEM TR("\006", "\010")
#define TR_VUNITSSYSTEM TR("MetricImper.", "Metric\0 Imperial")
#define LEN_VTELEMUNIT_NORM "\003"
#define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
#define LEN_VTELEMUNIT_IMP "\003"
@@ -318,6 +341,11 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "VYP""ABS""THs""TH%""THt"
#if defined (PCBTARANIS)
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "MasterSlave\0"
#endif
// ZERO TERMINATED STRINGS
#define INDENT "\001"
#define LEN_INDENT 1
@@ -484,9 +512,14 @@
#define TR_MENUFLIGHTPHASES "LETOV\220 RE\217IMY"
#define TR_MENUHELISETUP "HELI"
// Alignment
#define TR_MENUDREXPO "DR/EXPO"
#define TR_MENULIMITS "LIMITY"
#define TR_MENUCURVES "K\215IVKY"
#define TR_MENUCURVE "\002k"
#define TR_MENUCUSTOMSWITCH "VIRT. SP\214NA\201"
@@ -563,7 +596,7 @@
#define TR_SD_SPEED "Rychlost:"
#define TR_SD_SECTORS "Sektor\211 :"
#define TR_SD_SIZE "Velikost:"
#define TR_TYPE TR_SD_TYPE
#define TR_TYPE TR_SD_TYPE
#define TR_GLOBAL_VARS "Glob\200ln\204 prom\203nn\202"
#define TR_OWN " \043 "
#define TR_DATE "Datum"
@@ -574,3 +607,7 @@
#define TR_FAILSAFE "M\205d Failsafe"
#define TR_FAILSAFESET "NASTAVEN\214 FAILSAFE"
#define TR_COUNTRYCODE "K\205d regionu"
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED "Model ID already used"
#define TR_VOICELANG "Voice Language"
#define TR_UNITSSYSTEM "Units"
src/translations/de.h
+31 -2
View File
@@ -22,6 +22,18 @@
*
*/
// NON ZERO TERMINATED STRINGS
#define LEN_OFFON "\003"
#define TR_OFFON "AUS""EIN"
@@ -213,9 +225,18 @@
#define TR_FUNCSOUNDS "Piep1\0""Piep2\0""Piep3\0""Warn1\0""Warn2\0""Cheep\0""Ring\0 ""SciFi\0""Robot\0""Chirp\0""Tada\0 ""Crickt""Siren\0""AlmClk""Ratata""Tick\0 "
#define LEN_VTELEMCHNS "\004"
#if defined(PCBTARANIS)
#define TR_RSSI_0 "SWR\0"
#define TR_RSSI_1 "RSSI"
#else
#define TR_RSSI_0 "Tx\0 "
#define TR_RSSI_1 "Rx\0 "
#endif
#define TR_VTELEMCHNS "---\0""Batt""Uhr1""Uhr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""H\203he""Umdr""Stof""T1\0 ""T2\0 ""Gesc""Dist""GH\203h""Zell""Zels""Vfas""Strm""Verb""Leis""BesX""BesY""BesZ""Rich""VGes""A1-\0""A2-\0""H\203h-""H\203h+""Umd+""T1+\0""T2+\0""Ges+""Dst+""Str+""Besc""Zeit"
#if defined(CPUARM)
#define LEN_VUNITSSYSTEM TR("\006", "\010")
#define TR_VUNITSSYSTEM TR("MetricImper.", "Metric\0 Imperial")
#define LEN_VTELEMUNIT_NORM "\003"
#define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
#define LEN_VTELEMUNIT_IMP "\003"
@@ -320,6 +341,11 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "AUS""ABS""GSs""GS%""GSt"
#if defined (PCBTARANIS)
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "MasterSlave\0"
#endif
// ZERO TERMINATED STRINGS
#define INDENT "\001"
#define LEN_INDENT 1
@@ -570,7 +596,7 @@
#define TR_SD_SPEED "Geschw:"
#define TR_SD_SECTORS "Sektoren:"
#define TR_SD_SIZE "Gr\203\206e:"
#define TR_TYPE "Typ"
#define TR_TYPE "Typ"
#define TR_GLOBAL_VARS "Globale Variablen"
#define TR_OWN "Eigen"
#define TR_DATE "Datum:"
@@ -581,4 +607,7 @@
#define TR_FAILSAFE "Failsafe Mode"
#define TR_FAILSAFESET "Failsafe Einst."
#define TR_COUNTRYCODE "L\201nder Code"
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED "Model ID already used"
#define TR_VOICELANG "Voice Language"
#define TR_UNITSSYSTEM "Units"
src/translations/en.h
+11
View File
@@ -235,6 +235,8 @@
#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Acc\0""Time"
#if defined(CPUARM)
#define LEN_VUNITSSYSTEM TR("\006", "\010")
#define TR_VUNITSSYSTEM TR("MetricImper.", "Metric\0 Imperial")
#define LEN_VTELEMUNIT_NORM "\003"
#define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
#define LEN_VTELEMUNIT_IMP "\003"
@@ -339,6 +341,11 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "OFF""ABS""THs""TH%""THt"
#if defined (PCBTARANIS)
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "MasterSlave\0"
#endif
// ZERO TERMINATED STRINGS
#define INDENT "\001"
#define LEN_INDENT 1
@@ -600,3 +607,7 @@
#define TR_FAILSAFE INDENT "Failsafe mode"
#define TR_FAILSAFESET "FAILSAFE SETTINGS"
#define TR_COUNTRYCODE "Country Code"
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED "Model ID already used"
#define TR_VOICELANG "Voice Language"
#define TR_UNITSSYSTEM "Units"
src/translations/es.h
+21 -3
View File
@@ -225,9 +225,18 @@
#define TR_FUNCSOUNDS "Beep1 ""Beep2 ""Beep3 ""Aviso1""Aviso2""Cheep ""Ring ""SciFi ""Robot ""Gorjeo""Tada ""Crickt""Sirena""Alarma""Ratata""Tictac"
#define LEN_VTELEMCHNS "\004"
#if defined(PCBTARANIS)
#define TR_RSSI_0 "SWR\0"
#define TR_RSSI_1 "RSSI"
#else
#define TR_RSSI_0 "Tx\0 "
#define TR_RSSI_1 "Rx\0 "
#endif
#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cur+""Acc\0""Hora"
#if defined(CPUARM)
#define LEN_VUNITSSYSTEM TR("\006", "\010")
#define TR_VUNITSSYSTEM TR("MetricImper.", "Metric\0 Imperial")
#define LEN_VTELEMUNIT_NORM "\003"
#define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
#define LEN_VTELEMUNIT_IMP "\003"
@@ -332,6 +341,11 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "OFF""ABS""THs""TH%""THt"
#if defined (PCBTARANIS)
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "MasterSlave\0"
#endif
// ZERO TERMINATED STRINGS
#define INDENT "\001"
#define LEN_INDENT 1
@@ -359,7 +373,7 @@
#define TR_EXPONAME "Nom. Expo"
#define TR_BITMAP "Imagen Modelo"
#define TR_TIMER TR("Reloj","Reloj ")
#define TR_ELIMITS TR("E.Limite,"Ampliar Limites")
#define TR_ELIMITS TR("E.Limite","Ampliar Limites")
#define TR_ETRIMS TR("E.Trims","Ampliar Trims")
#define TR_TRIMINC "Paso Trim"
#define TR_TTRACE TR("T-Fuente","Fuente Acelerad")
@@ -558,7 +572,7 @@
#define TR_V1 "V1"
#define TR_V2 "V2"
#define TR_DURATION "Duracion"
#define TR_DELAY "Atraso
#define TR_DELAY "Atraso"
#define TR_SD_CARD "SD CARD"
#define TR_SDHC_CARD "SD-HC CARD"
#define TR_NO_SOUNDS_ON_SD "Sin sonidos en SD"
@@ -582,7 +596,7 @@
#define TR_SD_SPEED "Velocidad:"
#define TR_SD_SECTORS "Sectores:"
#define TR_SD_SIZE "Talla:"
#define TR_TYPE "Tipo"
#define TR_TYPE "Tipo"
#define TR_GLOBAL_VARS "Global Variables"
#define TR_OWN "Propio"
#define TR_DATE "Fecha"
@@ -593,3 +607,7 @@
#define TR_FAILSAFE INDENT"Modo sgdad."
#define TR_FAILSAFESET "AJUSTES SGDAD."
#define TR_COUNTRYCODE "Codigo Pais"
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED "Model ID already used"
#define TR_VOICELANG "Voice Language"
#define TR_UNITSSYSTEM "Units"
src/translations/fr.h
+20 -8
View File
@@ -225,9 +225,18 @@
#define TR_FUNCSOUNDS "Beep1\0""Beep2\0""Beep3\0""Warn1\0""Warn2\0""Cheep\0""Ring\0 ""SciFi\0""Robot\0""Chirp\0""Tada\0 ""Crickt""Siren\0""AlmClk""Ratata""Tick\0 "
#define LEN_VTELEMCHNS "\004"
#if defined(PCBTARANIS)
#define TR_RSSI_0 "SWR\0"
#define TR_RSSI_1 "RSSI"
#else
#define TR_RSSI_0 "Tx\0 "
#define TR_RSSI_1 "Rx\0 "
#endif
#define TR_VTELEMCHNS "---\0""Batt""Chr1""Chr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vit\0""Dist""AltG""Elem""Velm""Vfas""Cour""Cnsm""Puis""AccX""AccY""AccZ""Cap\0""VitV""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vit+""Dst+""Cur+""Acc\0""Time"
#if defined(CPUARM)
#define LEN_VUNITSSYSTEM TR("\006", "\012")
#define TR_VUNITSSYSTEM TR("M\200tr.\0Imp\200r.", "M\200triques\0Imp\200riales")
#define LEN_VTELEMUNIT_NORM "\003"
#define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
#define LEN_VTELEMUNIT_IMP "\003"
@@ -332,6 +341,11 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "OFF""ABS""GZs""GZ%""GZt"
#if defined (PCBTARANIS)
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "MaitreEl\201ve\0"
#endif
// ZERO TERMINATED STRINGS
#define INDENT "\001"
#define LEN_INDENT 1
@@ -445,13 +459,7 @@
#define TR_CAL "Cal"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#if defined(PCBTARANIS)
#define TR_MENUTOSTART CENTER"\005[ENTER] POUR DEBUT"
#else
#define TR_MENUTOSTART CENTER"\006[MENU] POUR DEBUT"
#endif
#define TR_MENUTOSTART CENTER"\006" TR_ENTER " POUR DEBUT"
#define TR_SETMIDPOINT CENTER"\010REGLER NEUTRES"
#define TR_MOVESTICKSPOTS CENTER"\004BOUGER STICKS/POTS"
#define TR_RXBATT "Batt.RX"
@@ -588,7 +596,7 @@
#define TR_SD_SPEED "Vitesse:"
#define TR_SD_SECTORS "Secteurs:"
#define TR_SD_SIZE "Taille:"
#define TR_TYPE "Type"
#define TR_TYPE "Type"
#define TR_GLOBAL_VARS "Variables Globales"
#define TR_OWN "Pers"
#define TR_DATE "Date"
@@ -599,3 +607,7 @@
#define TR_FAILSAFE "Type failsafe"
#define TR_FAILSAFESET "REGLAGES FAILSAFE"
#define TR_COUNTRYCODE "Zone g\200o."
#define TR_ANTENNAPROBLEM CENTER "Antenne radio d\200fectueuse!"
#define TR_MODELIDUSED "No de modèle d\200j\202 utilis\200"
#define TR_VOICELANG "Langue de la voix"
#define TR_UNITSSYSTEM "Unit\200s"
src/translations/it.h
+35 -8
View File
@@ -19,6 +19,21 @@
* GNU General Public License for more details.
*
*/
// NON ZERO TERMINATED STRINGS
#define LEN_OFFON "\003"
#define TR_OFFON "OFF""ON\0"
@@ -210,9 +225,18 @@
#define TR_FUNCSOUNDS "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""Siren ""AlmClk""Ratata""Tick "
#define LEN_VTELEMCHNS "\004"
#if defined(PCBTARANIS)
#define TR_RSSI_0 "SWR\0"
#define TR_RSSI_1 "RSSI"
#else
#define TR_RSSI_0 "Tx\0 "
#define TR_RSSI_1 "Rx\0 "
#endif
#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vel\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsm""Powr""AccX""AccY""AccZ""Dir\0""VelV""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cur+""Acc\0""Time"
#if defined(CPUARM)
#define LEN_VUNITSSYSTEM TR("\006", "\010")
#define TR_VUNITSSYSTEM TR("MetricImper.", "Metric\0 Imperial")
#define LEN_VTELEMUNIT_NORM "\003"
#define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
#define LEN_VTELEMUNIT_IMP "\003"
@@ -317,6 +341,11 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "OFF""ABS""THs""TH%""THt"
#if defined (PCBTARANIS)
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "MasterSlave\0"
#endif
// ZERO TERMINATED STRINGS
#define INDENT "\001"
#define LEN_INDENT 1
@@ -430,13 +459,7 @@
#define TR_CAL "Cal"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#if defined(PCBTARANIS)
#define TR_MENUTOSTART CENTER"\006[ENTER] per Cal."
#else
#define TR_MENUTOSTART CENTER"\006[Men\200] per Cal."
#endif
#define TR_MENUTOSTART CENTER"\006" TR_ENTER " per Cal."
#define TR_SETMIDPOINT CENTER"\011SETTA CENTRO"
#define TR_MOVESTICKSPOTS CENTER"\006MUOVI STICK/POT"
#define TR_RXBATT "Rx Batt:"
@@ -573,7 +596,7 @@
#define TR_SD_SPEED "Veloc.:"
#define TR_SD_SECTORS "Settori:"
#define TR_SD_SIZE "Dimens:"
#define TR_TYPE "Tipo"
#define TR_TYPE "Tipo"
#define TR_GLOBAL_VARS "Variabili Globali"
#define TR_OWN "Own"
#define TR_DATE "Date"
@@ -584,3 +607,7 @@
#define TR_FAILSAFE "Failsafe mode"
#define TR_FAILSAFESET "FAILSAFE SETTINGS"
#define TR_COUNTRYCODE "Country Code"
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED "Model ID already used"
#define TR_VOICELANG "Voice Language"
#define TR_UNITSSYSTEM "Units"
src/translations/pt.h
+56 -8
View File
@@ -1,3 +1,39 @@
/*
Padding for row alignment
*/
// NON ZERO TERMINATED STRINGS
#define LEN_OFFON "\003"
#define TR_OFFON "OFF""ON\0"
@@ -189,9 +225,18 @@
#define TR_FUNCSOUNDS "Beep1 ""Beep2 ""Beep3 ""Avis1 ""Avis2 ""Pio ""Ring ""SciFi ""Robot ""Gorjeo""Tada ""Crickt""Sirene""Alarme""Ratata""Tictac"
#define LEN_VTELEMCHNS "\004"
#if defined(PCBTARANIS)
#define TR_RSSI_0 "SWR\0"
#define TR_RSSI_1 "RSSI"
#else
#define TR_RSSI_0 "Tx\0 "
#define TR_RSSI_1 "Rx\0 "
#endif
#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VVel""A1-\0""A2-\0""Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+""Cur+""Acc\0""Hora"
#if defined(CPUARM)
#define LEN_VUNITSSYSTEM TR("\006", "\010")
#define TR_VUNITSSYSTEM TR("MetricImper.", "Metric\0 Imperial")
#define LEN_VTELEMUNIT_NORM "\003"
#define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
#define LEN_VTELEMUNIT_IMP "\003"
@@ -296,6 +341,11 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "OFF""ABS""MTs""MT%""MTt"
#if defined (PCBTARANIS)
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "MasterSlave\0"
#endif
// ZERO TERMINATED STRINGS
#define INDENT "\001"
#define LEN_INDENT 1
@@ -409,13 +459,7 @@
#define TR_CAL "Cal"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#if defined(PCBTARANIS)
#define TR_MENUTOSTART CENTER"\006[ENTER] INICIAR"
#else
#define TR_MENUTOSTART CENTER"\006[MENU] INICIAR"
#endif
#define TR_MENUTOSTART CENTER"\006" TR_ENTER " INICIAR"
#define TR_SETMIDPOINT CENTER"\005CENTRAR STICK/POT"
#define TR_MOVESTICKSPOTS CENTER"\005MOVER STICKS/POTs"
#define TR_RXBATT "Rx Batt:"
@@ -552,7 +596,7 @@
#define TR_SD_SPEED "Velocidade"
#define TR_SD_SECTORS "Sectores"
#define TR_SD_SIZE "Tamanho"
#define TR_TYPE "Type"
#define TR_TYPE "Tipe"
#define TR_GLOBAL_VARS "Variaveis"
#define TR_OWN "Propr."
#define TR_DATE "Data"
@@ -563,3 +607,7 @@
#define TR_FAILSAFE "Failsafe mode"
#define TR_FAILSAFESET "FAILSAFE SETTINGS"
#define TR_COUNTRYCODE "Country Code"
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED "Model ID already used"
#define TR_VOICELANG "Voice Language"
#define TR_UNITSSYSTEM "Units"
src/translations/se.h
+19 -1
View File
@@ -225,9 +225,18 @@
#define TR_FUNCSOUNDS "Pip1 ""Pip2 ""Pip3 ""Varn1 ""Varn2 ""F\200r ""Ring ""SciFi ""Robot ""F\200gel ""Tada ""Syrsa ""Siren ""Alarm ""Ratata""Tick "
#define LEN_VTELEMCHNS "\004"
#if defined(PCBTARANIS)
#define TR_RSSI_0 "SWR\0"
#define TR_RSSI_1 "RSSI"
#else
#define TR_RSSI_0 "Tx\0 "
#define TR_RSSI_1 "Rx\0 "
#endif
#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2""Tx\0 ""Rx\0 ""A1\0 ""A2\0 ""H\202jd""Varv""Tank""T1\0 ""T2\0 ""Fart""Avst""GHjd""Batt""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VFrt""A1-\0""A2-\0""Hjd-""Hjd+""Rpm+""T1+\0""T2+\0""Frt+""Avs+""Cur+""Acc\0""Tid\0"
#if defined(CPUARM)
#define LEN_VUNITSSYSTEM TR("\006", "\010")
#define TR_VUNITSSYSTEM TR("MetricImper.", "Metric\0 Imperial")
#define LEN_VTELEMUNIT_NORM "\003"
#define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 "
#define LEN_VTELEMUNIT_IMP "\003"
@@ -332,6 +341,11 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "AV ""ABS""GAs""GA%""GAt"
#if defined (PCBTARANIS)
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "MasterSlave\0"
#endif
// ZERO TERMINATED STRINGS
#define INDENT "\001"
#define LEN_INDENT 1
@@ -582,7 +596,7 @@
#define TR_SD_SPEED "Hastighet:"
#define TR_SD_SECTORS "Sektorer:"
#define TR_SD_SIZE "Strl:"
#define TR_TYPE "Typ "
#define TR_TYPE "Typ "
#define TR_GLOBAL_VARS "Globala Variabler"
#define TR_OWN "Egen"
#define TR_DATE "Datum"
@@ -593,3 +607,7 @@
#define TR_FAILSAFE "Failsafe-l\201ge"
#define TR_FAILSAFESET "FailsafeInst\201llning"
#define TR_COUNTRYCODE "Landskod"
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED "Model ID already used"
#define TR_VOICELANG "Voice Language"
#define TR_UNITSSYSTEM "Units"
src/translations/tts_cz.cpp
+1 -1
View File
@@ -234,6 +234,6 @@ I18N_PLAY_FUNCTION(cz, playDuration, int16_t seconds)
}
}
LANGUAGE_PACK_DECLARE(cz, "czech");
LANGUAGE_PACK_DECLARE(cz, "Czech");
#endif
src/translations/tts_de.cpp
+1 -1
View File
@@ -193,6 +193,6 @@ I18N_PLAY_FUNCTION(de, playDuration, int16_t seconds)
}
}
LANGUAGE_PACK_DECLARE(de, "german");
LANGUAGE_PACK_DECLARE(de, "German");
#endif
src/translations/tts_en.cpp
+1 -1
View File
@@ -168,6 +168,6 @@ I18N_PLAY_FUNCTION(en, playDuration, int16_t seconds)
}
}
LANGUAGE_PACK_DECLARE_DEFAULT(en, "english");
LANGUAGE_PACK_DECLARE_DEFAULT(en, "English");
#endif
src/translations/tts_es.cpp
+1 -1
View File
@@ -224,6 +224,6 @@ I18N_PLAY_FUNCTION(es, playDuration, int16_t seconds)
}
}
LANGUAGE_PACK_DECLARE(es, "spanish");
LANGUAGE_PACK_DECLARE(es, "Spanish");
#endif
src/translations/tts_fr.cpp
+1 -1
View File
@@ -194,6 +194,6 @@ I18N_PLAY_FUNCTION(fr, playDuration, int16_t seconds)
}
}
LANGUAGE_PACK_DECLARE(fr, "french");
LANGUAGE_PACK_DECLARE(fr, "French");
#endif
src/translations/tts_it.cpp
+1 -1
View File
@@ -198,6 +198,6 @@ I18N_PLAY_FUNCTION(it, playDuration, int16_t seconds)
}
}
LANGUAGE_PACK_DECLARE(it, "italian");
LANGUAGE_PACK_DECLARE(it, "Italian");
#endif
src/translations/tts_pt.cpp
+1 -1
View File
@@ -212,6 +212,6 @@ I18N_PLAY_FUNCTION(pt, playDuration, int16_t seconds)
}
}
LANGUAGE_PACK_DECLARE(pt, "portuguese");
LANGUAGE_PACK_DECLARE(pt, "Portuguese");
#endif
src/translations/tts_sk.cpp
+1 -1
View File
@@ -250,6 +250,6 @@ I18N_PLAY_FUNCTION(sk, playDuration, int16_t seconds)
}
}
LANGUAGE_PACK_DECLARE(sk, "slovak");
LANGUAGE_PACK_DECLARE(sk, "Slovak");
#endif