update to version 3.10.0

zgemma h7, vuduo4k, vuzero4k added
msgbox: ensure top allignment of buttons in message boxes
2025-09-18 19:01:14 +02:00 · 2019-10-27 16:46:52 +01:00 · 2019-10-27 16:24:47 +01:00 · 2019-10-27 16:24:47 +01:00 · 2019-10-27 16:24:47 +01:00 · 2019-10-27 16:24:47 +01:00
327 changed files with 12883 additions and 8011 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,50 +1,82 @@
-### mostly autoconf crap
+### http://www.gnu.org/software/automake
 Makefile
-autom4te.cache
-*.in
-aclocal.m4
-compile
-config.*
-configure
-depcomp
-install-sh
-*.pc
-libtool
-ltmain.sh
-missing
-stamp-h1
-README
-COPYING
-INSTALL
+Makefile.in

-### objects and libs
+### http://www.gnu.org/software/autoconf
+autom4te.cache
+/autoscan.log
+/autoscan-*.log
+/aclocal.m4
+/compile
+/config.guess
+/config.h.in
+/config.log
+/config.status
+/config.sub
+/configure
+/configure.scan
+/depcomp
+/install-sh
+/missing
+/stamp-h*
+
+### https://www.gnu.org/software/libtool/
+/libtool
+/ltmain.sh
+
+### http://www.gnu.org/software/m4/
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+
+### compiled objects and libs
 .libs
-.deps
+*.lo
 *.o
 *.so
-*.lo
-*.a
+*.lai
 *.la
-.*.swp
+*.a

-### editor crap
+### dependency files
+.deps
+*.Plo
+*.Po
+
+### diff and patch files
+*.patch
+*.diff
 *.orig
 *.rej
+
+### system generated stuff
+# dolphin
+.directory
+# kate
+*-swp
+.*.swp
+
+### generally excluded files
 *~
+*.pc
+git-*
+go_*

 ### binaries that fall out of the build
 lib/sectionsdclient/sectionsdcontrol
-src/neutrino
-src/nhttpd/web/*.js.gz
-src/zapit/src/pzapit
-src/zapit/src/udpstreampes
 src/drivertool
 src/dt
-src/rcsim.h
-src/rcsim
-src/gui/version.h
-src/nhttpd/nhttpd.conf
 src/mdev_helper
+src/neutrino
+src/rcsim
+src/zapit/src/pzapit
+src/zapit/src/udpstreampes
+
+### header files that fall out of the build
+src/rcsim.h
+src/gui/version.h
 local_build_config.h

 ### system generated stuff
@@ -52,3 +84,6 @@ local_build_config.h
 .directory
 # kate
 *-swp
+
+### other files that fall out of the build
+src/nhttpd/nhttpd.conf
--- a/0
+++ b/0
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,3 +2,5 @@ SUBDIRS = lib src data

 locale-update:
 	make -C $(top_builddir)/data/locale install-locals
+
+.PHONY: locale-update
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -24,6 +24,22 @@ if test "$DEBUG" = "yes"; then
 	AC_DEFINE(DEBUG, 1, [enable debugging code])
 fi

+# weather
+AC_ARG_WITH(weather-dev-key,
+	AS_HELP_STRING([--with-weather-dev-key=KEY], [API dev key to get data from weather data base, required for additional weather informations]),
+	[WEATHER_DEV_KEY="$withval"],
+	[WEATHER_DEV_KEY=""])
+AC_DEFINE_UNQUOTED([WEATHER_DEV_KEY], ["$WEATHER_DEV_KEY"], [API dev key to get data from weather data base, required for additional weather informations])
+
+AC_ARG_ENABLE([weather-key-manage],
+	AS_HELP_STRING([--enable-weather-key-manage], [Enable manage weather api dev key via gui for additional weather informations @<:@default=yes@:>@]),
+	[enable_weather_key_manage="$enableval"],
+	[enable_weather_key_manage="yes"])
+
+if test "$enable_weather_key_manage" = "yes" ; then
+	AC_DEFINE([ENABLE_WEATHER_KEY_MANAGE], 1, [Enable manage weather api dev key via gui for additional weather informations])
+fi
+# weather end

 # tmdb
 AC_ARG_WITH(tmdb-dev-key,
@@ -122,8 +138,8 @@ AC_ARG_ENABLE(libcoolstream-static,
 AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC, test "$enable_libcoolstream_static" = "yes")

 AC_ARG_ENABLE(reschange,
-	AS_HELP_STRING([--enable-reschange], [enable change the osd resolution @<:@default for hd2 and hd51@:>@]),
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]))
+	AS_HELP_STRING([--enable-reschange], [enable to change osd resolution]),
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution]))
 AM_CONDITIONAL(ENABLE_RESCHANGE, test "$enable_reschange" = "yes")

 # default theme
@@ -145,9 +161,6 @@ if test "$TARGET" = "native"; then
 	if test "$prefix" = "NONE"; then
 		prefix=/usr/local
 	fi
-	if test "$exec_prefix" = "NONE"; then
-		exec_prefix=$prefix
-	fi
 	targetprefix=$prefix
 	TARGET_PREFIX=$prefix
 	AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX", [The targets prefix])
@@ -175,6 +188,10 @@ else
 	AC_MSG_ERROR([invalid target $TARGET, choose on from native,cdk]);
 fi

+if test "$exec_prefix" = "NONE"; then
+	exec_prefix=$prefix
+fi
+
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_SYS_LARGEFILE
@@ -244,6 +261,12 @@ TUXBOX_APPS_DIRECTORY_ONE(configdir, CONFIGDIR, localstatedir, /var, /tuxbox/con
 TUXBOX_APPS_DIRECTORY_ONE(datadir, DATADIR, datadir, /share, /tuxbox,
 	[--with-datadir=PATH], [where to find data files])

+TUXBOX_APPS_DIRECTORY_ONE(controldir, CONTROLDIR, datadir, /share, /tuxbox/neutrino/control,
+	[--with-controldir=PATH], [where to find control scripts])
+
+TUXBOX_APPS_DIRECTORY_ONE(controldir_var, CONTROLDIR_VAR, localstatedir, /var, /tuxbox/control,
+	[--with-controldir_var=PATH], [where to find control scripts in /var])
+
 TUXBOX_APPS_DIRECTORY_ONE(fontdir, FONTDIR, datadir, /share, /fonts,
 	[--with-fontdir=PATH], [where to find fonts])

@@ -256,7 +279,7 @@ TUXBOX_APPS_DIRECTORY_ONE(gamesdir, GAMESDIR, localstatedir, /var, /tuxbox/games
 TUXBOX_APPS_DIRECTORY_ONE(libdir, LIBDIR, libdir, /lib, /tuxbox,
 	[--with-libdir=PATH], [where to find internal libs])

-TUXBOX_APPS_DIRECTORY_ONE(plugindir, PLUGINDIR, libdir, /lib, /tuxbox/plugins,
+TUXBOX_APPS_DIRECTORY_ONE(plugindir, PLUGINDIR, datadir, /share, /tuxbox/neutrino/plugins,
 	[--with-plugindir=PATH], [where to find plugins])

 TUXBOX_APPS_DIRECTORY_ONE(plugindir_var, PLUGINDIR_VAR, localstatedir, /var, /tuxbox/plugins,
@@ -265,7 +288,7 @@ TUXBOX_APPS_DIRECTORY_ONE(plugindir_var, PLUGINDIR_VAR, localstatedir, /var, /tu
 TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt, PLUGINDIR_MNT, mntdir, /mnt, /plugins,
 	[--with-plugindir_mnt=PATH], [where to find external plugins])

-TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, libdir, /lib, /tuxbox/luaplugins,
+TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, datadir, /share, /tuxbox/neutrino/luaplugins,
 	[--with-luaplugindir=PATH], [where to find Lua plugins])

 TUXBOX_APPS_DIRECTORY_ONE(webradiodir, WEBRADIODIR, datadir, /share, /tuxbox/neutrino/webradio,
@@ -298,6 +321,12 @@ TUXBOX_APPS_DIRECTORY_ONE(iconsdir, ICONSDIR, datadir, /share, /tuxbox/neutrino/
 TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var, ICONSDIR_VAR, localstatedir, /var, /tuxbox/icons,
 	[--with-iconsdir_var=PATH], [where to find icons in /var])

+TUXBOX_APPS_DIRECTORY_ONE(lcd4liconsdir, LCD4L_ICONSDIR, datadir, /share, /tuxbox/neutrino/lcd/icons,
+	[--with-lcd4liconsdir=PATH], [where to find lcd4linux icons])
+
+TUXBOX_APPS_DIRECTORY_ONE(lcd4liconsdir_var, LCD4L_ICONSDIR_VAR, localstatedir, /var, /tuxbox/lcd/icons,
+	[--with-lcd4liconsdir_var=PATH], [where to find lcd4linux icons in /var])
+
 TUXBOX_APPS_DIRECTORY_ONE(private_httpddir, PRIVATE_HTTPDDIR, datadir, /share, /tuxbox/neutrino/httpd,
 	[--with-private_httpddir=PATH], [where to find private httpd files])

@@ -314,6 +343,8 @@ TUXBOX_APPS_DIRECTORY_ONE(flagdir, FLAGDIR, localstatedir, /var, /etc,
 dnl automake <= 1.6 needs this specifications
 AC_SUBST(CONFIGDIR)
 AC_SUBST(DATADIR)
+AC_SUBST(CONTROLDIR)
+AC_SUBST(CONTROLDIR_VAR)
 AC_SUBST(FONTDIR)
 AC_SUBST(FONTDIR_VAR)
 AC_SUBST(GAMESDIR)
@@ -333,6 +364,8 @@ AC_SUBST(THEMESDIR)
 AC_SUBST(THEMESDIR_VAR)
 AC_SUBST(ICONSDIR)
 AC_SUBST(ICONSDIR_VAR)
+AC_SUBST(LCD4L_ICONSDIR)
+AC_SUBST(LCD4L_ICONSDIR_VAR)
 AC_SUBST(PRIVATE_HTTPDDIR)
 AC_SUBST(PUBLIC_HTTPDDIR)
 AC_SUBST(HOSTED_HTTPDDIR)
@@ -413,9 +446,9 @@ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)

 AC_DEFUN([TUXBOX_BOXTYPE], [
 AC_ARG_WITH(boxtype,
-	AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, coolstream, spark, azbox, generic, armbox]),
+	AS_HELP_STRING([--with-boxtype], [valid values: generic, azbox, tripledragon, spark, coolstream, armbox, mipsbox]),
 	[case "${withval}" in
-		tripledragon|coolstream|spark|azbox|generic|armbox)
+		generic|azbox|tripledragon|spark|coolstream|armbox|mipsbox)
 			BOXTYPE="$withval"
 		;;
 		*)
@@ -425,10 +458,18 @@ AC_ARG_WITH(boxtype,
 	[BOXTYPE="generic"])

 AC_ARG_WITH(boxmodel,
-	AS_HELP_STRING([--with-boxmodel], [valid for coolstream: hd1, hd2])
-AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k, bre2ze4k])
-AS_HELP_STRING([], [valid for generic: raspi]),
+	AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi])
+AS_HELP_STRING([], [valid for coolstream: hd1, hd2])
+AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k|h7])
+AS_HELP_STRING([], [valid for mipsbox: vuduo]),
 	[case "${withval}" in
+		generic|raspi)
+			if test "$BOXTYPE" = "generic"; then
+				BOXMODEL="$withval"
+			else
+				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
+			fi
+		;;
 		hd1|hd2)
 			if test "$BOXTYPE" = "coolstream"; then
 				BOXMODEL="$withval"
@@ -448,15 +489,15 @@ AS_HELP_STRING([], [valid for generic: raspi]),
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 		;;
-		hd51|hd60|vusolo4k|bre2ze4k)
+		hd51|hd60|bre2ze4k|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|h7)
 			if test "$BOXTYPE" = "armbox"; then
 				BOXMODEL="$withval"
 			else
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 		;;
-		raspi)
-			if test "$BOXTYPE" = "generic"; then
+		vuduo)
+			if test "$BOXTYPE" = "mipsbox"; then
 				BOXMODEL="$withval"
 			else
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
@@ -465,63 +506,129 @@ AS_HELP_STRING([], [valid for generic: raspi]),
 		*)
 			AC_MSG_ERROR([unsupported value $withval for --with-boxmodel])
 		;;
-	esac])
+	esac],
+	[BOXMODEL="generic"])

 AC_SUBST(BOXTYPE)
 AC_SUBST(BOXMODEL)

+AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
 AM_CONDITIONAL(BOXTYPE_AZBOX, test "$BOXTYPE" = "azbox")
 AM_CONDITIONAL(BOXTYPE_TRIPLE, test "$BOXTYPE" = "tripledragon")
-AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
 AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark")
-AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
+AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
 AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox")
+AM_CONDITIONAL(BOXTYPE_MIPSBOX, test "$BOXTYPE" = "mipsbox")

+# generic
+AM_CONDITIONAL(BOXMODEL_GENERIC, test "$BOXMODEL" = "generic")
+AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi")
+
+# coolstream
 AM_CONDITIONAL(BOXMODEL_CS_HD1, test "$BOXMODEL" = "hd1")
 AM_CONDITIONAL(BOXMODEL_CS_HD2, test "$BOXMODEL" = "hd2")

+# armbox
 AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51")
 AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60")
-AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k")
 AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k")
+AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k")
+AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k")
+AM_CONDITIONAL(BOXMODEL_VUULTIMO4K, test "$BOXMODEL" = "vuultimo4k")
+AM_CONDITIONAL(BOXMODEL_VUUNO4K, test "$BOXMODEL" = "vuuno4k")
+AM_CONDITIONAL(BOXMODEL_VUUNO4KSE, test "$BOXMODEL" = "vuuno4kse")
+AM_CONDITIONAL(BOXMODEL_VUZERO4K, test "$BOXMODEL" = "vuzero4k")
+AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo")
+AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7")

-AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi")
+# mipsbox
+AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo")

-if test "$BOXTYPE" = "azbox"; then
+if test "$BOXTYPE" = "generic"; then
+	AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC])
+elif test "$BOXTYPE" = "azbox"; then
 	AC_DEFINE(HAVE_AZBOX_HARDWARE, 1, [building for an azbox])
 elif test "$BOXTYPE" = "tripledragon"; then
 	AC_DEFINE(HAVE_TRIPLEDRAGON, 1, [building for a tripledragon])
-elif test "$BOXTYPE" = "coolstream"; then
-	AC_DEFINE(HAVE_COOL_HARDWARE, 1, [building for a coolstream])
 elif test "$BOXTYPE" = "spark"; then
 	AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux])
-elif test "$BOXTYPE" = "generic"; then
-	AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC])
+elif test "$BOXTYPE" = "coolstream"; then
+	AC_DEFINE(HAVE_COOL_HARDWARE, 1, [building for a coolstream])
 elif test "$BOXTYPE" = "armbox"; then
 	AC_DEFINE(HAVE_ARM_HARDWARE, 1, [building for an armbox])
+elif test "$BOXTYPE" = "mipsbox"; then
+	AC_DEFINE(HAVE_MIPS_HARDWARE, 1, [building for an mipsbox])
 fi

 # TODO: do we need more defines?
-if test "$BOXMODEL" = "hd1"; then
+if test "$BOXMODEL" = "generic"; then
+	AC_DEFINE(BOXMODEL_GENERIC, 1, [generic pc])
+elif test "$BOXMODEL" = "raspi"; then
+	AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi])
+elif test "$BOXMODEL" = "hd1"; then
 	AC_DEFINE(BOXMODEL_CS_HD1, 1, [coolstream hd1/neo/neo2/zee])
 elif test "$BOXMODEL" = "hd2"; then
 	AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link])
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
 elif test "$BOXMODEL" = "hd51"; then
 	AC_DEFINE(BOXMODEL_HD51, 1, [hd51])
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
 elif test "$BOXMODEL" = "hd60"; then
 	AC_DEFINE(BOXMODEL_HD60, 1, [hd60])
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
-elif test "$BOXMODEL" = "vusolo4k"; then
-	AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k])
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
 elif test "$BOXMODEL" = "bre2ze4k"; then
 	AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k])
+elif test "$BOXMODEL" = "vusolo4k"; then
+	AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k])
+elif test "$BOXMODEL" = "vuduo4k"; then
+	AC_DEFINE(BOXMODEL_VUDUO4K, 1, [vuduo4k])
+elif test "$BOXMODEL" = "vuultimo4k"; then
+	AC_DEFINE(BOXMODEL_VUULTIMO4K, 1, [vuultimo4k])
+elif test "$BOXMODEL" = "vuuno4k"; then
+	AC_DEFINE(BOXMODEL_VUUNO4K, 1, [vuuno4k])
+elif test "$BOXMODEL" = "vuuno4kse"; then
+	AC_DEFINE(BOXMODEL_VUUNO4KSE, 1, [vuuno4kse])
+elif test "$BOXMODEL" = "vuzero4k"; then
+	AC_DEFINE(BOXMODEL_VUZERO4K, 1, [vuzero4k])
+elif test "$BOXMODEL" = "vuduo"; then
+	AC_DEFINE(BOXMODEL_VUDUO, 1, [vuduo])
 	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
+elif test "$BOXMODEL" = "h7"; then
+	AC_DEFINE(BOXMODEL_H7, 1, [h7])
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
+elif test "$BOXMODEL" = "generic"; then
+	AC_DEFINE(BOXMODEL_GENERIC, 1, [generic pc])
 elif test "$BOXMODEL" = "raspi"; then
 	AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi])
 fi
+
+# all vuplus BOXMODELs
+case "$BOXMODEL" in
+	vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo)
+		AC_DEFINE(BOXMODEL_VUPLUS, 1, [vuplus])
+		vuplus=true
+	;;
+	*)
+		vuplus=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_VUPLUS, test "$vuplus" = "true")
+
+# all vuplus4k BOXMODELs
+case "$BOXMODEL" in
+	vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
+		AC_DEFINE(BOXMODEL_VUPLUS4K, 1, [vuplus4k])
+		vuplus4k=true
+	;;
+	*)
+		vuplus4k=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_VUPLUS4K, test "$vuplus4k" = "true")
+
+# BOXMODELs that allows to change osd resolution
+case "$BOXMODEL" in
+	hd2|hd51|hd60|bre2ze4k|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo)
+		AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution])
+	;;
+esac
 ])

 dnl backward compatiblity
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,10 +6,10 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.

 cd "$srcdir"
-echo "Generating configuration files for $package, please wait...."
+echo "Generating configuration files for $package, please wait ..."

 aclocal --force
 libtoolize --force
 autoconf --force
-autoheader  --force
+autoheader --force
 automake --add-missing --force-missing
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # explicit defines for separate revision handling
 define(ver_major, 3)
-define(ver_minor, 9)
+define(ver_minor, 10)
 define(ver_micro, 0)
 define(neutrino_rel_cycle, ver_major.ver_minor)

@@ -23,7 +23,7 @@ TUXBOX_BOXTYPE
 AC_PROG_CC
 AC_PROG_CXX
 AC_DISABLE_STATIC
-AM_PROG_LIBTOOL
+LT_INIT

 # Add build information to local_build_config.h.tmp
 # -------------------------------------------------
@@ -145,7 +145,7 @@ TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec)
 TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil)
 TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0)

-if test "$BOXTYPE" = "armbox"; then
+if test "$BOXTYPE" = "armbox" -o "$BOXTYPE" = "mipsbox"; then
 	TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale)
 fi

@@ -155,6 +155,7 @@ fi

 if test "$BOXTYPE" = "coolstream" ||
   test "$BOXTYPE" = "armbox" ||
+   test "$BOXTYPE" = "mipsbox" ||
   test "$BOXTYPE" = "generic" ||
   test "$BOXTYPE" = "tripledragon" ||
   test "$BOXTYPE" = "spark"; then
@@ -265,7 +266,6 @@ AC_ARG_WITH(stb-hal-includes,
 	AS_HELP_STRING([--with-stb-hal-includes=PATH], [path for libstb-hal includes [[NONE]]]),
 	[STB_HAL_INC="$withval"],
 	[STB_HAL_INC=""])
-AC_CHECK_HEADER([$STB_HAL_INC/libstb-hal-config.h], [AC_DEFINE(HAVE_CONFIG_HAL_H, 1 , [availability of libstb-hal-config.h as external header from libstb_hal, usable e.g. for package informations])])

 AC_ARG_WITH(stb-hal-build,
 	AS_HELP_STRING([--with-stb-hal-build=PATH], [path where libstb-hal is built [[NONE]]]),
@@ -326,10 +326,11 @@ AC_SUBST(LUA_CFLAGS)
 AC_SUBST(LUA_LIBS)
 AC_SUBST(BLURAY_LIBS)

-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 data/Makefile
 data/config/Makefile
+data/control/Makefile
 data/fonts/Makefile
 data/icons/Makefile
 data/icons/buttons/Makefile
@@ -346,6 +347,7 @@ data/icons/status/channel/Makefile
 data/icons/status/markers/Makefile
 data/icons/status/various/Makefile
 data/icons/various/Makefile
+data/icons/weather/Makefile
 data/inetradio/Makefile
 data/initial/Makefile
 data/iso-codes/Makefile
@@ -354,7 +356,6 @@ data/lcd/clock/Makefile
 data/lcd/icons/Makefile
 data/license/Makefile
 data/locale/Makefile
-data/neutrino-scripts/Makefile
 data/pictures/Makefile
 data/pictures/backgrounds/Makefile
 data/pictures/screensaver/Makefile
@@ -421,3 +422,5 @@ src/zapit/Makefile
 src/zapit/lib/Makefile
 src/zapit/src/Makefile
 ])
+
+AC_OUTPUT
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = \
 	config \
+	control \
 	fonts \
 	icons \
 	inetradio \
@@ -7,7 +8,6 @@ SUBDIRS = \
 	iso-codes \
 	license \
 	locale \
-	neutrino-scripts \
 	pictures \
 	policy \
 	scripts \
--- a/data/config/cables.xml
+++ b/data/config/cables.xml
@@ -1432,10 +1432,8 @@
 		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="506000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="514000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
--- a/data/config/satellites.xml
+++ b/data/config/satellites.xml
--- a/data/control/Makefile.am
+++ b/data/control/Makefile.am
@@ -0,0 +1,22 @@
+installdir = $(CONTROLDIR)
+
+install_SCRIPTS = \
+	audioplayer.start \
+	audioplayer.end \
+	deepstandby.on \
+	deepstandby.off \
+	flash.start \
+	inactivity.on \
+	\
+	movieplayer.start \
+	movieplayer.end \
+	neutrino.start \
+	pictureviewer.start \
+	pictureviewer.end \
+	recording.timer \
+	recording.start \
+	recording.end \
+	scan.start \
+	scan.stop \
+	standby.on \
+	standby.off
--- a/data/control/audioplayer.end
+++ b/data/control/audioplayer.end
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/audioplayer.start
+++ b/data/control/audioplayer.start
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/deepstandby.off
+++ b/data/control/deepstandby.off
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/deepstandby.on
+++ b/data/control/deepstandby.on
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/neutrino-scripts/flash.start
+++ b/data/neutrino-scripts/flash.start
--- a/data/control/inactivity.on
+++ b/data/control/inactivity.on
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/movieplayer.end
+++ b/data/control/movieplayer.end
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# wakeup Tuxmail
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -10 `pidof tuxmaild`
+fi
+
+# wakeup TuxCal
+if [ -e /tmp/tuxcald.pid ]; then
+	kill -usr1 $(cat /tmp/tuxcald.pid);
+fi
+
+sync
+sync
+
+exit 0
--- a/data/control/movieplayer.start
+++ b/data/control/movieplayer.start
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# TuxMail sleep
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -12 `pidof tuxmaild`
+fi
+
+# TuxCal sleep
+if [ -e /var/etc/.tuxcald ]; then
+	kill -usr2 $(cat /tmp/tuxcald.pid)
+fi
+
+exit 0
--- a/data/control/neutrino.start
+++ b/data/control/neutrino.start
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/pictureviewer.end
+++ b/data/control/pictureviewer.end
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/pictureviewer.start
+++ b/data/control/pictureviewer.start
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/recording.end
+++ b/data/control/recording.end
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# wakeup Tuxmail
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -10 `pidof tuxmaild`
+fi
+
+# wakeup TuxCal
+if [ -e /tmp/tuxcald.pid ]; then
+	kill -usr1 $(cat /tmp/tuxcald.pid);
+fi
+
+sync
+sync
+
+exit 0
--- a/data/control/recording.start
+++ b/data/control/recording.start
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# TuxMail sleep
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -12 `pidof tuxmaild`
+fi
+
+# TuxCal sleep
+if [ -e /var/etc/.tuxcald ]; then
+	kill -usr2 $(cat /tmp/tuxcald.pid)
+fi
+
+exit 0
--- a/data/control/recording.timer
+++ b/data/control/recording.timer
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/scan.start
+++ b/data/control/scan.start
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/scan.stop
+++ b/data/control/scan.stop
@@ -0,0 +1,2 @@
+#!/bin/sh
+
--- a/data/control/standby.off
+++ b/data/control/standby.off
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# wakeup Tuxmail
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -10 `pidof tuxmaild`
+fi
+
+# wakeup TuxCal
+if [ -e /tmp/tuxcald.pid ]; then
+	kill -usr1 $(cat /tmp/tuxcald.pid);
+fi
+
+sync
+sync
+
+exit 0
--- a/data/control/standby.on
+++ b/data/control/standby.on
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# TuxMail pause
+if [ -e /var/etc/.tuxmaild ]; then
+	kill -12 `pidof tuxmaild`
+fi
+
+# TuxCal pause
+if [ -e /var/etc/.tuxcald ]; then
+	kill -usr2 $(cat /tmp/tuxcald.pid)
+fi
+
+exit 0
--- a/data/fonts/Makefile.am
+++ b/data/fonts/Makefile.am
@@ -1,10 +1,6 @@
 installdir = $(FONTDIR)

-# NOTE:
-#	pakenham.ttf is not used by neutrino.
-#	It's the default- respectively fallback-font for some classic plugins.
-#
-#	tuxtxt.otb is the non-ttf font for tuxtxt (UseTTF 0 in tuxtxt2.conf).
+# NOTE: tuxtxt.otb is the non-ttf font for tuxtxt (UseTTF 0 in tuxtxt2.conf)
 #	Variables neutrino_ttf and tuxtxt_ttf describe aliases for neutrino.ttf and tuxtxt.ttf.

 neutrino_ttf = neutrino.ttf
@@ -18,7 +14,6 @@ install_DATA = \
 	micron_bold.ttf \
 	micron_italic.ttf \
 	micron.ttf \
-	pakenham.ttf \
 	tuxtxt.otb


@@ -31,3 +26,9 @@ install-data-hook:
 		mv $(neutrino_ttf) neutrino.ttf; \
 		mv $(tuxtxt_ttf) tuxtxt.ttf; \
 		ln -sf tuxtxt.ttf shell.ttf
+
+uninstall-hook:
+	cd $(DESTDIR)$(FONTDIR); \
+		rm -f neutrino.ttf; \
+		rm -f tuxtxt.ttf; \
+		rm -f shell.ttf
--- a/data/fonts/pakenham.ttf
+++ b/data/fonts/pakenham.ttf
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -8,7 +8,8 @@ SUBDIRS = \
 	radar \
 	slider \
 	status \
-	various
+	various \
+	weather

 install-data-hook:
 	$(INSTALL) -d $(DESTDIR)/$(ICONSDIR)/logo
--- a/data/icons/buttons/Makefile.am
+++ b/data/icons/buttons/Makefile.am
@@ -27,6 +27,7 @@ install_DATA = \
 	down.png \
 	dummy.png \
 	dummy_small.png \
+	epg.png \
 	gelb.png \
 	gruen.png \
 	help.png \
--- a/data/icons/buttons/epg.png
+++ b/data/icons/buttons/epg.png
--- a/data/icons/headers/Makefile.am
+++ b/data/icons/headers/Makefile.am
@@ -8,6 +8,7 @@ install_DATA = \
 	error.png \
 	features.png \
 	games.png \
+	icon_blue.png \
 	icon_green.png \
 	icon_movieplayer.png \
 	icon_red.png \
@@ -19,6 +20,7 @@ install_DATA = \
 	lcd.png \
 	lock.png \
 	mainmenue.png \
+	mp3.png \
 	multimedia.png \
 	network.png \
 	personalize.png \
--- a/data/icons/hints/Makefile.am
+++ b/data/icons/hints/Makefile.am
@@ -22,6 +22,7 @@ install_DATA = \
 	hint_info.png \
 	hint_keys.png \
 	hint_language.png \
+	hint_lcd4linux.png \
 	hint_load.png \
 	hint_manage.png \
 	hint_mb.png \
--- a/data/icons/hints/hint_lcd4linux.png
+++ b/data/icons/hints/hint_lcd4linux.png
--- a/data/icons/status/ca/Makefile.am
+++ b/data/icons/status/ca/Makefile.am
@@ -1,6 +1,9 @@
 installdir = $(ICONSDIR)

 install_DATA = \
+	bc_green.png \
+	bc_white.png \
+	bc_yellow.png \
 	biss_green.png \
 	biss_white.png \
 	biss_yellow.png \
@@ -34,6 +37,9 @@ install_DATA = \
 	via_green.png \
 	via_white.png \
 	via_yellow.png \
+	vmx_green.png \
+	vmx_white.png \
+	vmx_yellow.png \
 	x_green.png \
 	x_white.png \
 	x_yellow.png
--- a/data/icons/status/ca/bc_green.png
+++ b/data/icons/status/ca/bc_green.png
--- a/data/icons/status/ca/bc_white.png
+++ b/data/icons/status/ca/bc_white.png
--- a/data/icons/status/ca/bc_yellow.png
+++ b/data/icons/status/ca/bc_yellow.png
--- a/data/icons/status/ca/vmx_green.png
+++ b/data/icons/status/ca/vmx_green.png
--- a/data/icons/status/ca/vmx_white.png
+++ b/data/icons/status/ca/vmx_white.png
--- a/data/icons/status/ca/vmx_yellow.png
+++ b/data/icons/status/ca/vmx_yellow.png
--- a/data/icons/various/Makefile.am
+++ b/data/icons/various/Makefile.am
@@ -2,6 +2,7 @@ installdir = $(ICONSDIR)

 install_DATA = \
 	audioplay.png \
+	blank.png \
 	border_lr.png \
 	border_ul.png \
 	imdb.png \
--- a/data/icons/various/blank.png
+++ b/data/icons/various/blank.png
--- a/data/icons/weather/Makefile.am
+++ b/data/icons/weather/Makefile.am
@@ -0,0 +1,14 @@
+installdir = $(ICONSDIR)/weather
+
+install_DATA = \
+	clear-day.png \
+	clear-night.png \
+	cloudy.png \
+	fog.png \
+	partly-cloudy-day.png \
+	partly-cloudy-night.png \
+	rain.png \
+	sleet.png \
+	snow.png \
+	unknown.png \
+	wind.png
--- a/data/icons/weather/clear-day.png
+++ b/data/icons/weather/clear-day.png
--- a/data/icons/weather/clear-night.png
+++ b/data/icons/weather/clear-night.png
--- a/data/icons/weather/cloudy.png
+++ b/data/icons/weather/cloudy.png
--- a/data/icons/weather/fog.png
+++ b/data/icons/weather/fog.png
--- a/data/icons/weather/partly-cloudy-day.png
+++ b/data/icons/weather/partly-cloudy-day.png
--- a/data/icons/weather/partly-cloudy-night.png
+++ b/data/icons/weather/partly-cloudy-night.png
--- a/data/icons/weather/rain.png
+++ b/data/icons/weather/rain.png
--- a/data/icons/weather/sleet.png
+++ b/data/icons/weather/sleet.png
--- a/data/icons/weather/snow.png
+++ b/data/icons/weather/snow.png
--- a/data/icons/weather/unknown.png
+++ b/data/icons/weather/unknown.png
--- a/data/icons/weather/wind.png
+++ b/data/icons/weather/wind.png
--- a/data/inetradio/Makefile.am
+++ b/data/inetradio/Makefile.am
@@ -1,3 +1,5 @@
 installdir = $(CONFIGDIR)

-install_DATA = radio-favorites.xml radio-stations.xml
+install_DATA = \
+	radio-favorites.xml \
+	radio-stations.xml
--- a/data/initial/Makefile.am
+++ b/data/initial/Makefile.am
@@ -1,3 +1,10 @@
 installdir = $(CONFIGDIR)/initial

-install_DATA = bouquets.xml services.xml ubouquets.xml frontend.conf
+
+
+
+install_DATA = \
+	frontend.conf \
+	bouquets.xml \
+	services.xml \
+	ubouquets.xml
--- a/data/initial/bouquets.xml
+++ b/data/initial/bouquets.xml
--- a/data/initial/services.xml
+++ b/data/initial/services.xml
--- a/data/initial/ubouquets.xml
+++ b/data/initial/ubouquets.xml
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -117,6 +117,10 @@ adzap.minutes Minuten
 adzap.monitor Ein (dauerhaft)
 adzap.switchback Zurückschalten nach
 adzap.writedata Schreibe Status-Daten
+adzap.zap Zap bei Timer-Aktivierung
+adzap.zap_off aus
+adzap.zap_to_last_channel auf letzten Kanal
+adzap.zap_to_start_channel auf Start-Kanal
 apidselector.head Sprachauswahl
 audio.srs_algo Art
 audio.srs_algo_heavy stark
@@ -245,6 +249,8 @@ buildinfo.kernel Kernel Version
 buildinfo.menu Build Informationen
 cablesetup.provider Kabelanbieter
 channellist.additional Zusatzinformationen
+channellist.additional_desc Beschreibung
+channellist.additional_list Event-Liste
 channellist.additional_off aus
 channellist.additional_on ein
 channellist.additional_on_minitv ein (mit MiniTV)
@@ -279,6 +285,7 @@ channellist.new_zap_mode_allow erlauben
 channellist.new_zap_mode_off aus
 channellist.nonefound Es wurden keine Kanäle gefunden!\nFühren Sie bitte eine Kanalsuche durch\n(Menü-Taste -> Service)
 channellist.numeric_adjust Bei numerischem Zap Kanalliste nachführen
+channellist.primetime Primetime
 channellist.provs Anbieter
 channellist.recordable_channels Aufnehmbare Sender
 channellist.recording_not_possible Aufnahme nicht möglich!
@@ -333,8 +340,8 @@ colormenu.background Hintergrundfarbe
 colormenu.clock_textcolor Ziffernfarbe
 colormenu.fade Ein-/Ausblenden
 colormenu.font Verwendete Schriftart
-colormenu.font_ttx Teletext Schriftart
-colormenu.menucolors Farben
+colormenu.font_ttx Videotext Schriftart
+colormenu.menucolors Themes
 colormenu.osd_preset Monitor Auswahl
 colormenu.osd_resolution OSD-Auflösung
 colormenu.progressbar_active Farbe des aktiven Teil
@@ -348,6 +355,7 @@ colormenusetup.menucontent_inactive Fensterinhalt deaktiviert
 colormenusetup.menucontent_selected Fensterinhalt selektiert
 colormenusetup.menufoot Fußleiste
 colormenusetup.menuhead Titelleiste
+colormenusetup.menusubtitle_bar Menü Untertitel
 colorsetup.save Speichern
 colorstatusbar.text Infobar
 colorthememenu.head Theme auswählen
@@ -425,9 +433,7 @@ eventlistbar.channelswitch Umschalten
 eventlistbar.eventsort Sortieren
 eventlistbar.recordevent Aufnehmen
 extra.add_to_bouquet dem Bouquet zufügen
-extra.auto_delete Automatisches Löschen
-extra.auto_timeshift Automatische Aufnahme
-extra.cache_txt Teletext zwischenspeichern
+extra.cache_txt Videotext zwischenspeichern
 extra.chadded Der aktuelle Kanal wird dem selektierten Bouquet hinzugefügt ...\n
 extra.chalreadyinbq Der aktuelle Kanal ist bereits im selektierten Bouquet.\n
 extra.dboxinfo Box-Info
@@ -446,7 +452,6 @@ extra.dboxinfo_uptime Uptime
 extra.dboxinfo_use Nutzung
 extra.dboxinfo_used Benutzt
 extra.east Osten
-extra.external_volume Externe Lautstärke Regelung
 extra.fec_1_2 1/2
 extra.fec_2_3 2/3
 extra.fec_2_5 2/5
@@ -482,6 +487,8 @@ extra.lodirection Längengrad-Ausrichtung
 extra.longitude Längengrad
 extra.menu_left_exit "links" = Menü zurück
 extra.north Norden
+extra.record_bufsize Schreib-Puffer-Größe
+extra.record_bufsize_dmx DMX-Puffer-Größe
 extra.record_time Maximale Aufnahmedauer
 extra.record_time_ts Maximale Timeshiftdauer
 extra.rotor_swap Rotor dreht Ost/West
@@ -496,8 +503,10 @@ extra.sms_channel SMS-Modus bei Kanalsuche
 extra.sms_movie SMS-Modus bei Filmsuche
 extra.south Süden
 extra.start_tostandby Standby nach Boxstart
-extra.temp_timeshift Temporäres Timeshift
+extra.timeshift_auto Automatische Aufnahme
+extra.timeshift_delete Automatisches Löschen
 extra.timeshift_pause Pausierte Aufnahme
+extra.timeshift_temp Temporäres Timeshift
 extra.tp_bandwidth Bandbreite
 extra.tp_bandwidth_10mhz 10Mhz
 extra.tp_bandwidth_1_712mhz 1.712Mhz
@@ -929,6 +938,7 @@ lcd4l_brightness_standby Helligkeit im Standby-Modus
 lcd4l_clock_a Analog-Uhr im Standby-Modus
 lcd4l_convert Konvertiere Umlaute
 lcd4l_display_type Display-Typ
+lcd4l_display_type_setup Display-Typ einstellen
 lcd4l_logodir Senderlogo-Verzeichnis
 lcd4l_skin Display-Style
 lcd4l_skin_0 Standard
@@ -941,6 +951,7 @@ lcd4l_support LCD4Linux-Unterstützung
 lcd4l_support_auto automatisch
 lcd4l_support_off aus
 lcd4l_support_on ein
+lcd4l_weather Wetter im Standby-Modus
 lcd_info_line Zeige in Infozeile 
 lcd_info_line_channel Kanalname
 lcd_info_line_clock Uhrzeit
@@ -1034,6 +1045,7 @@ menu.hint_a_pic Konfigurieren Sie den Audioplayer und den Bildbetrachter
 menu.hint_adzap Der Werbezapper schaltet nach der eingestellten Zeit wieder auf den ursprünglichen Kanal zurück
 menu.hint_adzap_active Der Werbezapper ist aktiv. Mit einem erneuten Aufruf wird er deaktiviert.
 menu.hint_adzap_writedata Schreibe Daten über den Status des Werbezappers nach /tmp/adzap.data
+menu.hint_adzap_zap Umschalten bei Timer-Aktivierung auf zuletzt gesehenen Kanal oder auf Start-Kanal
 menu.hint_aplay Audioplayer
 menu.hint_aplay_setup Ändern Sie Audioplayer-Einstellungen wie Titel-Anzeige, Startverzeichnis oder Bildschirmschoner.
 menu.hint_audio Audio-Ausgang, Dolby Digital und SRS TruVolume Optionen usw.
@@ -1071,7 +1083,7 @@ menu.hint_backlight Konfigurieren Sie die Hintergrundbeleuchtung der Buttons
 menu.hint_backup Sichern von Konfigurationen und Kanallisten
 menu.hint_bedit Bearbeiten ihrer Favoriten und der Bouquets
 menu.hint_buildinfo Informationen über Compiler, Compilerflags, Kernel
-menu.hint_cache_txt Startet das Zwischenspeichern des Teletextes nach einem Kanalwechsel
+menu.hint_cache_txt Startet das Zwischenspeichern des Videotextes nach einem Kanalwechsel
 menu.hint_cec_mode CEC-Modus
 menu.hint_cec_standby CEC-Standby
 menu.hint_cec_view_on CEC view ON
@@ -1086,7 +1098,6 @@ menu.hint_channellist_mode Wählen Sie die Start-Kanalliste im TV-Modus
 menu.hint_channellist_mode_radio Wählen Sie die Start-Kanalliste im Radio-Modus
 menu.hint_channellist_setup Wählen Sie die Anzeigeoptionen für die Kanalliste
 menu.hint_channellist_show_channellogo Senderlogos aktivieren/deaktivieren.
-menu.hint_channellist_show_channellogo Zeigt Senderlogos in Kanalliste, Eventliste, EPG-Plus, EPG-Ansicht und Moviebrowser.
 menu.hint_channellist_show_channelnumber Zeigt Kanalnummer in der Kanalliste.
 menu.hint_channellist_show_empty_favs Zeigt oder versteckt leere Bouquets in den Favoriten
 menu.hint_channellist_show_eventlogo Eventlogos aktivieren/deaktivieren.
@@ -1132,7 +1143,6 @@ menu.hint_eventlist_epgplus Definiert, ob EPG Plus (Vorschau-Übersicht) mit der
 menu.hint_eventlist_fonts Ändern Sie die Schriftgröße in der Event-Liste
 menu.hint_eventlist_setup Wählen Sie die Anzeigeoptionen für die Event-Liste
 menu.hint_extended Energiespar-, EPG-Speicher- und Lade-Optionen, HDMI-CEC, Startkanal usw.
-menu.hint_external_volume Beim Betätigen der Lautstärketasten werden ensprechenden Script-Events ausgelöst.
 menu.hint_factory Zurücksetzen der Box auf Werkseinstellungen.\nDie Box wird danach neu gestartet
 menu.hint_fade Bei aktivierter Funktion werden die GUI-Fenster 'weich' ein- bzw. ausgeblendet
 menu.hint_fan_speed Steuerung der Lüftergeschwindigkeit für die CPU
@@ -1143,7 +1153,7 @@ menu.hint_fileplay_video Abspielen verschiedener Video-Dateien
 menu.hint_filesystem_is_utf8 Kodierung für Unicode-Zeichen im Filebrowser
 menu.hint_font_gui Wählen Sie die Schriftart für die Menüs
 menu.hint_font_scaling Legen Sie die vertikale und horizontale Skalierung der Menüschrift fest
-menu.hint_font_ttx Wählen Sie die Schriftart für den Teletext
+menu.hint_font_ttx Wählen Sie die Schriftart für den Videotext
 menu.hint_fonts Konfigurieren Sie die Schriftart und die Schriftgrößen für die Menüs
 menu.hint_foot_back Ändern Sie die Fußleisten-Hintergrundfarbe
 menu.hint_foot_textcolor Ändern Sie die Fußleisten-Textfarbe
@@ -1251,11 +1261,13 @@ menu.hint_lcd4l_brightness Regelt die Helligkeit des externen Displays im Normal
 menu.hint_lcd4l_brightness_standby Regelt die Helligkeit des externen Displays im Standby-Modus
 menu.hint_lcd4l_clock_a Zeigt im Standby-Betrieb eine Analog-Uhr anstatt einer Digital-Uhr
 menu.hint_lcd4l_convert Konvertiert Umlaute für die eingebaute LCD4Linux-Schriftart
-menu.hint_lcd4l_display_type Wählen Sie den Typ den externen Displays
+menu.hint_lcd4l_display_type Wählen Sie den Typ des externen Displays
+menu.hint_lcd4l_display_type_setup Einstellungen für den Typ des externen Displays
 menu.hint_lcd4l_logodir Verzeichnis für Senderlogos\nBei ungültigem Eintrag Fallback auf Standard-Logoverzeichnis
-menu.hint_lcd4l_skin Auswahl der verfügbaren Darstellungsarten
+menu.hint_lcd4l_skin Auswahl der verfügbaren Darstellungsarten\nStandard, Benutzerdefiniert, etc.
 menu.hint_lcd4l_skin_radio Wechselt die Darstellungsart, wenn der Radio-Modus aktiviert wird
 menu.hint_lcd4l_support LCD4Linux aktivieren/deaktivieren\nUnterstützte Displays: Pearl DPF, Samsung DPF, VU+SOLO4K, PNG
+menu.hint_lcd4l_weather Zeigt im Standby-Betrieb Wetterdaten auf dem Display an
 menu.hint_leds_blink Die Power-LEDs blinken, wenn sich der Receiver im Deep-Standby befindet und ein Timer aktiv ist
 menu.hint_leds_deepstandby Definiert den Status der Power-LEDs im Deep-Standby
 menu.hint_leds_record Definiert, ob die Power-LEDs blinken sollen, wenn eine Aufnahme aktiv ist
@@ -1282,8 +1294,8 @@ menu.hint_misc_channellist Erweiterte Einstellungen für die Kanallisten und Zap
 menu.hint_misc_energy Energieverbrauchs- und Standby-Optionen, verzögertes Ausschalten, setzen bzw. ändern des Inaktivitätstimers
 menu.hint_misc_epg Diverse EPG-Einstellungen und Speicherverzeichnis für EPG-Daten
 menu.hint_misc_filebrowser Dateisystem, Dateirechte anzeigen im Dateibrowser, Startverzeichnisoptionen
-menu.hint_misc_general Standby-, Teletext- und Rotor-Einstellungen, Pluginverzeichnis auf externem Datenträger
-menu.hint_misc_onlineservices Konfigurieren und steuern von Online-Diensten wie YouTube, SHOUTCast und TMDb
+menu.hint_misc_general Standby-, Videotext- und Rotor-Einstellungen, Pluginverzeichnis auf externem Datenträger
+menu.hint_misc_onlineservices Konfigurieren und steuern von Online-Diensten wie Wetter, YouTube, SHOUTCast und TMDb
 menu.hint_misc_zapit Verwaltung der Start-Kanäle für den TV/Radio-Modus
 menu.hint_movie Wiedergabe von Filmen
 menu.hint_moviebrowser_fonts Ändern Sie die Schriftgrößen im Moviebrowser (Meine Aufnahmen)
@@ -1379,9 +1391,9 @@ menu.hint_record_apids Konfigurieren Sie die Tonspuren für die Aufnahme
 menu.hint_record_apply Hiermit werden die Aufnahmeoptionen übernommen
 menu.hint_record_auto_cover Automatisch ein Film-Vorschaubild beim Abspielen erzeugen
 menu.hint_record_chandir Diese Option speichert Aufnahmen mit dem Namen des Kanals in ein eigenes Verzeichnis
-menu.hint_record_data Daten-Spuren (Teletext, Untertitel) für die Aufnahme
+menu.hint_record_data Daten-Spuren (Videotext, Untertitel) für die Aufnahme
 menu.hint_record_data_dvbsub Untertitel-Spur zu Aufnahme hinzufügen
-menu.hint_record_data_vtxt Teletext-Spur zu Aufnahme hinzufügen
+menu.hint_record_data_vtxt Videotext-Spur zu Aufnahme hinzufügen
 menu.hint_record_dir Wählen Sie das Aufnahmeverzeichnis
 menu.hint_record_end Wählen Sie zwischen maximaler Aufnahmezeit oder einem Aufnahmeende anhand der EPG-Daten
 menu.hint_record_filename_template Vorlagemuster für den Dateinamen bearbeiten
@@ -1529,7 +1541,7 @@ menu.hint_sw_update System aktualisieren, Image sichern und wiederherstellen
 menu.hint_theme Wählen Sie ein vordefiniertes Farbschema, speichern oder laden Sie ihre eigenen Farbschemata
 menu.hint_timeouts Anpassen von Timeouts und Anzeigeverhalten für Meldungen, Fenster, Menüs, Infobar usw.
 menu.hint_timeouts_static_messages Anzeigedauer für bestimmte Meldungen mit Benutzerinteraktion
-menu.hint_timer_followscreenings Zeige weitere Termine für Timerprogrammierung.
+menu.hint_timer_followscreenings Zeige Terminauswahl mit Folge-Events zur Timerprogrammierung. "Immer" zeigt die Auswahl auch dann, wenn nur ein Event gefunden wurde.
 menu.hint_timers Hinzufügen, entfernen und bearbeiten geplanter Aufnahmen oder anderer Timer
 menu.hint_timezone Wählen Sie ihre Zeitzone aus
 menu.hint_tmdb_api_key Geben Sie den TMDb API Schlüssel ein. Eine leere Eingabe schaltet die TMDb-Unterstützung aus
@@ -1569,6 +1581,9 @@ menu.hint_volume Wählen Sie die Anzeigeoptionen für die Lautstärke
 menu.hint_volume_digits Zifferndarstellung der Lautstärkeanzeige ein- oder ausschalten
 menu.hint_volume_pos Wählen Sie die Position der Lautstärkeanzeige aus
 menu.hint_volume_size Wählen Sie die Höhe der Lautstärkeanzeige
+menu.hint_weather_api_key Geben Sie den Dark Sky API Schlüssel ein. Eine leere Eingabe schaltet die Wetter-Unterstützung aus
+menu.hint_weather_enabled Schaltet die Wetter-Unterstützung (darksky.net) ein bzw. aus
+menu.hint_weather_location Wählen Sie eine Stadt in ihrer Nähe zur Anzeige der Wetterdaten aus
 menu.hint_webradio_setup Hier konfigurierte WebRadio-Kanäle finden Sie in der Kanalverwaltung.
 menu.hint_webradio_xml_auto Lädt automatisch alle WebRadio-Dateien aus %s/ und %s/
 menu.hint_webtv_setup Hier konfigurierte WebTV-Kanäle finden Sie in der Kanalverwaltung.
@@ -1581,6 +1596,8 @@ menu.hint_ytplay Wiedergabe von ausgewählten YouTube Feeds
 menu.hint_ytplay_setup Konfigurieren Sie YouTube-spezifische Optionen wie maximale Ergebnisse bei Suchen oder Cache-Verzeichnis
 menu.hint_zap_cycle Wählen Sie, ob nur innerhalb des aktiven Bouquets umgeschaltet werden kann
 menu.next Weiter
+message.frame_enable Rahmen für Meldungen und Hinweisfenster
+message.frame_enable_hint Aktivieren von Rahmen für Meldungen und Hinweisfenster.
 messagebox.back Zurück
 messagebox.cancel Abbruch
 messagebox.discard Wollen Sie die Änderungen verwerfen?
@@ -1744,7 +1761,9 @@ moviebrowser.book_type Sprung (<0: zurück, >0: vor):
 moviebrowser.book_type_backward Wiederholung
 moviebrowser.book_type_forward Überspringen
 moviebrowser.browser_additional Zusätzliche Informationen
+moviebrowser.browser_cut_long_rowtext Text in Spalten abschneiden
 moviebrowser.browser_frame_high Anzeigehöhe oberes Fenster [%]
+moviebrowser.browser_frame_high_additional Anzeigehöhe oberes Fenster mit Zusatzinfos [%]
 moviebrowser.browser_row_head Spalten Einstellungen
 moviebrowser.browser_row_item Spalteninfo
 moviebrowser.browser_row_nr Anzahl Spalten
@@ -1804,9 +1823,9 @@ moviebrowser.hint_movieend Filmende in 5 Sekunden\n'0' zum Weitersehen
 moviebrowser.hint_newbook_backward Neue Wiederholung gestartet.\n'%s' bestimmt die Endposition, '0' bricht ab.
 moviebrowser.hint_newbook_forward Neuer Werbesprung gestartet.\n'%s' bestimmt die Endposition, '0' bricht ab.
 moviebrowser.hint_truncate Entfernt den Filmteil hinter der Filmende-Markierung
-moviebrowser.imdb_data Lade IMDb-Daten
 moviebrowser.info_audio Audio
 moviebrowser.info_channel Kanal
+moviebrowser.info_elapsed Letzer Wiedergabe Stop
 moviebrowser.info_file Datei
 moviebrowser.info_filename Dateiname
 moviebrowser.info_genre_major Genre
@@ -1843,7 +1862,9 @@ moviebrowser.menu_copy_onefile Film kopieren
 moviebrowser.menu_copy_several Film kopieren und teilen
 moviebrowser.menu_cut Film schneiden
 moviebrowser.menu_cut_head Kopieren, Schneiden und Kürzen
+moviebrowser.menu_data_request Online-Datenbank abfragen
 moviebrowser.menu_directories_head Verzeichnisse de/aktivieren
+moviebrowser.menu_edit bearbeiten
 moviebrowser.menu_main_bookmarks Markierungen
 moviebrowser.menu_main_head Film-Info und Einstellungen
 moviebrowser.menu_nfs_head NFS Einstellung
@@ -1857,6 +1878,7 @@ moviebrowser.menu_save Veränderungen speichern
 moviebrowser.menu_save_all Starte Übernahme in allen sichtbaren Filminfos
 moviebrowser.menu_settings Einstellungen
 moviebrowser.menu_truncate Film kürzen
+moviebrowser.message_keep_storage_settings Sollen die Depot-Einstellungen für verwendete und aktivierte Verzeichnisse beibehalten werden?
 moviebrowser.option_browser Anzeigeoptionen
 moviebrowser.reload_at_start Filminfos neu laden bei Start
 moviebrowser.remount_at_start Filmdepot verbinden bei Start
@@ -1869,6 +1891,7 @@ moviebrowser.short_audio Audio
 moviebrowser.short_book Mark.
 moviebrowser.short_channel Kanal
 moviebrowser.short_country Land
+moviebrowser.short_elapsed 
 moviebrowser.short_filename Name
 moviebrowser.short_format Format
 moviebrowser.short_genre_major Genre
@@ -1906,6 +1929,7 @@ moviebrowser.yt_cancel_transfer Download abbrechen?
 moviebrowser.yt_clear Liste leeren
 moviebrowser.yt_completed Vollständige Downloads
 moviebrowser.yt_concurrent_connections Gleichzeitige Verbindungen
+moviebrowser.yt_dl_dir Youtube download Verzeichnis
 moviebrowser.yt_error Fehler beim Laden des YouTube-Feeds
 moviebrowser.yt_failed Fehlgeschlagene Downloads
 moviebrowser.yt_history Frühere Suchen
@@ -1937,9 +1961,9 @@ movieplayer.help_additional Weitere benutzerdefinierte Tastenbelegungen sind unt
 movieplayer.help_button_1 1 Minute zurück
 movieplayer.help_button_2 Zum Filmanfang springen
 movieplayer.help_button_3 1 Minute vor
-movieplayer.help_button_4 3 Minuten zurück
+movieplayer.help_button_4 5 Minuten zurück
 movieplayer.help_button_5 Zur Filmmitte springen
-movieplayer.help_button_6 3 Minuten vor
+movieplayer.help_button_6 5 Minuten vor
 movieplayer.help_button_7 10 Minuten zurück
 movieplayer.help_button_8 Zum Filmende springen
 movieplayer.help_button_9 10 Minuten vor
@@ -2053,6 +2077,7 @@ opkg.update.check Prüfe auf Updates ...
 opkg.update.reading_lists Paketlisten werden eingelesen ...
 opkg.upgrade Installierte Pakete aktualisieren
 opkg.warning_3rdparty_packages Drittanbieter-Pakete könnten Ihr System beschädigen! Sind Sie sicher, dieses Paket zu installieren?
+options.always immer
 options.default Voreinstellungen benutzen
 options.fb framebuffer
 options.hint_default Setzen Sie die Werte auf die Voreinstellung zurück.
@@ -2171,6 +2196,10 @@ rclock.title Fernbedienung sperren
 rclock.unlockmsg Fernbedienung reaktiviert
 recording.already_found %s\nwurde bereits gefunden. Trotzdem aufnehmen?
 recording.already_found_check Prüfe Aufnahmen
+recording.end Aufnahmeende festlegen
+recording.end_text Soll die Aufnahme zum Ende der aktuellen Sendung stoppen?
+recording.failed Aufzeichnung ist fehlgeschlagen!
+recording.fill_text Das Aufnahmemedium ist zu %d%% gefüllt. Trotzdem aufnehmen?
 recording.is_running Folgende Aufnahme läuft bereits! Neue Aufnahme starten?
 recording.start Starte Aufnahme, bitte warten ...
 recording.startstop_msg Meldung bei Aufnahme Start/Ende
@@ -2211,7 +2240,7 @@ recordingmenu.slow_warn Warnung bei langsamen Aufnahmemedien
 recordingmenu.timeshift Timeshift
 recordingmenu.tsdir Timeshift Aufnahmeverzeichnis
 recordingmenu.vcr Videorekorder
-recordingmenu.vtxt_pid Teletext aufnehmen
+recordingmenu.vtxt_pid Videotext aufnehmen
 recordingmenu.zap_on_announce Umschalten bei Ankündigung
 recordtimer.announce Die Aufnahme beginnt in wenigen Minuten.
 remotebox_add Hinzufügen
@@ -2408,7 +2437,7 @@ streaminfo.audiotype Audiotyp
 streaminfo.audiotype_unknown unbekannt
 streaminfo.average_bitrate Durchschnitt
 streaminfo.bitrate Bitrate
-streaminfo.casystems Cryptsysteme
+streaminfo.casystems CA ID(s)
 streaminfo.framerate Bildrate
 streaminfo.framerate_unknown unbekannt
 streaminfo.head Technische Informationen
@@ -2529,6 +2558,8 @@ tunersetup.mode Betriebsmodus
 tunersetup.power 5V-Versorgung bei DVB-T/T2 Kanälen
 tunersetup.terr Terrestrisch (DVB-T/T2)
 unicable.lnb Unicable Eingang
+unicable.pin Unicable PIN
+unicable.pin_hint PIN (1 - 255) für Benutzerfrequenz\n0 bedeutet inaktiv / aus
 unicable.qrg Unicable Frequenz
 unicable.scr Unicable SCR
 unit.decimal ,
@@ -2551,7 +2582,7 @@ usermenu.item_bar ---- Trennung ----
 usermenu.item_epg_misc EPG Funktionen
 usermenu.item_none (frei)
 usermenu.item_plugin_types Plugin-Typen
-usermenu.item_vtxt Teletext
+usermenu.item_vtxt Videotext
 usermenu.items Menüpunkte
 usermenu.key Taste
 usermenu.key_select Taste zuweisen
@@ -2617,6 +2648,9 @@ videomenu.videoformat_149 14:9
 videomenu.videoformat_169 16:9
 videomenu.videoformat_43 4:3
 videomenu.videomode Videosystem
+weather.api_key Wetter API Schlüssel (Dark Sky)
+weather.enabled Wetter-Unterstützung
+weather.location Wetter-Standort
 webradio.head WebRadio
 webradio.xml WebRadio-Dateien
 webradio.xml.auto WebRadio-Dateien automatisch laden
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -117,6 +117,10 @@ adzap.minutes minutes
 adzap.monitor On (durable)
 adzap.switchback Switch back after
 adzap.writedata Write status data
+adzap.zap Zap on timer activation
+adzap.zap_off off
+adzap.zap_to_last_channel to last channel
+adzap.zap_to_start_channel to start channel
 apidselector.head Select language
 audio.srs_algo Type
 audio.srs_algo_heavy Heavy
@@ -244,11 +248,13 @@ buildinfo.creator Creator
 buildinfo.kernel Kernel version
 buildinfo.menu Build information
 cablesetup.provider cable provider
-channellist.additional Additional Informations
-channellist.additional_off Off
-channellist.additional_on On
-channellist.additional_on_minitv On (with MiniTV)
-channellist.current_tp Current Transponder
+channellist.additional Additional informations
+channellist.additional_desc Description
+channellist.additional_list Event list
+channellist.additional_off off
+channellist.additional_on on
+channellist.additional_on_minitv on (with MiniTV)
+channellist.current_tp Current transponder
 channellist.edit Edit
 channellist.epgtext_align_left Left
 channellist.epgtext_align_right Right
@@ -278,7 +284,8 @@ channellist.new_zap_mode_active Active
 channellist.new_zap_mode_allow Allow
 channellist.new_zap_mode_off Off
 channellist.nonefound No channels were found!\nPlease execute a scan\n(Menu key -> Service)
-channellist.numeric_adjust Numeric Zap Adjust
+channellist.numeric_adjust Numeric zap adjust
+channellist.primetime Primetime
 channellist.provs Providers
 channellist.recordable_channels Recordable channels
 channellist.recording_not_possible Recording not possible!
@@ -334,7 +341,7 @@ colormenu.clock_textcolor Digit color
 colormenu.fade Fade GUI
 colormenu.font Select GUI font
 colormenu.font_ttx Select Teletext font
-colormenu.menucolors Colors
+colormenu.menucolors Themes
 colormenu.osd_preset TV preset
 colormenu.osd_resolution OSD resolution
 colormenu.progressbar_active Active part color
@@ -348,6 +355,7 @@ colormenusetup.menucontent_inactive Content inactive
 colormenusetup.menucontent_selected Content selected
 colormenusetup.menufoot Footer
 colormenusetup.menuhead Header
+colormenusetup.menusubtitle_bar Menu subtitle
 colorsetup.save Save
 colorstatusbar.text Infobar
 colorthememenu.head Select theme
@@ -425,8 +433,6 @@ eventlistbar.channelswitch schedule
 eventlistbar.eventsort sorting
 eventlistbar.recordevent record
 extra.add_to_bouquet Add to bouquet
-extra.auto_delete Automatic deletion
-extra.auto_timeshift Automatic recording
 extra.cache_txt Cache teletext
 extra.chadded The current channel has been added to selected bouquet.\n
 extra.chalreadyinbq The current channel is already in selected bouquet.\n
@@ -481,6 +487,8 @@ extra.lodirection LoDirection
 extra.longitude Longitude
 extra.menu_left_exit "Left" = menu back
 extra.north North
+extra.record_bufsize Write buffer size
+extra.record_bufsize_dmx DMX buffer size
 extra.record_time Maximal recording duration
 extra.record_time_ts Maximal timeshift duration
 extra.rotor_swap Swap rotor east/west
@@ -495,8 +503,10 @@ extra.sms_channel SMS-mode channel
 extra.sms_movie SMS-mode movie
 extra.south South
 extra.start_tostandby Startup to standby
-extra.temp_timeshift Temporary timeshift
+extra.timeshift_auto Automatic recording
+extra.timeshift_delete Automatic deletion
 extra.timeshift_pause Paused recording
+extra.timeshift_temp Temporary timeshift
 extra.tp_bandwidth Bandwidth
 extra.tp_bandwidth_10mhz 10Mhz
 extra.tp_bandwidth_1_712mhz 1.712Mhz
@@ -927,7 +937,8 @@ lcd4l_brightness Brightness
 lcd4l_brightness_standby Brightness in standby
 lcd4l_clock_a Analog clock in Standby-Mode
 lcd4l_convert Convert umlauts
-lcd4l_display_type Display Type
+lcd4l_display_type Display type
+lcd4l_display_type_setup Display type setup
 lcd4l_logodir Channellogo-Directory
 lcd4l_skin Display-Style
 lcd4l_skin_0 Standard
@@ -940,6 +951,7 @@ lcd4l_support LCD4Linux-Support
 lcd4l_support_auto automatic
 lcd4l_support_off off
 lcd4l_support_on on
+lcd4l_weather Weather in standby mode
 lcd_info_line Show in infoline
 lcd_info_line_channel Channelname
 lcd_info_line_clock Clock
@@ -1033,6 +1045,7 @@ menu.hint_a_pic Configure audio player and picture viewer
 menu.hint_adzap AdZap will switch back to the current channel when the selected time is up
 menu.hint_adzap_active AdZap is active. With a new call it will be deactivated.
 menu.hint_adzap_writedata Write data according to adzap status to /tmp/adzap.data
+menu.hint_adzap_zap Zap to last viewed channel or to start channel during timer activation
 menu.hint_aplay Audio player
 menu.hint_aplay_setup Change title display, start directory, screen saver and more
 menu.hint_audio Audio output, DD\nSRS True volume options
@@ -1085,7 +1098,6 @@ menu.hint_channellist_mode Use the selected channel list mode on startup if last
 menu.hint_channellist_mode_radio Use the selected channel list mode on startup if last mode is Radio
 menu.hint_channellist_setup Configure channel list GUI options
 menu.hint_channellist_show_channellogo Enable/disable channel logos.
-menu.hint_channellist_show_channellogo Show channel logos in channellist, eventlist, EPG Plus, EPG-viewer and moviebrowser
 menu.hint_channellist_show_channelnumber Show channel number in channel list
 menu.hint_channellist_show_empty_favs Show or hide empty bouquets in favorites
 menu.hint_channellist_show_eventlogo Enable/disable event logos.
@@ -1250,10 +1262,12 @@ menu.hint_lcd4l_brightness_standby Adjusts the brightness of external display in
 menu.hint_lcd4l_clock_a Shows an analog clock instead of a digital clock on display at standby
 menu.hint_lcd4l_convert Convert umlauts for the built-in LCD4Linux font
 menu.hint_lcd4l_display_type Choose type of external display
+menu.hint_lcd4l_display_type_setup Settings for the type of external display
 menu.hint_lcd4l_logodir Logo directory.\nFallback to default on invalid entry.
-menu.hint_lcd4l_skin Switch between modes
-menu.hint_lcd4l_skin_radio Switch the mode, when Radio-Mode is activated
-menu.hint_lcd4l_support Activate/deactivate LCD4Linux\nSupported displays: Pearl DPF, Samsung DPF, VU+SOLO4K, PNG
+menu.hint_lcd4l_skin Switch between styles\nDefault, User defined, etc.
+menu.hint_lcd4l_skin_radio Switch style when Radio-Mode is activated
+menu.hint_lcd4l_support Activate/deactivate LCD4Linux\nSupported displays: Pearl DPF, Samsung SPF, VU+SOLO4K, PNG
+menu.hint_lcd4l_weather weather data in standby mode
 menu.hint_leds_blink Blinking LEDs in deep-standby
 menu.hint_leds_deepstandby LEDs state in deep-standby mode
 menu.hint_leds_record LEDs state when box recording
@@ -1281,7 +1295,7 @@ menu.hint_misc_energy Enable soft-standby, delayed shutdown\ninactivity timers
 menu.hint_misc_epg Save/load EPG options, EPG cache options\nEPG save directory
 menu.hint_misc_filebrowser Filesystem encoding, file rights\ndeny directory leave
 menu.hint_misc_general Start to standby, cache teletext, swp rotor\nplugin hdd dir
-menu.hint_misc_onlineservices Configure and control online services like YouTube, SHOUTCast and TMDb
+menu.hint_misc_onlineservices Configure and control online services like Weather, YouTube, SHOUTCast and TMDb
 menu.hint_misc_zapit Initial TV/Radio channels
 menu.hint_movie Play movies
 menu.hint_moviebrowser_fonts Change moviebrowser (My recordings) font sizes
@@ -1527,7 +1541,7 @@ menu.hint_sw_update Update software
 menu.hint_theme Select pre-defined color theme\nSave or load theme from files
 menu.hint_timeouts Customize display behavior and timeouts for messages, windows, menus, infobar, etc.
 menu.hint_timeouts_static_messages Timeout for specific messages with user interaction
-menu.hint_timer_followscreenings Show selection with followscreenings for timer programming
+menu.hint_timer_followscreenings Show selection with followscreenings for timer programming. "Always" shows selection even if just one event is found.
 menu.hint_timers Add/Remove/Edit scheduled\nrecording, reminders etc.
 menu.hint_timezone Select your timezone
 menu.hint_tmdb_api_key Type your TMDb API key. An empty input disables TMDb support
@@ -1567,6 +1581,9 @@ menu.hint_volume Configure Volume GUI options
 menu.hint_volume_digits Numeric display of the volumebar on/off
 menu.hint_volume_pos Select volume indicator position
 menu.hint_volume_size Select volume indicator height
+menu.hint_weather_api_key Type your Dark Sky API key. An empty input disables Weather support
+menu.hint_weather_enabled Enable or disable Weather support (darksky.net)
+menu.hint_weather_location Select your weather location
 menu.hint_webradio_setup WebRadio channels configured here will be available in the standard channel lists.
 menu.hint_webradio_xml_auto Auto-load all existing WebRadio files from %s/ and %s/
 menu.hint_webtv_setup WebTV channels configured here will be available in the standard channel lists.
@@ -1579,6 +1596,8 @@ menu.hint_ytplay Play selected YouTube feeds
 menu.hint_ytplay_setup Configure YouTube-specific options, e.g. an upper limit for search results
 menu.hint_zap_cycle When swithing channels, stay in current bouquet
 menu.next Next
+message.frame_enable Message and hint box frames
+message.frame_enable_hint Enable frames around message and hint boxes.
 messagebox.back Back
 messagebox.cancel Cancel
 messagebox.discard Discard changes?
@@ -1742,7 +1761,9 @@ moviebrowser.book_type Jump (<0: backward, >0: forward):
 moviebrowser.book_type_backward Repeat
 moviebrowser.book_type_forward Jump over
 moviebrowser.browser_additional Additional informations
+moviebrowser.browser_cut_long_rowtext Cut long row text
 moviebrowser.browser_frame_high Browser height [%]
+moviebrowser.browser_frame_high_additional Browser height with additional info [%]
 moviebrowser.browser_row_head Row settings
 moviebrowser.browser_row_item Row item
 moviebrowser.browser_row_nr Number of rows
@@ -1802,9 +1823,9 @@ moviebrowser.hint_movieend Film end in 5 seconds\n'0' to cancel
 moviebrowser.hint_newbook_backward New jump back started\n'%s' to define endposition, '0' to cancel
 moviebrowser.hint_newbook_forward New jump forward started\n'%s' to define endposition, '0' to cancel
 moviebrowser.hint_truncate Truncating all data beyond the end-bookmark
-moviebrowser.imdb_data Get IMDb data
 moviebrowser.info_audio Audio
 moviebrowser.info_channel Channel
+moviebrowser.info_elapsed Last Play Stop
 moviebrowser.info_file File
 moviebrowser.info_filename Filename
 moviebrowser.info_genre_major Genre
@@ -1841,7 +1862,9 @@ moviebrowser.menu_copy_onefile Copy movie
 moviebrowser.menu_copy_several Copy and split movie
 moviebrowser.menu_cut Cut movie
 moviebrowser.menu_cut_head Copy, cut and truncate
+moviebrowser.menu_data_request Online database request
 moviebrowser.menu_directories_head Directories de/activate
+moviebrowser.menu_edit edit
 moviebrowser.menu_main_bookmarks Bookmarks
 moviebrowser.menu_main_head Movie info and settings
 moviebrowser.menu_nfs_head NFS settings
@@ -1855,6 +1878,7 @@ moviebrowser.menu_save Save changes
 moviebrowser.menu_save_all Start update of movie info files
 moviebrowser.menu_settings Settings
 moviebrowser.menu_truncate Truncate movie
+moviebrowser.message_keep_storage_settings Do You want to keep storage settings for used and enabled directories?
 moviebrowser.option_browser Browser Options
 moviebrowser.reload_at_start Reload movie info at start
 moviebrowser.remount_at_start Remount at start
@@ -1867,6 +1891,7 @@ moviebrowser.short_audio Audio
 moviebrowser.short_book Book
 moviebrowser.short_channel Channel
 moviebrowser.short_country Country
+moviebrowser.short_elapsed 
 moviebrowser.short_filename Name
 moviebrowser.short_format Format
 moviebrowser.short_genre_major Genre
@@ -1904,6 +1929,7 @@ moviebrowser.yt_cancel_transfer Cancel download?
 moviebrowser.yt_clear Clear
 moviebrowser.yt_completed Completed downloads
 moviebrowser.yt_concurrent_connections Concurrent connections
+moviebrowser.yt_dl_dir YouTube download directory
 moviebrowser.yt_error Failed to load YouTube feed
 moviebrowser.yt_failed Failed downloads
 moviebrowser.yt_history Search history
@@ -1935,9 +1961,9 @@ movieplayer.help_additional To find more user definable key bindings, see "Mainm
 movieplayer.help_button_1 1 minute backward
 movieplayer.help_button_2 Jump to movie's start
 movieplayer.help_button_3 1 minute forward
-movieplayer.help_button_4 3 minutes backward
+movieplayer.help_button_4 5 minutes backward
 movieplayer.help_button_5 Jump to movie's middle
-movieplayer.help_button_6 3 minutes forward
+movieplayer.help_button_6 5 minutes forward
 movieplayer.help_button_7 10 minutes backward
 movieplayer.help_button_8 Jump to movie's end
 movieplayer.help_button_9 10 minutes forward
@@ -2051,6 +2077,7 @@ opkg.update.check Checking for updates ...
 opkg.update.reading_lists Reading package lists ...
 opkg.upgrade Upgrade installed packages
 opkg.warning_3rdparty_packages 3rd party packages could damage your system! Are you sure install this package?
+options.always always
 options.default Reset to defaults
 options.fb framebuffer
 options.hint_default Reset the values to their defaults
@@ -2169,6 +2196,10 @@ rclock.title Lock remote control
 rclock.unlockmsg Remote control unlocked
 recording.already_found %s\nwas already found. Nevertheless start record?
 recording.already_found_check Check recordings
+recording.end Set record end
+recording.end_text Stop this record at the end of current show?
+recording.failed Recording failed!
+recording.fill_text Record medium is filled up to %d%%. Nevertheless start record?
 recording.is_running This channel already recording. Start new record?
 recording.start Start recording, please wait ...
 recording.startstop_msg Message when recording is start/stop
@@ -2406,7 +2437,7 @@ streaminfo.audiotype Audiotype
 streaminfo.audiotype_unknown unknown
 streaminfo.average_bitrate Average
 streaminfo.bitrate Bitrate
-streaminfo.casystems Conditional access systems
+streaminfo.casystems CA ID(s)
 streaminfo.framerate Framerate
 streaminfo.framerate_unknown unknown
 streaminfo.head Technical informations
@@ -2527,6 +2558,8 @@ tunersetup.mode Operation mode
 tunersetup.power 5V supply on DVB-T/T2 channels
 tunersetup.terr Terrestrial (DVB-T/T2)
 unicable.lnb Unicable Input
+unicable.pin Unicable PIN
+unicable.pin_hint PIN (1 - 255) for user frequency\n0 means inactive / off
 unicable.qrg Unicable Frequency
 unicable.scr Unicable SCR
 unit.decimal .
@@ -2615,6 +2648,9 @@ videomenu.videoformat_149 14:9
 videomenu.videoformat_169 16:9
 videomenu.videoformat_43 4:3
 videomenu.videomode Digital video mode
+weather.api_key Weather API key (Dark Sky)
+weather.enabled Weather support
+weather.location Weather location
 webradio.head WebRadio
 webradio.xml WebRadio files
 webradio.xml.auto Auto-load WebRadio files
--- a/data/neutrino-scripts/Makefile.am
+++ b/data/neutrino-scripts/Makefile.am
@@ -1,6 +0,0 @@
-
-installdir = $(CONFIGDIR)
-install_DATA = flash.start
-
-install-data-hook:
-	chmod 0755 $(DESTDIR)$(CONFIGDIR)/flash.start
--- a/data/scripts/Makefile.am
+++ b/data/scripts/Makefile.am
@@ -1,11 +1,17 @@
 installdir = $(bindir)

-install_DATA = \
+install_SCRIPTS = \
 	backup.sh \
 	restore.sh \
 	install.sh 

-install-data-hook:
-	chmod 0755 $(DESTDIR)$(bindir)/backup.sh
-	chmod 0755 $(DESTDIR)$(bindir)/restore.sh
-	chmod 0755 $(DESTDIR)$(bindir)/install.sh
+# if BOXMODEL_CS_HD2
+# install_SCRIPTS += \
+# 	backup_flash.sh \
+# 	restore_flash.sh
+# endif
+#
+# if BOXTYPE_ARMBOX
+# install_SCRIPTS += \
+# 	restore_flash.sh
+# endif
--- a/data/themes/Bluemoon-3.0.theme
+++ b/data/themes/Bluemoon-3.0.theme
@@ -8,6 +8,7 @@ colored_events_channellist=1
 colored_events_green=50
 colored_events_infobar=2
 colored_events_red=80
+message_frame_enable=1
 infobar_Text_alpha=0
 infobar_Text_blue=80
 infobar_Text_green=80
@@ -52,6 +53,14 @@ menu_Content_inactive_blue=20
 menu_Content_inactive_green=20
 menu_Content_inactive_red=20
 menu_Content_red=20
+menu_Foot_Text_alpha=0
+menu_Foot_Text_blue=48
+menu_Foot_Text_green=48
+menu_Foot_Text_red=48
+menu_Foot_alpha=20
+menu_Foot_blue=54
+menu_Foot_green=38
+menu_Foot_red=14
 menu_Head_Text_alpha=0
 menu_Head_Text_blue=80
 menu_Head_Text_green=80
@@ -65,3 +74,23 @@ menu_Head_red=0
 menu_Hint_gradient=1
 menu_Hint_gradient_direction=1
 menu_Separator_gradient_enable=1
+menu_SubHead_gradient=3
+menu_SubHead_gradient_direction=1
+progressbar_active_blue=98
+progressbar_active_green=98
+progressbar_active_red=98
+progressbar_design=3
+progressbar_design_channellist=3
+progressbar_gradient=1
+progressbar_passive_blue=60
+progressbar_passive_green=60
+progressbar_passive_red=60
+progressbar_timescale_green=100
+progressbar_timescale_invert=0
+progressbar_timescale_red=0
+progressbar_timescale_yellow=70
+rounded_corners=0
+shadow_alpha=0
+shadow_blue=8
+shadow_green=8
+shadow_red=8
--- a/data/themes/Classic.theme
+++ b/data/themes/Classic.theme
@@ -42,3 +42,4 @@ menu_Hint_gradient=0
 menu_Head_gradient=0
 infobar_gradient_top=0
 infobar_gradient_bottom=0
+rounded_corners=1
--- a/data/themes/Gray.theme
+++ b/data/themes/Gray.theme
@@ -51,5 +51,6 @@ menu_Head_green=20
 menu_Head_red=15
 menu_Hint_gradient=0
 menu_Head_gradient=0
+message_frame_enable=1
 infobar_gradient_top=0
 infobar_gradient_bottom=0
--- a/data/themes/Grey-Blue.theme
+++ b/data/themes/Grey-Blue.theme
@@ -48,5 +48,6 @@ menu_Head_green=0
 menu_Head_red=0
 menu_Hint_gradient=0
 menu_Head_gradient=0
+message_frame_enable=1
 infobar_gradient_top=0
 infobar_gradient_bottom=0
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -1,10 +1,10 @@
-installdir = $(THEMESDIR)
-
 SUBDIRS = \
 	Grey-Blue/icons/buttons \
 	Neutrino-3.0/icons/buttons \
 	Olive-3.0/icons/buttons

+installdir = $(THEMESDIR)
+
 install_DATA = \
 	Bluemoon-3.0.theme \
 	Classic.theme \
@@ -18,5 +18,6 @@ install_DATA = \
 	Neutrino-3.0.theme \
 	Olive.theme \
 	Olive-3.0.theme \
+	Origin.theme \
 	Red.theme \
 	VirginMedia.theme
--- a/data/themes/Neutrino-3.0.theme
+++ b/data/themes/Neutrino-3.0.theme
@@ -8,6 +8,7 @@ colored_events_channellist=2
 colored_events_green=70
 colored_events_infobar=2
 colored_events_red=95
+message_frame_enable=1
 infobar_Text_alpha=0
 infobar_Text_blue=100
 infobar_Text_green=100
@@ -34,7 +35,7 @@ menu_Content_Selected_Text_green=0
 menu_Content_Selected_Text_red=0
 menu_Content_Selected_alpha=20
 menu_Content_Selected_blue=100
-menu_Content_Selected_green=55
+menu_Content_Selected_green=43
 menu_Content_Selected_red=25
 menu_Content_Text_alpha=0
 menu_Content_Text_blue=100
@@ -52,10 +53,18 @@ menu_Content_inactive_blue=41
 menu_Content_inactive_green=5
 menu_Content_inactive_red=0
 menu_Content_red=0
+menu_Foot_Text_alpha=0
+menu_Foot_Text_blue=60
+menu_Foot_Text_green=60
+menu_Foot_Text_red=60
+menu_Foot_alpha=20
+menu_Foot_blue=32
+menu_Foot_green=15
+menu_Foot_red=14
 menu_Head_Text_alpha=0
-menu_Head_Text_blue=0
-menu_Head_Text_green=70
-menu_Head_Text_red=95
+menu_Head_Text_blue=16
+menu_Head_Text_green=66
+menu_Head_Text_red=87
 menu_Head_alpha=0
 menu_Head_blue=35
 menu_Head_gradient=1
@@ -65,3 +74,23 @@ menu_Head_red=0
 menu_Hint_gradient=2
 menu_Hint_gradient_direction=1
 menu_Separator_gradient_enable=1
+menu_SubHead_gradient=4
+menu_SubHead_gradient_direction=1
+progressbar_active_blue=88
+progressbar_active_green=60
+progressbar_active_red=60
+progressbar_design=-1
+progressbar_design_channellist=-1
+progressbar_gradient=1
+progressbar_passive_blue=74
+progressbar_passive_green=24
+progressbar_passive_red=0
+progressbar_timescale_green=100
+progressbar_timescale_invert=0
+progressbar_timescale_red=0
+progressbar_timescale_yellow=70
+rounded_corners=0
+shadow_alpha=0
+shadow_blue=8
+shadow_green=8
+shadow_red=8
--- a/data/themes/Olive-3.0.theme
+++ b/data/themes/Olive-3.0.theme
@@ -3,11 +3,12 @@ clock_Digit_blue=100
 clock_Digit_green=100
 clock_Digit_red=100
 colored_events_alpha=0
-colored_events_blue=0
+colored_events_blue=2
 colored_events_channellist=2
-colored_events_green=84
+colored_events_green=46
 colored_events_infobar=2
-colored_events_red=63
+colored_events_red=27
+message_frame_enable=1
 infobar_Text_alpha=0
 infobar_Text_blue=18
 infobar_Text_green=20
@@ -18,6 +19,8 @@ infobar_casystem_alpha=8
 infobar_casystem_blue=0
 infobar_casystem_green=0
 infobar_casystem_red=0
+infobar_gradient_body=0
+infobar_gradient_body_direction=1
 infobar_gradient_bottom=3
 infobar_gradient_bottom_direction=1
 infobar_gradient_top=4
@@ -50,6 +53,14 @@ menu_Content_inactive_blue=0
 menu_Content_inactive_green=0
 menu_Content_inactive_red=0
 menu_Content_red=0
+menu_Foot_Text_alpha=0
+menu_Foot_Text_blue=10
+menu_Foot_Text_green=12
+menu_Foot_Text_red=12
+menu_Foot_alpha=0
+menu_Foot_blue=47
+menu_Foot_green=44
+menu_Foot_red=42
 menu_Head_Text_alpha=0
 menu_Head_Text_blue=0
 menu_Head_Text_green=82
@@ -63,3 +74,23 @@ menu_Head_red=66
 menu_Hint_gradient=3
 menu_Hint_gradient_direction=0
 menu_Separator_gradient_enable=1
+menu_SubHead_gradient=3
+menu_SubHead_gradient_direction=1
+progressbar_active_blue=0
+progressbar_active_green=88
+progressbar_active_red=36
+progressbar_design=-1
+progressbar_design_channellist=-1
+progressbar_gradient=1
+progressbar_passive_blue=34
+progressbar_passive_green=42
+progressbar_passive_red=34
+progressbar_timescale_green=100
+progressbar_timescale_invert=0
+progressbar_timescale_red=0
+progressbar_timescale_yellow=70
+rounded_corners=0
+shadow_alpha=0
+shadow_blue=8
+shadow_green=8
+shadow_red=8
--- a/data/themes/Origin.theme
+++ b/data/themes/Origin.theme
@@ -0,0 +1,93 @@
+clock_Digit_alpha=0
+clock_Digit_blue=100
+clock_Digit_green=100
+clock_Digit_red=100
+colored_events_alpha=0
+colored_events_blue=0
+colored_events_channellist=0
+colored_events_green=70
+colored_events_infobar=0
+colored_events_red=95
+infobar_Text_alpha=0
+infobar_Text_blue=100
+infobar_Text_green=100
+infobar_Text_red=100
+infobar_alpha=20
+infobar_blue=35
+infobar_casystem_alpha=8
+infobar_casystem_blue=0
+infobar_casystem_green=0
+infobar_casystem_red=0
+infobar_gradient_body=0
+infobar_gradient_body_direction=1
+infobar_gradient_bottom=0
+infobar_gradient_bottom_direction=1
+infobar_gradient_top=0
+infobar_gradient_top_direction=1
+infobar_green=14
+infobar_red=0
+menu_ButtonBar_gradient=0
+menu_ButtonBar_gradient_direction=1
+menu_Content_Selected_Text_alpha=0
+menu_Content_Selected_Text_blue=0
+menu_Content_Selected_Text_green=0
+menu_Content_Selected_Text_red=0
+menu_Content_Selected_alpha=20
+menu_Content_Selected_blue=100
+menu_Content_Selected_green=55
+menu_Content_Selected_red=25
+menu_Content_Text_alpha=0
+menu_Content_Text_blue=100
+menu_Content_Text_green=100
+menu_Content_Text_red=100
+menu_Content_alpha=20
+menu_Content_blue=35
+menu_Content_green=15
+menu_Content_inactive_Text_alpha=0
+menu_Content_inactive_Text_blue=85
+menu_Content_inactive_Text_green=70
+menu_Content_inactive_Text_red=55
+menu_Content_inactive_alpha=20
+menu_Content_inactive_blue=35
+menu_Content_inactive_green=15
+menu_Content_inactive_red=0
+menu_Content_red=0
+menu_Foot_Text_alpha=0
+menu_Foot_Text_blue=60
+menu_Foot_Text_green=60
+menu_Foot_Text_red=60
+menu_Foot_alpha=20
+menu_Foot_blue=28
+menu_Foot_green=19
+menu_Foot_red=14
+menu_Head_Text_alpha=0
+menu_Head_Text_blue=0
+menu_Head_Text_green=70
+menu_Head_Text_red=95
+menu_Head_alpha=0
+menu_Head_blue=25
+menu_Head_gradient=0
+menu_Head_gradient_direction=1
+menu_Head_green=10
+menu_Head_red=0
+menu_Hint_gradient=0
+menu_Hint_gradient_direction=1
+menu_Separator_gradient_enable=0
+progressbar_active_blue=98
+progressbar_active_green=98
+progressbar_active_red=98
+progressbar_design=3
+progressbar_design_channellist=3
+progressbar_gradient=1
+progressbar_passive_blue=60
+progressbar_passive_green=60
+progressbar_passive_red=60
+progressbar_timescale_green=100
+progressbar_timescale_invert=0
+progressbar_timescale_red=0
+progressbar_timescale_yellow=70
+rounded_corners=1
+shadow_alpha=0
+shadow_blue=8
+shadow_green=8
+shadow_red=8
--- a/data/y-web/Makefile.am
+++ b/data/y-web/Makefile.am
@@ -107,6 +107,8 @@ install-data-hook:
 		sed -i \
 			-e 's|%(CONFIGDIR)|$(CONFIGDIR)|g' \
 			-e 's|%(DATADIR)|$(DATADIR)|g' \
+			-e 's|%(CONTROLDIR)|$(CONTROLDIR)|g' \
+			-e 's|%(CONTROLDIR_VAR)|$(CONTROLDIR_VAR)|g' \
 			-e 's|%(FONTDIR)|$(FONTDIR)|g' \
 			-e 's|%(FONTDIR_VAR)|$(FONTDIR_VAR)|g' \
 			-e 's|%(LIBDIR)|$(LIBDIR)|g' \
@@ -122,6 +124,8 @@ install-data-hook:
 			-e 's|%(WEBRADIODIR_VAR)|$(WEBRADIODIR_VAR)|g' \
 			-e 's|%(LOGODIR)|$(LOGODIR)|g' \
 			-e 's|%(LOGODIR_VAR)|$(LOGODIR_VAR)|g' \
+			-e 's|%(LCD4L_ICONSDIR)|$(LCD4L_ICONSDIR)|g' \
+			-e 's|%(LCD4L_ICONSDIR_VAR)|$(LCD4L_ICONSDIR_VAR)|g' \
 			-e 's|%(PRIVATE_HTTPDDIR)|$(PRIVATE_HTTPDDIR)|g' \
 			-e 's|%(PUBLIC_HTTPDDIR)|$(PUBLIC_HTTPDDIR)|g' \
 			-e 's|%(HOSTED_HTTPDDIR)|$(HOSTED_HTTPDDIR)|g' \
--- a/data/y-web/Y_Blocks.txt
+++ b/data/y-web/Y_Blocks.txt
@@ -29,6 +29,7 @@ start-block~yWeb_save_settings
 {=ini-set:%(CONFIGDIR)/Y-Web.conf;wol_desc_2;{=wol_desc_2=}~cache=}
 {=ini-set:%(CONFIGDIR)/Y-Web.conf;wol_desc_3;{=wol_desc_3=}~cache=}
 {=ini-set:%(CONFIGDIR)/Y-Web.conf;fb;{=fb=}~cache=}
+{=ini-set:%(CONFIGDIR)/Y-Web.conf;screenshot_rc;{=screenshot_rc=}~cache=}
 {=ini-set:%(CONFIGDIR)/Y-Web.conf;start_page;{=start_page=}~cache=}
 {=ini-set:%(CONFIGDIR)/Y-Web.conf;style;{=style=}~cache=}
 {=ini-set:%(CONFIGDIR)/Y-Web.conf;yweb_box_name;{=yweb_box_name=}~cache=}
@@ -250,9 +251,7 @@ end-block~snip_show_wait
 # ------- Wiki Help display
 #<img src="/images/help.gif" align="bottom" />
 start-block~wiki_help
-<!--
-<a href="http://www.yjogol.com/{=var-get:help_url=}" target="_blank" title="get help from www.yjogol.com">?</a>
-->
+<a href="https://wiki.tuxbox-neutrino.org/wiki/{=var-get:help_url=}" target="_blank" title="get help from https://wiki.tuxbox-neutrino.org">?</a>
 end-block~wiki_help

 # ------- work menu
@@ -356,7 +355,7 @@ function do_submit()
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-StartWizard=}{=var-set:menu={=L:start.head=}Start Wizard=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:help_url=NeutrinoHD:Inbetriebnahme#Inbetriebnahme=}{=var-set:menu={=L:start.head=}Start Wizard=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" class="y_form" action="/y/cgi">
 		<table border="0" width="100%">
@@ -372,6 +371,8 @@ function do_submit()
 				<td>	<select name="start_page" title="{=L:set.yweb.start_page=}">
 					<option value="bouquets" selected="selected">{=L:bc.menue.bouquets=}</option>
 					<option value="control">{=L:bc.menue.control=}</option>
+					<option value="remote">{=L:bc.menue.remote=}</option>
+					<option value="screenshot">{=L:bc.menue.screenshot=}</option>
 					<option value="none">{=L:empty=}</option>
 				</td>
 			</tr>
@@ -438,12 +439,22 @@ end-block~frame_secondary
 # ------- Lay-Frame Boxcontrol-Menu
 start-block~frame_boxcontrol
 {=var-set:sec_menu=Y_Boxcontrol_Menue.yhtm=}
-{=var-set:startpage={=ini-get:%(CONFIGDIR)/Y-Web.conf;start_page;bouquets=}=}
+{=var-set:startpage={=ini-get:%(CONFIGDIR)/Y-Web.conf;start_page;none=}=}
 {=var-set:work=
 	{=if-equal:{=var-get:startpage=}~bouquets~Y_Boxcontrol_Bouquets.yhtm
 	~
-		{=if-equal:{=var-get:startpage=}~control~Y_Tools_Boxcontrol.yhtm~Y_blank.htm=}
-	=}=}
+		{=if-equal:{=var-get:startpage=}~control~Y_Tools_Boxcontrol.yhtm
+		~
+			{=if-equal:{=var-get:startpage=}~remote~Y_Tools_Rcsim.yhtm
+			~
+				{=if-equal:{=var-get:startpage=}~screenshot~Y_Tools_Screenshot.yhtm?osd=1
+				~
+					Y_blank.yhtm
+				=}
+			=}
+		=}
+	=}
+=}
 {=include-block:Y_Blocks.txt;frame_secondary=}
 end-block~frame_boxcontrol

@@ -524,11 +535,18 @@ start-block~remote
 		{=if-equal:{=var-get:boxtype=}~CST Trinity Duo~	{=include-block:Y_Blocks.txt;rc_cst_v6=}~
 		{=if-equal:{=var-get:boxtype=}~AX-Technologies HD51~{=include-block:Y_Blocks.txt;rc_ax_hd51=}~
 		{=if-equal:{=var-get:boxtype=}~Mutant HD51~	{=include-block:Y_Blocks.txt;rc_mutant_hd51=}~
-		{=if-equal:{=var-get:boxtype=}~WWIO BRE2ZE4K~ {=include-block:Y_Blocks.txt;rc_wwio_bre2ze4k=}~
-		{=if-equal:{=var-get:boxtype=}~VU+ SOLO4K~	{=include-block:Y_Blocks.txt;rc_vu_solo4k=}~
+		{=if-equal:{=var-get:boxtype=}~WWIO BRE2ZE 4K~	{=include-block:Y_Blocks.txt;rc_wwio_bre2ze4k=}~
+		{=if-equal:{=var-get:boxtype=}~VU+ SOLO4K~	{=include-block:Y_Blocks.txt;rc_vuplus=}~
+		{=if-equal:{=var-get:boxtype=}~VU+ DUO4K~	{=include-block:Y_Blocks.txt;rc_vuplus=}~
+		{=if-equal:{=var-get:boxtype=}~VU+ ULTIMO4K~	{=include-block:Y_Blocks.txt;rc_vuplus=}~
+		{=if-equal:{=var-get:boxtype=}~VU+ UNO4K~	{=include-block:Y_Blocks.txt;rc_vuplus=}~
+		{=if-equal:{=var-get:boxtype=}~VU+ UNO4KSE~	{=include-block:Y_Blocks.txt;rc_vuplus=}~
+		{=if-equal:{=var-get:boxtype=}~VU+ ZERO4K~	{=include-block:Y_Blocks.txt;rc_vuplus=}~
+		{=if-equal:{=var-get:boxtype=}~VU+ DUO~		{=include-block:Y_Blocks.txt;rc_vuplus=}~
+		{=if-equal:{=var-get:boxtype=}~ZGEMMA H7~	{=include-block:Y_Blocks.txt;rc_zgemma_h7=}~

 		{=comment:fallback~=}				{=include-block:Y_Blocks.txt;rc_cst_v1=}
-		=}=}=}=}=}=}=}=}=}=}=}=}
+		=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
 	=}=}
 ~
 	{=if-equal:{=var-get:yfbtype=}~-2~	{=include-block:Y_Blocks.txt;rc_dbox_philips=}~
@@ -544,10 +562,17 @@ start-block~remote
 	{=if-equal:{=var-get:yfbtype=}~9~	{=include-block:Y_Blocks.txt;rc_ax_hd51=}~
 	{=if-equal:{=var-get:yfbtype=}~10~	{=include-block:Y_Blocks.txt;rc_mutant_hd51=}~
 	{=if-equal:{=var-get:yfbtype=}~11~	{=include-block:Y_Blocks.txt;rc_wwio_bre2ze4k=}~
-	{=if-equal:{=var-get:yfbtype=}~12~	{=include-block:Y_Blocks.txt;rc_vu_solo4k=}~
+	{=if-equal:{=var-get:yfbtype=}~12~	{=include-block:Y_Blocks.txt;rc_vuplus=}~
+	{=if-equal:{=var-get:yfbtype=}~13~	{=include-block:Y_Blocks.txt;rc_vuplus=}~
+	{=if-equal:{=var-get:yfbtype=}~14~	{=include-block:Y_Blocks.txt;rc_vuplus=}~
+	{=if-equal:{=var-get:yfbtype=}~15~	{=include-block:Y_Blocks.txt;rc_vuplus=}~
+	{=if-equal:{=var-get:yfbtype=}~16~	{=include-block:Y_Blocks.txt;rc_vuplus=}~
+	{=if-equal:{=var-get:yfbtype=}~17~	{=include-block:Y_Blocks.txt;rc_vuplus=}~
+	{=if-equal:{=var-get:yfbtype=}~18~	{=include-block:Y_Blocks.txt;rc_vuplus=}~
+	{=if-equal:{=var-get:yfbtype=}~19~	{=include-block:Y_Blocks.txt;rc_zgemma_h7=}~

 	{=comment:fallback~=}			{=include-block:Y_Blocks.txt;rc_cst_v1=}
-	=}=}=}=}=}=}=}=}=}=}=}=}=}=}
+	=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
 =}
 end-block~remote

@@ -726,7 +751,7 @@ start-block~map_rc_cst_v3_v4
  <area shape="circle" href="javascript:rcsim('KEY_BLUE')" coords="129,447,11" alt="blue" title="{=L:rc.key_blue=}" />

  <area shape="circle" href="javascript:rcsim('KEY_WWW')" coords="39,487,9" alt="w" title="{=L:rc.key_www=}" />
-  <!-- area shape="circle" coords="68,487,9" alt="sub" / -->
+  <area shape="circle" href="javascript:rcsim('KEY_SUBTITLES')" coords="68,487,9" alt="sub" title="{=L:rc.key_sub=}" />
  <area shape="circle" coords="96,487,9" alt="recall" href="javascript:rcsim('KEY_LAST')" title="{=L:rc.key_recall=}" />
  <area shape="circle" coords="125,487,9" alt="pos" href="javascript:rcsim('KEY_MOVE')" title="{=L:rc.key_pos=}" />

@@ -779,7 +804,7 @@ start-block~rc_cst_v5
  <area shape="rect" href="javascript:rcsim('KEY_INFO')" coords="124,216,166,244" alt="info" title="{=L:rc.key_info=}" />
  <area shape="rect" href="javascript:rcsim('KEY_HOME')" coords="124,280,166,308" alt="exit" title="{=L:rc.key_home=}" />

-  <!-- area shape="rect" coords="24,321,66,349" alt="sub" / -->
+  <area shape="rect" href="javascript:rcsim('KEY_SUBTITLES')" coords="24,321,66,349" alt="sub" title="{=L:rc.key_sub=}" />
  <area shape="rect" href="javascript:rcsim('KEY_PREVIOUS')" coords="76,321,118,349" alt="picmode" title="{=L:rc.key_picmode=}" />
  <area shape="rect" href="javascript:rcsim('KEY_FAVORITES')" coords="128,321,170,349" alt="fav" title="{=L:rc.key_favorites=}" />

@@ -831,7 +856,7 @@ start-block~rc_cst_v6
  <area shape="circle" coords="73,204,14" alt="t/s" href="javascript:rcsim('KEY_TIME')" title="{=L:rc.key_time=}" />
  <area shape="circle" coords="114,171,14" alt="audio" href="javascript:rcsim('KEY_AUDIO')" title="{=L:rc.key_audio=}" />
  <area shape="circle" coords="114,204,14" alt="text" href="javascript:rcsim('KEY_TEXT')" title="{=L:rc.key_text=}" />
-  <!-- area shape="circle" coords="34,183,14" alt="sub" / -->
+  <area shape="circle"  coords="34,183,14" alt="sub" href="javascript:rcsim('KEY_SUBTITLES')" title="{=L:rc.key_sub=}" />
  <area shape="circle" coords="34,217,14" alt="trsp" href="javascript:rcsim('KEY_GAMES')" title="{=L:rc.key_trsp=}" />
  <area shape="circle" coords="154,183,14" alt="help" href="javascript:rcsim('KEY_HELP')" title="{=L:rc.key_help=}" />
  <area shape="circle" coords="154,217,14" alt="recall" href="javascript:rcsim('KEY_LAST')" title="{=L:rc.key_recall=}" />
@@ -955,7 +980,7 @@ start-block~rc_ax_hd51
 <area shape="rect" coords="88,80,114,98" href="javascript:rcsim('KEY_RADIO')" />
 <area shape="rect" coords="122,81,146,98" href="javascript:rcsim('KEY_HELP')" />
 <area shape="rect" coords="21,109,54,132" href="javascript:rcsim('KEY_AUDIO')" />
-<!-- area shape="rect" coords="69,109,101,130" alt="subtitle" / -->
+<area shape="rect" coords="69,109,101,130" href="javascript:rcsim('KEY_SUBTITLE')" />
 <area shape="rect" coords="115,111,146,130" href="javascript:rcsim('KEY_TEXT')" />
 <area shape="rect" coords="23,142,55,163" href="javascript:rcsim('KEY_1')" />
 <area shape="rect" coords="68,141,101,163" href="javascript:rcsim('KEY_2')" />
@@ -1011,7 +1036,7 @@ start-block~rc_mutant_hd51
 <area shape="rect" coords="87,63,114,80" href="javascript:rcsim('KEY_RADIO')" />
 <area shape="rect" coords="121,63,148,80" href="javascript:rcsim('KEY_HELP')" />
 <area shape="rect" coords="20,90,55,111" href="javascript:rcsim('KEY_AUDIO')" />
-<!-- area shape="rect" coords="65,90,102,111" alt="subtitle" / -->
+<area shape="rect" coords="65,90,102,111" href="javascript:rcsim('KEY_SUBTITLE')" />
 <area shape="rect" coords="111,90,148,111" href="javascript:rcsim('KEY_TEXT')" />
 <area shape="rect" coords="20,121,55,144" href="javascript:rcsim('KEY_1')" />
 <area shape="rect" coords="65,121,102,144" href="javascript:rcsim('KEY_2')" />
@@ -1118,55 +1143,112 @@ start-block~rc_wwio_bre2ze4k
 </map>
 end-block~rc_wwio_bre2ze4k

-# ------ Remote VU+ Solo 4K
-start-block~rc_vu_solo4k
-<img src="images/rc_vu_solo4k.png" usemap="#rc"/>
+# ------ Remote VU+ Solo 4K/Duo 4K/Ultimo 4K/Zero 4K/Uno 4K SE
+start-block~rc_vuplus
+<img src="images/rc_vuplus.png" usemap="#rc"/>
 <map name="rc" id="rc">
-<!--<area shape="circle" coords="33,28,10" id="113" alt="v1_mute" href="javascript:rcsim('KEY_POWER_TV');">-->
-<area shape="circle" coords="105,28,10" id ="116" alt="Power" href="javascript:rcsim('KEY_POWER');">
-<area shape="circle" coords="33,53,10" id ="388" alt="text" href="javascript:rcsim('KEY_TEXT');">
-<area shape="circle" coords="58,53,10" id ="370" alt="subtitle" href="javascript:rcsim('KEY_SUB');">
-<!--<area shape="circle" coords="82,53,10" id ="102" alt="v1_home" href="javascript:rcsim('KEY_HOME');">-->
-<!--<area shape="circle" coords="105,53,10" id ="107" alt="v1_end" href="javascript:rcsim('107');">-->
-<area shape="circle" coords="105,53,10" id ="107" alt="mute" href="javascript:rcsim('KEY_MUTE');">
-<area shape="circle" coords="38,79,10" id ="2" alt="1" href="javascript:rcsim('KEY_1');">
-<area shape="circle" coords="70,79,10" id ="3" alt="2" href="javascript:rcsim('KEY_2');">
-<area shape="circle" coords="102,79,10" id ="4" alt="3" href="javascript:rcsim('KEY_3');">
-<area shape="circle" coords="38,106,10" id ="5" alt="4" href="javascript:rcsim('KEY_4');">
-<area shape="circle" coords="70,106,10" id ="6" alt="5" href="javascript:rcsim('KEY_5');">
-<area shape="circle" coords="102,106,10" id ="7" alt="6" href="javascript:rcsim('KEY_6');">
-<area shape="circle" coords="38,133,10" id ="8" alt="7" href="javascript:rcsim('KEY_7');">
-<area shape="circle" coords="70,133,10" id ="9" alt="8" href="javascript:rcsim('KEY_8');">
-<area shape="circle" coords="102,133,10" id ="10" alt="9" href="javascript:rcsim('9');">
-<area shape="circle" coords="38,161,10" id ="412" alt="previous" href="javascript:rcsim('KEY_PREVIOUS');">
-<area shape="circle" coords="70,161,10" id ="11" alt="0" href="javascript:rcsim('KEY_0');">
-<area shape="circle" coords="102,161,10" id ="407" alt="next" href="javascript:rcsim('KEY_NEXT');">
-<area shape="circle" coords="33,186,10" id ="398" alt="red" href="javascript:rcsim('KEY_RED');">
-<area shape="circle" coords="58,186,10" id ="399" alt="green" href="javascript:rcsim('KEY_GREEN');">
-<area shape="circle" coords="82,186,10" id ="400" alt="yellow" href="javascript:rcsim('KEY_YELLOW');">
-<area shape="circle" coords="105,186,10" id ="401" alt="blue" href="javascript:rcsim('KEY_BLUE');">
-<area shape="circle" coords="70,220,10" id ="103" alt="up" href="javascript:rcsim('KEY_UP');">
-<area shape="circle" coords="35,255,10" id ="105" alt="left" href="javascript:rcsim('KEY_LEFT');">
-<area shape="circle" coords="70,255,10" id ="352" alt="OK" href="javascript:rcsim('KEY_OK');">
-<area shape="circle" coords="105,255,10" id ="106" alt="right" href="javascript:rcsim('KEY_RIGHT');">
-<area shape="circle" coords="70,288,10" id ="108" alt="down" href="javascript:rcsim('KEY_DOWN');">
-<area shape="circle" coords="40,316,10" id ="115" alt="volume up" href="javascript:rcsim('KEY_VOLUMEUP');">
-<area shape="circle" coords="70,319,10" id ="174" alt="exit" href="javascript:rcsim('KEY_HOME');">
-<area shape="circle" coords="99,316,10" id ="402" alt="channelup" href="javascript:rcsim('KEY_PAGEUP');">
-<area shape="circle" coords="40,346,10" id ="114" alt="volume down" href="javascript:rcsim('KEY_VOLUMEDOWN');">
-<area shape="circle" coords="70,343,10" id ="358" alt="epg" href="javascript:rcsim('KEY_INFO');"><!-- KEY_INFO = KEY_EPG -->
-<area shape="circle" coords="99,346,10" id ="403" alt="channeldown" href="javascript:rcsim('KEY_PAGEDOWN');">
-<area shape="circle" coords="36,375,10" id ="139" alt="menu" href="javascript:rcsim('KEY_MENU');">
-<area shape="circle" coords="59,375,10" id ="393" alt="videoaltlast" href="javascript:rcsim('KEY_FAVORITES');">
-<area shape="circle" coords="81,375,10" id ="392" alt="audio" href="javascript:rcsim('KEY_AUDIO');">
-<area shape="circle" coords="104,375,10" id ="138" alt="help" href="javascript:rcsim('KEY_HELP');">
-<area shape="circle" coords="36,397,10" id ="168" alt="rewind" href="javascript:rcsim('KEY_REWIND');">
-<area shape="circle" coords="59,397,10" id ="207" alt="play" href="javascript:rcsim('KEY_PLAY');">
-<area shape="circle" coords="81,397,10" id ="119" alt="pause" href="javascript:rcsim('KEY_PAUSE');">
-<area shape="circle" coords="104,397,10" id ="208" alt="forward" href="javascript:rcsim('KEY_FORWARD');">
-<area shape="circle" coords="36,422,10" id ="377" alt="tv" href="javascript:rcsim('KEY_TV');">
-<area shape="circle" coords="59,422,10" id ="167" alt="record" href="javascript:rcsim('KEY_RECORD');">
-<area shape="circle" coords="81,422,10" id ="128" alt="stop" href="javascript:rcsim('KEY_STOP');">
-<area shape="circle" coords="104,422,10" id ="385" alt="radio" href="javascript:rcsim('KEY_RADIO');">
+<!-- <area shape="circle" coords="33,28,10" id="113" alt="v1_mute" href="javascript:rcsim('KEY_POWER_TV')" /> -->
+<area shape="circle" coords="142,28,10" id ="116" alt="Power" href="javascript:rcsim('KEY_POWER')" />
+<area shape="circle" coords="32,74,10" id ="388" alt="text" href="javascript:rcsim('KEY_TEXT')" />
+<area shape="circle" coords="70,74,10" id ="370" alt="subtitle" href="javascript:rcsim('KEY_SUB')" />
+<!-- <area shape="circle" coords="106,74,10" id ="102" alt="v1_home" href="javascript:rcsim('KEY_HOME')" /> -->
+<!-- <area shape="circle" coords="142,74,10" id ="107" alt="v1_end" href="javascript:rcsim('107')" /> -->
+<area shape="circle" coords="142,74,10" id ="107" alt="mute" href="javascript:rcsim('KEY_MUTE')" />
+<area shape="circle" coords="40,114,16" id ="2" alt="1" href="javascript:rcsim('KEY_1')" />
+<area shape="circle" coords="88,114,16" id ="3" alt="2" href="javascript:rcsim('KEY_2')" />
+<area shape="circle" coords="138,114,16" id ="4" alt="3" href="javascript:rcsim('KEY_3')" />
+<area shape="circle" coords="40,156,16" id ="5" alt="4" href="javascript:rcsim('KEY_4')" />
+<area shape="circle" coords="88,156,16" id ="6" alt="5" href="javascript:rcsim('KEY_5')" />
+<area shape="circle" coords="138,156,16" id ="7" alt="6" href="javascript:rcsim('KEY_6')" />
+<area shape="circle" coords="40,200,16" id ="8" alt="7" href="javascript:rcsim('KEY_7')" />
+<area shape="circle" coords="88,200,16" id ="9" alt="8" href="javascript:rcsim('KEY_8')" />
+<area shape="circle" coords="138,200,16" id ="10" alt="9" href="javascript:rcsim('KEY_9')" />
+<area shape="circle" coords="40,242,16" id ="412" alt="previous" href="javascript:rcsim('KEY_PREVIOUS')" />
+<area shape="circle" coords="88,242,16" id ="11" alt="0" href="javascript:rcsim('KEY_0')" />
+<area shape="circle" coords="138,242,16" id ="407" alt="next" href="javascript:rcsim('KEY_NEXT')" />
+<area shape="circle" coords="34,280,10" id ="398" alt="red" href="javascript:rcsim('KEY_RED')" />
+<area shape="circle" coords="70,280,10" id ="399" alt="green" href="javascript:rcsim('KEY_GREEN')" />
+<area shape="circle" coords="106,280,10" id ="400" alt="yellow" href="javascript:rcsim('KEY_YELLOW')" />
+<area shape="circle" coords="142,280,10" id ="401" alt="blue" href="javascript:rcsim('KEY_BLUE')" />
+<area shape="circle" coords="88,334,10" id ="103" alt="up" href="javascript:rcsim('KEY_UP')" />
+<area shape="circle" coords="44,380,10" id ="105" alt="left" href="javascript:rcsim('KEY_LEFT')" />
+<area shape="circle" coords="88,380,19" id ="352" alt="OK" href="javascript:rcsim('KEY_OK')" />
+<area shape="circle" coords="132,380,10" id ="106" alt="right" href="javascript:rcsim('KEY_RIGHT')" />
+<area shape="circle" coords="88,428,10" id ="108" alt="down" href="javascript:rcsim('KEY_DOWN')" />
+<area shape="circle" coords="44,466,19" id ="115" alt="volume up" href="javascript:rcsim('KEY_VOLUMEUP')" />
+<area shape="circle" coords="88,472,10" id ="174" alt="exit" href="javascript:rcsim('KEY_HOME')" />
+<area shape="circle" coords="130,466,19" id ="402" alt="channelup" href="javascript:rcsim('KEY_PAGEUP')" />
+<area shape="circle" coords="44,516,15" id ="114" alt="volume down" href="javascript:rcsim('KEY_VOLUMEDOWN')" />
+<area shape="circle" coords="88,508,10" id ="358" alt="epg" href="javascript:rcsim('KEY_INFO')" /> <!-- KEY_INFO = KEY_EPG -->
+<area shape="circle" coords="130,516,15" id ="403" alt="channeldown" href="javascript:rcsim('KEY_PAGEDOWN')" />
+<area shape="circle" coords="38,550,10" id ="139" alt="menu" href="javascript:rcsim('KEY_MENU')" />
+<area shape="circle" coords="70,550,10" id ="393" alt="videoaltlast" href="javascript:rcsim('KEY_FAVORITES')" />
+<area shape="circle" coords="104,550,10" id ="392" alt="audio" href="javascript:rcsim('KEY_AUDIO')" />
+<area shape="circle" coords="136,550,10" id ="138" alt="help" href="javascript:rcsim('KEY_HELP')" />
+<area shape="circle" coords="38,585,10" id ="168" alt="rewind" href="javascript:rcsim('KEY_REWIND')" />
+<area shape="circle" coords="70,585,10" id ="207" alt="play" href="javascript:rcsim('KEY_PLAY')" />
+<area shape="circle" coords="104,585,10" id ="119" alt="pause" href="javascript:rcsim('KEY_PLAYPAUSE')" />
+<area shape="circle" coords="136,585,10" id ="208" alt="forward" href="javascript:rcsim('KEY_FORWARD')" />
+<area shape="circle" coords="38,616,10" id ="377" alt="tv" href="javascript:rcsim('KEY_TV')" />
+<area shape="circle" coords="70,616,10" id ="167" alt="record" href="javascript:rcsim('KEY_RECORD')" />
+<area shape="circle" coords="104,616,10" id ="128" alt="stop" href="javascript:rcsim('KEY_STOP')" />
+<area shape="circle" coords="136,616,10" id ="385" alt="radio" href="javascript:rcsim('KEY_RADIO')" />
 </map>
-end-block~rc_vu_solo4k
+end-block~rc_vuplus
+
+# ------ Remote Air Digital Zgemma H7
+start-block~rc_zgemma_h7
+<img src="images/rc_zgemma_h7.png" usemap="#rc"/>
+<map name="rc" id="rc">
+<area shape="rect" coords="58,46,25,23" alt="KEY_POWER" href="javascript:rcsim('KEY_POWER')" />
+<area shape="rect" coords="134,22,171,46" alt="KEY_MUTE" href="javascript:rcsim('KEY_MUTE')" />
+<area shape="rect" coords="24,60,66,86" alt="KEY_1" href="javascript:rcsim('KEY_1')" />
+<area shape="rect" coords="75,60,117,86" alt="KEY_2" href="javascript:rcsim('KEY_2')" />
+<area shape="rect" coords="128,60,170,86" alt="KEY_3" href="javascript:rcsim('KEY_3')" />
+<area shape="rect" coords="25,92,67,118" alt="KEY_4" href="javascript:rcsim('KEY_4')" />
+<area shape="rect" coords="77,92,119,118" alt="KEY_5" href="javascript:rcsim('KEY_5')" />
+<area shape="rect" coords="130,92,172,118" alt="KEY_6" href="javascript:rcsim('KEY_6')" />
+<area shape="rect" coords="24,124,66,150" alt="KEY_7" href="javascript:rcsim('KEY_7')" />
+<area shape="rect" coords="78,125,118,150" alt="KEY_8" href="javascript:rcsim('KEY_8')" />
+<area shape="rect" coords="129,124,171,150" alt="KEY_9" href="javascript:rcsim('KEY_9')" />
+<area shape="rect" coords="77,156,119,182" alt="KEY_0" href="javascript:rcsim('KEY_0')" />
+<area shape="rect" coords="24,156,66,182" alt="KEY_PREVIOUS" href="javascript:rcsim('KEY_PREVIOUS')" />
+<area shape="rect" coords="130,156,172,182" alt="KEY_NEXT" href="javascript:rcsim('KEY_NEXT')" />
+<area shape="rect" coords="141,318,196,345" alt="KEY_EPG" href="javascript:rcsim('KEY_EPG')" />
+<area shape="rect" coords="141,192,169,219" alt="KEY_INFO" href="javascript:rcsim('KEY_INFO')" />
+<!--<area shape="rect" coords="27,191,55,218" alt="KEY_BACK" href="javascript:rcsim('KEY_BACK')" />-->
+<area shape="rect" coords="67,394,28,355" alt="KEY_VOLUMEUP" href="javascript:rcsim('KEY_VOLUMEUP')" />
+<area shape="rect" coords="67,439,28,400" alt="KEY_VOLUMEDOWN" href="javascript:rcsim('KEY_VOLUMEDOWN')" />
+<area shape="rect" coords="119,439,77,415" alt="KEY_PORTAL" href="javascript:rcsim('KEY_BOOKMARKS')" />
+<area shape="rect" coords="169,394,130,355" alt="KEY_PAGEUP" href="javascript:rcsim('KEY_PAGEUP)" />
+<area shape="recr" coords="169,439,130,400" alt="KEY_PAGEDOWN" href="javascript:rcsim('KEY_PAGEDOWN')" />
+<area shape="rect" coords="78,356,119,377" alt="KEY_MENU" href="javascript:rcsim('KEY_MENU')" />
+<area shape="rect" coords="27,317,55,344" alt="KEY_HOME" href="javascript:rcsim('KEY_HOME')" />
+<area shape="rect" coords="81,214,114,243" alt="KEY_UP" href="javascript:rcsim('KEY_UP')" />
+<area shape="rect" coords="81,293,114,322" alt="KEY_DOWN" href="javascript:rcsim('KEY_DOWN')" />
+<area shape="rect" coords="41,252,73,284" alt="KEY_LEFT" href="javascript:rcsim('KEY_LEFT')" />
+<area shape="rect" coords="123,253,153,284" alt="KEY_RIGHT" href="javascript:rcsim('KEY_RIGHT')" />
+<area shape="circle" coords="118,285,52" alt="KEY_OK" href="javascript:rcsim('KEY_OK')" />
+<area shape="rect" coords="24,506,55,529" alt="KEY_RED" href="javascript:rcsim('KEY_RED')" />
+<area shape="rect" coords="62,506,93,529" alt="KEY_GREEN" href="javascript:rcsim('KEY_GREEN')" />
+<area shape="rect" coords="101,506,132,529" alt="KEY_YELLOW" href="javascript:rcsim('KEY_YELLOW')" />
+<area shape="rect" coords="140,506,171,529" alt="KEY_BLUE" href="javascript:rcsim('KEY_BLUE')" />
+<area shape="rect" coords="78,449,118,469" alt="KEY_AUDIO" href="javascript:rcsim('KEY_AUDIO')" />
+<area shape="rect" coords="130,449,170,469" alt="KEY_SUBTITLE" href="javascript:rcsim('KEY_SUBTITLE')" />
+<area shape="rect" coords="78,632,119,657" alt="KEY_FAVORITES" href="javascript:rcsim('KEY_FAVORITES')" />
+<area shape="rect" coords="79,477,119,497" alt="KEY_MEDIA" href="javascript:rcsim('KEY_MEDIA')" />
+<area shape="rect" coords="26,476,66,496" alt="KEY_TV" href="javascript:rcsim('KEY_TV')" />
+<area shape="rect" coords="130,476,170,496" alt="KEY_RADIO" href="javascript:rcsim('KEY_RADIO')" />
+<area shape="rect" coords="26,449,66,469" alt="KEY_TEXT" href="javascript:rcsim('KEY_TEXT')" />
+<area shape="rect" coords="128,632,169,657" alt="KEY_HELP" href="javascript:rcsim('KEY_HELP')" />
+<area shape="rect" coords="28,633,65,656" alt="KEY_MODE" href="javascript:rcsim('KEY_MODE')" />
+<area shape="rect" coords="26,600,67,625" alt="KEY_REWIND" href="javascript:rcsim('KEY_REWIND')" />
+<area shape="rect" coords="130,535,171,560" alt="KEY_PLAY" href="javascript:rcsim('KEY_PLAYPAUSE')" />
+<area shape="rect" coords="78,535,119,560" alt="KEY_STOP" href="javascript:rcsim('KEY_STOP')" />
+<area shape="rect" coords="77,601,118,626" alt="KEY_FORWARD" href="javascript:rcsim('KEY_FORWARD')" />
+<area shape="rect" coords="25,535,66,560" alt="KEY_RECORD" href="javascript:rcsim('KEY_RECORD')" />
+<area shape="rect" coords="129,568,170,593" alt="KEY_TIME" href="javascript:rcsim('KEY_TIME')" />
+<area shape="rect" coords="26,568,67,593" alt="KEY_PREVIOUSSONG" href="javascript:rcsim('KEY_PREVIOUSSONG')" />
+<area shape="rect" coords="77,568,118,593" alt="KEY_NEXTSONG" href="javascript:rcsim('KEY_NEXTSONG')" />
+</map>
+end-block~rc_zgemma_h7
--- a/data/y-web/Y_EPG_Plus.yhtm
+++ b/data/y-web/Y_EPG_Plus.yhtm
@@ -67,7 +67,7 @@ function epg_imdb(){
 </div>
 <script type="text/javascript">
 //<![CDATA[
-	epg_plus_init("{=ini-get:%(CONFIGDIR)/nhttpd.conf;Tuxbox.DisplayLogos=}");
+	epg_plus_init("{=ini-get:%(CONFIGDIR)/nhttpd.conf;Tuxbox.DisplayLogos;true=}");
 //]]>
 </script>

--- a/data/y-web/Y_Info_Help.yhtm
+++ b/data/y-web/Y_Info_Help.yhtm
@@ -7,9 +7,9 @@
 	{=var-set:help_url=Help-Info-Hilfe=}{=var-set:menu={=L:info.help=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<ul>
-		<li><a href="http://wiki.tuxbox.org/wiki/Neutrino-HD" class="exlink" title="User guide for Neutrino" target="_blank">Tuxbox-Wiki Neutrino Help</a></li>
-		<li><a href="http://wiki.tuxbox.org/wiki/Neutrino:yWeb" class="exlink" title="yWeb Help from Tuxbox Wiki" target="_blank">Tuxbox-Wiki yWeb Help</a></li>
-		<li><a href="http://forum.tuxbox.org/forum" class="exlink" title="Tuxbox Dicussion Forum" target="_blank">Tuxbox Forum</a></li>
+		<li><a href="https://wiki.tuxbox-neutrino.org/wiki/Tuxbox-Neutrino" class="exlink" title="User guide for Neutrino" target="_blank">Tuxbox-Wiki Neutrino Help</a></li>
+		<li><a href="https://wiki.tuxbox-neutrino.org/wiki/Neutrino:yWeb" class="exlink" title="yWeb Help from Tuxbox Wiki" target="_blank">Tuxbox-Wiki yWeb Help</a></li>
+		<li><a href="https://forum.tuxbox-neutrino.org/forum/" class="exlink" title="Tuxbox Dicussion Forum" target="_blank">Tuxbox Forum</a></li>
 		<li><a href="http://tuxbox-neutrino.org" class="exlink" title="Tuxbox-Neutrino developers" target="_blank">Sources</a></li>
 	</ul>
 	</div>
--- a/data/y-web/Y_Settings_yWeb.yhtm
+++ b/data/y-web/Y_Settings_yWeb.yhtm
@@ -44,6 +44,7 @@ function do_init(){
 		case "10":	// mutant hd51
 		case "11":	// wwio bre2ze4k
 		case "12":	// vu solo4k
+		case "13":	// zgemma h7
 			sel=(sel*1+val*1);
 			break;
 		default:
@@ -135,6 +136,7 @@ select {
 						<option value="10">Mutant | HD51</option>
 						<option value="11">WWIO | Bre2ze 4K</option>
 						<option value="12">VU+ | Solo 4K</option>
+						<option value="13">Zgemma | H7</option>
 					</select>
 				</td>
 			</tr>
--- a/data/y-web/Y_StreamInfo.yhtm
+++ b/data/y-web/Y_StreamInfo.yhtm
@@ -25,6 +25,11 @@
 <div class="y_head">{=L:epg.si.streaminfo=} ({=ServiceName=})</div>
 <div class="y_work_box">
 	<table cellspacing="2" cellpadding="3" class="tableborder" width="300px">
+		<tr>
+			<td class="set"><b>{=L:epg.si.url=}:</b></td>
+			<td>&nbsp;</td>
+			<td class="set"> <div align="left">{=Url=}</div></td>
+		</tr>
 		<tr> 
 			<td class="set"><b>{=L:epg.si.resolution=}:</b></td>
 			<td width="30">&nbsp;</td>
--- a/data/y-web/Y_Tools_Check_Install.yhtm
+++ b/data/y-web/Y_Tools_Check_Install.yhtm
@@ -40,7 +40,7 @@ function sLog_addRow(_body, state, action_text, state_text){
 }
 /*check*/
 function wiki_url(_page){
-	return "<a href=\"http://wiki.dbox2-tuning.net/"+_page+"\" target='_blank'><b>[Help]<\/b><\/a>"
+	return "<a href=\"https://wiki.tuxbox-neutrino.org/wiki/"+_page+"\" target='_blank'><b>[Help]<\/b><\/a>"
 }
 function do_check(){
 	sLog_init();
@@ -62,18 +62,18 @@ function do_check(){
 	=}
 	{=if-equal:{=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.port;80=}~80~~
 		sLog_addRow(sLog_body, "yellow",
-		"WebServer: not set to Standard-Port. Actual: {=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.port;80=} "+wiki_url("Neutrino:yWeb#Webserver"), "notice");
+		"WebServer: not set to Standard-Port. Actual: {=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.port;80=} "+wiki_url("Neutrino:yWeb:Settings#WebServer"), "notice");
 	=}
 	/*settings*/
 	{=if-empty:{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip=}~~
 		sLog_addRow(sLog_body, "yellow",
 		"Settings: Management IP(1) is set to {=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip=} ! Your IP is {=func:get_request_data client_addr=}. "
-		+wiki_url("Help-Settings-yWeb"), "notice");
+		+wiki_url("Neutrino:yWeb:Settings#yWeb"), "notice");
 	=}
 	{=if-empty:{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=}~~
 		sLog_addRow(sLog_body, "yellow",
 		"Settings: Management IP(2) is set to {=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=} ! Your IP is {=func:get_request_data client_addr=}. "
-		+wiki_url("Neutrino:yWeb#yWeb"), "notice");
+		+wiki_url("Neutrino:yWeb:Settings#yWeb"), "notice");
 	=}

 	/*programs*/
--- a/data/y-web/Y_Tools_Timer_Sync.js
+++ b/data/y-web/Y_Tools_Timer_Sync.js
@@ -1,6 +1,6 @@
 function wiki_url(_page)
 {
-	return "<a href=\"http://wiki.dbox2-tuning.net/"+_page+"\"' target=\"_blank\"><b>[Help]<\/b><\/a>";
+	return "<a href=\"https://wiki.tuxbox-neutrino.org/wiki/"+_page+"\"' target=\"_blank\"><b>[Help]<\/b><\/a>";
 }
 /*timer_list*/
 var timer_body;
@@ -173,21 +173,31 @@ function do_get_tvinfo()
 		if(_password != "")
 		{
 			var res = loadSyncURL(_url);
-			if(res.search(/Connecting/)!=-1)
+
+			if(res.search("Could not resolve host")!=-1) {
+				sLog_addRow(sLog_body, "red", "TVinfo: Could not resolve host", "error");
+				return;
+			}
+
+			if(res.search("error setting certificate")!=-1)
+				sLog_addRow(sLog_body, "red", "TVinfo: error setting certificate verify locations", "error");
+
+			if(res.search("SSL certificate verify ok")!=-1)
+				sLog_addRow(sLog_body, "green", "TVinfo: SSL certificate verify", "ok");
+			else
+				sLog_addRow(sLog_body, "red", "TVinfo: SSL certificate verify "+wiki_url("Neutrino:yWeb:Live_Timer#Timer_Sync"), "failed");
+
+			if(res.search("left intact")!=-1)
 			{
-				sLog_addRow(sLog_body, "green", "TVinfo: connecting "+res, "ok");
-				if(res.search(/empty/)!=-1)
-					sLog_addRow(sLog_body, "red", "TVinfo: Username and/or Password wrong. "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed");
-				else
-					sLog_addRow(sLog_body, "green", "TVinfo: Username / Password ok", "ok");
+				sLog_addRow(sLog_body, "green", "TVinfo: connecting ", "ok");
 			}
 			else
-				sLog_addRow(sLog_body, "red", "TVinfo: connecting. "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed");
+				sLog_addRow(sLog_body, "red", "TVinfo: connecting. "+wiki_url("Neutrino:yWeb:Live_Timer#Timer_Sync"), "failed");
 		}
 		else
-			sLog_addRow(sLog_body, "red", "TVinfo: no password given. "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed");
+			sLog_addRow(sLog_body, "red", "TVinfo: no password given. "+wiki_url("Neutrino:yWeb:Live_Timer#Timer_Sync"), "failed");
 	else
-		sLog_addRow(sLog_body, "red", "TVinfo: no username given. "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed");
+		sLog_addRow(sLog_body, "red", "TVinfo: no username given. "+wiki_url("Neutrino:yWeb:Live_Timer#Timer_Sync"), "failed");

 }
 function do_get_klack()
@@ -198,7 +208,7 @@ function do_get_klack()
 	if(res.search(/Connecting/)!=-1)
 		sLog_addRow(sLog_body, "green", "Klack: connecting: "+res, "ok");
 	else
-		sLog_addRow(sLog_body, "red", "Klack: connecting. "+wiki_url("Neutrino:yWeb#Timer_Sync"), "failed");
+		sLog_addRow(sLog_body, "red", "Klack: connecting. "+wiki_url("Neutrino:yWeb:Live_Timer#Timer_Sync"), "failed");
 }
 function do_clear_all()
 {
--- a/data/y-web/Y_Version.txt
+++ b/data/y-web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.9.0.40
-date=01.03.2017
+version=2.9.0.44
+date=27.10.2019
 type=Release
 info=Port Tuxbox-Neutrino
--- a/data/y-web/Y_neutrino_Blocks.txt
+++ b/data/y-web/Y_neutrino_Blocks.txt
@@ -84,20 +84,20 @@ start-block~neutrino_form-data_record
 			</tr>
 			<tr>
 				<td>{=L:set.rec.timeshift.auto_record=}</td>
-				<td><input type="text" name="auto_timeshift" size="5" value="{=ini-get:%(CONFIGDIR)/neutrino.conf;auto_timeshift~cache=}" /></td>
+				<td><input type="text" name="timeshift_auto" size="5" value="{=ini-get:%(CONFIGDIR)/neutrino.conf;timeshift_auto~cache=}" /></td>
 			</tr>
 			<tr>
 				<td>{=L:set.rec.timeshift.auto_delete=}</td>
 				<td>
-					<input class="audio" type="radio" name="auto_delete" value="0"/>{=L:off=}&nbsp;
-					<input class="audio" type="radio" name="auto_delete" value="1"/>{=L:on=}
+					<input class="audio" type="radio" name="timeshift_delete" value="0"/>{=L:off=}&nbsp;
+					<input class="audio" type="radio" name="timeshift_delete" value="1"/>{=L:on=}
 				</td>
 			</tr>
 			<tr>
 				<td>{=L:set.rec.timeshift.tmp_timeshift=}</td>
 				<td>
-					<input class="audio" type="radio" name="temp_timeshift" value="0"/>{=L:off=}&nbsp;
-					<input class="audio" type="radio" name="temp_timeshift" value="1"/>{=L:on=}
+					<input class="audio" type="radio" name="timeshift_temp" value="0"/>{=L:off=}&nbsp;
+					<input class="audio" type="radio" name="timeshift_temp" value="1"/>{=L:on=}
 				</td>
 			</tr>
 			<tr><td colspan="2" class="y_form_header">{=L:set.rec.timer_settings=}</td></tr>
@@ -162,8 +162,8 @@ function form_init()
 	obj_set_radio_value('recording_epg_for_end', "{=ini-get:%(CONFIGDIR)/neutrino.conf;recording_epg_for_end;false=}");
 	obj_set_radio_value('recording_save_in_channeldir', "{=ini-get:%(CONFIGDIR)/neutrino.conf;recording_save_in_channeldir;false=}");
 	obj_set_radio_value('timeshift_pause', "{=ini-get:%(CONFIGDIR)/neutrino.conf;timeshift_pause;0=}");
-	obj_set_radio_value('auto_delete', "{=ini-get:%(CONFIGDIR)/neutrino.conf;auto_delete;true=}");
-	obj_set_radio_value('temp_timeshift', "{=ini-get:%(CONFIGDIR)/neutrino.conf;temp_timeshift;0=}");
+	obj_set_radio_value('timeshift_delete', "{=ini-get:%(CONFIGDIR)/neutrino.conf;timeshift_delete;true=}");
+	obj_set_radio_value('timeshift_temp', "{=ini-get:%(CONFIGDIR)/neutrino.conf;timeshift_temp;0=}");

 	val = "{=ini-get:%(CONFIGDIR)/neutrino.conf;recording_audio_pids_default;true=}";
 	val = parseInt(val);
@@ -204,9 +204,9 @@ start-block~neutrino_record_save_settings
 {=ini-set:%(CONFIGDIR)/neutrino.conf;timeshiftdir;{=timeshiftdir=}~cache=}
 {=ini-set:%(CONFIGDIR)/neutrino.conf;record_hours;{=record_hours=}~cache=}
 {=ini-set:%(CONFIGDIR)/neutrino.conf;timeshift_pause;{=timeshift_pause=}~cache=}
-{=ini-set:%(CONFIGDIR)/neutrino.conf;auto_timeshift;{=auto_timeshift=}~cache=}
-{=ini-set:%(CONFIGDIR)/neutrino.conf;auto_delete;{=auto_delete=}~cache=}
-{=ini-set:%(CONFIGDIR)/neutrino.conf;temp_timeshift;{=temp_timeshift=}~cache=}
+{=ini-set:%(CONFIGDIR)/neutrino.conf;timeshift_auto;{=timeshift_auto=}~cache=}
+{=ini-set:%(CONFIGDIR)/neutrino.conf;timeshift_delete;{=timeshift_delete=}~cache=}
+{=ini-set:%(CONFIGDIR)/neutrino.conf;timeshift_temp;{=timeshift_temp=}~cache=}
 {=ini-set:%(CONFIGDIR)/neutrino.conf;recording_audio_pids_default;{=recording_audio_pids_default=}~save=}
 {=ini-set:%(CONFIGDIR)/timerd.conf;EXTRA_TIME_START;{=EXTRA_TIME_START=}~open=}
 {=ini-set:%(CONFIGDIR)/timerd.conf;EXTRA_TIME_END;{=EXTRA_TIME_END=}~cache=}
--- a/data/y-web/images/Makefile.am
+++ b/data/y-web/images/Makefile.am
@@ -101,7 +101,35 @@ install_DATA += rc_wwio_bre2ze4k.png
 endif

 if BOXMODEL_VUSOLO4K
-install_DATA += rc_vu_solo4k.png
+install_DATA += rc_vuplus.png
+endif
+
+if BOXMODEL_H7
+install_DATA += rc_zgemma_h7.png
+endif
+
+if BOXMODEL_VUDUO4K
+install_DATA += rc_vuplus.png
+endif
+
+if BOXMODEL_VUULTIMO4K
+install_DATA += rc_vuplus.png
+endif
+
+if BOXMODEL_VUUNO4K
+install_DATA += rc_vuplus.png
+endif
+
+if BOXMODEL_VUUNO4KSE
+install_DATA += rc_vuplus.png
+endif
+
+if BOXMODEL_VUZERO4K
+install_DATA += rc_vuplus.png
+endif
+
+if BOXMODEL_VUDUO
+install_DATA += rc_vuplus.png
 endif

 # file manager
--- a/data/y-web/images/rc_vu_solo4k.png
+++ b/data/y-web/images/rc_vu_solo4k.png
--- a/data/y-web/images/rc_vuplus.png
+++ b/data/y-web/images/rc_vuplus.png
--- a/data/y-web/images/rc_zgemma_h7.png
+++ b/data/y-web/images/rc_zgemma_h7.png
--- a/data/y-web/languages/Czech
+++ b/data/y-web/languages/Czech
@@ -204,6 +204,7 @@ epg.si.pcrpid=Program Clock Reference PID
 epg.si.apid=Zvukový PID
 epg.si.vtxtpid=TeleText PID
 epg.si.crypt=Kodovací systém
+epg.si.url=Url

 ======= Nastavení
 set.reload_neutrino=Restart Neutrina
--- a/data/y-web/languages/Deutsch
+++ b/data/y-web/languages/Deutsch
@@ -223,6 +223,7 @@ epg.si.pcrpid=Program Clock Reference PID
 epg.si.apid=Audio PID
 epg.si.vtxtpid=Teletext PID
 epg.si.crypt=Crypt Systeme
+epg.si.url=Url

 ========Neutrino Settings
 set.reload_neutrino=Neutrino neuladen
--- a/data/y-web/languages/English
+++ b/data/y-web/languages/English
@@ -226,6 +226,7 @@ epg.si.pcrpid=Program Clock Reference PID
 epg.si.apid=Audio PID
 epg.si.vtxtpid=Teletext PID
 epg.si.crypt=Crypt systems
+epg.si.url=Url

 ========Settings
 set.reload_neutrino=reload Neutrino
--- a/data/y-web/languages/Polski
+++ b/data/y-web/languages/Polski
@@ -206,6 +206,7 @@ epg.si.pcrpid=Program zegara odniesienia PID
 epg.si.apid=audio PID
 epg.si.vtxtpid=Telegazeta PID
 epg.si.crypt=system kodowania
+epg.si.url=Url

 # ========= Ustawienia
 set.reload_neutrino=Restart Neutrino
--- a/data/y-web/languages/Slovak
+++ b/data/y-web/languages/Slovak
@@ -225,6 +225,7 @@ epg.si.pcrpid=Program Clock Reference PID
 epg.si.apid=Zvukový PID
 epg.si.vtxtpid=TeleText PID
 epg.si.crypt=Kodovací systém
+epg.si.url=Url

 ======= Nastavenia
 set.reload_neutrino=reŠtart Neutrina
--- a/data/y-web/scripts/Makefile.am
+++ b/data/y-web/scripts/Makefile.am
@@ -1,9 +1,15 @@
-installdir =  $(PRIVATE_HTTPDDIR)/scripts
+installdir = $(PRIVATE_HTTPDDIR)/scripts

-install_DATA= api.sh _Y_Globals.sh _Y_Library.sh Y_Live.sh Y_Tools.sh
+install_SCRIPTS = \
+	api.sh \
+	_Y_Globals.sh \
+	_Y_Library.sh \
+	Y_Live.sh \
+	Y_Tools.sh

 # file manager
-install_DATA +=	Y_NAS.sh
+install_SCRIPTS += \
+	Y_NAS.sh

 install-data-hook:
 	chmod 0755 $(DESTDIR)$(PRIVATE_HTTPDDIR)/scripts/api.sh
--- a/data/y-web/scripts/Y_Live.sh
+++ b/data/y-web/scripts/Y_Live.sh
--- a/data/y-web/scripts/Y_NAS.sh
+++ b/data/y-web/scripts/Y_NAS.sh
--- a/data/y-web/scripts/Y_Tools.sh
+++ b/data/y-web/scripts/Y_Tools.sh
@@ -581,7 +581,7 @@ case "$1" in
 	fbshot)					shift 1; do_fbshot $* ;;
 	fbshot_clear)			do_fbshot_clear ;;
 	screenshot_clear)		do_screenshot_clear ;;
-	get_update_version)		wget -O /tmp/version.txt "http://raw.github.com/tuxbox-neutrino/gui-neutrino/master/src/nhttpd/web/Y_Version.txt" ;;
+	get_update_version)		wget -q -O /tmp/version.txt "https://raw.githubusercontent.com/tuxbox-neutrino/gui-neutrino/master/data/y-web/Y_Version.txt" ;;
 	settings_backup_restore)	shift 1; do_settings_backup_restore $* ;;
 	exec_cmd)				shift 1; $* ;;
 	automount_list)			shift 1; do_automount_list $* ;;
@@ -593,7 +593,7 @@ case "$1" in
 	timer_get_tvinfo)
 		shift 1
 		rm -r /tmp/tvinfo.xml
-		res=$(wget -O /tmp/tvinfo.xml "http://www.tvinfo.de/share/openepg/schedule.php?username=$1&password=$2" 2>&1)
+		res=$(curl -o /tmp/tvinfo.xml -vs "https://www.tvinfo.de/share/openepg/schedule.php?username=$1&password=$2" 2>&1)
 		if  ! [ -s /tmp/tvinfo.xml ]
 		then
 			res="$res File empty!"
--- a/data/y-web/scripts/_Y_Globals.sh
+++ b/data/y-web/scripts/_Y_Globals.sh
--- a/data/y-web/scripts/_Y_Library.sh
+++ b/data/y-web/scripts/_Y_Library.sh
--- a/data/y-web/scripts/api.sh
+++ b/data/y-web/scripts/api.sh
--- a/Show More
+++ b/Show More