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.h
View File

@@ -1619,6 +1619,7 @@ typedef enum
LOCALE_MENU_HINT_SW_UPDATE,
LOCALE_MENU_HINT_THEME,
LOCALE_MENU_HINT_TIMEOUTS,
LOCALE_MENU_HINT_TIMEOUTS_STATIC_MESSAGES,
LOCALE_MENU_HINT_TIMER_FOLLOWSCREENINGS,
LOCALE_MENU_HINT_TIMERS,
LOCALE_MENU_HINT_TIMEZONE,
@@ -2668,6 +2669,7 @@ typedef enum
LOCALE_TIMING_MENU,
LOCALE_TIMING_NUMERICZAP,
LOCALE_TIMING_POPUP_MESSAGES,
LOCALE_TIMING_STATIC_MESSAGES,
LOCALE_TIMING_VOLUMEBAR,
LOCALE_TMDB_API_KEY,
LOCALE_TMDB_ENABLED,