Merge branch 'master' into multituner

This commit is contained in:
[CST] Focus
2012-01-16 17:48:19 +04:00
20 changed files with 277 additions and 97 deletions

View File

@@ -610,14 +610,24 @@ const char * locale_real_names[] =
"keybindingmenu.head",
"keybindingmenu.lastchannel",
"keybindingmenu.misc",
"keybindingmenu.mode_left_right_key_tv",
"keybindingmenu.mode_left_right_key_tv_infobar",
"keybindingmenu.mode_left_right_key_tv_volume",
"keybindingmenu.mode_left_right_key_tv_vzap",
"keybindingmenu.mode_left_right_key_tv_zap",
"keybindingmenu.modechange",
"keybindingmenu.pagedown",
"keybindingmenu.pageup",
"keybindingmenu.poweroff",
"keybindingmenu.quickzap",
"keybindingmenu.remotecontrol",
"keybindingmenu.remotecontrol_neo1",
"keybindingmenu.remotecontrol_standard",
"keybindingmenu.remotecontrol_hardware",
"keybindingmenu.remotecontrol_hardware_coolstream",
"keybindingmenu.remotecontrol_hardware_dbox",
"keybindingmenu.remotecontrol_hardware_msg_part1",
"keybindingmenu.remotecontrol_hardware_msg_part2",
"keybindingmenu.remotecontrol_hardware_msg_part3",
"keybindingmenu.remotecontrol_hardware_philips",
"keybindingmenu.remotecontrol_hardware_tripledragon",
"keybindingmenu.repeatblock",
"keybindingmenu.repeatblockgeneric",
"keybindingmenu.sort",
@@ -754,7 +764,6 @@ const char * locale_real_names[] =
"miscsettings.shutdown_real",
"miscsettings.shutdown_real_rcdelay",
"miscsettings.sleeptimer",
"miscsettings.virtual_zap_mode",
"miscsettings.zapto_pre_time",
"motorcontrol.calc_positions",
"motorcontrol.disable_limit",