Merge branch 'dvbsi++' into next

Origin commit data
------------------
Branch: ni/coolstream
Commit: 6174c657a1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2013-02-13 15:34:41 +04:00
24 changed files with 347 additions and 167 deletions

View File

@@ -550,6 +550,7 @@ typedef enum
LOCALE_FONTSIZE_CHANNEL_NUM_ZAP,
LOCALE_FONTSIZE_CHANNELLIST,
LOCALE_FONTSIZE_CHANNELLIST_DESCR,
LOCALE_FONTSIZE_CHANNELLIST_EVENT,
LOCALE_FONTSIZE_CHANNELLIST_NUMBER,
LOCALE_FONTSIZE_EPG_DATE,
LOCALE_FONTSIZE_EPG_INFO1,
@@ -829,6 +830,7 @@ typedef enum
LOCALE_MENU_HINT_INFOBAR_LOGO,
LOCALE_MENU_HINT_INFOBAR_LOGO_DIR,
LOCALE_MENU_HINT_INFOBAR_ON_EPG,
LOCALE_MENU_HINT_INFOBAR_PROGRESSBAR,
LOCALE_MENU_HINT_INFOBAR_RADIOTEXT,
LOCALE_MENU_HINT_INFOBAR_RES,
LOCALE_MENU_HINT_INFOBAR_SAT,
@@ -1160,6 +1162,11 @@ typedef enum
LOCALE_MISCSETTINGS_INFOBAR_DISP_6,
LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG,
LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_0,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_1,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_2,
LOCALE_MISCSETTINGS_INFOBAR_PROGRESSBAR_3,
LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY,
LOCALE_MISCSETTINGS_INFOBAR_SHOW,
LOCALE_MISCSETTINGS_INFOBAR_SHOW_DD_AVAILABLE,