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:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3caf9e47c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-20 18:36:35 +01:00
parent c6ce2a6670 5c85bb59c6
commit 209ca4b776
19 changed files with 252 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/system/locals.h
View File

@@ -769,6 +769,7 @@ typedef enum
LOCALE_FONTMENU_HEAD,
LOCALE_FONTMENU_INFOBAR,
LOCALE_FONTMENU_MENU,
LOCALE_FONTMENU_MESSAGES,
LOCALE_FONTMENU_MOVIEBROWSER,
LOCALE_FONTMENU_OTHER,
LOCALE_FONTMENU_SCALING,
@@ -803,6 +804,7 @@ typedef enum
LOCALE_FONTSIZE_MENU_HINT,
LOCALE_FONTSIZE_MENU_INFO,
LOCALE_FONTSIZE_MENU_TITLE,
LOCALE_FONTSIZE_MESSAGE_TEXT,
LOCALE_FONTSIZE_MOVIEBROWSER_HEAD,
LOCALE_FONTSIZE_MOVIEBROWSER_INFO,
LOCALE_FONTSIZE_MOVIEBROWSER_LIST,
@@ -1353,6 +1355,7 @@ typedef enum
LOCALE_MENU_HINT_MENU_HINTS_LINE,
LOCALE_MENU_HINT_MENU_POS,
LOCALE_MENU_HINT_MENUS,
LOCALE_MENU_HINT_MESSAGE_FONTS,
LOCALE_MENU_HINT_MISC_CEC,
LOCALE_MENU_HINT_MISC_CHANNELLIST,
LOCALE_MENU_HINT_MISC_ENERGY,