From 796b322edf3f810ba61d105a79fd166f7b32737a Mon Sep 17 00:00:00 2001 From: hrenz Date: Fri, 4 Apr 2014 16:56:20 +0200 Subject: [PATCH 1/3] 0404 German Update de.h.txt Date 04.04. small changes Update German de.h.txt Testet with th9x and Taranis --- radio/src/translations/de.h.txt | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 80e28048c..d8a7fd314 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -1,4 +1,4 @@ -/* German checked 29.03.2014 Test 010 kleine Änderungen +/* German checked 04.04.2014 Test 012 kleine Änderungen * Authors (alphabetical order) * - Bertrand Songis * - Bernet Andre @@ -165,14 +165,14 @@ #if defined(PCBTARANIS) #define TR_CSWTIMER "Takt\0" // TIM = Takt = Taktgenerator #define TR_CSWSTICKY "SRFF\0" // Sticky = RS-Flip-Flop - #define TR_CSWRANGE "Range" // unklar + #define TR_CSWRANGE "PosS6" // Range= Pos Schalter P11..P16, P21..P26, P31..P36 #define TR_CSWSTAY "Puls\0" // Edge = einstellbarer Impuls #else - #define TR_CSWTIMER "Takt\0" // - #define TR_CSWSTICKY "SRFF\0" // + #define TR_CSWTIMER "Takt\0" // TIM = Takt = Taktgenerator + #define TR_CSWSTICKY "SRFF\0" // Sticky = RS-Flip-Flop #if defined(CPUARM) - #define TR_CSWRANGE "Rnge\0" // - #define TR_CSWSTAY "Puls\0" // + #define TR_CSWRANGE "PoS6\0" // Range= Pos Schalter P11..P16, P21..P26, P31..P36 + #define TR_CSWSTAY "Puls\0" // Edge = einstellbarer Impuls #else #define TR_CSWRANGE #define TR_CSWSTAY @@ -401,9 +401,9 @@ #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26""P31""P32""P33""P34""P35""P36" #define TR_VSWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301" TR_6POS_POTS TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW #elif defined(CPUARM) - #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_CUSTOMSW + #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW #else - #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_CUSTOMSW + #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW #endif #if defined(HELI) @@ -527,11 +527,11 @@ #define TR_ALARMS_LABEL "----Alarm wenn---" #define TR_BATTERY_RANGE TR("Akku Bereich","Akku Spg-Bereich") // Symbol Akku Ladezustand #define TR_BATTERYWARNING INDENT"Akku Spg kleiner" -#define TR_INACTIVITYALARM INDENT"Inaktivität " +#define TR_INACTIVITYALARM INDENT"Inaktivität nach" #define TR_MEMORYWARNING INDENT"Speicher voll" -#define TR_ALARMWARNING INDENT"Ton aus" +#define TR_ALARMWARNING INDENT"Töne ganz aus ?" #define TR_RENAVIG "Drehgeb. Navig." -#define TR_THROTTLE_LABEL "Gas" +#define TR_THROTTLE_LABEL "---Gas Kontrolle----" #define TR_THROTTLEREVERSE TR("Gas invers", INDENT "Vollgas hinten?") //Änderung wg TH9x, Taranis #define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Jede Minute") #define TR_BEEPCOUNTDOWN INDENT"Countdown" @@ -540,7 +540,7 @@ #define TR_BLDELAY INDENT"Dauer" #define TR_BLONBRIGHTNESS INDENT"An Helligkeit" #define TR_BLOFFBRIGHTNESS INDENT"Aus Helligkeit" -#define TR_SPLASHSCREEN "Startbild" +#define TR_SPLASHSCREEN "Startbild Ein für" #define TR_THROTTLEWARNING TR("Gas Alarm", INDENT "Gas Alarm") #define TR_SWITCHWARNING TR("Sch. Alarm", INDENT "Schalter Alarm") #define TR_POTWARNING TR("Pot Warn.", INDENT "Poti Warnung") @@ -753,10 +753,10 @@ #define TR_PRESET "Preset" #define TR_MIRROR "Mirror" #define TR_CLEAR "Clear" -#define TR_RESET "Reset" +#define TR_RESET "Reset Servowerte" #define TR_COUNT "Punkte" -#define TR_PT "pt" -#define TR_PTS "pts" +#define TR_PT "Pt" +#define TR_PTS "Pts" #define TR_SMOOTH "Runden" #define TR_COPY_TRIMS_TO_OFS "Kopie Trim to Servo-Subtrim" // "Trims => Offset" #define TR_PERSISTENT_MAH INDENT "Speichern mAh" @@ -797,7 +797,7 @@ // Taranis Info Zeile Anzeigen #define TR_PHASES_HEADERS { " Name ", " Schalter ", " Seite Trim ", " Höhe Trim ", " Gas Trim ", " Quer Trim ", " Fade In ", " Fade Out " } #define TR_LIMITS_HEADERS { " Name ", " Subtrim ", " Min ", " Max ", " Richtung ", " Kurve ", " PPM Mitte ", " Subtrim Mode " } -#define TR_CSW_HEADERS { " Funktion ", " Var1 ", " Var2 ", " Var2 ", " UND Schalter ", " Dauer ", " Delay " } +#define TR_CSW_HEADERS { " Funktion ", " Var1 ", " Var2 ", " Var2 ", " UND Schalter ", " Dauer ", " Verzögerung " } //Taranis About screen #define TR_ABOUTUS "Über OpenTx" From eec02abf2380a0d50f2dbed6881527162bc62e07 Mon Sep 17 00:00:00 2001 From: hrenz Date: Fri, 4 Apr 2014 18:25:21 +0200 Subject: [PATCH 2/3] 04.04. German Update de.h.txt Hy Kilrah, Range back to Original for AreaWindow --- radio/src/translations/de.h.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index d8a7fd314..c3d2e9147 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -165,13 +165,13 @@ #if defined(PCBTARANIS) #define TR_CSWTIMER "Takt\0" // TIM = Takt = Taktgenerator #define TR_CSWSTICKY "SRFF\0" // Sticky = RS-Flip-Flop - #define TR_CSWRANGE "PosS6" // Range= Pos Schalter P11..P16, P21..P26, P31..P36 + #define TR_CSWRANGE "Range" // Range = Bereichsabfrage Wert von bis #define TR_CSWSTAY "Puls\0" // Edge = einstellbarer Impuls #else #define TR_CSWTIMER "Takt\0" // TIM = Takt = Taktgenerator #define TR_CSWSTICKY "SRFF\0" // Sticky = RS-Flip-Flop #if defined(CPUARM) - #define TR_CSWRANGE "PoS6\0" // Range= Pos Schalter P11..P16, P21..P26, P31..P36 + #define TR_CSWRANGE "Rnge\0" // Range= Bereichsabfrage Wert von bis #define TR_CSWSTAY "Puls\0" // Edge = einstellbarer Impuls #else #define TR_CSWRANGE From e00f008460807da9413b6a8818c1f353c5e23ca3 Mon Sep 17 00:00:00 2001 From: hrenz Date: Fri, 4 Apr 2014 18:34:43 +0200 Subject: [PATCH 3/3] 04.04. German Update de.h.txt Range now back to original --- radio/src/translations/de.h.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index c3d2e9147..20b1f30ba 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -165,13 +165,13 @@ #if defined(PCBTARANIS) #define TR_CSWTIMER "Takt\0" // TIM = Takt = Taktgenerator #define TR_CSWSTICKY "SRFF\0" // Sticky = RS-Flip-Flop - #define TR_CSWRANGE "Range" // Range = Bereichsabfrage Wert von bis + #define TR_CSWRANGE "Range" // Range = Bereichsabfrage von bis #define TR_CSWSTAY "Puls\0" // Edge = einstellbarer Impuls #else #define TR_CSWTIMER "Takt\0" // TIM = Takt = Taktgenerator #define TR_CSWSTICKY "SRFF\0" // Sticky = RS-Flip-Flop #if defined(CPUARM) - #define TR_CSWRANGE "Rnge\0" // Range= Bereichsabfrage Wert von bis + #define TR_CSWRANGE "Rnge\0" // Range= Bereichsabfrage von bis #define TR_CSWSTAY "Puls\0" // Edge = einstellbarer Impuls #else #define TR_CSWRANGE