Merge branch 'master', remote-tracking branch 'origin' into dvbsi++

Origin commit data
------------------
Branch: ni/coolstream
Commit: f3d2895847
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-02 (Fri, 02 Mar 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-03-02 19:31:49 +04:00
16 changed files with 257 additions and 186 deletions

View File

@@ -141,6 +141,8 @@ const char * locale_real_names[] =
"audiomenu.clockrec",
"audiomenu.dolbydigital",
"audiomenu.hdmi_dd",
"audiomenu.hdmi_dd_auto",
"audiomenu.hdmi_dd_force",
"audiomenu.monoleft",
"audiomenu.monoright",
"audiomenu.pref_lang",
@@ -1235,6 +1237,7 @@ const char * locale_real_names[] =
"screenshot.info",
"screenshot.menu",
"screenshot.osd",
"screenshot.res",
"screenshot.scale",
"screenshot.tv",
"screenshot.video",