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

Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/screensaver.cpp


Origin commit data
------------------
Commit: 47d0b6efb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-25 (Wed, 25 Jan 2017)
This commit is contained in:
vanhofen
2017-01-25 21:02:22 +01:00
parent 45544364d2 133aef7a21
commit 7fa810e183
36 changed files with 331 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals_intern.h
View File

@@ -375,7 +375,6 @@ const char * locale_real_names[] =
"colormenu.advanced_mode_on",
"colormenu.background",
"colormenu.clock_textcolor",
"colormenu.contrast_fonts",
"colormenu.fade",
"colormenu.font",
"colormenu.font_ttx",
@@ -1169,7 +1168,6 @@ const char * locale_real_names[] =
"menu.hint_colors",
"menu.hint_content_back",
"menu.hint_content_textcolor",
"menu.hint_contrast_fonts",
"menu.hint_dboxinfo",
"menu.hint_delete_channels",
"menu.hint_delete_removed",