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 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: fd5029560e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-15 00:19:32 +02:00
parent a3eefb15ea fb9eaf294f
commit ceb8fea637
22 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals.h
View File

@@ -385,6 +385,7 @@ typedef enum
LOCALE_COLORMENUSETUP_MENUCONTENT,
LOCALE_COLORMENUSETUP_MENUCONTENT_INACTIVE,
LOCALE_COLORMENUSETUP_MENUCONTENT_SELECTED,
LOCALE_COLORMENUSETUP_MENUFOOT,
LOCALE_COLORMENUSETUP_MENUHEAD,
LOCALE_COLORSTATUSBAR_TEXT,
LOCALE_COLORTHEMEMENU_HEAD,
@@ -1204,6 +1205,7 @@ typedef enum
LOCALE_MENU_HINT_HDD_TOOLS,
LOCALE_MENU_HINT_HDD_WAKEUP,
LOCALE_MENU_HINT_HDD_WAKEUP_MSG,
LOCALE_MENU_HINT_FOOT_BACK,
LOCALE_MENU_HINT_HEAD_BACK,
LOCALE_MENU_HINT_HEAD_TEXTCOLOR,
LOCALE_MENU_HINT_IMAGEINFO,