mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +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:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-01 13:09:50 +01:00
parent bf56f9f0bc c1140e0c1c
commit 9bd8b2b10c
27 changed files with 143 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/y-web/languages/English
View File

@@ -206,8 +206,8 @@ epg.hover_for_details=move to program for more details
epg.refresh=get or refresh EPG
epg.past_hours=past hours
epg.next_hours=next hours
epg.set_timer=Set timer for recording. Done.
epg.zap_to=Set switch to channel. Done.
epg.set_timer_rec=Set timer for recording. Done.
epg.set_timer_zap=Set switch to channel. Done.
========EPG Streaminfo
epg.si.streaminfo=Streaminfo