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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	lib/timerdclient/timerdtypes.h
	src/gui/channellist.cpp
	src/system/httptool.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bb2f888c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-21 11:23:51 +02:00
parent 9bdd4c7ee6 a41206902f
commit 108cf42786
15 changed files with 577 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/system/locals.h
View File

@@ -1908,6 +1908,7 @@ typedef enum
LOCALE_MOVIEBROWSER_INFO_RECORDDATE,
LOCALE_MOVIEBROWSER_INFO_SERIE,
LOCALE_MOVIEBROWSER_INFO_SIZE,
LOCALE_MOVIEBROWSER_INFO_SPACER,
LOCALE_MOVIEBROWSER_INFO_TITLE,
LOCALE_MOVIEBROWSER_INFO_VIDEOFORMAT,
LOCALE_MOVIEBROWSER_LAST_PLAY_MAX_ITEMS,
@@ -1958,6 +1959,7 @@ typedef enum
LOCALE_MOVIEBROWSER_SHORT_RECORDDATE,
LOCALE_MOVIEBROWSER_SHORT_SERIE,
LOCALE_MOVIEBROWSER_SHORT_SIZE,
LOCALE_MOVIEBROWSER_SHORT_SPACER,
LOCALE_MOVIEBROWSER_SHORT_TITLE,
LOCALE_MOVIEBROWSER_START_HEAD,
LOCALE_MOVIEBROWSER_START_RECORD_START,
@@ -2340,6 +2342,12 @@ typedef enum
LOCALE_RECORDINGMENU_VTXT_PID,
LOCALE_RECORDINGMENU_ZAP_ON_ANNOUNCE,
LOCALE_RECORDTIMER_ANNOUNCE,
LOCALE_REMOTEBOX_ADD,
LOCALE_REMOTEBOX_CHANNEL_NA,
LOCALE_REMOTEBOX_DEL,
LOCALE_REMOTEBOX_HEAD,
LOCALE_REMOTEBOX_IP,
LOCALE_REMOTEBOX_MOD,
LOCALE_RESET_ALL,
LOCALE_RESET_CHANNELS,
LOCALE_RESET_CONFIRM,
@@ -2616,6 +2624,7 @@ typedef enum
LOCALE_TIMERLIST_TYPE_NEXTPROGRAM,
LOCALE_TIMERLIST_TYPE_RECORD,
LOCALE_TIMERLIST_TYPE_REMIND,
LOCALE_TIMERLIST_TYPE_REMOTEBOX,
LOCALE_TIMERLIST_TYPE_SHUTDOWN,
LOCALE_TIMERLIST_TYPE_SLEEPTIMER,
LOCALE_TIMERLIST_TYPE_STANDBY,