Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next

Conflicts:
	src/gui/Makefile.am
	src/neutrino.h


Origin commit data
------------------
Commit: 0d42384f0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-01 (Fri, 01 Jul 2016)
This commit is contained in:
vanhofen
2016-07-01 15:28:37 +02:00
17 changed files with 338 additions and 68 deletions

View File

@@ -448,6 +448,7 @@ const char * locale_real_names[] =
"epgviewer.length",
"epgviewer.nodetailed",
"epgviewer.notfound",
"epgviewer.select_screening",
"eventfinder.fsk",
"eventfinder.genre",
"eventfinder.head",