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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 29b6f4a827
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-16 (Tue, 16 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-16 15:45:22 +02:00
parent cfcd5caf3b 7ad04029de
commit f1c4db23e3
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/locals.h
View File

@@ -1190,6 +1190,8 @@ typedef enum
LOCALE_MENU_HINT_FONT_SCALING,
LOCALE_MENU_HINT_FONT_TTX,
LOCALE_MENU_HINT_FONTS,
LOCALE_MENU_HINT_FOOT_BACK,
LOCALE_MENU_HINT_FOOT_TEXTCOLOR,
LOCALE_MENU_HINT_GAMES,
LOCALE_MENU_HINT_HDD,
LOCALE_MENU_HINT_HDD_ALLOW_SET_RECDIR,
@@ -1206,8 +1208,6 @@ 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_FOOT_TEXTCOLOR,
LOCALE_MENU_HINT_HEAD_BACK,
LOCALE_MENU_HINT_HEAD_TEXTCOLOR,
LOCALE_MENU_HINT_IMAGEINFO,