mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-03 02:41:12 +02:00
Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -2348,6 +2348,7 @@ typedef enum
|
||||
LOCALE_TIMERLIST_CHANNEL,
|
||||
LOCALE_TIMERLIST_CHANNELSELECT,
|
||||
LOCALE_TIMERLIST_DELETE,
|
||||
LOCALE_TIMERLIST_INFO,
|
||||
LOCALE_TIMERLIST_MENUMODIFY,
|
||||
LOCALE_TIMERLIST_MENUNEW,
|
||||
LOCALE_TIMERLIST_MESSAGE,
|
||||
@@ -2383,6 +2384,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,
|
||||
|
@@ -2348,6 +2348,7 @@ const char * locale_real_names[] =
|
||||
"timerlist.channel",
|
||||
"timerlist.channelselect",
|
||||
"timerlist.delete",
|
||||
"timerlist.info",
|
||||
"timerlist.menumodify",
|
||||
"timerlist.menunew",
|
||||
"timerlist.message",
|
||||
@@ -2383,6 +2384,7 @@ const char * locale_real_names[] =
|
||||
"timerlist.repeatcount.hint_1",
|
||||
"timerlist.repeatcount.hint_2",
|
||||
"timerlist.save",
|
||||
"timerlist.send.timer",
|
||||
"timerlist.standby",
|
||||
"timerlist.standby.off",
|
||||
"timerlist.standby.on",
|
||||
|
Reference in New Issue
Block a user