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 'uncool/cst-next'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d949bce16
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-15 (Tue, 15 Dec 2015)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-15 17:29:18 +01:00
parent 0a6026dc32 aea126e2e2
commit 5b0debf29a
35 changed files with 268 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals.h
View File

@@ -1108,7 +1108,6 @@ typedef enum
LOCALE_MENU_HINT_KEY_MPSTOP,
LOCALE_MENU_HINT_KEY_MPSUBTITLE,
LOCALE_MENU_HINT_KEY_MPTIME,
LOCALE_MENU_HINT_KEY_MPTIMESHIFT,
LOCALE_MENU_HINT_KEY_PAGEDOWN,
LOCALE_MENU_HINT_KEY_PAGEUP,
LOCALE_MENU_HINT_KEY_PIC_MODE_ACTIVE,
@@ -1129,6 +1128,7 @@ typedef enum
LOCALE_MENU_HINT_KEY_SPECIAL_ACTIVE,
LOCALE_MENU_HINT_KEY_SUBCHANNELDOWN,
LOCALE_MENU_HINT_KEY_SUBCHANNELUP,
LOCALE_MENU_HINT_KEY_TIMESHIFT,
LOCALE_MENU_HINT_KEY_TRANSPONDER,
LOCALE_MENU_HINT_KEY_TVRADIOMODE,
LOCALE_MENU_HINT_KEY_UNLOCK,

2
src/system/locals_intern.h
View File

@@ -1108,7 +1108,6 @@ const char * locale_real_names[] =
"menu.hint_key_mpstop",
"menu.hint_key_mpsubtitle",
"menu.hint_key_mptime",
"menu.hint_key_mptimeshift",
"menu.hint_key_pagedown",
"menu.hint_key_pageup",
"menu.hint_key_pic_mode_active",
@@ -1129,6 +1128,7 @@ const char * locale_real_names[] =
"menu.hint_key_special_active",
"menu.hint_key_subchanneldown",
"menu.hint_key_subchannelup",
"menu.hint_key_timeshift",
"menu.hint_key_transponder",
"menu.hint_key_tvradiomode",
"menu.hint_key_unlock",