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

Merge pull request #611 from opentx/dvogonen/607_translation_issues

Browse Source 
Made the small input icon translatable (A-I available). Entered hard coded string to translations.
This commit is contained in:
Bertrand Songis
2014-01-26 11:50:33 -08:00
parent d695b53548 69da337b70
commit 0c015f321a
14 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/fonts/std/font_03x05.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 222 B

After

Width:  |  Height:  |  Size: 261 B

radio/src/gui/menu_model.cpp
+1 -1
View File
@@ -2888,7 +2888,7 @@ void menuModelExpoOne(uint8_t event)
{
#if defined(PCBTARANIS)
case EXPO_FIELD_INPUT_NAME:
editSingleName(EXPO_ONE_2ND_COLUMN, y, "Input Name", g_model.inputNames[ed->chn], sizeof(g_model.inputNames[ed->chn]), event, attr);
editSingleName(EXPO_ONE_2ND_COLUMN, y, STR_INPUTNAME, g_model.inputNames[ed->chn], sizeof(g_model.inputNames[ed->chn]), event, attr);
break;
#endif
radio/src/lcd.cpp
+1 -1
View File
@@ -957,7 +957,7 @@ void putsMixerSource(xcoord_t x, uint8_t y, uint8_t idx, LcdFlags att)
lcd_putsiAtt(x, y, STR_VSRCRAW, 0, att);
}
else if (idx <= MIXSRC_LAST_INPUT) {
lcd_putcAtt(x+2, y+1, 'I', TINSIZE);
lcd_putcAtt(x+2, y+1, CHR_INPUT, TINSIZE);
lcd_filled_rect(x, y, 7, 7);
if (ZEXIST(g_model.inputNames[idx-MIXSRC_FIRST_INPUT]))
lcd_putsnAtt(x+8, y, g_model.inputNames[idx-MIXSRC_FIRST_INPUT], 4, ZCHAR|att);
radio/src/translations.cpp
+1
View File
@@ -462,6 +462,7 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text";
const pm_char STR_MODELNAME[] PROGMEM = TR_MODELNAME;
const pm_char STR_PHASENAME[] PROGMEM = TR_PHASENAME;
const pm_char STR_MIXNAME[] PROGMEM = TR_MIXNAME;
const pm_char STR_INPUTNAME[] PROGMEM = TR_INPUTNAME;
const pm_char STR_EXPONAME[] PROGMEM = TR_EXPONAME;
#endif
radio/src/translations.h
+2
View File
@@ -644,6 +644,7 @@ extern const pm_char STR_VIEW_TEXT[];
extern const pm_char STR_MODELNAME[];
extern const pm_char STR_PHASENAME[];
extern const pm_char STR_MIXNAME[];
extern const pm_char STR_INPUTNAME[];
extern const pm_char STR_EXPONAME[];
#else
#define STR_MODELNAME STR_NAME
@@ -764,5 +765,6 @@ extern const pm_char STR_VIEW_TEXT[];
#define CHR_LONG TR_CHR_LONG
#define CHR_TOGGLE TR_CHR_TOGGLE
#define CHR_HOUR TR_CHR_HOUR
#define CHR_INPUT TR_CHR_INPUT
#endif
radio/src/translations/cz.h.txt
+2
View File
@@ -396,6 +396,7 @@
#define TR_MODELNAME "Název modelu"
#define TR_PHASENAME "Jméno"
#define TR_MIXNAME "Jméno"
#define TR_INPUTNAME "Input Name"
#if defined(PCBTARANIS)
#define TR_EXPONAME "Line Name"
#else
@@ -761,6 +762,7 @@
#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 "Pípání"
#define TR_WAV_VOLUME "Zvuky WAV"
radio/src/translations/de.h.txt
+2
View File
@@ -396,6 +396,7 @@
#define TR_MODELNAME "Modell Name"
#define TR_PHASENAME "Phase Name"
#define TR_MIXNAME "Mix Name"
#define TR_INPUTNAME "Input Name"
#if defined(PCBTARANIS)
#define TR_EXPONAME "Linie Name"
#else
@@ -761,6 +762,7 @@
#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"
radio/src/translations/en.h
+2
View File
@@ -396,6 +396,7 @@
#define TR_MODELNAME "Model Name"
#define TR_PHASENAME "Mode Name"
#define TR_MIXNAME "Mix Name"
#define TR_INPUTNAME "Input Name"
#if defined(PCBTARANIS)
#define TR_EXPONAME "Line Name"
#else
@@ -761,6 +762,7 @@
#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"
radio/src/translations/es.h.txt
+2
View File
@@ -396,6 +396,7 @@
#define TR_MODELNAME "Nom.Modelo"
#define TR_PHASENAME "Nom.Fase "
#define TR_MIXNAME "Nom.Mezcla"
#define TR_INPUTNAME "Input Name"
#if defined(PCBTARANIS)
#define TR_EXPONAME "Line Name"
#else
@@ -761,6 +762,7 @@
#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 "Volumen Beep"
#define TR_WAV_VOLUME "Volumen Wav"
radio/src/translations/fr.h.txt
+2
View File
@@ -396,6 +396,7 @@
#define TR_MODELNAME TR("Nom modèle","Nom du modèle")
#define TR_PHASENAME "Nom phase"
#define TR_MIXNAME TR("Nom mix.","Nom du mixeur")
#define TR_INPUTNAME "Input Name"
#if defined(PCBTARANIS)
#define TR_EXPONAME "Nom ligne"
#else
@@ -761,6 +762,7 @@
#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"
radio/src/translations/it.h.txt
+2
View File
@@ -396,6 +396,7 @@
#define TR_MODELNAME "Nome modello"
#define TR_PHASENAME "Nome fase"
#define TR_MIXNAME "Nome mix"
#define TR_INPUTNAME "Input Name"
#if defined(PCBTARANIS)
#define TR_EXPONAME "Nome expo"
#else
@@ -761,6 +762,7 @@
#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"
radio/src/translations/pl.h.txt
+2
View File
@@ -396,6 +396,7 @@
#define TR_MODELNAME "Nazwa modelu"
#define TR_PHASENAME "Nazwa"
#define TR_MIXNAME "Nazwa"
#define TR_INPUTNAME "Input Name"
#if defined(PCBTARANIS)
#define TR_EXPONAME "Line Name"
#else
@@ -761,6 +762,7 @@
#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 "Głośność pikania"
#define TR_WAV_VOLUME "Głośność wav"
radio/src/translations/pt.h.txt
+2
View File
@@ -396,6 +396,7 @@
#define TR_MODELNAME "Model Name"
#define TR_PHASENAME "Phase Name"
#define TR_MIXNAME "Mix Name"
#define TR_INPUTNAME "Input Name"
#if defined(PCBTARANIS)
#define TR_EXPONAME "Line Name"
#else
@@ -761,6 +762,7 @@
#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"
radio/src/translations/se.h.txt
+2
View File
@@ -396,6 +396,7 @@
#define TR_MODELNAME "Modellnamn"
#define TR_PHASENAME "Lägesnamn "
#define TR_MIXNAME "Mixnamn "
#define TR_INPUTNAME "Filternamn"
#if defined(PCBTARANIS)
#define TR_EXPONAME "Linjenamn"
#else
@@ -761,6 +762,7 @@
#define TR_CHR_LONG 'l'
#define TR_CHR_TOGGLE 't'
#define TR_CHR_HOUR 'h'
#define TR_CHR_INPUT 'F' // Values between A-I will work
#define TR_BEEP_VOLUME "Volym Pip"
#define TR_WAV_VOLUME "Volym Wav"