From 4506328144886a3d568ab9584cc9908c981563d5 Mon Sep 17 00:00:00 2001 From: mhotar Date: Sat, 1 Mar 2014 00:25:18 +0100 Subject: [PATCH 01/13] Preflight check label and items --- radio/src/gui/menu_model.cpp | 23 ++++++++++++++--------- radio/src/translations.cpp | 1 + radio/src/translations/en.h.txt | 9 +++++---- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index bea52b0ce..ae6e3036f 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -873,10 +873,11 @@ enum menuModelSetupItems { ITEM_MODEL_THROTTLE_REVERSED, ITEM_MODEL_THROTTLE_TRACE, ITEM_MODEL_THROTTLE_TRIM, - ITEM_MODEL_THROTTLE_WARNING, + CASE_PCBTARANIS(ITEM_MODEL_PREFLIGHT_LABEL) #if defined(PCBTARANIS) ITEM_MODEL_CHECKLIST_DISPLAY, #endif + ITEM_MODEL_THROTTLE_WARNING, ITEM_MODEL_SWITCHES_WARNING, CASE_PCBTARANIS(ITEM_MODEL_POT_WARNING) ITEM_MODEL_BEEP_CENTER, @@ -964,7 +965,7 @@ void menuModelSetup(uint8_t event) #define POT_WARN_ITEMS() ((g_model.nPotsToWarn >> 6) ? (uint8_t)NUM_POTS : (uint8_t)0) bool CURSOR_ON_CELL = (m_posHorz >= 0); - MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, 0, 0, 0, 0, CASE_PCBTARANIS(0) 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_PORT1_ON(1), IF_PORT1_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_PORT1_ON(FAILSAFE_ROWS(0)), LABEL(ExternalModule), (g_model.externalModule==MODULE_TYPE_XJT || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, PORT2_CHANNELS_ROWS(), (IS_MODULE_XJT(1) && IS_D8_RX(1)) ? (uint8_t)1 : (IS_MODULE_PPM(1) || IS_MODULE_XJT(1) || IS_MODULE_DSM2(1)) ? (uint8_t)2 : HIDDEN_ROW, IF_PORT2_XJT(FAILSAFE_ROWS(1)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)}); + MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, 0, 0, 0,LABEL(PreflightCheck), CASE_PCBTARANIS(0) 0, 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_PORT1_ON(1), IF_PORT1_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_PORT1_ON(FAILSAFE_ROWS(0)), LABEL(ExternalModule), (g_model.externalModule==MODULE_TYPE_XJT || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, PORT2_CHANNELS_ROWS(), (IS_MODULE_XJT(1) && IS_D8_RX(1)) ? (uint8_t)1 : (IS_MODULE_PPM(1) || IS_MODULE_XJT(1) || IS_MODULE_DSM2(1)) ? (uint8_t)2 : HIDDEN_ROW, IF_PORT2_XJT(FAILSAFE_ROWS(1)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)}); #elif defined(CPUM64) #define CURSOR_ON_CELL (true) #define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX) @@ -1142,16 +1143,20 @@ void menuModelSetup(uint8_t event) g_model.thrTrim = onoffMenuItem(g_model.thrTrim, MODEL_SETUP_2ND_COLUMN, y, STR_TTRIM, attr, event); break; - case ITEM_MODEL_THROTTLE_WARNING: - g_model.disableThrottleWarning = !onoffMenuItem(!g_model.disableThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLEWARNING, attr, event); - break; - #if defined(PCBTARANIS) + case ITEM_MODEL_PREFLIGHT_LABEL: + lcd_putsLeft(y, TR_PREFLIGHT); + break; + case ITEM_MODEL_CHECKLIST_DISPLAY: g_model.displayText = onoffMenuItem(g_model.displayText, MODEL_SETUP_2ND_COLUMN, y, STR_CHECKLIST, attr, event); break; #endif + case ITEM_MODEL_THROTTLE_WARNING: + g_model.disableThrottleWarning = !onoffMenuItem(!g_model.disableThrottleWarning, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLEWARNING, attr, event); + break; + case ITEM_MODEL_SWITCHES_WARNING: { lcd_putsLeft(y, STR_SWITCHWARNING); @@ -1201,9 +1206,9 @@ void menuModelSetup(uint8_t event) uint8_t swactive = !(g_model.nSwToWarn & 1 << i); #if defined(PCBTARANIS) c = "\300-\301"[states & 0x03]; - lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+i*(2*FW), y, 'A'+i, line && (m_posHorz == i) ? INVERS : 0); - if (swactive) lcd_putc(MODEL_SETUP_2ND_COLUMN+i*(2*FW)+FWNUM, y, c); - lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+((NUM_SWITCHES-1)*2*FW+2), y, PSTR("<]"), (m_posHorz == NUM_SWITCHES-1 && !s_noHi) ? line : 0); + lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+i*(2*FW+1), y, 'A'+i, line && (m_posHorz == i) ? INVERS : 0); + if (swactive) lcd_putc(MODEL_SETUP_2ND_COLUMN+i*(2*FW+1)+FWNUM+1, y, c); + lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+((NUM_SWITCHES-1)*2*FW+8), y, PSTR("<]"), (m_posHorz == NUM_SWITCHES-1 && !s_noHi) ? line : 0); states >>= 2; #else attr = 0; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index f85c49c49..3042345f7 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -496,6 +496,7 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text"; const pm_char STR_VIEW_CHANNELS[] PROGMEM = "View Channels"; const pm_char STR_VIEW_NOTES[] PROGMEM = "View Notes"; const pm_char STR_POTWARNING[] PROGMEM = TR_POTWARNING; + const pm_char STR_PREFLIGHT[] PROGMEM = TR_PREFLIGHT; const pm_char STR_CHECKLIST[] PROGMEM = TR_CHECKLIST; const pm_char STR_UART3MODE[] PROGMEM = TR_UART3MODE; const pm_char STR_POT1TYPE[] PROGMEM = TR_POT1TYPE; diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 32940a94e..c22ecb8ed 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -523,9 +523,9 @@ #define TR_BLONBRIGHTNESS INDENT"ON Brightness" #define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness" #define TR_SPLASHSCREEN "Splash screen" -#define TR_THROTTLEWARNING TR("T-Warning","Throttle Warning") -#define TR_SWITCHWARNING TR("S-Warning","Switch Warning") -#define TR_POTWARNING TR("Pot Warn.","Pot Warning") +#define TR_THROTTLEWARNING TR("T-Warning", INDENT "Throttle State") +#define TR_SWITCHWARNING TR("S-Warning", INDENT "Switch Positions") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Setup") #define TR_TIMEZONE TR("Time Zone","GPS Time zone") #define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order") #define TR_SLAVE "Slave" @@ -720,7 +720,8 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" -#define TR_CHECKLIST "Display Checklist" +#define TR_PREFLIGHT "Preflight Checks" +#define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_UART3MODE "Serial port" #define TR_POT1TYPE "S1 Type" From 55ff2e6b5ea2401c17cb713e9e42f0e54f2ec5da Mon Sep 17 00:00:00 2001 From: mhotar Date: Sat, 1 Mar 2014 01:20:47 +0100 Subject: [PATCH 02/13] Throttle label and missing string defs --- radio/src/gui/menu_model.cpp | 13 +++++++++---- radio/src/translations.cpp | 1 + radio/src/translations.h | 4 +++- radio/src/translations/en.h.txt | 7 ++++--- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index ae6e3036f..da8b1ae88 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -870,6 +870,7 @@ enum menuModelSetupItems { ITEM_MODEL_EXTENDED_LIMITS, ITEM_MODEL_EXTENDED_TRIMS, ITEM_MODEL_TRIM_INC, + ITEM_MODEL_THROTTLE_LABEL, ITEM_MODEL_THROTTLE_REVERSED, ITEM_MODEL_THROTTLE_TRACE, ITEM_MODEL_THROTTLE_TRIM, @@ -965,19 +966,19 @@ void menuModelSetup(uint8_t event) #define POT_WARN_ITEMS() ((g_model.nPotsToWarn >> 6) ? (uint8_t)NUM_POTS : (uint8_t)0) bool CURSOR_ON_CELL = (m_posHorz >= 0); - MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, 0, 0, 0,LABEL(PreflightCheck), CASE_PCBTARANIS(0) 0, 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_PORT1_ON(1), IF_PORT1_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_PORT1_ON(FAILSAFE_ROWS(0)), LABEL(ExternalModule), (g_model.externalModule==MODULE_TYPE_XJT || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, PORT2_CHANNELS_ROWS(), (IS_MODULE_XJT(1) && IS_D8_RX(1)) ? (uint8_t)1 : (IS_MODULE_PPM(1) || IS_MODULE_XJT(1) || IS_MODULE_DSM2(1)) ? (uint8_t)2 : HIDDEN_ROW, IF_PORT2_XJT(FAILSAFE_ROWS(1)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)}); + MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0,LABEL(Throttle), 0, 0, 0,LABEL(PreflightCheck), CASE_PCBTARANIS(0) 0, 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_PORT1_ON(1), IF_PORT1_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_PORT1_ON(FAILSAFE_ROWS(0)), LABEL(ExternalModule), (g_model.externalModule==MODULE_TYPE_XJT || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, PORT2_CHANNELS_ROWS(), (IS_MODULE_XJT(1) && IS_D8_RX(1)) ? (uint8_t)1 : (IS_MODULE_PPM(1) || IS_MODULE_XJT(1) || IS_MODULE_DSM2(1)) ? (uint8_t)2 : HIDDEN_ROW, IF_PORT2_XJT(FAILSAFE_ROWS(1)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)}); #elif defined(CPUM64) #define CURSOR_ON_CELL (true) #define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX) uint8_t protocol = g_model.protocol; - MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2 }); + MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 0, 0,LABEL(Throttle), 0, 0, 0, 0, 5, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2 }); #else #define CURSOR_ON_CELL (true) #define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX) uint8_t protocol = g_model.protocol; - MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, 0, 0, 0, 0, 6, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2, CASE_PCBSKY9X(1) CASE_PCBSKY9X(2) }); + MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0,LABEL(Throttle), 0, 0, 0, 0, 6, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2, CASE_PCBSKY9X(1) CASE_PCBSKY9X(2) }); #endif if (!MENU_CHECK(menuTabModel, e_ModelSetup, MODEL_SETUP_MAX_LINES)) { @@ -1122,6 +1123,10 @@ void menuModelSetup(uint8_t event) g_model.trimInc = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_TRIMINC, STR_VTRIMINC, g_model.trimInc, -2, 2, attr, event); break; + case ITEM_MODEL_THROTTLE_LABEL: + lcd_putsLeft(y, STR_THROTTLE_LABEL); + break; + case ITEM_MODEL_THROTTLE_REVERSED: g_model.throttleReversed = onoffMenuItem(g_model.throttleReversed, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLEREVERSE, attr, event ) ; break; @@ -1145,7 +1150,7 @@ void menuModelSetup(uint8_t event) #if defined(PCBTARANIS) case ITEM_MODEL_PREFLIGHT_LABEL: - lcd_putsLeft(y, TR_PREFLIGHT); + lcd_putsLeft(y, STR_PREFLIGHT); break; case ITEM_MODEL_CHECKLIST_DISPLAY: diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 3042345f7..b30c2f26e 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -211,6 +211,7 @@ const pm_char STR_ALARMWARNING[] PROGMEM = TR_ALARMWARNING; #if defined(ROTARY_ENCODERS) const pm_char STR_RENAVIG[] PROGMEM = TR_RENAVIG; #endif +const pm_char STR_THROTTLE_LABEL[] PROGMEM = TR_THROTTLE_LABEL; const pm_char STR_THROTTLEREVERSE[] PROGMEM = TR_THROTTLEREVERSE; const pm_char STR_MINUTEBEEP[] PROGMEM = TR_MINUTEBEEP; const pm_char STR_BEEPCOUNTDOWN[] PROGMEM = TR_BEEPCOUNTDOWN; diff --git a/radio/src/translations.h b/radio/src/translations.h index 18c39df1a..ec882c0a2 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -370,6 +370,7 @@ extern const pm_char STR_INACTIVITYALARM[]; extern const pm_char STR_MEMORYWARNING[]; extern const pm_char STR_ALARMWARNING[]; extern const pm_char STR_RENAVIG[]; +extern const pm_char STR_THROTTLE_LABEL[]; extern const pm_char STR_THROTTLEREVERSE[]; extern const pm_char STR_MINUTEBEEP[]; extern const pm_char STR_BEEPCOUNTDOWN[]; @@ -611,7 +612,7 @@ extern const pm_char STR_SD_SECTORS[]; extern const pm_char STR_SD_SIZE[]; extern const pm_char STR_TYPE[]; extern const pm_char STR_GLOBAL_VARS[]; -extern const pm_char STR_GLOBAL_V[]; +extern const pm_char STR_GLOBAL_V[]; extern const pm_char STR_GLOBAL_VAR[]; extern const pm_char STR_OWN[]; extern const pm_char STR_ROTARY_ENCODER[]; @@ -687,6 +688,7 @@ extern const pm_char STR_VIEW_TEXT[]; extern const pm_char STR_VIEW_CHANNELS[]; extern const pm_char STR_VIEW_NOTES[]; extern const pm_char STR_POTWARNING[]; + extern const pm_char STR_PREFLIGHT[]; extern const pm_char STR_CHECKLIST[]; extern const pm_char STR_UART3MODE[]; extern const pm_char STR_POT1TYPE[]; diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index c22ecb8ed..b34cd334b 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -450,8 +450,8 @@ #define TR_ELIMITS TR("E.Limits", "Extended Limits") #define TR_ETRIMS TR("E.Trims", "Extended Trims") #define TR_TRIMINC "Trim Step" -#define TR_TTRACE TR("T-Source", "Throttle Source") -#define TR_TTRIM TR("T-Trim", "Throttle Trim") +#define TR_TTRACE INDENT "Source" +#define TR_TTRIM INDENT "Idle Trim" #define TR_BEEPCTR TR("Ctr Beep", "Center Beep") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocol") #define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") @@ -514,7 +514,8 @@ #define TR_MEMORYWARNING INDENT"Memory Low" #define TR_ALARMWARNING INDENT"Sound Off" #define TR_RENAVIG "RotEnc Navig" -#define TR_THROTTLEREVERSE TR("T-Reverse", "Throttle reverse") +#define TR_THROTTLE_LABEL "Throttle" +#define TR_THROTTLEREVERSE INDENT "Reverse" #define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Minute call") #define TR_BEEPCOUNTDOWN INDENT"Countdown" #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistent") From 83651486f43b8b04d83b20fa640d944516852975 Mon Sep 17 00:00:00 2001 From: mhotar Date: Sat, 1 Mar 2014 02:08:45 +0100 Subject: [PATCH 03/13] Translations updated --- radio/src/translations/cz.h.txt | 16 +++++++++------- radio/src/translations/de.h.txt | 16 +++++++++------- radio/src/translations/es.h.txt | 16 +++++++++------- radio/src/translations/fi.h.txt | 16 +++++++++------- radio/src/translations/fr.h.txt | 16 +++++++++------- radio/src/translations/it.h.txt | 16 +++++++++------- radio/src/translations/pl.h.txt | 16 +++++++++------- radio/src/translations/pt.h.txt | 16 +++++++++------- radio/src/translations/se.h.txt | 16 +++++++++------- 9 files changed, 81 insertions(+), 63 deletions(-) diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 4a6fba404..09d101a40 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limit+25%", "Kanál +/- 125%") #define TR_ETRIMS TR("širšíTrim", "Široký trim") #define TR_TRIMINC TR("KrokTrimu", "Krok trimu") -#define TR_TTRACE TR("StopaPlyn", "Stopař plynu") -#define TR_TTRIM TR("TrimPlynu", "TrimPlyn-volnoběh") +#define TR_TTRACE TR(INDENT "StopaPlyn", INDENT "Stopař plynu") +#define TR_TTRIM TR(INDENT "TrimPlynu", INDENT "Trim-volnoběh") #define TR_BEEPCTR "(\043)Středy" #define TR_PROTO INDENT"Protokol" #define TR_PPMFRAME "PPM frame" @@ -504,7 +504,8 @@ #define TR_MEMORYWARNING INDENT"Plná pamět'" #define TR_ALARMWARNING INDENT"Vypnutý zvuk" #define TR_RENAVIG "Navig. RotEnc" -#define TR_THROTTLEREVERSE TR("ReversPlyn", "Revers plynu") +#define TR_THROTTLE_LABEL "Plyn" +#define TR_THROTTLEREVERSE INDENT "Revers" #define TR_MINUTEBEEP TR(INDENT"Minuta", INDENT"Oznamovat minuty") #define TR_BEEPCOUNTDOWN INDENT"Odpočet" #define TR_PERSISTENT INDENT"Trvalé" @@ -513,9 +514,9 @@ #define TR_BLONBRIGHTNESS INDENT"Jas Zap." #define TR_BLOFFBRIGHTNESS INDENT"Jas Vyp." #define TR_SPLASHSCREEN "úvodníLogo" -#define TR_THROTTLEWARNING "(\043)Plyn" -#define TR_SWITCHWARNING "(\043)Spínače" -#define TR_POTWARNING TR("Pot Warn.","Pot Warning") +#define TR_THROTTLEWARNING TR("(\043)Plyn", INDENT "(\043)Plyn") +#define TR_SWITCHWARNING TR("(\043)Spínače", INDENT "(\043)Spínače") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE "časové pásmo" #define TR_RXCHANNELORD TR("Pořadí kanálů", "Výchozí pořadí kanálů") #define TR_SLAVE "Podřízený" @@ -710,7 +711,8 @@ #define TR_LOWALARM INDENT "Nízký Alarm" #define TR_CRITICALALARM INDENT "Kritický Alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" -#define TR_CHECKLIST "Display Checklist" +#define TR_PREFLIGHT "Preflight Checks" +#define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_UART3MODE "Serial port" #define TR_POT1TYPE "S1 Type" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 5d99446cd..eae9626d5 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Erw.Limit","Erweit. Limits") #define TR_ETRIMS TR("Erw.Trims","Erweit. Trimmung") #define TR_TRIMINC TR("Trim Schr.","Trimm Schritte") -#define TR_TTRACE TR("Gasquelle","Gas Quelle") -#define TR_TTRIM TR("Gastrim","Gas Trimmung") +#define TR_TTRACE TR(INDENT "Gasquelle", INDENT "Gas Quelle") +#define TR_TTRIM TR(INDENT "Gastrim",INDENT "Gas Trimmung") #define TR_BEEPCTR TR("Mitt.Piep","Mittelst. Pieps") #define TR_PROTO TR(INDENT"Proto.",INDENT"Protokoll") #define TR_PPMFRAME "PPM Einst." @@ -504,7 +504,8 @@ #define TR_MEMORYWARNING INDENT"Speicher voll" #define TR_ALARMWARNING INDENT"Ton aus" #define TR_RENAVIG "Drehgeb. Navig." -#define TR_THROTTLEREVERSE TR("Gas invers", "Vollgas hinten?") //Änderung wg TH9x, Taranis +#define TR_THROTTLE_LABEL "Gas" +#define TR_THROTTLEREVERSE TR(INDENT "Gas invers", INDENT "Vollgas hinten?") //Änderung wg TH9x, Taranis #define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Jede Minute") #define TR_BEEPCOUNTDOWN INDENT"Countdown" #define TR_PERSISTENT TR(INDENT"M-Zeit",INDENT"Modell Zeit") @@ -513,9 +514,9 @@ #define TR_BLONBRIGHTNESS INDENT"An Helligkeit" #define TR_BLOFFBRIGHTNESS INDENT"Aus Helligkeit" #define TR_SPLASHSCREEN "Startbild" -#define TR_THROTTLEWARNING "Gas Alarm" -#define TR_SWITCHWARNING TR("Sch. Alarm","Schalter Alarm") -#define TR_POTWARNING TR("Pot Warn.","Pot Warning") +#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 "Pot Warning") #define TR_TIMEZONE TR("Zeitzone","GPS Zeit Zone") #define TR_RXCHANNELORD TR("Kanalanordnung","Kanalvoreinstellung") #define TR_SLAVE "Sch\205ler PPM1-8 als Ausgang" @@ -710,7 +711,8 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Kritisch Alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" -#define TR_CHECKLIST "Display Checklist" +#define TR_PREFLIGHT "Preflight Checks" +#define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_UART3MODE "Serial port" #define TR_POT1TYPE "S1 Type" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 44d96759a..c01910b4e 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("E.Limite","Ampliar Limites") #define TR_ETRIMS TR("E.Trims","Ampliar Trims") #define TR_TRIMINC "Paso Trim" -#define TR_TTRACE TR("Fuente-A","Fuente Acelerad") -#define TR_TTRIM TR("Trim-A","Trim Acelerad") +#define TR_TTRACE TR( INDENT "Fuente-A", INDENT "Fuente Acelerad") +#define TR_TTRIM TR(INDENT "Trim-A", INDENT "Trim Acelerad") #define TR_BEEPCTR TR("Ctr Beep","Center Beep") #define TR_PROTO TR(INDENT"Proto",INDENT"Protocol") #define TR_PPMFRAME "Trama PPM" @@ -504,7 +504,8 @@ #define TR_MEMORYWARNING INDENT"Memoria Baja" #define TR_ALARMWARNING INDENT"Sin Sonido" #define TR_RENAVIG "RotEnc Navig" -#define TR_THROTTLEREVERSE TR("Invert_Acel", "Invertir Acel.") +#define TR_THROTTLE_LABEL "Throttle" +#define TR_THROTTLEREVERSE TR(INDENT "Invert_Acel", INDENT "Invertir Acel.") #define TR_MINUTEBEEP TR(INDENT"Minuto",INDENT"Cada Minuto") #define TR_BEEPCOUNTDOWN INDENT"Cuentaatras" #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistente") @@ -513,9 +514,9 @@ #define TR_BLONBRIGHTNESS INDENT"MAS Brillo" #define TR_BLOFFBRIGHTNESS INDENT"MENOS Brillo" #define TR_SPLASHSCREEN "Ptalla.inicio" -#define TR_THROTTLEWARNING TR("Aviso-A", "Aviso Acelerador") -#define TR_SWITCHWARNING TR("Aviso-I", "Aviso Intrptor") -#define TR_POTWARNING TR("Pot Warn.","Pot Warning") +#define TR_THROTTLEWARNING TR("Aviso-A", INDENT "Aviso Acelerador") +#define TR_SWITCHWARNING TR("Aviso-I", INDENT "Aviso Intrptor") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE TR("Zona Hora", "GPS Zona Hora") #define TR_RXCHANNELORD TR("Rx Orden canal", "Orden habitual canales") #define TR_SLAVE "Esclavo" @@ -710,7 +711,8 @@ #define TR_LOWALARM INDENT "Alarma baja" #define TR_CRITICALALARM INDENT "Alarma Critica" #define TR_PERSISTENT_MAH INDENT "Valor mAh" -#define TR_CHECKLIST "Display Checklist" +#define TR_PREFLIGHT "Preflight Checks" +#define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_UART3MODE "Serial port" #define TR_POT1TYPE "S1 Type" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 6b1dea41a..41509b804 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("E.Limits", "Extended Limits") #define TR_ETRIMS TR("E.Trims", "Extended Trims") #define TR_TRIMINC "Trim Step" -#define TR_TTRACE TR("T-Source", "Throttle Source") -#define TR_TTRIM TR("T-Trim", "Throttle Trim") +#define TR_TTRACE TR(INDENT "T-Source", INDENT "Throttle Source") +#define TR_TTRIM TR(INDENT "T-Trim", INDENT "Throttle Trim") #define TR_BEEPCTR TR("Ctr Beep", "Center Beep") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocol") #define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") @@ -504,7 +504,8 @@ #define TR_MEMORYWARNING INDENT"Memory Low" #define TR_ALARMWARNING INDENT"Sound Off" #define TR_RENAVIG "RotEnc Navig" -#define TR_THROTTLEREVERSE TR("T-Reverse", "Throttle reverse") +#define TR_THROTTLE_LABEL "Throttle" +#define TR_THROTTLEREVERSE TR(INDENT "T-Reverse", INDENT "Throttle reverse") #define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Minute call") #define TR_BEEPCOUNTDOWN INDENT"Countdown" #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistent") @@ -513,9 +514,9 @@ #define TR_BLONBRIGHTNESS INDENT"ON Brightness" #define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness" #define TR_SPLASHSCREEN "Splash screen" -#define TR_THROTTLEWARNING TR("T-Warning","Throttle Warning") -#define TR_SWITCHWARNING TR("S-Warning","Switch Warning") -#define TR_POTWARNING TR("Pot Warn.","Pot Warning") +#define TR_THROTTLEWARNING TR("T-Warning", INDENT "Throttle Warning") +#define TR_SWITCHWARNING TR("S-Warning",INDENT "Switch Warning") +#define TR_POTWARNING TR("Pot Warn.",INDENT "Pot Warning") #define TR_TIMEZONE TR("Time Zone","GPS Time zone") #define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order") #define TR_SLAVE "Slave" @@ -710,7 +711,8 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" -#define TR_CHECKLIST "Display Checklist" +#define TR_PREFLIGHT "Preflight Checks" +#define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_UART3MODE "Serial port" #define TR_POT1TYPE "S1 Type" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index a3b12102e..88135ba8b 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limites ét","Limites étendues") #define TR_ETRIMS TR("Trims ét.","Trims étendus") #define TR_TRIMINC TR("Pas Trim","Pas des trims") -#define TR_TTRACE "Source gaz" -#define TR_TTRIM "Trim gaz" +#define TR_TTRACE INDENT"Source gaz" +#define TR_TTRIM INDENT"Trim gaz" #define TR_BEEPCTR TR("Bips centr","Bips centrage") #define TR_PROTO TR(INDENT"Proto.",INDENT"Protocole") #define TR_PPMFRAME INDENT"Trame PPM" @@ -504,7 +504,8 @@ #define TR_MEMORYWARNING INDENT"Mémoire pleine" #define TR_ALARMWARNING TR(INDENT"Silence",INDENT"Sons désactivés") #define TR_RENAVIG "Navig EncRot" -#define TR_THROTTLEREVERSE TR("Inv. gaz","Inversion gaz") +#define TR_THROTTLE_LABEL "Gaz" +#define TR_THROTTLEREVERSE TR(INDENT"Inv. gaz",INDENT"Inversion gaz") #define TR_MINUTEBEEP TR(INDENT"Bip min.",INDENT"Annonces minutes") #define TR_BEEPCOUNTDOWN TR(INDENT"Bip fin",INDENT"Compte à rebours") #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistant") @@ -513,9 +514,9 @@ #define TR_BLONBRIGHTNESS INDENT"Luminosité ON" #define TR_BLOFFBRIGHTNESS INDENT"Luminosité OFF" #define TR_SPLASHSCREEN "Logo d'accueil" -#define TR_THROTTLEWARNING "Alerte gaz" -#define TR_SWITCHWARNING TR("Alerte int","Alerte interrupt.") -#define TR_POTWARNING TR("Alerte pot","Alerte potentiom.") +#define TR_THROTTLEWARNING TR("Alerte gaz",INDENT"Alerte gaz") +#define TR_SWITCHWARNING TR("Alerte int",INDENT"Alerte interrupt.") +#define TR_POTWARNING TR("Alerte pot",INDENT"Alerte potentiom.") #define TR_TIMEZONE "Fuseau horaire" #define TR_RXCHANNELORD TR("Ordre voies RX","Ordre des voies préféré") #define TR_SLAVE "Elève" @@ -710,7 +711,8 @@ #define TR_LOWALARM INDENT "Alarme basse" #define TR_CRITICALALARM INDENT "Alarme critique" #define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh",INDENT "Enregistrer mAh") -#define TR_CHECKLIST "Afficher notes" +#define TR_PREFLIGHT "Preflight Checks" +#define TR_CHECKLIST INDENT"Afficher notes" #define TR_FAS_OFFSET TR(INDENT "Corr FAS", INDENT "Correction FAS") #define TR_UART3MODE "Port série" #define TR_POT1TYPE "Type S1" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 5b6857738..cba63389d 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limiti.E","Limiti Estesi") #define TR_ETRIMS TR("Trim Ext","Trim Estesi") #define TR_TRIMINC "Trim Step" -#define TR_TTRACE TR("T-Source","Throttle Source") -#define TR_TTRIM TR("T-Trim","Throttle Trim") +#define TR_TTRACE TR(INDENT "T-Source",INDENT "Throttle Source") +#define TR_TTRIM TR(INDENT "T-Trim",INDENT "Throttle Trim") #define TR_BEEPCTR TR("Ctr Beep","Center Beep") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocollo") #define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") @@ -504,7 +504,8 @@ #define TR_MEMORYWARNING INDENT"Avviso memoria" #define TR_ALARMWARNING INDENT"Spento" #define TR_RENAVIG "Navig RotEnc " -#define TR_THROTTLEREVERSE TR("Thr inv.", "Throttle Inverso") +#define TR_THROTTLE_LABEL "Throttle" +#define TR_THROTTLEREVERSE TR(INDENT "Thr inv.", INDENT "Throttle Inverso") #define TR_MINUTEBEEP INDENT"Minuto" #define TR_BEEPCOUNTDOWN TR(INDENT"Conto rov",INDENT"Conto rovescia") #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistente") @@ -513,9 +514,9 @@ #define TR_BLONBRIGHTNESS TR(INDENT"Lumin. ON",INDENT"Luminosità ON") #define TR_BLOFFBRIGHTNESS TR(INDENT"Lumin. OFF",INDENT"Luminosità OFF") #define TR_SPLASHSCREEN TR("Schermo avvio", "Schermata di avvio") -#define TR_THROTTLEWARNING TR("All. Thr", "Allarme Throttle") -#define TR_SWITCHWARNING TR("Avv. Int.", "Avviso Interr.") -#define TR_POTWARNING TR("Pot Warn.","Pot Warning") +#define TR_THROTTLEWARNING TR("All. Thr", INDENT"Allarme Throttle") +#define TR_SWITCHWARNING TR("Avv. Int.", INDENT"Avviso Interr.") +#define TR_POTWARNING TR("Pot Warn.", INDENT"Pot Warning") #define TR_TIMEZONE "Ora locale" #define TR_RXCHANNELORD "Ordine ch RX" #define TR_SLAVE "Allievo" @@ -710,7 +711,8 @@ #define TR_LOWALARM INDENT "Allarme Basso" #define TR_CRITICALALARM INDENT "Allarme Critico" #define TR_PERSISTENT_MAH INDENT "Store mAh" -#define TR_CHECKLIST "Display Checklist" +#define TR_PREFLIGHT "Preflight Checks" +#define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_UART3MODE "Serial port" #define TR_POT1TYPE "S1 Type" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 0a3bde330..f2434da46 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limit+25%", "Kanał +/- 125%") #define TR_ETRIMS TR("Trymery 100%", "Poszerzone Trymery") #define TR_TRIMINC TR("Krok Trymera", "Krok trymera") -#define TR_TTRACE TR("Źródło gazu", "Źródło gazu") -#define TR_TTRIM TR("Trymer gazu", "Trymer gazu") +#define TR_TTRACE TR(INDENT"Źródło gazu", INDENT"Źródło gazu") +#define TR_TTRIM TR(INDENT"Trymer gazu", INDENT"Trymer gazu") #define TR_BEEPCTR "(\043)Pikanie środka" #define TR_PROTO INDENT"Protokól" #define TR_PPMFRAME "Ramka PPM" @@ -504,7 +504,8 @@ #define TR_MEMORYWARNING INDENT"Pełna pamięć'" #define TR_ALARMWARNING INDENT"Wyłącz dźwięk" #define TR_RENAVIG "Nawigacja potencjometrem" -#define TR_THROTTLEREVERSE TR("Odwróć gaz", "Odwróć gaz") +#define TR_THROTTLE_LABEL "Throttle" +#define TR_THROTTLEREVERSE TR(INDENT"Odwróć gaz", INDENT"Odwróć gaz") #define TR_MINUTEBEEP TR(INDENT"Minuta", INDENT"Pik co minutę") #define TR_BEEPCOUNTDOWN TR(INDENT"Odliczanie", INDENT"Odliczanie") #define TR_PERSISTENT INDENT"Dokładny" @@ -513,9 +514,9 @@ #define TR_BLONBRIGHTNESS INDENT"Jasnośc wł." #define TR_BLOFFBRIGHTNESS INDENT"Jasność wył." #define TR_SPLASHSCREEN "Logo ekranu" -#define TR_THROTTLEWARNING "(\043)Gaz" -#define TR_SWITCHWARNING "(\043)Przełącznik" -#define TR_POTWARNING TR("Pot Warn.","Pot Warning") +#define TR_THROTTLEWARNING TR("(\043)Gaz",INDENT"(\043)Gaz") +#define TR_SWITCHWARNING TR("(\043)Przełącznik",INDENT"(\043)Przełącznik") +#define TR_POTWARNING TR("Pot Warn.",INDENT"Pot Warning") #define TR_TIMEZONE "Strefa czasowa" #define TR_RXCHANNELORD TR("Kolejność kanałów", "Bazowa kolejność kanałów") #define TR_SLAVE "Uczeń" @@ -710,7 +711,8 @@ #define TR_LOWALARM INDENT "Alarm niski" #define TR_CRITICALALARM INDENT "Alarm krytyczny" #define TR_PERSISTENT_MAH INDENT "Zapisz mAh" -#define TR_CHECKLIST "Display Checklist" +#define TR_PREFLIGHT "Preflight Checks" +#define TR_CHECKLIST INDENT"Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_UART3MODE "Port szreg." #define TR_POT1TYPE "Typ S1" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index f831cf0a1..8e8c17b2c 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS "E.Limits" #define TR_ETRIMS "E.Trims" #define TR_TRIMINC "Trim Step" -#define TR_TTRACE "T-Trace" -#define TR_TTRIM "T-Trim" +#define TR_TTRACE INDENT"T-Trace" +#define TR_TTRIM INDENT"T-Trim" #define TR_BEEPCTR "Ctr Beep" #define TR_PROTO INDENT"Proto" #define TR_PPMFRAME "PPM frame" @@ -504,7 +504,8 @@ #define TR_MEMORYWARNING INDENT"Memoria Baixa" #define TR_ALARMWARNING INDENT"Som Off" #define TR_RENAVIG "RotEnc Navig" -#define TR_THROTTLEREVERSE "Inverte Acel." +#define TR_THROTTLE_LABEL "Throttle" +#define TR_THROTTLEREVERSE INDENT"Inverte Acel." #define TR_MINUTEBEEP INDENT"Beep Minuto" #define TR_BEEPCOUNTDOWN INDENT"Beep Regressivo" #define TR_PERSISTENT INDENT"Persist." @@ -513,9 +514,9 @@ #define TR_BLONBRIGHTNESS INDENT"ON Brightness" #define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness" #define TR_SPLASHSCREEN "Splash screen" -#define TR_THROTTLEWARNING "Avisa Acel" -#define TR_SWITCHWARNING "Avisa Chav" -#define TR_POTWARNING TR("Pot Warn.","Pot Warning") +#define TR_THROTTLEWARNING TR("Avisa Acel",INDENT"Avisa Acel") +#define TR_SWITCHWARNING TR("Avisa Chav",INDENT"Avisa Chav") +#define TR_POTWARNING TR("Pot Warn.",INDENT"Pot Warning") #define TR_TIMEZONE "Time Zone" #define TR_RXCHANNELORD "Ordem Canal RX" #define TR_SLAVE "Escravo" @@ -710,7 +711,8 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" -#define TR_CHECKLIST "Display Checklist" +#define TR_PREFLIGHT "Preflight Checks" +#define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_UART3MODE "Serial port" #define TR_POT1TYPE "S1 Type" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 3e899b755..0fac67a01 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Gränser++","Utökade Gränser") #define TR_ETRIMS TR("Trimmar++","Utökade Trimmar") #define TR_TRIMINC TR("Trimning","Trimökning") -#define TR_TTRACE "Följ Gas" -#define TR_TTRIM "Gastrim" +#define TR_TTRACE INDENT"Följ Gas" +#define TR_TTRIM INDENT"Gastrim" #define TR_BEEPCTR TR("Cent.pip", "Centerpip") #define TR_PROTO TR(INDENT"Proto",INDENT"Protokoll") #define TR_PPMFRAME "PPM-paket" @@ -504,7 +504,8 @@ #define TR_MEMORYWARNING INDENT"Lite Minne" #define TR_ALARMWARNING INDENT"Ljud Av" #define TR_RENAVIG "RotEnc Navig" -#define TR_THROTTLEREVERSE "Revers.Gas" +#define TR_THROTTLE_LABEL "Throttle" +#define TR_THROTTLEREVERSE INDENT"Revers.Gas" #define TR_MINUTEBEEP INDENT"Minutpip" #define TR_BEEPCOUNTDOWN INDENT"Räkna Ned" #define TR_PERSISTENT TR("Jämt på ",INDENT"Alltid På") @@ -513,9 +514,9 @@ #define TR_BLONBRIGHTNESS INDENT"På Ljusstyrka" #define TR_BLOFFBRIGHTNESS INDENT"Av Ljusstyrka" #define TR_SPLASHSCREEN "Startbild" -#define TR_THROTTLEWARNING "Gasvarning" -#define TR_SWITCHWARNING TR("Bryt.varn.","Brytarvarning") -#define TR_POTWARNING TR("Pot Warn.","Pot Warning") +#define TR_THROTTLEWARNING TR("Gasvarning",INDENT"Gasvarning") +#define TR_SWITCHWARNING TR("Bryt.varn.",INDENT"Brytarvarning") +#define TR_POTWARNING TR("Pot Warn.",INDENT"Pot Warning") #define TR_TIMEZONE TR("Tidszon","GPS Tidszon") #define TR_RXCHANNELORD "Kanaler i RX" #define TR_SLAVE "Elev" @@ -710,7 +711,8 @@ #define TR_LOWALARM INDENT "Låg-alarm" #define TR_CRITICALALARM INDENT "Kritiskt alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" -#define TR_CHECKLIST "Display Checklist" +#define TR_PREFLIGHT "Preflight Checks" +#define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_UART3MODE "Serieporten" #define TR_POT1TYPE "S1-ratten" From 61bb02ceea619ba4e07a1e5e4745174d80751394 Mon Sep 17 00:00:00 2001 From: mhotar Date: Sat, 1 Mar 2014 23:32:05 +0100 Subject: [PATCH 04/13] Thr grouping for Taranis only --- radio/src/gui/menu_model.cpp | 8 +++++--- radio/src/translations.cpp | 2 +- radio/src/translations.h | 2 +- radio/src/translations/cz.h.txt | 6 +++--- radio/src/translations/de.h.txt | 6 +++--- radio/src/translations/en.h.txt | 6 +++--- radio/src/translations/es.h.txt | 6 +++--- radio/src/translations/fi.h.txt | 6 +++--- radio/src/translations/fr.h.txt | 6 +++--- radio/src/translations/it.h.txt | 6 +++--- radio/src/translations/pl.h.txt | 6 +++--- radio/src/translations/pt.h.txt | 6 +++--- radio/src/translations/se.h.txt | 6 +++--- 13 files changed, 37 insertions(+), 35 deletions(-) diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index da8b1ae88..5e42edc11 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -870,7 +870,7 @@ enum menuModelSetupItems { ITEM_MODEL_EXTENDED_LIMITS, ITEM_MODEL_EXTENDED_TRIMS, ITEM_MODEL_TRIM_INC, - ITEM_MODEL_THROTTLE_LABEL, + CASE_PCBTARANIS(ITEM_MODEL_THROTTLE_LABEL) ITEM_MODEL_THROTTLE_REVERSED, ITEM_MODEL_THROTTLE_TRACE, ITEM_MODEL_THROTTLE_TRIM, @@ -972,13 +972,13 @@ void menuModelSetup(uint8_t event) #define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX) uint8_t protocol = g_model.protocol; - MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 0, 0,LABEL(Throttle), 0, 0, 0, 0, 5, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2 }); + MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2 }); #else #define CURSOR_ON_CELL (true) #define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX) uint8_t protocol = g_model.protocol; - MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0,LABEL(Throttle), 0, 0, 0, 0, 6, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2, CASE_PCBSKY9X(1) CASE_PCBSKY9X(2) }); + MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, 0, 0, 0, 0, 6, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2, CASE_PCBSKY9X(1) CASE_PCBSKY9X(2) }); #endif if (!MENU_CHECK(menuTabModel, e_ModelSetup, MODEL_SETUP_MAX_LINES)) { @@ -1123,9 +1123,11 @@ void menuModelSetup(uint8_t event) g_model.trimInc = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_TRIMINC, STR_VTRIMINC, g_model.trimInc, -2, 2, attr, event); break; +#if defined(PCBTARANIS) case ITEM_MODEL_THROTTLE_LABEL: lcd_putsLeft(y, STR_THROTTLE_LABEL); break; +#endif case ITEM_MODEL_THROTTLE_REVERSED: g_model.throttleReversed = onoffMenuItem(g_model.throttleReversed, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLEREVERSE, attr, event ) ; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index b30c2f26e..12dff79c1 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -211,7 +211,6 @@ const pm_char STR_ALARMWARNING[] PROGMEM = TR_ALARMWARNING; #if defined(ROTARY_ENCODERS) const pm_char STR_RENAVIG[] PROGMEM = TR_RENAVIG; #endif -const pm_char STR_THROTTLE_LABEL[] PROGMEM = TR_THROTTLE_LABEL; const pm_char STR_THROTTLEREVERSE[] PROGMEM = TR_THROTTLEREVERSE; const pm_char STR_MINUTEBEEP[] PROGMEM = TR_MINUTEBEEP; const pm_char STR_BEEPCOUNTDOWN[] PROGMEM = TR_BEEPCOUNTDOWN; @@ -502,6 +501,7 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text"; const pm_char STR_UART3MODE[] PROGMEM = TR_UART3MODE; const pm_char STR_POT1TYPE[] PROGMEM = TR_POT1TYPE; const pm_char STR_POT2TYPE[] PROGMEM = TR_POT2TYPE; + const pm_char STR_THROTTLE_LABEL[] PROGMEM = TR_THROTTLE_LABEL; #endif #if MENUS_LOCK == 1 diff --git a/radio/src/translations.h b/radio/src/translations.h index ec882c0a2..5154676b8 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -370,7 +370,6 @@ extern const pm_char STR_INACTIVITYALARM[]; extern const pm_char STR_MEMORYWARNING[]; extern const pm_char STR_ALARMWARNING[]; extern const pm_char STR_RENAVIG[]; -extern const pm_char STR_THROTTLE_LABEL[]; extern const pm_char STR_THROTTLEREVERSE[]; extern const pm_char STR_MINUTEBEEP[]; extern const pm_char STR_BEEPCOUNTDOWN[]; @@ -693,6 +692,7 @@ extern const pm_char STR_VIEW_TEXT[]; extern const pm_char STR_UART3MODE[]; extern const pm_char STR_POT1TYPE[]; extern const pm_char STR_POT2TYPE[]; + extern const pm_char STR_THROTTLE_LABEL[]; #endif #if MENUS_LOCK == 1 diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 09d101a40..91b85620d 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limit+25%", "Kanál +/- 125%") #define TR_ETRIMS TR("širšíTrim", "Široký trim") #define TR_TRIMINC TR("KrokTrimu", "Krok trimu") -#define TR_TTRACE TR(INDENT "StopaPlyn", INDENT "Stopař plynu") -#define TR_TTRIM TR(INDENT "TrimPlynu", INDENT "Trim-volnoběh") +#define TR_TTRACE TR("StopaPlyn", INDENT "Stopař plynu") +#define TR_TTRIM TR("TrimPlynu", INDENT "Trim-volnoběh") #define TR_BEEPCTR "(\043)Středy" #define TR_PROTO INDENT"Protokol" #define TR_PPMFRAME "PPM frame" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Vypnutý zvuk" #define TR_RENAVIG "Navig. RotEnc" #define TR_THROTTLE_LABEL "Plyn" -#define TR_THROTTLEREVERSE INDENT "Revers" +#define TR_THROTTLEREVERSE TR("ReversPlyn", INDENT"Revers plynu") #define TR_MINUTEBEEP TR(INDENT"Minuta", INDENT"Oznamovat minuty") #define TR_BEEPCOUNTDOWN INDENT"Odpočet" #define TR_PERSISTENT INDENT"Trvalé" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index eae9626d5..e93fcd68f 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Erw.Limit","Erweit. Limits") #define TR_ETRIMS TR("Erw.Trims","Erweit. Trimmung") #define TR_TRIMINC TR("Trim Schr.","Trimm Schritte") -#define TR_TTRACE TR(INDENT "Gasquelle", INDENT "Gas Quelle") -#define TR_TTRIM TR(INDENT "Gastrim",INDENT "Gas Trimmung") +#define TR_TTRACE TR("Gasquelle", INDENT "Gas Quelle") +#define TR_TTRIM TR("Gastrim",INDENT "Gas Trimmung") #define TR_BEEPCTR TR("Mitt.Piep","Mittelst. Pieps") #define TR_PROTO TR(INDENT"Proto.",INDENT"Protokoll") #define TR_PPMFRAME "PPM Einst." @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Ton aus" #define TR_RENAVIG "Drehgeb. Navig." #define TR_THROTTLE_LABEL "Gas" -#define TR_THROTTLEREVERSE TR(INDENT "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_BEEPCOUNTDOWN INDENT"Countdown" #define TR_PERSISTENT TR(INDENT"M-Zeit",INDENT"Modell Zeit") diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index b34cd334b..a7c5f9938 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -450,8 +450,8 @@ #define TR_ELIMITS TR("E.Limits", "Extended Limits") #define TR_ETRIMS TR("E.Trims", "Extended Trims") #define TR_TRIMINC "Trim Step" -#define TR_TTRACE INDENT "Source" -#define TR_TTRIM INDENT "Idle Trim" +#define TR_TTRACE TR("T-Source", INDENT "Source") +#define TR_TTRIM TR("T-IdleTrim", INDENT "Idle Trim") #define TR_BEEPCTR TR("Ctr Beep", "Center Beep") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocol") #define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") @@ -515,7 +515,7 @@ #define TR_ALARMWARNING INDENT"Sound Off" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE INDENT "Reverse" +#define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Reverse") #define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Minute call") #define TR_BEEPCOUNTDOWN INDENT"Countdown" #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistent") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index c01910b4e..d361be05b 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("E.Limite","Ampliar Limites") #define TR_ETRIMS TR("E.Trims","Ampliar Trims") #define TR_TRIMINC "Paso Trim" -#define TR_TTRACE TR( INDENT "Fuente-A", INDENT "Fuente Acelerad") -#define TR_TTRIM TR(INDENT "Trim-A", INDENT "Trim Acelerad") +#define TR_TTRACE TR("Fuente-A", INDENT "Fuente Acelerad") +#define TR_TTRIM TR("Trim-A", INDENT "Trim Acelerad") #define TR_BEEPCTR TR("Ctr Beep","Center Beep") #define TR_PROTO TR(INDENT"Proto",INDENT"Protocol") #define TR_PPMFRAME "Trama PPM" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Sin Sonido" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR(INDENT "Invert_Acel", INDENT "Invertir Acel.") +#define TR_THROTTLEREVERSE TR("Invert_Acel", INDENT "Invertir Acel.") #define TR_MINUTEBEEP TR(INDENT"Minuto",INDENT"Cada Minuto") #define TR_BEEPCOUNTDOWN INDENT"Cuentaatras" #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistente") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 41509b804..d0541e7f2 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("E.Limits", "Extended Limits") #define TR_ETRIMS TR("E.Trims", "Extended Trims") #define TR_TRIMINC "Trim Step" -#define TR_TTRACE TR(INDENT "T-Source", INDENT "Throttle Source") -#define TR_TTRIM TR(INDENT "T-Trim", INDENT "Throttle Trim") +#define TR_TTRACE TR("T-Source", INDENT "Throttle Source") +#define TR_TTRIM TR("T-Trim", INDENT "Throttle Trim") #define TR_BEEPCTR TR("Ctr Beep", "Center Beep") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocol") #define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Sound Off" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR(INDENT "T-Reverse", INDENT "Throttle reverse") +#define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Throttle reverse") #define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Minute call") #define TR_BEEPCOUNTDOWN INDENT"Countdown" #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistent") diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 88135ba8b..6fec8a7d7 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limites ét","Limites étendues") #define TR_ETRIMS TR("Trims ét.","Trims étendus") #define TR_TRIMINC TR("Pas Trim","Pas des trims") -#define TR_TTRACE INDENT"Source gaz" -#define TR_TTRIM INDENT"Trim gaz" +#define TR_TTRACE TR("Source gaz",INDENT"Source gaz") +#define TR_TTRIM TR("Trim gaz",INDENT"Trim gaz") #define TR_BEEPCTR TR("Bips centr","Bips centrage") #define TR_PROTO TR(INDENT"Proto.",INDENT"Protocole") #define TR_PPMFRAME INDENT"Trame PPM" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING TR(INDENT"Silence",INDENT"Sons désactivés") #define TR_RENAVIG "Navig EncRot" #define TR_THROTTLE_LABEL "Gaz" -#define TR_THROTTLEREVERSE TR(INDENT"Inv. gaz",INDENT"Inversion gaz") +#define TR_THROTTLEREVERSE TR("Inv. gaz",INDENT"Inversion gaz") #define TR_MINUTEBEEP TR(INDENT"Bip min.",INDENT"Annonces minutes") #define TR_BEEPCOUNTDOWN TR(INDENT"Bip fin",INDENT"Compte à rebours") #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistant") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index cba63389d..7e3283647 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limiti.E","Limiti Estesi") #define TR_ETRIMS TR("Trim Ext","Trim Estesi") #define TR_TRIMINC "Trim Step" -#define TR_TTRACE TR(INDENT "T-Source",INDENT "Throttle Source") -#define TR_TTRIM TR(INDENT "T-Trim",INDENT "Throttle Trim") +#define TR_TTRACE TR("T-Source",INDENT "Throttle Source") +#define TR_TTRIM TR("T-Trim",INDENT "Throttle Trim") #define TR_BEEPCTR TR("Ctr Beep","Center Beep") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocollo") #define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Spento" #define TR_RENAVIG "Navig RotEnc " #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR(INDENT "Thr inv.", INDENT "Throttle Inverso") +#define TR_THROTTLEREVERSE TR("Thr inv.", INDENT "Throttle Inverso") #define TR_MINUTEBEEP INDENT"Minuto" #define TR_BEEPCOUNTDOWN TR(INDENT"Conto rov",INDENT"Conto rovescia") #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistente") diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index f2434da46..065201e6d 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limit+25%", "Kanał +/- 125%") #define TR_ETRIMS TR("Trymery 100%", "Poszerzone Trymery") #define TR_TRIMINC TR("Krok Trymera", "Krok trymera") -#define TR_TTRACE TR(INDENT"Źródło gazu", INDENT"Źródło gazu") -#define TR_TTRIM TR(INDENT"Trymer gazu", INDENT"Trymer gazu") +#define TR_TTRACE TR("Źródło gazu", INDENT"Źródło gazu") +#define TR_TTRIM TR("Trymer gazu", INDENT"Trymer gazu") #define TR_BEEPCTR "(\043)Pikanie środka" #define TR_PROTO INDENT"Protokól" #define TR_PPMFRAME "Ramka PPM" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Wyłącz dźwięk" #define TR_RENAVIG "Nawigacja potencjometrem" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR(INDENT"Odwróć gaz", INDENT"Odwróć gaz") +#define TR_THROTTLEREVERSE TR("Odwróć gaz", INDENT"Odwróć gaz") #define TR_MINUTEBEEP TR(INDENT"Minuta", INDENT"Pik co minutę") #define TR_BEEPCOUNTDOWN TR(INDENT"Odliczanie", INDENT"Odliczanie") #define TR_PERSISTENT INDENT"Dokładny" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 8e8c17b2c..aa6662795 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS "E.Limits" #define TR_ETRIMS "E.Trims" #define TR_TRIMINC "Trim Step" -#define TR_TTRACE INDENT"T-Trace" -#define TR_TTRIM INDENT"T-Trim" +#define TR_TTRACE TR("T-Trace",INDENT"T-Trace") +#define TR_TTRIM TR("T-Trim",INDENT"T-Trim") #define TR_BEEPCTR "Ctr Beep" #define TR_PROTO INDENT"Proto" #define TR_PPMFRAME "PPM frame" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Som Off" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE INDENT"Inverte Acel." +#define TR_THROTTLEREVERSE TR("Inverte Acel.",INDENT"Inverte Acel.") #define TR_MINUTEBEEP INDENT"Beep Minuto" #define TR_BEEPCOUNTDOWN INDENT"Beep Regressivo" #define TR_PERSISTENT INDENT"Persist." diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 0fac67a01..024726df1 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Gränser++","Utökade Gränser") #define TR_ETRIMS TR("Trimmar++","Utökade Trimmar") #define TR_TRIMINC TR("Trimning","Trimökning") -#define TR_TTRACE INDENT"Följ Gas" -#define TR_TTRIM INDENT"Gastrim" +#define TR_TTRACE TR("Följ Gas",INDENT"Följ Gas") +#define TR_TTRIM TR("Gastrim",INDENT"Gastrim") #define TR_BEEPCTR TR("Cent.pip", "Centerpip") #define TR_PROTO TR(INDENT"Proto",INDENT"Protokoll") #define TR_PPMFRAME "PPM-paket" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Ljud Av" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE INDENT"Revers.Gas" +#define TR_THROTTLEREVERSE TR("Revers.Gas",INDENT"Revers.Gas") #define TR_MINUTEBEEP INDENT"Minutpip" #define TR_BEEPCOUNTDOWN INDENT"Räkna Ned" #define TR_PERSISTENT TR("Jämt på ",INDENT"Alltid På") From 9bb64c07ae17e6c74d5a056b6a86aee54ba0ebe4 Mon Sep 17 00:00:00 2001 From: bsongis Date: Mon, 3 Mar 2014 22:57:46 +0100 Subject: [PATCH 05/13] Align french translations --- radio/src/translations/en.h.txt | 64 ++--- radio/src/translations/fr.h.txt | 432 ++++++++++++++++---------------- 2 files changed, 251 insertions(+), 245 deletions(-) diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index e99c62650..7f26756f8 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -168,7 +168,7 @@ #endif #if defined(CPUARM) - #define TR_CSWEQUAL "a=x\0 " + #define TR_CSWEQUAL "a=x\0 " #else #define TR_CSWEQUAL #endif @@ -333,7 +333,7 @@ #define TR_VSCREEN "Nums""Bars" #define LEN_GPSFORMAT "\004" -#define TR_GPSFORMAT "HMS NMEA" +#define TR_GPSFORMAT "HMS ""NMEA" #define LEN2_VTEMPLATES 13 #define LEN_VTEMPLATES "\015" @@ -474,17 +474,17 @@ #define TR_ELEDIRECTION TR("ELE Direction","Long. cyc. direction") #define TR_AILDIRECTION TR("AIL Direction","Lateral cyc. direction") #define TR_COLDIRECTION TR("PIT Direction","Coll. pitch direction") -#define TR_MODE INDENT"Mode" +#define TR_MODE INDENT "Mode" #define TR_NOFREEEXPO "No free expo!" #define TR_NOFREEMIXER "No free mixer!" #define TR_INSERTMIX "INSERT MIX " #define TR_EDITMIX "EDIT MIX " -#define TR_SOURCE INDENT"Source" +#define TR_SOURCE INDENT "Source" #define TR_WEIGHT "Weight" #define TR_EXPO TR("Expo","Exponential") #define TR_SIDE "Side" #define TR_DIFFERENTIAL "Differ" -#define TR_OFFSET INDENT"Offset" +#define TR_OFFSET INDENT "Offset" #define TR_TRIM "Trim" #define TR_DREX "DRex" #define TR_CURVE "Curve" @@ -500,33 +500,33 @@ #define TR_CV "CV" #define TR_GV "GV" #define TR_ACHANNEL "A\004channel" -#define TR_RANGE INDENT"Range" +#define TR_RANGE INDENT "Range" #define TR_BAR "Bar" -#define TR_ALARM INDENT"Alarm" +#define TR_ALARM INDENT "Alarm" #define TR_USRDATA "UsrData" -#define TR_BLADES INDENT"Blades" +#define TR_BLADES INDENT "Blades" #define TR_SCREEN "Screen " #define TR_SOUND_LABEL "Sound" -#define TR_LENGTH INDENT"Length" -#define TR_SPKRPITCH INDENT"Pitch" +#define TR_LENGTH INDENT "Length" +#define TR_SPKRPITCH INDENT "Pitch" #define TR_HAPTIC_LABEL "Haptic" -#define TR_HAPTICSTRENGTH INDENT"Strength" +#define TR_HAPTICSTRENGTH INDENT "Strength" #define TR_CONTRAST "Contrast" #define TR_ALARMS_LABEL "Alarms" #define TR_BATTERY_RANGE TR("Battery range","Battery meter range") -#define TR_BATTERYWARNING INDENT"Battery Low" -#define TR_INACTIVITYALARM INDENT"Inactivity" -#define TR_MEMORYWARNING INDENT"Memory Low" -#define TR_ALARMWARNING INDENT"Sound Off" +#define TR_BATTERYWARNING INDENT "Battery Low" +#define TR_INACTIVITYALARM INDENT "Inactivity" +#define TR_MEMORYWARNING INDENT "Memory Low" +#define TR_ALARMWARNING INDENT "Sound Off" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLEREVERSE TR("T-Reverse", "Throttle reverse") -#define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Minute call") -#define TR_BEEPCOUNTDOWN INDENT"Countdown" -#define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistent") +#define TR_MINUTEBEEP TR(INDENT "Minute",INDENT "Minute call") +#define TR_BEEPCOUNTDOWN INDENT "Countdown" +#define TR_PERSISTENT TR(INDENT "Persist.",INDENT "Persistent") #define TR_BACKLIGHT_LABEL "Backlight" -#define TR_BLDELAY INDENT"Duration" -#define TR_BLONBRIGHTNESS INDENT"ON Brightness" -#define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness" +#define TR_BLDELAY INDENT "Duration" +#define TR_BLONBRIGHTNESS INDENT "ON Brightness" +#define TR_BLOFFBRIGHTNESS INDENT "OFF Brightness" #define TR_SPLASHSCREEN "Splash screen" #define TR_THROTTLEWARNING TR("T-Warning","Throttle Warning") #define TR_SWITCHWARNING TR("S-Warning","Switch Warning") @@ -610,9 +610,9 @@ #define TR_MENUTEMPLATES "TEMPLATES" #define TR_MENUSTAT "STATS" #define TR_MENUDEBUG "DEBUG" -#define TR_RXNUM TR("RxNum", INDENT"Receiver No.") +#define TR_RXNUM TR("RxNum", INDENT "Receiver No.") #define TR_SYNCMENU "[Sync]" -#define TR_LIMIT INDENT"Limit" +#define TR_LIMIT INDENT "Limit" #define TR_MINRSSI "Min Rssi" #define TR_LATITUDE "Latitude" #define TR_LONGITUDE "Longitude" @@ -621,8 +621,8 @@ #define TR_SHUTDOWN "SHUTTING DOWN" #define TR_BATT_CALIB "Battery Calib" #define TR_CURRENT_CALIB "Current Calib" -#define TR_VOLTAGE INDENT"Voltage" -#define TR_CURRENT INDENT"Current" +#define TR_VOLTAGE INDENT "Voltage" +#define TR_CURRENT INDENT "Current" #define TR_SELECT_MODEL "Select Model" #define TR_CREATE_MODEL "Create Model" #define TR_COPY_MODEL "Copy Model" @@ -710,8 +710,8 @@ #define TR_ABOUT_US "About" #define TR_AND_SWITCH "AND Switch" #define TR_CF "CF" -#define TR_SPEAKER INDENT"Speaker" -#define TR_BUZZER INDENT"Buzzer" +#define TR_SPEAKER INDENT "Speaker" +#define TR_BUZZER INDENT "Buzzer" #define TR_BYTES "bytes" #define TR_MODULE_BIND "[Bind]" #define TR_MODULE_RANGE "[Range]" @@ -807,11 +807,11 @@ #define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" #define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" -#define TR_CHR_SHORT 's' -#define TR_CHR_LONG 'l' -#define TR_CHR_TOGGLE 't' -#define TR_CHR_HOUR 'h' -#define TR_CHR_INPUT 'I' // Values between A-I will work +#define TR_CHR_SHORT 's' +#define TR_CHR_LONG 'l' +#define TR_CHR_TOGGLE 't' +#define TR_CHR_HOUR 'h' +#define TR_CHR_INPUT 'I' // Values between A-I will work #define TR_BEEP_VOLUME "Beep Volume" #define TR_WAV_VOLUME "Wav Volume" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index d1762df32..69880ef7c 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -1,10 +1,7 @@ /* * Authors (alphabetical order) + * - Andre Bernet * - Bertrand Songis - * - Bernet Andre - * - Kjell Kernen - * - Martin Hotar - * - Romolo Manfredini * * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, @@ -39,90 +36,90 @@ * \001 to \035 -extended spacing (value * FW/2) * \0 -ends actual string */ - + // NON ZERO TERMINATED STRINGS -#define LEN_OFFON "\003" -#define TR_OFFON "OFF""ON\0" +#define LEN_OFFON "\003" +#define TR_OFFON "OFF""ON\0" -#define LEN_MMMINV "\003" -#define TR_MMMINV "---""INV" +#define LEN_MMMINV "\003" +#define TR_MMMINV "---""INV" -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" +#define LEN_NCHANNELS "\004" +#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" -#define LEN_VBEEPMODE "\005" -#define TR_VBEEPMODE "Aucun""Alarm""NoKey""Tout\0" +#define LEN_VBEEPMODE "\005" +#define TR_VBEEPMODE "Aucun""Alarm""NoKey""Tout\0" -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" +#define LEN_VBEEPLEN "\005" +#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" -#define LEN_VRENAVIG "\003" -#define TR_VRENAVIG "NonREaREb" +#define LEN_VRENAVIG "\003" +#define TR_VRENAVIG "NonREaREb" -#define LEN_VBLMODE TR("\004","\011") -#define TR_VBLMODE TR("OFF\0""Btns""Ctrl""Tous""ON\0","OFF\0 ""Touches\0 ""Controles""Tous\0 ""ON\0 ") +#define LEN_VBLMODE TR("\004","\011") +#define TR_VBLMODE TR("OFF\0""Btns""Ctrl""Tous""ON\0","OFF\0 ""Touches\0 ""Controles""Tous\0 ""ON\0 ") -#define LEN_TRNMODE "\003" -#define TR_TRNMODE "OFF"" +="" :=" +#define LEN_TRNMODE "\003" +#define TR_TRNMODE "OFF"" +="" :=" -#define LEN_TRNCHN "\003" -#define TR_TRNCHN "CH1CH2CH3CH4" +#define LEN_TRNCHN "\003" +#define TR_TRNCHN "CH1CH2CH3CH4" -#define LEN_UART3MODES "\017" -#define TR_UART3MODES "OFF\0 ""Recopie S-Port\0""Debug\0 " +#define LEN_UART3MODES "\017" +#define TR_UART3MODES "OFF\0 ""Recopie S-Port\0""Debug\0 " -#define LEN_POTTYPES "\017" -#define TR_POTTYPES "Potentiomètre\0 ""Inter multi-pos" +#define LEN_POTTYPES "\017" +#define TR_POTTYPES "Rien\0 ""Potentiomètre\0 ""Inter multi-pos" -#define LEN_DATETIME "\005" -#define TR_DATETIME "DATE:""HEURE" +#define LEN_DATETIME "\005" +#define TR_DATETIME "DATE:""HEURE" -#define LEN_VLCD "\006" -#define TR_VLCD "NormalOptrex" +#define LEN_VLCD "\006" +#define TR_VLCD "NormalOptrex" -#define LEN_COUNTRYCODES TR("\002", "\006") -#define TR_COUNTRYCODES TR("US""JP""EU", "USA\0 ""Japon\0""Europe") +#define LEN_COUNTRYCODES TR("\002", "\006") +#define TR_COUNTRYCODES TR("US""JP""EU", "USA\0 ""Japon\0""Europe") -#define LEN_VTRIMINC TR("\006","\013") -#define TR_VTRIMINC TR("Expo\0 ""ExFin\0""Fin\0 ""Moyen\0""Gros\0 ","Exponentiel""Extra Fin\0 ""Fin\0 ""Moyen\0 ""Grossier\0 ") +#define LEN_VTRIMINC TR("\006","\013") +#define TR_VTRIMINC TR("Expo\0 ""ExFin\0""Fin\0 ""Moyen\0""Gros\0 ","Exponentiel""Extra Fin\0 ""Fin\0 ""Moyen\0 ""Grossier\0 ") #define LEN_VBEEPCOUNTDOWN "\006" #define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0" -#define LEN_RETA123 "\001" +#define LEN_RETA123 "\001" #if defined(PCBGRUVIN9X) #if ROTARY_ENCODERS > 2 - #define TR_RETA123 "DPGA123abcd" + #define TR_RETA123 "DPGA123abcd" #else - #define TR_RETA123 "DPGA123ab" + #define TR_RETA123 "DPGA123ab" #endif #elif defined(PCBTARANIS) - #define TR_RETA123 "DPGA12LR" -#else - #define TR_RETA123 "DPGA123" + #define TR_RETA123 "DPGA12LR" +#else + #define TR_RETA123 "DPGA123" #endif -#define LEN_VPROTOS "\006" +#define LEN_VPROTOS "\006" #if defined(PXX) - #define TR_PXX "PXX\0 " + #define TR_PXX "PXX\0 " #elif defined(DSM2) || defined(IRPROTOS) - #define TR_PXX "[PXX]\0" + #define TR_PXX "[PXX]\0" #else #define TR_PXX #endif #if defined(DSM2) - #define TR_DSM2 "LP45\0 ""DSM2\0 ""DSMX\0 " + #define TR_DSM2 "LP45\0 ""DSM2\0 ""DSMX\0 " #elif defined(IRPROTOS) - #define TR_DSM2 "[LP45]""[DSM2]""[DSMX]" + #define TR_DSM2 "[LP45]""[DSM2]""[DSMX]" #else #define TR_DSM2 #endif #if defined(IRPROTOS) - #define TR_IRPROTOS "SILV TRAC09PICZ SWIFT\0" + #define TR_IRPROTOS "SILV TRAC09PICZ SWIFT\0" #else #define TR_IRPROTOS #endif @@ -130,25 +127,25 @@ #if defined(CPUARM) #define TR_XPPM #else - #define TR_XPPM "PPM16\0""PPMsim" + #define TR_XPPM "PPM16\0""PPMsim" #endif -#define TR_VPROTOS "PPM\0 " TR_XPPM TR_PXX TR_DSM2 TR_IRPROTOS +#define TR_VPROTOS "PPM\0 " TR_XPPM TR_PXX TR_DSM2 TR_IRPROTOS -#define LEN_POSNEG "\003" -#define TR_POSNEG "POS""NEG" +#define LEN_POSNEG "\003" +#define TR_POSNEG "POS""NEG" -#define LEN_VCURVEFUNC "\003" -#define TR_VCURVEFUNC "---""x>0""x<0""|x|""f>0""f<0""|f|" +#define LEN_VCURVEFUNC "\003" +#define TR_VCURVEFUNC "---""x>0""x<0""|x|""f>0""f<0""|f|" -#define LEN_VMLTPX TR("\010","\013") -#define TR_VMLTPX TR("Ajoute\0 ""Multipl.""Remplace","Additionner""Multiplier\0""Remplacer\0 ") +#define LEN_VMLTPX TR("\010", "\013") +#define TR_VMLTPX TR("Ajoute\0 ""Multipl.""Remplace","Additionner""Multiplier\0""Remplacer\0 ") -#define LEN_VMLTPX2 "\002" -#define TR_VMLTPX2 "+=""*="":=" +#define LEN_VMLTPX2 "\002" +#define TR_VMLTPX2 "+=""*="":=" -#define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS "OFF""ON\0""Dir""Prf""Gaz""Ail" +#define LEN_VMIXTRIMS "\003" +#define TR_VMIXTRIMS "OFF""ON\0""Dir""Prf""Gaz""Ail" #if defined(PCBTARANIS) #define TR_CSWTIMER "Tempo" @@ -168,86 +165,87 @@ #endif #if defined(CPUARM) - #define TR_CSWEQUAL "a=x\0 " + #define TR_CSWEQUAL "a=x\0 " #else #define TR_CSWEQUAL #endif -#define LEN_VCSWFUNC "\005" +#define LEN_VCSWFUNC "\005" #if defined(CPUARM) -#define TR_VCSWFUNC "---\0 " TR_CSWEQUAL "a{x\0 ""a>x\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""a" +#define LEN_VALARMFN "\001" +#define TR_VALARMFN "<>" -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "Aucun ""Hub\0 ""WSHHigh""Halcyon" +#define LEN_VTELPROTO "\007" +#define TR_VTELPROTO "Aucun ""Hub\0 ""WSHHigh""Halcyon" -#define LEN_VOLTSRC "\003" -#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel" +#define LEN_VOLTSRC "\003" +#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel" -#define LEN_VARIOSRC "\005" +#define LEN_VARIOSRC "\005" #if defined(FRSKY_SPORT) - #define TR_VARIOSRC "Vario""A1\0 ""A2\0" + #define TR_VARIOSRC "Vario""A1\0 ""A2\0""dTE\0" #else #define TR_VARIOSRC "Alti\0""Alti+""Vario""A1\0 ""A2\0" #endif -#define LEN_VSCREEN TR("\004","\007") -#define TR_VSCREEN TR("Val.""Bars","Valeurs""Barres\0") +#define LEN_VSCREEN TR("\004", "\007") +#define TR_VSCREEN TR("Val.""Bars", "Valeurs""Barres\0") -#define LEN_GPSFORMAT "\004" -#define TR_GPSFORMAT "DMS\0NMEA" +#define LEN_GPSFORMAT "\004" +#define TR_GPSFORMAT "DMS\0""NMEA" -#define LEN2_VTEMPLATES 15 -#define LEN_VTEMPLATES "\017" -#define TR_VTEMPLATES "Suppr Mixages\0 ""4 Voies simple\0""Coupure Gaz\0 ""Empennage V\0 ""Elevon\\Delta\0 ""eCCPM\0 ""Conf. Hélico\0 ""Test Servo\0 " +#define LEN2_VTEMPLATES 15 +#define LEN_VTEMPLATES "\017" +#define TR_VTEMPLATES "Suppr Mixages\0 ""4 Voies simple\0""Coupure Gaz\0 ""Empennage V\0 ""Elevon\\Delta\0 ""eCCPM\0 ""Conf. Hélico\0 ""Test Servo\0 " -#define LEN_VSWASHTYPE "\004" -#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" +#define LEN_VSWASHTYPE "\004" +#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" -#define LEN_VKEYS "\005" -#define TR_VKEYS TR("Menu\0""Exit\0""Bas\0 ""Haut\0""Droit""Gauch", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus") +#define LEN_VKEYS "\005" +#define TR_VKEYS TR("Menu\0""Exit\0""Bas\0 ""Haut\0""Droit""Gauch", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus") -#define LEN_VRENCODERS "\003" -#define TR_VRENCODERS "REa""REb" +#define LEN_VRENCODERS "\003" +#define TR_VRENCODERS "REa""REb" -#define LEN_VSWITCHES "\003" -#define LEN_VSRCRAW "\004" +#define LEN_VSWITCHES "\003" +#define LEN_VSRCRAW "\004" #if defined(PCBTARANIS) #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 " @@ -355,11 +361,11 @@ #endif #if defined(CPUARM) - #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC""ILD""ILE""ILF""ILG""ILH""ILI""ILJ""ILK""ILL""ILM""ILN""ILO""ILP""ILQ""ILR""ILS""ILT""ILU""ILV""ILW" + #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC""ILD""ILE""ILF""ILG""ILH""ILI""ILJ""ILK""ILL""ILM""ILN""ILO""ILP""ILQ""ILR""ILS""ILT""ILU""ILV""ILW" #elif defined(PCBGRUVIN9X) || defined(CPUM2561) || defined(CPUM128) - #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC""ILD""ILE""ILF" + #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC""ILD""ILE""ILF" #else - #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC" + #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC" #endif #define TR_TRIMS_SWITCHES "tDg""tDd""tPb""tPh""tGb""tGh""tAg""tAd" @@ -385,21 +391,21 @@ #endif #if defined(HELI) -#define TR_CYC_VSRCRAW "CYC1""CYC2""CYC3" + #define TR_CYC_VSRCRAW "CYC1""CYC2""CYC3" #else -#define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]" + #define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]" #endif -#define TR_VSRCRAW "---\0""Dir\0""Prf\0""Gaz\0""Ail\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" TR_SW_VSRCRAW +#define TR_VSRCRAW "---\0""Dir\0""Prf\0""Gaz\0""Ail\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" TR_SW_VSRCRAW -#define LEN_VTMRMODES "\003" -#define TR_VTMRMODES "OFF""ABS""GZs""GZ%""GZt" +#define LEN_VTMRMODES "\003" +#define TR_VTMRMODES "OFF""ABS""GZs""GZ%""GZt" #define LEN_VTRAINERMODES "\006" #define TR_VTRAINERMODES "Maître""Elève\0" -#define LEN_VFAILSAFE "\011" -#define TR_VFAILSAFE "Maintien\0""Prédéfini""Pas d'imp" +#define LEN_VFAILSAFE "\011" +#define TR_VFAILSAFE "Maintien\0""Prédéfini""Pas d'imp" #if defined(MAVLINK) #define LEN_MAVLINK_BAUDS "\006" @@ -442,43 +448,43 @@ #endif #define TR_BITMAP "Image du modèle" #define TR_TIMER "Chrono " -#define TR_ELIMITS TR("Limites ét","Limites étendues") -#define TR_ETRIMS TR("Trims ét.","Trims étendus") -#define TR_TRIMINC TR("Pas Trim","Pas des trims") +#define TR_ELIMITS TR("Limites ét", "Limites étendues") +#define TR_ETRIMS TR("Trims ét.", "Trims étendus") +#define TR_TRIMINC TR("Pas Trim", "Pas des trims") #define TR_TTRACE "Source gaz" #define TR_TTRIM "Trim gaz" -#define TR_BEEPCTR TR("Bips centr","Bips centrage") -#define TR_PROTO TR(INDENT"Proto.",INDENT"Protocole") -#define TR_PPMFRAME INDENT"Trame PPM" +#define TR_BEEPCTR TR("Bips centr", "Bips centrage") +#define TR_PROTO TR(INDENT "Proto.", INDENT "Protocole") +#define TR_PPMFRAME INDENT "Trame PPM" #define TR_MS "ms" -#define TR_SWITCH TR("Inter","Interrupteur") +#define TR_SWITCH TR("Inter", "Interrupteur") #define TR_TRIMS "Trims" #define TR_FADEIN "Fondu ON" #define TR_FADEOUT "Fondu OFF" #define TR_DEFAULT "(défaut)" #define TR_CHECKTRIMS "\006Vérif\012Trims" #define OFS_CHECKTRIMS (9*FW) -#define TR_SWASHTYPE TR("Type de Plat.","Type de plateau") -#define TR_COLLECTIVE TR("Collectif","Voie du pas collectif") -#define TR_SWASHRING TR("Limite Cycl.","Limite du cyclique") -#define TR_ELEDIRECTION TR("Inv. longitud.","Inversion longitudinal") -#define TR_AILDIRECTION TR("Inv. latéral","Inversion latéral") -#define TR_COLDIRECTION TR("Inv. collectif","Inversion collectif") -#define TR_MODE INDENT"Mode" +#define TR_SWASHTYPE TR("Type de Plat.", "Type de plateau") +#define TR_COLLECTIVE TR("Collectif", "Voie du pas collectif") +#define TR_SWASHRING TR("Limite Cycl.", "Limite du cyclique") +#define TR_ELEDIRECTION TR("Inv. longitud.", "Inversion longitudinal") +#define TR_AILDIRECTION TR("Inv. latéral", "Inversion latéral") +#define TR_COLDIRECTION TR("Inv. collectif", "Inversion collectif") +#define TR_MODE INDENT "Mode" #define TR_NOFREEEXPO "Max expos atteint!" #define TR_NOFREEMIXER "Max mixages atteint!" #define TR_INSERTMIX "INSERER MIXAGE" #define TR_EDITMIX "EDITER MIXAGE" -#define TR_SOURCE INDENT"Source" +#define TR_SOURCE INDENT "Source" #define TR_WEIGHT "Ratio" -#define TR_EXPO TR("Expo","Exponentiel") +#define TR_EXPO TR("Expo", "Exponentiel") #define TR_SIDE "Coté" #define TR_DIFFERENTIAL "Différentiel" -#define TR_OFFSET INDENT"Décalage" +#define TR_OFFSET INDENT "Décalage" #define TR_TRIM "Trim" #define TR_DREX "DRex" #define TR_CURVE "Courbe" -#define TR_FLMODE TR("Phase","Phases") +#define TR_FLMODE TR("Phase", "Phases") #define TR_MIXWARNING "Alerte" #define TR_OFF "OFF" #define TR_MULTPX "Opération" @@ -490,33 +496,33 @@ #define TR_CV "CB" #define TR_GV "VG" #define TR_ACHANNEL "A" -#define TR_RANGE INDENT"Plage" +#define TR_RANGE INDENT "Plage" #define TR_BAR "Barre" -#define TR_ALARM INDENT"Alarme" +#define TR_ALARM INDENT "Alarme" #define TR_USRDATA "Données" -#define TR_BLADES INDENT"Pales" +#define TR_BLADES INDENT "Pales" #define TR_SCREEN "Ecran " #define TR_SOUND_LABEL "Son" -#define TR_LENGTH INDENT"Durée" -#define TR_SPKRPITCH INDENT"Tonalité" +#define TR_LENGTH INDENT "Durée" +#define TR_SPKRPITCH INDENT "Tonalité" #define TR_HAPTIC_LABEL "Vibreur" -#define TR_HAPTICSTRENGTH INDENT"Force" +#define TR_HAPTICSTRENGTH INDENT "Force" #define TR_CONTRAST "Contraste" #define TR_ALARMS_LABEL "Alarmes" #define TR_BATTERY_RANGE "Plage batterie" -#define TR_BATTERYWARNING TR(INDENT"Batterie",INDENT"Batterie faible") -#define TR_INACTIVITYALARM INDENT"Inactivité" -#define TR_MEMORYWARNING INDENT"Mémoire pleine" -#define TR_ALARMWARNING TR(INDENT"Silence",INDENT"Sons désactivés") +#define TR_BATTERYWARNING TR(INDENT "Batterie",INDENT "Batterie faible") +#define TR_INACTIVITYALARM INDENT "Inactivité" +#define TR_MEMORYWARNING INDENT "Mémoire pleine" +#define TR_ALARMWARNING TR(INDENT "Silence",INDENT "Sons désactivés") #define TR_RENAVIG "Navig EncRot" #define TR_THROTTLEREVERSE TR("Inv. gaz","Inversion gaz") -#define TR_MINUTEBEEP TR(INDENT"Bip min.",INDENT"Annonces minutes") -#define TR_BEEPCOUNTDOWN TR(INDENT"Bip fin",INDENT"Compte à rebours") -#define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistant") +#define TR_MINUTEBEEP TR(INDENT "Bip min.",INDENT "Annonces minutes") +#define TR_BEEPCOUNTDOWN TR(INDENT "Bip fin",INDENT "Compte à rebours") +#define TR_PERSISTENT TR(INDENT "Persist.",INDENT "Persistant") #define TR_BACKLIGHT_LABEL "Rétroéclairage" -#define TR_BLDELAY INDENT"Durée" -#define TR_BLONBRIGHTNESS INDENT"Luminosité ON" -#define TR_BLOFFBRIGHTNESS INDENT"Luminosité OFF" +#define TR_BLDELAY INDENT "Durée" +#define TR_BLONBRIGHTNESS INDENT "Luminosité ON" +#define TR_BLOFFBRIGHTNESS INDENT "Luminosité OFF" #define TR_SPLASHSCREEN "Logo d'accueil" #define TR_THROTTLEWARNING "Alerte gaz" #define TR_SWITCHWARNING TR("Alerte int","Alerte interrupt.") @@ -581,28 +587,28 @@ #define TR_MENUHELISETUP TR("CONF.HELI","CONFIGURATION HELICO") #if defined(PCBTARANIS) - #define TR_MENUINPUTS "ENTREES" - #define TR_MENULIMITS "SORTIES" + #define TR_MENUINPUTS "ENTREES" + #define TR_MENULIMITS "SORTIES" #elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ... - #define TR_MENUINPUTS "MANCHES" - #define TR_MENULIMITS "SORTIES" + #define TR_MENUINPUTS "MANCHES" + #define TR_MENULIMITS "SORTIES" #else - #define TR_MENUINPUTS "DR/EXPO" - #define TR_MENULIMITS "LIMITES" + #define TR_MENUINPUTS "DR/EXPO" + #define TR_MENULIMITS "LIMITES" #endif #define TR_MENUCURVES "COURBES" #define TR_MENUCURVE "COURBE" -#define TR_MENULOGICALSWITCH "INTER LOG." -#define TR_MENULOGICALSWITCHES TR("INTERS LOG.","INTERS LOGIQUES") +#define TR_MENULOGICALSWITCH "INTER LOG." +#define TR_MENULOGICALSWITCHES TR("INTERS LOG.","INTERS LOGIQUES") #define TR_MENUCUSTOMFUNC TR("FONCTIONS SPEC.","FONCTIONS SPECIALES") #define TR_MENUTELEMETRY "TELEMESURE" #define TR_MENUTEMPLATES "GABARITS" #define TR_MENUSTAT TR("STATS","STATISTIQUES") #define TR_MENUDEBUG "DEBUG" -#define TR_RXNUM TR(INDENT"NumRx",INDENT"No. récepteur") +#define TR_RXNUM TR(INDENT "NumRx",INDENT "No. récepteur") #define TR_SYNCMENU "Sync [MENU]" -#define TR_LIMIT INDENT"Limite" +#define TR_LIMIT INDENT "Limite" #define TR_MINRSSI "RSSI Min." #define TR_LATITUDE "Latitude" #define TR_LONGITUDE "Longitude" @@ -611,8 +617,8 @@ #define TR_SHUTDOWN "ARRET EN COURS" #define TR_BATT_CALIB "Calib. Batterie" #define TR_CURRENT_CALIB "Calib. Courant" -#define TR_VOLTAGE INDENT"Tension" -#define TR_CURRENT INDENT"Courant" +#define TR_VOLTAGE INDENT "Tension" +#define TR_CURRENT INDENT "Courant" #define TR_SELECT_MODEL "Sélect. Modèle" #define TR_CREATE_MODEL "Créer Modèle" #define TR_COPY_MODEL "Copier Modèle" @@ -679,10 +685,10 @@ #define TR_CHANNELS_MONITOR "MONITEUR CANAUX" #define TR_INTERNALRF "HF interne" #define TR_EXTERNALRF "HF externe" -#define TR_FAILSAFE INDENT"Type failsafe" +#define TR_FAILSAFE INDENT "Type failsafe" #define TR_FAILSAFESET "REGLAGES FAILSAFE" #define TR_COUNTRYCODE "Zone géo." -#define TR_VOICELANG TR("Langue voix","Langue annonces vocales") +#define TR_VOICELANG TR("Langue voix", "Langue annonces vocales") #define TR_UNITSSYSTEM "Unités" #define TR_EDIT "Editer" #define TR_INSERT_BEFORE "Insérer avant" @@ -692,16 +698,16 @@ #define TR_PASTE "Coller" #define TR_DELETE "Effacer" #define TR_INSERT "Insérer" -#define TR_RESET_FLIGHT TR("Réinit. vol","Réinitialiser vol") -#define TR_RESET_TIMER1 TR("Réinit. Timer1","Réinitialiser Timer1") -#define TR_RESET_TIMER2 TR("Réinit. Timer2","Réinitialiser Timer2") -#define TR_RESET_TELEMETRY TR("Réinit. Télém.","Réinit. Télémesure") +#define TR_RESET_FLIGHT TR("Réinit. vol", "Réinitialiser vol") +#define TR_RESET_TIMER1 TR("Réinit. Timer1", "Réinitialiser Timer1") +#define TR_RESET_TIMER2 TR("Réinit. Timer2", "Réinitialiser Timer2") +#define TR_RESET_TELEMETRY TR("Réinit. Télém.", "Réinit. Télémesure") #define TR_STATISTICS "Statistiques" #define TR_ABOUT_US "A propos" #define TR_AND_SWITCH "ET suppl." #define TR_CF "FS" -#define TR_SPEAKER INDENT"Haut-p." -#define TR_BUZZER INDENT"Bipeur" +#define TR_SPEAKER INDENT "Haut-p." +#define TR_BUZZER INDENT "Bipeur" #define TR_BYTES "bytes" #define TR_MODULE_BIND "[Bind]" #define TR_MODULE_RANGE "[Port.]" @@ -709,12 +715,12 @@ #define TR_SET "[Déf.]" #define TR_TRAINER "Ecolage" #define TR_ANTENNAPROBLEM CENTER "Antenne radio défectueuse!" -#define TR_MODELIDUSED TR("ID déjà affecté","No de modèle déjà utilisé") +#define TR_MODELIDUSED TR("ID déjà affecté", "No de modèle déjà utilisé") #define TR_MODULE INDENT "Type de module" #define TR_CHANNELRANGE INDENT "Plage de canaux" #define TR_LOWALARM INDENT "Alarme basse" #define TR_CRITICALALARM INDENT "Alarme critique" -#define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh",INDENT "Enregistrer mAh") +#define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh", INDENT "Enregistrer mAh") #define TR_CHECKLIST "Afficher notes" #define TR_FAS_OFFSET TR(INDENT "Corr FAS", INDENT "Correction FAS") #define TR_UART3MODE "Port série" @@ -751,17 +757,17 @@ #define TR_CSW_HEADERS { " Fonction ", " V1 ", " V2 ", " V2 ", " ET suppl. ", " Durée ", " Délai " } //Taranis About screen -#define TR_ABOUTUS TR(" A PROPOS ","A PROPOS") +#define TR_ABOUTUS TR(" A PROPOS ", "A PROPOS") -#define TR_ABOUT_OPENTX_1 TR("OpenTX\001est\001libre,\001non-","OpenTX est libre, non-") -#define TR_ABOUT_OPENTX_2 TR("commercial,\001et\001offert\001sans","commercial et n'offre aucune") -#define TR_ABOUT_OPENTX_3 TR("garantie.\001Il\001est\001développé","garantie. Il a été développé") -#define TR_ABOUT_OPENTX_4 TR("gratuitement.\001Donations","gratuitement. Vos donations") -#define TR_ABOUT_OPENTX_5 TR("bienvenues!","sont bienvenues!") +#define TR_ABOUT_OPENTX_1 TR("OpenTX\001est\001libre,\001non-", "OpenTX est libre, non-") +#define TR_ABOUT_OPENTX_2 TR("commercial,\001et\001offert\001sans", "commercial et n'offre aucune") +#define TR_ABOUT_OPENTX_3 TR("garantie.\001Il\001est\001développé", "garantie. Il a été développé") +#define TR_ABOUT_OPENTX_4 TR("gratuitement.\001Donations", "gratuitement. Vos donations") +#define TR_ABOUT_OPENTX_5 TR("bienvenues!", "sont bienvenues!") #define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 TR("Auteur\001principal\001d'OpenTX","Auteur principal d'OpenTX") -#define TR_ABOUT_BERTRAND_3 TR("Codéveloppeur\001de\001C9X","Codéveloppeur de Companion9x") +#define TR_ABOUT_BERTRAND_2 TR("Auteur\001principal\001d'OpenTX", "Auteur principal d'OpenTX") +#define TR_ABOUT_BERTRAND_3 TR("Codéveloppeur\001de\001C9X", "Codéveloppeur de Companion9x") #define TR_ABOUT_MIKE_1 "Mike Blandford" #define TR_ABOUT_MIKE_2 "Maître du code et des" @@ -783,13 +789,13 @@ #define TR_ABOUT_MARTIN_2 "Design graphique" #if defined(PCBTARANIS) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" - #define TR_ABOUT_HARDWARE_3 "du matériel" + #define TR_ABOUT_HARDWARE_1 "FrSky" + #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" + #define TR_ABOUT_HARDWARE_3 "du matériel" #else - #define TR_ABOUT_HARDWARE_1 "Brent Nelson" - #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" - #define TR_ABOUT_HARDWARE_3 "de la carte Sky9x" + #define TR_ABOUT_HARDWARE_1 "Brent Nelson" + #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" + #define TR_ABOUT_HARDWARE_3 "de la carte Sky9x" #endif #define TR_ABOUT_PARENTS_1 "Projets parents" @@ -797,10 +803,10 @@ #define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" #define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" -#define TR_CHR_SHORT 's' -#define TR_CHR_LONG 'l' -#define TR_CHR_TOGGLE 't' -#define TR_CHR_HOUR 'h' +#define TR_CHR_SHORT 's' +#define TR_CHR_LONG 'l' +#define TR_CHR_TOGGLE 't' +#define TR_CHR_HOUR 'h' #define TR_CHR_INPUT 'E' // Values between A-I will work #define TR_BEEP_VOLUME "Beep Volume" From 13a2fdfc00df37859ba12c2f89e2de2e42a09b0b Mon Sep 17 00:00:00 2001 From: mhotar Date: Mon, 3 Mar 2014 23:48:49 +0100 Subject: [PATCH 06/13] indentations and ifdef corrected --- radio/src/gui/menu_model.cpp | 6 ++---- radio/src/translations/de.h.txt | 4 ++-- radio/src/translations/fi.h.txt | 4 ++-- radio/src/translations/fr.h.txt | 14 +++++++------- radio/src/translations/it.h.txt | 10 +++++----- radio/src/translations/pl.h.txt | 18 +++++++++--------- radio/src/translations/pt.h.txt | 12 ++++++------ radio/src/translations/se.h.txt | 14 +++++++------- 8 files changed, 40 insertions(+), 42 deletions(-) diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index 5e42edc11..61cba0a89 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -875,9 +875,7 @@ enum menuModelSetupItems { ITEM_MODEL_THROTTLE_TRACE, ITEM_MODEL_THROTTLE_TRIM, CASE_PCBTARANIS(ITEM_MODEL_PREFLIGHT_LABEL) -#if defined(PCBTARANIS) - ITEM_MODEL_CHECKLIST_DISPLAY, -#endif + CASE_PCBTARANIS(ITEM_MODEL_CHECKLIST_DISPLAY) ITEM_MODEL_THROTTLE_WARNING, ITEM_MODEL_SWITCHES_WARNING, CASE_PCBTARANIS(ITEM_MODEL_POT_WARNING) @@ -966,7 +964,7 @@ void menuModelSetup(uint8_t event) #define POT_WARN_ITEMS() ((g_model.nPotsToWarn >> 6) ? (uint8_t)NUM_POTS : (uint8_t)0) bool CURSOR_ON_CELL = (m_posHorz >= 0); - MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0,LABEL(Throttle), 0, 0, 0,LABEL(PreflightCheck), CASE_PCBTARANIS(0) 0, 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_PORT1_ON(1), IF_PORT1_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_PORT1_ON(FAILSAFE_ROWS(0)), LABEL(ExternalModule), (g_model.externalModule==MODULE_TYPE_XJT || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, PORT2_CHANNELS_ROWS(), (IS_MODULE_XJT(1) && IS_D8_RX(1)) ? (uint8_t)1 : (IS_MODULE_PPM(1) || IS_MODULE_XJT(1) || IS_MODULE_DSM2(1)) ? (uint8_t)2 : HIDDEN_ROW, IF_PORT2_XJT(FAILSAFE_ROWS(1)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)}); + MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0,CASE_PCBTARANIS(LABEL(Throttle)) 0, 0, 0,CASE_PCBTARANIS(LABEL(PreflightCheck)) CASE_PCBTARANIS(0) 0, 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_PORT1_ON(1), IF_PORT1_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_PORT1_ON(FAILSAFE_ROWS(0)), LABEL(ExternalModule), (g_model.externalModule==MODULE_TYPE_XJT || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, PORT2_CHANNELS_ROWS(), (IS_MODULE_XJT(1) && IS_D8_RX(1)) ? (uint8_t)1 : (IS_MODULE_PPM(1) || IS_MODULE_XJT(1) || IS_MODULE_DSM2(1)) ? (uint8_t)2 : HIDDEN_ROW, IF_PORT2_XJT(FAILSAFE_ROWS(1)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)}); #elif defined(CPUM64) #define CURSOR_ON_CELL (true) #define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX) diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index e93fcd68f..5cb0c795e 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -441,7 +441,7 @@ #define TR_ETRIMS TR("Erw.Trims","Erweit. Trimmung") #define TR_TRIMINC TR("Trim Schr.","Trimm Schritte") #define TR_TTRACE TR("Gasquelle", INDENT "Gas Quelle") -#define TR_TTRIM TR("Gastrim",INDENT "Gas Trimmung") +#define TR_TTRIM TR("Gastrim", INDENT "Gas Trimmung") #define TR_BEEPCTR TR("Mitt.Piep","Mittelst. Pieps") #define TR_PROTO TR(INDENT"Proto.",INDENT"Protokoll") #define TR_PPMFRAME "PPM Einst." @@ -515,7 +515,7 @@ #define TR_BLOFFBRIGHTNESS INDENT"Aus Helligkeit" #define TR_SPLASHSCREEN "Startbild" #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 "Pot Warning") #define TR_TIMEZONE TR("Zeitzone","GPS Zeit Zone") #define TR_RXCHANNELORD TR("Kanalanordnung","Kanalvoreinstellung") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index d0541e7f2..ced15354b 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -515,8 +515,8 @@ #define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness" #define TR_SPLASHSCREEN "Splash screen" #define TR_THROTTLEWARNING TR("T-Warning", INDENT "Throttle Warning") -#define TR_SWITCHWARNING TR("S-Warning",INDENT "Switch Warning") -#define TR_POTWARNING TR("Pot Warn.",INDENT "Pot Warning") +#define TR_SWITCHWARNING TR("S-Warning", INDENT "Switch Warning") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE TR("Time Zone","GPS Time zone") #define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order") #define TR_SLAVE "Slave" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 6fec8a7d7..6bbf97318 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limites ét","Limites étendues") #define TR_ETRIMS TR("Trims ét.","Trims étendus") #define TR_TRIMINC TR("Pas Trim","Pas des trims") -#define TR_TTRACE TR("Source gaz",INDENT"Source gaz") -#define TR_TTRIM TR("Trim gaz",INDENT"Trim gaz") +#define TR_TTRACE TR("Source gaz", INDENT "Source gaz") +#define TR_TTRIM TR("Trim gaz", INDENT "Trim gaz") #define TR_BEEPCTR TR("Bips centr","Bips centrage") #define TR_PROTO TR(INDENT"Proto.",INDENT"Protocole") #define TR_PPMFRAME INDENT"Trame PPM" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING TR(INDENT"Silence",INDENT"Sons désactivés") #define TR_RENAVIG "Navig EncRot" #define TR_THROTTLE_LABEL "Gaz" -#define TR_THROTTLEREVERSE TR("Inv. gaz",INDENT"Inversion gaz") +#define TR_THROTTLEREVERSE TR("Inv. gaz", INDENT "Inversion gaz") #define TR_MINUTEBEEP TR(INDENT"Bip min.",INDENT"Annonces minutes") #define TR_BEEPCOUNTDOWN TR(INDENT"Bip fin",INDENT"Compte à rebours") #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistant") @@ -514,9 +514,9 @@ #define TR_BLONBRIGHTNESS INDENT"Luminosité ON" #define TR_BLOFFBRIGHTNESS INDENT"Luminosité OFF" #define TR_SPLASHSCREEN "Logo d'accueil" -#define TR_THROTTLEWARNING TR("Alerte gaz",INDENT"Alerte gaz") -#define TR_SWITCHWARNING TR("Alerte int",INDENT"Alerte interrupt.") -#define TR_POTWARNING TR("Alerte pot",INDENT"Alerte potentiom.") +#define TR_THROTTLEWARNING TR("Alerte gaz", INDENT "Alerte gaz") +#define TR_SWITCHWARNING TR("Alerte int", INDENT "Alerte interrupt.") +#define TR_POTWARNING TR("Alerte pot", INDENT "Alerte potentiom.") #define TR_TIMEZONE "Fuseau horaire" #define TR_RXCHANNELORD TR("Ordre voies RX","Ordre des voies préféré") #define TR_SLAVE "Elève" @@ -712,7 +712,7 @@ #define TR_CRITICALALARM INDENT "Alarme critique" #define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh",INDENT "Enregistrer mAh") #define TR_PREFLIGHT "Preflight Checks" -#define TR_CHECKLIST INDENT"Afficher notes" +#define TR_CHECKLIST INDENT "Afficher notes" #define TR_FAS_OFFSET TR(INDENT "Corr FAS", INDENT "Correction FAS") #define TR_UART3MODE "Port série" #define TR_POT1TYPE "Type S1" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 7e3283647..555ce7bb9 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limiti.E","Limiti Estesi") #define TR_ETRIMS TR("Trim Ext","Trim Estesi") #define TR_TRIMINC "Trim Step" -#define TR_TTRACE TR("T-Source",INDENT "Throttle Source") -#define TR_TTRIM TR("T-Trim",INDENT "Throttle Trim") +#define TR_TTRACE TR("T-Source", INDENT "Throttle Source") +#define TR_TTRIM TR("T-Trim", INDENT "Throttle Trim") #define TR_BEEPCTR TR("Ctr Beep","Center Beep") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocollo") #define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") @@ -514,9 +514,9 @@ #define TR_BLONBRIGHTNESS TR(INDENT"Lumin. ON",INDENT"Luminosità ON") #define TR_BLOFFBRIGHTNESS TR(INDENT"Lumin. OFF",INDENT"Luminosità OFF") #define TR_SPLASHSCREEN TR("Schermo avvio", "Schermata di avvio") -#define TR_THROTTLEWARNING TR("All. Thr", INDENT"Allarme Throttle") -#define TR_SWITCHWARNING TR("Avv. Int.", INDENT"Avviso Interr.") -#define TR_POTWARNING TR("Pot Warn.", INDENT"Pot Warning") +#define TR_THROTTLEWARNING TR("All. Thr", INDENT "Allarme Throttle") +#define TR_SWITCHWARNING TR("Avv. Int.", INDENT "Avviso Interr.") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE "Ora locale" #define TR_RXCHANNELORD "Ordine ch RX" #define TR_SLAVE "Allievo" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 065201e6d..e81b30c8a 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limit+25%", "Kanał +/- 125%") #define TR_ETRIMS TR("Trymery 100%", "Poszerzone Trymery") #define TR_TRIMINC TR("Krok Trymera", "Krok trymera") -#define TR_TTRACE TR("Źródło gazu", INDENT"Źródło gazu") -#define TR_TTRIM TR("Trymer gazu", INDENT"Trymer gazu") +#define TR_TTRACE TR("Źródło gazu", INDENT "Źródło gazu") +#define TR_TTRIM TR("Trymer gazu", INDENT "Trymer gazu") #define TR_BEEPCTR "(\043)Pikanie środka" #define TR_PROTO INDENT"Protokól" #define TR_PPMFRAME "Ramka PPM" @@ -505,18 +505,18 @@ #define TR_ALARMWARNING INDENT"Wyłącz dźwięk" #define TR_RENAVIG "Nawigacja potencjometrem" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR("Odwróć gaz", INDENT"Odwróć gaz") -#define TR_MINUTEBEEP TR(INDENT"Minuta", INDENT"Pik co minutę") -#define TR_BEEPCOUNTDOWN TR(INDENT"Odliczanie", INDENT"Odliczanie") +#define TR_THROTTLEREVERSE TR("Odwróć gaz", INDENT "Odwróć gaz") +#define TR_MINUTEBEEP TR(INDENT "Minuta", INDENT "Pik co minutę") +#define TR_BEEPCOUNTDOWN TR(INDENT "Odliczanie", INDENT "Odliczanie") #define TR_PERSISTENT INDENT"Dokładny" #define TR_BACKLIGHT_LABEL "Podświetlenie" #define TR_BLDELAY INDENT"Czas trwania" #define TR_BLONBRIGHTNESS INDENT"Jasnośc wł." #define TR_BLOFFBRIGHTNESS INDENT"Jasność wył." #define TR_SPLASHSCREEN "Logo ekranu" -#define TR_THROTTLEWARNING TR("(\043)Gaz",INDENT"(\043)Gaz") -#define TR_SWITCHWARNING TR("(\043)Przełącznik",INDENT"(\043)Przełącznik") -#define TR_POTWARNING TR("Pot Warn.",INDENT"Pot Warning") +#define TR_THROTTLEWARNING TR("(\043)Gaz", INDENT "(\043)Gaz") +#define TR_SWITCHWARNING TR("(\043)Przełącznik", INDENT "(\043)Przełącznik") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE "Strefa czasowa" #define TR_RXCHANNELORD TR("Kolejność kanałów", "Bazowa kolejność kanałów") #define TR_SLAVE "Uczeń" @@ -712,7 +712,7 @@ #define TR_CRITICALALARM INDENT "Alarm krytyczny" #define TR_PERSISTENT_MAH INDENT "Zapisz mAh" #define TR_PREFLIGHT "Preflight Checks" -#define TR_CHECKLIST INDENT"Display Checklist" +#define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_UART3MODE "Port szreg." #define TR_POT1TYPE "Typ S1" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index aa6662795..6b6b9c89f 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS "E.Limits" #define TR_ETRIMS "E.Trims" #define TR_TRIMINC "Trim Step" -#define TR_TTRACE TR("T-Trace",INDENT"T-Trace") -#define TR_TTRIM TR("T-Trim",INDENT"T-Trim") +#define TR_TTRACE TR("T-Trace", INDENT "T-Trace") +#define TR_TTRIM TR("T-Trim", INDENT "T-Trim") #define TR_BEEPCTR "Ctr Beep" #define TR_PROTO INDENT"Proto" #define TR_PPMFRAME "PPM frame" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Som Off" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR("Inverte Acel.",INDENT"Inverte Acel.") +#define TR_THROTTLEREVERSE TR("Inverte Acel.", INDENT "Inverte Acel.") #define TR_MINUTEBEEP INDENT"Beep Minuto" #define TR_BEEPCOUNTDOWN INDENT"Beep Regressivo" #define TR_PERSISTENT INDENT"Persist." @@ -514,9 +514,9 @@ #define TR_BLONBRIGHTNESS INDENT"ON Brightness" #define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness" #define TR_SPLASHSCREEN "Splash screen" -#define TR_THROTTLEWARNING TR("Avisa Acel",INDENT"Avisa Acel") -#define TR_SWITCHWARNING TR("Avisa Chav",INDENT"Avisa Chav") -#define TR_POTWARNING TR("Pot Warn.",INDENT"Pot Warning") +#define TR_THROTTLEWARNING TR("Avisa Acel", INDENT "Avisa Acel") +#define TR_SWITCHWARNING TR("Avisa Chav", INDENT "Avisa Chav") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE "Time Zone" #define TR_RXCHANNELORD "Ordem Canal RX" #define TR_SLAVE "Escravo" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 024726df1..3d2e0df7b 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -440,10 +440,10 @@ #define TR_ELIMITS TR("Gränser++","Utökade Gränser") #define TR_ETRIMS TR("Trimmar++","Utökade Trimmar") #define TR_TRIMINC TR("Trimning","Trimökning") -#define TR_TTRACE TR("Följ Gas",INDENT"Följ Gas") -#define TR_TTRIM TR("Gastrim",INDENT"Gastrim") +#define TR_TTRACE TR("Följ Gas", INDENT "Följ Gas") +#define TR_TTRIM TR("Gastrim", INDENT "Gastrim") #define TR_BEEPCTR TR("Cent.pip", "Centerpip") -#define TR_PROTO TR(INDENT"Proto",INDENT"Protokoll") +#define TR_PROTO TR(INDENT "Proto", INDENT "Protokoll") #define TR_PPMFRAME "PPM-paket" #define TR_MS "ms" #define TR_SWITCH "Brytare" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Ljud Av" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR("Revers.Gas",INDENT"Revers.Gas") +#define TR_THROTTLEREVERSE TR("Revers.Gas", INDENT "Revers.Gas") #define TR_MINUTEBEEP INDENT"Minutpip" #define TR_BEEPCOUNTDOWN INDENT"Räkna Ned" #define TR_PERSISTENT TR("Jämt på ",INDENT"Alltid På") @@ -514,9 +514,9 @@ #define TR_BLONBRIGHTNESS INDENT"På Ljusstyrka" #define TR_BLOFFBRIGHTNESS INDENT"Av Ljusstyrka" #define TR_SPLASHSCREEN "Startbild" -#define TR_THROTTLEWARNING TR("Gasvarning",INDENT"Gasvarning") -#define TR_SWITCHWARNING TR("Bryt.varn.",INDENT"Brytarvarning") -#define TR_POTWARNING TR("Pot Warn.",INDENT"Pot Warning") +#define TR_THROTTLEWARNING TR("Gasvarning", INDENT "Gasvarning") +#define TR_SWITCHWARNING TR("Bryt.varn.", INDENT "Brytarvarning") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning") #define TR_TIMEZONE TR("Tidszon","GPS Tidszon") #define TR_RXCHANNELORD "Kanaler i RX" #define TR_SLAVE "Elev" From b506259d76fcbbbc576ac786f02173108b8a65f5 Mon Sep 17 00:00:00 2001 From: mhotar Date: Tue, 4 Mar 2014 21:52:54 +0100 Subject: [PATCH 07/13] Conflicts fix --- radio/src/translations.cpp | 2 - radio/src/translations.h | 2 - radio/src/translations/de.h.txt | 229 +++++++++-------- radio/src/translations/en.h.txt | 95 +++---- radio/src/translations/fr.h.txt | 441 ++++++++++++++++---------------- 5 files changed, 390 insertions(+), 379 deletions(-) diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 98c1066f1..8e9e8f2d7 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -499,8 +499,6 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text"; const pm_char STR_PREFLIGHT[] PROGMEM = TR_PREFLIGHT; const pm_char STR_CHECKLIST[] PROGMEM = TR_CHECKLIST; const pm_char STR_UART3MODE[] PROGMEM = TR_UART3MODE; - const pm_char STR_POT1TYPE[] PROGMEM = TR_POT1TYPE; - const pm_char STR_POT2TYPE[] PROGMEM = TR_POT2TYPE; const pm_char STR_THROTTLE_LABEL[] PROGMEM = TR_THROTTLE_LABEL; #endif diff --git a/radio/src/translations.h b/radio/src/translations.h index e51a262b6..ac0436349 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -690,8 +690,6 @@ extern const pm_char STR_VIEW_TEXT[]; extern const pm_char STR_PREFLIGHT[]; extern const pm_char STR_CHECKLIST[]; extern const pm_char STR_UART3MODE[]; - extern const pm_char STR_POT1TYPE[]; - extern const pm_char STR_POT2TYPE[]; extern const pm_char STR_THROTTLE_LABEL[]; #endif diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 857d8a341..f6ca1c69d 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -3,9 +3,6 @@ * - Bertrand Songis * - Bernet Andre * - Helle - * - Kjell Kernen - * - Martin Hotar - * - Romolo Manfredini * * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, @@ -235,13 +232,13 @@ #endif #define TR_CFN_RESERVE "[Reserve]\0" - #define TR_VFSWFUNC "Sicher\0 ""Lehrer \0 ""Inst. Trim""Rücksetz.\0""Setze \0 " TR_ADJUST_GVAR "Lautstr.\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "LCD Licht\0" TR_CFN_TEST + #if defined(CPUARM) - #define TR_VFSWFUNC "Sicher\0 ""Lehrer \0 ""Inst. Trim""Rücksetz.\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "LCD Licht\0" TR_CFN_TEST + #define TR_VFSWFUNC "Sicher\0 ""Lehrer \0 ""Inst. Trim""Rücksetz.\0""Setze \0 " TR_ADJUST_GVAR "Lautstr.\0 " TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_RESERVE TR_CFN_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "LCD Licht\0" TR_CFN_TEST #elif defined(PCBGRUVIN9X) - #define TR_VFSWFUNC "Sicher\0 ""Lehrer \0 ""Inst. Trim""Rücksetz.\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "LCD Licht\0" TR_CFN_TEST + #define TR_VFSWFUNC "Sicher\0 ""Lehrer \0 ""Inst. Trim""Rücksetz.\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "LCD Licht\0" TR_CFN_TEST #else - #define TR_VFSWFUNC "Sicher\0 ""Lehrer \0 ""Inst. Trim""R\205cksetz.\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "LCD Licht\0" TR_CFN_TEST + #define TR_VFSWFUNC "Sicher\0 ""Lehrer \0 ""Inst. Trim""Rücksetz.\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC "LCD Licht\0" TR_CFN_TEST #endif #define LEN_VFSWRESET TR("\004", "\011") @@ -251,11 +248,11 @@ #else #define TR_FSW_RESET_TELEM #endif - #define TR_FSW_RESET_ROTENC TR("DGa\0""DGb\0", "DrehGb A\0""DrehGb B\0") + #if ROTARY_ENCODERS == 2 - #define TR_FSW_RESET_ROTENC TR("D.G.", "DrehGb\0 ") + #define TR_FSW_RESET_ROTENC TR("DGa\0""DGb\0", "DrehGb A\0""DrehGb B\0") #elif ROTARY_ENCODERS == 1 - #define TR_FSW_RESET_ROTENC TR("R.E.", "RotEnc\0 ") + #define TR_FSW_RESET_ROTENC TR("D.G.", "DrehGb\0 ") #else #define TR_FSW_RESET_ROTENC #endif @@ -266,18 +263,26 @@ #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Piep1\0""Piep2\0""Piep3\0""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") #define LEN_VTELEMCHNS "\004" -#if defined(PCBTARANIS) - #define TR_RSSI_0 "SWR\0" - #define TR_RSSI_1 "RSSI" -#else - #define TR_RSSI_0 "Tx\0 " - #define TR_RSSI_1 "Rx\0 " -#endif -#define TR_VTELEMCHNS "---\0""Batt""Uhr1""Uhr2" TR_RSSI_0 TR_RSSI_1 "A1\0 ""A2\0 ""H\203he""Umdr""Fuel""T1\0 ""T2\0 ""Gesc""Dist""GH\203h""Zell""Zels""Vfas""Strm""Verb""Leis""BesX""BesY""BesZ""Rich""VGes""ASpd""dTE\0""A1-\0""A2-\0""H\203h-""H\203h+""Umd+""T1+\0""T2+\0""Ges+""Dst+""Cel-""Cls-""Vfs-""Str+""Pwr+""Besc""Zeit" #if defined(CPUARM) - #define LEN_VUNITSSYSTEM TR("\006", "\010") - #define TR_VUNITSSYSTEM TR("Metrik""Imper.", "Metrisch\0 ""Imperial") + #define TR_TELEM_RESERVE "[--]" + #define TR_SWR "SWR\0" + #define TR_RX_BATT "RxBt" + #define TR_A3_A4 "A3\0 ""A4\0 " + #define TR_A3_A4_MIN "A3-\0""A4-\0" +#else + #define TR_TELEM_RESERVE + #define TR_SWR + #define TR_RX_BATT + #define TR_A3_A4 + #define TR_A3_A4_MIN +#endif + +#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" + +#if defined(CPUARM) + #define LEN_VUNITSSYSTEM TR("\006", "\012") + #define TR_VUNITSSYSTEM TR("Metrik""Imper.", "Metrisch\0 ""Imperial\0 ") #define LEN_VTELEMUNIT_NORM "\003" #define TR_VTELEMUNIT_NORM "V\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 " #define LEN_VTELEMUNIT_IMP "\003" @@ -316,15 +321,15 @@ #define TR_VARIOSRC "Alti\0""Alti+""Vario""A1\0 ""A2\0" #endif -#define LEN_VSCREEN "\006" +#define LEN_VSCREEN "\006" #define TR_VSCREEN "Werte\0""Balken" //Telemetrie Werte oder Balken #define LEN_GPSFORMAT "\004" #define TR_GPSFORMAT "HMS\0""NMEA" //Koordinatenanzeige -#define LEN2_VTEMPLATES 15 // max String L\201nge f\205r Men\205 (original=13) -#define LEN_VTEMPLATES "\017" // max String L\201nge 15+cr+lf -#define TR_VTEMPLATES "Misch. L\203sch.\0 ""Einfach. 4-CH\0 ""Fixe Gassperre\0""V-Stabilisator\0""Delta Mischer\0 ""eCCPM\0 ""Hubschrauber\0 ""Servo Tester\0 " +#define LEN2_VTEMPLATES 15 // max String Länge für Menü (original=13) +#define LEN_VTEMPLATES "\017" // max String Länge 15+cr+lf +#define TR_VTEMPLATES "Misch. Lösch.\0 ""Einfach. 4-CH\0 ""Fixe Gassperre\0""V-Stabilisator\0""Delta Mischer\0 ""eCCPM\0 ""Hubschrauber\0 ""Servo Tester\0 " #define LEN_VSWASHTYPE "\004" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" @@ -339,7 +344,7 @@ #define LEN_VSRCRAW "\004" #if defined(PCBTARANIS) - #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""LS\0 ""RS\0 " //4 Potis S1,S2,Links,Rechts + #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 " //4 Potis S1,S2,Links,Rechts #define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 " #elif defined(EXTRA_3POS) #define TR_POTS_VSRCRAW "P1\0 ""P2\0 " @@ -352,14 +357,14 @@ #endif #if defined(CPUARM) -#define TR_LOGICALSW "PS1""PS2""PS3""PS4""PS5""PS6""PS7""PS8""PS9""PSA""PSB""PSC""PSD""PSE""PSF""PSG""PSH""PSI""PSJ""PSK""PSL""PSM""PSN""PSO""PSP""PSQ""PSR""PSS""PST""PSU""PSV""PSW" + #define TR_LOGICALSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC""LSD""LSE""LSF""LSG""LSH""LSI""LSJ""LSK""LSL""LSM""LSN""LSO""LSP""LSQ""LSR""LSS""LST""LSU""LSV""LSW" #elif defined(PCBGRUVIN9X) || defined(CPUM2561) || defined(CPUM128) - #define TR_LOGICALSW "PS1""PS2""PS3""PS4""PS5""PS6""PS7""PS8""PS9""PSA""PSB""PSC""PSD""PSE""PSF" + #define TR_LOGICALSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC""LSD""LSE""LSF" #else - #define TR_LOGICALSW "PS1""PS2""PS3""PS4""PS5""PS6""PS7""PS8""PS9""PSA""PSB""PSC" + #define TR_LOGICALSW "LS1""LS2""LS3""LS4""LS5""LS6""LS7""LS8""LS9""LSA""LSB""LSC" #endif -#define TR_TRIMS_SWITCHES "tRl""tRr""tEd""tEu""tTd""tTu""tAl""tAr" +#define TR_TRIMS_SWITCHES "tSl""tSr""tHd""tHu""tGd""tGu""tQl""tQr" #if defined(PCBSKY9X) #define TR_ROTARY_ENCODERS "DGa\0" @@ -373,12 +378,12 @@ #endif #if defined(PCBTARANIS) - #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26" + #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_LOGICALSW + #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_CUSTOMSW #else - #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_LOGICALSW + #define TR_VSWITCHES TR_9X_3POS_SWITCHES "THR""RUD""ELE""AIL""GEA""TRN" TR_TRIMS_SWITCHES TR_ROTENC_SWITCHES TR_CUSTOMSW #endif #if defined(HELI) @@ -387,13 +392,13 @@ #define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]" #endif -#define TR_VSRCRAW "---\0""Sei\0""H\203h\0""Gas\0""Que\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmS" "TrmH" "TrmG" "TrmQ" TR_SW_VSRCRAW +#define TR_VSRCRAW "---\0""Sei\0""Höh\0""Gas\0""Que\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmS" "TrmH" "TrmG" "TrmQ" TR_SW_VSRCRAW #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "AUS""ABS""GSs""GS%""GSt" #define LEN_VTRAINERMODES "\007" // "\006" -#define TR_VTRAINERMODES "Lehrer\0""Sch\205ler\0" // "Master""Slave\0" +#define TR_VTRAINERMODES "Lehrer\0""Schüler\0" // "Master""Slave\0" #define LEN_VFAILSAFE "\011" #define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses" @@ -423,7 +428,7 @@ #define TR_MENUWHENDONE CENTER"\010"TR_ENTER" > Weiter" #define TR_FREE "frei" -#define TR_DELETEMODEL "Modell l\203schen?" +#define TR_DELETEMODEL "Modell löschen?" #define TR_COPYINGMODEL "Kopiere Modell" #define TR_MOVINGMODEL "Schiebe Modell" #define TR_LOADINGMODEL "Lade Modell..." @@ -438,12 +443,12 @@ #define TR_EXPONAME "Expo Name" #endif #define TR_BITMAP "Modell Bild" -#define TR_TIMER TR("Stoppuhr","Stoppuhr ") +#define TR_TIMER TR("Timer","Timer ") #define TR_ELIMITS TR("Erw.Limit","Erweit. Limits") -#define TR_TTRACE TR("Gasquelle","Gas Verfolgung") -#define TR_TTRIM TR("Gastrim","Gas Trimmung") -#define TR_TTRACE TR("Gasquelle","Gas Quelle") -#define TR_TTRIM TR("Gastrim","Gas Trimmung") +#define TR_ETRIMS TR("Erw.Trims","Erweit. Trimmung") +#define TR_TRIMINC TR("Trim Schr.","Trimm Schritte") +#define TR_TTRACE TR("Gasquelle", INDENT "Gas Verfolgung") +#define TR_TTRIM TR("Gastrim", INDENT "Gas Trimmung") #define TR_BEEPCTR TR("Mitt.Piep","Mittelst. Pieps") #define TR_PROTO TR(INDENT"Proto.",INDENT"Protokoll") #define TR_PPMFRAME "PPM Einst." @@ -453,14 +458,14 @@ #define TR_FADEIN "Langs. Ein" #define TR_FADEOUT "Langs. Aus" #define TR_DEFAULT "(Normal)" -#define TR_CHECKTRIMS "\006Trims\012Pr\205fen" +#define TR_CHECKTRIMS "\006Trims\012Prüfen" #define OFS_CHECKTRIMS (9*FW) #define TR_SWASHTYPE TR("Typ Taumelsch","Typ Taumelscheibe") #define TR_COLLECTIVE TR("Kollekt.Pitch","Kollekt. Pitch Kanal") #define TR_SWASHRING TR("Zykl. Begrenz","Zyklische Begrenzung") -#define TR_ELEDIRECTION TR("Nick Richtung"," Nick Servo Richtung") -#define TR_AILDIRECTION TR("Roll Richtung"," Roll Servo Richtung") -#define TR_COLDIRECTION TR("Pit. Richtung","Pitch Servo Richtung") +#define TR_ELEDIRECTION TR("Nick Richtung"," Nick Servo Richtung") +#define TR_AILDIRECTION TR("Roll Richtung"," Roll Servo Richtung") +#define TR_COLDIRECTION TR("Pit. Richtung"," Pitch Servo Richtung") #define TR_MODE INDENT"Modus" #define TR_NOFREEEXPO "Expos voll!" #define TR_NOFREEMIXER "Mischer voll!" @@ -491,36 +496,37 @@ #define TR_BAR "Streifen" #define TR_ALARM INDENT"Alarm" #define TR_USRDATA "Daten" -#define TR_BLADES INDENT"Bl\201tter" +#define TR_BLADES INDENT"Blätter" #define TR_SCREEN "Bild " -#define TR_SOUND_LABEL "T\203ne" -#define TR_LENGTH INDENT"Dauer" -#define TR_SPKRPITCH INDENT"Tonh\203he" +#define TR_SOUND_LABEL "----Töne---------" +#define TR_LENGTH INDENT"Dauer" +#define TR_SPKRPITCH INDENT"Tonhöhe" #define TR_HAPTIC_LABEL "Vibration" -#define TR_HAPTICSTRENGTH INDENT"St\201rke" -#define TR_CONTRAST "Kontrast" -#define TR_ALARMS_LABEL "Alarm wenn" +#define TR_HAPTICSTRENGTH INDENT"Stärke" +#define TR_CONTRAST "LCD Kontrast" +#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 kl." -#define TR_INACTIVITYALARM INDENT"Inaktivit\201t " +#define TR_BATTERYWARNING INDENT"Akku Spg kleiner" +#define TR_INACTIVITYALARM INDENT"Inaktivität " #define TR_MEMORYWARNING INDENT"Speicher voll" #define TR_ALARMWARNING INDENT"Ton aus" #define TR_RENAVIG "Drehgeb. Navig." -#define TR_THROTTLEREVERSE TR("Gas invers", "Vollgas hinten?") //Änderung wg TH9x, Taranis +#define TR_THROTTLE_LABEL "Gas" +#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" #define TR_PERSISTENT TR(INDENT"M-Zeit",INDENT"Modell Zeit") -#define TR_BACKLIGHT_LABEL "LCD Licht an" +#define TR_BACKLIGHT_LABEL "----LCD Licht----" #define TR_BLDELAY INDENT"Dauer" #define TR_BLONBRIGHTNESS INDENT"An Helligkeit" -#define TR_THROTTLEWARNING "Gas Alarm" -#define TR_SWITCHWARNING TR("Sch. Alarm","Schalter Alarm") -#define TR_POTWARNING TR("Pot Warn.","Poti Warnung") -#define TR_SWITCHWARNING TR("Sch. Alarm","Schalter Alarm") -#define TR_POTWARNING TR("Pot Warn.","Pot Warning") +#define TR_BLOFFBRIGHTNESS INDENT"Aus Helligkeit" +#define TR_SPLASHSCREEN "Startbild" +#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") #define TR_TIMEZONE TR("Zeitzone","GPS Zeit Zone") #define TR_RXCHANNELORD TR("Kanalanordnung","Kanalvoreinstellung") -#define TR_SLAVE "Sch\205ler PPM1-8 als Ausgang" +#define TR_SLAVE "Schüler PPM1-8 als Ausgang" #define TR_MODESRC " Modus\002% Quelle" #define TR_MULTIPLIER "Multiplikator" #define TR_CAL "Kal." @@ -548,7 +554,7 @@ #define TR_FREESTACKMINB "Free Stack\037\124b" #endif -#define TR_MENUTORESET CENTER TR_ENTER" f\205r Reset" +#define TR_MENUTORESET CENTER TR_ENTER" für Reset" #define TR_PPM "PPM" #define TR_CH "CH" #define TR_MODEL "MODELL" @@ -556,33 +562,33 @@ #define TR_MIX "MIX" #define TR_EEPROMLOWMEM "EEPROM voll" #define TR_ALERT "WARNUNG" -#define TR_PRESSANYKEYTOSKIP "Taste dr\205cken" +#define TR_PRESSANYKEYTOSKIP "Taste drücken" #define TR_THROTTLENOTIDLE "Gas nicht Null!" #define TR_ALARMSDISABLED "Alarme ausgeschaltet" -#define TR_PRESSANYKEY TR("Taste dr\205cken",CENTER"Taste dr\205cken") -#define TR_BADEEPROMDATA "EEPROM ung\205ltig" +#define TR_PRESSANYKEY TR("Taste drücken",CENTER"Taste drücken") +#define TR_BADEEPROMDATA "EEPROM ungültig" #define TR_EEPROMFORMATTING "EEPROM Initialisieren" -#define TR_EEPROMOVERFLOW "EEPROM \204berlauf" +#define TR_EEPROMOVERFLOW "EEPROM Überlauf" #define TR_MENURADIOSETUP TR("SENDER EINST.","SENDER GRUNGEINSTELLUNGEN") #define TR_MENUDATEANDTIME "DATUM UND ZEIT" -#define TR_MENUTRAINER TR("Lehr./Sch\204l.","LEHRER/SCH\204LER") +#define TR_MENUTRAINER TR("Lehr./Schül.","LEHRER/SCHÜLER") #define TR_MENUVERSION "VERSION" #define TR_MENUDIAG TR("Schalt.","Schalter Test") #define TR_MENUANA "Analog Test" #define TR_MENUCALIBRATION TR("KALIB. ANALOG","KALIBRIERUNG STICKS+POTIS") #define TR_TRIMS2OFFSETS "\006Trims => Offset" -#define TR_MENUMODELSEL TR("MODELLE","MODELL W\200HLEN") +#define TR_MENUMODELSEL TR("MODELLE","MODELL WÄHLEN") #define TR_MENUSETUP TR("KONF.","MODELL EINSTELLUNGEN") #define TR_MENUFLIGHTPHASE "FLUGPHASE" #define TR_MENUFLIGHTPHASES "FLUGPHASEN" #define TR_MENUHELISETUP "HUBSCHRAUBER" #if defined(PCBTARANIS) - #define TR_MENUINPUTS "EING\200NGE" - #define TR_MENULIMITS "AUSG\200NGE" -#elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ... #define TR_MENUDREXPO "KN\204PPEL" - #define TR_MENUINPUTS "EING\200NGE" - #define TR_MENULIMITS "AUSG\200NGE" + #define TR_MENUINPUTS "INPUTS" + #define TR_MENULIMITS "AUSGÄNGE" +#elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ... #define TR_MENUDREXPO "KNÜPPEL" + #define TR_MENUINPUTS "INPUTS" + #define TR_MENULIMITS "AUSGÄNGE" #else #define TR_MENUINPUTS TR("DR/EXPO","DUALRATE/EXPO") #define TR_MENULIMITS TR("GRENZEN","SERVO WEG") @@ -590,32 +596,32 @@ #define TR_MENUCURVES "KURVEN" #define TR_MENUCURVE "KURVE" -#define TR_MENULOGICALSWITCH "PROG.SCHALTER" -#define TR_MENULOGICALSWITCHES TR_MENULOGICALSWITCH +#define TR_MENULOGICALSWITCH "LOGIK SCHALTER" +#define TR_MENULOGICALSWITCHES "LOGIK SCHALTER" #define TR_MENUCUSTOMFUNC "SPEZ. FUNKTIONEN" #define TR_MENUTELEMETRY "TELEMETRIE" #define TR_MENUTEMPLATES "VORLAGEN" #define TR_MENUSTAT "STAT" #define TR_MENUDEBUG "DEBUG" -#define TR_RXNUM TR("Rx Nummer",INDENT"Empf\201nger Nr.") +#define TR_RXNUM TR("Rx Nummer",INDENT"Empfänger Nr.") #define TR_SYNCMENU "Sync [MENU]" -#define TR_LIMIT INDENT"Limite" +#define TR_LIMIT INDENT"Grenzen" #define TR_MINRSSI "Min. RSSI" #define TR_LATITUDE "Breite:" -#define TR_LONGITUDE "L\201nge:" +#define TR_LONGITUDE "Länge:" #define TR_GPSCOORD TR("Gps Koord.","GPS Koordinaten Format") -#define TR_VARIO TR("Vario","Variometer") +#define TR_VARIO TR("Vario","----Variometer----") #define TR_SHUTDOWN "Herunterfahren" #define TR_BATT_CALIB "Akku. Kalib." #define TR_CURRENT_CALIB "Stromkalib." #define TR_VOLTAGE INDENT"Spann." #define TR_CURRENT INDENT"Strom" -#define TR_SELECT_MODEL "Modell W\201hlen" +#define TR_SELECT_MODEL "Modell Wählen" #define TR_CREATE_MODEL "Neues Modell" #define TR_COPY_MODEL "Kopiere Modell" #define TR_MOVE_MODEL "Verschiebe Modell" #define TR_BACKUP_MODEL "Modell Backup" -#define TR_DELETE_MODEL "Modell L\203schen" // TODO merged into DELETEMODEL? +#define TR_DELETE_MODEL "Modell Löschen" // TODO merged into DELETEMODEL? #define TR_RESTORE_MODEL "Modell Restore" #define TR_SDCARD_ERROR "SDcard Fehler" #define TR_NO_SDCARD "Keine SDcard" @@ -625,8 +631,8 @@ #define TR_THROTTLEWARN "GAS" #define TR_ALARMSWARN "ALARM" #define TR_SWITCHWARN "SCHALTER" -#define TR_INVERT_THR TR("Gas umkehren?","Vollgas hinten?") //\200nderung wg Th9x -#define TR_SPEAKER_VOLUME INDENT "Lautst\201rke" +#define TR_INVERT_THR TR("Gas umkehren?","Vollgas hinten?") //Änderung wg Th9x +#define TR_SPEAKER_VOLUME INDENT "Lautstärke" #define TR_LCD "Bildschirm" #define TR_BRIGHTNESS INDENT "Helligkeit" #define TR_CPU_TEMP "CPU Temp.\016>" @@ -635,27 +641,27 @@ #define TR_COPROC "CoProz." #define TR_COPROC_TEMP "MB Temp. \016>" #define TR_CAPAWARNING INDENT "Kapaz. niedrig" -#define TR_TEMPWARNING INDENT "Temperatur gr\203er" +#define TR_TEMPWARNING INDENT "Temperatur größer" #define TR_FUNC "Funktion" #define TR_V1 "V1" #define TR_V2 "V2" #define TR_DURATION "Dauer" -#define TR_DELAY "Verz\203g." +#define TR_DELAY "Verzög." #define TR_SD_CARD "SD Karte" #define TR_SDHC_CARD "SD-HC Karte" -#define TR_NO_SOUNDS_ON_SD "Keine T\203ne auf SD" +#define TR_NO_SOUNDS_ON_SD "Keine Töne auf SD" #define TR_NO_MODELS_ON_SD "Keine Modelle auf SD" #define TR_NO_BITMAPS_ON_SD "Keine Bitmaps auf SD" #define TR_PLAY_FILE "Spielen" -#define TR_DELETE_FILE "L\203schen" +#define TR_DELETE_FILE "Löschen" #define TR_COPY_FILE "Kopieren" #define TR_RENAME_FILE "Umbenennen" #define TR_ASSIGN_BITMAP "Assign Bitmap" -#define TR_REMOVED " gel\203scht" +#define TR_REMOVED " gelöscht" #define TR_SD_INFO "Information" #define TR_SD_FORMAT "Formattieren" -#define TR_NA "N/V" //NV=Nicht Verf\205gbar Kurz-Meldung -#define TR_HARDWARE "Hardware" +#define TR_NA "N/V" //NV=Nicht Verfügbar Kurz-Meldung +#define TR_HARDWARE "Hardware einstellen" #define TR_FORMATTING "Formattierung..." #define TR_TEMP_CALIB "Temp. Kalib." #define TR_TIME "Uhrzeit:" @@ -664,7 +670,7 @@ #define TR_SD_TYPE "Typ:" #define TR_SD_SPEED "Geschw:" #define TR_SD_SECTORS "Sektoren:" -#define TR_SD_SIZE "Gr\203\206e:" +#define TR_SD_SIZE "Größe:" #define TR_TYPE "Typ" #define TR_GLOBAL_VARS "Globale Variablen" #define TR_GLOBAL_V "GLOBAL V." @@ -708,15 +714,14 @@ #define TR_ANTENNAPROBLEM CENTER "TX Antennen Problem!" #define TR_MODELIDUSED TR("ID schon benutzt","Modell ID schon benutzt") #define TR_MODULE INDENT "Modul-Typ" -#define TR_CHANNELRANGE INDENT "Ausgangs Kan\201le" +#define TR_CHANNELRANGE INDENT "Ausgangs Kanäle" #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Kritisch Alarm" -#define TR_PERSISTENT_MAH INDENT "Store mAh" -#define TR_CHECKLIST "Display Checklist" +#define TR_PERSISTENT_MAH INDENT "Speichern mAh" +#define TR_PREFLIGHT "Preflight Checks" +#define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") -#define TR_UART3MODE "Serial port" -#define TR_POT1TYPE "S1 Type" -#define TR_POT2TYPE "S2 Type" +#define TR_UART3MODE "Serial Port" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" @@ -744,8 +749,8 @@ #define TR_MAVLINK_LON "LON" #endif -// Taranis column headers -#define TR_PHASES_HEADERS { " Name ", " Schalter ", " Trimmung ", " Fade In ", " Fade Out " } +// 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 " } @@ -787,7 +792,7 @@ #define TR_ABOUT_HARDWARE_3 "Firmware Vertrieb" #else #define TR_ABOUT_HARDWARE_1 "Brent Nelson" - #define TR_ABOUT_HARDWARE_2 "Sky9x Design/produktion" + #define TR_ABOUT_HARDWARE_2 "Sky9x Design/Produktion" #define TR_ABOUT_HARDWARE_3 "" #endif @@ -796,18 +801,18 @@ #define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" #define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" -#define TR_CHR_SHORT 's' //Taste short -#define TR_CHR_LONG 'l' //Taste long -#define TR_CHR_TOGGLE 't' //Taste als togglefunktion = Ein Aus Ein -#define TR_CHR_HOUR 'h' //Stunden -#define TR_CHR_INPUT 'I' // Values between A-I will work +#define TR_CHR_SHORT 's' // Taste short +#define TR_CHR_LONG 'l' // Taste long +#define TR_CHR_TOGGLE 't' // Taste als togglefunktion = Ein Aus Ein +#define TR_CHR_HOUR 'h' // Stunden +#define TR_CHR_INPUT 'I' // Values between A-I will work -#define TR_BEEP_VOLUME "Beep Lautst" -#define TR_WAV_VOLUME "Wav Lautst" +#define TR_BEEP_VOLUME "Beep Lautst" +#define TR_WAV_VOLUME "Wav Lautst" #define TR_VARIO_VOLUME "Vario Lautst" -#define TR_BG_VOLUME "Bg Lautst" +#define TR_BG_VOLUME "Bg Lautst" -#define TR_TOP_BAR "Top Bar" -#define TR_ALTITUDE INDENT "Altitude" -#define TR_MODS_FORBIDDEN "Modifications forbidden!" -#define TR_UNLOCKED "Unlocked" +#define TR_TOP_BAR "Info Zeile" +#define TR_ALTITUDE INDENT "Höhe" +#define TR_MODS_FORBIDDEN "Veränderungen verboten!" +#define TR_UNLOCKED "Entsperrt" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index a7c5f9938..48f356d62 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -72,7 +72,7 @@ #define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Debug\0 " #define LEN_POTTYPES "\017" -#define TR_POTTYPES "Pot\0 ""Multipos Switch" +#define TR_POTTYPES "None\0 ""Pot\0 ""Multipos Switch" #define LEN_DATETIME "\005" #define TR_DATETIME "DATE:""TIME:" @@ -168,7 +168,7 @@ #endif #if defined(CPUARM) - #define TR_CSWEQUAL "a=x\0 " + #define TR_CSWEQUAL "a=x\0 " #else #define TR_CSWEQUAL #endif @@ -283,20 +283,25 @@ #define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+""Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" +#define LENGTH_UNIT_IMP "ft\0" +#define SPEED_UNIT_IMP "mph" +#define LENGTH_UNIT_METR "m\0 " +#define SPEED_UNIT_METR "kmh" + #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial") - #define LEN_VTELEMUNIT_NORM "\003" - #define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 " + #define LEN_VTELEMUNIT_METR "\003" + #define TR_VTELEMUNIT_METR "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT_METR LENGTH_UNIT_METR "@\0 ""%\0 ""mA\0""mAh""W\0 " #define LEN_VTELEMUNIT_IMP "\003" - #define TR_VTELEMUNIT_IMP "v\0 ""A\0 ""m/s""-\0 ""kts""ft\0""@\0 ""%\0 ""mA\0""mAh""W\0 " + #define TR_VTELEMUNIT_IMP "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT_IMP LENGTH_UNIT_IMP "@\0 ""%\0 ""mA\0""mAh""W\0 " #else #if defined(IMPERIAL_UNITS) - #define LENGTH_UNIT "ft\0" - #define SPEED_UNIT "kts" + #define LENGTH_UNIT LENGTH_UNIT_IMP + #define SPEED_UNIT SPEED_UNIT_IMP #else - #define LENGTH_UNIT "m\0 " - #define SPEED_UNIT "kmh" + #define LENGTH_UNIT LENGTH_UNIT_METR + #define SPEED_UNIT SPEED_UNIT_METR #endif #define LEN_VTELEMUNIT "\003" #define TR_VTELEMUNIT "v\0 ""A\0 ""m/s""-\0 " SPEED_UNIT LENGTH_UNIT "@\0 ""%\0 ""mA\0""mAh""W\0 " @@ -328,7 +333,7 @@ #define TR_VSCREEN "Nums""Bars" #define LEN_GPSFORMAT "\004" -#define TR_GPSFORMAT "HMS NMEA" +#define TR_GPSFORMAT "HMS ""NMEA" #define LEN2_VTEMPLATES 13 #define LEN_VTEMPLATES "\015" @@ -347,7 +352,7 @@ #define LEN_VSRCRAW "\004" #if defined(PCBTARANIS) - #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""LS\0 ""RS\0 " + #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 " #define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 " #elif defined(EXTRA_3POS) #define TR_POTS_VSRCRAW "P1\0 ""P2\0 " @@ -381,7 +386,7 @@ #endif #if defined(PCBTARANIS) - #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26" + #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_LOGICALSW @@ -451,7 +456,7 @@ #define TR_ETRIMS TR("E.Trims", "Extended Trims") #define TR_TRIMINC "Trim Step" #define TR_TTRACE TR("T-Source", INDENT "Source") -#define TR_TTRIM TR("T-IdleTrim", INDENT "Idle Trim") +#define TR_TTRIM TR("T-Trim", INDENT "Idle Trim") #define TR_BEEPCTR TR("Ctr Beep", "Center Beep") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocol") #define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") @@ -469,17 +474,17 @@ #define TR_ELEDIRECTION TR("ELE Direction","Long. cyc. direction") #define TR_AILDIRECTION TR("AIL Direction","Lateral cyc. direction") #define TR_COLDIRECTION TR("PIT Direction","Coll. pitch direction") -#define TR_MODE INDENT"Mode" +#define TR_MODE INDENT "Mode" #define TR_NOFREEEXPO "No free expo!" #define TR_NOFREEMIXER "No free mixer!" #define TR_INSERTMIX "INSERT MIX " #define TR_EDITMIX "EDIT MIX " -#define TR_SOURCE INDENT"Source" +#define TR_SOURCE INDENT "Source" #define TR_WEIGHT "Weight" #define TR_EXPO TR("Expo","Exponential") #define TR_SIDE "Side" #define TR_DIFFERENTIAL "Differ" -#define TR_OFFSET INDENT"Offset" +#define TR_OFFSET INDENT "Offset" #define TR_TRIM "Trim" #define TR_DREX "DRex" #define TR_CURVE "Curve" @@ -495,37 +500,37 @@ #define TR_CV "CV" #define TR_GV "GV" #define TR_ACHANNEL "A\004channel" -#define TR_RANGE INDENT"Range" +#define TR_RANGE INDENT "Range" #define TR_BAR "Bar" -#define TR_ALARM INDENT"Alarm" +#define TR_ALARM INDENT "Alarm" #define TR_USRDATA "UsrData" -#define TR_BLADES INDENT"Blades" +#define TR_BLADES INDENT "Blades" #define TR_SCREEN "Screen " #define TR_SOUND_LABEL "Sound" -#define TR_LENGTH INDENT"Length" -#define TR_SPKRPITCH INDENT"Pitch" +#define TR_LENGTH INDENT "Length" +#define TR_SPKRPITCH INDENT "Pitch" #define TR_HAPTIC_LABEL "Haptic" -#define TR_HAPTICSTRENGTH INDENT"Strength" +#define TR_HAPTICSTRENGTH INDENT "Strength" #define TR_CONTRAST "Contrast" #define TR_ALARMS_LABEL "Alarms" #define TR_BATTERY_RANGE TR("Battery range","Battery meter range") -#define TR_BATTERYWARNING INDENT"Battery Low" -#define TR_INACTIVITYALARM INDENT"Inactivity" -#define TR_MEMORYWARNING INDENT"Memory Low" -#define TR_ALARMWARNING INDENT"Sound Off" +#define TR_BATTERYWARNING INDENT "Battery Low" +#define TR_INACTIVITYALARM INDENT "Inactivity" +#define TR_MEMORYWARNING INDENT "Memory Low" +#define TR_ALARMWARNING INDENT "Sound Off" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" #define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Reverse") -#define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Minute call") -#define TR_BEEPCOUNTDOWN INDENT"Countdown" -#define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistent") +#define TR_MINUTEBEEP TR(INDENT "Minute",INDENT "Minute call") +#define TR_BEEPCOUNTDOWN INDENT "Countdown" +#define TR_PERSISTENT TR(INDENT "Persist.",INDENT "Persistent") #define TR_BACKLIGHT_LABEL "Backlight" -#define TR_BLDELAY INDENT"Duration" -#define TR_BLONBRIGHTNESS INDENT"ON Brightness" -#define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness" +#define TR_BLDELAY INDENT "Duration" +#define TR_BLONBRIGHTNESS INDENT "ON Brightness" +#define TR_BLOFFBRIGHTNESS INDENT "OFF Brightness" #define TR_SPLASHSCREEN "Splash screen" #define TR_THROTTLEWARNING TR("T-Warning", INDENT "Throttle State") -#define TR_SWITCHWARNING TR("S-Warning", INDENT "Switch Positions") +#define TR_SWITCHWARNING TR("S-Warning", INDENT "Switch Position") #define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Setup") #define TR_TIMEZONE TR("Time Zone","GPS Time zone") #define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order") @@ -606,9 +611,9 @@ #define TR_MENUTEMPLATES "TEMPLATES" #define TR_MENUSTAT "STATS" #define TR_MENUDEBUG "DEBUG" -#define TR_RXNUM TR("RxNum", INDENT"Receiver No.") +#define TR_RXNUM TR("RxNum", INDENT "Receiver No.") #define TR_SYNCMENU "[Sync]" -#define TR_LIMIT INDENT"Limit" +#define TR_LIMIT INDENT "Limit" #define TR_MINRSSI "Min Rssi" #define TR_LATITUDE "Latitude" #define TR_LONGITUDE "Longitude" @@ -617,8 +622,8 @@ #define TR_SHUTDOWN "SHUTTING DOWN" #define TR_BATT_CALIB "Battery Calib" #define TR_CURRENT_CALIB "Current Calib" -#define TR_VOLTAGE INDENT"Voltage" -#define TR_CURRENT INDENT"Current" +#define TR_VOLTAGE INDENT "Voltage" +#define TR_CURRENT INDENT "Current" #define TR_SELECT_MODEL "Select Model" #define TR_CREATE_MODEL "Create Model" #define TR_COPY_MODEL "Copy Model" @@ -706,8 +711,8 @@ #define TR_ABOUT_US "About" #define TR_AND_SWITCH "AND Switch" #define TR_CF "CF" -#define TR_SPEAKER INDENT"Speaker" -#define TR_BUZZER INDENT"Buzzer" +#define TR_SPEAKER INDENT "Speaker" +#define TR_BUZZER INDENT "Buzzer" #define TR_BYTES "bytes" #define TR_MODULE_BIND "[Bind]" #define TR_MODULE_RANGE "[Range]" @@ -725,8 +730,6 @@ #define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_UART3MODE "Serial port" -#define TR_POT1TYPE "S1 Type" -#define TR_POT2TYPE "S2 Type" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" @@ -806,11 +809,11 @@ #define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" #define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" -#define TR_CHR_SHORT 's' -#define TR_CHR_LONG 'l' -#define TR_CHR_TOGGLE 't' -#define TR_CHR_HOUR 'h' -#define TR_CHR_INPUT 'I' // Values between A-I will work +#define TR_CHR_SHORT 's' +#define TR_CHR_LONG 'l' +#define TR_CHR_TOGGLE 't' +#define TR_CHR_HOUR 'h' +#define TR_CHR_INPUT 'I' // Values between A-I will work #define TR_BEEP_VOLUME "Beep Volume" #define TR_WAV_VOLUME "Wav Volume" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index c26d95018..828b25b79 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -2,10 +2,6 @@ * Authors (alphabetical order) * - Andre Bernet * - Bertrand Songis - * - Bernet Andre - * - Kjell Kernen - * - Martin Hotar - * - Romolo Manfredini * * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, @@ -40,90 +36,90 @@ * \001 to \035 -extended spacing (value * FW/2) * \0 -ends actual string */ - + // NON ZERO TERMINATED STRINGS -#define LEN_OFFON "\003" -#define TR_OFFON "OFF""ON\0" +#define LEN_OFFON "\003" +#define TR_OFFON "OFF""ON\0" -#define LEN_MMMINV "\003" -#define TR_MMMINV "---""INV" +#define LEN_MMMINV "\003" +#define TR_MMMINV "---""INV" -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" +#define LEN_NCHANNELS "\004" +#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" -#define LEN_VBEEPMODE "\005" -#define TR_VBEEPMODE "Aucun""Alarm""NoKey""Tout\0" +#define LEN_VBEEPMODE "\005" +#define TR_VBEEPMODE "Aucun""Alarm""NoKey""Tout\0" -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" +#define LEN_VBEEPLEN "\005" +#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" -#define LEN_VRENAVIG "\003" -#define TR_VRENAVIG "NonREaREb" +#define LEN_VRENAVIG "\003" +#define TR_VRENAVIG "NonREaREb" -#define LEN_VBLMODE TR("\004","\011") -#define TR_VBLMODE TR("OFF\0""Btns""Ctrl""Tous""ON\0","OFF\0 ""Touches\0 ""Controles""Tous\0 ""ON\0 ") +#define LEN_VBLMODE TR("\004","\011") +#define TR_VBLMODE TR("OFF\0""Btns""Ctrl""Tous""ON\0","OFF\0 ""Touches\0 ""Controles""Tous\0 ""ON\0 ") -#define LEN_TRNMODE "\003" -#define TR_TRNMODE "OFF"" +="" :=" +#define LEN_TRNMODE "\003" +#define TR_TRNMODE "OFF"" +="" :=" -#define LEN_TRNCHN "\003" -#define TR_TRNCHN "CH1CH2CH3CH4" +#define LEN_TRNCHN "\003" +#define TR_TRNCHN "CH1CH2CH3CH4" -#define LEN_UART3MODES "\017" -#define TR_UART3MODES "OFF\0 ""Recopie S-Port\0""Debug\0 " +#define LEN_UART3MODES "\017" +#define TR_UART3MODES "OFF\0 ""Recopie S-Port\0""Debug\0 " -#define LEN_POTTYPES "\017" -#define TR_POTTYPES "Potentiomètre\0 ""Inter multi-pos" +#define LEN_POTTYPES "\017" +#define TR_POTTYPES "Rien\0 ""Potentiomètre\0 ""Inter multi-pos" -#define LEN_DATETIME "\005" -#define TR_DATETIME "DATE:""HEURE" +#define LEN_DATETIME "\005" +#define TR_DATETIME "DATE:""HEURE" -#define LEN_VLCD "\006" -#define TR_VLCD "NormalOptrex" +#define LEN_VLCD "\006" +#define TR_VLCD "NormalOptrex" -#define LEN_COUNTRYCODES TR("\002", "\006") -#define TR_COUNTRYCODES TR("US""JP""EU", "USA\0 ""Japon\0""Europe") +#define LEN_COUNTRYCODES TR("\002", "\006") +#define TR_COUNTRYCODES TR("US""JP""EU", "USA\0 ""Japon\0""Europe") -#define LEN_VTRIMINC TR("\006","\013") -#define TR_VTRIMINC TR("Expo\0 ""ExFin\0""Fin\0 ""Moyen\0""Gros\0 ","Exponentiel""Extra Fin\0 ""Fin\0 ""Moyen\0 ""Grossier\0 ") +#define LEN_VTRIMINC TR("\006","\013") +#define TR_VTRIMINC TR("Expo\0 ""ExFin\0""Fin\0 ""Moyen\0""Gros\0 ","Exponentiel""Extra Fin\0 ""Fin\0 ""Moyen\0 ""Grossier\0 ") #define LEN_VBEEPCOUNTDOWN "\006" #define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0" -#define LEN_RETA123 "\001" +#define LEN_RETA123 "\001" #if defined(PCBGRUVIN9X) #if ROTARY_ENCODERS > 2 - #define TR_RETA123 "DPGA123abcd" + #define TR_RETA123 "DPGA123abcd" #else - #define TR_RETA123 "DPGA123ab" + #define TR_RETA123 "DPGA123ab" #endif #elif defined(PCBTARANIS) - #define TR_RETA123 "DPGA12LR" -#else - #define TR_RETA123 "DPGA123" + #define TR_RETA123 "DPGA12LR" +#else + #define TR_RETA123 "DPGA123" #endif -#define LEN_VPROTOS "\006" +#define LEN_VPROTOS "\006" #if defined(PXX) - #define TR_PXX "PXX\0 " + #define TR_PXX "PXX\0 " #elif defined(DSM2) || defined(IRPROTOS) - #define TR_PXX "[PXX]\0" + #define TR_PXX "[PXX]\0" #else #define TR_PXX #endif #if defined(DSM2) - #define TR_DSM2 "LP45\0 ""DSM2\0 ""DSMX\0 " + #define TR_DSM2 "LP45\0 ""DSM2\0 ""DSMX\0 " #elif defined(IRPROTOS) - #define TR_DSM2 "[LP45]""[DSM2]""[DSMX]" + #define TR_DSM2 "[LP45]""[DSM2]""[DSMX]" #else #define TR_DSM2 #endif #if defined(IRPROTOS) - #define TR_IRPROTOS "SILV TRAC09PICZ SWIFT\0" + #define TR_IRPROTOS "SILV TRAC09PICZ SWIFT\0" #else #define TR_IRPROTOS #endif @@ -131,25 +127,25 @@ #if defined(CPUARM) #define TR_XPPM #else - #define TR_XPPM "PPM16\0""PPMsim" + #define TR_XPPM "PPM16\0""PPMsim" #endif -#define TR_VPROTOS "PPM\0 " TR_XPPM TR_PXX TR_DSM2 TR_IRPROTOS +#define TR_VPROTOS "PPM\0 " TR_XPPM TR_PXX TR_DSM2 TR_IRPROTOS -#define LEN_POSNEG "\003" -#define TR_POSNEG "POS""NEG" +#define LEN_POSNEG "\003" +#define TR_POSNEG "POS""NEG" -#define LEN_VCURVEFUNC "\003" -#define TR_VCURVEFUNC "---""x>0""x<0""|x|""f>0""f<0""|f|" +#define LEN_VCURVEFUNC "\003" +#define TR_VCURVEFUNC "---""x>0""x<0""|x|""f>0""f<0""|f|" -#define LEN_VMLTPX TR("\010","\013") -#define TR_VMLTPX TR("Ajoute\0 ""Multipl.""Remplace","Additionner""Multiplier\0""Remplacer\0 ") +#define LEN_VMLTPX TR("\010", "\013") +#define TR_VMLTPX TR("Ajoute\0 ""Multipl.""Remplace","Additionner""Multiplier\0""Remplacer\0 ") -#define LEN_VMLTPX2 "\002" -#define TR_VMLTPX2 "+=""*="":=" +#define LEN_VMLTPX2 "\002" +#define TR_VMLTPX2 "+=""*="":=" -#define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS "OFF""ON\0""Dir""Prf""Gaz""Ail" +#define LEN_VMIXTRIMS "\003" +#define TR_VMIXTRIMS "OFF""ON\0""Dir""Prf""Gaz""Ail" #if defined(PCBTARANIS) #define TR_CSWTIMER "Tempo" @@ -169,86 +165,86 @@ #endif #if defined(CPUARM) - #define TR_CSWEQUAL "a=x\0 " + #define TR_CSWEQUAL "a=x\0 " #else #define TR_CSWEQUAL #endif -#define LEN_VCSWFUNC "\005" +#define LEN_VCSWFUNC "\005" #if defined(CPUARM) -#define TR_VCSWFUNC "---\0 " TR_CSWEQUAL "a{x\0 ""a>x\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""a" +#define LEN_VALARMFN "\001" +#define TR_VALARMFN "<>" -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "Aucun ""Hub\0 ""WSHHigh""Halcyon" +#define LEN_VTELPROTO "\007" +#define TR_VTELPROTO "Aucun ""Hub\0 ""WSHHigh""Halcyon" -#define LEN_VOLTSRC "\003" -#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel" +#define LEN_VOLTSRC "\003" +#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel" -#define LEN_VARIOSRC "\005" +#define LEN_VARIOSRC "\005" #if defined(FRSKY_SPORT) - #define TR_VARIOSRC "Vario""A1\0 ""A2\0" + #define TR_VARIOSRC "Vario""A1\0 ""A2\0""dTE\0" #else #define TR_VARIOSRC "Alti\0""Alti+""Vario""A1\0 ""A2\0" #endif -#define LEN_VSCREEN TR("\004","\007") -#define TR_VSCREEN TR("Val.""Bars","Valeurs""Barres\0") +#define LEN_VSCREEN TR("\004", "\007") +#define TR_VSCREEN TR("Val.""Bars", "Valeurs""Barres\0") -#define LEN_GPSFORMAT "\004" -#define TR_GPSFORMAT "DMS\0NMEA" +#define LEN_GPSFORMAT "\004" +#define TR_GPSFORMAT "DMS\0""NMEA" -#define LEN2_VTEMPLATES 15 -#define LEN_VTEMPLATES "\017" -#define TR_VTEMPLATES "Suppr Mixages\0 ""4 Voies simple\0""Coupure Gaz\0 ""Empennage V\0 ""Elevon\\Delta\0 ""eCCPM\0 ""Conf. Hélico\0 ""Test Servo\0 " +#define LEN2_VTEMPLATES 15 +#define LEN_VTEMPLATES "\017" +#define TR_VTEMPLATES "Suppr Mixages\0 ""4 Voies simple\0""Coupure Gaz\0 ""Empennage V\0 ""Elevon\\Delta\0 ""eCCPM\0 ""Conf. Hélico\0 ""Test Servo\0 " -#define LEN_VSWASHTYPE "\004" -#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" +#define LEN_VSWASHTYPE "\004" +#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" -#define LEN_VKEYS "\005" -#define TR_VKEYS TR("Menu\0""Exit\0""Bas\0 ""Haut\0""Droit""Gauch", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus") +#define LEN_VKEYS "\005" +#define TR_VKEYS TR("Menu\0""Exit\0""Bas\0 ""Haut\0""Droit""Gauch", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus") -#define LEN_VRENCODERS "\003" -#define TR_VRENCODERS "REa""REb" +#define LEN_VRENCODERS "\003" +#define TR_VRENCODERS "REa""REb" -#define LEN_VSWITCHES "\003" -#define LEN_VSRCRAW "\004" +#define LEN_VSWITCHES "\003" +#define LEN_VSRCRAW "\004" #if defined(PCBTARANIS) - #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""LS\0 ""RS\0 " + #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 " #define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 " #elif defined(EXTRA_3POS) #define TR_POTS_VSRCRAW "P1\0 ""P2\0 " @@ -351,11 +360,11 @@ #endif #if defined(CPUARM) - #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC""ILD""ILE""ILF""ILG""ILH""ILI""ILJ""ILK""ILL""ILM""ILN""ILO""ILP""ILQ""ILR""ILS""ILT""ILU""ILV""ILW" + #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC""ILD""ILE""ILF""ILG""ILH""ILI""ILJ""ILK""ILL""ILM""ILN""ILO""ILP""ILQ""ILR""ILS""ILT""ILU""ILV""ILW" #elif defined(PCBGRUVIN9X) || defined(CPUM2561) || defined(CPUM128) - #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC""ILD""ILE""ILF" + #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC""ILD""ILE""ILF" #else - #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC" + #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC" #endif #define TR_TRIMS_SWITCHES "tDg""tDd""tPb""tPh""tGb""tGh""tAg""tAd" @@ -372,7 +381,7 @@ #endif #if defined(PCBTARANIS) - #define TR_6POS_POTS "P11""P12""P13""P14""P15""P16""P21""P22""P23""P24""P25""P26" + #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_LOGICALSW @@ -381,21 +390,21 @@ #endif #if defined(HELI) -#define TR_CYC_VSRCRAW "CYC1""CYC2""CYC3" + #define TR_CYC_VSRCRAW "CYC1""CYC2""CYC3" #else -#define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]" + #define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]" #endif -#define TR_VSRCRAW "---\0""Dir\0""Prf\0""Gaz\0""Ail\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" TR_SW_VSRCRAW +#define TR_VSRCRAW "---\0""Dir\0""Prf\0""Gaz\0""Ail\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" TR_SW_VSRCRAW -#define LEN_VTMRMODES "\003" -#define TR_VTMRMODES "OFF""ABS""GZs""GZ%""GZt" +#define LEN_VTMRMODES "\003" +#define TR_VTMRMODES "OFF""ABS""GZs""GZ%""GZt" #define LEN_VTRAINERMODES "\006" #define TR_VTRAINERMODES "Maître""Elève\0" -#define LEN_VFAILSAFE "\011" -#define TR_VFAILSAFE "Maintien\0""Prédéfini""Pas d'imp" +#define LEN_VFAILSAFE "\011" +#define TR_VFAILSAFE "Maintien\0""Prédéfini""Pas d'imp" #if defined(MAVLINK) #define LEN_MAVLINK_BAUDS "\006" @@ -438,43 +447,43 @@ #endif #define TR_BITMAP "Image du modèle" #define TR_TIMER "Chrono " -#define TR_ELIMITS TR("Limites ét","Limites étendues") -#define TR_ETRIMS TR("Trims ét.","Trims étendus") -#define TR_TRIMINC TR("Pas Trim","Pas des trims") +#define TR_ELIMITS TR("Limites ét", "Limites étendues") +#define TR_ETRIMS TR("Trims ét.", "Trims étendus") +#define TR_TRIMINC TR("Pas Trim", "Pas des trims") #define TR_TTRACE TR("Source gaz", INDENT "Source gaz") #define TR_TTRIM TR("Trim gaz", INDENT "Trim gaz") -#define TR_BEEPCTR TR("Bips centr","Bips centrage") -#define TR_PROTO TR(INDENT"Proto.",INDENT"Protocole") -#define TR_PPMFRAME INDENT"Trame PPM" +#define TR_BEEPCTR TR("Bips centr", "Bips centrage") +#define TR_PROTO TR(INDENT "Proto.", INDENT "Protocole") +#define TR_PPMFRAME INDENT "Trame PPM" #define TR_MS "ms" -#define TR_SWITCH TR("Inter","Interrupteur") +#define TR_SWITCH TR("Inter", "Interrupteur") #define TR_TRIMS "Trims" #define TR_FADEIN "Fondu ON" #define TR_FADEOUT "Fondu OFF" #define TR_DEFAULT "(défaut)" #define TR_CHECKTRIMS "\006Vérif\012Trims" #define OFS_CHECKTRIMS (9*FW) -#define TR_SWASHTYPE TR("Type de Plat.","Type de plateau") -#define TR_COLLECTIVE TR("Collectif","Voie du pas collectif") -#define TR_SWASHRING TR("Limite Cycl.","Limite du cyclique") -#define TR_ELEDIRECTION TR("Inv. longitud.","Inversion longitudinal") -#define TR_AILDIRECTION TR("Inv. latéral","Inversion latéral") -#define TR_COLDIRECTION TR("Inv. collectif","Inversion collectif") -#define TR_MODE INDENT"Mode" +#define TR_SWASHTYPE TR("Type de Plat.", "Type de plateau") +#define TR_COLLECTIVE TR("Collectif", "Voie du pas collectif") +#define TR_SWASHRING TR("Limite Cycl.", "Limite du cyclique") +#define TR_ELEDIRECTION TR("Inv. longitud.", "Inversion longitudinal") +#define TR_AILDIRECTION TR("Inv. latéral", "Inversion latéral") +#define TR_COLDIRECTION TR("Inv. collectif", "Inversion collectif") +#define TR_MODE INDENT "Mode" #define TR_NOFREEEXPO "Max expos atteint!" #define TR_NOFREEMIXER "Max mixages atteint!" #define TR_INSERTMIX "INSERER MIXAGE" #define TR_EDITMIX "EDITER MIXAGE" -#define TR_SOURCE INDENT"Source" +#define TR_SOURCE INDENT "Source" #define TR_WEIGHT "Ratio" -#define TR_EXPO TR("Expo","Exponentiel") +#define TR_EXPO TR("Expo", "Exponentiel") #define TR_SIDE "Coté" #define TR_DIFFERENTIAL "Différentiel" -#define TR_OFFSET INDENT"Décalage" +#define TR_OFFSET INDENT "Décalage" #define TR_TRIM "Trim" #define TR_DREX "DRex" #define TR_CURVE "Courbe" -#define TR_FLMODE TR("Phase","Phases") +#define TR_FLMODE TR("Phase", "Phases") #define TR_MIXWARNING "Alerte" #define TR_OFF "OFF" #define TR_MULTPX "Opération" @@ -486,34 +495,34 @@ #define TR_CV "CB" #define TR_GV "VG" #define TR_ACHANNEL "A" -#define TR_RANGE INDENT"Plage" +#define TR_RANGE INDENT "Plage" #define TR_BAR "Barre" -#define TR_ALARM INDENT"Alarme" +#define TR_ALARM INDENT "Alarme" #define TR_USRDATA "Données" -#define TR_BLADES INDENT"Pales" +#define TR_BLADES INDENT "Pales" #define TR_SCREEN "Ecran " #define TR_SOUND_LABEL "Son" -#define TR_LENGTH INDENT"Durée" -#define TR_SPKRPITCH INDENT"Tonalité" +#define TR_LENGTH INDENT "Durée" +#define TR_SPKRPITCH INDENT "Tonalité" #define TR_HAPTIC_LABEL "Vibreur" -#define TR_HAPTICSTRENGTH INDENT"Force" +#define TR_HAPTICSTRENGTH INDENT "Force" #define TR_CONTRAST "Contraste" #define TR_ALARMS_LABEL "Alarmes" #define TR_BATTERY_RANGE "Plage batterie" -#define TR_BATTERYWARNING TR(INDENT"Batterie",INDENT"Batterie faible") -#define TR_INACTIVITYALARM INDENT"Inactivité" -#define TR_MEMORYWARNING INDENT"Mémoire pleine" -#define TR_ALARMWARNING TR(INDENT"Silence",INDENT"Sons désactivés") +#define TR_BATTERYWARNING TR(INDENT "Batterie",INDENT "Batterie faible") +#define TR_INACTIVITYALARM INDENT "Inactivité" +#define TR_MEMORYWARNING INDENT "Mémoire pleine" +#define TR_ALARMWARNING TR(INDENT "Silence",INDENT "Sons désactivés") #define TR_RENAVIG "Navig EncRot" #define TR_THROTTLE_LABEL "Gaz" #define TR_THROTTLEREVERSE TR("Inv. gaz", INDENT "Inversion gaz") -#define TR_MINUTEBEEP TR(INDENT"Bip min.",INDENT"Annonces minutes") -#define TR_BEEPCOUNTDOWN TR(INDENT"Bip fin",INDENT"Compte à rebours") -#define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistant") +#define TR_MINUTEBEEP TR(INDENT "Bip min.",INDENT "Annonces minutes") +#define TR_BEEPCOUNTDOWN TR(INDENT "Bip fin",INDENT "Compte à rebours") +#define TR_PERSISTENT TR(INDENT "Persist.",INDENT "Persistant") #define TR_BACKLIGHT_LABEL "Rétroéclairage" -#define TR_BLDELAY INDENT"Durée" -#define TR_BLONBRIGHTNESS INDENT"Luminosité ON" -#define TR_BLOFFBRIGHTNESS INDENT"Luminosité OFF" +#define TR_BLDELAY INDENT "Durée" +#define TR_BLONBRIGHTNESS INDENT "Luminosité ON" +#define TR_BLOFFBRIGHTNESS INDENT "Luminosité OFF" #define TR_SPLASHSCREEN "Logo d'accueil" #define TR_THROTTLEWARNING TR("Alerte gaz", INDENT "Alerte gaz") #define TR_SWITCHWARNING TR("Alerte int", INDENT "Alerte interrupt.") @@ -578,28 +587,28 @@ #define TR_MENUHELISETUP TR("CONF.HELI","CONFIGURATION HELICO") #if defined(PCBTARANIS) - #define TR_MENUINPUTS "ENTREES" - #define TR_MENULIMITS "SORTIES" + #define TR_MENUINPUTS "ENTREES" + #define TR_MENULIMITS "SORTIES" #elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ... - #define TR_MENUINPUTS "MANCHES" - #define TR_MENULIMITS "SORTIES" + #define TR_MENUINPUTS "MANCHES" + #define TR_MENULIMITS "SORTIES" #else - #define TR_MENUINPUTS "DR/EXPO" - #define TR_MENULIMITS "LIMITES" + #define TR_MENUINPUTS "DR/EXPO" + #define TR_MENULIMITS "LIMITES" #endif #define TR_MENUCURVES "COURBES" #define TR_MENUCURVE "COURBE" -#define TR_MENULOGICALSWITCH "INTER LOG." -#define TR_MENULOGICALSWITCHES TR("INTERS LOG.","INTERS LOGIQUES") +#define TR_MENULOGICALSWITCH "INTER LOG." +#define TR_MENULOGICALSWITCHES TR("INTERS LOG.","INTERS LOGIQUES") #define TR_MENUCUSTOMFUNC TR("FONCTIONS SPEC.","FONCTIONS SPECIALES") #define TR_MENUTELEMETRY "TELEMESURE" #define TR_MENUTEMPLATES "GABARITS" #define TR_MENUSTAT TR("STATS","STATISTIQUES") #define TR_MENUDEBUG "DEBUG" -#define TR_RXNUM TR(INDENT"NumRx",INDENT"No. récepteur") +#define TR_RXNUM TR(INDENT "NumRx",INDENT "No. récepteur") #define TR_SYNCMENU "Sync [MENU]" -#define TR_LIMIT INDENT"Limite" +#define TR_LIMIT INDENT "Limite" #define TR_MINRSSI "RSSI Min." #define TR_LATITUDE "Latitude" #define TR_LONGITUDE "Longitude" @@ -608,8 +617,8 @@ #define TR_SHUTDOWN "ARRET EN COURS" #define TR_BATT_CALIB "Calib. Batterie" #define TR_CURRENT_CALIB "Calib. Courant" -#define TR_VOLTAGE INDENT"Tension" -#define TR_CURRENT INDENT"Courant" +#define TR_VOLTAGE INDENT "Tension" +#define TR_CURRENT INDENT "Courant" #define TR_SELECT_MODEL "Sélect. Modèle" #define TR_CREATE_MODEL "Créer Modèle" #define TR_COPY_MODEL "Copier Modèle" @@ -676,10 +685,10 @@ #define TR_CHANNELS_MONITOR "MONITEUR CANAUX" #define TR_INTERNALRF "HF interne" #define TR_EXTERNALRF "HF externe" -#define TR_FAILSAFE INDENT"Type failsafe" +#define TR_FAILSAFE INDENT "Type failsafe" #define TR_FAILSAFESET "REGLAGES FAILSAFE" #define TR_COUNTRYCODE "Zone géo." -#define TR_VOICELANG TR("Langue voix","Langue annonces vocales") +#define TR_VOICELANG TR("Langue voix", "Langue annonces vocales") #define TR_UNITSSYSTEM "Unités" #define TR_EDIT "Editer" #define TR_INSERT_BEFORE "Insérer avant" @@ -689,16 +698,16 @@ #define TR_PASTE "Coller" #define TR_DELETE "Effacer" #define TR_INSERT "Insérer" -#define TR_RESET_FLIGHT TR("Réinit. vol","Réinitialiser vol") -#define TR_RESET_TIMER1 TR("Réinit. Timer1","Réinitialiser Timer1") -#define TR_RESET_TIMER2 TR("Réinit. Timer2","Réinitialiser Timer2") -#define TR_RESET_TELEMETRY TR("Réinit. Télém.","Réinit. Télémesure") +#define TR_RESET_FLIGHT TR("Réinit. vol", "Réinitialiser vol") +#define TR_RESET_TIMER1 TR("Réinit. Timer1", "Réinitialiser Timer1") +#define TR_RESET_TIMER2 TR("Réinit. Timer2", "Réinitialiser Timer2") +#define TR_RESET_TELEMETRY TR("Réinit. Télém.", "Réinit. Télémesure") #define TR_STATISTICS "Statistiques" #define TR_ABOUT_US "A propos" #define TR_AND_SWITCH "ET suppl." #define TR_CF "FS" -#define TR_SPEAKER INDENT"Haut-p." -#define TR_BUZZER INDENT"Bipeur" +#define TR_SPEAKER INDENT "Haut-p." +#define TR_BUZZER INDENT "Bipeur" #define TR_BYTES "bytes" #define TR_MODULE_BIND "[Bind]" #define TR_MODULE_RANGE "[Port.]" @@ -706,18 +715,16 @@ #define TR_SET "[Déf.]" #define TR_TRAINER "Ecolage" #define TR_ANTENNAPROBLEM CENTER "Antenne radio défectueuse!" -#define TR_MODELIDUSED TR("ID déjà affecté","No de modèle déjà utilisé") +#define TR_MODELIDUSED TR("ID déjà affecté", "No de modèle déjà utilisé") #define TR_MODULE INDENT "Type de module" #define TR_CHANNELRANGE INDENT "Plage de canaux" #define TR_LOWALARM INDENT "Alarme basse" #define TR_CRITICALALARM INDENT "Alarme critique" -#define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh",INDENT "Enregistrer mAh") +#define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh", INDENT "Enregistrer mAh") #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST INDENT "Afficher notes" #define TR_FAS_OFFSET TR(INDENT "Corr FAS", INDENT "Correction FAS") #define TR_UART3MODE "Port série" -#define TR_POT1TYPE "Type S1" -#define TR_POT2TYPE "Type S2" #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "RSSI Max" @@ -751,17 +758,17 @@ #define TR_CSW_HEADERS { " Fonction ", " V1 ", " V2 ", " V2 ", " ET suppl. ", " Durée ", " Délai " } //Taranis About screen -#define TR_ABOUTUS TR(" A PROPOS ","A PROPOS") +#define TR_ABOUTUS TR(" A PROPOS ", "A PROPOS") -#define TR_ABOUT_OPENTX_1 TR("OpenTX\001est\001libre,\001non-","OpenTX est libre, non-") -#define TR_ABOUT_OPENTX_2 TR("commercial,\001et\001offert\001sans","commercial et n'offre aucune") -#define TR_ABOUT_OPENTX_3 TR("garantie.\001Il\001est\001développé","garantie. Il a été développé") -#define TR_ABOUT_OPENTX_4 TR("gratuitement.\001Donations","gratuitement. Vos donations") -#define TR_ABOUT_OPENTX_5 TR("bienvenues!","sont bienvenues!") +#define TR_ABOUT_OPENTX_1 TR("OpenTX\001est\001libre,\001non-", "OpenTX est libre, non-") +#define TR_ABOUT_OPENTX_2 TR("commercial,\001et\001offert\001sans", "commercial et n'offre aucune") +#define TR_ABOUT_OPENTX_3 TR("garantie.\001Il\001est\001développé", "garantie. Il a été développé") +#define TR_ABOUT_OPENTX_4 TR("gratuitement.\001Donations", "gratuitement. Vos donations") +#define TR_ABOUT_OPENTX_5 TR("bienvenues!", "sont bienvenues!") #define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 TR("Auteur\001principal\001d'OpenTX","Auteur principal d'OpenTX") -#define TR_ABOUT_BERTRAND_3 TR("Codéveloppeur\001de\001C9X","Codéveloppeur de Companion9x") +#define TR_ABOUT_BERTRAND_2 TR("Auteur\001principal\001d'OpenTX", "Auteur principal d'OpenTX") +#define TR_ABOUT_BERTRAND_3 TR("Codéveloppeur\001de\001C9X", "Codéveloppeur de Companion9x") #define TR_ABOUT_MIKE_1 "Mike Blandford" #define TR_ABOUT_MIKE_2 "Maître du code et des" @@ -783,13 +790,13 @@ #define TR_ABOUT_MARTIN_2 "Design graphique" #if defined(PCBTARANIS) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" - #define TR_ABOUT_HARDWARE_3 "du matériel" + #define TR_ABOUT_HARDWARE_1 "FrSky" + #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" + #define TR_ABOUT_HARDWARE_3 "du matériel" #else - #define TR_ABOUT_HARDWARE_1 "Brent Nelson" - #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" - #define TR_ABOUT_HARDWARE_3 "de la carte Sky9x" + #define TR_ABOUT_HARDWARE_1 "Brent Nelson" + #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" + #define TR_ABOUT_HARDWARE_3 "de la carte Sky9x" #endif #define TR_ABOUT_PARENTS_1 "Projets parents" @@ -797,10 +804,10 @@ #define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" #define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" -#define TR_CHR_SHORT 's' -#define TR_CHR_LONG 'l' -#define TR_CHR_TOGGLE 't' -#define TR_CHR_HOUR 'h' +#define TR_CHR_SHORT 's' +#define TR_CHR_LONG 'l' +#define TR_CHR_TOGGLE 't' +#define TR_CHR_HOUR 'h' #define TR_CHR_INPUT 'E' // Values between A-I will work #define TR_BEEP_VOLUME "Beep Volume" From b919773b56b39efde43d27601069a2847b15d821 Mon Sep 17 00:00:00 2001 From: mhotar Date: Tue, 4 Mar 2014 22:26:15 +0100 Subject: [PATCH 08/13] TR_POTTYPES "None" was missing in some translations --- radio/src/translations/de.h.txt | 2 +- radio/src/translations/es.h.txt | 2 +- radio/src/translations/fi.h.txt | 2 +- radio/src/translations/it.h.txt | 2 +- radio/src/translations/pl.h.txt | 2 +- radio/src/translations/pt.h.txt | 2 +- radio/src/translations/se.h.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index f6ca1c69d..31ef5569e 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -69,7 +69,7 @@ #define TR_UART3MODES "AUS\0 ""S-Port Data Out\0""Debug\0 " #define LEN_POTTYPES "\017" -#define TR_POTTYPES "Poti\0 ""Stufen-Schalter " +#define TR_POTTYPES "None\0 ""Poti\0 ""Stufen-Schalter " #define LEN_DATETIME "\005" #define TR_DATETIME "DATE:""ZEIT:" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 9f8ea38aa..a54fd03f8 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -72,7 +72,7 @@ #define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Debug\0 " #define LEN_POTTYPES "\017" -#define TR_POTTYPES "Pot\0 ""Multipos Switch" +#define TR_POTTYPES "None\0 ""Pot\0 ""Multipos Switch" #define LEN_DATETIME "\005" #define TR_DATETIME "DATA:""HORA:" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 096247a56..e7e25fbc4 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -72,7 +72,7 @@ #define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Debug\0 " #define LEN_POTTYPES "\017" -#define TR_POTTYPES "Pot\0 ""Multipos Switch" +#define TR_POTTYPES "None\0 ""Pot\0 ""Multipos Switch" #define LEN_DATETIME "\005" #define TR_DATETIME "DATE:""TIME:" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index f98270685..7e7a2eeaa 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -72,7 +72,7 @@ #define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Debug\0 " #define LEN_POTTYPES "\017" -#define TR_POTTYPES "Pot\0 ""Multipos Switch" +#define TR_POTTYPES "None\0 ""Pot\0 ""Multipos Switch" #define LEN_DATETIME "\005" #define TR_DATETIME "DATA:""ORA :" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index b8366499a..eedb2d9d4 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -72,7 +72,7 @@ #define TR_UART3MODES "Wyłącz\0 ""S-Port Mirror\0 ""Debug\0 " #define LEN_POTTYPES "\017" -#define TR_POTTYPES "Potencjometr\0 ""Przeł.Wielopoz." +#define TR_POTTYPES "None\0 ""Potencjometr\0 ""Przeł.Wielopoz." #define LEN_DATETIME "\006" #define TR_DATETIME "DATA:\0""CZAS:\0" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index fe01c626b..6505786e4 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -72,7 +72,7 @@ #define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Debug\0 " #define LEN_POTTYPES "\017" -#define TR_POTTYPES "Pot\0 ""Multipos Switch" +#define TR_POTTYPES "None\0 ""Pot\0 ""Multipos Switch" #define LEN_DATETIME "\005" #define TR_DATETIME "DATA:""HORA:" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index b9cae485e..94fb53c1c 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -72,7 +72,7 @@ #define TR_UART3MODES "Av\0 ""Spegling av S-Port""Debug\0 " #define LEN_POTTYPES "\020" -#define TR_POTTYPES "Potentiometer\0 ""Flerlägesväljare" +#define TR_POTTYPES "None\0 ""Potentiometer\0 ""Flerlägesväljare" #define LEN_DATETIME "\005" #define TR_DATETIME "DAG: ""TID: " From 21f2130d1320872d525d4b4cadea523d86ddc11d Mon Sep 17 00:00:00 2001 From: mhotar Date: Tue, 4 Mar 2014 22:31:41 +0100 Subject: [PATCH 09/13] TR_POTTYPES "None" in cz.h.txt --- radio/src/translations/cz.h.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 35a21e470..dbe10d791 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -72,7 +72,7 @@ #define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Debug\0 " #define LEN_POTTYPES "\017" -#define TR_POTTYPES "Pot\0 ""Multipos Switch" +#define TR_POTTYPES "None\0 ""Pot\0 ""Multipos Switch" #define LEN_DATETIME "\006" #define TR_DATETIME "DATUM:""ČAS: " @@ -330,7 +330,7 @@ #define TR_VTEMPLATES "Smazat mixy\0\0""Zákl. 4kanál\0""Sticky-T-Cut\0""V-Tail \0""Elevon\\Delta\0""eCCPM \0""Heli Setup \0""Servo Test \0" #define LEN_VSWASHTYPE "\004" -#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" +#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0" #define LEN_VKEYS "\005" #define TR_VKEYS TR("Menu\0""Exit\0""Dolů\0""Nhoru""Vprvo""Vlevo", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Mínus") From 3f231585a981d0c6fd7ac7747ad4f28afd49100a Mon Sep 17 00:00:00 2001 From: mhotar Date: Tue, 4 Mar 2014 22:52:37 +0100 Subject: [PATCH 10/13] Neverending conflicts --- radio/src/translations/en.h.txt | 61 +++-- radio/src/translations/fr.h.txt | 419 ++++++++++++++++---------------- 2 files changed, 241 insertions(+), 239 deletions(-) diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index aaadfba49..7f26756f8 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -168,7 +168,7 @@ #endif #if defined(CPUARM) - #define TR_CSWEQUAL "a=x\0 " + #define TR_CSWEQUAL "a=x\0 " #else #define TR_CSWEQUAL #endif @@ -333,7 +333,7 @@ #define TR_VSCREEN "Nums""Bars" #define LEN_GPSFORMAT "\004" -#define TR_GPSFORMAT "HMS NMEA" +#define TR_GPSFORMAT "HMS ""NMEA" #define LEN2_VTEMPLATES 13 #define LEN_VTEMPLATES "\015" @@ -474,17 +474,17 @@ #define TR_ELEDIRECTION TR("ELE Direction","Long. cyc. direction") #define TR_AILDIRECTION TR("AIL Direction","Lateral cyc. direction") #define TR_COLDIRECTION TR("PIT Direction","Coll. pitch direction") -#define TR_MODE INDENT"Mode" +#define TR_MODE INDENT "Mode" #define TR_NOFREEEXPO "No free expo!" #define TR_NOFREEMIXER "No free mixer!" #define TR_INSERTMIX "INSERT MIX " #define TR_EDITMIX "EDIT MIX " -#define TR_SOURCE INDENT"Source" +#define TR_SOURCE INDENT "Source" #define TR_WEIGHT "Weight" #define TR_EXPO TR("Expo","Exponential") #define TR_SIDE "Side" #define TR_DIFFERENTIAL "Differ" -#define TR_OFFSET INDENT"Offset" +#define TR_OFFSET INDENT "Offset" #define TR_TRIM "Trim" #define TR_DREX "DRex" #define TR_CURVE "Curve" @@ -500,34 +500,33 @@ #define TR_CV "CV" #define TR_GV "GV" #define TR_ACHANNEL "A\004channel" -#define TR_RANGE INDENT"Range" +#define TR_RANGE INDENT "Range" #define TR_BAR "Bar" -#define TR_ALARM INDENT"Alarm" +#define TR_ALARM INDENT "Alarm" #define TR_USRDATA "UsrData" -#define TR_BLADES INDENT"Blades" +#define TR_BLADES INDENT "Blades" #define TR_SCREEN "Screen " #define TR_SOUND_LABEL "Sound" -#define TR_LENGTH INDENT"Length" -#define TR_SPKRPITCH INDENT"Pitch" +#define TR_LENGTH INDENT "Length" +#define TR_SPKRPITCH INDENT "Pitch" #define TR_HAPTIC_LABEL "Haptic" -#define TR_HAPTICSTRENGTH INDENT"Strength" +#define TR_HAPTICSTRENGTH INDENT "Strength" #define TR_CONTRAST "Contrast" #define TR_ALARMS_LABEL "Alarms" #define TR_BATTERY_RANGE TR("Battery range","Battery meter range") -#define TR_BATTERYWARNING INDENT"Battery Low" -#define TR_INACTIVITYALARM INDENT"Inactivity" -#define TR_MEMORYWARNING INDENT"Memory Low" -#define TR_ALARMWARNING INDENT"Sound Off" +#define TR_BATTERYWARNING INDENT "Battery Low" +#define TR_INACTIVITYALARM INDENT "Inactivity" +#define TR_MEMORYWARNING INDENT "Memory Low" +#define TR_ALARMWARNING INDENT "Sound Off" #define TR_RENAVIG "RotEnc Navig" -#define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Reverse") +#define TR_THROTTLEREVERSE TR("T-Reverse", "Throttle reverse") #define TR_MINUTEBEEP TR(INDENT "Minute",INDENT "Minute call") #define TR_BEEPCOUNTDOWN INDENT "Countdown" #define TR_PERSISTENT TR(INDENT "Persist.",INDENT "Persistent") #define TR_BACKLIGHT_LABEL "Backlight" -#define TR_BLDELAY INDENT"Duration" -#define TR_BLONBRIGHTNESS INDENT"ON Brightness" -#define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness" +#define TR_BLDELAY INDENT "Duration" +#define TR_BLONBRIGHTNESS INDENT "ON Brightness" +#define TR_BLOFFBRIGHTNESS INDENT "OFF Brightness" #define TR_SPLASHSCREEN "Splash screen" #define TR_THROTTLEWARNING TR("T-Warning","Throttle Warning") #define TR_SWITCHWARNING TR("S-Warning","Switch Warning") @@ -611,9 +610,9 @@ #define TR_MENUTEMPLATES "TEMPLATES" #define TR_MENUSTAT "STATS" #define TR_MENUDEBUG "DEBUG" -#define TR_RXNUM TR("RxNum", INDENT"Receiver No.") +#define TR_RXNUM TR("RxNum", INDENT "Receiver No.") #define TR_SYNCMENU "[Sync]" -#define TR_LIMIT INDENT"Limit" +#define TR_LIMIT INDENT "Limit" #define TR_MINRSSI "Min Rssi" #define TR_LATITUDE "Latitude" #define TR_LONGITUDE "Longitude" @@ -622,8 +621,8 @@ #define TR_SHUTDOWN "SHUTTING DOWN" #define TR_BATT_CALIB "Battery Calib" #define TR_CURRENT_CALIB "Current Calib" -#define TR_VOLTAGE INDENT"Voltage" -#define TR_CURRENT INDENT"Current" +#define TR_VOLTAGE INDENT "Voltage" +#define TR_CURRENT INDENT "Current" #define TR_SELECT_MODEL "Select Model" #define TR_CREATE_MODEL "Create Model" #define TR_COPY_MODEL "Copy Model" @@ -711,8 +710,8 @@ #define TR_ABOUT_US "About" #define TR_AND_SWITCH "AND Switch" #define TR_CF "CF" -#define TR_SPEAKER INDENT"Speaker" -#define TR_BUZZER INDENT"Buzzer" +#define TR_SPEAKER INDENT "Speaker" +#define TR_BUZZER INDENT "Buzzer" #define TR_BYTES "bytes" #define TR_MODULE_BIND "[Bind]" #define TR_MODULE_RANGE "[Range]" @@ -808,11 +807,11 @@ #define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" #define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" -#define TR_CHR_SHORT 's' -#define TR_CHR_LONG 'l' -#define TR_CHR_TOGGLE 't' -#define TR_CHR_HOUR 'h' -#define TR_CHR_INPUT 'I' // Values between A-I will work +#define TR_CHR_SHORT 's' +#define TR_CHR_LONG 'l' +#define TR_CHR_TOGGLE 't' +#define TR_CHR_HOUR 'h' +#define TR_CHR_INPUT 'I' // Values between A-I will work #define TR_BEEP_VOLUME "Beep Volume" #define TR_WAV_VOLUME "Wav Volume" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 5cdb604fa..b28416cee 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -1,10 +1,7 @@ /* * Authors (alphabetical order) + * - Andre Bernet * - Bertrand Songis - * - Bernet Andre - * - Kjell Kernen - * - Martin Hotar - * - Romolo Manfredini * * opentx is based on code named * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, @@ -39,90 +36,90 @@ * \001 to \035 -extended spacing (value * FW/2) * \0 -ends actual string */ - + // NON ZERO TERMINATED STRINGS -#define LEN_OFFON "\003" -#define TR_OFFON "OFF""ON\0" +#define LEN_OFFON "\003" +#define TR_OFFON "OFF""ON\0" -#define LEN_MMMINV "\003" -#define TR_MMMINV "---""INV" +#define LEN_MMMINV "\003" +#define TR_MMMINV "---""INV" -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" +#define LEN_NCHANNELS "\004" +#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" -#define LEN_VBEEPMODE "\005" -#define TR_VBEEPMODE "Aucun""Alarm""NoKey""Tout\0" +#define LEN_VBEEPMODE "\005" +#define TR_VBEEPMODE "Aucun""Alarm""NoKey""Tout\0" -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" +#define LEN_VBEEPLEN "\005" +#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" -#define LEN_VRENAVIG "\003" -#define TR_VRENAVIG "NonREaREb" +#define LEN_VRENAVIG "\003" +#define TR_VRENAVIG "NonREaREb" -#define LEN_VBLMODE TR("\004","\011") -#define TR_VBLMODE TR("OFF\0""Btns""Ctrl""Tous""ON\0","OFF\0 ""Touches\0 ""Controles""Tous\0 ""ON\0 ") +#define LEN_VBLMODE TR("\004","\011") +#define TR_VBLMODE TR("OFF\0""Btns""Ctrl""Tous""ON\0","OFF\0 ""Touches\0 ""Controles""Tous\0 ""ON\0 ") -#define LEN_TRNMODE "\003" -#define TR_TRNMODE "OFF"" +="" :=" +#define LEN_TRNMODE "\003" +#define TR_TRNMODE "OFF"" +="" :=" -#define LEN_TRNCHN "\003" -#define TR_TRNCHN "CH1CH2CH3CH4" +#define LEN_TRNCHN "\003" +#define TR_TRNCHN "CH1CH2CH3CH4" -#define LEN_UART3MODES "\017" -#define TR_UART3MODES "OFF\0 ""Recopie S-Port\0""Debug\0 " +#define LEN_UART3MODES "\017" +#define TR_UART3MODES "OFF\0 ""Recopie S-Port\0""Debug\0 " -#define LEN_POTTYPES "\017" -#define TR_POTTYPES "Potentiomètre\0 ""Inter multi-pos" +#define LEN_POTTYPES "\017" +#define TR_POTTYPES "Rien\0 ""Potentiomètre\0 ""Inter multi-pos" -#define LEN_DATETIME "\005" -#define TR_DATETIME "DATE:""HEURE" +#define LEN_DATETIME "\005" +#define TR_DATETIME "DATE:""HEURE" -#define LEN_VLCD "\006" -#define TR_VLCD "NormalOptrex" +#define LEN_VLCD "\006" +#define TR_VLCD "NormalOptrex" -#define LEN_COUNTRYCODES TR("\002", "\006") -#define TR_COUNTRYCODES TR("US""JP""EU", "USA\0 ""Japon\0""Europe") +#define LEN_COUNTRYCODES TR("\002", "\006") +#define TR_COUNTRYCODES TR("US""JP""EU", "USA\0 ""Japon\0""Europe") -#define LEN_VTRIMINC TR("\006","\013") -#define TR_VTRIMINC TR("Expo\0 ""ExFin\0""Fin\0 ""Moyen\0""Gros\0 ","Exponentiel""Extra Fin\0 ""Fin\0 ""Moyen\0 ""Grossier\0 ") +#define LEN_VTRIMINC TR("\006","\013") +#define TR_VTRIMINC TR("Expo\0 ""ExFin\0""Fin\0 ""Moyen\0""Gros\0 ","Exponentiel""Extra Fin\0 ""Fin\0 ""Moyen\0 ""Grossier\0 ") #define LEN_VBEEPCOUNTDOWN "\006" #define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0" -#define LEN_RETA123 "\001" +#define LEN_RETA123 "\001" #if defined(PCBGRUVIN9X) #if ROTARY_ENCODERS > 2 - #define TR_RETA123 "DPGA123abcd" + #define TR_RETA123 "DPGA123abcd" #else - #define TR_RETA123 "DPGA123ab" + #define TR_RETA123 "DPGA123ab" #endif #elif defined(PCBTARANIS) - #define TR_RETA123 "DPGA12LR" -#else - #define TR_RETA123 "DPGA123" + #define TR_RETA123 "DPGA12LR" +#else + #define TR_RETA123 "DPGA123" #endif -#define LEN_VPROTOS "\006" +#define LEN_VPROTOS "\006" #if defined(PXX) - #define TR_PXX "PXX\0 " + #define TR_PXX "PXX\0 " #elif defined(DSM2) || defined(IRPROTOS) - #define TR_PXX "[PXX]\0" + #define TR_PXX "[PXX]\0" #else #define TR_PXX #endif #if defined(DSM2) - #define TR_DSM2 "LP45\0 ""DSM2\0 ""DSMX\0 " + #define TR_DSM2 "LP45\0 ""DSM2\0 ""DSMX\0 " #elif defined(IRPROTOS) - #define TR_DSM2 "[LP45]""[DSM2]""[DSMX]" + #define TR_DSM2 "[LP45]""[DSM2]""[DSMX]" #else #define TR_DSM2 #endif #if defined(IRPROTOS) - #define TR_IRPROTOS "SILV TRAC09PICZ SWIFT\0" + #define TR_IRPROTOS "SILV TRAC09PICZ SWIFT\0" #else #define TR_IRPROTOS #endif @@ -130,25 +127,25 @@ #if defined(CPUARM) #define TR_XPPM #else - #define TR_XPPM "PPM16\0""PPMsim" + #define TR_XPPM "PPM16\0""PPMsim" #endif -#define TR_VPROTOS "PPM\0 " TR_XPPM TR_PXX TR_DSM2 TR_IRPROTOS +#define TR_VPROTOS "PPM\0 " TR_XPPM TR_PXX TR_DSM2 TR_IRPROTOS -#define LEN_POSNEG "\003" -#define TR_POSNEG "POS""NEG" +#define LEN_POSNEG "\003" +#define TR_POSNEG "POS""NEG" -#define LEN_VCURVEFUNC "\003" -#define TR_VCURVEFUNC "---""x>0""x<0""|x|""f>0""f<0""|f|" +#define LEN_VCURVEFUNC "\003" +#define TR_VCURVEFUNC "---""x>0""x<0""|x|""f>0""f<0""|f|" -#define LEN_VMLTPX TR("\010","\013") -#define TR_VMLTPX TR("Ajoute\0 ""Multipl.""Remplace","Additionner""Multiplier\0""Remplacer\0 ") +#define LEN_VMLTPX TR("\010", "\013") +#define TR_VMLTPX TR("Ajoute\0 ""Multipl.""Remplace","Additionner""Multiplier\0""Remplacer\0 ") -#define LEN_VMLTPX2 "\002" -#define TR_VMLTPX2 "+=""*="":=" +#define LEN_VMLTPX2 "\002" +#define TR_VMLTPX2 "+=""*="":=" -#define LEN_VMIXTRIMS "\003" -#define TR_VMIXTRIMS "OFF""ON\0""Dir""Prf""Gaz""Ail" +#define LEN_VMIXTRIMS "\003" +#define TR_VMIXTRIMS "OFF""ON\0""Dir""Prf""Gaz""Ail" #if defined(PCBTARANIS) #define TR_CSWTIMER "Tempo" @@ -168,86 +165,86 @@ #endif #if defined(CPUARM) - #define TR_CSWEQUAL "a=x\0 " + #define TR_CSWEQUAL "a=x\0 " #else #define TR_CSWEQUAL #endif -#define LEN_VCSWFUNC "\005" +#define LEN_VCSWFUNC "\005" #if defined(CPUARM) -#define TR_VCSWFUNC "---\0 " TR_CSWEQUAL "a{x\0 ""a>x\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""a" +#define LEN_VALARMFN "\001" +#define TR_VALARMFN "<>" -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "Aucun ""Hub\0 ""WSHHigh""Halcyon" +#define LEN_VTELPROTO "\007" +#define TR_VTELPROTO "Aucun ""Hub\0 ""WSHHigh""Halcyon" -#define LEN_VOLTSRC "\003" -#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel" +#define LEN_VOLTSRC "\003" +#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel" -#define LEN_VARIOSRC "\005" +#define LEN_VARIOSRC "\005" #if defined(FRSKY_SPORT) - #define TR_VARIOSRC "Vario""A1\0 ""A2\0" + #define TR_VARIOSRC "Vario""A1\0 ""A2\0""dTE\0" #else #define TR_VARIOSRC "Alti\0""Alti+""Vario""A1\0 ""A2\0" #endif -#define LEN_VSCREEN TR("\004","\007") -#define TR_VSCREEN TR("Val.""Bars","Valeurs""Barres\0") +#define LEN_VSCREEN TR("\004", "\007") +#define TR_VSCREEN TR("Val.""Bars", "Valeurs""Barres\0") -#define LEN_GPSFORMAT "\004" -#define TR_GPSFORMAT "DMS\0NMEA" +#define LEN_GPSFORMAT "\004" +#define TR_GPSFORMAT "DMS\0""NMEA" -#define LEN2_VTEMPLATES 15 -#define LEN_VTEMPLATES "\017" -#define TR_VTEMPLATES "Suppr Mixages\0 ""4 Voies simple\0""Coupure Gaz\0 ""Empennage V\0 ""Elevon\\Delta\0 ""eCCPM\0 ""Conf. Hélico\0 ""Test Servo\0 " +#define LEN2_VTEMPLATES 15 +#define LEN_VTEMPLATES "\017" +#define TR_VTEMPLATES "Suppr Mixages\0 ""4 Voies simple\0""Coupure Gaz\0 ""Empennage V\0 ""Elevon\\Delta\0 ""eCCPM\0 ""Conf. Hélico\0 ""Test Servo\0 " -#define LEN_VSWASHTYPE "\004" -#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" +#define LEN_VSWASHTYPE "\004" +#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" -#define LEN_VKEYS "\005" -#define TR_VKEYS TR("Menu\0""Exit\0""Bas\0 ""Haut\0""Droit""Gauch", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus") +#define LEN_VKEYS "\005" +#define TR_VKEYS TR("Menu\0""Exit\0""Bas\0 ""Haut\0""Droit""Gauch", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus") -#define LEN_VRENCODERS "\003" -#define TR_VRENCODERS "REa""REb" +#define LEN_VRENCODERS "\003" +#define TR_VRENCODERS "REa""REb" -#define LEN_VSWITCHES "\003" -#define LEN_VSRCRAW "\004" +#define LEN_VSWITCHES "\003" +#define LEN_VSRCRAW "\004" #if defined(PCBTARANIS) #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 " @@ -355,11 +360,11 @@ #endif #if defined(CPUARM) - #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC""ILD""ILE""ILF""ILG""ILH""ILI""ILJ""ILK""ILL""ILM""ILN""ILO""ILP""ILQ""ILR""ILS""ILT""ILU""ILV""ILW" + #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC""ILD""ILE""ILF""ILG""ILH""ILI""ILJ""ILK""ILL""ILM""ILN""ILO""ILP""ILQ""ILR""ILS""ILT""ILU""ILV""ILW" #elif defined(PCBGRUVIN9X) || defined(CPUM2561) || defined(CPUM128) - #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC""ILD""ILE""ILF" + #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC""ILD""ILE""ILF" #else - #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC" + #define TR_LOGICALSW "IL1""IL2""IL3""IL4""IL5""IL6""IL7""IL8""IL9""ILA""ILB""ILC" #endif #define TR_TRIMS_SWITCHES "tDg""tDd""tPb""tPh""tGb""tGh""tAg""tAd" @@ -385,21 +390,21 @@ #endif #if defined(HELI) -#define TR_CYC_VSRCRAW "CYC1""CYC2""CYC3" + #define TR_CYC_VSRCRAW "CYC1""CYC2""CYC3" #else -#define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]" + #define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]" #endif -#define TR_VSRCRAW "---\0""Dir\0""Prf\0""Gaz\0""Ail\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" TR_SW_VSRCRAW +#define TR_VSRCRAW "---\0""Dir\0""Prf\0""Gaz\0""Ail\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" TR_SW_VSRCRAW -#define LEN_VTMRMODES "\003" -#define TR_VTMRMODES "OFF""ABS""GZs""GZ%""GZt" +#define LEN_VTMRMODES "\003" +#define TR_VTMRMODES "OFF""ABS""GZs""GZ%""GZt" #define LEN_VTRAINERMODES "\006" #define TR_VTRAINERMODES "Maître""Elève\0" -#define LEN_VFAILSAFE "\011" -#define TR_VFAILSAFE "Maintien\0""Prédéfini""Pas d'imp" +#define LEN_VFAILSAFE "\011" +#define TR_VFAILSAFE "Maintien\0""Prédéfini""Pas d'imp" #if defined(MAVLINK) #define LEN_MAVLINK_BAUDS "\006" @@ -445,40 +450,40 @@ #define TR_ELIMITS TR("Limites ét", "Limites étendues") #define TR_ETRIMS TR("Trims ét.", "Trims étendus") #define TR_TRIMINC TR("Pas Trim", "Pas des trims") -#define TR_TTRACE TR("Source gaz", INDENT "Source gaz") -#define TR_TTRIM TR("Trim gaz", INDENT "Trim gaz") +#define TR_TTRACE "Source gaz" +#define TR_TTRIM "Trim gaz" #define TR_BEEPCTR TR("Bips centr", "Bips centrage") #define TR_PROTO TR(INDENT "Proto.", INDENT "Protocole") #define TR_PPMFRAME INDENT "Trame PPM" #define TR_MS "ms" -#define TR_SWITCH TR("Inter","Interrupteur") +#define TR_SWITCH TR("Inter", "Interrupteur") #define TR_TRIMS "Trims" #define TR_FADEIN "Fondu ON" #define TR_FADEOUT "Fondu OFF" #define TR_DEFAULT "(défaut)" #define TR_CHECKTRIMS "\006Vérif\012Trims" #define OFS_CHECKTRIMS (9*FW) -#define TR_SWASHTYPE TR("Type de Plat.","Type de plateau") -#define TR_COLLECTIVE TR("Collectif","Voie du pas collectif") -#define TR_SWASHRING TR("Limite Cycl.","Limite du cyclique") -#define TR_ELEDIRECTION TR("Inv. longitud.","Inversion longitudinal") -#define TR_AILDIRECTION TR("Inv. latéral","Inversion latéral") -#define TR_COLDIRECTION TR("Inv. collectif","Inversion collectif") -#define TR_MODE INDENT"Mode" +#define TR_SWASHTYPE TR("Type de Plat.", "Type de plateau") +#define TR_COLLECTIVE TR("Collectif", "Voie du pas collectif") +#define TR_SWASHRING TR("Limite Cycl.", "Limite du cyclique") +#define TR_ELEDIRECTION TR("Inv. longitud.", "Inversion longitudinal") +#define TR_AILDIRECTION TR("Inv. latéral", "Inversion latéral") +#define TR_COLDIRECTION TR("Inv. collectif", "Inversion collectif") +#define TR_MODE INDENT "Mode" #define TR_NOFREEEXPO "Max expos atteint!" #define TR_NOFREEMIXER "Max mixages atteint!" #define TR_INSERTMIX "INSERER MIXAGE" #define TR_EDITMIX "EDITER MIXAGE" -#define TR_SOURCE INDENT"Source" +#define TR_SOURCE INDENT "Source" #define TR_WEIGHT "Ratio" -#define TR_EXPO TR("Expo","Exponentiel") +#define TR_EXPO TR("Expo", "Exponentiel") #define TR_SIDE "Coté" #define TR_DIFFERENTIAL "Différentiel" -#define TR_OFFSET INDENT"Décalage" +#define TR_OFFSET INDENT "Décalage" #define TR_TRIM "Trim" #define TR_DREX "DRex" #define TR_CURVE "Courbe" -#define TR_FLMODE TR("Phase","Phases") +#define TR_FLMODE TR("Phase", "Phases") #define TR_MIXWARNING "Alerte" #define TR_OFF "OFF" #define TR_MULTPX "Opération" @@ -490,34 +495,33 @@ #define TR_CV "CB" #define TR_GV "VG" #define TR_ACHANNEL "A" -#define TR_RANGE INDENT"Plage" +#define TR_RANGE INDENT "Plage" #define TR_BAR "Barre" -#define TR_ALARM INDENT"Alarme" +#define TR_ALARM INDENT "Alarme" #define TR_USRDATA "Données" -#define TR_BLADES INDENT"Pales" +#define TR_BLADES INDENT "Pales" #define TR_SCREEN "Ecran " #define TR_SOUND_LABEL "Son" -#define TR_LENGTH INDENT"Durée" -#define TR_SPKRPITCH INDENT"Tonalité" +#define TR_LENGTH INDENT "Durée" +#define TR_SPKRPITCH INDENT "Tonalité" #define TR_HAPTIC_LABEL "Vibreur" -#define TR_HAPTICSTRENGTH INDENT"Force" +#define TR_HAPTICSTRENGTH INDENT "Force" #define TR_CONTRAST "Contraste" #define TR_ALARMS_LABEL "Alarmes" #define TR_BATTERY_RANGE "Plage batterie" -#define TR_BATTERYWARNING TR(INDENT"Batterie",INDENT"Batterie faible") -#define TR_INACTIVITYALARM INDENT"Inactivité" -#define TR_MEMORYWARNING INDENT"Mémoire pleine" -#define TR_ALARMWARNING TR(INDENT"Silence",INDENT"Sons désactivés") +#define TR_BATTERYWARNING TR(INDENT "Batterie",INDENT "Batterie faible") +#define TR_INACTIVITYALARM INDENT "Inactivité" +#define TR_MEMORYWARNING INDENT "Mémoire pleine" +#define TR_ALARMWARNING TR(INDENT "Silence",INDENT "Sons désactivés") #define TR_RENAVIG "Navig EncRot" -#define TR_THROTTLE_LABEL "Gaz" -#define TR_THROTTLEREVERSE TR("Inv. gaz", INDENT "Inversion gaz") +#define TR_THROTTLEREVERSE TR("Inv. gaz","Inversion gaz") #define TR_MINUTEBEEP TR(INDENT "Bip min.",INDENT "Annonces minutes") #define TR_BEEPCOUNTDOWN TR(INDENT "Bip fin",INDENT "Compte à rebours") #define TR_PERSISTENT TR(INDENT "Persist.",INDENT "Persistant") #define TR_BACKLIGHT_LABEL "Rétroéclairage" -#define TR_BLDELAY INDENT"Durée" -#define TR_BLONBRIGHTNESS INDENT"Luminosité ON" -#define TR_BLOFFBRIGHTNESS INDENT"Luminosité OFF" +#define TR_BLDELAY INDENT "Durée" +#define TR_BLONBRIGHTNESS INDENT "Luminosité ON" +#define TR_BLOFFBRIGHTNESS INDENT "Luminosité OFF" #define TR_SPLASHSCREEN "Logo d'accueil" #define TR_THROTTLEWARNING "Alerte gaz" #define TR_SWITCHWARNING TR("Alerte int","Alerte interrupt.") @@ -582,28 +586,28 @@ #define TR_MENUHELISETUP TR("CONF.HELI","CONFIGURATION HELICO") #if defined(PCBTARANIS) - #define TR_MENUINPUTS "ENTREES" - #define TR_MENULIMITS "SORTIES" + #define TR_MENUINPUTS "ENTREES" + #define TR_MENULIMITS "SORTIES" #elif defined(PPM_CENTER_ADJUSTABLE) || defined(PPM_LIMITS_SYMETRICAL) // The right menu titles for the gurus ... - #define TR_MENUINPUTS "MANCHES" - #define TR_MENULIMITS "SORTIES" + #define TR_MENUINPUTS "MANCHES" + #define TR_MENULIMITS "SORTIES" #else - #define TR_MENUINPUTS "DR/EXPO" - #define TR_MENULIMITS "LIMITES" + #define TR_MENUINPUTS "DR/EXPO" + #define TR_MENULIMITS "LIMITES" #endif #define TR_MENUCURVES "COURBES" #define TR_MENUCURVE "COURBE" -#define TR_MENULOGICALSWITCH "INTER LOG." -#define TR_MENULOGICALSWITCHES TR("INTERS LOG.","INTERS LOGIQUES") +#define TR_MENULOGICALSWITCH "INTER LOG." +#define TR_MENULOGICALSWITCHES TR("INTERS LOG.","INTERS LOGIQUES") #define TR_MENUCUSTOMFUNC TR("FONCTIONS SPEC.","FONCTIONS SPECIALES") #define TR_MENUTELEMETRY "TELEMESURE" #define TR_MENUTEMPLATES "GABARITS" #define TR_MENUSTAT TR("STATS","STATISTIQUES") #define TR_MENUDEBUG "DEBUG" -#define TR_RXNUM TR(INDENT"NumRx",INDENT"No. récepteur") +#define TR_RXNUM TR(INDENT "NumRx",INDENT "No. récepteur") #define TR_SYNCMENU "Sync [MENU]" -#define TR_LIMIT INDENT"Limite" +#define TR_LIMIT INDENT "Limite" #define TR_MINRSSI "RSSI Min." #define TR_LATITUDE "Latitude" #define TR_LONGITUDE "Longitude" @@ -612,8 +616,8 @@ #define TR_SHUTDOWN "ARRET EN COURS" #define TR_BATT_CALIB "Calib. Batterie" #define TR_CURRENT_CALIB "Calib. Courant" -#define TR_VOLTAGE INDENT"Tension" -#define TR_CURRENT INDENT"Courant" +#define TR_VOLTAGE INDENT "Tension" +#define TR_CURRENT INDENT "Courant" #define TR_SELECT_MODEL "Sélect. Modèle" #define TR_CREATE_MODEL "Créer Modèle" #define TR_COPY_MODEL "Copier Modèle" @@ -680,10 +684,10 @@ #define TR_CHANNELS_MONITOR "MONITEUR CANAUX" #define TR_INTERNALRF "HF interne" #define TR_EXTERNALRF "HF externe" -#define TR_FAILSAFE INDENT"Type failsafe" +#define TR_FAILSAFE INDENT "Type failsafe" #define TR_FAILSAFESET "REGLAGES FAILSAFE" #define TR_COUNTRYCODE "Zone géo." -#define TR_VOICELANG TR("Langue voix","Langue annonces vocales") +#define TR_VOICELANG TR("Langue voix", "Langue annonces vocales") #define TR_UNITSSYSTEM "Unités" #define TR_EDIT "Editer" #define TR_INSERT_BEFORE "Insérer avant" @@ -693,16 +697,16 @@ #define TR_PASTE "Coller" #define TR_DELETE "Effacer" #define TR_INSERT "Insérer" -#define TR_RESET_FLIGHT TR("Réinit. vol","Réinitialiser vol") -#define TR_RESET_TIMER1 TR("Réinit. Timer1","Réinitialiser Timer1") -#define TR_RESET_TIMER2 TR("Réinit. Timer2","Réinitialiser Timer2") -#define TR_RESET_TELEMETRY TR("Réinit. Télém.","Réinit. Télémesure") +#define TR_RESET_FLIGHT TR("Réinit. vol", "Réinitialiser vol") +#define TR_RESET_TIMER1 TR("Réinit. Timer1", "Réinitialiser Timer1") +#define TR_RESET_TIMER2 TR("Réinit. Timer2", "Réinitialiser Timer2") +#define TR_RESET_TELEMETRY TR("Réinit. Télém.", "Réinit. Télémesure") #define TR_STATISTICS "Statistiques" #define TR_ABOUT_US "A propos" #define TR_AND_SWITCH "ET suppl." #define TR_CF "FS" -#define TR_SPEAKER INDENT"Haut-p." -#define TR_BUZZER INDENT"Bipeur" +#define TR_SPEAKER INDENT "Haut-p." +#define TR_BUZZER INDENT "Bipeur" #define TR_BYTES "bytes" #define TR_MODULE_BIND "[Bind]" #define TR_MODULE_RANGE "[Port.]" @@ -710,14 +714,13 @@ #define TR_SET "[Déf.]" #define TR_TRAINER "Ecolage" #define TR_ANTENNAPROBLEM CENTER "Antenne radio défectueuse!" -#define TR_MODELIDUSED TR("ID déjà affecté","No de modèle déjà utilisé") +#define TR_MODELIDUSED TR("ID déjà affecté", "No de modèle déjà utilisé") #define TR_MODULE INDENT "Type de module" #define TR_CHANNELRANGE INDENT "Plage de canaux" #define TR_LOWALARM INDENT "Alarme basse" #define TR_CRITICALALARM INDENT "Alarme critique" #define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh", INDENT "Enregistrer mAh") -#define TR_PREFLIGHT "Preflight Checks" -#define TR_CHECKLIST INDENT "Afficher notes" +#define TR_CHECKLIST "Afficher notes" #define TR_FAS_OFFSET TR(INDENT "Corr FAS", INDENT "Correction FAS") #define TR_UART3MODE "Port série" @@ -753,17 +756,17 @@ #define TR_CSW_HEADERS { " Fonction ", " V1 ", " V2 ", " V2 ", " ET suppl. ", " Durée ", " Délai " } //Taranis About screen -#define TR_ABOUTUS TR(" A PROPOS ","A PROPOS") +#define TR_ABOUTUS TR(" A PROPOS ", "A PROPOS") -#define TR_ABOUT_OPENTX_1 TR("OpenTX\001est\001libre,\001non-","OpenTX est libre, non-") -#define TR_ABOUT_OPENTX_2 TR("commercial,\001et\001offert\001sans","commercial et n'offre aucune") -#define TR_ABOUT_OPENTX_3 TR("garantie.\001Il\001est\001développé","garantie. Il a été développé") -#define TR_ABOUT_OPENTX_4 TR("gratuitement.\001Donations","gratuitement. Vos donations") -#define TR_ABOUT_OPENTX_5 TR("bienvenues!","sont bienvenues!") +#define TR_ABOUT_OPENTX_1 TR("OpenTX\001est\001libre,\001non-", "OpenTX est libre, non-") +#define TR_ABOUT_OPENTX_2 TR("commercial,\001et\001offert\001sans", "commercial et n'offre aucune") +#define TR_ABOUT_OPENTX_3 TR("garantie.\001Il\001est\001développé", "garantie. Il a été développé") +#define TR_ABOUT_OPENTX_4 TR("gratuitement.\001Donations", "gratuitement. Vos donations") +#define TR_ABOUT_OPENTX_5 TR("bienvenues!", "sont bienvenues!") #define TR_ABOUT_BERTRAND_1 "Bertrand Songis" -#define TR_ABOUT_BERTRAND_2 TR("Auteur\001principal\001d'OpenTX","Auteur principal d'OpenTX") -#define TR_ABOUT_BERTRAND_3 TR("Codéveloppeur\001de\001C9X","Codéveloppeur de Companion9x") +#define TR_ABOUT_BERTRAND_2 TR("Auteur\001principal\001d'OpenTX", "Auteur principal d'OpenTX") +#define TR_ABOUT_BERTRAND_3 TR("Codéveloppeur\001de\001C9X", "Codéveloppeur de Companion9x") #define TR_ABOUT_MIKE_1 "Mike Blandford" #define TR_ABOUT_MIKE_2 "Maître du code et des" @@ -785,13 +788,13 @@ #define TR_ABOUT_MARTIN_2 "Design graphique" #if defined(PCBTARANIS) - #define TR_ABOUT_HARDWARE_1 "FrSky" - #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" - #define TR_ABOUT_HARDWARE_3 "du matériel" + #define TR_ABOUT_HARDWARE_1 "FrSky" + #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" + #define TR_ABOUT_HARDWARE_3 "du matériel" #else - #define TR_ABOUT_HARDWARE_1 "Brent Nelson" - #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" - #define TR_ABOUT_HARDWARE_3 "de la carte Sky9x" + #define TR_ABOUT_HARDWARE_1 "Brent Nelson" + #define TR_ABOUT_HARDWARE_2 "Développeur/fabricant" + #define TR_ABOUT_HARDWARE_3 "de la carte Sky9x" #endif #define TR_ABOUT_PARENTS_1 "Projets parents" @@ -799,10 +802,10 @@ #define TR_ABOUT_PARENTS_3 "ER9X (Erez Raviv)" #define TR_ABOUT_PARENTS_4 "TH9X (Thomas Husterer)" -#define TR_CHR_SHORT 's' -#define TR_CHR_LONG 'l' -#define TR_CHR_TOGGLE 't' -#define TR_CHR_HOUR 'h' +#define TR_CHR_SHORT 's' +#define TR_CHR_LONG 'l' +#define TR_CHR_TOGGLE 't' +#define TR_CHR_HOUR 'h' #define TR_CHR_INPUT 'E' // Values between A-I will work #define TR_BEEP_VOLUME "Beep Volume" From 708411c272aaf858f38da9cae17338be17075b29 Mon Sep 17 00:00:00 2001 From: mhotar Date: Tue, 4 Mar 2014 23:08:18 +0100 Subject: [PATCH 11/13] EN,FR translations --- radio/src/translations/en.h.txt | 16 +++++++++------- radio/src/translations/fr.h.txt | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 7f26756f8..48f356d62 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -455,8 +455,8 @@ #define TR_ELIMITS TR("E.Limits", "Extended Limits") #define TR_ETRIMS TR("E.Trims", "Extended Trims") #define TR_TRIMINC "Trim Step" -#define TR_TTRACE TR("T-Source", "Throttle Source") -#define TR_TTRIM TR("T-Trim", "Throttle Trim") +#define TR_TTRACE TR("T-Source", INDENT "Source") +#define TR_TTRIM TR("T-Trim", INDENT "Idle Trim") #define TR_BEEPCTR TR("Ctr Beep", "Center Beep") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocol") #define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") @@ -519,7 +519,8 @@ #define TR_MEMORYWARNING INDENT "Memory Low" #define TR_ALARMWARNING INDENT "Sound Off" #define TR_RENAVIG "RotEnc Navig" -#define TR_THROTTLEREVERSE TR("T-Reverse", "Throttle reverse") +#define TR_THROTTLE_LABEL "Throttle" +#define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Reverse") #define TR_MINUTEBEEP TR(INDENT "Minute",INDENT "Minute call") #define TR_BEEPCOUNTDOWN INDENT "Countdown" #define TR_PERSISTENT TR(INDENT "Persist.",INDENT "Persistent") @@ -528,9 +529,9 @@ #define TR_BLONBRIGHTNESS INDENT "ON Brightness" #define TR_BLOFFBRIGHTNESS INDENT "OFF Brightness" #define TR_SPLASHSCREEN "Splash screen" -#define TR_THROTTLEWARNING TR("T-Warning","Throttle Warning") -#define TR_SWITCHWARNING TR("S-Warning","Switch Warning") -#define TR_POTWARNING TR("Pot Warn.","Pot Warning") +#define TR_THROTTLEWARNING TR("T-Warning", INDENT "Throttle State") +#define TR_SWITCHWARNING TR("S-Warning", INDENT "Switch Position") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Setup") #define TR_TIMEZONE TR("Time Zone","GPS Time zone") #define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order") #define TR_SLAVE "Slave" @@ -725,7 +726,8 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" #define TR_PERSISTENT_MAH INDENT "Store mAh" -#define TR_CHECKLIST "Display Checklist" +#define TR_PREFLIGHT "Preflight Checks" +#define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #define TR_UART3MODE "Serial port" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index b28416cee..828b25b79 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -450,8 +450,8 @@ #define TR_ELIMITS TR("Limites ét", "Limites étendues") #define TR_ETRIMS TR("Trims ét.", "Trims étendus") #define TR_TRIMINC TR("Pas Trim", "Pas des trims") -#define TR_TTRACE "Source gaz" -#define TR_TTRIM "Trim gaz" +#define TR_TTRACE TR("Source gaz", INDENT "Source gaz") +#define TR_TTRIM TR("Trim gaz", INDENT "Trim gaz") #define TR_BEEPCTR TR("Bips centr", "Bips centrage") #define TR_PROTO TR(INDENT "Proto.", INDENT "Protocole") #define TR_PPMFRAME INDENT "Trame PPM" @@ -514,7 +514,8 @@ #define TR_MEMORYWARNING INDENT "Mémoire pleine" #define TR_ALARMWARNING TR(INDENT "Silence",INDENT "Sons désactivés") #define TR_RENAVIG "Navig EncRot" -#define TR_THROTTLEREVERSE TR("Inv. gaz","Inversion gaz") +#define TR_THROTTLE_LABEL "Gaz" +#define TR_THROTTLEREVERSE TR("Inv. gaz", INDENT "Inversion gaz") #define TR_MINUTEBEEP TR(INDENT "Bip min.",INDENT "Annonces minutes") #define TR_BEEPCOUNTDOWN TR(INDENT "Bip fin",INDENT "Compte à rebours") #define TR_PERSISTENT TR(INDENT "Persist.",INDENT "Persistant") @@ -523,9 +524,9 @@ #define TR_BLONBRIGHTNESS INDENT "Luminosité ON" #define TR_BLOFFBRIGHTNESS INDENT "Luminosité OFF" #define TR_SPLASHSCREEN "Logo d'accueil" -#define TR_THROTTLEWARNING "Alerte gaz" -#define TR_SWITCHWARNING TR("Alerte int","Alerte interrupt.") -#define TR_POTWARNING TR("Alerte pot","Alerte potentiom.") +#define TR_THROTTLEWARNING TR("Alerte gaz", INDENT "Alerte gaz") +#define TR_SWITCHWARNING TR("Alerte int", INDENT "Alerte interrupt.") +#define TR_POTWARNING TR("Alerte pot", INDENT "Alerte potentiom.") #define TR_TIMEZONE "Fuseau horaire" #define TR_RXCHANNELORD TR("Ordre voies RX","Ordre des voies préféré") #define TR_SLAVE "Elève" @@ -720,7 +721,8 @@ #define TR_LOWALARM INDENT "Alarme basse" #define TR_CRITICALALARM INDENT "Alarme critique" #define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh", INDENT "Enregistrer mAh") -#define TR_CHECKLIST "Afficher notes" +#define TR_PREFLIGHT "Preflight Checks" +#define TR_CHECKLIST INDENT "Afficher notes" #define TR_FAS_OFFSET TR(INDENT "Corr FAS", INDENT "Correction FAS") #define TR_UART3MODE "Port série" From 50a38a97bef2878fab352ff12abecd75e4d47f82 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sun, 16 Mar 2014 17:04:17 +0100 Subject: [PATCH 12/13] Wording --- radio/src/translations/en.h.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 46cf92249..8c7b85a81 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -455,8 +455,8 @@ #define TR_ELIMITS TR("E.Limits", "Extended Limits") #define TR_ETRIMS TR("E.Trims", "Extended Trims") #define TR_TRIMINC "Trim Step" -#define TR_TTRACE TR("T-Source", INDENT "Source") -#define TR_TTRIM TR("T-Trim", INDENT "Idle Trim") +#define TR_TTRACE TR("T-Source", INDENT "Timer Source") +#define TR_TTRIM TR("T-Trim", INDENT "Trim Idle Only") #define TR_BEEPCTR TR("Ctr Beep", "Center Beep") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocol") #define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") @@ -530,8 +530,8 @@ #define TR_BLOFFBRIGHTNESS INDENT "OFF Brightness" #define TR_SPLASHSCREEN "Splash screen" #define TR_THROTTLEWARNING TR("T-Warning", INDENT "Throttle State") -#define TR_SWITCHWARNING TR("S-Warning", INDENT "Switch Position") -#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Setup") +#define TR_SWITCHWARNING TR("S-Warning", INDENT "Switch Positions") +#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Positions") #define TR_TIMEZONE TR("Time Zone","GPS Time zone") #define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order") #define TR_SLAVE "Slave" From 93333b1735ac3e7087ad4c1f1bd059ca6214366c Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sun, 16 Mar 2014 17:36:05 +0100 Subject: [PATCH 13/13] French translations --- radio/src/translations/fr.h.txt | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 828b25b79..64c9e8225 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -83,8 +83,8 @@ #define LEN_VTRIMINC TR("\006","\013") #define TR_VTRIMINC TR("Expo\0 ""ExFin\0""Fin\0 ""Moyen\0""Gros\0 ","Exponentiel""Extra Fin\0 ""Fin\0 ""Moyen\0 ""Grossier\0 ") -#define LEN_VBEEPCOUNTDOWN "\006" -#define TR_VBEEPCOUNTDOWN "SilentBeeps\0Voice\0" +#define LEN_VBEEPCOUNTDOWN "\007" +#define TR_VBEEPCOUNTDOWN "Silence""Bips\0 ""Voix\0 " #define LEN_RETA123 "\001" @@ -149,7 +149,7 @@ #if defined(PCBTARANIS) #define TR_CSWTIMER "Tempo" - #define TR_CSWSTICKY "Bist." + #define TR_CSWSTICKY "Bistb" #define TR_CSWRANGE "Plage" #define TR_CSWSTAY "Flanc" #else @@ -172,9 +172,9 @@ #define LEN_VCSWFUNC "\005" #if defined(CPUARM) -#define TR_VCSWFUNC "---\0 " TR_CSWEQUAL "a{x\0 ""a>x\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""ax\0 ""ax""|a|b\0 ""a