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

Merge remote-tracking branch 'n/cst-next-fixed'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5c72d35c8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-24 (Sun, 24 Jan 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-01-24 13:15:43 +01:00
parent 0e475c8ddf 23ceb1bbd6
commit 50cb7dd5d3
58 changed files with 627 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals.h
View File

@@ -2018,8 +2018,8 @@ typedef enum
LOCALE_PLUGINTYPE_LUA,
LOCALE_PLUGINTYPE_SCRIPT,
LOCALE_PLUGINTYPE_TOOL,
LOCALE_RCLOCK_LOCKED,
LOCALE_RCLOCK_LOCKMSG,
LOCALE_RCLOCK_MENUEADD,
LOCALE_RCLOCK_TITLE,
LOCALE_RCLOCK_UNLOCKMSG,
LOCALE_RECORDING_IS_RUNNING,

2
src/system/locals_intern.h
View File

@@ -2018,8 +2018,8 @@ const char * locale_real_names[] =
"plugintype.lua",
"plugintype.script",
"plugintype.tool",
"rclock.locked",
"rclock.lockmsg",
"rclock.menueadd",
"rclock.title",
"rclock.unlockmsg",
"recording.is_running",