Merge branch 'dvbsi++' into next

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 @@ const char * locale_real_names[] =
"fontsize.channel_num_zap",
"fontsize.channellist",
"fontsize.channellist_descr",
"fontsize.channellist_event",
"fontsize.channellist_number",
"fontsize.epg_date",
"fontsize.epg_info1",
@@ -829,6 +830,7 @@ const char * locale_real_names[] =
"menu.hint_infobar_logo",
"menu.hint_infobar_logo_dir",
"menu.hint_infobar_on_epg",
"menu.hint_infobar_progressbar",
"menu.hint_infobar_radiotext",
"menu.hint_infobar_res",
"menu.hint_infobar_sat",
@@ -1160,6 +1162,11 @@ const char * locale_real_names[] =
"miscsettings.infobar_disp_6",
"miscsettings.infobar_disp_log",
"miscsettings.infobar_logo_hdd_dir",
"miscsettings.infobar_progressbar",
"miscsettings.infobar_progressbar_0",
"miscsettings.infobar_progressbar_1",
"miscsettings.infobar_progressbar_2",
"miscsettings.infobar_progressbar_3",
"miscsettings.infobar_sat_display",
"miscsettings.infobar_show",
"miscsettings.infobar_show_dd_available",