piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

New translations

Browse Source
This commit is contained in:
Bertrand Songis
2016-06-11 08:57:31 +02:00
parent 17ab2c83aa
commit 71e71f8314
16 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/9x/menu_model_setup.cpp
+3 -3
View File
@@ -596,11 +596,11 @@ void menuModelSetup(uint8_t event)
coord_t xOffsetBind = MODEL_SETUP_BIND_OFS;
if (IS_MODULE_XJT(moduleIdx) && IS_D8_RX(moduleIdx)) {
xOffsetBind = 0;
lcd_putsLeft(y, INDENT "Receiver");
lcd_putsLeft(y, STR_RECEIVER);
if (attr) l_posHorz += 1;
}
else {
lcd_putsLeft(y, STR_RXNUM);
lcd_putsLeft(y, STR_RECEIVER_NUM);
}
if (IS_MODULE_XJT(moduleIdx) || IS_MODULE_DSM2(moduleIdx)) {
if (xOffsetBind) lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
@@ -773,7 +773,7 @@ void menuModelSetup(uint8_t event)
if (attr && menuHorizontalPosition > 1) {
REPEAT_LAST_CURSOR_MOVE(); // limit 3 column row to 2 colums (Rx_Num and RANGE fields)
}
lcd_putsLeft(y, STR_RXNUM);
lcd_putsLeft(y, STR_RECEIVER_NUM);
lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[0], (menuHorizontalPosition<=0 ? attr : 0) | LEADING0|LEFT, 2);
if (attr && (menuHorizontalPosition==0 && (editMode>0 || p1valdiff))) {
CHECK_INCDEC_MODELVAR_ZERO(event, g_model.header.modelId[0], 99);
radio/src/gui/horus/menu_model_setup.cpp
+2 -2
View File
@@ -662,11 +662,11 @@ bool menuModelSetup(evt_t event)
coord_t xOffsetBind = MODEL_SETUP_BIND_OFS;
if (IS_MODULE_XJT(moduleIdx) && IS_D8_RX(moduleIdx)) {
xOffsetBind = 0;
lcdDrawText(MENUS_MARGIN_LEFT, y, INDENT "Receiver");
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_RECEIVER);
if (attr) l_posHorz += 1;
}
else {
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_RXNUM);
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_RECEIVER_NUM);
}
if (IS_MODULE_XJT(moduleIdx) || IS_MODULE_DSM2(moduleIdx)) {
if (xOffsetBind) lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0 | LEFT, 2);
radio/src/gui/taranis/menu_model_setup.cpp
+8 -7
View File
@@ -894,11 +894,11 @@ void menuModelSetup(uint8_t event)
coord_t xOffsetBind = MODEL_SETUP_BIND_OFS;
if (IS_MODULE_XJT(moduleIdx) && g_model.moduleData[moduleIdx].rfProtocol == RF_PROTO_D8) {
xOffsetBind = 0;
lcd_putsLeft(y, INDENT "Receiver");
lcd_putsLeft(y, STR_RECEIVER);
if (attr) l_posHorz += 1;
}
else {
lcd_putsLeft(y, STR_RXNUM);
lcd_putsLeft(y, STR_RECEIVER_NUM);
}
if (IS_MODULE_XJT(moduleIdx) || IS_MODULE_DSM2(moduleIdx) || IS_MODULE_MULTIMODULE(moduleIdx)) {
if (xOffsetBind) lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
@@ -1105,21 +1105,22 @@ void menuModelFailsafe(uint8_t event)
uint8_t wbar = (longNames ? SLIDER_W-10 : SLIDER_W);
#endif
uint8_t xValue = x+COL_W-4-wbar-ofs;
if (failsafeValue == FAILSAFE_CHANNEL_HOLD) {
lcdDrawText(x+COL_W-4-wbar-ofs-16, y, "HOLD", flags);
lcdDrawText(xValue, y, STR_HOLD, RIGHT|flags);
failsafeValue = 0;
}
else if (failsafeValue == FAILSAFE_CHANNEL_NOPULSE) {
lcdDrawText(x+COL_W-4-wbar-ofs-16, y, "NONE", flags);
lcdDrawText(xValue, y, STR_NONE, RIGHT|flags);
failsafeValue = 0;
}
else {
#if defined(PPM_UNIT_US)
lcdDrawNumber(x+COL_W-4-wbar-ofs, y, PPM_CH_CENTER(ch)+failsafeValue/2, flags);
lcdDrawNumber(xValue, y, PPM_CH_CENTER(ch)+failsafeValue/2, RIGHT|flags);
#elif defined(PPM_UNIT_PERCENT_PREC1)
lcdDrawNumber(x+COL_W-4-wbar-ofs, y, calcRESXto1000(failsafeValue), PREC1|flags);
lcdDrawNumber(xValue, y, calcRESXto1000(failsafeValue), RIGHT|PREC1|flags);
#else
lcdDrawNumber(x+COL_W-4-wbar-ofs, y, calcRESXto1000(failsafeValue)/10, flags);
lcdDrawNumber(xValue, y, calcRESXto1000(failsafeValue)/10, RIGHT|flags);
#endif
}
radio/src/translations.cpp
+4 -1
View File
@@ -368,7 +368,8 @@ const pm_char STR_MENUDEBUG[] PROGMEM = TR_MENUDEBUG;
const pm_char STR_MENUGLOBALVARS[] PROGMEM = TR_MENUGLOBALVARS;
#if defined(DSM2) || defined(PXX)
const pm_char STR_RXNUM[] PROGMEM = TR_RXNUM;
const pm_char STR_RECEIVER_NUM[] PROGMEM = TR_RECEIVER_NUM;
const pm_char STR_RECEIVER[] PROGMEM = TR_RECEIVER;
#endif
#if defined(PXX) || defined(CPUARM)
@@ -378,6 +379,8 @@ const pm_char STR_EXTERNALRF[] PROGMEM = TR_EXTERNALRF;
const pm_char STR_COUNTRYCODE[] PROGMEM = TR_COUNTRYCODE;
const pm_char STR_FAILSAFE[] PROGMEM = TR_FAILSAFE;
const pm_char STR_FAILSAFESET[] PROGMEM = TR_FAILSAFESET;
const pm_char STR_HOLD[] PROGMEM = TR_HOLD;
const pm_char STR_NONE[] PROGMEM = TR_NONE;
const pm_char STR_MENUSENSOR[] PROGMEM = TR_MENUSENSOR;
const pm_char STR_SENSOR[] PROGMEM = TR_SENSOR;
#endif
radio/src/translations.h
+4 -1
View File
@@ -583,7 +583,8 @@ extern const pm_char STR_MULTI_LOWPOWER[];
extern const pm_char STR_MULTI_DSMFRAME[];
#endif
#if defined(DSM2) || defined(PXX)
extern const pm_char STR_RXNUM[];
extern const pm_char STR_RECEIVER_NUM[];
extern const pm_char STR_RECEIVER[];
#endif
#if defined(PXX) || defined(CPUARM)
@@ -592,6 +593,8 @@ extern const pm_char STR_INTERNALRF[];
extern const pm_char STR_EXTERNALRF[];
extern const pm_char STR_FAILSAFE[];
extern const pm_char STR_FAILSAFESET[];
extern const pm_char STR_HOLD[];
extern const pm_char STR_NONE[];
extern const pm_char STR_MENUSENSOR[];
extern const pm_char STR_SENSOR[];
extern const pm_char STR_COUNTRYCODE[];
radio/src/translations/cz.h.txt
+5 -2
View File
@@ -848,9 +848,10 @@
#define TR_MENUSTAT "STATISTIKA"
#define TR_MENUDEBUG "DIAG"
#if defined(CPUARM)
#define TR_RXNUM TR(INDENT "RX číslo", INDENT "Číslo přijímače")
#define TR_RECEIVER_NUM TR(INDENT "RX číslo", INDENT "Číslo přijímače")
#define TR_RECEIVER INDENT "Receiver"
#else
#define TR_RXNUM "RX číslo"
#define TR_RECEIVER_NUM "RX číslo"
#endif
#define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune"
#define TR_MULTI_VIDFREQ INDENT "Video frequency"
@@ -968,6 +969,8 @@
#define TR_EXTERNALRF "Externí RF modul"
#define TR_FAILSAFE "Mód Failsafe"
#define TR_FAILSAFESET "NASTAVENÍ FAILSAFE"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_MENUSENSOR "SENZOR"
#define TR_SENSOR "SENSOR"
#define TR_COUNTRYCODE "Kód regionu"
radio/src/translations/de.h.txt
+5 -2
View File
@@ -852,9 +852,10 @@
#define TR_MENUSTAT "STAT"
#define TR_MENUDEBUG "DEBUG"
#if defined(CPUARM)
#define TR_RXNUM TR(INDENT "Empf Nr.", INDENT "Modell-Match-Nr.")
#define TR_RECEIVER_NUM TR(INDENT "Empf Nr.", INDENT "Modell-Match-Nr.")
#define TR_RECEIVER INDENT "Receiver"
#else
#define TR_RXNUM "Empf Nr."
#define TR_RECEIVER_NUM "Empf Nr."
#endif
#define TR_MULTI_RFTUNE INDENT "Frequenzfeineinst."
#define TR_MULTI_VIDFREQ INDENT "Videofrequenz"
@@ -972,6 +973,8 @@
#define TR_EXTERNALRF TR("---Externes HF-Modul---", "----Externes HF-Modul----------") //9XR-Pro
#define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Failsafe Mode")
#define TR_FAILSAFESET "Failsafe setzen"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_MENUSENSOR "SENSOR"
#define TR_SENSOR "SENSOR"
#define TR_COUNTRYCODE "Landescode"
radio/src/translations/en.h.txt
+6 -2
View File
@@ -862,9 +862,11 @@
#define TR_MENUSTAT "STATS"
#define TR_MENUDEBUG "DEBUG"
#if defined(CPUARM)
#define TR_RXNUM TR(INDENT "RxNum", INDENT "Receiver No.")
#define TR_RECEIVER_NUM TR(INDENT "RxNum", INDENT "Receiver No.")
#define TR_RECEIVER INDENT "Receiver"
#else
#define TR_RXNUM "RxNum"
#define TR_RECEIVER_NUM "RxNum"
#define TR_RECEIVER "RxNum"
#endif
#define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune"
#define TR_MULTI_VIDFREQ INDENT "Video frequency"
@@ -982,6 +984,8 @@
#define TR_EXTERNALRF "External RF"
#define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Failsafe mode")
#define TR_FAILSAFESET "FAILSAFE SETTINGS"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_MENUSENSOR "SENSORS"
#define TR_SENSOR "SENSOR"
#define TR_COUNTRYCODE "Country code"
radio/src/translations/es.h.txt
+4 -1
View File
@@ -815,7 +815,8 @@
#define TR_MENUTEMPLATES "PLANTILLAS"
#define TR_MENUSTAT "STATS"
#define TR_MENUDEBUG "DEBUG"
#define TR_RXNUM TR("RxNum", INDENT"Receptor No.")
#define TR_RECEIVER_NUM TR("RxNum", INDENT"Receptor No.")
#define TR_RECEIVER INDENT "Receiver"
#define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune"
#define TR_MULTI_VIDFREQ INDENT "Video frequency"
#define TR_MULTI_DSMFRAME INDENT "DSM frame format"
@@ -932,6 +933,8 @@
#define TR_EXTERNALRF "Externa RF"
#define TR_FAILSAFE INDENT"Modo sgdad."
#define TR_FAILSAFESET "AJUSTES SGDAD."
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_MENUSENSOR "SENSOR"
#define TR_SENSOR "SENSOR"
#define TR_COUNTRYCODE "Codigo Pais"
radio/src/translations/fi.h.txt
+4 -1
View File
@@ -815,7 +815,8 @@
#define TR_MENUTEMPLATES "TEMPLATES"
#define TR_MENUSTAT "STATS"
#define TR_MENUDEBUG "DEBUG"
#define TR_RXNUM TR("RxNum", INDENT"Receiver No.")
#define TR_RECEIVER_NUM TR("RxNum", INDENT"Receiver No.")
#define TR_RECEIVER INDENT "Receiver"
#define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune"
#define TR_MULTI_VIDFREQ INDENT "Video frequency"
#define TR_MULTI_DSMFRAME INDENT "DSM frame format"
@@ -932,6 +933,8 @@
#define TR_EXTERNALRF "External RF"
#define TR_FAILSAFE INDENT "Failsafe mode"
#define TR_FAILSAFESET "FAILSAFE SETTINGS"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_MENUSENSOR "SENSOR"
#define TR_SENSOR "SENSOR"
#define TR_COUNTRYCODE "Country Code"
radio/src/translations/fr.h.txt
+9 -1
View File
@@ -842,7 +842,13 @@
#define TR_MENUTEMPLATES "GABARITS"
#define TR_MENUSTAT TR("STATS", "STATISTIQUES")
#define TR_MENUDEBUG "DEBUG"
#define TR_RXNUM TR(INDENT "NumRx", INDENT "No. récepteur")
#if defined(CPUARM)
#define TR_RECEIVER_NUM TR(INDENT "NumRx", INDENT "No. récepteur")
#define TR_RECEIVER INDENT "Récepteur"
#else
#define TR_RECEIVER_NUM "Récepteur"
#define TR_RECEIVER "Récepteur"
#endif
#define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune"
#define TR_MULTI_VIDFREQ INDENT "Video frequency"
#define TR_MULTI_DSMFRAME INDENT "DSM frame format"
@@ -959,6 +965,8 @@
#define TR_EXTERNALRF "HF externe"
#define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Type failsafe")
#define TR_FAILSAFESET "REGLAGES FAILSAFE"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_MENUSENSOR "CAPTEUR"
#define TR_SENSOR "SENSOR"
#define TR_COUNTRYCODE TR("Zone géo.","Zone géographique")
radio/src/translations/it.h.txt
+5 -2
View File
@@ -847,9 +847,10 @@
#define TR_MENUSTAT "STATO"
#define TR_MENUDEBUG "DEBUG"
#if defined(CPUARM)
#define TR_RXNUM TR(INDENT "RxNum", INDENT "Ricevente No.")
#define TR_RECEIVER_NUM TR(INDENT "RxNum", INDENT "Ricevente No.")
#define TR_RECEIVER INDENT "Receiver"
#else
#define TR_RXNUM "RxNum"
#define TR_RECEIVER_NUM "RxNum"
#endif
#define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune"
#define TR_MULTI_VIDFREQ INDENT "Video frequency"
@@ -967,6 +968,8 @@
#define TR_EXTERNALRF "Modulo esterno"
#define TR_FAILSAFE "Modo failsafe"
#define TR_FAILSAFESET TR("FAILSAFE","IMPOSTAZIONI FAILSAFE")
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_MENUSENSOR "SENSOR"
#define TR_SENSOR "SENSOR"
#define TR_COUNTRYCODE TR("Codice Paese","Standard 2.4Ghz")
radio/src/translations/nl.h.txt
+5 -2
View File
@@ -861,9 +861,10 @@
#define TR_MENUSTAT "STAT"
#define TR_MENUDEBUG "DEBUG"
#if defined(CPUARM)
#define TR_RXNUM TR(INDENT "RxNum", INDENT "Receiver No.")
#define TR_RECEIVER_NUM TR(INDENT "RxNum", INDENT "Receiver No.")
#define TR_RECEIVER INDENT "Receiver"
#else
#define TR_RXNUM "RxNum"
#define TR_RECEIVER_NUM "RxNum"
#endif
#define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune"
#define TR_MULTI_VIDFREQ INDENT "Video frequency"
@@ -981,6 +982,8 @@
#define TR_EXTERNALRF "Externe RF"
#define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Failsafe Modus")
#define TR_FAILSAFESET "Failsafe instellen"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_MENUSENSOR "SENSOR"
#define TR_SENSOR "SENSOR"
#define TR_COUNTRYCODE "Landcode"
radio/src/translations/pl.h.txt
+5 -2
View File
@@ -849,9 +849,10 @@
#define TR_MENUSTAT "STAT"
#define TR_MENUDEBUG "DEBUG"
#if defined(CPUARM)
#define TR_RXNUM TR( INDENT "Nr RX",INDENT "Nr odbiornika")
#define TR_RECEIVER_NUM TR( INDENT "Nr RX",INDENT "Nr odbiornika")
#define TR_RECEIVER INDENT "Receiver"
#else
#define TR_RXNUM "NumOdb"
#define TR_RECEIVER_NUM "NumOdb"
#endif
#define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune"
#define TR_MULTI_VIDFREQ INDENT "Video frequency"
@@ -969,6 +970,8 @@
#define TR_EXTERNALRF "Zewn.Moduł RF"
#define TR_FAILSAFE TR(INDENT"Failsafe",INDENT"Tryb Failsafe")
#define TR_FAILSAFESET "USTAWIENIE FAILSAFE"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_MENUSENSOR "CZUJNIK"
#define TR_SENSOR "SENSOR"
#define TR_COUNTRYCODE "Kod regionu"
radio/src/translations/pt.h.txt
+4 -1
View File
@@ -811,7 +811,8 @@
#define TR_MENUTEMPLATES "MODELOS"
#define TR_MENUSTAT "REGISTROS"
#define TR_MENUDEBUG "DEPURAR"
#define TR_RXNUM "RxNum"
#define TR_RECEIVER_NUM "RxNum"
#define TR_RECEIVER INDENT "Receiver"
#define TR_SYNCMENU "Sync [MENU]"
#define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune"
#define TR_MULTI_VIDFREQ INDENT "Video frequency"
@@ -928,6 +929,8 @@
#define TR_EXTERNALRF "External RF"
#define TR_FAILSAFE "Failsafe mode"
#define TR_FAILSAFESET "FAILSAFE SETTINGS"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_MENUSENSOR "SENSOR"
#define TR_SENSOR "SENSOR"
#define TR_COUNTRYCODE "Country Code"
radio/src/translations/se.h.txt
+5 -2
View File
@@ -860,9 +860,10 @@
#define TR_MENUSTAT "STATISTIK"
#define TR_MENUDEBUG "DEBUG"
#if defined(CPUARM)
#define TR_RXNUM TR(INDENT "RxNum", INDENT "Mottagare Nr.")
#define TR_RECEIVER_NUM TR(INDENT "RxNum", INDENT "Mottagare Nr.")
#define TR_RECEIVER INDENT "Receiver"
#else
#define TR_RXNUM "RxNum"
#define TR_RECEIVER_NUM "RxNum"
#endif
#define TR_SYNCMENU "Synk [MENU]"
#define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune"
@@ -980,6 +981,8 @@
#define TR_EXTERNALRF "Extern Radiomodul"
#define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Failsafeläge")
#define TR_FAILSAFESET "FailsafeInställning"
#define TR_HOLD "HOLD"
#define TR_NONE "NONE"
#define TR_MENUSENSOR "SENSOR"
#define TR_SENSOR "SENSOR"
#define TR_COUNTRYCODE "Landskod"