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

Merge branch 'origin/next'

Browse Source
This commit is contained in:
Kjell Kernen
2014-02-12 01:21:59 +01:00
parent 94720b0c4e c034abdb4e
commit 64573dd571
3 changed files with 1154 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/translations/companion_pl.ts
+1149 -837
View File
File diff suppressed because it is too large Load Diff
radio/src/eeprom_conversions.cpp
+2 -2
View File
@@ -449,7 +449,7 @@ void ConvertModel_215_to_216(ModelData &model)
else if (cstate == LS_FAMILY_OFS || cstate == LS_FAMILY_COMP || cstate == LS_FAMILY_DIFF) {
sw.v1 = ConvertSource_215_to_216(sw.v1);
if (cstate == LS_FAMILY_OFS || cstate == LS_FAMILY_DIFF) {
if (sw.v1 >= MIXSRC_FIRST_TELEM) {
if ((uint8_t)sw.v1 >= MIXSRC_FIRST_TELEM) {
switch ((uint8_t)sw.v1) {
case MIXSRC_FIRST_TELEM + TELEM_TM1-1:
case MIXSRC_FIRST_TELEM + TELEM_TM2-1:
@@ -492,7 +492,7 @@ void ConvertModel_215_to_216(ModelData &model)
}
}
}
if (cstate == LS_FAMILY_COMP) {
else if (cstate == LS_FAMILY_COMP) {
sw.v2 = ConvertSource_215_to_216(sw.v2);
}
}
radio/src/translations/pl.h.txt
+3 -3
View File
@@ -521,7 +521,7 @@
#define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4
#define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "NO DATA"
#define TR_NODATA CENTER "BRAK DANYCH"
#define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+12)
@@ -529,10 +529,10 @@
#define TR_TMR1JITTERUS "Tmr1 Jitter\037\124us"
#if defined(CPUARM)
#define TR_TMIXMAXMS "Tmix max"
#define TR_TMIXMAXMS "Tmix maks"
#define TR_FREESTACKMINB "Wolny stos"
#else
#define TR_TMIXMAXMS "Tmix max\037\124ms"
#define TR_TMIXMAXMS "Tmix maks\037\124ms"
#define TR_FREESTACKMINB "Wolny stos\037\124b"
#endif