Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



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

lib/sectionsdclient/sectionsdMsg.h

@@ -102,6 +102,7 @@ struct sectionsd
 //		std::string network_ntpserver;
 //		std::string epg_dir;
 		int epg_save_frequently;
+		int epg_read_frequently;
 	};
 
 };

lib/sectionsdclient/sectionsdclient.cpp

@@ -216,6 +216,7 @@ void CSectionsdClient::setConfig(const epg_config config)
 	msg->network_ntpenable	= config.network_ntpenable;
 	msg->epg_extendedcache	= config.epg_extendedcache;
 	msg->epg_save_frequently= config.epg_save_frequently;
+	msg->epg_read_frequently= config.epg_read_frequently;
 //	config.network_ntpserver:
 	strcpy(&pData[sizeof(sectionsd::commandSetConfig)], config.network_ntpserver.c_str());
 //	config.epg_dir:

lib/sectionsdclient/sectionsdclient.h

@@ -172,6 +172,7 @@ class CSectionsdClient : private CBasicClient
 		int epg_extendedcache;
 		std::string network_ntpserver;
 		int epg_save_frequently;
+		int epg_read_frequently;
 		std::string epg_dir;
 	} epg_config;