From d9c7cfae6f9029e6771ff6b65ae3057c800ab1b0 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Wed, 14 Sep 2022 12:28:48 +1000 Subject: [PATCH] =?UTF-8?q?fix:=20Show=20degree=20symbol=20`=C2=B0`=20inst?= =?UTF-8?q?ead=20of=20`@`=20(#2199)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Use degree symbol instead of `@` For temperature and degree units, @C, @F and @ were being shown, rather than °C, °F and °. Also hoping this will also resolve the GPS sensor showing @ instead of ° as mentioned in #2163 * fix: B&W need prior `@` for degrees * fix: `dBm` missing from some translations --- radio/src/translations/cn.h | 4 ++++ radio/src/translations/cz.h | 6 +++++- radio/src/translations/da.h | 4 ++++ radio/src/translations/de.h | 6 +++++- radio/src/translations/en.h | 5 ++++- radio/src/translations/es.h | 7 +++++-- radio/src/translations/fi.h | 7 +++++-- radio/src/translations/fr.h | 7 +++++-- radio/src/translations/it.h | 7 +++++-- radio/src/translations/nl.h | 7 +++++-- radio/src/translations/pl.h | 7 +++++-- radio/src/translations/pt.h | 6 +++++- radio/src/translations/se.h | 4 ++-- radio/src/translations/tw.h | 5 ++++- 14 files changed, 63 insertions(+), 19 deletions(-) diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index 3aac02630..53a0c9876 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -183,7 +183,11 @@ #define SPEED_UNIT_METR "kmh" #define TR_VUNITSSYSTEM "公制",TR("英制","英制") +#if defined(COLORLCD) +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#else #define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#endif #define STR_V (STR_VTELEMUNIT[1]) #define STR_A (STR_VTELEMUNIT[2]) diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index e2304247a..97969fe5e 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -202,7 +202,11 @@ #define SPEED_UNIT_METR "kmh" #define TR_VUNITSSYSTEM TR("Metr.","Metrické"),TR("Imper.","Imperial") -#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km" +#if defined(COLORLCD) +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#else +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#endif #define STR_V (STR_VTELEMUNIT[1]) #define STR_A (STR_VTELEMUNIT[2]) diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index 9460bd158..9883ff830 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -183,7 +183,11 @@ #define SPEED_UNIT_METR "kmh" #define TR_VUNITSSYSTEM "Metrisk",TR("Imper.","Imperiel") +#if defined(COLORLCD) +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#else #define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#endif #define STR_V (STR_VTELEMUNIT[1]) #define STR_A (STR_VTELEMUNIT[2]) diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index 03a3b91a8..f443d32fb 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -186,7 +186,11 @@ #define LENGTH_UNIT_METR "m" #define SPEED_UNIT_METR "kmh" #define TR_VUNITSSYSTEM TR("Metrik","Metrisch"),TR("Imper.","Imperial") -#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km" +#if defined(COLORLCD) +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#else +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#endif #define STR_V (STR_VTELEMUNIT[1]) #define STR_A (STR_VTELEMUNIT[2]) diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index b0b54e8e0..752a54416 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -183,8 +183,11 @@ #define SPEED_UNIT_METR "kmh" #define TR_VUNITSSYSTEM "Metric",TR("Imper.","Imperial") +#if defined(COLORLCD) +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#else #define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" - +#endif #define STR_V (STR_VTELEMUNIT[1]) #define STR_A (STR_VTELEMUNIT[2]) diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index b39f668cc..b25303c65 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -184,8 +184,11 @@ #define SPEED_UNIT_METR "kmh" #define TR_VUNITSSYSTEM "Métrico","Imperial" -#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km" - +#if defined(COLORLCD) +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#else +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#endif #define STR_V (STR_VTELEMUNIT[1]) #define STR_A (STR_VTELEMUNIT[2]) diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index 2f07d6882..b560924fe 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -204,8 +204,11 @@ #define SPEED_UNIT_METR "kmh" #define TR_VUNITSSYSTEM "Metric",TR("Imper.","Imperial") -#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km" - +#if defined(COLORLCD) +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#else +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#endif #define STR_V (STR_VTELEMUNIT[1]) #define STR_A (STR_VTELEMUNIT[2]) diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index 1074b40eb..8e0d6dccc 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -205,8 +205,11 @@ #define SPEED_UNIT_METR "kmh" #define TR_VUNITSSYSTEM TR("Métr.","Métriques"),TR("Impér.","Impériales") -#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km" - +#if defined(COLORLCD) +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#else +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#endif #define STR_V (STR_VTELEMUNIT[1]) #define STR_A (STR_VTELEMUNIT[2]) diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index f31ba67b7..b09e6d72b 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -187,8 +187,11 @@ #define SPEED_UNIT_METR "kmh" #define TR_VUNITSSYSTEM TR("Metric","Metriche"),TR("Imper.","Imperiali") -#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km" - +#if defined(COLORLCD) +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#else +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#endif #define STR_V (STR_VTELEMUNIT[1]) #define STR_A (STR_VTELEMUNIT[2]) diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 30dada2c7..07af4982a 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -186,8 +186,11 @@ #define SPEED_UNIT_METR "kmh" #define TR_VUNITSSYSTEM TR("Mtrsch","Metrisch"),"Engels" -#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km" - +#if defined(COLORLCD) +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#else +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#endif #define STR_V (STR_VTELEMUNIT[1]) #define STR_A (STR_VTELEMUNIT[2]) diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 7d2384bb2..05d21a61a 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -183,8 +183,11 @@ #define SPEED_UNIT_METR "kmh" #define TR_VUNITSSYSTEM TR("Metr.","Metryczn"),TR("Imper.","Imperial") -#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km" - +#if defined(COLORLCD) +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#else +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#endif #define STR_V (STR_VTELEMUNIT[1]) #define STR_A (STR_VTELEMUNIT[2]) diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index dfaa18ff8..a74cc50cd 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -181,7 +181,11 @@ #define SPEED_UNIT_METR "kmh" #define TR_VUNITSSYSTEM "Metric",TR("Imper.","Imperial") -#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km" +#if defined(COLORLCD) +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#else +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#endif #define STR_V (STR_VTELEMUNIT[1]) #define STR_A (STR_VTELEMUNIT[2]) diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 3dd3119c5..4329b05ce 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -204,9 +204,9 @@ #define TR_VUNITSSYSTEM TR("Metr.","Metriska"),TR("Brit.","Brittiska") #if defined(COLORLCD) -#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" #else -#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" #endif #define STR_V (STR_VTELEMUNIT[1]) #define STR_A (STR_VTELEMUNIT[2]) diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index 8bb4435fc..8d5e35c69 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -183,8 +183,11 @@ #define SPEED_UNIT_METR "kmh" #define TR_VUNITSSYSTEM "公制",TR("英制","英制") +#if defined(COLORLCD) +#define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","°C","°F","%","mAh","W","mW","dB","rpm","g","°","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" +#else #define TR_VTELEMUNIT "-","V","A","mA","kts","m/s","f/s","kmh","mph","m","ft","@C","@F","%","mAh","W","mW","dB","rpm","g","@","rad","ml","fOz","mlm","Hz","mS","uS","km","dBm" - +#endif #define STR_V (STR_VTELEMUNIT[1]) #define STR_A (STR_VTELEMUNIT[2])