From ca4d00ca4b984c03ee204de16fdd67e51fd9eaea Mon Sep 17 00:00:00 2001 From: "bsongis@gmail.com" Date: Thu, 4 Apr 2013 21:08:27 +0000 Subject: [PATCH] Translations updated --- src/translations/cz.h | 21 ++++++++++++++------- src/translations/de.h | 21 ++++++++++++++------- src/translations/es.h | 21 ++++++++++++++------- src/translations/fr.h | 21 ++++++++++++++------- src/translations/it.h | 21 ++++++++++++++------- src/translations/pt.h | 21 ++++++++++++++------- src/translations/se.h | 21 ++++++++++++++------- 7 files changed, 98 insertions(+), 49 deletions(-) diff --git a/src/translations/cz.h b/src/translations/cz.h index ab1183192..f773f7352 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -213,16 +213,23 @@ #define LEN_VTELEMCHNS "\004" #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""Time" -#ifdef IMPERIAL_UNITS - #define LENGTH_UNIT "ft\0" - #define SPEED_UNIT "kts" +#if defined(CPUARM) + #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" + #define TR_VTELEMUNIT_IMP "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 " #else - #define LENGTH_UNIT "m\0 " - #define SPEED_UNIT "kmh" + #if defined(IMPERIAL_UNITS) + #define LENGTH_UNIT "ft\0" + #define SPEED_UNIT "kts" + #else + #define LENGTH_UNIT "m\0 " + #define SPEED_UNIT "kmh" + #endif + #define LEN_VTELEMUNIT "\003" + #define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " #endif -#define LEN_VTELEMUNIT "\003" -#define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) diff --git a/src/translations/de.h b/src/translations/de.h index 790bf33b2..4d75fead1 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -215,16 +215,23 @@ #define LEN_VTELEMCHNS "\004" #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" -#ifdef IMPERIAL_UNITS -#define LENGTH_UNIT "ft\0" -#define SPEED_UNIT "kts" +#if defined(CPUARM) + #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" + #define TR_VTELEMUNIT_IMP "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 " #else -#define LENGTH_UNIT "m\0 " -#define SPEED_UNIT "kmh" + #if defined(IMPERIAL_UNITS) + #define LENGTH_UNIT "ft\0" + #define SPEED_UNIT "kts" + #else + #define LENGTH_UNIT "m\0 " + #define SPEED_UNIT "kmh" + #endif + #define LEN_VTELEMUNIT "\003" + #define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " #endif -#define LEN_VTELEMUNIT "\003" -#define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) diff --git a/src/translations/es.h b/src/translations/es.h index 1b31464c7..57f67cce9 100644 --- a/src/translations/es.h +++ b/src/translations/es.h @@ -213,16 +213,23 @@ #define LEN_VTELEMCHNS "\004" #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" -#ifdef IMPERIAL_UNITS - #define LENGTH_UNIT "ft\0" - #define SPEED_UNIT "kts" +#if defined(CPUARM) + #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" + #define TR_VTELEMUNIT_IMP "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 " #else - #define LENGTH_UNIT "m\0 " - #define SPEED_UNIT "kmh" + #if defined(IMPERIAL_UNITS) + #define LENGTH_UNIT "ft\0" + #define SPEED_UNIT "kts" + #else + #define LENGTH_UNIT "m\0 " + #define SPEED_UNIT "kmh" + #endif + #define LEN_VTELEMUNIT "\003" + #define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " #endif -#define LEN_VTELEMUNIT "\003" -#define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) diff --git a/src/translations/fr.h b/src/translations/fr.h index 55bbaf809..6644fbb09 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -227,16 +227,23 @@ #define LEN_VTELEMCHNS "\004" #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" -#ifdef IMPERIAL_UNITS -#define LENGTH_UNIT "ft\0" -#define SPEED_UNIT "kts" +#if defined(CPUARM) + #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" + #define TR_VTELEMUNIT_IMP "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 " #else -#define LENGTH_UNIT "m\0 " -#define SPEED_UNIT "kmh" + #if defined(IMPERIAL_UNITS) + #define LENGTH_UNIT "ft\0" + #define SPEED_UNIT "kts" + #else + #define LENGTH_UNIT "m\0 " + #define SPEED_UNIT "kmh" + #endif + #define LEN_VTELEMUNIT "\003" + #define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " #endif -#define LEN_VTELEMUNIT "\003" -#define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) diff --git a/src/translations/it.h b/src/translations/it.h index 8a14636b3..c2148d2f4 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -212,16 +212,23 @@ #define LEN_VTELEMCHNS "\004" #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" -#ifdef IMPERIAL_UNITS -#define LENGTH_UNIT "ft\0" -#define SPEED_UNIT "kts" +#if defined(CPUARM) + #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" + #define TR_VTELEMUNIT_IMP "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 " #else -#define LENGTH_UNIT "m\0 " -#define SPEED_UNIT "kmh" + #if defined(IMPERIAL_UNITS) + #define LENGTH_UNIT "ft\0" + #define SPEED_UNIT "kts" + #else + #define LENGTH_UNIT "m\0 " + #define SPEED_UNIT "kmh" + #endif + #define LEN_VTELEMUNIT "\003" + #define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " #endif -#define LEN_VTELEMUNIT "\003" -#define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) diff --git a/src/translations/pt.h b/src/translations/pt.h index 9ba5fca96..8fb4fb999 100644 --- a/src/translations/pt.h +++ b/src/translations/pt.h @@ -191,16 +191,23 @@ #define LEN_VTELEMCHNS "\004" #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" -#ifdef IMPERIAL_UNITS -#define LENGTH_UNIT "ft\0" -#define SPEED_UNIT "kts" +#if defined(CPUARM) + #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" + #define TR_VTELEMUNIT_IMP "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 " #else -#define LENGTH_UNIT "m\0 " -#define SPEED_UNIT "kmh" + #if defined(IMPERIAL_UNITS) + #define LENGTH_UNIT "ft\0" + #define SPEED_UNIT "kts" + #else + #define LENGTH_UNIT "m\0 " + #define SPEED_UNIT "kmh" + #endif + #define LEN_VTELEMUNIT "\003" + #define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " #endif -#define LEN_VTELEMUNIT "\003" -#define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) diff --git a/src/translations/se.h b/src/translations/se.h index baf34b65a..5f123d356 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -227,16 +227,23 @@ #define LEN_VTELEMCHNS "\004" #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" -#ifdef IMPERIAL_UNITS - #define LENGTH_UNIT "fot" - #define SPEED_UNIT "knp" +#if defined(CPUARM) + #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" + #define TR_VTELEMUNIT_IMP "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 " #else - #define LENGTH_UNIT "m\0 " - #define SPEED_UNIT "kmh" + #if defined(IMPERIAL_UNITS) + #define LENGTH_UNIT "fot" + #define SPEED_UNIT "knp" + #else + #define LENGTH_UNIT "m\0 " + #define SPEED_UNIT "kmh" + #endif + #define LEN_VTELEMUNIT "\003" + #define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " #endif -#define LEN_VTELEMUNIT "\003" -#define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4)