update to version 3.13.0

- removed azbox, tripledragon
- hisilcon fixes

acinclude.m4

@@ -149,6 +149,13 @@ AC_ARG_WITH(default-theme,
 	[default_theme=""])
 AC_DEFINE_UNQUOTED([DEFAULT_THEME], ["$default_theme"], [Default theme for gui.])
 
+# default oled theme
+AC_ARG_WITH(default-oled-theme,
+	AS_HELP_STRING([--with-default-oled-theme=THEMENAME], [Default theme for oled. @<:@default is empty@:>@]),
+	[default_oled_theme="$withval"],
+	[default_oled_theme=""])
+AC_DEFINE_UNQUOTED([DEFAULT_OLED_THEME], ["$default_oled_theme"], [Default theme for oled.])
+
 AC_MSG_CHECKING(target)
 
 if test "$TARGET" = "native"; then
@@ -446,9 +453,9 @@ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
 
 AC_DEFUN([TUXBOX_BOXTYPE], [
 AC_ARG_WITH(boxtype,
-	AS_HELP_STRING([--with-boxtype], [valid values: generic, azbox, tripledragon, spark, coolstream, armbox, mipsbox]),
+	AS_HELP_STRING([--with-boxtype], [valid values: generic, spark, coolstream, armbox, mipsbox]),
 	[case "${withval}" in
-		generic|azbox|tripledragon|spark|coolstream|armbox|mipsbox)
+		generic|spark|coolstream|armbox|mipsbox)
 			BOXTYPE="$withval"
 		;;
 		*)
@@ -460,7 +467,7 @@ AC_ARG_WITH(boxtype,
 AC_ARG_WITH(boxmodel,
 	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, h7, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k, osmio4kplus])
+AS_HELP_STRING([], [valid for armbox: hd51, hd60, hd61, bre2ze4k, h7, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k])
 AS_HELP_STRING([], [valid for mipsbox: vuduo]),
 	[case "${withval}" in
 		generic|raspi)
@@ -489,7 +496,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]),
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 		;;
-		hd51|hd60|bre2ze4k|h7|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|osmio4kplus)
+		hd51|hd60|hd61|bre2ze4k|h7|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
 			if test "$BOXTYPE" = "armbox"; then
 				BOXMODEL="$withval"
 			else
@@ -513,10 +520,8 @@ 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_SPARK, test "$BOXTYPE" = "spark")
-AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
+AM_CONDITIONAL(BOXTYPE_CST, test "$BOXTYPE" = "coolstream")
 AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox")
 AM_CONDITIONAL(BOXTYPE_MIPSBOX, test "$BOXTYPE" = "mipsbox")
 
@@ -525,18 +530,20 @@ 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")
+AM_CONDITIONAL(BOXMODEL_CST_HD1, test "$BOXMODEL" = "hd1")
+AM_CONDITIONAL(BOXMODEL_CST_HD2, test "$BOXMODEL" = "hd2")
 
 # armbox
 AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51")
 AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60")
+AM_CONDITIONAL(BOXMODEL_HD61, test "$BOXMODEL" = "hd61")
 AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k")
 AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7")
 AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k")
 AM_CONDITIONAL(BOXMODEL_OSMIO4KPLUS, test "$BOXMODEL" = "osmio4kplus")
 AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k")
 AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k")
+AM_CONDITIONAL(BOXMODEL_VUDUO4KSE, test "$BOXMODEL" = "vuduo4kse")
 AM_CONDITIONAL(BOXMODEL_VUULTIMO4K, test "$BOXMODEL" = "vuultimo4k")
 AM_CONDITIONAL(BOXMODEL_VUUNO4K, test "$BOXMODEL" = "vuuno4k")
 AM_CONDITIONAL(BOXMODEL_VUUNO4KSE, test "$BOXMODEL" = "vuuno4kse")
@@ -547,14 +554,10 @@ AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo")
 
 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" = "spark"; then
 	AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux])
 elif test "$BOXTYPE" = "coolstream"; then
-	AC_DEFINE(HAVE_COOL_HARDWARE, 1, [building for a coolstream])
+	AC_DEFINE(HAVE_CST_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
@@ -579,13 +582,15 @@ if test "$BOXMODEL" = "generic"; then
 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])
+	AC_DEFINE(BOXMODEL_CST_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(BOXMODEL_CST_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link])
 elif test "$BOXMODEL" = "hd51"; then
 	AC_DEFINE(BOXMODEL_HD51, 1, [hd51])
 elif test "$BOXMODEL" = "hd60"; then
 	AC_DEFINE(BOXMODEL_HD60, 1, [hd60])
+elif test "$BOXMODEL" = "hd61"; then
+	AC_DEFINE(BOXMODEL_HD61, 1, [hd61])
 elif test "$BOXMODEL" = "bre2ze4k"; then
 	AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k])
 elif test "$BOXMODEL" = "h7"; then
@@ -598,6 +603,8 @@ 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" = "vuduo4kse"; then
+	AC_DEFINE(BOXMODEL_VUDUO4KSE, 1, [vuduo4kse])
 elif test "$BOXMODEL" = "vuultimo4k"; then
 	AC_DEFINE(BOXMODEL_VUULTIMO4K, 1, [vuultimo4k])
 elif test "$BOXMODEL" = "vuuno4k"; then
@@ -612,38 +619,62 @@ fi
 
 # all vuplus BOXMODELs
 case "$BOXMODEL" in
-	vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo)
-		AC_DEFINE(BOXMODEL_VUPLUS, 1, [vuplus])
-		vuplus=true
+	vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo)
+		AC_DEFINE(BOXMODEL_VUPLUS_ALL, 1, [vuplus_all])
+		vuplus_all=true
 	;;
 	*)
-		vuplus=false
+		vuplus_all=false
 	;;
 esac
-AM_CONDITIONAL(BOXMODEL_VUPLUS, test "$vuplus" = "true")
+AM_CONDITIONAL(BOXMODEL_VUPLUS_ALL, test "$vuplus_all" = "true")
 
-# all vuplus4k BOXMODELs
+# all vuplus arm BOXMODELs
 case "$BOXMODEL" in
-	vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
-		AC_DEFINE(BOXMODEL_VUPLUS4K, 1, [vuplus4k])
-		vuplus4k=true
+	vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
+		AC_DEFINE(BOXMODEL_VUPLUS_ARM, 1, [vuplus_arm])
+		vuplus_arm=true
 	;;
 	*)
-		vuplus4k=false
+		vuplus_arm=false
 	;;
 esac
-AM_CONDITIONAL(BOXMODEL_VUPLUS4K, test "$vuplus4k" = "true")
+AM_CONDITIONAL(BOXMODEL_VUPLUS_ARM, test "$vuplus_arm" = "true")
+
+# all vuplus mips BOXMODELs
+case "$BOXMODEL" in
+	vuduo)
+		AC_DEFINE(BOXMODEL_VUPLUS_MIPS, 1, [vuplus_mips])
+		vuplus_mips=true
+	;;
+	*)
+		vuplus_mips=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_VUPLUS_MIPS, test "$vuplus_mips" = "true")
+
+# all hisilicon BOXMODELs
+case "$BOXMODEL" in
+	hd60|hd61)
+		AC_DEFINE(BOXMODEL_HISILICON, 1, [hisilicon])
+		hisilicon=true
+	;;
+	*)
+		hisilicon=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_HISILICON, test "$hisilicon" = "true")
 
 # BOXMODELs that allows to change osd resolution
 case "$BOXMODEL" in
-	hd2|hd51|hd60|bre2ze4k|h7|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|osmio4kplus)
+	hd2|hd51|hd60|hd61|bre2ze4k|h7|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo)
 		AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution])
 	;;
 esac
 
 # BOXMODELs that needs GraphLCD support
 case "$BOXMODEL" in
-	vusolo4k|vuduo4k|vuultimo4k|vuuno4kse)
+	vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4kse)
 		AC_DEFINE(ENABLE_GRAPHLCD, 1, [include GraphLCD support])
 		enable_graphlcd=yes
 	;;

configure.ac

@@ -1,19 +1,32 @@
 # explicit defines for separate revision handling
 define(ver_major, 3)
-define(ver_minor, 11)
-define(ver_micro, 1)
-define(neutrino_rel_cycle, ver_major.ver_minor)
+define(ver_minor, 13)
+define(ver_micro, 0)
+define(rel_cycle, "ver_major.0")
+
+# sync with current git
+define(ver_git, m4_esyscmd([
+	GITBRANCH=$(git rev-parse --abbrev-ref HEAD);
+	GITDESCRIBE=$(git describe --always --tags --dirty);
+	printf "$GITDESCRIBE $GITBRANCH"
+]))
+
+define(ver_date, m4_esyscmd([
+	BUILTDATE=$(date);
+	printf "$BUILTDATE"
+]))
 
 AC_INIT(Tuxbox-Neutrino,ver_major.ver_minor.ver_micro)
 AM_INIT_AUTOMAKE([nostdinc foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
-AC_DEFINE(RELEASE_CYCLE, "2.5", [Release cycle information; used in update code; only relevant for flash image releases ])
+AC_DEFINE(PACKAGE_RELEASE_CYCLE, rel_cycle, [Release cycle information; used in update code; only relevant for flash image releases ])
 
 AC_DEFINE(PACKAGE_VERSION_MAJOR, ver_major, [Major version number])
 AC_DEFINE(PACKAGE_VERSION_MINOR, ver_minor, [Minor version number])
 AC_DEFINE(PACKAGE_VERSION_MICRO, ver_micro, [Micro version number])
-AC_DEFINE(PACKAGE_VERSION_NEUTRINO_REL_CYCLE, neutrino_rel_cycle, [Neutrino release cycle])
+AC_DEFINE(PACKAGE_VERSION_GIT, "ver_git", [internal vcs version info])
+AC_DEFINE(PACKAGE_VERSION_DATE, "ver_date", [internal built date])
 
 TUXBOX_APPS
 TUXBOX_APPS_DIRECTORY
@@ -100,10 +113,6 @@ TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample)
 
 AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes")
 
-if test "$BOXTYPE" = "tripledragon"; then
-	TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb)
-fi
-
 # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl)
 TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl)
 
@@ -157,7 +166,6 @@ if test "$BOXTYPE" = "coolstream" ||
    test "$BOXTYPE" = "armbox" ||
    test "$BOXTYPE" = "mipsbox" ||
    test "$BOXTYPE" = "generic" ||
-   test "$BOXTYPE" = "tripledragon" ||
    test "$BOXTYPE" = "spark"; then
 	AC_DEFINE(SCREENSHOT, 1, [Define to 1 if the platform supports screenshots])
 fi
@@ -216,6 +224,26 @@ if test "$enable_upnp" = "yes"; then
 fi
 AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes")
 
+AC_ARG_ENABLE(arm-acc,
+	AS_HELP_STRING([--enable-arm-acc], [enable arm hardware acceleration @<:@default=yes@:>@]]),
+	[enable_arm_acc="$enableval"],
+	[enable_arm_acc="yes"])
+
+if test "$enable_arm_acc" = "yes"; then
+	AC_DEFINE(ENABLE_ARM_ACC, 1, [enable arm hardware acceleration])
+fi
+AM_CONDITIONAL(ENABLE_ARM_ACC, test "$enable_arm_acc" = "yes")
+
+AC_ARG_ENABLE(mips-acc,
+	AS_HELP_STRING([--enable-mips-acc], [enable mips hardware acceleration @<:@default=yes@:>@]]),
+	[enable_mips_acc="$enableval"],
+	[enable_mips_acc="yes"])
+
+if test "$enable_mips_acc" = "yes"; then
+	AC_DEFINE(ENABLE_MIPS_ACC, 1, [enable mips hardware acceleration])
+fi
+AM_CONDITIONAL(ENABLE_MIPS_ACC, test "$enable_mips_acc" = "yes")
+
 AC_ARG_ENABLE(extupdate,
 	AS_HELP_STRING([--enable-extupdate], [enable extended update routine @<:@default=no@:>@]),
 	AC_DEFINE(ENABLE_EXTUPDATE, 1, [enable extended update routine]))
@@ -228,19 +256,20 @@ AC_ARG_ENABLE(lua,
 
 if test "$enable_lua" = "yes"; then
 	AC_DEFINE(ENABLE_LUA, 1, [include Lua support])
-	PKG_CHECK_MODULES([LUA], [lua >= 5.2], [
-		echo "lua >= 5.2 found"
-	], [
-		PKG_CHECK_MODULES([LUA], [lua5.2 >= 5.2], [
-			echo "lua5.2 found"
-		], [
+	PKG_CHECK_MODULES(LUA, lua, LLUA="yes", LLUA="no")
+	PKG_CHECK_MODULES(luajit, luajit, LLUAJIT="yes", LLUAJIT="no")
+		if test "x$LLUAJIT" = "xyes"; then
+			LUA_LIBS="-lluajit-5.1"
+			AC_DEFINE(LUA_COMPAT_5_2, 1, [needed for build with lua 5.1])
+		elif test "x$LLUA" = "xyes"; then
+			LUA_LIBS="-llua"
+			AC_DEFINE(LUA_COMPAT_5_2, 0, [needed for build with lua 5.1])
+		else
 			echo "lualib not found, assuming static lua in linker path..."
 			LUA_LIBS="-llua -ldl"
 			AC_DEFINE(STATIC_LUAPOSIX, 1, [Define to 1 for static lua build.])
-		])
-	])
-	# hack...
-	AC_DEFINE(LUA_COMPAT_5_2, 1, [does not really belong in config.h, but is needed for build with lua 5.3+])
+			AC_DEFINE(LUA_COMPAT_5_2, 0, [needed for build with lua 5.1])
+		fi
 fi
 AM_CONDITIONAL(ENABLE_LUA, test "$enable_lua" = "yes")
 
@@ -355,6 +384,15 @@ data/lcd/clock/Makefile
 data/lcd/icons/Makefile
 data/license/Makefile
 data/locale/Makefile
+data/oled/Makefile
+data/oled/fonts/Makefile
+data/oled/icons/Makefile
+data/oled/icons/clock/Makefile
+data/oled/icons/weather/Makefile
+data/oled/themes/Makefile
+data/oled/themes/400x240/Makefile
+data/oled/themes/480x320/Makefile
+data/oled/themes/800x480/Makefile
 data/pictures/Makefile
 data/pictures/backgrounds/Makefile
 data/pictures/screensaver/Makefile
@@ -364,6 +402,9 @@ data/themes/Makefile
 data/themes/Grey-Blue/Makefile
 data/themes/Grey-Blue/icons/Makefile
 data/themes/Grey-Blue/icons/buttons/Makefile
+data/themes/Grey-3.0/Makefile
+data/themes/Grey-3.0/icons/Makefile
+data/themes/Grey-3.0/icons/buttons/Makefile
 data/themes/Neutrino-3.0/Makefile
 data/themes/Neutrino-3.0/icons/Makefile
 data/themes/Neutrino-3.0/icons/buttons/Makefile
@@ -398,6 +439,7 @@ src/Makefile
 src/daemonc/Makefile
 src/driver/Makefile
 src/driver/audiodec/Makefile
+src/driver/glcd/Makefile
 src/driver/pictureviewer/Makefile
 src/eitd/Makefile
 src/gui/Makefile

data/Makefile.am

@@ -17,6 +17,7 @@ SUBDIRS = \
 	y-web \
 	zapit
 
-if BOXTYPE_TRIPLE
-SUBDIRS += lcd
+if ENABLE_GRAPHLCD
+SUBDIRS += \
+	oled
 endif

data/config/bad_package_pattern.list.sample

@@ -1,6 +1,7 @@
 ^locale-base-
 ^perl-module-
 acl
+alsa-utils-
 attr
 attr-
 autoconf
@@ -9,6 +10,7 @@ alsa-server
 avahi
 base-passwd-
 bash-
+bluez5-
 bsd
 busybox-
 catchsegv
@@ -66,6 +68,7 @@ pcsc-lite-
 perl-
 pps
 -ptest$
+pulseaudio-
 python-
 python3-
 qemu

data/fonts/Makefile.am

@@ -17,7 +17,7 @@ install_DATA = \
 	tuxtxt.otb
 
 
-if BOXMODEL_CS_HD2
+if BOXMODEL_CST_HD2
 install_DATA += UnDotum.ttf
 endif
 

data/initial/frontend.conf

@@ -5,7 +5,7 @@ fe0_lastSatellitePosition=360
 fe0_motorRotationSpeed=18
 fe0_position_192=192,-1,-1,-1,0,0,9750,10600,11700,0,0,1
 fe0_satellites=192
-fe0_uni_qrg=0
+fe0_uni_freq=0
 fe0_uni_scr=-1
 fe0_mode=1
 fe1_diseqcRepeats=0
@@ -15,6 +15,6 @@ fe1_lastSatellitePosition=360
 fe1_motorRotationSpeed=18
 fe1_position_192=192,-1,-1,-1,0,0,9750,10600,11700,0,0,1
 fe1_satellites=192
-fe1_uni_qrg=0
+fe1_uni_freq=0
 fe1_uni_scr=-1
 fe1_mode=0

data/initial/services.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zapit api="4">
-	<sat name="Astra 1KR/1L/1M/1N (19.2E)" flags="0" position="192">
+	<sat name="Astra (19.2E) by matze" flags="0" position="192">
 		<TS id="03e9" on="0001" frq="11214000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
 			<S i="3459" n="Service 13401" t="1f" s="0" num="0" f="0"/>
 			<S i="345d" n="Service13405" t="1" s="0" num="0" f="0"/>
@@ -13,7 +13,6 @@
 			<S i="1393" n="INSIGHT TV HD INT" t="19" s="0" num="0" f="0"/>
 			<S i="139d" n="NHK WORLD-JPN" t="1" s="0" num="0" f="0"/>
 			<S i="13a7" n="Al Jazeera English HD" t="19" s="0" num="0" f="0"/>
-			<S i="13d9" n="MB LIVE" t="19" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="03eb" on="0001" frq="11243000" inv="2" sr="22000000" fec="5" pol="0" mod="0" sys="0">
 			<S i="33a5" n="ORF SPORT+" t="1" s="0" num="0" f="0"/>
@@ -22,7 +21,7 @@
 			<S i="33a8" n="Bibel TV HD" t="19" s="0" num="0" f="0"/>
 			<S i="33a9" n="Schau TV HD" t="19" s="0" num="0" f="0"/>
 			<S i="33aa" n="Starparadies AT" t="1" s="0" num="0" f="0"/>
-			<S i="33ab" n="HOPE Channel HD" t="19" s="0" num="0" f="0"/>
+			<S i="33ab" n="HopeTV" t="19" s="0" num="0" f="0"/>
 			<S i="33ac" n="ATV HD" t="19" s="0" num="0" f="0"/>
 			<S i="33ad" n="RTLplus Austria" t="16" s="0" num="0" f="0"/>
 			<S i="33b0" n="Service 13232" t="1" s="0" num="0" f="0"/>
@@ -34,7 +33,6 @@
 			<S i="78b6" n="M.Seriesmania HD" t="19" s="0" num="0" f="0"/>
 			<S i="78b7" n="M. GOLF HD" t="19" s="0" num="0" f="0"/>
 			<S i="78b8" n="COSMO HD" t="19" s="0" num="0" f="0"/>
-			<S i="78b9" n="11258V SID 0x78b9" t="1" s="0" num="0" f="0"/>
 			<S i="78be" n="11258V SID 0x78be" t="1" s="0" num="0" f="0"/>
 			<S i="78c0" n="COMEDYCENTRALHD" t="19" s="0" num="0" f="0"/>
 			<S i="78c2" n="11258V SID 0x78c2" t="64" s="0" num="0" f="0"/>
@@ -52,6 +50,7 @@
 			<S i="33fe" n="flimmit Zusatzpaket" t="19" s="0" num="0" f="0"/>
 			<S i="33ff" n="Aristo.TV" t="16" s="0" num="0" f="0"/>
 			<S i="3400" n="R9 Oesterreich HD" t="19" s="0" num="0" f="0"/>
+			<S i="3401" n="krone.tv" t="16" s="0" num="0" f="0"/>
 			<S i="3402" n="oe24.TV HD" t="19" s="0" num="0" f="0"/>
 			<S i="3403" n="Starparadies A" t="16" s="0" num="0" f="0"/>
 			<S i="3404" n="gotv neu" t="16" s="0" num="0" f="0"/>
@@ -59,9 +58,7 @@
 		</TS>
 		<TS id="03ee" on="0001" frq="11288000" inv="2" sr="22000000" fec="2" pol="1" mod="9" sys="1">
 			<S i="1078" n="RAI News 24" t="1" s="0" num="0" f="0"/>
-			<S i="1081" n="Deutschland Vozrozhdenie" t="16" s="0" num="0" f="0"/>
 			<S i="1086" n="QVC UHD" t="1f" s="0" num="0" f="0"/>
-			<S i="1090" n="D7 TV" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="03ef" on="0001" frq="11302000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
 			<S i="132f" n="ORF1 HD" t="19" s="0" num="0" f="0"/>
@@ -69,6 +66,7 @@
 			<S i="1331" n="ServusTV HD Oesterreich" t="19" s="0" num="0" f="0"/>
 			<S i="1332" n="ServusTV HD Deutschland" t="19" s="0" num="0" f="0"/>
 			<S i="1334" n="ORF2N HD" t="19" s="0" num="0" f="0"/>
+			<S i="1338" n="OE3." t="2" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="03f0" on="0001" frq="11317000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
 			<S i="7468" n="FOX LIFE" t="1" s="0" num="0" f="0"/>
@@ -103,6 +101,9 @@
 			<S i="18ee" n="RT Esp HD" t="1" s="0" num="0" f="0"/>
 			<S i="18ef" n="RT France HD" t="1" s="0" num="0" f="0"/>
 			<S i="18f0" n="EXTREMADURA SAT" t="1" s="0" num="0" f="0"/>
+			<S i="18f1" n="TVGA HD EUROPA" t="1" s="0" num="0" f="0"/>
+			<S i="18f2" n="RADIO GALEGA" t="2" s="0" num="0" f="0"/>
+			<S i="18f3" n="RADIO GALEGA MUSICA" t="2" s="0" num="0" f="0"/>
 			<S i="18f8" n="RT Esp HD" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="03f5" on="0001" frq="11391000" inv="2" sr="22000000" fec="5" pol="0" mod="0" sys="0">
@@ -158,9 +159,11 @@
 			<S i="ef76" n="kabel eins HD" t="19" s="1" num="0" f="0"/>
 			<S i="ef77" n="SIXX HD" t="19" s="1" num="0" f="0"/>
 			<S i="ef78" n="Pro7 MAXX HD" t="19" s="1" num="0" f="0"/>
+			<S i="ef79" n="Kabel Eins Doku HD" t="19" s="1" num="0" f="0"/>
 			<S i="ef8a" n="kabel eins HD Austria" t="19" s="0" num="0" f="0"/>
 			<S i="ef8b" n="sixx HD Austria" t="19" s="0" num="0" f="0"/>
 			<S i="ef8c" n="Pro7 MAXX HD Austria" t="19" s="0" num="0" f="0"/>
+			<S i="ef8d" n="." t="19" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="03fb" on="0001" frq="11493000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
 			<S i="283d" n="Das Erste HD" t="19" s="0" num="0" f="0"/>
@@ -176,16 +179,13 @@
 		</TS>
 		<TS id="03fe" on="0001" frq="11538000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
 			<S i="1af4" n="DATASYSTEM" t="c" s="0" num="0" f="0"/>
-			<S i="1af8" n="Russia Today" t="1" s="0" num="0" f="0"/>
 			<S i="1af9" n="France 24 (en Français)" t="1" s="0" num="0" f="0"/>
 			<S i="1afa" n="France 24 (in English)" t="1" s="0" num="0" f="0"/>
-			<S i="1afe" n="France 24 (in Arabic)" t="1" s="0" num="0" f="0"/>
 			<S i="1b00" n="CGTN Documentary" t="1" s="0" num="0" f="0"/>
 			<S i="1b01" n="CGTN F" t="1" s="0" num="0" f="0"/>
 			<S i="1b02" n="CGTN" t="1" s="0" num="0" f="0"/>
 			<S i="1b03" n="TV5MONDE EUROPE" t="1" s="0" num="0" f="0"/>
 			<S i="1b06" n="TRT World HD" t="1" s="0" num="0" f="0"/>
-			<S i="1b0d" n="TEST" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="03ff" on="0001" frq="11552000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
 			<S i="16a8" n="a.tv HD" t="19" s="0" num="0" f="0"/>
@@ -215,22 +215,12 @@
 		<TS id="0403" on="0001" frq="11611000" inv="2" sr="22000000" fec="5" pol="0" mod="0" sys="0">
 			<S i="13fc" n="TSR Turkce" t="2" s="0" num="0" f="0"/>
 			<S i="1406" n="Kaufbei.tv" t="16" s="0" num="0" f="0"/>
-			<S i="140a" n="YOL TV" t="1" s="0" num="0" f="0"/>
 			<S i="1417" n="TBN Russia" t="1" s="0" num="0" f="0"/>
-			<S i="1419" n="Juvelirochka" t="1" s="0" num="0" f="0"/>
-			<S i="141b" n="8 TV RU" t="1" s="0" num="0" f="0"/>
+			<S i="1419" n="BestMarket TV" t="1" s="0" num="0" f="0"/>
 			<S i="144f" n="KaCTFL" t="c" s="0" num="0" f="0"/>
 			<S i="15e1" n="TVRUS" t="16" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0404" on="0001" frq="11626000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
-			<S i="1131" n="TVE INTERNACIONAL EUROPA" t="1" s="0" num="0" f="0"/>
-			<S i="1132" n="CANAL 24 HORAS" t="1" s="0" num="0" f="0"/>
-			<S i="113b" n="RNE RADIO 1" t="2" s="0" num="0" f="0"/>
-			<S i="113c" n="RNE RADIO 3" t="2" s="0" num="0" f="0"/>
-			<S i="113d" n="RNE RADIO 4" t="2" s="0" num="0" f="0"/>
-			<S i="113e" n="RNE RADIO 5 TODO NOTICIAS" t="2" s="0" num="0" f="0"/>
-			<S i="113f" n="RNE RADIO CLASICA" t="2" s="0" num="0" f="0"/>
-			<S i="1140" n="RNE RADIO EXTERIOR DE ESPAÑA" t="2" s="0" num="0" f="0"/>
 			<S i="1146" n="CNN Int." t="1" s="0" num="0" f="0"/>
 			<S i="114e" n="DW English" t="1" s="0" num="0" f="0"/>
 			<S i="1158" n="Al Jazeera English" t="1" s="0" num="0" f="0"/>
@@ -240,6 +230,7 @@
 			<S i="1195" n="SPORT1+" t="19" s="1" num="0" f="0"/>
 			<S i="1196" n="eSPORTS1" t="19" s="1" num="0" f="0"/>
 			<S i="1197" n="EDGEsport" t="19" s="1" num="0" f="0"/>
+			<S i="1198" n="WAIDWERK" t="19" s="1" num="0" f="0"/>
 		</TS>
 		<TS id="0407" on="0001" frq="11670000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
 			<S i="14b4" n="SAT.1 HD Austria" t="19" s="0" num="0" f="0"/>
@@ -265,7 +256,7 @@
 			<S i="7603" n="11685V SID 0x7603" t="64" s="0" num="0" f="0"/>
 			<S i="7604" n="ANTENA 3" t="1" s="0" num="0" f="0"/>
 			<S i="7606" n="#VAMOS" t="1" s="0" num="0" f="0"/>
-			<S i="7607" n="TEST P" t="1" s="0" num="0" f="0"/>
+			<S i="7607" n="Disney+" t="1" s="0" num="0" f="0"/>
 			<S i="7609" n="11685V SID 0x7609" t="64" s="0" num="0" f="0"/>
 			<S i="760c" n="#VAMOS" t="1" s="0" num="0" f="0"/>
 			<S i="760e" n="EUROSPORT 2" t="1" s="0" num="0" f="0"/>
@@ -276,7 +267,7 @@
 			<S i="2776" n="Handystar TV HD" t="19" s="0" num="0" f="0"/>
 			<S i="2777" n="MTV HD" t="19" s="1" num="0" f="0"/>
 			<S i="2778" n="Channel21 HD" t="19" s="0" num="0" f="0"/>
-			<S i="2779" n="QVC Style HD" t="19" s="0" num="0" f="0"/>
+			<S i="2779" n="QVC STYLE HD" t="19" s="0" num="0" f="0"/>
 			<S i="277e" n="TLC HD Austria" t="19" s="0" num="0" f="0"/>
 			<S i="2781" n="MTV HD Austria" t="19" s="0" num="0" f="0"/>
 		</TS>
@@ -299,7 +290,7 @@
 		<TS id="040b" on="0001" frq="10993000" inv="0" sr="21996000" fec="5" pol="0" mod="9" sys="1">
 			<S i="0001" n="SES UHD Demo Channel" t="1f" s="0" num="0" f="0"/>
 			<S i="0002" n="UHD1 by ASTRA / HD+" t="1f" s="0" num="0" f="0"/>
-			<S i="183a" n="Travelxp 4k" t="1f" s="1" num="0" f="0"/>
+			<S i="183a" n="." t="1f" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="040e" on="0001" frq="11038000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
 			<S i="76c0" n="M. ESTRENOS" t="1" s="0" num="0" f="0"/>
@@ -330,10 +321,7 @@
 			<S i="047e" n="RT Esp" t="1" s="0" num="0" f="0"/>
 			<S i="7a45" n="TV Record SD" t="1" s="0" num="0" f="0"/>
 			<S i="7a48" n="TELESUR" t="1" s="0" num="0" f="0"/>
-			<S i="7a49" n="TBN Espana" t="1" s="0" num="0" f="0"/>
-			<S i="7a4a" n="TVGA" t="1" s="0" num="0" f="0"/>
 			<S i="7a4b" n="I24 Francis" t="1" s="0" num="0" f="0"/>
-			<S i="7a4d" n="TELEMAROC" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0411" on="0001" frq="11082000" inv="2" sr="22000000" fec="3" pol="0" mod="9" sys="1">
 			<S i="2e87" n="RTL HD Austria" t="19" s="0" num="0" f="0"/>
@@ -388,7 +376,7 @@
 			<S i="30d5" n="." t="19" s="0" num="0" f="0"/>
 			<S i="30d6" n="Eurosport 1 HD" t="19" s="1" num="0" f="0"/>
 			<S i="30d7" n="Eurosport 2 HD Xtra" t="19" s="1" num="0" f="0"/>
-			<S i="30de" n="Fashion 4K" t="1f" s="0" num="0" f="0"/>
+			<S i="30de" n="." t="1f" s="0" num="0" f="0"/>
 			<S i="30e8" n="SAT.1 Gold HD Austria" t="19" s="0" num="0" f="0"/>
 			<S i="30ea" n="Eurosport 1 HD Austria" t="19" s="0" num="0" f="0"/>
 		</TS>
@@ -397,6 +385,7 @@
 			<S i="7885" n="TCM HD" t="19" s="0" num="0" f="0"/>
 			<S i="7888" n="TNT HD" t="19" s="0" num="0" f="0"/>
 			<S i="7889" n="NG WILD HD" t="19" s="0" num="0" f="0"/>
+			<S i="788a" n="11126V SID 0x788a" t="1" s="0" num="0" f="0"/>
 			<S i="788b" n="DISNEY CH HD" t="19" s="0" num="0" f="0"/>
 			<S i="788c" n="#0 HD" t="19" s="0" num="0" f="0"/>
 			<S i="788d" n="CAZAyPESCA HD" t="19" s="0" num="0" f="0"/>
@@ -408,7 +397,7 @@
 			<S i="7727" n="11156V SID 0x7727" t="64" s="0" num="0" f="0"/>
 			<S i="7728" n="11156V SID 0x7728" t="64" s="0" num="0" f="0"/>
 			<S i="7729" n="CANAL SUR A." t="1" s="0" num="0" f="0"/>
-			<S i="772a" n="DISNEY XD" t="1" s="0" num="0" f="0"/>
+			<S i="772a" n="TEST D" t="1" s="0" num="0" f="0"/>
 			<S i="772b" n="CAZA Y PESCA" t="1" s="0" num="0" f="0"/>
 			<S i="772c" n="11156V SID 0x772c" t="1" s="0" num="0" f="0"/>
 			<S i="772d" n="BLAZE" t="1" s="0" num="0" f="0"/>
@@ -462,7 +451,7 @@
 			<S i="749a" n="DIVINITY" t="1" s="0" num="0" f="0"/>
 			<S i="749b" n="FOX NEWS" t="1" s="0" num="0" f="0"/>
 			<S i="749c" n="BABY TV" t="1" s="0" num="0" f="0"/>
-			<S i="749d" n="M. DISNEY" t="1" s="0" num="0" f="0"/>
+			<S i="749d" n="TEST M" t="1" s="0" num="0" f="0"/>
 			<S i="749e" n="BOING" t="1" s="0" num="0" f="0"/>
 			<S i="749f" n="ENERGY" t="1" s="0" num="0" f="0"/>
 			<S i="74a0" n="BARÇA TV" t="1" s="0" num="0" f="0"/>
@@ -486,8 +475,6 @@
 			<S i="5279" n="Genius Plus" t="16" s="0" num="0" f="0"/>
 			<S i="527d" n="Comedy Central HD AT" t="19" s="0" num="0" f="0"/>
 			<S i="527e" n="WELT HD" t="19" s="0" num="0" f="0"/>
-			<S i="52cb" n="10773H SID 0x52cb" t="64" s="0" num="0" f="0"/>
-			<S i="52cc" n="10773H SID 0x52cc" t="64" s="0" num="0" f="0"/>
 			<S i="52cf" n="10773H SID 0x52cf" t="64" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="041e" on="0001" frq="10788000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
@@ -520,7 +507,7 @@
 			<S i="157d" n="HSE24 EXTRA HD" t="19" s="0" num="0" f="0"/>
 			<S i="157e" n="1-2-3.tv HD" t="19" s="0" num="0" f="0"/>
 			<S i="157f" n="Deluxe Music HD" t="19" s="1" num="0" f="0"/>
-			<S i="1580" n="QVC2 HD" t="19" s="0" num="0" f="0"/>
+			<S i="1580" n="QVC ZWEI HD" t="19" s="0" num="0" f="0"/>
 			<S i="1581" n="SPORT1 HD" t="19" s="1" num="0" f="0"/>
 			<S i="1586" n="Disney Channel HD Austria" t="19" s="0" num="0" f="0"/>
 			<S i="1589" n="Deluxe Music HD Austria" t="19" s="0" num="0" f="0"/>
@@ -634,12 +621,17 @@
 			<S i="782d" n="TOROS HD" t="19" s="0" num="0" f="0"/>
 			<S i="782e" n="10935V SID 0x782e" t="64" s="0" num="0" f="0"/>
 		</TS>
+		<TS id="042c" on="0001" frq="11778000" inv="2" sr="29500000" fec="11" pol="1" mod="9" sys="1">
+			<S i="1645" n="BVN TV" t="16" s="0" num="0" f="0"/>
+			<S i="1646" n="VRT Radio 1" t="2" s="0" num="0" f="0"/>
+		</TS>
 		<TS id="042e" on="0001" frq="11817000" inv="2" sr="29700000" fec="2" pol="1" mod="9" sys="1">
 			<S i="1f41" n="BET" t="19" s="0" num="0" f="0"/>
+			<S i="1f42" n="OLYMPIA TV" t="19" s="0" num="0" f="0"/>
 			<S i="1f43" n="MTV HITS" t="19" s="0" num="0" f="0"/>
 			<S i="1f44" n="MTV" t="19" s="0" num="0" f="0"/>
 			<S i="1f45" n="FRANCEINFO:" t="19" s="0" num="0" f="0"/>
-			<S i="1f46" n="HISTOIRE" t="19" s="0" num="0" f="0"/>
+			<S i="1f46" n="HISTOIRE TV" t="19" s="0" num="0" f="0"/>
 			<S i="1f47" n="RMC SPORT 4" t="19" s="0" num="0" f="0"/>
 			<S i="1f48" n="NICKELODEON" t="19" s="0" num="0" f="0"/>
 			<S i="1f49" n="PINK X" t="19" s="0" num="0" f="0"/>
@@ -655,15 +647,16 @@
 			<S i="200a" n="BEIN SPORTS MAX 5" t="19" s="0" num="0" f="0"/>
 			<S i="200b" n="BEIN SPORTS MAX 6" t="19" s="0" num="0" f="0"/>
 			<S i="200c" n="NRJ HITS" t="19" s="0" num="0" f="0"/>
-			<S i="200d" n="SUNDANCE TV" t="19" s="0" num="0" f="0"/>
+			<S i="200d" n="11856V SID 0x200d" t="1" s="0" num="0" f="0"/>
 			<S i="200e" n="M6 BOUTIQUE" t="19" s="0" num="0" f="0"/>
-			<S i="200f" n="VICELAND" t="19" s="0" num="0" f="0"/>
+			<S i="200f" n="VICE TV" t="19" s="0" num="0" f="0"/>
 			<S i="2010" n="NICKELODEON+1" t="19" s="0" num="0" f="0"/>
 			<S i="2011" n="RMC DECOUVERTE" t="19" s="0" num="0" f="0"/>
 			<S i="2012" n="BEIN SPORTS 2" t="19" s="0" num="0" f="0"/>
 			<S i="2013" n="BEIN SPORTS 3" t="19" s="0" num="0" f="0"/>
 			<S i="2014" n="TFX" t="19" s="0" num="0" f="0"/>
 			<S i="2015" n="TMC" t="19" s="0" num="0" f="0"/>
+			<S i="2016" n="DISNEY+" t="19" s="0" num="0" f="0"/>
 			<S i="2017" n="MELODY" t="19" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0431" on="0001" frq="12109000" inv="2" sr="27500000" fec="3" pol="0" mod="0" sys="0">
@@ -690,7 +683,7 @@
 			<S i="2073" n="BEIN SPORTS MAX 9" t="19" s="0" num="0" f="0"/>
 			<S i="2074" n="BEIN SPORTS MAX 10" t="19" s="0" num="0" f="0"/>
 			<S i="2075" n="RMC STORY" t="19" s="0" num="0" f="0"/>
-			<S i="2076" n="L&apos;EQUIPE" t="19" s="0" num="0" f="0"/>
+			<S i="2076" n="L'EQUIPE" t="19" s="0" num="0" f="0"/>
 			<S i="2077" n="LA CHAINE METEO" t="19" s="0" num="0" f="0"/>
 			<S i="2081" n="ARTE" t="19" s="0" num="0" f="0"/>
 			<S i="2082" n="FRANCE O" t="19" s="0" num="0" f="0"/>
@@ -701,7 +694,7 @@
 			<S i="22c5" n="CLIQUE TV" t="19" s="0" num="0" f="0"/>
 			<S i="22ca" n="DISNEY JUNIOR" t="19" s="0" num="0" f="0"/>
 			<S i="22cd" n="CANAL+" t="19" s="0" num="0" f="0"/>
-			<S i="22ce" n="4K UHD - EVENEMENT" t="1f" s="0" num="0" f="0"/>
+			<S i="22ce" n="EVENEMENT SPORT 4K UHD" t="1f" s="0" num="0" f="0"/>
 			<S i="22d0" n="NICKELODEON JUNIOR" t="19" s="0" num="0" f="0"/>
 			<S i="22d1" n="MULTISPORTS 2" t="19" s="0" num="0" f="0"/>
 			<S i="22d2" n="RMC SPORT 1" t="19" s="0" num="0" f="0"/>
@@ -714,6 +707,7 @@
 			<S i="6ff6" n="Nick Jr." t="1" s="0" num="0" f="0"/>
 			<S i="6ff7" n="Nick Jr.." t="1" s="0" num="0" f="0"/>
 			<S i="6ff9" n="Nick Junior Global" t="1" s="0" num="0" f="0"/>
+			<S i="6ffb" n="Nick.Jr." t="1" s="0" num="0" f="0"/>
 			<S i="6ffc" n="Nick_Jr." t="1" s="0" num="0" f="0"/>
 			<S i="6fff" n="MTV Music 24" t="1" s="0" num="0" f="0"/>
 			<S i="7004" n="Comedy Central" t="1" s="0" num="0" f="0"/>
@@ -858,7 +852,7 @@
 			<S i="19ce" n="PARAMOUNT CHANNEL" t="19" s="0" num="0" f="0"/>
 			<S i="19cf" n="LIBIDO TV" t="19" s="0" num="0" f="0"/>
 			<S i="19d0" n="PENTHOUSE BLACK" t="19" s="0" num="0" f="0"/>
-			<S i="19d1" n="EVENEMENT" t="19" s="0" num="0" f="0"/>
+			<S i="19d1" n="CHAINE EVENEMENT" t="19" s="0" num="0" f="0"/>
 			<S i="19d2" n="SEASONS" t="19" s="0" num="0" f="0"/>
 			<S i="19d3" n="FOOT+ 24/24" t="19" s="0" num="0" f="0"/>
 			<S i="19d4" n="EQUIDIA" t="19" s="0" num="0" f="0"/>
@@ -945,6 +939,7 @@
 			<S i="4287" n="MANGAS" t="19" s="1" num="0" f="0"/>
 			<S i="428b" n="RTL9" t="19" s="1" num="0" f="0"/>
 			<S i="428c" n="CHASSE ET PECHE" t="1" s="1" num="0" f="0"/>
+			<S i="428d" n="A La Maison" t="19" s="0" num="0" f="0"/>
 			<S i="429e" n="XXL" t="19" s="0" num="0" f="0"/>
 			<S i="42cb" n="DATA SYSTEM 94" t="c" s="0" num="0" f="0"/>
 		</TS>
@@ -960,10 +955,10 @@
 			<S i="21fb" n="DATASYSTEM R9" t="c" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0449" on="0001" frq="12343000" inv="2" sr="30000000" fec="2" pol="0" mod="9" sys="1">
-			<S i="07d0" n="INSIGHT TV UHD" t="1f" s="0" num="0" f="0"/>
-			<S i="07d1" n="INSIGHT TV UHD SPAIN" t="1f" s="0" num="0" f="0"/>
-			<S i="07d5" n="INSIGHT UHD Russia" t="1f" s="0" num="0" f="0"/>
-			<S i="07da" n="QVC2 UHD" t="1f" s="0" num="0" f="0"/>
+			<S i="07d0" n="INSIGHT TV UHD" t="1f" s="0" num="0" f="1"/>
+			<S i="07d1" n="INSIGHT TV UHD SPAIN" t="1f" s="0" num="0" f="1"/>
+			<S i="07d5" n="INSIGHT UHD Russia" t="1f" s="0" num="0" f="1"/>
+			<S i="07da" n="QVC ZWEI UHD" t="1f" s="0" num="0" f="1"/>
 		</TS>
 		<TS id="044a" on="0001" frq="12363000" inv="2" sr="27500000" fec="3" pol="1" mod="0" sys="0">
 			<S i="238e" n="AUDIO PRIMO" t="2" s="0" num="0" f="0"/>
@@ -975,7 +970,7 @@
 			<S i="2394" n="12363V SID 0x2394" t="1" s="0" num="0" f="0"/>
 			<S i="2395" n="SUD RADIO" t="2" s="0" num="0" f="0"/>
 			<S i="2396" n="12363V SID 0x2396" t="2" s="0" num="0" f="0"/>
-			<S i="2397" n="BFM BUSINESS" t="2" s="0" num="0" f="0"/>
+			<S i="2397" n="12363V SID 0x2397" t="2" s="0" num="0" f="0"/>
 			<S i="2398" n="DOWNLOAD R7 G5 PACE" t="c0" s="0" num="0" f="0"/>
 			<S i="2399" n="RADIOS 2" t="c6" s="0" num="0" f="0"/>
 			<S i="239a" n="RADIOS 1" t="c6" s="0" num="0" f="0"/>
@@ -989,7 +984,6 @@
 			<S i="23a2" n="DEUTSCHE GRAMMOPHON+" t="c9" s="0" num="0" f="0"/>
 			<S i="23a3" n="CANAL+ A LA DEMANDE" t="c9" s="0" num="0" f="0"/>
 			<S i="23a5" n="NETFLIX" t="c9" s="0" num="0" f="0"/>
-			<S i="23a6" n="EVENEMENT" t="c9" s="0" num="0" f="0"/>
 			<S i="23aa" n="6PLAY" t="c9" s="0" num="0" f="0"/>
 			<S i="23ab" n="CANAL VOD" t="c9" s="0" num="0" f="0"/>
 			<S i="23ac" n="ESPACE CLIENT" t="c9" s="0" num="0" f="0"/>
@@ -1001,13 +995,14 @@
 			<S i="23b5" n="12363V SID 0x23b5" t="2" s="0" num="0" f="0"/>
 			<S i="23b6" n="BBCW SERVICE" t="2" s="0" num="0" f="0"/>
 			<S i="23b7" n="BBC ARABIC" t="2" s="0" num="0" f="0"/>
+			<S i="23b8" n="MELODY" t="2" s="0" num="0" f="0"/>
 			<S i="23ba" n="DOWNLOAD G5 SAMSUNG" t="c0" s="0" num="0" f="0"/>
 			<S i="23bb" n="DOWNLOAD G5 PACE" t="c0" s="0" num="0" f="0"/>
 			<S i="23bc" n="12363V SID 0x23bc" t="1" s="0" num="0" f="0"/>
 			<S i="23be" n="DOWNLOAD G5+ PACE" t="c0" s="0" num="0" f="0"/>
 			<S i="23bf" n="DOWNLOAD G5+ SAGEM" t="c0" s="0" num="0" f="0"/>
 			<S i="23c0" n="DOWNLOAD R7 G5+ PACE" t="c0" s="0" num="0" f="0"/>
-			<S i="23c1" n="MOUV&apos;" t="2" s="0" num="0" f="0"/>
+			<S i="23c1" n="MOUV'" t="2" s="0" num="0" f="0"/>
 			<S i="23c2" n="FRANCE MUSIQUE" t="2" s="0" num="0" f="0"/>
 			<S i="23c3" n="FIP" t="2" s="0" num="0" f="0"/>
 			<S i="23c4" n="FRANCE INFO" t="2" s="0" num="0" f="0"/>
@@ -1021,7 +1016,7 @@
 			<S i="23cc" n="RADIO CLASSIQUE" t="2" s="0" num="0" f="0"/>
 			<S i="23cd" n="RTL" t="2" s="0" num="0" f="0"/>
 			<S i="23ce" n="EUROPE 1" t="2" s="0" num="0" f="0"/>
-			<S i="23cf" n="RMC" t="2" s="0" num="0" f="0"/>
+			<S i="23cf" n="12363V SID 0x23cf" t="2" s="0" num="0" f="0"/>
 			<S i="23d0" n="RIRE &amp; CHANSONS" t="2" s="0" num="0" f="0"/>
 			<S i="23d1" n="LE PORN" t="c9" s="0" num="0" f="0"/>
 			<S i="23d2" n="12363V SID 0x23d2" t="1" s="0" num="0" f="0"/>
@@ -1054,7 +1049,7 @@
 			<S i="23ed" n="DATA SERVICE R7" t="c" s="0" num="0" f="0"/>
 			<S i="23ee" n="BEUR FM" t="2" s="0" num="0" f="0"/>
 			<S i="23ef" n="DATA SYSTEM[98]" t="c1" s="0" num="0" f="0"/>
-			<S i="23f1" n="NUMEROTATIONS" t="c9" s="0" num="0" f="0"/>
+			<S i="23f1" n="NUMEROTATIONS CANAL+" t="c9" s="0" num="0" f="0"/>
 			<S i="23f2" n="FOX PLAY" t="c9" s="0" num="0" f="0"/>
 			<S i="23f3" n="DATA SERVICE R9" t="c" s="0" num="0" f="0"/>
 			<S i="23f4" n="INFO TECHNIQUE" t="c9" s="0" num="0" f="0"/>
@@ -1062,6 +1057,8 @@
 		<TS id="044c" on="0001" frq="12402000" inv="2" sr="29700000" fec="2" pol="1" mod="9" sys="1">
 			<S i="21fd" n="FRANCE 4" t="19" s="0" num="0" f="0"/>
 			<S i="21fe" n="RMC SPORT 3" t="19" s="0" num="0" f="0"/>
+			<S i="21ff" n="ES1" t="19" s="0" num="0" f="0"/>
+			<S i="2200" n=".." t="19" s="0" num="0" f="0"/>
 			<S i="2201" n="TV BREIZH" t="19" s="0" num="0" f="0"/>
 			<S i="2202" n="RFM TV" t="19" s="0" num="0" f="0"/>
 			<S i="2203" n="TIJI" t="19" s="0" num="0" f="0"/>
@@ -1087,7 +1084,7 @@
 			<S i="196a" n="WARNER TV" t="19" s="0" num="0" f="0"/>
 			<S i="196b" n="MAN X" t="19" s="0" num="0" f="0"/>
 			<S i="196c" n="COMEDIE+" t="19" s="0" num="0" f="0"/>
-			<S i="196d" n="EXTREME SPORTS" t="19" s="0" num="0" f="0"/>
+			<S i="196d" n="12441V SID 0x196d" t="1" s="0" num="0" f="0"/>
 			<S i="196e" n="PIWI+" t="19" s="0" num="0" f="0"/>
 			<S i="196f" n="CANAL J" t="19" s="0" num="0" f="0"/>
 			<S i="1970" n="NICKELODEON TEEN" t="19" s="0" num="0" f="0"/>
@@ -1097,16 +1094,16 @@
 			<S i="19c7" n="DATASYSTEM" t="c" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0453" on="0001" frq="12544000" inv="2" sr="22000000" fec="5" pol="0" mod="0" sys="0">
-			<S i="445c" n="SAT.1" t="1" s="0" num="0" f="0"/>
-			<S i="445d" n="ProSieben" t="1" s="0" num="0" f="0"/>
-			<S i="445e" n="kabel eins" t="1" s="0" num="0" f="0"/>
-			<S i="445f" n="WELT" t="1" s="0" num="0" f="0"/>
-			<S i="4460" n="SAT.1 Gold" t="1" s="0" num="0" f="0"/>
-			<S i="4461" n="Pro7 MAXX" t="1" s="0" num="0" f="0"/>
-			<S i="4462" n="." t="1" s="0" num="0" f="0"/>
-			<S i="4463" n="SAT.1 Bayern" t="1" s="0" num="0" f="0"/>
-			<S i="4464" n="SAT.1 NRW" t="1" s="0" num="0" f="0"/>
-			<S i="4465" n="kabel eins Doku" t="1" s="0" num="0" f="0"/>
+			<S i="445c" n="SAT.1" t="1" s="0" num="0" f="1"/>
+			<S i="445d" n="ProSieben" t="1" s="0" num="0" f="1"/>
+			<S i="445e" n="kabel eins" t="1" s="0" num="0" f="1"/>
+			<S i="445f" n="WELT" t="1" s="0" num="0" f="1"/>
+			<S i="4460" n="SAT.1 Gold" t="1" s="0" num="0" f="1"/>
+			<S i="4461" n="Pro7 MAXX" t="1" s="0" num="0" f="1"/>
+			<S i="4462" n="." t="1" s="0" num="0" f="1"/>
+			<S i="4463" n="SAT.1 Bayern" t="1" s="0" num="0" f="1"/>
+			<S i="4464" n="SAT.1 NRW" t="1" s="0" num="0" f="1"/>
+			<S i="4465" n="kabel eins Doku" t="1" s="0" num="0" f="1"/>
 		</TS>
 		<TS id="0454" on="0001" frq="12551000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
 			<S i="000c" n="ASTRA SDT" t="81" s="0" num="0" f="0"/>
@@ -1158,7 +1155,6 @@
 			<S i="3139" n="K-TV" t="1" s="0" num="0" f="0"/>
 			<S i="313c" n="Deutsches Musik Fernsehen" t="1" s="0" num="0" f="0"/>
 			<S i="313e" n="MB SAT - Test 8" t="1" s="0" num="0" f="0"/>
-			<S i="313f" n="freenet TV connect" t="19" s="0" num="0" f="0"/>
 			<S i="3144" n="GayBoys LIVE" t="1" s="0" num="0" f="0"/>
 			<S i="3145" n="RAPS" t="c" s="0" num="0" f="0"/>
 			<S i="3146" n="rhein main tv" t="1" s="0" num="0" f="0"/>
@@ -1177,10 +1173,10 @@
 			<S i="3154" n="Achtung Sexy TV" t="1" s="0" num="0" f="0"/>
 			<S i="3155" n="Traumfrauen TV" t="1" s="0" num="0" f="0"/>
 			<S i="3156" n="Heiss und Sexy TV" t="1" s="0" num="0" f="0"/>
-			<S i="3159" n="Volksmusik.TV - Der neue Sender!" t="1" s="0" num="0" f="0"/>
+			<S i="3159" n="Volksmusik.TV - Neuer Sender!" t="1" s="0" num="0" f="0"/>
 			<S i="315a" n="nice" t="1" s="0" num="0" f="0"/>
 			<S i="315b" n="Babestation24" t="1" s="0" num="0" f="0"/>
-			<S i="315c" n="freenet Shopping" t="1" s="0" num="0" f="0"/>
+			<S i="315c" n="NicerDicerTV" t="1" s="0" num="0" f="0"/>
 			<S i="315e" n="MB SAT - Test3" t="c" s="0" num="0" f="0"/>
 			<S i="315f" n="EROTIKA TV - NEU!" t="1" s="0" num="0" f="0"/>
 			<S i="3160" n="BunnyClub24" t="1" s="0" num="0" f="0"/>
@@ -1196,13 +1192,13 @@
 			<S i="316f" n="Radio Paloma" t="2" s="0" num="0" f="0"/>
 			<S i="3170" n="Radio HBR" t="2" s="0" num="0" f="0"/>
 			<S i="3171" n="Radio HCJB" t="2" s="0" num="0" f="0"/>
-			<S i="3172" n="SCHLAGER-RADIO" t="2" s="0" num="0" f="0"/>
+			<S i="3172" n="Schlager Radio B2" t="2" s="0" num="0" f="0"/>
 			<S i="3173" n="Radio Gloria" t="2" s="0" num="0" f="0"/>
 			<S i="3174" n="HIT RADIO FFH" t="2" s="0" num="0" f="0"/>
 			<S i="3175" n="planet radio" t="2" s="0" num="0" f="0"/>
 			<S i="3176" n="harmony.fm" t="2" s="0" num="0" f="0"/>
 			<S i="3177" n="Radio Regenbogen" t="2" s="0" num="0" f="0"/>
-			<S i="3178" n="radioB2  SCHLAGER" t="2" s="0" num="0" f="0"/>
+			<S i="3178" n="Schlager Radio B2" t="2" s="0" num="0" f="0"/>
 			<S i="3179" n="Regenbogen 2" t="2" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="045b" on="0001" frq="12662000" inv="2" sr="22000000" fec="5" pol="0" mod="0" sys="0">
@@ -1249,14 +1245,14 @@
 			<S i="32d5" n="HITRADIO OE3" t="19" s="0" num="0" f="0"/>
 			<S i="32d6" n="ORF2E" t="1" s="0" num="0" f="0"/>
 			<S i="32d7" n="Mei Musi TV" t="1" s="0" num="0" f="0"/>
-			<S i="32da" n="Folx TV" t="1" s="0" num="0" f="0"/>
+			<S i="32da" n="Volksmusik.TV" t="1" s="0" num="0" f="0"/>
 			<S i="32db" n="RiC" t="1" s="0" num="0" f="0"/>
 			<S i="32dd" n="n-tv Austria" t="16" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0460" on="0001" frq="12728000" inv="2" sr="22000000" fec="2" pol="1" mod="9" sys="1">
 			<S i="2649" n="F3 BNORMANDIE" t="1" s="0" num="0" f="0"/>
 			<S i="264a" n="F3 PAYS DE LA LOIRE" t="1" s="0" num="0" f="0"/>
-			<S i="264b" n="F3 COTE D&apos;AZUR" t="1" s="0" num="0" f="0"/>
+			<S i="264b" n="F3 COTE D'AZUR" t="1" s="0" num="0" f="0"/>
 			<S i="264c" n="F3 CENTRE" t="1" s="0" num="0" f="0"/>
 			<S i="264d" n="F3 BOURGOGNE" t="1" s="0" num="0" f="0"/>
 			<S i="264e" n="F3 POITOUCHAR" t="1" s="0" num="0" f="0"/>
@@ -1335,9 +1331,9 @@
 			<S i="0016" n="Heimatkanal" t="16" s="0" num="0" f="0"/>
 			<S i="0018" n="Classica" t="16" s="0" num="0" f="0"/>
 			<S i="001e" n="Sky Sport Austria 1" t="16" s="0" num="0" f="0"/>
-			<S i="0029" n="Sky Cinema Hits" t="16" s="0" num="0" f="0"/>
+			<S i="0029" n="Sky Cinema Best Of" t="16" s="0" num="0" f="0"/>
 			<S i="008b" n="Sky Cinema Family HD" t="19" s="0" num="0" f="0"/>
-			<S i="0093" n="Sky 1 HD" t="19" s="0" num="0" f="0"/>
+			<S i="0093" n="Sky One HD" t="19" s="0" num="0" f="0"/>
 			<S i="00de" n="Sky Sport 2" t="16" s="0" num="0" f="0"/>
 			<S i="010f" n="Sky Select 3" t="16" s="0" num="0" f="0"/>
 			<S i="0110" n="Sky Sport Bundesliga 3" t="d3" s="0" num="0" f="0"/>
@@ -1359,11 +1355,10 @@
 			<S i="0f9a" n="Pace TDC 866 NSDX" t="c" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0003" on="0085" frq="11719000" inv="2" sr="27500000" fec="11" pol="0" mod="9" sys="1">
-			<S i="0008" n="Sky Cinema Comedy" t="16" s="0" num="0" f="0"/>
+			<S i="0008" n="Sky Cinema Fun" t="16" s="0" num="0" f="0"/>
 			<S i="0009" n="Sky Cinema Action" t="16" s="0" num="0" f="0"/>
 			<S i="001c" n="Boomerang" t="16" s="0" num="0" f="0"/>
 			<S i="0085" n="Beate Uhse HD" t="19" s="0" num="0" f="0"/>
-			<S i="008a" n="Disney Junior HD" t="19" s="0" num="0" f="0"/>
 			<S i="00c8" n="BDL VoD" t="c6" s="0" num="0" f="0"/>
 			<S i="00fb" n="Sky Select 1" t="16" s="0" num="0" f="0"/>
 			<S i="00fc" n="Sky Sport Bundesliga 10" t="d3" s="0" num="0" f="0"/>
@@ -1391,9 +1386,9 @@
 			<S i="0fb8" n="Pace DS 830 NP" t="c" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0004" on="0085" frq="12031000" inv="2" sr="27500000" fec="11" pol="0" mod="9" sys="1">
-			<S i="000a" n="Sky Cinema" t="16" s="0" num="0" f="0"/>
+			<S i="000a" n="Sky Cinema Premieren" t="16" s="0" num="0" f="0"/>
+			<S i="000b" n="Sky Cinema Thriller HD" t="19" s="0" num="0" f="0"/>
 			<S i="0012" n="Sky Select" t="16" s="0" num="0" f="0"/>
-			<S i="0014" n="Sky Cinema Emotion" t="16" s="0" num="0" f="0"/>
 			<S i="0017" n="Sky Krimi HD" t="19" s="0" num="0" f="0"/>
 			<S i="008c" n="TNT Film HD" t="19" s="0" num="0" f="0"/>
 			<S i="00dd" n="Sky Sport 1" t="16" s="0" num="0" f="0"/>
@@ -1402,7 +1397,6 @@
 			<S i="0134" n="Sky Sport 7 HD" t="19" s="0" num="0" f="0"/>
 			<S i="0136" n="Eurosport360HD 5" t="19" s="0" num="0" f="0"/>
 			<S i="0197" n="Sky Cinema Family" t="16" s="0" num="0" f="0"/>
-			<S i="0204" n="Sky Cinema Nostalgie" t="16" s="0" num="0" f="0"/>
 			<S i="0a83" n="NDS Applikation" t="c1" s="0" num="0" f="0"/>
 			<S i="0dac" n="BEM Service" t="95" s="0" num="0" f="0"/>
 			<S i="0dad" n="GFD Service" t="96" s="0" num="0" f="0"/>
@@ -1413,7 +1407,7 @@
 		<TS id="0005" on="0085" frq="12460000" inv="2" sr="27500000" fec="3" pol="0" mod="0" sys="0">
 			<S i="0030" n="N24 DOKU" t="1" s="0" num="0" f="0"/>
 			<S i="003e" n="EWTN katholisches TV" t="1" s="0" num="0" f="0"/>
-			<S i="0040" n="QVC Style" t="1" s="0" num="0" f="0"/>
+			<S i="0040" n="QVC STYLE" t="1" s="0" num="0" f="0"/>
 			<S i="004a" n="Nicer Dicer TV" t="1" s="0" num="0" f="0"/>
 			<S i="00ab" n="." t="2" s="0" num="0" f="0"/>
 			<S i="00ac" n="egoFM" t="2" s="0" num="0" f="0"/>
@@ -1433,12 +1427,11 @@
 			<S i="0fb9" n="12460H SID 0xfb9" t="64" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0006" on="0085" frq="11914000" inv="2" sr="27500000" fec="11" pol="0" mod="9" sys="1">
-			<S i="000b" n="Sky Cinema +1" t="16" s="0" num="0" f="0"/>
-			<S i="002b" n="Sky Cinema +24" t="16" s="0" num="0" f="0"/>
+			<S i="002b" n="Sky Cinema Premieren +24" t="16" s="0" num="0" f="0"/>
 			<S i="0076" n="Nat Geo Wild HD" t="19" s="0" num="0" f="0"/>
 			<S i="0081" n="Sky Sport 1 HD" t="19" s="0" num="0" f="0"/>
 			<S i="0082" n="Discovery HD" t="19" s="0" num="0" f="0"/>
-			<S i="0083" n="Sky Cinema HD" t="19" s="0" num="0" f="0"/>
+			<S i="0083" n="Sky Cinema Premieren HD" t="19" s="0" num="0" f="0"/>
 			<S i="010b" n="Sky Sport Bundesliga 2 HD" t="19" s="0" num="0" f="0"/>
 			<S i="010c" n="Sky Sport 3 HD" t="19" s="0" num="0" f="0"/>
 			<S i="010e" n="Eurosport360HD 1" t="19" s="0" num="0" f="0"/>
@@ -1446,6 +1439,7 @@
 			<S i="0148" n="Sky Sport 9 HD" t="19" s="0" num="0" f="0"/>
 			<S i="0149" n="Sky Sport Austria 2 HD" t="19" s="0" num="0" f="0"/>
 			<S i="014a" n="Eurosport360HD 7" t="19" s="0" num="0" f="0"/>
+			<S i="0204" n="Sky Cinema Classics" t="16" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0007" on="0085" frq="12148000" inv="2" sr="27500000" fec="3" pol="0" mod="0" sys="0">
 			<S i="0035" n="N24 DOKU Austria" t="1" s="0" num="0" f="0"/>
@@ -1494,8 +1488,7 @@
 			<S i="006d" n="Eurosport 2 HD" t="19" s="0" num="0" f="0"/>
 			<S i="0071" n="History HD" t="19" s="0" num="0" f="0"/>
 			<S i="0080" n="E! Entertainm. HD" t="19" s="0" num="0" f="0"/>
-			<S i="0086" n="Sky Cinema +1 HD" t="19" s="0" num="0" f="0"/>
-			<S i="0087" n="Sky Cinema +24 HD" t="19" s="0" num="0" f="0"/>
+			<S i="0087" n="Sky Cinema Premieren +24 HD" t="19" s="0" num="0" f="0"/>
 			<S i="0088" n="TNT Comedy HD" t="19" s="0" num="0" f="0"/>
 			<S i="00a8" n="Motorvision TV" t="16" s="0" num="0" f="0"/>
 			<S i="0101" n="Sky Sport Bundesliga 10 HD" t="19" s="0" num="0" f="0"/>
@@ -1512,7 +1505,7 @@
 		</TS>
 		<TS id="000c" on="0085" frq="12304000" inv="2" sr="27500000" fec="11" pol="0" mod="9" sys="1">
 			<S i="0069" n="Sky Sport Bundesliga 1 HD" t="19" s="0" num="0" f="0"/>
-			<S i="006b" n="Sky Cinema Hits HD" t="19" s="0" num="0" f="0"/>
+			<S i="006b" n="Sky Cinema Best Of HD" t="19" s="0" num="0" f="0"/>
 			<S i="006c" n="Sky Sport News HD" t="19" s="0" num="0" f="0"/>
 			<S i="0075" n="Sky Serien &amp; Shows HD" t="19" s="0" num="0" f="0"/>
 			<S i="007c" n="Fox HD" t="19" s="0" num="0" f="0"/>
@@ -1529,9 +1522,10 @@
 			<S i="0fc3" n="Humax PR-HD3000S" t="c" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="000d" on="0085" frq="11992000" inv="2" sr="27500000" fec="11" pol="0" mod="9" sys="1">
+			<S i="001b" n="Nicktoons" t="16" s="0" num="0" f="0"/>
 			<S i="0031" n="Spiegel TV Wissen" t="16" s="0" num="0" f="0"/>
 			<S i="006e" n="Sky Atlantic HD" t="19" s="0" num="0" f="0"/>
-			<S i="006f" n="Sky Cinema Mittelerde HD" t="19" s="0" num="0" f="0"/>
+			<S i="006f" n="Sky Cinema  Fast &amp; Furious HD" t="19" s="0" num="0" f="0"/>
 			<S i="0070" n="NatGeo HD" t="19" s="0" num="0" f="0"/>
 			<S i="0072" n="Sky Sport 2 HD" t="19" s="0" num="0" f="0"/>
 			<S i="007f" n="13th Street HD" t="19" s="0" num="0" f="0"/>
@@ -1544,7 +1538,7 @@
 			<S i="0023" n="Zee One" t="1" s="0" num="0" f="0"/>
 			<S i="0025" n="Sky Sport News" t="1" s="0" num="0" f="0"/>
 			<S i="0026" n="HGTV" t="1" s="0" num="0" f="0"/>
-			<S i="0027" n="MediaShop- Meine Einkaufswelt" t="1" s="0" num="0" f="0"/>
+			<S i="0027" n="Mediashop Life" t="1" s="0" num="0" f="0"/>
 			<S i="0037" n="." t="19" s="0" num="0" f="0"/>
 			<S i="0038" n="." t="1" s="0" num="0" f="0"/>
 			<S i="0039" n="." t="16" s="0" num="0" f="0"/>
@@ -1569,7 +1563,7 @@
 			<S i="002f" n="REGIO TV" t="16" s="0" num="0" f="0"/>
 			<S i="0033" n="TELE 5" t="1" s="0" num="0" f="0"/>
 			<S i="003f" n="DMAX" t="1" s="0" num="0" f="0"/>
-			<S i="004c" n="Baden TV" t="16" s="0" num="0" f="0"/>
+			<S i="004c" n="." t="16" s="0" num="0" f="0"/>
 			<S i="004d" n="HSE24 TREND" t="1" s="0" num="0" f="0"/>
 			<S i="0295" n="AstroTV" t="1" s="0" num="0" f="0"/>
 			<S i="0381" n="e8 television" t="1" s="0" num="0" f="0"/>

data/initial/ubouquets.xml

@@ -92,7 +92,6 @@
 		<S i="16ab" n="Ulm-Allgäu HD" t="3ff" on="1" s="192" frq="11552" l="0"/>
 		<S i="16ac" n="tv.ingolstadt HD" t="3ff" on="1" s="192" frq="11552" l="0"/>
 		<S i="3146" n="rhein main tv" t="459" on="1" s="192" frq="12633" l="0"/>
-		<S i="4c" n="Baden TV" t="21" on="85" s="192" frq="12480" l="0"/>
 		<S i="3339" n="L-TV" t="45b" on="1" s="192" frq="12662" l="0"/>
 		<S i="16ae" n="BB-MV-LokalTV" t="3ff" on="1" s="192" frq="11552" l="0"/>
 		<S i="2f" n="REGIO TV" t="21" on="85" s="192" frq="12480" l="0"/>
@@ -111,6 +110,7 @@
 		<S i="445e" n="kabel eins" t="453" on="1" s="192" frq="12544" l="0"/>
 		<S i="4465" n="kabel eins Doku" t="453" on="1" s="192" frq="12544" l="0"/>
 		<S i="2f1c" n="VOX" t="441" on="1" s="192" frq="12187" l="0"/>
+		<S i="7094" n="VOXup" t="443" on="1" s="192" frq="12226" l="0"/>
 		<S i="33" n="TELE 5" t="21" on="85" s="192" frq="12480" l="0"/>
 		<S i="308" n="SIXX" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="304" n="TLC" t="5" on="85" s="192" frq="12460" l="0"/>
@@ -151,6 +151,7 @@
 		<S i="313c" n="Deutsches Musik Fernsehen" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="32d7" n="Mei Musi TV" t="45d" on="1" s="192" frq="12692" l="0"/>
 		<S i="23a2" n="DEUTSCHE GRAMMOPHON+" t="44a" on="1" s="192" frq="12363" l="0"/>
+		<S i="3159" n="Volksmusik.TV - Neuer Sender!" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="191" n="Jukebox" t="9" on="85" s="192" frq="11170" l="0"/>
 		<S i="6ff0" n="VH1" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff1" n="VH1 Classic" t="436" on="1" s="192" frq="11973" l="0"/>
@@ -187,8 +188,6 @@
 		<S i="2753" n="Bloomberg Europe TV" t="402" on="1" s="192" frq="11597" l="0"/>
 		<S i="1c7a" n="Sky News Intl" t="457" on="1" s="192" frq="12603" l="0"/>
 		<S i="1146" n="CNN Int." t="404" on="1" s="192" frq="11626" l="0"/>
-		<S i="1af8" n="Russia Today" t="3fe" on="1" s="192" frq="11538" l="0"/>
-		<S i="1078" n="RAI News 24" t="3ee" on="1" s="192" frq="11288" l="0"/>
 		<S i="1389" n="BBC World News Europe HD" t="3ea" on="1" s="192" frq="11229" l="0"/>
 		<S i="1b61" n="Al Jazeera Channel" t="3fc" on="1" s="192" frq="11508" l="0"/>
 		<S i="1158" n="Al Jazeera English" t="404" on="1" s="192" frq="11626" l="0"/>
@@ -221,7 +220,7 @@
 		<S i="49" n="DMAX Austria" t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="14c0" n="kabel1 Doku austria" t="407" on="1" s="192" frq="11670" l="0"/>
 		<S i="33aa" n="Starparadies AT" t="3eb" on="1" s="192" frq="11243" l="0"/>
-		<S i="32da" n="Folx TV" t="45d" on="1" s="192" frq="12692" l="0"/>
+		<S i="32da" n="Volksmusik.TV" t="45d" on="1" s="192" frq="12692" l="0"/>
 		<S i="32db" n="RiC" t="45d" on="1" s="192" frq="12692" l="0"/>
 		<S i="3400" n="R9 Oesterreich HD" t="3ed" on="1" s="192" frq="11273" l="0"/>
 		<S i="3402" n="oe24.TV HD" t="3ed" on="1" s="192" frq="11273" l="0"/>
@@ -257,6 +256,7 @@
 		<S i="3d" n="NICKELODEON AT" t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="3c" n="Comedy Central Austria" t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="33fe" n="flimmit Zusatzpaket" t="3ed" on="1" s="192" frq="11273" l="0"/>
+		<S i="3401" n="krone.tv" t="3ed" on="1" s="192" frq="11273" l="0"/>
 		<S i="3330" n="LT1-OOE" t="45b" on="1" s="192" frq="12662" l="0"/>
 		<S i="32c9" n="ORF1" t="45d" on="1" s="192" frq="12692" l="0"/>
 		<S i="32ca" n="ORF2" t="45d" on="1" s="192" frq="12692" l="0"/>
@@ -303,66 +303,97 @@
 		<S i="1260" n="3+" t="3f7" on="1" s="192" frq="11420" l="0"/>
 		<S i="3070" n="RTL 2 CH" t="3f5" on="1" s="192" frq="11391" l="0"/>
 		<S i="4e26" n="SAT.1 CH" t="43a" on="1" s="192" frq="12051" l="0"/>
-		<S i="7094" n="VOXup" t="443" on="1" s="192" frq="12226" l="0"/>
 		<S i="4e21" n="ProSieben Schweiz" t="43a" on="1" s="192" frq="12051" l="0"/>
 		<S i="4e23" n="Kabel 1 Schweiz" t="43a" on="1" s="192" frq="12051" l="0"/>
 		<S i="3403" n="Starparadies A" t="3ed" on="1" s="192" frq="11273" l="0"/>
 	</Bouquet>
 	<Bouquet name="Sky Starter" hidden="0" locked="0">
-		<S i="93" n="Sky 1 HD" t="2" on="85" s="192" frq="11758" l="0"/>
-		<S i="75" n="Sky Serien &amp; Shows HD" t="c" on="85" s="192" frq="12304" l="0"/>
-		<S i="7e" n="SYFY HD" t="c" on="85" s="192" frq="12304" l="0"/>
-		<S i="65" n="Universal TV HD" t="9" on="85" s="192" frq="11170" l="0"/>
+		<S i="93" n="Sky One HD" t="2" on="85" s="192" frq="11758" l="0"/>
+		<S i="17" n="Sky Krimi HD" t="4" on="85" s="192" frq="12031" l="0"/>
 		<S i="7f" n="13th Street HD" t="d" on="85" s="192" frq="11992" l="0"/>
-		<S i="7b" n="TNT Serie HD" t="9" on="85" s="192" frq="11170" l="0"/>
-		<S i="7c" n="Fox HD" t="c" on="85" s="192" frq="12304" l="0"/>
-		<S i="206" n="Romance TV" t="2" on="85" s="192" frq="11758" l="0"/>
-		<S i="16" n="Heimatkanal" t="2" on="85" s="192" frq="11758" l="0"/>
 		<S i="82" n="Discovery HD" t="6" on="85" s="192" frq="11914" l="0"/>
-		<S i="70" n="NatGeo HD" t="d" on="85" s="192" frq="11992" l="0"/>
+		<S i="80" n="E! Entertainm. HD" t="b" on="85" s="192" frq="12382" l="0"/>
+		<S i="30d6" n="Eurosport 1 HD" t="413" on="1" s="192" frq="11111" l="0"/>
+		<S i="7c" n="Fox HD" t="c" on="85" s="192" frq="12304" l="0"/>
+		<S i="71" n="History HD" t="b" on="85" s="192" frq="12382" l="0"/>
+		<S i="1392" n="INSIGHT TV HD" t="3ea" on="1" s="192" frq="11229" l="0"/>
 		<S i="76" n="Nat Geo Wild HD" t="6" on="85" s="192" frq="11914" l="0"/>
+		<S i="70" n="NatGeo HD" t="d" on="85" s="192" frq="11992" l="0"/>
 		<S i="89" n="Spiegel Geschichte HD" t="10" on="85" s="192" frq="11797" l="0"/>
-		<S i="31" n="Spiegel TV Wissen" t="d" on="85" s="192" frq="11992" l="0"/>
-		<S i="a8" n="Motorvision TV" t="b" on="85" s="192" frq="12382" l="0"/>
-		<S i="192" n="Crime + Investigation" t="b" on="85" s="192" frq="12382" l="0"/>
-		<S i="194" n="Cartoon Network" t="b" on="85" s="192" frq="12382" l="0"/>
+		<S i="7e" n="SYFY HD" t="c" on="85" s="192" frq="12304" l="0"/>
+		<S i="88" n="TNT Comedy HD" t="b" on="85" s="192" frq="12382" l="0"/>
+		<S i="7b" n="TNT Serie HD" t="9" on="85" s="192" frq="11170" l="0"/>
+		<S i="65" n="Universal TV HD" t="9" on="85" s="192" frq="11170" l="0"/>
 		<S i="1c" n="Boomerang" t="3" on="85" s="192" frq="11719" l="0"/>
-		<S i="8a" n="Disney Junior HD" t="3" on="85" s="192" frq="11719" l="0"/>
-		<S i="191" n="Jukebox" t="9" on="85" s="192" frq="11170" l="0"/>
+		<S i="194" n="Cartoon Network" t="b" on="85" s="192" frq="12382" l="0"/>
 		<S i="18" n="Classica" t="2" on="85" s="192" frq="11758" l="0"/>
+		<S i="192" n="Crime + Investigation" t="b" on="85" s="192" frq="12382" l="0"/>
+		<S i="16" n="Heimatkanal" t="2" on="85" s="192" frq="11758" l="0"/>
+		<S i="191" n="Jukebox" t="9" on="85" s="192" frq="11170" l="0"/>
+		<S i="13" n="Junior" t="2" on="85" s="192" frq="11758" l="0"/>
+		<S i="a8" n="Motorvision TV" t="b" on="85" s="192" frq="12382" l="0"/>
+		<S i="6ffb" n="Nick.Jr." t="436" on="1" s="192" frq="11973" l="0"/>
+		<S i="1b" n="Nicktoons" t="d" on="85" s="192" frq="11992" l="0"/>
+		<S i="206" n="Romance TV" t="2" on="85" s="192" frq="11758" l="0"/>
+		<S i="31" n="Spiegel TV Wissen" t="d" on="85" s="192" frq="11992" l="0"/>
+		<S i="75" n="Sky Serien &amp; Shows HD" t="c" on="85" s="192" frq="12304" l="0"/>
 	</Bouquet>
 	<Bouquet name="Sky Entertainment" hidden="0" locked="0">
 		<S i="6e" n="Sky Atlantic HD" t="d" on="85" s="192" frq="11992" l="0"/>
+		<S i="93" n="Sky One HD" t="2" on="85" s="192" frq="11758" l="0"/>
 		<S i="17" n="Sky Krimi HD" t="4" on="85" s="192" frq="12031" l="0"/>
-		<S i="71" n="History HD" t="b" on="85" s="192" frq="12382" l="0"/>
-		<S i="88" n="TNT Comedy HD" t="b" on="85" s="192" frq="12382" l="0"/>
+		<S i="7f" n="13th Street HD" t="d" on="85" s="192" frq="11992" l="0"/>
+		<S i="82" n="Discovery HD" t="6" on="85" s="192" frq="11914" l="0"/>
 		<S i="80" n="E! Entertainm. HD" t="b" on="85" s="192" frq="12382" l="0"/>
+		<S i="30d6" n="Eurosport 1 HD" t="413" on="1" s="192" frq="11111" l="0"/>
+		<S i="7c" n="Fox HD" t="c" on="85" s="192" frq="12304" l="0"/>
+		<S i="71" n="History HD" t="b" on="85" s="192" frq="12382" l="0"/>
+		<S i="1392" n="INSIGHT TV HD" t="3ea" on="1" s="192" frq="11229" l="0"/>
+		<S i="76" n="Nat Geo Wild HD" t="6" on="85" s="192" frq="11914" l="0"/>
+		<S i="70" n="NatGeo HD" t="d" on="85" s="192" frq="11992" l="0"/>
+		<S i="89" n="Spiegel Geschichte HD" t="10" on="85" s="192" frq="11797" l="0"/>
+		<S i="7e" n="SYFY HD" t="c" on="85" s="192" frq="12304" l="0"/>
+		<S i="88" n="TNT Comedy HD" t="b" on="85" s="192" frq="12382" l="0"/>
+		<S i="7b" n="TNT Serie HD" t="9" on="85" s="192" frq="11170" l="0"/>
+		<S i="65" n="Universal TV HD" t="9" on="85" s="192" frq="11170" l="0"/>
+		<S i="1c" n="Boomerang" t="3" on="85" s="192" frq="11719" l="0"/>
+		<S i="194" n="Cartoon Network" t="b" on="85" s="192" frq="12382" l="0"/>
+		<S i="18" n="Classica" t="2" on="85" s="192" frq="11758" l="0"/>
+		<S i="192" n="Crime + Investigation" t="b" on="85" s="192" frq="12382" l="0"/>
+		<S i="16" n="Heimatkanal" t="2" on="85" s="192" frq="11758" l="0"/>
+		<S i="191" n="Jukebox" t="9" on="85" s="192" frq="11170" l="0"/>
+		<S i="13" n="Junior" t="2" on="85" s="192" frq="11758" l="0"/>
+		<S i="a8" n="Motorvision TV" t="b" on="85" s="192" frq="12382" l="0"/>
+		<S i="6ffb" n="Nick.Jr." t="436" on="1" s="192" frq="11973" l="0"/>
+		<S i="1b" n="Nicktoons" t="d" on="85" s="192" frq="11992" l="0"/>
+		<S i="206" n="Romance TV" t="2" on="85" s="192" frq="11758" l="0"/>
+		<S i="31" n="Spiegel TV Wissen" t="d" on="85" s="192" frq="11992" l="0"/>
+		<S i="75" n="Sky Serien &amp; Shows HD" t="c" on="85" s="192" frq="12304" l="0"/>
 	</Bouquet>
 	<Bouquet name="Sky Cinema" hidden="0" locked="0">
-		<S i="a" n="Sky Cinema" t="4" on="85" s="192" frq="12031" l="0"/>
-		<S i="b" n="Sky Cinema +1" t="6" on="85" s="192" frq="11914" l="0"/>
-		<S i="2b" n="Sky Cinema +24" t="6" on="85" s="192" frq="11914" l="0"/>
+		<S i="a" n="Sky Cinema Premieren" t="4" on="85" s="192" frq="12031" l="0"/>
+		<S i="2b" n="Sky Cinema Premieren +24" t="6" on="85" s="192" frq="11914" l="0"/>
 		<S i="197" n="Sky Cinema Family" t="4" on="85" s="192" frq="12031" l="0"/>
 		<S i="9" n="Sky Cinema Action" t="3" on="85" s="192" frq="11719" l="0"/>
-		<S i="29" n="Sky Cinema Hits" t="2" on="85" s="192" frq="11758" l="0"/>
-		<S i="204" n="Sky Cinema Nostalgie" t="4" on="85" s="192" frq="12031" l="0"/>
-		<S i="8" n="Sky Cinema Comedy" t="3" on="85" s="192" frq="11719" l="0"/>
-		<S i="14" n="Sky Cinema Emotion" t="4" on="85" s="192" frq="12031" l="0"/>
+		<S i="29" n="Sky Cinema Best Of" t="2" on="85" s="192" frq="11758" l="0"/>
+		<S i="8" n="Sky Cinema Fun" t="3" on="85" s="192" frq="11719" l="0"/>
+		<S i="204" n="Sky Cinema Classics" t="6" on="85" s="192" frq="11914" l="0"/>
 		<S i="196" n="Kinowelt TV" t="2" on="85" s="192" frq="11758" l="0"/>
-		<S i="83" n="Sky Cinema HD" t="6" on="85" s="192" frq="11914" l="0"/>
-		<S i="86" n="Sky Cinema +1 HD" t="b" on="85" s="192" frq="12382" l="0"/>
-		<S i="87" n="Sky Cinema +24 HD" t="b" on="85" s="192" frq="12382" l="0"/>
+		<S i="83" n="Sky Cinema Premieren HD" t="6" on="85" s="192" frq="11914" l="0"/>
+		<S i="87" n="Sky Cinema Premieren +24 HD" t="b" on="85" s="192" frq="12382" l="0"/>
 		<S i="8b" n="Sky Cinema Family HD" t="2" on="85" s="192" frq="11758" l="0"/>
 		<S i="74" n="Sky Cinema Action HD" t="9" on="85" s="192" frq="11170" l="0"/>
-		<S i="6f" n="Sky Cinema Mittelerde HD" t="d" on="85" s="192" frq="11992" l="0"/>
-		<S i="6b" n="Sky Cinema Hits HD" t="c" on="85" s="192" frq="12304" l="0"/>
+		<S i="6b" n="Sky Cinema Best Of HD" t="c" on="85" s="192" frq="12304" l="0"/>
+		<S i="6f" n="Sky Cinema  Fast &amp; Furious HD" t="d" on="85" s="192" frq="11992" l="0"/>
+		<S i="b" n="Sky Cinema Thriller HD" t="4" on="85" s="192" frq="12031" l="0"/>
 		<S i="8c" n="TNT Film HD" t="4" on="85" s="192" frq="12031" l="0"/>
 	</Bouquet>
 	<Bouquet name="Sky Kids" hidden="0" locked="0">
 		<S i="1c" n="Boomerang" t="3" on="85" s="192" frq="11719" l="0"/>
-		<S i="8a" n="Disney Junior HD" t="3" on="85" s="192" frq="11719" l="0"/>
 		<S i="194" n="Cartoon Network" t="b" on="85" s="192" frq="12382" l="0"/>
 		<S i="13" n="Junior" t="2" on="85" s="192" frq="11758" l="0"/>
+		<S i="1b" n="Nicktoons" t="d" on="85" s="192" frq="11992" l="0"/>
+		<S i="6ffb" n="Nick.Jr." t="436" on="1" s="192" frq="11973" l="0"/>
 	</Bouquet>
 	<Bouquet name="Sky Sport" hidden="0" locked="0">
 		<S i="25" n="Sky Sport News" t="f" on="85" s="192" frq="10920" l="0"/>
@@ -379,7 +410,6 @@
 		<S i="fd" n="Sky Sport 11" t="3" on="85" s="192" frq="11719" l="0"/>
 	</Bouquet>
 	<Bouquet name="Sky Sport HD" hidden="0" locked="0">
-		<S i="1194" n="SPORTDIGITAL FUSSBALL HD" t="406" on="1" s="192" frq="11656" l="0"/>
 		<S i="1581" n="SPORT1 HD" t="41f" on="1" s="192" frq="10802" l="0"/>
 		<S i="6c" n="Sky Sport News HD" t="c" on="85" s="192" frq="12304" l="0"/>
 		<S i="81" n="Sky Sport 1 HD" t="6" on="85" s="192" frq="11914" l="0"/>
@@ -471,35 +501,41 @@
 	<Bouquet name="Sky UHD" hidden="0" locked="0">
 		<S i="229" n="Sky Sport UHD" t="10" on="85" s="192" frq="11797" l="0"/>
 		<S i="228" n="Sky Sport Bundesliga UHD" t="10" on="85" s="192" frq="11797" l="0"/>
-		<S i="183a" n="Travelxp 4k" t="40b" on="1" s="192" frq="10993" l="0"/>
 	</Bouquet>
 	<Bouquet name="Sky DAZN" hidden="0" locked="0">
 		<S i="84" n="DAZN 1 Bar HD" t="9" on="85" s="192" frq="11170" l="0"/>
 		<S i="7a" n="DAZN 2 Bar HD" t="10" on="85" s="192" frq="11797" l="0"/>
 	</Bouquet>
+	<Bouquet name="TrendSports TV" hidden="0" locked="0">
+		<S i="1197" n="EDGEsport" t="406" on="1" s="192" frq="11656" l="0"/>
+		<S i="1195" n="SPORT1+" t="406" on="1" s="192" frq="11656" l="0"/>
+		<S i="1196" n="eSPORTS1" t="406" on="1" s="192" frq="11656" l="0"/>
+		<S i="1194" n="SPORTDIGITAL FUSSBALL HD" t="406" on="1" s="192" frq="11656" l="0"/>
+		<S i="1198" n="WAIDWERK" t="406" on="1" s="192" frq="11656" l="0"/>
+	</Bouquet>
 	<Bouquet name="Platzhalter." hidden="0" locked="0">
 		<S i="320" n="STEST1" t="c" on="85" s="192" frq="12304" l="0"/>
 		<S i="321" n="STEST2" t="c" on="85" s="192" frq="12304" l="0"/>
 		<S i="4e2b" n="." t="43a" on="1" s="192" frq="12051" l="0"/>
 		<S i="4462" n="." t="453" on="1" s="192" frq="12544" l="0"/>
 		<S i="14b6" n="." t="407" on="1" s="192" frq="11670" l="0"/>
+		<S i="ef8d" n="." t="3f9" on="1" s="192" frq="11464" l="0"/>
 	</Bouquet>
 	<Bouquet name="religion" hidden="0" locked="0">
 		<S i="2f5a" n="Bibel TV" t="454" on="1" s="192" frq="12551" l="0"/>
 		<S i="3e" n="EWTN katholisches TV" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="3139" n="K-TV" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="5278" n="SOPHIA TV" t="41d" on="1" s="192" frq="10773" l="0"/>
-		<S i="1081" n="Deutschland Vozrozhdenie" t="3ee" on="1" s="192" frq="11288" l="0"/>
 		<S i="1269" n="Die Neue Zeit TV" t="3f7" on="1" s="192" frq="11420" l="0"/>
 		<S i="2760" n="Sonlife Broadcasting Network" t="402" on="1" s="192" frq="11597" l="0"/>
-		<S i="33a8" n="Bibel TV HD" t="3eb" on="1" s="192" frq="11243" l="0"/>
-		<S i="33ab" n="HOPE Channel HD" t="3eb" on="1" s="192" frq="11243" l="0"/>
 		<S i="1417" n="TBN Russia" t="403" on="1" s="192" frq="11611" l="0"/>
+		<S i="33a8" n="Bibel TV HD" t="3eb" on="1" s="192" frq="11243" l="0"/>
+		<S i="33ab" n="HopeTV" t="3eb" on="1" s="192" frq="11243" l="0"/>
 	</Bouquet>
 	<Bouquet name="shopping/games" hidden="0" locked="0">
 		<S i="2f44" n="QVC Deutschland" t="454" on="1" s="192" frq="12551" l="0"/>
 		<S i="d42" n="QVC2" t="454" on="1" s="192" frq="12551" l="0"/>
-		<S i="40" n="QVC Style" t="5" on="85" s="192" frq="12460" l="0"/>
+		<S i="40" n="QVC STYLE" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="702" n="QVC" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="79ea" n="HSE24 EXTRA" t="443" on="1" s="192" frq="12226" l="0"/>
 		<S i="4d" n="HSE24 TREND" t="21" on="85" s="192" frq="12480" l="0"/>
@@ -512,25 +548,21 @@
 		<S i="383" n="meinTVshop" t="21" on="85" s="192" frq="12480" l="0"/>
 		<S i="296" n="1-2-3.tv" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="295" n="AstroTV" t="21" on="85" s="192" frq="12480" l="0"/>
-		<S i="27" n="MediaShop- Meine Einkaufswelt" t="f" on="85" s="192" frq="10920" l="0"/>
+		<S i="27" n="Mediashop Life" t="f" on="85" s="192" frq="10920" l="0"/>
 		<S i="301" n="Channel21" t="7" on="85" s="192" frq="12148" l="0"/>
-		<S i="315c" n="freenet Shopping" t="459" on="1" s="192" frq="12633" l="0"/>
-		<S i="313c" n="Deutsches Musik Fernsehen" t="459" on="1" s="192" frq="12633" l="0"/>
+		<S i="315c" n="NicerDicerTV" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="36" n="Genius exklusiv" t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="5279" n="Genius Plus" t="41d" on="1" s="192" frq="10773" l="0"/>
 		<S i="33ff" n="Aristo.TV" t="3ed" on="1" s="192" frq="11273" l="0"/>
 		<S i="381" n="e8 television" t="21" on="85" s="192" frq="12480" l="0"/>
 		<S i="202" n="Immer etwas Neues TV" t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="20" n="Sonnenklar TV" t="21" on="85" s="192" frq="12480" l="0"/>
-		<S i="3159" n="Volksmusik.TV - Der neue Sender!" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="293" n="Handystar TV" t="5" on="85" s="192" frq="12460" l="0"/>
-		<S i="32d7" n="Mei Musi TV" t="45d" on="1" s="192" frq="12692" l="0"/>
 		<S i="4a" n="Nicer Dicer TV" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="26" n="HGTV" t="f" on="85" s="192" frq="10920" l="0"/>
-		<S i="1419" n="Juvelirochka" t="403" on="1" s="192" frq="11611" l="0"/>
 		<S i="526f" n="QVC HD" t="41d" on="1" s="192" frq="10773" l="0"/>
-		<S i="1580" n="QVC2 HD" t="41f" on="1" s="192" frq="10802" l="0"/>
-		<S i="2779" n="QVC Style HD" t="409" on="1" s="192" frq="10964" l="0"/>
+		<S i="1580" n="QVC ZWEI HD" t="41f" on="1" s="192" frq="10802" l="0"/>
+		<S i="2779" n="QVC STYLE HD" t="409" on="1" s="192" frq="10964" l="0"/>
 		<S i="5270" n="HSE24 HD" t="41d" on="1" s="192" frq="10773" l="0"/>
 		<S i="157d" n="HSE24 EXTRA HD" t="41f" on="1" s="192" frq="10802" l="0"/>
 		<S i="2776" n="Handystar TV HD" t="409" on="1" s="192" frq="10964" l="0"/>
@@ -539,6 +571,7 @@
 		<S i="157e" n="1-2-3.tv HD" t="41f" on="1" s="192" frq="10802" l="0"/>
 		<S i="1518" n="sonnenklar.TV HD" t="455" on="1" s="192" frq="12574" l="0"/>
 		<S i="2778" n="Channel21 HD" t="409" on="1" s="192" frq="10964" l="0"/>
+		<S i="1419" n="BestMarket TV" t="403" on="1" s="192" frq="11611" l="0"/>
 	</Bouquet>
 	<Bouquet name="chat/screenpeaks" hidden="0" locked="0">
 		<S i="3333" n="VISIT-X.tv" t="45b" on="1" s="192" frq="12662" l="0"/>
@@ -574,6 +607,7 @@
 		<S i="2eaf" n="NITRO HD" t="411" on="1" s="192" frq="11082" l="0"/>
 		<S i="ef11" n="VOX HD" t="421" on="1" s="192" frq="10832" l="0"/>
 		<S i="ef76" n="kabel eins HD" t="3f9" on="1" s="192" frq="11464" l="0"/>
+		<S i="ef79" n="Kabel Eins Doku HD" t="3f9" on="1" s="192" frq="11464" l="0"/>
 		<S i="ef77" n="SIXX HD" t="3f9" on="1" s="192" frq="11464" l="0"/>
 		<S i="2774" n="TLC HD" t="409" on="1" s="192" frq="10964" l="0"/>
 		<S i="5273" n="Comedy Central HD" t="41d" on="1" s="192" frq="10773" l="0"/>
@@ -588,8 +622,8 @@
 		<S i="1518" n="sonnenklar.TV HD" t="455" on="1" s="192" frq="12574" l="0"/>
 		<S i="157f" n="Deluxe Music HD" t="41f" on="1" s="192" frq="10802" l="0"/>
 		<S i="2777" n="MTV HD" t="409" on="1" s="192" frq="10964" l="0"/>
-		<S i="183a" n="Travelxp 4k" t="40b" on="1" s="192" frq="10993" l="0"/>
 		<S i="307a" n="RTL UHD" t="3f5" on="1" s="192" frq="11391" l="0"/>
+		<S i="1392" n="INSIGHT TV HD" t="3ea" on="1" s="192" frq="11229" l="0"/>
 	</Bouquet>
 	<Bouquet name="erotik" hidden="0" locked="0">
 		<S i="778b" n="PLAYBOY TV" t="424" on="1" s="192" frq="10876" l="0"/>
@@ -646,25 +680,23 @@
 		<S i="3b" n="." t="f" on="85" s="192" frq="10920" l="0"/>
 		<S i="46" n="." t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="306" n="." t="7" on="85" s="192" frq="12148" l="0"/>
+		<S i="4c" n="." t="21" on="85" s="192" frq="12480" l="0"/>
 	</Bouquet>
 	<Bouquet name="UHD" hidden="0" locked="0">
 		<S i="307a" n="RTL UHD" t="3f5" on="1" s="192" frq="11391" l="0"/>
 		<S i="3462" n="RTL UHD Austria" t="3e9" on="1" s="192" frq="11214" l="0"/>
-		<S i="1086" n="QVC UHD" t="3ee" on="1" s="192" frq="11288" l="0"/>
 		<S i="1" n="SES UHD Demo Channel" t="40b" on="1" s="192" frq="10993" l="0"/>
 		<S i="2" n="UHD1 by ASTRA / HD+" t="40b" on="1" s="192" frq="10993" l="0"/>
-		<S i="30de" n="Fashion 4K" t="413" on="1" s="192" frq="11111" l="0"/>
-		<S i="183a" n="Travelxp 4k" t="40b" on="1" s="192" frq="10993" l="0"/>
 		<S i="229" n="Sky Sport UHD" t="10" on="85" s="192" frq="11797" l="0"/>
 		<S i="228" n="Sky Sport Bundesliga UHD" t="10" on="85" s="192" frq="11797" l="0"/>
-		<S i="22ce" n="4K UHD - EVENEMENT" t="434" on="1" s="192" frq="11934" l="0"/>
+		<S i="22ce" n="EVENEMENT SPORT 4K UHD" t="434" on="1" s="192" frq="11934" l="0"/>
 		<S i="7d0" n="INSIGHT TV UHD" t="449" on="1" s="192" frq="12343" l="0"/>
 		<S i="7d1" n="INSIGHT TV UHD SPAIN" t="449" on="1" s="192" frq="12343" l="0"/>
 		<S i="7d5" n="INSIGHT UHD Russia" t="449" on="1" s="192" frq="12343" l="0"/>
-		<S i="7da" n="QVC2 UHD" t="449" on="1" s="192" frq="12343" l="0"/>
+		<S i="7da" n="QVC ZWEI UHD" t="449" on="1" s="192" frq="12343" l="0"/>
+		<S i="1086" n="QVC UHD" t="3ee" on="1" s="192" frq="11288" l="0"/>
 	</Bouquet>
 	<Bouquet name="Astra_TV" hidden="0" locked="0">
-		<S i="1392" n="INSIGHT TV HD" t="3ea" on="1" s="192" frq="11229" l="0"/>
 		<S i="1393" n="INSIGHT TV HD INT" t="3ea" on="1" s="192" frq="11229" l="0"/>
 		<S i="6eeb" n="WDR Test A" t="4b1" on="1" s="192" frq="12421" l="0"/>
 		<S i="6e3d" n="ARD-TEST-1" t="431" on="1" s="192" frq="12109" l="0"/>
@@ -672,35 +704,27 @@
 		<S i="7036" n="Test-R" t="41b" on="1" s="192" frq="10743" l="0"/>
 		<S i="1b03" n="TV5MONDE EUROPE" t="3fe" on="1" s="192" frq="11538" l="0"/>
 		<S i="7a48" n="TELESUR" t="410" on="1" s="192" frq="11067" l="0"/>
-		<S i="7a49" n="TBN Espana" t="410" on="1" s="192" frq="11067" l="0"/>
-		<S i="7a4a" n="TVGA" t="410" on="1" s="192" frq="11067" l="0"/>
 		<S i="7a4b" n="I24 Francis" t="410" on="1" s="192" frq="11067" l="0"/>
 		<S i="7a45" n="TV Record SD" t="410" on="1" s="192" frq="11067" l="0"/>
-		<S i="7a4d" n="TELEMAROC" t="410" on="1" s="192" frq="11067" l="0"/>
 		<S i="139d" n="NHK WORLD-JPN" t="3ea" on="1" s="192" frq="11229" l="0"/>
 		<S i="2762" n="Algerie 3" t="402" on="1" s="192" frq="11597" l="0"/>
 		<S i="2763" n="Canal Algerie" t="402" on="1" s="192" frq="11597" l="0"/>
-		<S i="1131" n="TVE INTERNACIONAL EUROPA" t="404" on="1" s="192" frq="11626" l="0"/>
-		<S i="1132" n="CANAL 24 HORAS" t="404" on="1" s="192" frq="11626" l="0"/>
 		<S i="7699" n="MEZZO" t="41e" on="1" s="192" frq="10788" l="0"/>
 		<S i="788d" n="CAZAyPESCA HD" t="414" on="1" s="192" frq="11126" l="0"/>
 		<S i="2f6c" n="Cherie 25" t="454" on="1" s="192" frq="12551" l="0"/>
 		<S i="2f6d" n="Cherie 25" t="454" on="1" s="192" frq="12551" l="0"/>
 		<S i="1006" n="AB3" t="451" on="35" s="192" frq="12515" l="0"/>
-		<S i="141b" n="8 TV RU" t="403" on="1" s="192" frq="11611" l="0"/>
 		<S i="3338" n="4MEDIATHEK" t="45b" on="1" s="192" frq="12662" l="0"/>
 		<S i="15e1" n="TVRUS" t="403" on="1" s="192" frq="11611" l="0"/>
-		<S i="140a" n="YOL TV" t="403" on="1" s="192" frq="11611" l="0"/>
 		<S i="76c4" n="11038V SID 0x76c4" t="40e" on="1" s="192" frq="11038" l="0"/>
 		<S i="101e" n="Elevensports1" t="451" on="35" s="192" frq="12515" l="0"/>
-		<S i="13d9" n="MB LIVE" t="3ea" on="1" s="192" frq="11229" l="0"/>
-		<S i="1195" n="SPORT1+" t="406" on="1" s="192" frq="11656" l="0"/>
-		<S i="1196" n="eSPORTS1" t="406" on="1" s="192" frq="11656" l="0"/>
-		<S i="1197" n="EDGEsport" t="406" on="1" s="192" frq="11656" l="0"/>
+		<S i="1645" n="BVN TV" t="42c" on="1" s="192" frq="11778" l="0"/>
 		<S i="759b" n="10847V SID 0x759b" t="422" on="1" s="192" frq="10847" l="0"/>
 		<S i="75f3" n="" t="422" on="1" s="192" frq="10847" l="0"/>
 		<S i="30d5" n="." t="413" on="1" s="192" frq="11111" l="0"/>
 		<S i="75fb" n="." t="408" on="1" s="192" frq="11685" l="0"/>
+		<S i="30de" n="." t="413" on="1" s="192" frq="11111" l="0"/>
+		<S i="183a" n="." t="40b" on="1" s="192" frq="10993" l="0"/>
 		<S i="75f4" n="10847V SID 0x75f4" t="422" on="1" s="192" frq="10847" l="0"/>
 		<S i="2392" n="12363V SID 0x2392" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23bc" n="12363V SID 0x23bc" t="44a" on="1" s="192" frq="12363" l="0"/>
@@ -727,13 +751,15 @@
 		<S i="7587" n="11097V SID 0x7587" t="412" on="1" s="192" frq="11097" l="0"/>
 		<S i="7586" n="11097V SID 0x7586" t="412" on="1" s="192" frq="11097" l="0"/>
 		<S i="7585" n="11097V SID 0x7585" t="412" on="1" s="192" frq="11097" l="0"/>
-		<S i="76cb" n="11038V SID 0x76cb" t="40e" on="1" s="192" frq="11038" l="0"/>
 		<S i="76c1" n="11038V SID 0x76c1" t="40e" on="1" s="192" frq="11038" l="0"/>
 		<S i="7474" n="11317V SID 0x7474" t="3f0" on="1" s="192" frq="11317" l="0"/>
 		<S i="7473" n="11317V SID 0x7473" t="3f0" on="1" s="192" frq="11317" l="0"/>
 		<S i="7472" n="11317V SID 0x7472" t="3f0" on="1" s="192" frq="11317" l="0"/>
 		<S i="78be" n="11258V SID 0x78be" t="3ec" on="1" s="192" frq="11258" l="0"/>
-		<S i="78b9" n="11258V SID 0x78b9" t="3ec" on="1" s="192" frq="11258" l="0"/>
+		<S i="200d" n="11856V SID 0x200d" t="430" on="1" s="192" frq="11856" l="0"/>
+		<S i="196d" n="12441V SID 0x196d" t="44e" on="1" s="192" frq="12441" l="0"/>
+		<S i="76cb" n="11038V SID 0x76cb" t="40e" on="1" s="192" frq="11038" l="0"/>
+		<S i="788a" n="11126V SID 0x788a" t="414" on="1" s="192" frq="11126" l="0"/>
 	</Bouquet>
 	<Bouquet name="MTV Networks" hidden="0" locked="0">
 		<S i="7004" n="Comedy Central" t="436" on="1" s="192" frq="11973" l="0"/>
@@ -746,6 +772,7 @@
 		<S i="7006" n="MTV" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="7005" n="Nick_Jr.." t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ffc" n="Nick_Jr." t="436" on="1" s="192" frq="11973" l="0"/>
+		<S i="6ffb" n="Nick.Jr." t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff9" n="Nick Junior Global" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff7" n="Nick Jr.." t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff6" n="Nick Jr." t="436" on="1" s="192" frq="11973" l="0"/>
@@ -825,8 +852,8 @@
 		<S i="77c6" n="M.CineDoc&amp;Roll" t="40a" on="1" s="192" frq="10979" l="0"/>
 		<S i="7789" n="M. GOLF" t="424" on="1" s="192" frq="10876" l="0"/>
 		<S i="769c" n="M. LaLiga 3" t="41e" on="1" s="192" frq="10788" l="0"/>
-		<S i="749d" n="M. DISNEY" t="41c" on="1" s="192" frq="10758" l="0"/>
-		<S i="7607" n="TEST P" t="408" on="1" s="192" frq="11685" l="0"/>
+		<S i="749d" n="TEST M" t="41c" on="1" s="192" frq="10758" l="0"/>
+		<S i="7607" n="Disney+" t="408" on="1" s="192" frq="11685" l="0"/>
 		<S i="778e" n="#VAMOS BAR" t="424" on="1" s="192" frq="10876" l="0"/>
 		<S i="772e" n="NICKELODEON" t="416" on="1" s="192" frq="11156" l="0"/>
 		<S i="7570" n="TOROS" t="412" on="1" s="192" frq="11097" l="0"/>
@@ -909,7 +936,7 @@
 		<S i="7468" n="FOX LIFE" t="3f0" on="1" s="192" frq="11317" l="0"/>
 		<S i="7823" n="MEZZO LIVE HD" t="428" on="1" s="192" frq="10935" l="0"/>
 		<S i="75ff" n="CANAL PANDA" t="408" on="1" s="192" frq="11685" l="0"/>
-		<S i="772a" n="DISNEY XD" t="416" on="1" s="192" frq="11156" l="0"/>
+		<S i="772a" n="TEST D" t="416" on="1" s="192" frq="11156" l="0"/>
 		<S i="76c3" n="DISNEY CH." t="40e" on="1" s="192" frq="11038" l="0"/>
 		<S i="746b" n="DISNEY JR" t="3f0" on="1" s="192" frq="11317" l="0"/>
 		<S i="7602" n="CLASSICA" t="408" on="1" s="192" frq="11685" l="0"/>
@@ -977,7 +1004,7 @@
 		<S i="21ae" n="MOSAIQUE" t="448" on="1" s="192" frq="12324" l="0"/>
 		<S i="2649" n="F3 BNORMANDIE" t="460" on="1" s="192" frq="12728" l="0"/>
 		<S i="264a" n="F3 PAYS DE LA LOIRE" t="460" on="1" s="192" frq="12728" l="0"/>
-		<S i="264b" n="F3 COTE D&apos;AZUR" t="460" on="1" s="192" frq="12728" l="0"/>
+		<S i="264b" n="F3 COTE D'AZUR" t="460" on="1" s="192" frq="12728" l="0"/>
 		<S i="264c" n="F3 CENTRE" t="460" on="1" s="192" frq="12728" l="0"/>
 		<S i="264d" n="F3 BOURGOGNE" t="460" on="1" s="192" frq="12728" l="0"/>
 		<S i="264e" n="F3 POITOUCHAR" t="460" on="1" s="192" frq="12728" l="0"/>
@@ -1042,6 +1069,7 @@
 		<S i="24c4" n="TELETOON+1" t="43c" on="1" s="192" frq="12090" l="0"/>
 		<S i="26b4" n="CARTOON NETWORK" t="43e" on="1" s="192" frq="12129" l="0"/>
 		<S i="22ca" n="DISNEY JUNIOR" t="434" on="1" s="192" frq="11934" l="0"/>
+		<S i="2016" n="DISNEY+" t="430" on="1" s="192" frq="11856" l="0"/>
 		<S i="23a1" n="MON NICKELODEON JUNIOR" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="427e" n="ANIMAUX" t="446" on="1" s="192" frq="12285" l="0"/>
 		<S i="4287" n="MANGAS" t="446" on="1" s="192" frq="12285" l="0"/>
@@ -1099,7 +1127,7 @@
 		<S i="232a" n="NATIONAL GEO" t="442" on="1" s="192" frq="12207" l="0"/>
 		<S i="1965" n="NATIONAL GEOGRAPHIC  WILD" t="44e" on="1" s="192" frq="12441" l="0"/>
 		<S i="26b8" n="PLANETE+ A&amp;E" t="43e" on="1" s="192" frq="12129" l="0"/>
-		<S i="2076" n="L&apos;EQUIPE" t="432" on="1" s="192" frq="11895" l="0"/>
+		<S i="2076" n="L'EQUIPE" t="432" on="1" s="192" frq="11895" l="0"/>
 		<S i="427c" n="AUTOMOTO la chaine" t="446" on="1" s="192" frq="12285" l="0"/>
 		<S i="427d" n="AB1" t="446" on="1" s="192" frq="12285" l="0"/>
 		<S i="4286" n="ACTION" t="446" on="1" s="192" frq="12285" l="0"/>
@@ -1108,7 +1136,7 @@
 		<S i="4281" n="TREK" t="446" on="1" s="192" frq="12285" l="0"/>
 		<S i="219d" n="ASSOCIATION MATERIEL" t="448" on="1" s="192" frq="12324" l="0"/>
 		<S i="232b" n="TF1 SERIES FILMS" t="442" on="1" s="192" frq="12207" l="0"/>
-		<S i="1f46" n="HISTOIRE" t="42e" on="1" s="192" frq="11817" l="0"/>
+		<S i="1f46" n="HISTOIRE TV" t="42e" on="1" s="192" frq="11817" l="0"/>
 		<S i="19cd" n="VOYAGE" t="444" on="1" s="192" frq="12246" l="0"/>
 		<S i="232d" n="BOING" t="442" on="1" s="192" frq="12207" l="0"/>
 		<S i="2333" n="BOOMERANG" t="442" on="1" s="192" frq="12207" l="0"/>
@@ -1130,17 +1158,15 @@
 		<S i="200c" n="NRJ HITS" t="430" on="1" s="192" frq="11856" l="0"/>
 		<S i="2017" n="MELODY" t="430" on="1" s="192" frq="11856" l="0"/>
 		<S i="220a" n="MCM" t="44c" on="1" s="192" frq="12402" l="0"/>
-		<S i="200d" n="SUNDANCE TV" t="430" on="1" s="192" frq="11856" l="0"/>
-		<S i="200f" n="VICELAND" t="430" on="1" s="192" frq="11856" l="0"/>
-		<S i="23f1" n="NUMEROTATIONS" t="44a" on="1" s="192" frq="12363" l="0"/>
+		<S i="200f" n="VICE TV" t="430" on="1" s="192" frq="11856" l="0"/>
+		<S i="23f1" n="NUMEROTATIONS CANAL+" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23f2" n="FOX PLAY" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="232c" n="PARIS PREMIERE" t="442" on="1" s="192" frq="12207" l="0"/>
 		<S i="2461" n="EUROSPORT 1" t="440" on="1" s="192" frq="12168" l="0"/>
 		<S i="24be" n="EUROSPORT 2" t="43c" on="1" s="192" frq="12090" l="0"/>
 		<S i="22c5" n="CLIQUE TV" t="434" on="1" s="192" frq="11934" l="0"/>
 		<S i="26af" n="GOLF+" t="43e" on="1" s="192" frq="12129" l="0"/>
-		<S i="196d" n="EXTREME SPORTS" t="44e" on="1" s="192" frq="12441" l="0"/>
-		<S i="19d1" n="EVENEMENT" t="444" on="1" s="192" frq="12246" l="0"/>
+		<S i="19d1" n="CHAINE EVENEMENT" t="444" on="1" s="192" frq="12246" l="0"/>
 		<S i="2011" n="RMC DECOUVERTE" t="430" on="1" s="192" frq="11856" l="0"/>
 		<S i="19cb" n="RMC SPORT NEWS" t="444" on="1" s="192" frq="12246" l="0"/>
 		<S i="22d2" n="RMC SPORT 1" t="434" on="1" s="192" frq="11934" l="0"/>
@@ -1170,13 +1196,15 @@
 		<S i="21af" n="MOSAIQUE BEIN SPORTS" t="448" on="1" s="192" frq="12324" l="0"/>
 		<S i="1f4a" n="MEZZO" t="42e" on="1" s="192" frq="11817" l="0"/>
 		<S i="1966" n="MEZZO LIVE" t="44e" on="1" s="192" frq="12441" l="0"/>
+		<S i="1f42" n="OLYMPIA TV" t="42e" on="1" s="192" frq="11817" l="0"/>
 		<S i="1f41" n="BET" t="42e" on="1" s="192" frq="11817" l="0"/>
 		<S i="26b3" n="PENTHOUSE" t="43e" on="1" s="192" frq="12129" l="0"/>
 		<S i="19d0" n="PENTHOUSE BLACK" t="444" on="1" s="192" frq="12246" l="0"/>
 		<S i="1f49" n="PINK X" t="42e" on="1" s="192" frq="11817" l="0"/>
 		<S i="19cf" n="LIBIDO TV" t="444" on="1" s="192" frq="12246" l="0"/>
+		<S i="21ff" n="ES1" t="44c" on="1" s="192" frq="12402" l="0"/>
+		<S i="2200" n=".." t="44c" on="1" s="192" frq="12402" l="0"/>
 		<S i="23a5" n="NETFLIX" t="44a" on="1" s="192" frq="12363" l="0"/>
-		<S i="23a6" n="EVENEMENT" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23d4" n="DIAGNOSTIC TECHNIQUE" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="239d" n="." t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="1f4f" n="TRACE LATINA" t="42e" on="1" s="192" frq="11817" l="0"/>
@@ -1184,7 +1212,7 @@
 	<Bouquet name="Orange" hidden="0" locked="0">
 		<S i="2649" n="F3 BNORMANDIE" t="460" on="1" s="192" frq="12728" l="0"/>
 		<S i="264a" n="F3 PAYS DE LA LOIRE" t="460" on="1" s="192" frq="12728" l="0"/>
-		<S i="264b" n="F3 COTE D&apos;AZUR" t="460" on="1" s="192" frq="12728" l="0"/>
+		<S i="264b" n="F3 COTE D'AZUR" t="460" on="1" s="192" frq="12728" l="0"/>
 		<S i="264c" n="F3 CENTRE" t="460" on="1" s="192" frq="12728" l="0"/>
 		<S i="264d" n="F3 BOURGOGNE" t="460" on="1" s="192" frq="12728" l="0"/>
 		<S i="264e" n="F3 POITOUCHAR" t="460" on="1" s="192" frq="12728" l="0"/>
@@ -1235,6 +1263,7 @@
 		<S i="4281" n="TREK" t="446" on="1" s="192" frq="12285" l="0"/>
 		<S i="4280" n="XXL" t="446" on="1" s="192" frq="12285" l="0"/>
 		<S i="429e" n="XXL" t="446" on="1" s="192" frq="12285" l="0"/>
+		<S i="428d" n="A La Maison" t="446" on="1" s="192" frq="12285" l="0"/>
 	</Bouquet>
 	<Bouquet name="Mobistar" hidden="0" locked="0">
 		<S i="6fff" n="MTV Music 24" t="436" on="1" s="192" frq="11973" l="0"/>
@@ -1245,7 +1274,7 @@
 	<Bouquet name="TNTSat" hidden="0" locked="0">
 		<S i="2649" n="F3 BNORMANDIE" t="460" on="1" s="192" frq="12728" l="0"/>
 		<S i="264a" n="F3 PAYS DE LA LOIRE" t="460" on="1" s="192" frq="12728" l="0"/>
-		<S i="264b" n="F3 COTE D&apos;AZUR" t="460" on="1" s="192" frq="12728" l="0"/>
+		<S i="264b" n="F3 COTE D'AZUR" t="460" on="1" s="192" frq="12728" l="0"/>
 		<S i="264c" n="F3 CENTRE" t="460" on="1" s="192" frq="12728" l="0"/>
 		<S i="264d" n="F3 BOURGOGNE" t="460" on="1" s="192" frq="12728" l="0"/>
 		<S i="264e" n="F3 POITOUCHAR" t="460" on="1" s="192" frq="12728" l="0"/>
@@ -1311,15 +1340,14 @@
 		<S i="1033" n="VElevenSports2" t="451" on="35" s="192" frq="12515" l="0"/>
 	</Bouquet>
 	<Bouquet name="Globecast" hidden="0" locked="0">
-		<S i="1afe" n="France 24 (in Arabic)" t="3fe" on="1" s="192" frq="11538" l="0"/>
 		<S i="1af9" n="France 24 (en Français)" t="3fe" on="1" s="192" frq="11538" l="0"/>
 		<S i="1afa" n="France 24 (in English)" t="3fe" on="1" s="192" frq="11538" l="0"/>
-		<S i="1af8" n="Russia Today" t="3fe" on="1" s="192" frq="11538" l="0"/>
 		<S i="47e" n="RT Esp" t="410" on="1" s="192" frq="11067" l="0"/>
 		<S i="1b60" n="Cubavision Internacional" t="3fc" on="1" s="192" frq="11508" l="0"/>
 		<S i="1b63" n="Arirang TV" t="3fc" on="1" s="192" frq="11508" l="0"/>
+		<S i="1419" n="BestMarket TV" t="403" on="1" s="192" frq="11611" l="0"/>
 		<S i="18f0" n="EXTREMADURA SAT" t="3f4" on="1" s="192" frq="11376" l="0"/>
-		<S i="1b0d" n="TEST" t="3fe" on="1" s="192" frq="11538" l="0"/>
+		<S i="18f1" n="TVGA HD EUROPA" t="3f4" on="1" s="192" frq="11376" l="0"/>
 		<S i="18ed" n="RT HD" t="3f4" on="1" s="192" frq="11376" l="0"/>
 		<S i="18f8" n="RT Esp HD" t="3f4" on="1" s="192" frq="11376" l="0"/>
 		<S i="18ee" n="RT Esp HD" t="3f4" on="1" s="192" frq="11376" l="0"/>
@@ -1328,12 +1356,10 @@
 		<S i="18ec" n="TELESUR HD" t="3f4" on="1" s="192" frq="11376" l="0"/>
 	</Bouquet>
 	<Bouquet name="MEDIA BROADCAST" hidden="0" locked="0">
-		<S i="3159" n="Volksmusik.TV - Der neue Sender!" t="459" on="1" s="192" frq="12633" l="0"/>
+		<S i="3159" n="Volksmusik.TV - Neuer Sender!" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="315a" n="nice" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="3138" n="health.tv" t="459" on="1" s="192" frq="12633" l="0"/>
-		<S i="313f" n="freenet TV connect" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="314d" n="MB SAT - Test1" t="459" on="1" s="192" frq="12633" l="0"/>
-		<S i="3164" n="MB SAT - Test2" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="3166" n="MB SAT - Test4" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="3167" n="MB SAT - Test5" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="3165" n="MB SAT - Test6" t="459" on="1" s="192" frq="12633" l="0"/>
@@ -1353,9 +1379,6 @@
 	<Bouquet name="Arqiva" hidden="0" locked="0">
 		<S i="1158" n="Al Jazeera English" t="404" on="1" s="192" frq="11626" l="0"/>
 	</Bouquet>
-	<Bouquet name="Harmonic/Telespazio/RFI" hidden="0" locked="0">
-		<S i="1090" n="D7 TV" t="3ee" on="1" s="192" frq="11288" l="0"/>
-	</Bouquet>
 	<Bouquet name="DATA" hidden="0" locked="0">
 		<S i="c8" n="BDL VoD" t="3" on="85" s="192" frq="11719" l="0"/>
 		<S i="6e5a" n="ARD-Data-1" t="431" on="1" s="192" frq="12109" l="0"/>
@@ -1387,7 +1410,6 @@
 		<S i="7507" n="10817V SID 0x7507" t="420" on="1" s="192" frq="10817" l="0"/>
 		<S i="7794" n="10876V SID 0x7794" t="424" on="1" s="192" frq="10876" l="0"/>
 		<S i="77ca" n="10979V SID 0x77ca" t="40a" on="1" s="192" frq="10979" l="0"/>
-		<S i="76cd" n="11038V SID 0x76cd" t="40e" on="1" s="192" frq="11038" l="0"/>
 		<S i="7564" n="11097V SID 0x7564" t="412" on="1" s="192" frq="11097" l="0"/>
 		<S i="7728" n="11156V SID 0x7728" t="416" on="1" s="192" frq="11156" l="0"/>
 		<S i="1c7e" n="IDS DOWNLOAD SVC" t="457" on="1" s="192" frq="12603" l="0"/>
@@ -1491,16 +1513,15 @@
 		<S i="78c2" n="11258V SID 0x78c2" t="3ec" on="1" s="192" frq="11258" l="0"/>
 		<S i="74dc" n="11435V SID 0x74dc" t="3f8" on="1" s="192" frq="11435" l="0"/>
 		<S i="7865" n="10729V SID 0x7865" t="41a" on="1" s="192" frq="10729" l="0"/>
-		<S i="52cb" n="10773H SID 0x52cb" t="41d" on="1" s="192" frq="10773" l="0"/>
-		<S i="52cc" n="10773H SID 0x52cc" t="41d" on="1" s="192" frq="10773" l="0"/>
 		<S i="21f3" n="DOWNLOAD G10 SAGEM" t="448" on="1" s="192" frq="12324" l="0"/>
 		<S i="21f4" n="DOWNLOAD G10 HUMAX" t="448" on="1" s="192" frq="12324" l="0"/>
 		<S i="ff5" n="MZ-102" t="451" on="35" s="192" frq="12515" l="0"/>
 		<S i="75a4" n="10847V SID 0x75a4" t="422" on="1" s="192" frq="10847" l="0"/>
 		<S i="782c" n="10935V SID 0x782c" t="428" on="1" s="192" frq="10935" l="0"/>
+		<S i="76cd" n="11038V SID 0x76cd" t="40e" on="1" s="192" frq="11038" l="0"/>
 	</Bouquet>
 	<Bouquet name="Favourites (TV)" hidden="0" locked="0">
-	</Bouquet>
+</Bouquet>
 	<Bouquet name="Radio_deutsch" hidden="0" locked="0">
 		<S i="6d6d" n="Dlf" t="437" on="1" s="192" frq="11953" l="0"/>
 		<S i="6d6c" n="Dlf Kultur" t="437" on="1" s="192" frq="11953" l="0"/>
@@ -1577,8 +1598,8 @@
 		<S i="b1" n="JAM FM" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="3174" n="HIT RADIO FFH" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="3175" n="planet radio" t="459" on="1" s="192" frq="12633" l="0"/>
-		<S i="3172" n="SCHLAGER-RADIO" t="459" on="1" s="192" frq="12633" l="0"/>
-		<S i="3178" n="radioB2  SCHLAGER" t="459" on="1" s="192" frq="12633" l="0"/>
+		<S i="3172" n="Schlager Radio B2" t="459" on="1" s="192" frq="12633" l="0"/>
+		<S i="3178" n="Schlager Radio B2" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="316b" n="Inselradio" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="ad" n="Klassik Radio" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="316f" n="Radio Paloma" t="459" on="1" s="192" frq="12633" l="0"/>
@@ -1603,18 +1624,15 @@
 		<S i="3349" n="OE2 V" t="45b" on="1" s="192" frq="12662" l="0"/>
 		<S i="3343" n="OE2 W" t="45b" on="1" s="192" frq="12662" l="0"/>
 		<S i="334d" n="OE3" t="45b" on="1" s="192" frq="12662" l="0"/>
+		<S i="1338" n="OE3." t="3ef" on="1" s="192" frq="11302" l="0"/>
 		<S i="32d5" n="HITRADIO OE3" t="45d" on="1" s="192" frq="12692" l="0"/>
 		<S i="334e" n="FM4" t="45b" on="1" s="192" frq="12662" l="0"/>
 		<S i="3350" n="U1 Tirol" t="45b" on="1" s="192" frq="12662" l="0"/>
 	</Bouquet>
-	<Bouquet name="Radio_Schweiz" hidden="0" locked="0">
-		<S i="a3" n="." t="7" on="85" s="192" frq="12148" l="0"/>
-	</Bouquet>
 	<Bouquet name="religion" hidden="0" locked="0">
 		<S i="a1" n="ERF Plus" t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="a2" n="ERF Pop" t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="fdc" n="Radio Lebensquelle" t="451" on="35" s="192" frq="12515" l="0"/>
-		<S i="a3" n="." t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="3354" n="RADIO MARIA" t="45b" on="1" s="192" frq="12662" l="0"/>
 		<S i="3173" n="Radio Gloria" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="1c79" n="Radio Horeb" t="457" on="1" s="192" frq="12603" l="0"/>
@@ -1634,12 +1652,12 @@
 		<S i="23ee" n="BEUR FM" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="2395" n="SUD RADIO" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="2396" n="12363V SID 0x2396" t="44a" on="1" s="192" frq="12363" l="0"/>
-		<S i="2397" n="BFM BUSINESS" t="44a" on="1" s="192" frq="12363" l="0"/>
+		<S i="2397" n="12363V SID 0x2397" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23b4" n="FUN RADIO" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23b5" n="12363V SID 0x23b5" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23b6" n="BBCW SERVICE" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23b7" n="BBC ARABIC" t="44a" on="1" s="192" frq="12363" l="0"/>
-		<S i="23c1" n="MOUV&apos;" t="44a" on="1" s="192" frq="12363" l="0"/>
+		<S i="23c1" n="MOUV'" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23c2" n="FRANCE MUSIQUE" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23c3" n="FIP" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23c4" n="FRANCE INFO" t="44a" on="1" s="192" frq="12363" l="0"/>
@@ -1650,7 +1668,7 @@
 		<S i="23cc" n="RADIO CLASSIQUE" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23cd" n="RTL" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23ce" n="EUROPE 1" t="44a" on="1" s="192" frq="12363" l="0"/>
-		<S i="23cf" n="RMC" t="44a" on="1" s="192" frq="12363" l="0"/>
+		<S i="23cf" n="12363V SID 0x23cf" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23d0" n="RIRE &amp; CHANSONS" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23d7" n="TSF JAZZ" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23d8" n="OUI FM" t="44a" on="1" s="192" frq="12363" l="0"/>
@@ -1667,26 +1685,27 @@
 		<S i="23e3" n="SKYROCK" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23ea" n="RADIO NOTRE DAME" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23eb" n="12363V SID 0x23eb" t="44a" on="1" s="192" frq="12363" l="0"/>
+		<S i="23b8" n="MELODY" t="44a" on="1" s="192" frq="12363" l="0"/>
 	</Bouquet>
 	<Bouquet name="TV Vlaanderen" hidden="0" locked="0">
 		<S i="1012" n="Nostalgie" t="451" on="35" s="192" frq="12515" l="0"/>
 	</Bouquet>
+	<Bouquet name="Globecast" hidden="0" locked="0">
+		<S i="18f2" n="RADIO GALEGA" t="3f4" on="1" s="192" frq="11376" l="0"/>
+		<S i="18f3" n="RADIO GALEGA MUSICA" t="3f4" on="1" s="192" frq="11376" l="0"/>
+	</Bouquet>
 	<Bouquet name="Astra_Radio" hidden="0" locked="0">
 		<S i="13fc" n="TSR Turkce" t="403" on="1" s="192" frq="11611" l="0"/>
 		<S i="238e" n="AUDIO PRIMO" t="44a" on="1" s="192" frq="12363" l="0"/>
-		<S i="113b" n="RNE RADIO 1" t="404" on="1" s="192" frq="11626" l="0"/>
-		<S i="113c" n="RNE RADIO 3" t="404" on="1" s="192" frq="11626" l="0"/>
-		<S i="113d" n="RNE RADIO 4" t="404" on="1" s="192" frq="11626" l="0"/>
-		<S i="113e" n="RNE RADIO 5 TODO NOTICIAS" t="404" on="1" s="192" frq="11626" l="0"/>
-		<S i="113f" n="RNE RADIO CLASICA" t="404" on="1" s="192" frq="11626" l="0"/>
-		<S i="1140" n="RNE RADIO EXTERIOR DE ESPAÑA" t="404" on="1" s="192" frq="11626" l="0"/>
-		<S i="7599" n="10847V SID 0x7599" t="422" on="1" s="192" frq="10847" l="0"/>
 		<S i="101a" n="VRT Radio1" t="451" on="35" s="192" frq="12515" l="0"/>
+		<S i="1646" n="VRT Radio 1" t="42c" on="1" s="192" frq="11778" l="0"/>
 		<S i="101b" n="VRT Radio2" t="451" on="35" s="192" frq="12515" l="0"/>
 		<S i="103f" n="NRJ" t="451" on="35" s="192" frq="12515" l="0"/>
 		<S i="af" n="." t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="ae" n="." t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="ab" n="." t="5" on="85" s="192" frq="12460" l="0"/>
+		<S i="a3" n="." t="7" on="85" s="192" frq="12148" l="0"/>
+		<S i="7599" n="10847V SID 0x7599" t="422" on="1" s="192" frq="10847" l="0"/>
 		<S i="759a" n="10847V SID 0x759a" t="422" on="1" s="192" frq="10847" l="0"/>
 	</Bouquet>
 	<Bouquet name="MEDIA BROADCAST" hidden="0" locked="0">
@@ -1694,5 +1713,5 @@
 		<S i="3171" n="Radio HCJB" t="459" on="1" s="192" frq="12633" l="0"/>
 	</Bouquet>
 	<Bouquet name="Favourites (Radio)" hidden="0" locked="0">
-	</Bouquet>
+</Bouquet>
 </zapit>

data/locale/deutsch.locale

@@ -282,6 +282,7 @@ channellist.keep_numbers Dauerhafte Kanalnummern
 channellist.make_hdlist Erzeuge Bouquets mit HD- und UHD-Kanälen
 channellist.make_newlist Erzeuge Bouquet mit neuen Kanälen
 channellist.make_removedlist Erzeuge Bouquet mit gelöschten Kanälen
+channellist.make_webradiolist Erzeuge Bouquet mit WebRadio-Kanälen
 channellist.make_webtvlist Erzeuge Bouquet mit WebTV-Kanälen
 channellist.new_zap_mode Quickzap in Liste
 channellist.new_zap_mode_active aktiv
@@ -326,6 +327,7 @@ ci.rpr Relevant PIDs Routing
 ci.save_pincode Jugendschutz-PIN speichern
 ci.settings Zugangskontrolle
 ci.timeout CAM antwortet nicht
+ci.try_decode Versuche CI-Kanal zu entschlüsseln
 ci.tuner Nutze CI nur mit Tuner:
 ci.use Erlaube CI
 ci.waiting Warte auf CAM-Antwort
@@ -596,8 +598,7 @@ extra.tp_mod_8 8PSK
 extra.tp_mod_8a 8APSK
 extra.tp_mod_auto AUTO
 extra.tp_pilot Pilot
-extra.tp_pilot_auto Auto (HW)
-extra.tp_pilot_auto_sw Auto (SW)
+extra.tp_pilot_auto Auto
 extra.tp_plc PLM Code
 extra.tp_pli Stream ID
 extra.tp_plm PLS Modus
@@ -712,7 +713,7 @@ flashupdate.menu_apply_settings Settingsübernahme erlauben
 flashupdate.mkfs_create_image Backup erstellen
 flashupdate.mkfs_preparing_files Dateien und Verzeichnisse vorbereiten
 flashupdate.mkfs_using_sumtool Benutze Sumtool
-flashupdate.msgbox Es wurde folgende neue Datei gefunden:\nDatum: %s, %s\nBasisImage: %s\nTyp: %s\n\nWollen Sie diese Version jetzt herunterladen und installieren?
+flashupdate.msgbox Es wurde folgendes Update gefunden:\n%s %s vom %s, %s\n\nWollen Sie diese Version jetzt herunterladen?
 flashupdate.mtdselector Partitions-Auswahl
 flashupdate.namemode1 Dateiname Settingsfile
 flashupdate.namemode1_default <Org.Name>+settings.img
@@ -754,6 +755,7 @@ flashupdate.type_beta Beta
 flashupdate.type_locale Sprachdatei
 flashupdate.type_nightly Nightly
 flashupdate.type_release Release
+flashupdate.type_selfmade Eigenbau
 flashupdate.type_settings Einstellungen
 flashupdate.type_text Text
 flashupdate.type_unknown Unbekannt
@@ -829,45 +831,101 @@ fsk.from_7 ab 7
 fsk.to_12 bis 12
 fsk.to_16 bis 16
 fsk.to_7 bis 7
+glcd.align_center zentriert
+glcd.align_channel Sender ausrichten
+glcd.align_duration Sendungsdauer ausrichten
+glcd.align_end Sendungsende ausrichten
+glcd.align_epg EPG ausrichten
+glcd.align_left links
+glcd.align_none keine
+glcd.align_right rechts
+glcd.align_start Sendungsstart ausrichten
+glcd.align_time Uhrzeit ausrichten
+glcd.bar_width Fortschrittsbalken Weite
+glcd.bar_x_position Fortschrittsbalken x-Position
+glcd.bar_y_position Fortschrittsbalken y-Position
 glcd.brightness Helligkeit
-glcd.brightness_standby Helligkeit in Standby
+glcd.brightness_standby Helligkeit im Standby-Modus
+glcd.brightness_dim Dimmen
+glcd.brightness_dim_time Dimmen nach
+glcd.brightness_settings Helligkeit
+glcd.color.amber Amber
 glcd.color.black Schwarz
 glcd.color.blue Blau
-glcd.color.cyan Blaugrün
-glcd.color.green Grün
-glcd.color.magenta Magenta
-glcd.color.red Rot
-glcd.color.white Weiss
-glcd.color.yellow Gelb
-glcd.color.orange Orange
-glcd.color.light_gray Hellgrau
+glcd.color.bluegray Blaugrau
+glcd.color.brown Braun
+glcd.color.cyan Cyan
+glcd.color.deeporange Dunkles Orange
+glcd.color.deeppurple Dunkles Lila
 glcd.color.gray Grau
-glcd.color.dark_gray Dunkelgrau
-glcd.color.dark_red Dunkelrot
-glcd.color.dark_green Dunkelgrün
-glcd.color.dark_blue Dunkelblau
-glcd.color.purple Purple
-glcd.color.mint Mint
-glcd.color.golden Golden
+glcd.color.green Grün
+glcd.color.indigo Indigo
+glcd.color.lightblue Helles Blau
+glcd.color.lightgreen Helles Grün
+glcd.color.lime Lime
+glcd.color.orange Orange
+glcd.color.pink Pink
+glcd.color.purple Lila
+glcd.color.red Rot
+glcd.color.teal Teal
+glcd.color.white Weiß
+glcd.color.yellow Gelb
+glcd.channel_x_position Sender x-Position
+glcd.channel_y_position Sender y-Position
+glcd.digital_clock_y_position Digitaluhr y-Position
 glcd.display Display-Typ
+glcd.duration_x_position Sendungsdauer x-Position
+glcd.duration_y_position Sendungsdauer y-Position
 glcd.enable GraphLCD aktiv
+glcd.end_x_position Sendungsende x-Position
+glcd.end_y_position Sendungsende y-Position
+glcd.epg_x_position EPG x-Position
+glcd.epg_y_position EPG x-Position
 glcd.font Schrift
+glcd.font_autoresize Automatische SChriftgröße
 glcd.head GraphLCD-Unterstützung
+glcd.logo_x_position Senderlogo x-Position
+glcd.logo_y_position Senderlogo y-Position
 glcd.mirror_osd OSD-Menü auf GraphLCD anzeigen
 glcd.mirror_video Videobild auf GraphLCD anzeigen
+glcd.position_settings Positionen und Größen
 glcd.restart Neu erkennen
 glcd.scroll_speed Scroll-Geschwindigkeit
-glcd.select.bar Fortschrittsbalken-Farbe
-glcd.select.bg Hintergrund-Farbe
-glcd.select.fg Vordergrund-Farbe
-glcd.show_logo Sender-Logo anzeigen
-glcd.size_bar Fortschrittsbalken-Größe
-glcd.size_channel Sender-Größe
-glcd.size_epg EPG-Größe
-glcd.size_logo Logo-Größe
-glcd.size_time Uhrzeit-Größe
-glcd.size_time_standby Uhrzeit-Größe in Standby
-glcd.time_in_standby Zeitanzeige in Standby
+glcd.select.bar Fortschrittsbalkenfarbe
+glcd.select.bg Hintergrundfarbe
+glcd.select.fg Textfarbe
+glcd.show_duration Sendungsdauer anzeigen
+glcd.show_end Sendungsende anzeigen
+glcd.show_logo Senderlogo anzeigen
+glcd.show_progressbar Fortschrittsbalken anzeigen
+glcd.show_start Sendungsstart anzeigen
+glcd.show_time Uhrzeit anzeigen
+glcd.show_weather Wetter anzeigen
+glcd.simple_clock_y_position Einfache Uhr y-Position
+glcd.size_bar Fortschrittsbalken Höhe
+glcd.size_channel Sender Höhe
+glcd.size_duration Sendungsdauer Höhe
+glcd.size_end Sendungsende Höhe
+glcd.size_epg EPG Höhe
+glcd.size_logo Senderlogo Höhe
+glcd.size_simple_clock Einfache Uhr Höhe
+glcd.size_start Sendungsstart Höhe
+glcd.size_time Uhrzeit Höhe
+glcd.size_time_standby Uhrzeit Höhe im Standby
+glcd.theme Theme auswählen
+glcd.theme_settings Themes
+glcd.standby_analog_clock Analoge Uhr
+glcd.standby_digital_clock Digitale Uhr
+glcd.standby_lcd_clock LCD-Uhr
+glcd.standby_led_clock LED-Uhr
+glcd.standby_settings Standby-Einstellungen
+glcd.standby_simple_clock Einfache Uhr
+glcd.standby_weather Wetter im Standby
+glcd.start_x_position Sendungsstart x-Position
+glcd.start_y_position Sendungsstart y-Position
+glcd.time_in_standby Zeitanzeige im Standby
+glcd.time_x_position Uhrzeit x-Position
+glcd.time_y_position Uhrzeit y-Position
 glcd.volume Lautstärke
 hdd_10min 10 min.
 hdd_1min 1 min.
@@ -1030,8 +1088,9 @@ 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 Zeige in Infozeile
 lcd_info_line_channel Kanalname
+lcd_info_line_channel_no Kanalnummer
 lcd_info_line_clock Uhrzeit
 lcdcontroler.brightness Normalbetrieb
 lcdcontroler.brightnessdeepstandby Deep-Standby
@@ -1360,6 +1419,7 @@ menu.hint_lua Plugins ausführen
 menu.hint_make_hdlist Bei aktiver Option werden Bouquets namens 'HD' und 'UHD' erzeugt, in denen alle HD- bzw. UHD-Sender zusammengefasst sind
 menu.hint_make_newlist Nach einer Kanalsuche wird ein Bouquet namens 'neue Kanäle' erzeugt
 menu.hint_make_removedlist Nach einer Kanalsuche wird ein Bouquet namens 'gelöschte Kanäle' erzeugt
+menu.hint_make_webradiolist Bei aktiver Option wird ein Bouquet namens 'WebRadio' erzeugt, in dem alle WebRadio-Sender zusammengefasst sind
 menu.hint_make_webtvlist Bei aktiver Option wird ein Bouquet namens 'WebTV' erzeugt, in dem alle WebTV-Sender zusammengefasst sind
 menu.hint_manage_settings Sichern, Wiederherstellen und Auslieferungszustand wiederherstellen
 menu.hint_mb Ihre Aufnahmen
@@ -1372,6 +1432,7 @@ menu.hint_menus Wählen Sie die Anzeigeoptionen für die Menüs
 menu.hint_message_fonts Anpassen der Schrift in Meldungsfenstern
 menu.hint_misc_cec HDMI-CEC Optionen
 menu.hint_misc_channellist Erweiterte Einstellungen für die Kanallisten und Zapping-Einstellungen
+menu.hint_misc_cpufreq Legen Sie die Taktfrequenz der CPU fest
 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
@@ -1513,7 +1574,7 @@ menu.hint_scan_cable_simple Kabel-Suchlauf mit optionaler Anbieter- und Kanal-Nu
 menu.hint_scan_commited Wählen Sie ihre Einstellungen für diesen Satelliten
 menu.hint_scan_delsys Wählen Sie das Empfangssystem für diesen Kanal/Transponder.
 menu.hint_scan_diseqc Wählen Sie das DiSEqC-Schalter-Eingangssignal für diesen Satelliten
-menu.hint_scan_diseqcorder Diseqc command order for cascaded switches
+menu.hint_scan_diseqcorder Wählen Sie die Reihenfolge für committed und uncommitted Kommandos
 menu.hint_scan_diseqcrepeat DiSEqC-Wiederholungen für kaskadierte Schaltungen
 menu.hint_scan_diseqctype Wählen Sie ihr DiSEqC-Protokoll\nMit 'Erweitert' können Sie ihre Anlage einbinden
 menu.hint_scan_fast Schnell-Suchlauf eines ausgewählten Anbieters\nWARNUNG: DiSEqC-Einstellung wird überschrieben
@@ -1631,6 +1692,7 @@ menu.hint_tmdb_enabled Schaltet die TMDb-Unterstützung (themoviedb.org) ein bzw
 menu.hint_tools Werkzeuge ausführen
 menu.hint_tvmode Schaltet zum TV-Modus
 menu.hint_tvradio_switch Schaltet zwischen TV- und Radio-Modus um
+menu.hint_uni_setup Konfiguration Unikabel Frequenz, Userband und Pin
 menu.hint_upnp Universal Plug and Play Browser
 menu.hint_vfd Frontdisplay und Power-LEDs
 menu.hint_vfd_brightness Definiert die Helligkeit im TV-Betrieb 
@@ -1639,11 +1701,11 @@ menu.hint_vfd_brightnessdeepstandby Definiert die Helligkeit im Deep-Standby
 menu.hint_vfd_brightnessdim Definiert den Wert für das Dimmen des Display nach Ablauf der eingestellten Zeit
 menu.hint_vfd_brightnessstandby Definiert die Helligkeit im Standby-Modus
 menu.hint_vfd_defaults Zurücksetzen der Helligkeitswerte auf die Standardeinstellungen
-menu.hint_vfd_dimtime Geben Sie einen Wert in Sekunden ein, nachdem sich das Display automatisch auf den gewünschten Wert dimmt
+menu.hint_vfd_dimtime Zeit in Sekunden, nachdem sich das Display autom. im Normalbetrieb auf den gewünschten Wert dimmt
 menu.hint_vfd_infoline Wählen Sie, was in der Infozeile angezeigt werden soll
 menu.hint_vfd_notify_rclock Zeigt eine Meldung im Display, wenn bei gesperrter Fernbedienung eine Taste gedrückt wird
 menu.hint_vfd_scroll Laufschrift im Display ein- oder ausschalten
-menu.hint_vfd_statusline Wählen Sie, was in der Statuszeile angezeigt werden soll
+menu.hint_vfd_statusline Wählen Sie, was in der Statuszeile des VFD/LCD angezeigt werden soll
 menu.hint_video Video-Ausgang, Auflösung, Format, Seitenverhältnisse usw.
 menu.hint_video_43mode Anzeige-Modus für 4:3-Inhalte auf 16:9-Fernsehern
 menu.hint_video_analog_mode Wählen Sie den Modus des Ausgangssignals für den CINCH-Anschluss
@@ -1656,15 +1718,19 @@ menu.hint_video_mode Wählen Sie den Modus des Ausgangssignals für den HDMI-Ans
 menu.hint_video_modes Definiert, welche Videosysteme mit der VF-Taste der Fernbedienung ausgewählt werden können
 menu.hint_video_modes_auto Definiert, welche Videosysteme automatisch ausgewählt werden können
 menu.hint_video_pip Bild in Bild Größe und Position
+menu.hint_video_psi Menü zur Änderung von Farbe, Kontrast und mehr
+menu.hint_video_psi_step Setzt die Schrittweite für das On-Screen-Menü
 menu.hint_video_saturation Ändert die Farbsättigung
 menu.hint_video_scart_mode Wählen Sie den Modus des Ausgangssignals für den SCART-Anschluss
 menu.hint_video_sdosd Aktivieren/Deaktivieren der OSD Anzeige am Analogausgang (Scart, Cinch)
+menu.hint_video_tint Ändert den Farbton
 menu.hint_video_zappingmode Wählen Sie, ob ein schwarzes Bild oder ein Standbild beim Umschalten gezeigt werden soll
 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_country Land auswählen
 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.
@@ -1681,6 +1747,7 @@ menu.hint_zap_cycle Wählen Sie, ob nur innerhalb des aktiven Bouquets umgeschal
 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.accept Wollen Sie die Änderungen beibehalten?
 messagebox.back Zurück
 messagebox.cancel Abbruch
 messagebox.discard Wollen Sie die Änderungen verwerfen?
@@ -1700,6 +1767,7 @@ miscsettings.colored_events_1 aktuelle
 miscsettings.colored_events_2 nächste
 miscsettings.colored_events_channellist In der Kanalliste
 miscsettings.colored_events_infobar In der Infobar
+miscsettings.cpu CPU
 miscsettings.energy Energieverbrauch
 miscsettings.epg_cache EPG-Cache (Tage)
 miscsettings.epg_cache_hint1 EPG-Daten im Voraus zwischenspeichern?
@@ -2036,7 +2104,7 @@ movieplayer.bookmarkname Bookmark Name
 movieplayer.bookmarkname_hint1 Geben Sie den Namen für das neue Lesezeichen ein
 movieplayer.bookmarkname_hint2 
 movieplayer.chapters Kapitel
-movieplayer.display_playtime Zeige Spielzeit im VFD
+movieplayer.display_playtime Zeige Spielzeit im VFD/LCD
 movieplayer.fileplayback_audio Multiformat-Audiowiedergabe
 movieplayer.fileplayback_video Multiformat-Videowiedergabe
 movieplayer.head Movieplayer
@@ -2153,7 +2221,7 @@ opkg.install.local.package Installiere lokales Paket
 opkg.messagebox.reinstall %s erneut installieren?
 opkg.messagebox.remove %s entfernen?
 opkg.messagebox.size.error Nicht genügend freier Speicher für Paketinstallation verfügbar!
-opkg.messagebox.updates.available Aktualisierungen verfügbar!
+opkg.messagebox.updates.available Aktualisierung(en) verfügbar!
 opkg.success.install Installation erfolgreich!\nNeustart von Neutrino kann erforderlich sein. Jetzt neu starten?
 opkg.title Paketverwaltung
 opkg.update.check Prüfe auf Updates ...
@@ -2354,7 +2422,7 @@ satsetup.diseqc12 DiSEqC 1.2
 satsetup.diseqc_advanced Erweiterte Auswahl
 satsetup.diseqc_com_uncom Committed/Uncommitted
 satsetup.diseqc_input DiSEqC Einspeisung
-satsetup.diseqc_order DiSEqC command order
+satsetup.diseqc_order DiSEqC 1.1 Kommando-Folge
 satsetup.diseqc_uncom_com Uncommitted/Committed
 satsetup.diseqcrepeat DiSEqC-Wiederholungen
 satsetup.extended DiSEqC-Einstellungen
@@ -2385,6 +2453,7 @@ satsetup.fe_mode_link_twin TWIN
 satsetup.fe_mode_master Master
 satsetup.fe_mode_unused Nicht genutzt
 satsetup.fe_setup Tuner Einstellungen
+satsetup.fe_tuner Tuner
 satsetup.lofh LNB High Offset
 satsetup.lofl LNB Low Offset
 satsetup.lofs LNB Switch Offset
@@ -2644,7 +2713,7 @@ 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.freq Unicable Frequenz
 unicable.scr Unicable SCR
 unit.decimal ,
 unit.long.years Jahre
@@ -2720,6 +2789,13 @@ videomenu.panscan Pan & Scan
 videomenu.panscan2 14:9 Pan & Scan
 videomenu.pip PiP Setup
 videomenu.pip_error PiP Startfehler
+videomenu.psi Farbregler
+videomenu.psi.brightness Helligkeit
+videomenu.psi.contrast Kontrast
+videomenu.psi.reset Standard
+videomenu.psi.saturation Sättigung
+videomenu.psi.step Farbregler-Schrittweite
+videomenu.psi.tint Farbton
 videomenu.saturation Sättigung
 videomenu.scart Scart
 videomenu.screensetup Bildbereich
@@ -2736,18 +2812,21 @@ videomenu.zappingmode Umschaltverhalten
 videomenu.zappingmode_mute Schwarzes Bild
 videomenu.zappingmode_hold Standbild
 weather.api_key Wetter API Schlüssel (Dark Sky)
+weather.country Länderwahl
+weather.country_deutschland Deutschland
+weather.country_norway Norwegen
 weather.enabled Wetter-Unterstützung
 weather.location Wetter-Standort
+webchannels.xml.add Hinzufügen
+webchannels.xml.del Entfernen
+webchannels.xml.enter Eintragen
+webchannels.xml.reload Neu laden
 webradio.head WebRadio
 webradio.xml WebRadio-Dateien
 webradio.xml.auto WebRadio-Dateien automatisch laden
 webtv.head WebTV
 webtv.xml WebTV-Dateien
-webtv.xml.add Hinzufügen
 webtv.xml.auto WebTV-Dateien automatisch laden
-webtv.xml.del Entfernen
-webtv.xml.enter Eintragen
-webtv.xml.reload Neu laden
 window_size Fenstergröße in %
 wizard.initial_settings Grundeinstellungen gefunden
 wizard.install_settings Kanalliste für Astra 19.2°E installieren?

data/locale/english.locale

@@ -282,6 +282,7 @@ channellist.keep_numbers Persistent channel numbers
 channellist.make_hdlist Create lists of HD and UHD channels
 channellist.make_newlist Create list of new channels
 channellist.make_removedlist Create list of removed channels
+channellist.make_webradiolist Create list of WebRadio channels
 channellist.make_webtvlist Create list of WebTV channels
 channellist.new_zap_mode Quickzap in list
 channellist.new_zap_mode_active Active
@@ -326,6 +327,7 @@ ci.rpr Relevant PIDs routing
 ci.save_pincode Save pincode
 ci.settings Conditional access
 ci.timeout Timeout waiting CI menu ready
+ci.try_decode Try to decode CI channel
 ci.tuner Use CI only with tuner:
 ci.use Enable CI
 ci.waiting Waiting for CI answer
@@ -596,8 +598,7 @@ extra.tp_mod_8 8PSK
 extra.tp_mod_8a 8APSK
 extra.tp_mod_auto AUTO
 extra.tp_pilot Pilot
-extra.tp_pilot_auto Auto (HW)
-extra.tp_pilot_auto_sw Auto (SW)
+extra.tp_pilot_auto Auto
 extra.tp_plc PLM Code
 extra.tp_pli Stream ID
 extra.tp_plm PLS Mode
@@ -712,7 +713,7 @@ flashupdate.menu_apply_settings Allow apply settings
 flashupdate.mkfs_create_image Create backup
 flashupdate.mkfs_preparing_files Preparing files and directories
 flashupdate.mkfs_using_sumtool Using sumtool
-flashupdate.msgbox Found the following new file:\nDate: %s, %s\nBaseImage: %s\nType: %s\n\nDo you want to download and install this version now?
+flashupdate.msgbox Found the following update:\n%s %s of %s, %s\n\nDo you want to download this version now?
 flashupdate.mtdselector Partition-Selector
 flashupdate.namemode1 Filename settingsfile
 flashupdate.namemode1_default <org.name>+settings.img
@@ -754,6 +755,7 @@ flashupdate.type_beta Beta
 flashupdate.type_locale Locale
 flashupdate.type_nightly Nightly
 flashupdate.type_release Release
+flashupdate.type_selfmade Self made
 flashupdate.type_settings Settings
 flashupdate.type_text Text
 flashupdate.type_unknown Unknown
@@ -831,24 +833,27 @@ fsk.to_16 to 16
 fsk.to_7 to 7
 glcd.brightness Brightness
 glcd.brightness_standby Brightness in standby
+glcd.color.amber Amber
 glcd.color.black Black
 glcd.color.blue Blue
-glcd.color.cyan Blue-Green
+glcd.color.bluegray Bluegray
+glcd.color.brown Brown
+glcd.color.cyan Cyan
+glcd.color.deeporange Deep Orange
+glcd.color.deeppurple Deep Purple
+glcd.color.gray Gray
 glcd.color.green Green
-glcd.color.magenta Magenta
+glcd.color.indigo Indigo
+glcd.color.lightblue Light Blau
+glcd.color.lightgreen Light Green
+glcd.color.lime Lime
+glcd.color.orange Orange
+glcd.color.pink Pink
+glcd.color.purple Purple
 glcd.color.red Red
+glcd.color.teal Teal
 glcd.color.white White
 glcd.color.yellow Yellow
-glcd.color.orange Orange
-glcd.color.light_gray Light Gray
-glcd.color.gray Gray
-glcd.color.dark_gray Dark Gray
-glcd.color.dark_red Dark Red
-glcd.color.dark_green Dark Green
-glcd.color.dark_blue Dark Blue
-glcd.color.purple Purple
-glcd.color.mint Mint
-glcd.color.golden Golden
 glcd.display Display type
 glcd.enable GraphLCD enabled
 glcd.font Font
@@ -1032,6 +1037,7 @@ lcd4l_support_on on
 lcd4l_weather Weather in standby mode
 lcd_info_line Show in infoline
 lcd_info_line_channel Channelname
+lcd_info_line_channel_no Channelnumber
 lcd_info_line_clock Clock
 lcdcontroler.brightness Normal mode
 lcdcontroler.brightnessdeepstandby Deep-standby
@@ -1360,6 +1366,7 @@ menu.hint_lua Run Lua Plugins
 menu.hint_make_hdlist Auto-create HD and UHD channel lists based on\nchannel type and name
 menu.hint_make_newlist Create list of recently added channels
 menu.hint_make_removedlist Create list of recently removed channels
+menu.hint_make_webradiolist Auto-create WebRadio channel list based on\nchannel type and name
 menu.hint_make_webtvlist Auto-create WebTV channel list based on\nchannel type and name
 menu.hint_manage_settings Backup, restore, revert to defaults\nFactory box reset
 menu.hint_mb Your recordings
@@ -1372,6 +1379,7 @@ menu.hint_menus Configure menu options
 menu.hint_message_fonts Change message text font sizes
 menu.hint_misc_cec HDMI-CEC Options
 menu.hint_misc_channellist HD/New/Removed channel lists\nZap cycle
+menu.hint_misc_cpufreq Set the CPU frequency
 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
@@ -1381,7 +1389,7 @@ menu.hint_misc_zapit Initial TV/Radio channels
 menu.hint_movie Play movies
 menu.hint_moviebrowser_fonts Change moviebrowser (My recordings) font sizes
 menu.hint_moviebrowser_setup Set selection and display options.
-menu.hint_movieplayer_display_playtime While playback show playtime instead of movietitle on VFD
+menu.hint_movieplayer_display_playtime While playback show playtime instead of movietitle on VFD/LCD
 menu.hint_movieplayer_plugin Choose a plugin that's executed with the one touch key in movieplayer mode
 menu.hint_net_broadcast Enter broadcast address\nif unsure, use IP address with last .255
 menu.hint_net_dhcp Use DHCP server to auto-configure
@@ -1631,6 +1639,7 @@ menu.hint_tmdb_enabled Enable or disable TMDb support (themoviedb.org)
 menu.hint_tools Run tools
 menu.hint_tvmode Switch box to TV mode
 menu.hint_tvradio_switch Switches between TV and Radio mode
+menu.hint_uni_setup Configuration of unicable frequency, user band and pin
 menu.hint_upnp Universal Plug and Play Browser
 menu.hint_vfd Frontpanel LEDs, VFD options
 menu.hint_vfd_brightness Working brightness 
@@ -1639,11 +1648,11 @@ menu.hint_vfd_brightnessdeepstandby Brightness in deep-standby mode
 menu.hint_vfd_brightnessdim Auto-dim brightness
 menu.hint_vfd_brightnessstandby Brightness in soft-standby mode
 menu.hint_vfd_defaults Restore default brightness values
-menu.hint_vfd_dimtime Auto-dim time, in seconds
-menu.hint_vfd_infoline Choose what to display in main VFD line
+menu.hint_vfd_dimtime Auto-dim time in seconds for normal mode
+menu.hint_vfd_infoline Choose what to display in main VFD/LCD line
 menu.hint_vfd_notify_rclock Displays a notification when a key is pressed while remote control is locked
 menu.hint_vfd_scroll Enable or disable text scrolling on VFD
-menu.hint_vfd_statusline Choose what to display in short\nVFD status line
+menu.hint_vfd_statusline Choose what to display in short\nVFD/LCD status line
 menu.hint_video Video output, resolution, format\nAspect ratio, fast mode switch options
 menu.hint_video_43mode Display mode for 4:3 content\non 16:9 TV
 menu.hint_video_analog_mode Select analog output mode\nfor SCART and CINCH connectors
@@ -1656,15 +1665,19 @@ menu.hint_video_mode HDMI output video mode
 menu.hint_video_modes VF key will cycle between enabled modes 
 menu.hint_video_modes_auto Enable modes to auto-select based on content
 menu.hint_video_pip Picture in picture size and position
+menu.hint_video_psi Menu for changing color, contrast and more
+menu.hint_video_psi_step Set the increment for the on-screen menu
 menu.hint_video_saturation Change picture saturation
 menu.hint_video_scart_mode Select analog output mode for SCART connectors
 menu.hint_video_sdosd Enable/disable OSD display on SD output (scart, cinch)
+menu.hint_video_tint Change picture tint
 menu.hint_video_zappingmode Select black screen or still picture while zapping
 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_country Select your country.
 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.
@@ -1681,6 +1694,7 @@ 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.accept Keep changes?
 messagebox.back Back
 messagebox.cancel Cancel
 messagebox.discard Discard changes?
@@ -1700,6 +1714,7 @@ miscsettings.colored_events_1 current
 miscsettings.colored_events_2 next
 miscsettings.colored_events_channellist In channellist
 miscsettings.colored_events_infobar In infobar
+miscsettings.cpu CPU
 miscsettings.energy Energy
 miscsettings.epg_cache EPG-Cache (Days)
 miscsettings.epg_cache_hint1 How long will EPG-Data in the future cached?
@@ -2153,7 +2168,7 @@ opkg.install.local.package Install local package
 opkg.messagebox.reinstall Re-install %s?
 opkg.messagebox.remove Remove %s?
 opkg.messagebox.size.error Not enough free memory available for this package!
-opkg.messagebox.updates.available Updates available!
+opkg.messagebox.updates.available Update(s) available!
 opkg.success.install Install successful!\n restart of Neutrino might be required. Restart now?
 opkg.title Package Management
 opkg.update.check Checking for updates ...
@@ -2385,6 +2400,7 @@ satsetup.fe_mode_link_twin TWIN
 satsetup.fe_mode_master Master
 satsetup.fe_mode_unused Unused
 satsetup.fe_setup Setup tuner
+satsetup.fe_tuner Tuner
 satsetup.lofh LNB High Offset
 satsetup.lofl LNB Low Offset
 satsetup.lofs LNB switch Offset
@@ -2644,7 +2660,7 @@ 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.freq Unicable Frequency
 unicable.scr Unicable SCR
 unit.decimal .
 unit.long.years years
@@ -2720,6 +2736,13 @@ videomenu.panscan Pan & Scan
 videomenu.panscan2 14:9 Pan & Scan
 videomenu.pip PiP setup
 videomenu.pip_error PiP start failed
+videomenu.psi Color sliders
+videomenu.psi.brightness Brightness
+videomenu.psi.contrast Contrast
+videomenu.psi.reset Default
+videomenu.psi.saturation Saturation
+videomenu.psi.step Color sliders step size
+videomenu.psi.tint Tint
 videomenu.saturation Saturation
 videomenu.scart Scart
 videomenu.screensetup Screen Setup
@@ -2736,18 +2759,21 @@ videomenu.zappingmode Zapping mode
 videomenu.zappingmode_mute Black screen
 videomenu.zappingmode_hold Hold screen
 weather.api_key Weather API key (Dark Sky)
+weather.country Country choice
+weather.country_deutschland Germany
+weather.country_norway Norway
 weather.enabled Weather support
 weather.location Weather location
+webchannels.xml.add Add
+webchannels.xml.del Remove
+webchannels.xml.enter Enter
+webchannels.xml.reload Reload
 webradio.head WebRadio
 webradio.xml WebRadio files
 webradio.xml.auto Auto-load WebRadio files
 webtv.head WebTV
 webtv.xml WebTV files
-webtv.xml.add Add
 webtv.xml.auto Auto-load WebTV files
-webtv.xml.del Remove
-webtv.xml.enter Enter
-webtv.xml.reload Reload
 window_size Window size in %
 wizard.initial_settings Initial settings found
 wizard.install_settings Do you want to install channels for Astra 19.2°E?

data/oled/Makefile.am

@@ -0,0 +1,4 @@
+SUBDIRS = \
+	fonts \
+	icons \
+	themes

data/oled/fonts/Makefile.am

@@ -0,0 +1,12 @@
+installdir = $(FONTDIR)/oled
+
+# NOTE:	led.ttf is used for the LED clock in standby mode
+#	lcd.ttf is used for the LCD clock in standby mode
+#	pakenham.ttf is used for the temperature digits
+#	terminator.ttf is used for the status markers
+
+install_DATA = \
+	led.ttf \
+	lcd.ttf \
+	pakenham.ttf \
+	terminator.ttf

data/oled/icons/Makefile.am

@@ -0,0 +1,3 @@
+SUBDIRS = \
+	clock \
+	weather

data/oled/icons/clock/Makefile.am

@@ -0,0 +1,17 @@
+installdir = $(ICONSDIR)/oled/clock
+
+install_DATA = \
+	analog_clock.png \
+	analog_hour.png \
+	analog_min.png \
+	time_dots.png \
+	time_eight.png \
+	time_five.png \
+	time_four.png \
+	time_nine.png \
+	time_one.png \
+	time_seven.png \
+	time_six.png \
+	time_three.png \
+	time_two.png \
+	time_zero.png

data/oled/icons/weather/Makefile.am

@@ -0,0 +1,16 @@
+installdir = $(ICONSDIR)/oled/weather
+
+install_DATA = \
+	clear-day.png \
+	clear-night.png \
+	cloudy.png \
+	fog.png \
+	hail.png \
+	partly-cloudy-day.png \
+	partly-cloudy-night.png \
+	rain.png \
+	sleet.png \
+	snow.png \
+	thunderstorm.png \
+	unknown.png \
+	wind.png

data/oled/themes/400x240/Default.otheme

@@ -0,0 +1,73 @@
+# align 0=none, 1=left, 2=center, 3=right
+# if align > 0 x_position will be ignored
+# if glcd_background_image != "" background color will be ignored
+# glcd_position_settings != false allows to edit position settings in gui
+glcd_foreground_color_red=100
+glcd_foreground_color_green=100
+glcd_foreground_color_blue=100
+glcd_background_color_red=0
+glcd_background_color_green=0
+glcd_background_color_blue=0
+glcd_background_image=
+glcd_font=/share/fonts/neutrino.ttf
+glcd_channel_percent=25
+glcd_channel_align=2
+glcd_channel_x_position=0
+glcd_channel_y_position=19
+glcd_logo=true
+glcd_logo_percent=25
+glcd_logo_x_position=0
+glcd_logo_y_position=19
+glcd_epg_percent=15
+glcd_epg_align=2
+glcd_epg_x_position=0
+glcd_epg_y_position=97
+glcd_start=false
+glcd_start_percent=0
+glcd_start_align=0
+glcd_start_x_position=0
+glcd_start_y_position=0
+glcd_end=false
+glcd_end_percent=0
+glcd_end_align=0
+glcd_end_x_position=0
+glcd_end_y_position=0
+glcd_duration=false
+glcd_duration_align=0
+glcd_duration_percent=0
+glcd_duration_x_position=0
+glcd_duration_y_position=0
+glcd_progressbar=true
+glcd_progressbar_color_red=62
+glcd_progressbar_color_green=62
+glcd_progressbar_color_blue=62
+glcd_progressbar_percent=20
+glcd_progressbar_width=400
+glcd_progressbar_x_position=0
+glcd_progressbar_y_position=157
+glcd_time=true
+glcd_time_percent=25
+glcd_time_align=2
+glcd_time_x_position=0
+glcd_time_y_position=172
+glcd_icons_percent=4
+glcd_icons_y_position=4
+glcd_icon_ecm_x_position=83
+glcd_icon_cam_x_position=123
+glcd_icon_txt_x_position=161
+glcd_icon_dd_x_position=198
+glcd_icon_mute_x_position=228
+glcd_icon_timer_x_position=278
+glcd_icon_rec_x_position=332
+glcd_icon_ts_x_position=369
+glcd_weather=false
+glcd_weather_curr_x_position=0
+glcd_weather_next_x_position=0
+glcd_weather_y_position=0
+glcd_standby_clock_digital_y_position=15
+glcd_standby_clock_simple_size=40
+glcd_standby_clock_simple_y_position=15
+glcd_standby_weather_curr_x_position=8
+glcd_standby_weather_next_x_position=283
+glcd_standby_weather_y_position=131
+glcd_position_settings=true

data/oled/themes/400x240/Makefile.am

@@ -0,0 +1,4 @@
+oledthemesdir = $(THEMESDIR)/oled
+
+oledthemes_DATA = \
+	Default.otheme

data/oled/themes/480x320/Advanced.otheme

@@ -0,0 +1,73 @@
+# align 0=none, 1=left, 2=center, 3=right
+# if align > 0 x_position will be ignored
+# if glcd_background_image != "" background color will be ignored
+# glcd_position_settings != false allows to edit position settings in gui
+glcd_foreground_color_red=100
+glcd_foreground_color_green=100
+glcd_foreground_color_blue=100
+glcd_background_color_red=0
+glcd_background_color_green=0
+glcd_background_color_blue=0
+glcd_background_image=/share/tuxbox/neutrino/icons/oled/advanced.png
+glcd_font=/share/fonts/neutrino.ttf
+glcd_channel_percent=22
+glcd_channel_align=2
+glcd_channel_x_position=0
+glcd_channel_y_position=22
+glcd_logo=true
+glcd_logo_percent=22
+glcd_logo_x_position=0
+glcd_logo_y_position=22
+glcd_epg_percent=15
+glcd_epg_align=2
+glcd_epg_x_position=0
+glcd_epg_y_position=133
+glcd_start=false
+glcd_start_percent=0
+glcd_start_align=0
+glcd_start_x_position=0
+glcd_start_y_position=0
+glcd_end=true
+glcd_end_percent=14
+glcd_end_align=3
+glcd_end_x_position=0
+glcd_end_y_position=224
+glcd_duration=true
+glcd_duration_percent=14
+glcd_duration_align=3
+glcd_duration_x_position=0
+glcd_duration_y_position=261
+glcd_progressbar=true
+glcd_progressbar_color_red=62
+glcd_progressbar_color_green=62
+glcd_progressbar_color_blue=62
+glcd_progressbar_percent=22
+glcd_progressbar_width=311
+glcd_progressbar_x_position=23
+glcd_progressbar_y_position=216
+glcd_time=true
+glcd_time_percent=14
+glcd_time_align=1
+glcd_time_x_position=0
+glcd_time_y_position=261
+glcd_icons_percent=4
+glcd_icons_y_position=6
+glcd_icon_ecm_x_position=100
+glcd_icon_cam_x_position=148
+glcd_icon_txt_x_position=193
+glcd_icon_dd_x_position=238
+glcd_icon_mute_x_position=273
+glcd_icon_timer_x_position=333
+glcd_icon_rec_x_position=398
+glcd_icon_ts_x_position=443
+glcd_weather=false
+glcd_weather_curr_x_position=0
+glcd_weather_next_x_position=0
+glcd_weather_y_position=0
+glcd_standby_clock_digital_y_position=20
+glcd_standby_clock_simple_size=40
+glcd_standby_clock_simple_y_position=20
+glcd_standby_weather_curr_x_position=10
+glcd_standby_weather_next_x_position=340
+glcd_standby_weather_y_position=175
+glcd_position_settings=true

data/oled/themes/480x320/Default.otheme

@@ -0,0 +1,73 @@
+# align 0=none, 1=left, 2=center, 3=right
+# if align > 0 x_position will be ignored
+# if glcd_background_image != "" background color will be ignored
+# glcd_position_settings != false allows to edit position settings in gui
+glcd_foreground_color_red=100
+glcd_foreground_color_green=100
+glcd_foreground_color_blue=100
+glcd_background_color_red=0
+glcd_background_color_green=0
+glcd_background_color_blue=0
+glcd_background_image=
+glcd_font=/share/fonts/neutrino.ttf
+glcd_channel_percent=25
+glcd_channel_align=2
+glcd_channel_x_position=0
+glcd_channel_y_position=25
+glcd_logo=true
+glcd_logo_percent=25
+glcd_logo_x_position=0
+glcd_logo_y_position=25
+glcd_epg_percent=15
+glcd_epg_align=2
+glcd_epg_x_position=0
+glcd_epg_y_position=130
+glcd_start=false
+glcd_start_percent=0
+glcd_start_align=0
+glcd_start_x_position=0
+glcd_start_y_position=0
+glcd_end=false
+glcd_end_percent=0
+glcd_end_align=0
+glcd_end_x_position=0
+glcd_end_y_position=0
+glcd_duration=false
+glcd_duration_percent=0
+glcd_duration_align=0
+glcd_duration_x_position=0
+glcd_duration_y_position=0
+glcd_progressbar=true
+glcd_progressbar_color_red=62
+glcd_progressbar_color_green=62
+glcd_progressbar_color_blue=62
+glcd_progressbar_percent=20
+glcd_progressbar_width=480
+glcd_progressbar_x_position=0
+glcd_progressbar_y_position=210
+glcd_time=true
+glcd_time_percent=25
+glcd_time_align=2
+glcd_time_x_position=0
+glcd_time_y_position=230
+glcd_icons_percent=4
+glcd_icons_y_position=6
+glcd_icon_ecm_x_position=100
+glcd_icon_cam_x_position=148
+glcd_icon_txt_x_position=193
+glcd_icon_dd_x_position=238
+glcd_icon_mute_x_position=273
+glcd_icon_timer_x_position=333
+glcd_icon_rec_x_position=398
+glcd_icon_ts_x_position=443
+glcd_weather=false
+glcd_weather_curr_x_position=0
+glcd_weather_next_x_position=0
+glcd_weather_y_position=0
+glcd_standby_clock_digital_y_position=20
+glcd_standby_clock_simple_size=40
+glcd_standby_clock_simple_y_position=20
+glcd_standby_weather_curr_x_position=10
+glcd_standby_weather_next_x_position=340
+glcd_standby_weather_y_position=175
+glcd_position_settings=true

data/oled/themes/480x320/Easy.otheme

@@ -0,0 +1,73 @@
+# align 0=none, 1=left, 2=center, 3=right
+# if align > 0 x_position will be ignored
+# if glcd_background_image != "" background color will be ignored
+# glcd_position_settings != false allows to edit position settings in gui
+glcd_foreground_color_red=100
+glcd_foreground_color_green=100
+glcd_foreground_color_blue=100
+glcd_background_color_red=0
+glcd_background_color_green=0
+glcd_background_color_blue=0
+glcd_background_image=/share/tuxbox/neutrino/icons/oled/easy.png
+glcd_font=/share/fonts/neutrino.ttf
+glcd_channel_percent=22
+glcd_channel_align=2
+glcd_channel_x_position=0
+glcd_channel_y_position=22
+glcd_logo=true
+glcd_logo_percent=22
+glcd_logo_x_position=0
+glcd_logo_y_position=22
+glcd_epg_percent=18
+glcd_epg_align=2
+glcd_epg_x_position=0
+glcd_epg_y_position=152
+glcd_start=false
+glcd_start_percent=0
+glcd_start_align=0
+glcd_start_x_position=0
+glcd_start_y_position=0
+glcd_end=false
+glcd_end_percent=0
+glcd_end_align=0
+glcd_end_x_position=0
+glcd_end_y_position=0
+glcd_duration=true
+glcd_duration_percent=14
+glcd_duration_align=3
+glcd_duration_x_position=0
+glcd_duration_y_position=261
+glcd_progressbar=false
+glcd_progressbar_color_red=62
+glcd_progressbar_color_green=62
+glcd_progressbar_color_blue=62
+glcd_progressbar_percent=0
+glcd_progressbar_width=0
+glcd_progressbar_x_position=0
+glcd_progressbar_y_position=0
+glcd_time=true
+glcd_time_percent=14
+glcd_time_align=1
+glcd_time_x_position=0
+glcd_time_y_position=261
+glcd_icons_percent=4
+glcd_icons_y_position=6
+glcd_icon_ecm_x_position=100
+glcd_icon_cam_x_position=148
+glcd_icon_txt_x_position=193
+glcd_icon_dd_x_position=238
+glcd_icon_mute_x_position=273
+glcd_icon_timer_x_position=333
+glcd_icon_rec_x_position=398
+glcd_icon_ts_x_position=443
+glcd_weather=false
+glcd_weather_curr_x_position=0
+glcd_weather_next_x_position=0
+glcd_weather_y_position=0
+glcd_standby_clock_digital_y_position=20
+glcd_standby_clock_simple_size=40
+glcd_standby_clock_simple_y_position=20
+glcd_standby_weather_curr_x_position=10
+glcd_standby_weather_next_x_position=340
+glcd_standby_weather_y_position=175
+glcd_position_settings=true

data/oled/themes/480x320/Makefile.am

@@ -0,0 +1,18 @@
+oledthemesdir = $(THEMESDIR)/oled
+
+oledthemes_DATA = \
+	Default.otheme \
+	Advanced.otheme \
+	Easy.otheme \
+	Medium.otheme \
+	Simple.otheme \
+	Weather.otheme
+
+olediconsdir = $(ICONSDIR)/oled
+
+oledicons_DATA = \
+        advanced.png \
+        easy.png \
+        medium.png \
+        simple.png \
+        weather.png

data/oled/themes/480x320/Medium.otheme

@@ -0,0 +1,73 @@
+# align 0=none, 1=left, 2=center, 3=right
+# if align > 0 x_position will be ignored
+# if glcd_background_image != "" background color will be ignored
+# glcd_position_settings != false allows to edit position settings in gui
+glcd_foreground_color_red=100
+glcd_foreground_color_green=100
+glcd_foreground_color_blue=100
+glcd_background_color_red=0
+glcd_background_color_green=0
+glcd_background_color_blue=0
+glcd_background_image=/share/tuxbox/neutrino/icons/oled/medium.png
+glcd_font=/share/fonts/neutrino.ttf
+glcd_channel_percent=22
+glcd_channel_align=2
+glcd_channel_x_position=0
+glcd_channel_y_position=22
+glcd_logo=true
+glcd_logo_percent=22
+glcd_logo_x_position=0
+glcd_logo_y_position=22
+glcd_epg_percent=14
+glcd_epg_align=2
+glcd_epg_x_position=0
+glcd_epg_y_position=198
+glcd_start=false
+glcd_start_percent=0
+glcd_start_align=0
+glcd_start_x_position=0
+glcd_start_y_position=0
+glcd_end=true
+glcd_end_percent=14
+glcd_end_align=3
+glcd_end_x_position=0
+glcd_end_y_position=116
+glcd_duration=false
+glcd_duration_percent=14
+glcd_duration_align=3
+glcd_duration_x_position=0
+glcd_duration_y_position=261
+glcd_progressbar=true
+glcd_progressbar_color_red=62
+glcd_progressbar_color_green=62
+glcd_progressbar_color_blue=62
+glcd_progressbar_percent=14
+glcd_progressbar_width=450
+glcd_progressbar_x_position=29
+glcd_progressbar_y_position=288
+glcd_time=true
+glcd_time_percent=14
+glcd_time_align=1
+glcd_time_x_position=0
+glcd_time_y_position=116
+glcd_icons_percent=4
+glcd_icons_y_position=6
+glcd_icon_ecm_x_position=100
+glcd_icon_cam_x_position=148
+glcd_icon_txt_x_position=193
+glcd_icon_dd_x_position=238
+glcd_icon_mute_x_position=273
+glcd_icon_timer_x_position=333
+glcd_icon_rec_x_position=398
+glcd_icon_ts_x_position=443
+glcd_weather=false
+glcd_weather_curr_x_position=0
+glcd_weather_next_x_position=0
+glcd_weather_y_position=0
+glcd_standby_clock_digital_y_position=20
+glcd_standby_clock_simple_size=40
+glcd_standby_clock_simple_y_position=20
+glcd_standby_weather_curr_x_position=10
+glcd_standby_weather_next_x_position=340
+glcd_standby_weather_y_position=175
+glcd_position_settings=true

data/oled/themes/480x320/Simple.otheme

@@ -0,0 +1,73 @@
+# align 0=none, 1=left, 2=center, 3=right
+# if align > 0 x_position will be ignored
+# if glcd_background_image != "" background color will be ignored
+# glcd_position_settings != false allows to edit position settings in gui
+glcd_foreground_color_red=100
+glcd_foreground_color_green=100
+glcd_foreground_color_blue=100
+glcd_background_color_red=0
+glcd_background_color_green=0
+glcd_background_color_blue=0
+glcd_background_image=/share/tuxbox/neutrino/icons/oled/simple.png
+glcd_font=/share/fonts/neutrino.ttf
+glcd_channel_percent=20
+glcd_channel_align=2
+glcd_channel_x_position=0
+glcd_channel_y_position=51
+glcd_logo=true
+glcd_logo_percent=20
+glcd_logo_x_position=0
+glcd_logo_y_position=51
+glcd_epg_percent=16
+glcd_epg_align=2
+glcd_epg_x_position=0
+glcd_epg_y_position=241
+glcd_start=false
+glcd_start_percent=0
+glcd_start_align=0
+glcd_start_x_position=0
+glcd_start_y_position=0
+glcd_end=false
+glcd_end_percent=14
+glcd_end_align=0
+glcd_end_x_position=0
+glcd_end_y_position=0
+glcd_duration=false
+glcd_duration_percent=0
+glcd_duration_align=0
+glcd_duration_x_position=0
+glcd_duration_y_position=0
+glcd_progressbar=false
+glcd_progressbar_color_red=62
+glcd_progressbar_color_green=62
+glcd_progressbar_color_blue=62
+glcd_progressbar_percent=0
+glcd_progressbar_width=0
+glcd_progressbar_x_position=0
+glcd_progressbar_y_position=0
+glcd_time=false
+glcd_time_percent=0
+glcd_time_align=0
+glcd_time_x_position=0
+glcd_time_y_position=0
+glcd_icons_percent=4
+glcd_icons_y_position=6
+glcd_icon_ecm_x_position=100
+glcd_icon_cam_x_position=148
+glcd_icon_txt_x_position=193
+glcd_icon_dd_x_position=238
+glcd_icon_mute_x_position=273
+glcd_icon_timer_x_position=333
+glcd_icon_rec_x_position=398
+glcd_icon_ts_x_position=443
+glcd_weather=false
+glcd_weather_curr_x_position=0
+glcd_weather_next_x_position=0
+glcd_weather_y_position=0
+glcd_standby_clock_digital_y_position=20
+glcd_standby_clock_simple_size=40
+glcd_standby_clock_simple_y_position=20
+glcd_standby_weather_curr_x_position=10
+glcd_standby_weather_next_x_position=340
+glcd_standby_weather_y_position=175
+glcd_position_settings=true

data/oled/themes/480x320/Weather.otheme

@@ -0,0 +1,73 @@
+# align 0=none, 1=left, 2=center, 3=right
+# if align > 0 x_position will be ignored
+# if glcd_background_image != "" background color will be ignored
+# glcd_position_settings != false allows to edit position settings in gui
+glcd_foreground_color_red=100
+glcd_foreground_color_green=100
+glcd_foreground_color_blue=100
+glcd_background_color_red=0
+glcd_background_color_green=0
+glcd_background_color_blue=0
+glcd_background_image=/share/tuxbox/neutrino/icons/oled/weather.png
+glcd_font=/share/fonts/neutrino.ttf
+glcd_channel_percent=22
+glcd_channel_align=2
+glcd_channel_x_position=0
+glcd_channel_y_position=22
+glcd_logo=true
+glcd_logo_percent=22
+glcd_logo_x_position=0
+glcd_logo_y_position=22
+glcd_epg_percent=14
+glcd_epg_align=2
+glcd_epg_x_position=0
+glcd_epg_y_position=133
+glcd_start=false
+glcd_start_percent=0
+glcd_start_align=0
+glcd_start_x_position=0
+glcd_start_y_position=0
+glcd_end=true
+glcd_end_percent=14
+glcd_end_align=3
+glcd_end_x_position=0
+glcd_end_y_position=185
+glcd_duration=false
+glcd_duration_percent=14
+glcd_duration_align=3
+glcd_duration_x_position=0
+glcd_duration_y_position=261
+glcd_progressbar=true
+glcd_progressbar_color_red=62
+glcd_progressbar_color_green=62
+glcd_progressbar_color_blue=62
+glcd_progressbar_percent=22
+glcd_progressbar_width=313
+glcd_progressbar_x_position=18
+glcd_progressbar_y_position=201
+glcd_time=false
+glcd_time_percent=0
+glcd_time_align=1
+glcd_time_x_position=0
+glcd_time_y_position=0
+glcd_icons_percent=4
+glcd_icons_y_position=6
+glcd_icon_ecm_x_position=100
+glcd_icon_cam_x_position=148
+glcd_icon_txt_x_position=193
+glcd_icon_dd_x_position=238
+glcd_icon_mute_x_position=273
+glcd_icon_timer_x_position=333
+glcd_icon_rec_x_position=398
+glcd_icon_ts_x_position=443
+glcd_weather=true
+glcd_weather_curr_x_position=45
+glcd_weather_next_x_position=375
+glcd_weather_y_position=240
+glcd_standby_clock_digital_y_position=20
+glcd_standby_clock_simple_size=40
+glcd_standby_clock_simple_y_position=20
+glcd_standby_weather_curr_x_position=10
+glcd_standby_weather_next_x_position=340
+glcd_standby_weather_y_position=175
+glcd_position_settings=true

data/oled/themes/800x480/Default.otheme

@@ -0,0 +1,73 @@
+# align 0=none, 1=left, 2=center, 3=right
+# if align > 0 x_position will be ignored
+# if glcd_background_image != "" background color will be ignored
+# glcd_position_settings != false allows to edit position settings in gui
+glcd_foreground_color_red=100
+glcd_foreground_color_green=100
+glcd_foreground_color_blue=100
+glcd_background_color_red=0
+glcd_background_color_green=0
+glcd_background_color_blue=0
+glcd_background_image=
+glcd_font=/share/fonts/neutrino.ttf
+glcd_channel_percent=25
+glcd_channel_align=2
+glcd_channel_x_position=0
+glcd_channel_y_position=38
+glcd_logo=true
+glcd_logo_percent=25
+glcd_logo_x_position=0
+glcd_logo_y_position=38
+glcd_epg_percent=15
+glcd_epg_align=2
+glcd_epg_x_position=0
+glcd_epg_y_position=195
+glcd_start=false
+glcd_start_percent=0
+glcd_start_align=0
+glcd_start_x_position=0
+glcd_start_y_position=0
+glcd_end=false
+glcd_end_percent=0
+glcd_end_align=0
+glcd_end_x_position=0
+glcd_end_y_position=0
+glcd_duration=false
+glcd_duration_percent=0
+glcd_duration_align=0
+glcd_duration_x_position=0
+glcd_duration_y_position=0
+glcd_progressbar=true
+glcd_progressbar_color_red=62
+glcd_progressbar_color_green=62
+glcd_progressbar_color_blue=62
+glcd_progressbar_percent=20
+glcd_progressbar_width=800
+glcd_progressbar_x_position=0
+glcd_progressbar_y_position=315
+glcd_time=true
+glcd_time_percent=25
+glcd_time_align=2
+glcd_time_x_position=0
+glcd_time_y_position=345
+glcd_icons_percent=4
+glcd_icons_y_position=9
+glcd_icon_ecm_x_position=166
+glcd_icon_cam_x_position=247
+glcd_icon_txt_x_position=322
+glcd_icon_dd_x_position=397
+glcd_icon_mute_x_position=455
+glcd_icon_timer_x_position=555
+glcd_icon_rec_x_position=663
+glcd_icon_ts_x_position=738
+glcd_weather=false
+glcd_weather_curr_x_position=0
+glcd_weather_next_x_position=0
+glcd_weather_y_position=0
+glcd_standby_clock_digital_y_position=30
+glcd_standby_clock_simple_size=40
+glcd_standby_clock_simple_y_position=30
+glcd_standby_weather_curr_x_position=10
+glcd_standby_weather_next_x_position=567
+glcd_standby_weather_y_position=263
+glcd_position_settings=true

data/oled/themes/800x480/Makefile.am

@@ -0,0 +1,4 @@
+oledthemesdir = $(THEMESDIR)/oled
+
+oledthemes_DATA = \
+	Default.otheme

data/oled/themes/Makefile.am

@@ -0,0 +1,16 @@
+SUBDIRS =
+if BOXMODEL_VUUNO4KSE
+SUBDIRS += 400x240
+endif
+if BOXMODEL_VUSOLO4K
+SUBDIRS += 480x320
+endif
+if BOXMODEL_VUDUO4K
+SUBDIRS += 480x320
+endif
+if BOXMODEL_VUDUO4KSE
+SUBDIRS += 480x320
+endif
+if BOXMODEL_VUULTIMO4K
+SUBDIRS += 800x480
+endif

data/scripts/Makefile.am

@@ -5,7 +5,7 @@ install_SCRIPTS = \
 	restore.sh \
 	install.sh 
 
-# if BOXMODEL_CS_HD2
+# if BOXMODEL_CST_HD2
 # install_SCRIPTS += \
 # 	backup_flash.sh \
 # 	restore_flash.sh

data/themes/Grey-3.0.theme

@@ -0,0 +1,107 @@
+clock_Digit_alpha=0
+clock_Digit_blue=100
+clock_Digit_green=100
+clock_Digit_red=100
+colored_events_alpha=0
+colored_events_blue=62
+colored_events_channellist=2
+colored_events_green=62
+colored_events_infobar=2
+colored_events_red=63
+font_file=/share/fonts/neutrino.ttf
+infobar_Text_alpha=0
+infobar_Text_blue=100
+infobar_Text_green=100
+infobar_Text_red=100
+infobar_alpha=0
+infobar_blue=40
+infobar_casystem_alpha=8
+infobar_casystem_blue=0
+infobar_casystem_green=0
+infobar_casystem_red=0
+infobar_gradient_body=4
+infobar_gradient_body_direction=1
+infobar_gradient_bottom=0
+infobar_gradient_bottom_direction=1
+infobar_gradient_top=3
+infobar_gradient_top_direction=1
+infobar_green=29
+infobar_red=25
+lcd_autodimm=0
+lcd_brightness=10
+lcd_contrast=15
+lcd_deepbrightness=5
+lcd_dim_brightness=8
+lcd_dim_time=10
+lcd_inverse=0
+lcd_power=1
+lcd_show_volume=1
+lcd_standbybrightness=3
+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=0
+menu_Content_Selected_blue=70
+menu_Content_Selected_green=65
+menu_Content_Selected_red=65
+menu_Content_Text_alpha=0
+menu_Content_Text_blue=100
+menu_Content_Text_green=100
+menu_Content_Text_red=100
+menu_Content_alpha=0
+menu_Content_blue=40
+menu_Content_green=30
+menu_Content_inactive_Text_alpha=0
+menu_Content_inactive_Text_blue=58
+menu_Content_inactive_Text_green=58
+menu_Content_inactive_Text_red=58
+menu_Content_inactive_alpha=0
+menu_Content_inactive_blue=40
+menu_Content_inactive_green=30
+menu_Content_inactive_red=25
+menu_Content_red=25
+menu_Foot_Text_alpha=0
+menu_Foot_Text_blue=60
+menu_Foot_Text_green=60
+menu_Foot_Text_red=60
+menu_Foot_alpha=0
+menu_Foot_blue=30
+menu_Foot_green=25
+menu_Foot_red=24
+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=30
+menu_Head_gradient=3
+menu_Head_gradient_direction=1
+menu_Head_green=20
+menu_Head_red=15
+menu_Hint_gradient=3
+menu_Hint_gradient_direction=1
+menu_Separator_gradient_enable=0
+menu_SubHead_gradient=4
+menu_SubHead_gradient_direction=1
+message_frame_enable=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

data/themes/Grey-3.0/Makefile.am

@@ -0,0 +1 @@
+subdir = icons

data/themes/Grey-3.0/icons/Makefile.am

@@ -0,0 +1 @@
+subdir = buttons

data/themes/Grey-3.0/icons/buttons/Makefile.am

@@ -0,0 +1,7 @@
+installdir = $(THEMESDIR)/Grey-3.0/icons
+
+install_DATA = \
+	btn_option_off_active.png \
+	btn_option_off_inactive.png \
+	btn_option_on_active.png \
+	btn_option_on_inactive.png

data/themes/Makefile.am

@@ -1,5 +1,6 @@
 SUBDIRS = \
-	Grey-Blue/icons/buttons \
+	Neutrino-3.0/icons/buttons \
+	Grey-3.0/icons/buttons \
 	Neutrino-3.0/icons/buttons \
 	Olive-3.0/icons/buttons
 
@@ -12,7 +13,8 @@ install_DATA = \
 	DVB2000.theme \
 	DarkBlue.theme \
 	DarkBrown.theme \
-	Gray.theme \
+	Grey.theme \
+	Grey-3.0.theme \
 	Grey-Blue.theme \
 	MonoChrom.theme \
 	Neutrino-3.0.theme \

data/y-web/Makefile.am

@@ -53,6 +53,7 @@ install_DATA =	channels.js \
 		Y_Settings_automount.yhtm \
 		Y_Settings_Backup.yhtm \
 		Y_Settings_buttons.yhtm \
+		Y_Settings_glcd.yhtm \
 		Y_Settings_lcd.yhtm \
 		Y_Settings_Live.yhtm \
 		Y_Settings_Menue.yhtm \
@@ -77,6 +78,7 @@ install_DATA =	channels.js \
 		Y_Tools_Cmd.yhtm \
 		Y_Tools_Flash_Menue.yhtm \
 		Y_Tools_Flash_Upload.yhtm \
+		Y_Tools_Glcd_Screenshot.yhtm \
 		Y_Tools_Info_Menue.yhtm \
 		Y_Tools_Installer.yhtm \
 		Y_Tools_lcshot.yhtm \

data/y-web/Y_Baselib.js

@@ -505,3 +505,8 @@ function saveTextAsFile(content, filename, filetype)
 	}
 	downloadLink.click();
 }
+
+function glcdscreenshot(_filename)
+{
+	return loadSyncURL("/control/glcdscreenshot?name="+_filename);
+}

data/y-web/Y_Blocks.txt

@@ -538,15 +538,16 @@ start-block~remote
 		{=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+ DUO4KSE~	{=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=}~
+		{=if-equal:{=var-get:boxtype=}~AirDigital Zgemma H7C/S~	{=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=}~
@@ -569,10 +570,11 @@ start-block~remote
 	{=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=}~
+	{=if-equal:{=var-get:yfbtype=}~19~	{=include-block:Y_Blocks.txt;rc_vuplus=}~
+	{=if-equal:{=var-get:yfbtype=}~20~	{=include-block:Y_Blocks.txt;rc_zgemma_h7=}~
 
 	{=comment:fallback~=}			{=include-block:Y_Blocks.txt;rc_cst_v1=}
-	=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
+	=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
 =}
 end-block~remote
 
@@ -1143,7 +1145,7 @@ start-block~rc_wwio_bre2ze4k
 </map>
 end-block~rc_wwio_bre2ze4k
 
-# ------ Remote VU+ Solo 4K/Duo 4K/Ultimo 4K/Zero 4K/Uno 4K SE
+# ------ Remote VU+ Solo 4K, Duo 4K, Duo 4K SE, Ultimo 4K, Zero 4K, Uno 4K, Uno 4K SE
 start-block~rc_vuplus
 <img src="images/rc_vuplus.png" usemap="#rc"/>
 <map name="rc" id="rc">
@@ -1214,7 +1216,7 @@ start-block~rc_zgemma_h7
 <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,318,169,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')" />
@@ -1228,7 +1230,7 @@ start-block~rc_zgemma_h7
 <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="circle" coords="97,269,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')" />

data/y-web/Y_Boxcontrol_Menue.yhtm

@@ -148,6 +148,11 @@ function get_data(){
 				<li>
 					<a target="work" title="{=L:bc.menue.remote_desc=}" href="Y_Tools_Rcsim.yhtm">{=L:bc.menue.remote=}</a>
 				</li>
+				{=if-equal:{=ini-get:%(CONFIGDIR)/neutrino.conf;glcd_enable;0=}~1~
+				<li>
+					<a target="work" title="{=L:bc.menue.glcd_screenshot_desc=}" href="Y_Tools_Glcd_Screenshot.yhtm">{=L:bc.menue.glcd_screenshot=}</a>
+				</li>
+				~=}
 				{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
 				<li>
 					{=if-empty:{=var-get:lcshot=}~

data/y-web/Y_Settings_Menue.yhtm

@@ -84,6 +84,13 @@ function init(){
 					{=var-set:m_link_text={=L:set.menue.pictureviewer=}=}
 					{=include-block:Y_Blocks.txt;management_link=}
 				</li>
+				{=if-equal:{=ini-get:%(CONFIGDIR)/neutrino.conf;glcd_enable;0=}~1~
+				<li>
+					{=var-set:m_link_href=Y_Settings_glcd.yhtm=}
+					{=var-set:m_link_text={=L:set.menue.glcd_display=}=}
+					{=include-block:Y_Blocks.txt;management_link=}
+				</li>
+				~=}
 				{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
 				<li>
 					{=var-set:m_link_href=Y_Settings_video_audio.yhtm=}

data/y-web/Y_Settings_glcd.yhtm

@@ -0,0 +1,128 @@
+{=include-block:Y_Blocks.txt;management_check_top=}
+{=include-block:Y_Blocks.txt;head=}
+<style type="text/css">
+/*<![CDATA[*/
+	.alink {
+	text-decoration: underline;
+	}
+/*]]>*/
+</style>
+<script type="text/javascript" src="/Y_Baselib.js"></script>
+<script type="text/javascript">
+/*<![CDATA[*/
+function do_init()
+{
+	var val = "";
+	obj_set_radio_value('glcd_enable', "{=ini-get:%(CONFIGDIR)/neutrino.conf;glcd_enable;1~open=}");
+	obj_set_radio_value('glcd_inverse', "{=ini-get:%(CONFIGDIR)/neutrino.conf;glcd_inverse;0~cache=}");
+
+	val = "{=ini-get:%(CONFIGDIR)/neutrino.conf;glcd_brightness_dim;5~cache=}";
+		document.f.glcd_brightness_dim.value = val;
+	val = "{=ini-get:%(CONFIGDIR)/neutrino.conf;glcd_brightness_dim_time;15~cache=}";
+		document.f.glcd_.brightness_dim_time.value = val;
+	val = "{=ini-get:%(CONFIGDIR)/neutrino.conf;glcd_brightness;7~cache=}";
+		document.f.glcd_brightness.value = val;
+	val = "{=ini-get:%(CONFIGDIR)/neutrino.conf;glcd_brightness_standby;1~cache=}";
+		document.f.glcd_brightness_standby.value = val;
+}
+
+function setDefault()
+{
+	document.f.glcd_brightness_dim.value = 5;
+	document.f.glcd_brightness_dim_time.value = 15
+	document.f.glcd_brightness.value = 7;
+	document.f.glcd_brightness_standby.value = 1;
+}
+
+function do_submit()
+{
+		show_waitbox(true);
+		if (document.f.glcd_brightness_dim.value > 10)
+			document.f.glcd_brightness_dim.value = 10;
+		else if (document.f.glcd_brightness_dim.value < 0)
+			document.f.glcd_brightness_dim.value = 0;
+		if (document.f.glcd_brightness_dim_time.value > 60)
+			document.f.glcd_brightness_dim_time.value = 60;
+		else if (document.f.glcd_brightness_dim_time.value < 0)
+			document.f.glcd_brightness_dim_time.value = 0;
+		if (document.f.glcd_brightness.value > 10)
+			document.f.glcd_brightness.value = 10;
+		else if (document.f.glcd_brightness.value < 0)
+			document.f.glcd_brightness.value = 0;
+		if (document.f.glcd_brightness_standby.value > 10)
+			document.f.glcd_brightness_standby.value = 10;
+		else if (document.f.glcd_brightness_standby.value < 0)
+			document.f.glcd_brightness_standby.value = 0;
+		document.f.submit();
+}
+/*]]>*/
+</script>
+</head>
+<body onload="do_init()">
+{=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-LCD=}{=var-set:menu=GLCD Einstellungen=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	<div class="work_box_body">
+	<form name="f" class="y_form" action="">
+		<table cellspacing="0" border="0" cellpadding="2" width="100%">
+			<tr>
+				<td colspan="2" class="y_form_header">GLCD</td>
+			</tr>
+			<tr>
+				<td title="glcd: off/on" width="35%">Power</td>
+				<td>
+					<input type="radio" name="glcd_enable" value="0" />AUS&nbsp;
+					<input type="radio" name="glcd_enable" value="1" />EIN
+				</td>
+			</tr>
+			<tr>
+				<td title="inverse glcd: off/on">Invertieren</td>
+				<td>
+					<input type="radio" name="glcd_inverse" value="0" />AUS&nbsp;
+					<input type="radio" name="glcd_inverse" value="1" />EIN
+				</td>
+			</tr>
+			<tr>
+				<td title="brightness after dimm-timeout">Helligkeit nach dimm-Timeout</td>
+				<td>
+					<input type="text" name="glcd_brightness_dim" size="3" maxlength="3" />
+				</td>
+			</tr>
+			<tr>
+				<td  title="dimm-timeout">Dimm-Timeout</td>
+				<td>
+					<input type="text" name="glcd_brightness_dim_time" size="3" maxlength="3" />
+				</td>
+			</tr>
+			<tr>
+				<td title="lcd brightness normal 0-255">normale Helligkeit</td>
+				<td>
+					<input type="text" name="glcd_brightness" size="3" maxlength="3" />
+				</td>
+			</tr>
+			<tr> 
+				<td title="lcd brightness standby 0-255">Standby Helligkeit</td>
+				<td>
+					<input type="text" name="glcd_brightness_standby" size="3" maxlength="3" />
+				</td>
+			</tr>
+			<tr> 
+				<td>&nbsp;</td>
+				<td><a href="javascript:setDefault()" class="alink">Voreinstellung benutzen</a></td>
+			</tr>
+			<tr>
+				<td colspan="2" class="y_form_header">Anzeige-Modi</td>
+			</tr>
+		</table>
+		<br />
+		<input type="hidden" name="execute" value="include-block:Y_Blocks.txt;glcd_save_settings;nix" />
+		<button type="button" ytype="save" title="submit and save values" onclick="do_submit()">Speichern</button>&nbsp;
+		<button type="button" ytype="refresh" onclick="dbox_reload_neutrino()">reload Neutrino</button>&nbsp;
+		<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">Hilfe</a>
+	</form>
+	</div>
+</div>
+</body>
+</html>
+{=include-block:Y_Blocks.txt;management_check_bottom=}

data/y-web/Y_Tools_Glcd_Screenshot.yhtm

@@ -0,0 +1,98 @@
+
+{=include-block:Y_Blocks.txt;head=}
+<script type="text/javascript" src="/Y_Baselib.js"></script>
+<script type="text/javascript" src="/prototype.js"></script>
+<script type="text/javascript">
+//<![CDATA[
+var interval;
+
+function do_snapshot() {
+
+	$('shot').hide();
+	$('shot').src = "";
+	$('buttons').hide();
+	$('status').show();
+
+	var filename = "glcdscreenshot";
+	if (id("filename").value != "") {
+		filename = id("filename").value;
+	}
+
+	loadSyncURL("/control/glcdscreenshot?name"+filename);
+
+	do_showshot(filename);	
+}
+function do_showshot(_filename) {
+	if (_filename == "")
+		_filename = "glcdscreenshot";
+
+	$('status').hide();
+	$('buttons').show();
+	$('shot').src = "/tmp/"+_filename+".png?"+Math.random();
+	$('shot').show();
+}
+function do_clearshot(){
+	$('shot').hide();
+	$('shot').src = "";
+
+	loadSyncURL("/control/exec?Y_Tools&screenshot_clear");
+}
+
+function do_reload(){
+	if (document.getElementById("checkReload").checked)
+		interval = setInterval(do_snapshot, document.getElementById("inputReload").value + "000");
+	else
+		clearInterval(interval);
+}
+//]]>
+</script>
+</head>
+<body onload="do_snapshot();">
+<div class="work_box" id="work_box">
+	<div class="work_box_head"><div class="work_box_head_h2">
+	{=var-set:help_url==}{=var-set:menu={=L:bc.menue.screenshot=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	<div class="work_box_body">
+		<div id="screenshot_header">
+		<div id="buttons" style="display: block">
+			<div class="left">
+				<button name="snapshot" ytype="snapshot" onclick="do_snapshot()">{=L:bc.screenshot.create=}</button>&nbsp;
+				<button name="clearshot" ytype="clearshot" onclick="do_clearshot()">{=L:bc.screenshot.delete=}</button>&nbsp;
+			</div>
+			<div class="right">
+				<form onsubmit="do_snapshot(); return false">
+				{=L:filename=}: <input type="text" value="glcdscreenshot" id="filename" size="10" />
+				</form>
+			</div>
+			<div class="clear"></div>
+			<div class="right">
+				Reload: <input type="number" value="15" id="inputReload" min="1" max="180" title="{=L:bc.screenshot.reload_desc=}" disabled /> <input id="checkReload" name="checkReload" type="checkbox" />
+			</div>
+			<div class="clear"></div>
+		</div>
+		<div id="status" style="display: none">
+				<img src="/images/wait.gif" alt="{=L:bc.screenshot.wait_text=}"/>
+				{=L:bc.screenshot.wait_text=}
+		</div>
+		</div>
+		<table cellpadding="0" class="screenshot">
+		<tr>
+			<td class="shot">
+				<img id="shot" src="" style="display: none" />
+			</td>
+		</tr>
+		</table>
+	</div>
+</div>
+<script>
+document.getElementById('checkReload').onclick = function() {
+	if (this.checked ) {
+		interval = setInterval(do_snapshot, document.getElementById("inputReload").value + "000");
+		document.getElementById("inputReload").disabled = false;
+	} else {
+		clearInterval(interval);
+		document.getElementById("inputReload").disabled = true;
+	}
+};
+</script>
+</body>
+</html>

data/y-web/images/Makefile.am

@@ -82,7 +82,7 @@ install_DATA =	accept.png \
 		x_red.png \
 		zap.png
 
-if BOXTYPE_COOL
+if BOXTYPE_CST
 install_DATA += rc_cst_v1.jpg \
 		rc_cst_v2.png \
 		rc_cst_v3.png \

data/y-web/languages/Deutsch

@@ -104,6 +104,8 @@ bc.menue.messages_desc=Nachricht an die Box senden
 bc.menue.messages=Nachrichten
 bc.menue.remote_desc=Fernbedienung
 bc.menue.remote=Fernbedienung
+bc.menue.glcd_screenshot_desc=GLCD Screenshot erstellen
+bc.menue.glcd_screenshot=GLCD Screenshot
 bc.menue.lcd_screenshot_desc=LCD Screenshot erstellen
 bc.menue.lcd_screenshot=LCD Screenshot
 bc.menue.lcd_screenshot_desc_ni=lcshot nicht installiert in /bin oder /var/bin
@@ -119,6 +121,8 @@ bc.menue.webinf_slavebox=Webinterface der SlaveBox
 bc.menue.volumen_display=Lautstärke Anzeige
 
 bc.menue.signal=Signalstärke
+bc.menue.sig_display=Signalstärke
+bc.menue.snr_display=(Signal-)Rauschabstand
 
 ========= Boxcontrol
 bc.control.freemem=FreeMem
@@ -245,6 +249,7 @@ set.menue.recording=Aufnahme
 set.menue.audio_player=Audioplayer
 set.menue.movieplayer=Movieplayer
 set.menue.pictureviewer=Bildbetrachter
+set.menue.glcd_display=GLC-Display
 set.menue.lcd_display=LC-Display
 set.menue.key_settings=Tastenbelegung
 set.menue.boot_options=Bootoptionen

data/y-web/languages/English

@@ -106,7 +106,9 @@ bc.menue.messages_desc=send Messages to box
 bc.menue.messages=Messages
 bc.menue.remote_desc=Web-based Remote Control
 bc.menue.remote=Remote
-bc.menue.lcd_screenshot_desc=make lcd screenshot
+bc.menue.glcd_screenshot_desc=take a GLCD screenshot
+bc.menue.glcd_screenshot=GLCD Screenshot
+bc.menue.lcd_screenshot_desc=take a lcd screenshot
 bc.menue.lcd_screenshot=LCD Screenshot
 bc.menue.lcd_screenshot_desc_ni=lcshot not installed at /bin or /var/bin
 bc.menue.screenshot=Screenshot
@@ -121,6 +123,8 @@ bc.menue.webinf_slavebox=Webinterface der SlaveBox
 bc.menue.volumen_display=volumen display
 
 bc.menue.signal=Signal strength
+bc.menue.sig_display=Signal strength
+bc.menue.snr_display=signal-to-noise ratio
 
 ========= Boxcontrol
 bc.control.freemem=FreeMem
@@ -248,6 +252,7 @@ set.menue.recording=Recording
 set.menue.audio_player=Audioplayer
 set.menue.movieplayer=Movieplayer
 set.menue.pictureviewer=Picture Viewer
+set.menue.glcd_display=GLC-Display
 set.menue.lcd_display=LC-Display
 set.menue.key_settings=Key Layout
 set.menue.boot_options=Boot options

lib/Makefile.am

@@ -18,7 +18,7 @@ SUBDIRS += \
 	libupnpclient
 endif
 
-if BOXTYPE_COOL
+if BOXTYPE_CST
 SUBDIRS += \
 	hardware/coolstream
 endif

lib/hardware/audio.h

@@ -1,8 +1,8 @@
-#if HAVE_COOL_HARDWARE
+#if HAVE_CST_HARDWARE
 #include <audio_cs.h>
 #elif USE_STB_HAL
 #include <audio_hal.h>
 #else
-#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined.
+#error neither HAVE_CST_HARDWARE nor USE_STB_HAL defined.
 #error do you need to include config.h?
 #endif

lib/hardware/ca.h

@@ -1,8 +1,8 @@
-#if HAVE_COOL_HARDWARE
+#if HAVE_CST_HARDWARE
 #include <ca_cs.h>
 #elif USE_STB_HAL
 #include <ca_hal.h>
 #else
-#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined.
+#error neither HAVE_CST_HARDWARE nor USE_STB_HAL defined.
 #error do you need to include config.h?
 #endif

lib/hardware/coolstream/hardware_caps.cpp

@@ -24,6 +24,7 @@ hw_caps_t *get_hwcaps(void) {
 	caps.has_SCART = (rev != 10);
 	caps.has_SCART_input = 0;
 	caps.has_YUV_cinch = 1;
+	caps.can_cpufreq = (rev < 9);
 	caps.can_shutdown = (rev > 7);
 	caps.can_cec = 1;
 	caps.display_type = HW_DISPLAY_LINE_TEXT;
@@ -32,6 +33,7 @@ hw_caps_t *get_hwcaps(void) {
 	caps.display_can_deepstandby = (rev > 7);
 	caps.display_can_set_brightness = 1;
 	caps.display_has_statusline = 1;
+	caps.display_has_colon = 0;
 	caps.has_button_timer = 0;
 	caps.has_button_vformat = 1;
 	caps.can_ar_14_9 = 1;

lib/hardware/coolstream/hardware_caps.h

@@ -26,6 +26,7 @@ typedef struct hw_caps
 	int has_SCART;
 	int has_SCART_input;
 	int has_YUV_cinch;
+	int can_cpufreq;
 	int can_shutdown;
 	int can_cec;
 	int can_ar_14_9;	/* video drivers have 14:9 aspect ratio mode */
@@ -37,6 +38,7 @@ typedef struct hw_caps
 	int display_can_deepstandby;
 	int display_can_set_brightness;
 	int display_has_statusline;
+	int display_has_colon;
 	int has_button_timer;
 	int has_button_vformat;
 	char boxvendor[64];

lib/hardware/dmx.h

@@ -1,8 +1,8 @@
-#if HAVE_COOL_HARDWARE
+#if HAVE_CST_HARDWARE
 #include <dmx_cs.h>
 #elif USE_STB_HAL
 #include <dmx_hal.h>
 #else
-#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined.
+#error neither HAVE_CST_HARDWARE nor USE_STB_HAL defined.
 #error do you need to include config.h?
 #endif

lib/hardware/playback.h

@@ -1,8 +1,8 @@
-#if HAVE_COOL_HARDWARE
+#if HAVE_CST_HARDWARE
 #include <playback_cs.h>
 #elif USE_STB_HAL
 #include <playback_hal.h>
 #else
-#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined.
+#error neither HAVE_CST_HARDWARE nor USE_STB_HAL defined.
 #error do you need to include config.h?
 #endif

lib/hardware/record.h

@@ -1,8 +1,8 @@
-#if HAVE_COOL_HARDWARE
+#if HAVE_CST_HARDWARE
 #include <record_cs.h>
 #elif USE_STB_HAL
 #include <record_hal.h>
 #else
-#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined.
+#error neither HAVE_CST_HARDWARE nor USE_STB_HAL defined.
 #error do you need to include config.h?
 #endif

lib/hardware/video.h

@@ -1,10 +1,10 @@
-#if HAVE_COOL_HARDWARE
+#if HAVE_CST_HARDWARE
 #include <cs_api.h>
 #include <video_cs.h>
 #elif USE_STB_HAL
 #include <init.h>
 #include <video_hal.h>
 #else
-#error neither HAVE_COOL_HARDWARE nor USE_STB_HAL defined.
+#error neither HAVE_CST_HARDWARE nor USE_STB_HAL defined.
 #error do you need to include config.h?
 #endif

lib/libdvbsub/Makefile.am

@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 	@SIGC_CFLAGS@ \
 	@HWLIB_CFLAGS@
 
-AM_CPPFLAGS += -fno-rtti -fno-exceptions
+AM_CPPFLAGS += -fno-rtti -fno-exceptions -D__STDC_LIMIT_MACROS
 
 noinst_LIBRARIES = libdvbsub.a
 

lib/libdvbsub/dvbsub.cpp

@@ -243,8 +243,8 @@ static void* reader_thread(void * /*arg*/)
 	bool bad_startcode = false;
 	set_threadname("dvbsub:reader");
 
-        dmx = new cDemux(0);
-        dmx->Open(DMX_PES_CHANNEL, NULL, 64*1024);
+	dmx = new cDemux(0);
+	dmx->Open(DMX_PES_CHANNEL, NULL, 64*1024);
 
 	while (reader_running) {
 		if(dvbsub_stopped /*dvbsub_paused*/) {

lib/libtuxtxt/tuxtxt.h

@@ -173,16 +173,9 @@ int tv_pip_y;
 #define RC_TTTV     CRCInput::RC_tttv
 #define RC_TTZOOM   CRCInput::RC_ttzoom
 #define RC_TTREVEAL CRCInput::RC_ttreveal
-#if HAVE_TRIPLEDRAGON
-/* td has more keys so use ttx key for switching split mode... */
-#define RC_SPLIT    CRCInput::RC_text
-/* rc_text is now unused */
-#define RC_TEXT    (CRCInput::RC_MaxRC + 1)
-#else
 /* ...while other receivers use the vol- key for that, so rc_split is unused */
 #define RC_SPLIT   (CRCInput::RC_MaxRC + 1)
 #define RC_TEXT     CRCInput::RC_text
-#endif
 
 typedef enum /* object type */
 {