mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +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:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fb_generic.cpp
	src/gui/components/cc_frm_header.h
	src/gui/osd_setup.cpp
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 644a634f3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-08 15:54:12 +02:00
parent 2d6ad62b30 c647e359ec
commit aa022d1ee4
21 changed files with 256 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals_intern.h
View File

@@ -384,6 +384,7 @@ const char * locale_real_names[] =
"colormenu.osd_resolution",
"colormenu.progressbar_active",
"colormenu.progressbar_passive",
"colormenu.shadow_color",
"colormenu.textcolor",
"colormenu.themeselect",
"colormenu.timing",
@@ -1193,6 +1194,7 @@ const char * locale_real_names[] =
"menu.hint_colored_events",
"menu.hint_colored_events_textcolor",
"menu.hint_colors",
"menu.hint_colors_shadow",
"menu.hint_content_back",
"menu.hint_content_textcolor",
"menu.hint_dboxinfo",