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
------------------
Commit: 646a41c52f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-08 (Mon, 08 Aug 2016)

src/system/locals_intern.h

@@ -1578,6 +1578,7 @@ const char * locale_real_names[] =
 	"menu.hint_service_scan",
 	"menu.hint_settings",
 	"menu.hint_shoutcast_dev_id",
+	"menu.hint_shoutcast_enabled",
 	"menu.hint_show_mute_icon",
 	"menu.hint_shutdown",
 	"menu.hint_shutdown_count",
@@ -1606,6 +1607,7 @@ const char * locale_real_names[] =
 	"menu.hint_timers",
 	"menu.hint_timezone",
 	"menu.hint_tmdb_api_key",
+	"menu.hint_tmdb_enabled",
 	"menu.hint_tools",
 	"menu.hint_tvmode",
 	"menu.hint_tvradio_switch",
@@ -1645,6 +1647,7 @@ const char * locale_real_names[] =
 	"menu.hint_webtv_xml_auto",
 	"menu.hint_window_size",
 	"menu.hint_youtube_dev_id",
+	"menu.hint_youtube_enabled",
 	"menu.hint_ytplay",
 	"menu.hint_ytplay_setup",
 	"menu.hint_zap_cycle",
@@ -2510,6 +2513,7 @@ const char * locale_real_names[] =
 	"settings.teams.restore",
 	"settings.teams.restore_warn",
 	"shoutcast.dev_id",
+	"shoutcast.enabled",
 	"shutdown.recording_query",
 	"shutdowntimer.announce",
 	"sleeptimerbox.announce",
@@ -2630,6 +2634,7 @@ const char * locale_real_names[] =
 	"timing.numericzap",
 	"timing.volumebar",
 	"tmdb.api_key",
+	"tmdb.enabled",
 	"tmdb.info",
 	"tmdb.read_data",
 	"unicable.lnb",
@@ -2740,6 +2745,7 @@ const char * locale_real_names[] =
 	"word.from",
 	"word.in",
 	"youtube.dev_id",
+	"youtube.enabled",
 	"zapit.scantype",
 	"zapit.scantype.all",
 	"zapit.scantype.radio",