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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 33857873dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-14 07:15:30 +02:00
parent f39ef8ad1d 7667bf5f01
commit bb2b748ea3
16 changed files with 318 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals.h
View File

@@ -2610,6 +2610,7 @@ typedef enum
LOCALE_TIMERLIST_CHANNEL,
LOCALE_TIMERLIST_CHANNELSELECT,
LOCALE_TIMERLIST_DELETE,
LOCALE_TIMERLIST_INFO,
LOCALE_TIMERLIST_MENUMODIFY,
LOCALE_TIMERLIST_MENUNEW,
LOCALE_TIMERLIST_MESSAGE,
@@ -2645,6 +2646,7 @@ typedef enum
LOCALE_TIMERLIST_REPEATCOUNT_HINT_1,
LOCALE_TIMERLIST_REPEATCOUNT_HINT_2,
LOCALE_TIMERLIST_SAVE,
LOCALE_TIMERLIST_SEND_TIMER,
LOCALE_TIMERLIST_STANDBY,
LOCALE_TIMERLIST_STANDBY_OFF,
LOCALE_TIMERLIST_STANDBY_ON,