mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 02:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e9430aec0d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-19 (Sun, 19 Feb 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-02-19 13:20:19 +04:00
parent 19bc82a69b 8e238857f3
commit 9ba79bc6b2
46 changed files with 392 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/system/locals.h
View File

@@ -360,6 +360,7 @@ typedef enum
LOCALE_EXTRA_FEC_S2_QPSK_7_8,
LOCALE_EXTRA_FEC_S2_QPSK_8_9,
LOCALE_EXTRA_FEC_S2_QPSK_9_10,
LOCALE_EXTRA_KEY_CURRENT_TRANSPONDER,
LOCALE_EXTRA_KEY_LIST_END,
LOCALE_EXTRA_KEY_LIST_START,
LOCALE_EXTRA_KEY_PLUGIN,
@@ -920,10 +921,8 @@ typedef enum
LOCALE_MOVIEPLAYER_BOOKMARKNAME_HINT1,
LOCALE_MOVIEPLAYER_BOOKMARKNAME_HINT2,
LOCALE_MOVIEPLAYER_DEFPLUGIN,
LOCALE_MOVIEPLAYER_DVDPLAYBACK,
LOCALE_MOVIEPLAYER_FILEPLAYBACK,
LOCALE_MOVIEPLAYER_HEAD,
LOCALE_MOVIEPLAYER_PESPLAYBACK,
LOCALE_MOVIEPLAYER_TOOMANYBOOKMARKS,
LOCALE_MOVIEPLAYER_TSHELP1,
LOCALE_MOVIEPLAYER_TSHELP10,
@@ -938,7 +937,6 @@ typedef enum
LOCALE_MOVIEPLAYER_TSHELP8,
LOCALE_MOVIEPLAYER_TSHELP9,
LOCALE_MOVIEPLAYER_TSPLAYBACK,
LOCALE_MOVIEPLAYER_VCDPLAYBACK,
LOCALE_MPKEY_AUDIO,
LOCALE_MPKEY_BOOKMARK,
LOCALE_MPKEY_FORWARD,
@@ -1052,6 +1050,7 @@ typedef enum
LOCALE_PERSONALIZE_NOTPROTECTED,
LOCALE_PERSONALIZE_NOTVISIBLE,
LOCALE_PERSONALIZE_PIN,
LOCALE_PERSONALIZE_PIN_IN_USE,
LOCALE_PERSONALIZE_PINCODE,
LOCALE_PERSONALIZE_PINHINT,
LOCALE_PERSONALIZE_PINPROTECT,
@@ -1230,7 +1229,15 @@ typedef enum
LOCALE_SCREENSETUP_LOWERRIGHT,
LOCALE_SCREENSETUP_UPPERLEFT,
LOCALE_SCREENSHOT_COUNT,
LOCALE_SCREENSHOT_COVER,
LOCALE_SCREENSHOT_DEFDIR,
LOCALE_SCREENSHOT_FORMAT,
LOCALE_SCREENSHOT_INFO,
LOCALE_SCREENSHOT_MENU,
LOCALE_SCREENSHOT_OSD,
LOCALE_SCREENSHOT_SCALE,
LOCALE_SCREENSHOT_TV,
LOCALE_SCREENSHOT_VIDEO,
LOCALE_SERVICEMENU_GETPLUGINS,
LOCALE_SERVICEMENU_GETPLUGINS_HINT,
LOCALE_SERVICEMENU_HEAD,