From 6f1291ca212795c801c37f0464739e086a068684 Mon Sep 17 00:00:00 2001 From: "romolo.manfredini@gmail.com" Date: Sun, 19 May 2013 12:52:37 +0000 Subject: [PATCH] fix compilation problems for sky9x --- src/translations.cpp | 3 +++ src/translations.h | 3 +++ src/translations/cz.h | 4 ++++ src/translations/de.h | 4 ++++ src/translations/en.h | 4 ++++ src/translations/es.h | 4 ++++ src/translations/fr.h | 4 ++++ src/translations/it.h | 14 +++++++++----- src/translations/se.h | 4 ++++ 9 files changed, 39 insertions(+), 5 deletions(-) diff --git a/src/translations.cpp b/src/translations.cpp index 771ced18f..9f4f3a851 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -449,6 +449,9 @@ 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; +#endif + +#if defined(CPUARM) const pm_char STR_MODELIDUSED[] PROGMEM = TR_MODELIDUSED; #endif diff --git a/src/translations.h b/src/translations.h index 37a661195..4b7075414 100644 --- a/src/translations.h +++ b/src/translations.h @@ -615,6 +615,9 @@ extern const pm_char STR_CHANNELS_MONITOR[]; extern const pm_char STR_SET[]; extern const pm_char STR_TRAINER[]; extern const pm_char STR_ANTENNAPROBLEM[]; +#endif + +#if defined(CPUARM) extern const pm_char STR_MODELIDUSED[]; #endif diff --git a/src/translations/cz.h b/src/translations/cz.h index 8d1bbc668..032b37307 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -608,6 +608,10 @@ #define TR_FAILSAFESET "NASTAVEN\214 FAILSAFE" #define TR_COUNTRYCODE "K\205d regionu" #define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!" +#if defined (PCBTARANIS) #define TR_MODELIDUSED "Model ID already used" +#else +#define TR_MODELIDUSED "ID already used" +#endif #define TR_VOICELANG "Voice Language" #define TR_UNITSSYSTEM "Units" diff --git a/src/translations/de.h b/src/translations/de.h index 311c73961..4d811405d 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -608,6 +608,10 @@ #define TR_FAILSAFESET "Failsafe Einst." #define TR_COUNTRYCODE "L\201nder Code" #define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!" +#if defined (PCBTARANIS) #define TR_MODELIDUSED "Model ID already used" +#else +#define TR_MODELIDUSED "ID already used" +#endif #define TR_VOICELANG "Voice Language" #define TR_UNITSSYSTEM "Units" diff --git a/src/translations/en.h b/src/translations/en.h index 08c3c0db2..6d3e9052b 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -608,6 +608,10 @@ #define TR_FAILSAFESET "FAILSAFE SETTINGS" #define TR_COUNTRYCODE "Country Code" #define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!" +#if defined (PCBTARANIS) #define TR_MODELIDUSED "Model ID already used" +#else +#define TR_MODELIDUSED "ID already used" +#endif #define TR_VOICELANG "Voice Language" #define TR_UNITSSYSTEM "Units" diff --git a/src/translations/es.h b/src/translations/es.h index 7415d36f4..11f94308e 100644 --- a/src/translations/es.h +++ b/src/translations/es.h @@ -608,6 +608,10 @@ #define TR_FAILSAFESET "AJUSTES SGDAD." #define TR_COUNTRYCODE "Codigo Pais" #define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!" +#if defined (PCBTARANIS) #define TR_MODELIDUSED "Model ID already used" +#else +#define TR_MODELIDUSED "ID already used" +#endif #define TR_VOICELANG "Voice Language" #define TR_UNITSSYSTEM "Units" diff --git a/src/translations/fr.h b/src/translations/fr.h index 8ef257689..39332b7c0 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -608,6 +608,10 @@ #define TR_FAILSAFESET "REGLAGES FAILSAFE" #define TR_COUNTRYCODE "Zone g\200o." #define TR_ANTENNAPROBLEM CENTER "Antenne radio d\200fectueuse!" +#if defined (PCBTARANIS) #define TR_MODELIDUSED "No de modèle d\200j\202 utilis\200" +#else +#define TR_MODELIDUSED "No d\200j\202 utilis\200" +#endif #define TR_VOICELANG "Langue de la voix" #define TR_UNITSSYSTEM "Unit\200s" diff --git a/src/translations/it.h b/src/translations/it.h index 605383600..756e8a935 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -606,8 +606,12 @@ #define TR_EXTERNALRF "External RF" #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" +#define TR_COUNTRYCODE "Codice Paese" +#define TR_ANTENNAPROBLEM CENTER "Problemi antenna TX!" +#if defined (PCBTARANIS) +#define TR_MODELIDUSED "ID modello gia' usato" +#else +#define TR_MODELIDUSED "ID gia' usato" +#endif +#define TR_VOICELANG "Lingua della Voce" +#define TR_UNITSSYSTEM "Unita'" diff --git a/src/translations/se.h b/src/translations/se.h index dafeb85cd..3119004aa 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -608,6 +608,10 @@ #define TR_FAILSAFESET "FailsafeInst\201llning" #define TR_COUNTRYCODE "Landskod" #define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!" +#if defined (PCBTARANIS) #define TR_MODELIDUSED "Model ID already used" +#else +#define TR_MODELIDUSED "ID already used" +#endif #define TR_VOICELANG "Voice Language" #define TR_UNITSSYSTEM "Units"