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/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: e7ff6d5493
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-12 21:59:40 +01:00
parent c51684e1c7 7596c7d3d3
commit c3245e8661
9 changed files with 25 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/system/locals_intern.h
View File

@@ -381,10 +381,6 @@ const char * locale_real_names[] =
"colormenu.menucolors",
"colormenu.osd_preset",
"colormenu.osd_resolution",
"colormenu.osd_resolution_force",
"colormenu.osd_resolution_force_all",
"colormenu.osd_resolution_force_hd",
"colormenu.osd_resolution_force_never",
"colormenu.progressbar_active",
"colormenu.progressbar_passive",
"colormenu.textcolor",
@@ -1439,7 +1435,6 @@ const char * locale_real_names[] =
"menu.hint_osd_language",
"menu.hint_osd_preset",
"menu.hint_osd_resolution",
"menu.hint_osd_resolution_force",
"menu.hint_osd_timing",
"menu.hint_other_fonts",
"menu.hint_parentallock_changepin",