neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii

Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-09-05 17:49:11 +04:00
parent 4c9da61afa
commit 4eb5179286
45 changed files with 1767 additions and 1144 deletions

View File

@@ -407,15 +407,19 @@ typedef enum
LOCALE_EXTRA_FEC_AUTO,
LOCALE_EXTRA_KEY_CURRENT_TRANSPONDER,
LOCALE_EXTRA_KEY_FORMAT_MODE,
LOCALE_EXTRA_KEY_HELP,
LOCALE_EXTRA_KEY_LIST_END,
LOCALE_EXTRA_KEY_LIST_START,
LOCALE_EXTRA_KEY_NEXT43MODE,
LOCALE_EXTRA_KEY_PIC_MODE,
LOCALE_EXTRA_KEY_PIC_SIZE,
LOCALE_EXTRA_KEY_PIP_CLOSE,
LOCALE_EXTRA_KEY_PIP_SETUP,
LOCALE_EXTRA_KEY_PIP_SWAP,
LOCALE_EXTRA_KEY_PLUGIN,
LOCALE_EXTRA_KEY_RECORD,
LOCALE_EXTRA_KEY_SCREENSHOT,
LOCALE_EXTRA_KEY_SWITCHFORMAT,
LOCALE_EXTRA_KEY_TIMESHIFT,
LOCALE_EXTRA_KEY_UNLOCK,
LOCALE_EXTRA_LADIRECTION,
@@ -758,6 +762,7 @@ typedef enum
LOCALE_KEYBINDINGMENU_CHANNELDOWN,
LOCALE_KEYBINDINGMENU_CHANNELLIST,
LOCALE_KEYBINDINGMENU_CHANNELUP,
LOCALE_KEYBINDINGMENU_EDIT,
LOCALE_KEYBINDINGMENU_HEAD,
LOCALE_KEYBINDINGMENU_LASTCHANNEL,
LOCALE_KEYBINDINGMENU_LONGKEYPRESS_DURATION,
@@ -768,6 +773,7 @@ typedef enum
LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_VZAP,
LOCALE_KEYBINDINGMENU_MODE_LEFT_RIGHT_KEY_TV_ZAP,
LOCALE_KEYBINDINGMENU_MODECHANGE,
LOCALE_KEYBINDINGMENU_NAVIGATION,
LOCALE_KEYBINDINGMENU_PAGEDOWN,
LOCALE_KEYBINDINGMENU_PAGEUP,
LOCALE_KEYBINDINGMENU_POWEROFF,
@@ -787,6 +793,10 @@ typedef enum
LOCALE_KEYBINDINGMENU_SUBCHANNELDOWN,
LOCALE_KEYBINDINGMENU_SUBCHANNELUP,
LOCALE_KEYBINDINGMENU_TVRADIOMODE,
LOCALE_KEYBINDINGMENU_VIDEO,
LOCALE_KEYBINDINGMENU_VOLUME,
LOCALE_KEYBINDINGMENU_VOLUMEDOWN,
LOCALE_KEYBINDINGMENU_VOLUMEUP,
LOCALE_KEYBINDINGMENU_ZAPHISTORY,
LOCALE_KEYCHOOSER_HEAD,
LOCALE_KEYCHOOSER_TEXT1,
@@ -1031,6 +1041,7 @@ typedef enum
LOCALE_MENU_HINT_KEY_PLUGIN,
LOCALE_MENU_HINT_KEY_POWEROFF,
LOCALE_MENU_HINT_KEY_QUICKZAP,
LOCALE_MENU_HINT_KEY_RECORD,
LOCALE_MENU_HINT_KEY_REPEATBLOCK,
LOCALE_MENU_HINT_KEY_REPEATBLOCKGENERIC,
LOCALE_MENU_HINT_KEY_RIGHT,
@@ -1043,6 +1054,8 @@ typedef enum
LOCALE_MENU_HINT_KEY_TRANSPONDER,
LOCALE_MENU_HINT_KEY_TVRADIOMODE,
LOCALE_MENU_HINT_KEY_UNLOCK,
LOCALE_MENU_HINT_KEY_VOLUMEDOWN,
LOCALE_MENU_HINT_KEY_VOLUMEUP,
LOCALE_MENU_HINT_KEYS,
LOCALE_MENU_HINT_LANG_PREF,
LOCALE_MENU_HINT_LANGUAGE,
@@ -1635,6 +1648,8 @@ typedef enum
LOCALE_MPKEY_AUDIO,
LOCALE_MPKEY_BOOKMARK,
LOCALE_MPKEY_FORWARD,
LOCALE_MPKEY_GOTO,
LOCALE_MPKEY_NEXT_REPEAT_MODE,
LOCALE_MPKEY_PAUSE,
LOCALE_MPKEY_PLAY,
LOCALE_MPKEY_PLUGIN,
@@ -1823,6 +1838,11 @@ typedef enum
LOCALE_PINPROTECTION_WRONGCODE,
LOCALE_PLUGINS_HDD_DIR,
LOCALE_PLUGINS_RESULT,
LOCALE_PLUGINTYPE_DISABLED,
LOCALE_PLUGINTYPE_GAME,
LOCALE_PLUGINTYPE_LUA,
LOCALE_PLUGINTYPE_SCRIPT,
LOCALE_PLUGINTYPE_TOOL,
LOCALE_RCLOCK_LOCKMSG,
LOCALE_RCLOCK_MENUEADD,
LOCALE_RCLOCK_TITLE,
@@ -2161,6 +2181,9 @@ typedef enum
LOCALE_USERMENU_ITEM_NONE,
LOCALE_USERMENU_ITEM_PLUGIN_TYPES,
LOCALE_USERMENU_ITEM_VTXT,
LOCALE_USERMENU_ITEMS,
LOCALE_USERMENU_KEY,
LOCALE_USERMENU_KEY_SELECT,
LOCALE_USERMENU_MSG_INFO_IS_EMPTY,
LOCALE_USERMENU_MSG_WARNING_NAME,
LOCALE_USERMENU_MSG_WARNING_NO_ITEMS,