1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00

Merge #926 - Reverted STR_RESET (used at multiple places) and Range (nothing to do with the multipos pots, will be for user defined ranges of any source, for example "throttle stick between -23 and +12")

This commit is contained in:
Andre Bernet 2014-04-04 17:22:44 +02:00
parent 79dbd89214
commit e2e537060c

View file

@ -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) * Authors (alphabetical order)
* - Bertrand Songis <bsongis@gmail.com> * - Bertrand Songis <bsongis@gmail.com>
* - Bernet Andre <bernet.andre@gmail.com> * - Bernet Andre <bernet.andre@gmail.com>
@ -168,11 +168,11 @@
#define TR_CSWRANGE "Range" // unklar #define TR_CSWRANGE "Range" // unklar
#define TR_CSWSTAY "Puls\0" // Edge = einstellbarer Impuls #define TR_CSWSTAY "Puls\0" // Edge = einstellbarer Impuls
#else #else
#define TR_CSWTIMER "Takt\0" // #define TR_CSWTIMER "Takt\0" // TIM = Takt = Taktgenerator
#define TR_CSWSTICKY "SRFF\0" // #define TR_CSWSTICKY "SRFF\0" // Sticky = RS-Flip-Flop
#if defined(CPUARM) #if defined(CPUARM)
#define TR_CSWRANGE "Rnge\0" // #define TR_CSWRANGE "Rnge\0" //
#define TR_CSWSTAY "Puls\0" // #define TR_CSWSTAY "Puls\0" // Edge = einstellbarer Impuls
#else #else
#define TR_CSWRANGE #define TR_CSWRANGE
#define TR_CSWSTAY #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_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 #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) #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 #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 #endif
#if defined(HELI) #if defined(HELI)
@ -527,11 +527,11 @@
#define TR_ALARMS_LABEL "----Alarm wenn---" #define TR_ALARMS_LABEL "----Alarm wenn---"
#define TR_BATTERY_RANGE TR("Akku Bereich","Akku Spg-Bereich") // Symbol Akku Ladezustand #define TR_BATTERY_RANGE TR("Akku Bereich","Akku Spg-Bereich") // Symbol Akku Ladezustand
#define TR_BATTERYWARNING INDENT"Akku Spg kleiner" #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_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_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_THROTTLEREVERSE TR("Gas invers", INDENT "Vollgas hinten?") //Änderung wg TH9x, Taranis
#define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Jede Minute") #define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Jede Minute")
#define TR_BEEPCOUNTDOWN INDENT"Countdown" #define TR_BEEPCOUNTDOWN INDENT"Countdown"
@ -540,7 +540,7 @@
#define TR_BLDELAY INDENT"Dauer" #define TR_BLDELAY INDENT"Dauer"
#define TR_BLONBRIGHTNESS INDENT"An Helligkeit" #define TR_BLONBRIGHTNESS INDENT"An Helligkeit"
#define TR_BLOFFBRIGHTNESS INDENT"Aus 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_THROTTLEWARNING TR("Gas Alarm", INDENT "Gas Alarm")
#define TR_SWITCHWARNING TR("Sch. Alarm", INDENT "Schalter Alarm") #define TR_SWITCHWARNING TR("Sch. Alarm", INDENT "Schalter Alarm")
#define TR_POTWARNING TR("Pot Warn.", INDENT "Poti Warnung") #define TR_POTWARNING TR("Pot Warn.", INDENT "Poti Warnung")
@ -755,8 +755,8 @@
#define TR_CLEAR "Clear" #define TR_CLEAR "Clear"
#define TR_RESET "Reset" #define TR_RESET "Reset"
#define TR_COUNT "Punkte" #define TR_COUNT "Punkte"
#define TR_PT "pt" #define TR_PT "Pt"
#define TR_PTS "pts" #define TR_PTS "Pts"
#define TR_SMOOTH "Runden" #define TR_SMOOTH "Runden"
#define TR_COPY_TRIMS_TO_OFS "Kopie Trim to Servo-Subtrim" // "Trims => Offset" #define TR_COPY_TRIMS_TO_OFS "Kopie Trim to Servo-Subtrim" // "Trims => Offset"
#define TR_PERSISTENT_MAH INDENT "Speichern mAh" #define TR_PERSISTENT_MAH INDENT "Speichern mAh"
@ -797,7 +797,7 @@
// Taranis Info Zeile Anzeigen // 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_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_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 //Taranis About screen
#define TR_ABOUTUS "Über OpenTx" #define TR_ABOUTUS "Über OpenTx"