From 6a09f6fdb7c4f030bc176372bb7f1253a8ab8bdb Mon Sep 17 00:00:00 2001 From: "mhotar@gmail.com" Date: Mon, 2 Jul 2012 19:50:40 +0000 Subject: [PATCH] CZ translations FP_EDIT, HELI --- src/model_menus.cpp | 18 ++++++++++++------ src/translations/cz.h | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/model_menus.cpp b/src/model_menus.cpp index afc79808b..967d570d7 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -820,6 +820,12 @@ static uint8_t s_currIdx; #ifdef FLIGHT_PHASES +#if defined(TRANSLATIONS_CZ) +#define PHASES_EDIT_2ND_COLUMN 12 +#else +#define PHASES_EDIT_2ND_COLUMN 10 +#endif + void menuProcPhaseOne(uint8_t event) { PhaseData *phase = phaseaddress(s_currIdx); @@ -837,17 +843,17 @@ void menuProcPhaseOne(uint8_t event) switch(i) { case 0: lcd_putsLeft( y, STR_NAME); - EditName(10*FW, y, phase->name, sizeof(phase->name), event, attr, m_posHorz); + EditName(PHASES_EDIT_2ND_COLUMN*FW, y, phase->name, sizeof(phase->name), event, attr, m_posHorz); break; case 1: lcd_putsLeft( y, STR_SWITCH); - putsSwitches(10*FW, y, phase->swtch, attr); + putsSwitches(PHASES_EDIT_2ND_COLUMN*FW, y, phase->swtch, attr); if (attr) CHECK_INCDEC_MODELSWITCH(event, phase->swtch, -MAX_DRSWITCH, MAX_DRSWITCH); break; case 2: lcd_putsLeft( y, STR_TRIMS); for (uint8_t t=0; t0) ? BLINK|INVERS : INVERS) : 0); + putsTrimMode((PHASES_EDIT_2ND_COLUMN+t)*FW, y, s_currIdx, t, (attr && m_posHorz==t) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0); if (attr && m_posHorz==t && ((s_editMode>0) || p1valdiff)) { int16_t v = getRawTrimValue(s_currIdx, t); if (v < TRIM_EXTENDED_MAX) v = TRIM_EXTENDED_MAX; @@ -860,7 +866,7 @@ void menuProcPhaseOne(uint8_t event) } #if defined(PCBV4) for (uint8_t t=0; t0) ? BLINK|INVERS : INVERS) : 0); + putsRotaryEncoderMode((PHASES_EDIT_2ND_COLUMN+4+t)*FW+2, y, s_currIdx, t, (attr && m_posHorz==4+t) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0); if (attr && m_posHorz==4+t && ((s_editMode>0) || p1valdiff)) { #if defined(EXTRA_ROTARY_ENCODERS) int16_t v; @@ -890,12 +896,12 @@ void menuProcPhaseOne(uint8_t event) break; case 3: lcd_putsLeft( y, STR_FADEIN); - lcd_outdezAtt(10*FW, y, phase->fadeIn*5, attr|PREC1|LEFT); + lcd_outdezAtt((PHASES_EDIT_2ND_COLUMN*FW), y, phase->fadeIn*5, attr|PREC1|LEFT); if(attr) CHECK_INCDEC_MODELVAR(event, phase->fadeIn, 0, 15); break; case 4: lcd_putsLeft( y, STR_FADEOUT); - lcd_outdezAtt(10*FW, y, phase->fadeOut*5, attr|PREC1|LEFT); + lcd_outdezAtt((PHASES_EDIT_2ND_COLUMN*FW), y, phase->fadeOut*5, attr|PREC1|LEFT); if(attr) CHECK_INCDEC_MODELVAR(event, phase->fadeOut, 0, 15); break; } diff --git a/src/translations/cz.h b/src/translations/cz.h index b24e80a48..707a90ec7 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -260,16 +260,16 @@ #define TR_MS "ms" #define TR_SWITCH "Sp\204na\201" #define TR_TRIMS "Trimy" -#define TR_FADEIN "P\206echodZap" -#define TR_FADEOUT "P\206echodVyp" +#define TR_FADEIN "P\206echod Zap" +#define TR_FADEOUT "P\206echod Vyp" #define TR_DEFAULT "(v\212choz\204)" #define TR_CHECKTRIMS "Kont. \002 Trimy" -#define TR_SWASHTYPE "Swash Type" -#define TR_COLLECTIVE "Collective" -#define TR_SWASHRING "Swash Ring" -#define TR_ELEDIRECTION "ELE Direction" -#define TR_AILDIRECTION "AIL Direction" -#define TR_COLDIRECTION "COL Direction" +#define TR_SWASHTYPE "Typ Cykliky" +#define TR_COLLECTIVE "Kolektiv" +#define TR_SWASHRING "Cyklika" +#define TR_ELEDIRECTION "Sm\203r:V\212\207kovka" +#define TR_AILDIRECTION " += K\206id\202lka" +#define TR_COLDIRECTION " += Kolektiv" #define TR_MODE "M\205d" #define TR_NOFREEEXPO "Nen\204 voln\202 expo!" #define TR_NOFREEMIXER "Nen\204 voln\212 mix!" @@ -280,7 +280,7 @@ #define TR_MIXERWEIGHT "V\200ha Mixu" #define TR_DIFFERENTIAL "Dif.V\212chylek" #define TR_OFFSET "Ofset" -#define TR_MIXEROFFSET "Offset Mixu" +#define TR_MIXEROFFSET "Ofset Mixu" #define TR_DRWEIGHT "V\200ha DV" #define TR_DREXPO "Expo DV" #define TR_TRIM "Trim" @@ -383,7 +383,7 @@ #define TR_MENUSETUP "NASTAVEN\214" #define TR_MENUFLIGHTPHASE "F\213ZE LETU" #define TR_MENUFLIGHTPHASES "F\213ZE LETU" -#define TR_MENUHELISETUP "HELI SETUP" +#define TR_MENUHELISETUP "NASTAVEN\214 HELI" #define TR_MENUDREXPO "DV/EXPO" // TODO flash saving this string is 2 times here #define TR_MENULIMITS "LIMITY" #define TR_MENUCURVES "K\215IVKY"