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

Origin commit data
------------------
Branch: ni/coolstream
Commit: 30d4d6e7f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-04-08 14:33:53 +02:00
19 changed files with 1060 additions and 1032 deletions

View File

@@ -770,6 +770,7 @@ fontsize.epg_date EPG Datum
fontsize.epg_info1 EPG Info 1
fontsize.epg_info2 EPG Info 2
fontsize.epg_title EPG Titel
fontsize.epgplus_item EPG-Plus Listeneintrag
fontsize.eventlist_datetime Datum/Zeit
fontsize.eventlist_event Event Info
fontsize.eventlist_itemlarge Groß

View File

@@ -770,6 +770,7 @@ fontsize.epg_date EPG Date
fontsize.epg_info1 EPG Info 1
fontsize.epg_info2 EPG Info 2
fontsize.epg_title EPG Title
fontsize.epgplus_item EPG-Plus item
fontsize.eventlist_datetime Date and time
fontsize.eventlist_event Event Info
fontsize.eventlist_itemlarge Large