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

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 @@ typedef enum
LOCALE_AUDIOMENU_CLOCKREC,
LOCALE_AUDIOMENU_DOLBYDIGITAL,
LOCALE_AUDIOMENU_HDMI_DD,
LOCALE_AUDIOMENU_HDMI_DD_AUTO,
LOCALE_AUDIOMENU_HDMI_DD_FORCE,
LOCALE_AUDIOMENU_MONOLEFT,
LOCALE_AUDIOMENU_MONORIGHT,
LOCALE_AUDIOMENU_PREF_LANG,
@@ -1235,6 +1237,7 @@ typedef enum
LOCALE_SCREENSHOT_INFO,
LOCALE_SCREENSHOT_MENU,
LOCALE_SCREENSHOT_OSD,
LOCALE_SCREENSHOT_RES,
LOCALE_SCREENSHOT_SCALE,
LOCALE_SCREENSHOT_TV,
LOCALE_SCREENSHOT_VIDEO,