mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 09:51:13 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 84484832c3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -2609,6 +2609,7 @@ typedef enum
|
||||
LOCALE_TIMERLIST_CHANNEL,
|
||||
LOCALE_TIMERLIST_CHANNELSELECT,
|
||||
LOCALE_TIMERLIST_DELETE,
|
||||
LOCALE_TIMERLIST_INFO,
|
||||
LOCALE_TIMERLIST_MENUMODIFY,
|
||||
LOCALE_TIMERLIST_MENUNEW,
|
||||
LOCALE_TIMERLIST_MESSAGE,
|
||||
@@ -2644,6 +2645,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,
|
||||
|
Reference in New Issue
Block a user