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:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ad1e3beb3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-02 22:00:25 +01:00
parent 4590bd4644 4f2116df43
commit 243909caf8
10 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals_intern.h
View File

@@ -1619,6 +1619,7 @@ const char * locale_real_names[] =
"menu.hint_sw_update",
"menu.hint_theme",
"menu.hint_timeouts",
"menu.hint_timeouts_static_messages",
"menu.hint_timer_followscreenings",
"menu.hint_timers",
"menu.hint_timezone",
@@ -2668,6 +2669,7 @@ const char * locale_real_names[] =
"timing.menu",
"timing.numericzap",
"timing.popup_messages",
"timing.static_messages",
"timing.volumebar",
"tmdb.api_key",
"tmdb.enabled",