Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


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



------------------
This commit was generated by Migit

src/system/locals.h

@@ -1578,6 +1578,7 @@ typedef enum
 	LOCALE_MENU_HINT_SERVICE_SCAN,
 	LOCALE_MENU_HINT_SETTINGS,
 	LOCALE_MENU_HINT_SHOUTCAST_DEV_ID,
+	LOCALE_MENU_HINT_SHOUTCAST_ENABLED,
 	LOCALE_MENU_HINT_SHOW_MUTE_ICON,
 	LOCALE_MENU_HINT_SHUTDOWN,
 	LOCALE_MENU_HINT_SHUTDOWN_COUNT,
@@ -1606,6 +1607,7 @@ typedef enum
 	LOCALE_MENU_HINT_TIMERS,
 	LOCALE_MENU_HINT_TIMEZONE,
 	LOCALE_MENU_HINT_TMDB_API_KEY,
+	LOCALE_MENU_HINT_TMDB_ENABLED,
 	LOCALE_MENU_HINT_TOOLS,
 	LOCALE_MENU_HINT_TVMODE,
 	LOCALE_MENU_HINT_TVRADIO_SWITCH,
@@ -1645,6 +1647,7 @@ typedef enum
 	LOCALE_MENU_HINT_WEBTV_XML_AUTO,
 	LOCALE_MENU_HINT_WINDOW_SIZE,
 	LOCALE_MENU_HINT_YOUTUBE_DEV_ID,
+	LOCALE_MENU_HINT_YOUTUBE_ENABLED,
 	LOCALE_MENU_HINT_YTPLAY,
 	LOCALE_MENU_HINT_YTPLAY_SETUP,
 	LOCALE_MENU_HINT_ZAP_CYCLE,
@@ -2510,6 +2513,7 @@ typedef enum
 	LOCALE_SETTINGS_TEAMS_RESTORE,
 	LOCALE_SETTINGS_TEAMS_RESTORE_WARN,
 	LOCALE_SHOUTCAST_DEV_ID,
+	LOCALE_SHOUTCAST_ENABLED,
 	LOCALE_SHUTDOWN_RECORDING_QUERY,
 	LOCALE_SHUTDOWNTIMER_ANNOUNCE,
 	LOCALE_SLEEPTIMERBOX_ANNOUNCE,
@@ -2630,6 +2634,7 @@ typedef enum
 	LOCALE_TIMING_NUMERICZAP,
 	LOCALE_TIMING_VOLUMEBAR,
 	LOCALE_TMDB_API_KEY,
+	LOCALE_TMDB_ENABLED,
 	LOCALE_TMDB_INFO,
 	LOCALE_TMDB_READ_DATA,
 	LOCALE_UNICABLE_LNB,
@@ -2740,6 +2745,7 @@ typedef enum
 	LOCALE_WORD_FROM,
 	LOCALE_WORD_IN,
 	LOCALE_YOUTUBE_DEV_ID,
+	LOCALE_YOUTUBE_ENABLED,
 	LOCALE_ZAPIT_SCANTYPE,
 	LOCALE_ZAPIT_SCANTYPE_ALL,
 	LOCALE_ZAPIT_SCANTYPE_RADIO,