From bbd79f57eef3884d7e714d0ee2fd2d3f7dc90092 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Fri, 27 May 2016 11:35:20 +0200 Subject: [PATCH] Translation fixes, remove warnings --- radio/src/translations.h | 6 ------ radio/src/translations/cz.h.txt | 8 ++++++-- radio/src/translations/de.h.txt | 8 ++++++-- radio/src/translations/es.h.txt | 8 ++++++-- radio/src/translations/fi.h.txt | 8 ++++++-- radio/src/translations/fr.h.txt | 8 ++++++-- radio/src/translations/it.h.txt | 8 ++++++-- radio/src/translations/nl.h.txt | 8 ++++++-- radio/src/translations/pl.h.txt | 8 ++++++-- radio/src/translations/pt.h.txt | 8 ++++++-- radio/src/translations/se.h.txt | 8 ++++++-- 11 files changed, 60 insertions(+), 26 deletions(-) diff --git a/radio/src/translations.h b/radio/src/translations.h index 345080f41..b19ff65d2 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -71,12 +71,6 @@ #define BUTTON(x) "[" x "]" #endif -#define TR_VTRAINER_MASTER_JACK "Master/Jack\0 " -#define TR_VTRAINER_SLAVE_JACK "Slave/Jack\0 " -#define TR_VTRAINER_MASTER_SBUS_MODULE "Master/SBUS Module" -#define TR_VTRAINER_MASTER_CPPM_MODULE "Master/CPPM Module" -#define TR_VTRAINER_MASTER_BATTERY "Master/Battery\0" - #if defined(PCBTARANIS) #define TR_VTRAINERMODES TR_VTRAINER_MASTER_JACK TR_VTRAINER_SLAVE_JACK TR_VTRAINER_MASTER_SBUS_MODULE TR_VTRAINER_MASTER_CPPM_MODULE TR_VTRAINER_MASTER_BATTERY #elif defined(CPUARM) diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index ee11355df..26d74d37c 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -573,8 +573,12 @@ #define LEN_VTMRMODES "\004" #define TR_VTMRMODES "VYP\0""ZAP\0""Pln>""Pln%""Pln*" -#define LEN_VTRAINERMODES "\022" -#define TR_VTRAINERMODES "Učitel/Jack\0 ""Žák/Jack\0 ""Učitel/SBUS Modul\0""Učitel/CPPM Modul\0""Učitel/Bat. slot\0" +#define LEN_VTRAINERMODES "\022" +#define TR_VTRAINER_MASTER_JACK "Učitel/Jack\0 " +#define TR_VTRAINER_SLAVE_JACK "Žák/Jack\0 " +#define TR_VTRAINER_MASTER_SBUS_MODULE "Učitel/SBUS Modul\0" +#define TR_VTRAINER_MASTER_CPPM_MODULE "Učitel/CPPM Modul\0" +#define TR_VTRAINER_MASTER_BATTERY "Učitel/Bat. slot\0" #define LEN_VFAILSAFE "\012" #define TR_VFAILSAFE "Nenastaven""Držet\0 ""Vlastní\0 ""Bez pulzů\0""Přijímač\0" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index cfb21b526..23dd6687c 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -577,8 +577,12 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "AUS""EIN""GSs""GS%""GSt" -#define LEN_VTRAINERMODES "\022" -#define TR_VTRAINERMODES "Lehrer/Buchse\0 ""Schüler/Buchse\0 ""Lehrer/SBUS Modul\0""Lehrer/CPPM Modul\0""Lehrer/Batterie\0" +#define LEN_VTRAINERMODES "\022" +#define TR_VTRAINER_MASTER_JACK "Lehrer/Buchse\0 " +#define TR_VTRAINER_SLAVE_JACK "Schüler/Buchse\0 " +#define TR_VTRAINER_MASTER_SBUS_MODULE "Lehrer/SBUS Modul\0" +#define TR_VTRAINER_MASTER_CPPM_MODULE "Lehrer/CPPM Modul\0" +#define TR_VTRAINER_MASTER_BATTERY "Lehrer/Batterie\0" #define LEN_VFAILSAFE "\015" // "\013" original #define TR_VFAILSAFE "Kein Failsafe""Halte Pos.\0 ""Kanäle\0 ""Kein Signal\0 ""Empfänger\0 " diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 29965036c..956046ec2 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -558,8 +558,12 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ABS""THs""TH%""THt" -#define LEN_VTRAINERMODES "\022" -#define TR_VTRAINERMODES "Master/Jack\0 ""Esclav/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0" +#define LEN_VTRAINERMODES "\022" +#define TR_VTRAINER_MASTER_JACK "Master/Jack\0 " +#define TR_VTRAINER_SLAVE_JACK "Esclav/Jack\0 " +#define TR_VTRAINER_MASTER_SBUS_MODULE "Master/SBUS Module" +#define TR_VTRAINER_MASTER_CPPM_MODULE "Master/CPPM Module" +#define TR_VTRAINER_MASTER_BATTERY "Master/Battery\0" #define LEN_VFAILSAFE "\011" #define TR_VFAILSAFE "Not set\0 ""Guardar\0 ""Adaptar\0 ""Sin pulso""Receiver\0" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 53e453cde..264912a89 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -558,8 +558,12 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ABS""THs""TH%""THt" -#define LEN_VTRAINERMODES "\022" -#define TR_VTRAINERMODES "Master/Jack\0 ""Slave/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0" +#define LEN_VTRAINERMODES "\022" +#define TR_VTRAINER_MASTER_JACK "Master/Jack\0 " +#define TR_VTRAINER_SLAVE_JACK "Slave/Jack\0 " +#define TR_VTRAINER_MASTER_SBUS_MODULE "Master/SBUS Module" +#define TR_VTRAINER_MASTER_CPPM_MODULE "Master/CPPM Module" +#define TR_VTRAINER_MASTER_BATTERY "Master/Battery\0" #define LEN_VFAILSAFE "\011" #define TR_VFAILSAFE "Not set\0 ""Hold\0 ""Custom\0 ""No pulses""Receiver\0" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 76bb92eee..d38d1e048 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -572,8 +572,12 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ON\0""GZs""GZ%""GZt" -#define LEN_VTRAINERMODES "\022" -#define TR_VTRAINERMODES "Maître/Jack\0 ""Elève/Jack\0 ""Maître/SBUS Module""Maître/CPPM Module""Maître/Batterie\0" +#define LEN_VTRAINERMODES "\022" +#define TR_VTRAINER_MASTER_JACK "Maître/Jack\0 " +#define TR_VTRAINER_SLAVE_JACK "Elève/Jack\0 " +#define TR_VTRAINER_MASTER_SBUS_MODULE "Maître/SBUS Module" +#define TR_VTRAINER_MASTER_CPPM_MODULE "Maître/CPPM Module" +#define TR_VTRAINER_MASTER_BATTERY "Maître/Batterie\0" #define LEN_VFAILSAFE "\011" #define TR_VFAILSAFE TR("Pas déf.\0""Maintien\0""Prédéf.\0 ""Pas d'imp""Récepteur", "Pas déf.\0""Maintien\0""Prédéfini""Pas d'imp""Récepteur") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index d062a85c3..a0d9f9d34 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -572,8 +572,12 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ABS""MOs""MO%""MOt" -#define LEN_VTRAINERMODES "\022" -#define TR_VTRAINERMODES "Maestro/Jack\0 ""Allievo/Jack\0 ""Master/Modulo SBUS""Master/Modulo CPPM""Master/Batteria\0 " +#define LEN_VTRAINERMODES "\022" +#define TR_VTRAINER_MASTER_JACK "Maestro/Jack\0 " +#define TR_VTRAINER_SLAVE_JACK "Allievo/Jack\0 " +#define TR_VTRAINER_MASTER_SBUS_MODULE "Master/Modulo SBUS" +#define TR_VTRAINER_MASTER_CPPM_MODULE "Master/Modulo CPPM" +#define TR_VTRAINER_MASTER_BATTERY "Master/Batteria\0 " #define LEN_VFAILSAFE "\013" #define TR_VFAILSAFE "Non settato""Mantieni\0 ""Personali\0 ""No impulsi\0""Ricevente\0 " diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index b8492f15e..3a1ca56ba 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -577,8 +577,12 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "UIT""AAN""THs""TH%""THt" -#define LEN_VTRAINERMODES "\022" -#define TR_VTRAINERMODES "Master/Jack\0 ""Slave/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0" +#define LEN_VTRAINERMODES "\022" +#define TR_VTRAINER_MASTER_JACK "Master/Jack\0 " +#define TR_VTRAINER_SLAVE_JACK "Slave/Jack\0 " +#define TR_VTRAINER_MASTER_SBUS_MODULE "Master/SBUS Module" +#define TR_VTRAINER_MASTER_CPPM_MODULE "Master/CPPM Module" +#define TR_VTRAINER_MASTER_BATTERY "Master/Battery\0" #define LEN_VFAILSAFE TR("\013","\011") #define TR_VFAILSAFE TR("Niet Gezet\0""Vasthouden\0""Custom\0 ""Geen Pulsen""Ontvanger\0 ","Not Set\0 ""Hold\0 ""Custom\0 ""No Pulses""Receiver\0") diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index e3a3d4013..2f0e9e18d 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -574,8 +574,12 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "WYŁ""ABS""THs""TH%""THt" -#define LEN_VTRAINERMODES "\022" /*18 decimal*/ -#define TR_VTRAINERMODES "Trener/Jack\0 ""Uczeń/Jack\0 ""Trener/SBUS Moduł ""Trener/CPPM Moduł ""Trener/Bateria\0 " +#define LEN_VTRAINERMODES "\022" /*18 decimal*/ +#define TR_VTRAINER_MASTER_JACK "Trener/Jack\0 " +#define TR_VTRAINER_SLAVE_JACK "Uczeń/Jack\0 " +#define TR_VTRAINER_MASTER_SBUS_MODULE "Trener/SBUS Moduł " +#define TR_VTRAINER_MASTER_CPPM_MODULE "Trener/CPPM Moduł " +#define TR_VTRAINER_MASTER_BATTERY "Trener/Bateria\0 " #define LEN_VFAILSAFE "\011" /*9 decimal*/ #define TR_VFAILSAFE "Brak \0 ""Utrzymuj\0""Własne \0""0 sygnału""Odbiornik" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 0561b63ef..9e0cb0734 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -554,8 +554,12 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ABS""MTs""MT%""MTt" -#define LEN_VTRAINERMODES "\022" -#define TR_VTRAINERMODES "Master/Jack\0 ""Slave/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0" +#define LEN_VTRAINERMODES "\022" +#define TR_VTRAINER_MASTER_JACK "Master/Jack\0 " +#define TR_VTRAINER_SLAVE_JACK "Slave/Jack\0 " +#define TR_VTRAINER_MASTER_SBUS_MODULE "Master/SBUS Module" +#define TR_VTRAINER_MASTER_CPPM_MODULE "Master/CPPM Module" +#define TR_VTRAINER_MASTER_BATTERY "Master/Battery\0" #define LEN_VFAILSAFE "\011" #define TR_VFAILSAFE "Not set\0 ""Hold\0 ""Custom\0 ""No pulses""Receiver\0" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 0f44ceafb..523b07edb 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -583,8 +583,12 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "Av\0""På\0""GAs""GA%""GAt" -#define LEN_VTRAINERMODES "\022" -#define TR_VTRAINERMODES "Lärare/Uttag\0 ""Elev./Uttag\0 ""Lärare/SBUS-Modul\0""Lärare/CPPM-Modul\0""Lärare/Batteri\0" +#define LEN_VTRAINERMODES "\022" +#define TR_VTRAINER_MASTER_JACK "Lärare/Uttag\0 " +#define TR_VTRAINER_SLAVE_JACK "Elev./Uttag\0 " +#define TR_VTRAINER_MASTER_SBUS_MODULE "Lärare/SBUS-Modul\0" +#define TR_VTRAINER_MASTER_CPPM_MODULE "Lärare/CPPM-Modul\0" +#define TR_VTRAINER_MASTER_BATTERY "Lärare/Batteri\0" #define LEN_VFAILSAFE "\011" #define TR_VFAILSAFE "Ej givet""Lås Servo""Anpassat\0""Pulsfritt""Mottagare"