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

Merge branch 'next' into bsongis/issue_2056_set_rtc_from_gps

Browse Source
This commit is contained in:
Andre Bernet
2015-03-21 12:19:01 +04:00
parent 4318d04707 7ab483d469
commit c3cc3bd7d2
35 changed files with 687 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/translations.cpp
+18
View File
@@ -378,6 +378,10 @@ const pm_char STR_SHUTDOWN[] PROGMEM = TR_SHUTDOWN;
const pm_char STR_SAVEMODEL[] PROGMEM = TR_SAVEMODEL;
#endif
#if defined(PCBTARANIS) && defined(REV9E)
const pm_char STR_POWEROFF[] PROGMEM = TR_POWEROFF;
#endif
const pm_char STR_BATT_CALIB[] PROGMEM = TR_BATT_CALIB;
#if defined(CPUARM) || defined(FRSKY)
@@ -501,6 +505,8 @@ const pm_char STR_FLASH_EXTERNAL_DEVICE[] PROGMEM = TR_FLASH_EXTERNAL_DEVICE;
const pm_char STR_WRITING[] PROGMEM = TR_WRITING;
const pm_char STR_CONFIRM_FORMAT[] PROGMEM = TR_CONFIRM_FORMAT;
const pm_char STR_EEBACKUP[] PROGMEM = TR_EEBACKUP;
const pm_char STR_FACTORYRESET[] PROGMEM = TR_FACTORYRESET;
const pm_char STR_CONFIRMRESET[] PROGMEM = TR_CONFIRMRESET;
const pm_char STR_TOO_MANY_LUA_SCRIPTS[] PROGMEM = TR_TO_MANY_LUA_SCRIPTS;
const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR;
@@ -531,9 +537,21 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR;
const pm_char STR_CRITICALALARM[] PROGMEM = TR_CRITICALALARM;
const pm_char STR_TELEMETRY_TYPE[] PROGMEM = TR_TELEMETRY_TYPE;
const pm_char STR_TELEMETRY_SENSORS[] PROGMEM = TR_TELEMETRY_SENSORS;
const pm_char STR_VALUE[] PROGMEM = TR_VALUE;
const pm_char STR_TOPLCDTIMER[] PROGMEM = TR_TOPLCDTIMER;
const pm_char STR_UNIT[] PROGMEM = TR_UNIT;
const pm_char STR_TELEMETRY_NEWSENSOR[] PROGMEM = TR_TELEMETRY_NEWSENSOR;
const pm_char STR_ID[] PROGMEM = TR_ID;
const pm_char STR_PRECISION[] PROGMEM = TR_PRECISION;
const pm_char STR_RATIO[] PROGMEM = TR_RATIO;
const pm_char STR_FORMULA[] PROGMEM = TR_FORMULA;
const pm_char STR_CELLINDEX[] PROGMEM = TR_CELLINDEX;
const pm_char STR_LOGS[] PROGMEM = TR_LOGS;
const pm_char STR_OPTIONS[] PROGMEM = TR_OPTIONS;
const pm_char STR_ALTSENSOR[] PROGMEM = TR_ALTSENSOR;
const pm_char STR_CELLSENSOR[] PROGMEM = TR_CELLSENSOR;
const pm_char STR_GPSSENSOR[] PROGMEM = TR_GPSSENSOR;
const pm_char STR_CURRENTSENSOR[] PROGMEM = TR_CURRENTSENSOR;
#endif
#if defined(PCBTARANIS)