mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 18:31:12 +02:00
Merge branch 'master' into multituner
Origin commit data
------------------
Commit: 475f4d9893
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-16 (Mon, 16 Jan 2012)
This commit is contained in:
@@ -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",
|
||||
|
Reference in New Issue
Block a user