Merge branch 'next' into kilrah/antennaselection

# Conflicts:
#	radio/src/translations/de.h.txt
#	radio/src/translations/es.h.txt
#	radio/src/translations/it.h.txt
#	radio/src/translations/pt.h.txt
#	radio/src/translations/se.h.txt
This commit is contained in:
Andre Bernet
2016-03-31 15:11:12 +04:00
163 changed files with 4166 additions and 5372 deletions
+3 -1
View File
@@ -127,7 +127,9 @@ const pm_char STR_POPUPS[] PROGMEM = TR_POPUPS;
#if !defined(OFS_EXIT)
const pm_char STR_EXIT[] PROGMEM = TR_EXIT;
#endif
const pm_char STR_MENUWHENDONE[] PROGMEM = TR_MENUWHENDONE;
#if !defined(PCBHORUS)
const pm_char STR_MENUWHENDONE[] PROGMEM = TR_MENUWHENDONE;
#endif
const pm_char STR_FREE[] PROGMEM = TR_FREE;
const pm_char STR_DELETEMODEL[] PROGMEM = TR_DELETEMODEL;
const pm_char STR_COPYINGMODEL[] PROGMEM = TR_COPYINGMODEL;