mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +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
------------------
Commit: fd5029560e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
This commit is contained in:
vanhofen
2016-08-15 00:19:32 +02:00
parent b9810e3b44 70abfb3339
commit 2dc8a2a968
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_intern.h
View File

@@ -385,6 +385,7 @@ const char * locale_real_names[] =
"colormenusetup.menucontent",
"colormenusetup.menucontent_inactive",
"colormenusetup.menucontent_selected",
"colormenusetup.menufoot",
"colormenusetup.menuhead",
"colorstatusbar.text",
"colorthememenu.head",
@@ -1204,6 +1205,7 @@ const char * locale_real_names[] =
"menu.hint_hdd_tools",
"menu.hint_hdd_wakeup",
"menu.hint_hdd_wakeup_msg",
"menu.hint_foot_back",
"menu.hint_head_back",
"menu.hint_head_textcolor",
"menu.hint_imageinfo",