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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: afb6e0d4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)
This commit is contained in:
vanhofen
2016-08-04 12:02:35 +02:00
parent 3690012a29 e3daec4e2d
commit 41083ff567
8 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals_intern.h
View File

@@ -462,6 +462,7 @@ const char * locale_real_names[] =
"eventfinder.searching",
"eventfinder.start_search",
"eventlist.additional",
"eventlist.epgplus",
"eventlist.name",
"eventlistbar.channelswitch",
"eventlistbar.eventsort",
@@ -1172,6 +1173,7 @@ const char * locale_real_names[] =
"menu.hint_epg_scan",
"menu.hint_epg_scan_mode",
"menu.hint_eventlist_additional",
"menu.hint_eventlist_epgplus",
"menu.hint_eventlist_fonts",
"menu.hint_eventlist_setup",
"menu.hint_extended",