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 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-13 21:41:04 +01:00
parent 5ae7e351ae 168e359e2a
commit 315955cc0d
19 changed files with 432 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/locals_intern.h
View File

@@ -378,12 +378,11 @@ const char * locale_real_names[] =
"colormenu.fade",
"colormenu.font",
"colormenu.font_ttx",
"colormenu.hd_preset",
"colormenu.menucolors",
"colormenu.osd_preset",
"colormenu.osd_resolution",
"colormenu.progressbar_active",
"colormenu.progressbar_passive",
"colormenu.sd_preset",
"colormenu.textcolor",
"colormenu.themeselect",
"colormenu.timing",
@@ -1426,6 +1425,7 @@ const char * locale_real_names[] =
"menu.hint_osd",
"menu.hint_osd_language",
"menu.hint_osd_preset",
"menu.hint_osd_resolution",
"menu.hint_osd_timing",
"menu.hint_other_fonts",
"menu.hint_parentallock_changepin",