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

Merge branch 'master' into multituner

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 475f4d9893
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-16 (Mon, 16 Jan 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-01-16 17:48:19 +04:00
parent 6cf224eadc 60ea1bea7c
commit 9f8fd28001
20 changed files with 277 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/system/locals.h
View File

@@ -610,14 +610,24 @@ typedef enum
LOCALE_KEYBINDINGMENU_HEAD,
LOCALE_KEYBINDINGMENU_LASTCHANNEL,
LOCALE_KEYBINDINGMENU_MISC,
LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV,
LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_INFOBAR,
LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_VOLUME,
LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_VZAP,
LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_ZAP,
LOCALE_KEYBINDINGMENU_MODECHANGE,
LOCALE_KEYBINDINGMENU_PAGEDOWN,
LOCALE_KEYBINDINGMENU_PAGEUP,
LOCALE_KEYBINDINGMENU_POWEROFF,
LOCALE_KEYBINDINGMENU_QUICKZAP,
LOCALE_KEYBINDINGMENU_REMOTECONTROL,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_NEO1,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_STANDARD,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_COOLSTREAM,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_DBOX,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART1,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART2,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_MSG_PART3,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_PHILIPS,
LOCALE_KEYBINDINGMENU_REMOTECONTROL_HARDWARE_TRIPLEDRAGON,
LOCALE_KEYBINDINGMENU_REPEATBLOCK,
LOCALE_KEYBINDINGMENU_REPEATBLOCKGENERIC,
LOCALE_KEYBINDINGMENU_SORT,
@@ -754,7 +764,6 @@ typedef enum
LOCALE_MISCSETTINGS_SHUTDOWN_REAL,
LOCALE_MISCSETTINGS_SHUTDOWN_REAL_RCDELAY,
LOCALE_MISCSETTINGS_SLEEPTIMER,
LOCALE_MISCSETTINGS_VIRTUAL_ZAP_MODE,
LOCALE_MISCSETTINGS_ZAPTO_PRE_TIME,
LOCALE_MOTORCONTROL_CALC_POSITIONS,
LOCALE_MOTORCONTROL_DISABLE_LIMIT,