Change to version 3.23

- Contains more user interactions
- No disabled menu items, this allows getting package information
  for all items.
- Menu list is now divided into sections for updates, plugins and
  system packs, each sorted by installed or not installed.
- Install/reinstall and uninstall takes place via user dialogue
- Expert mode has been revised. Problematic packages may not be touched
  here either.
- Simplified progress display
- and some minor changes

.mailmap

@@ -0,0 +1,125 @@
+#
+# This list is used by git-shortlog to fix a few botched name translations
+# in the git archive, either because the author's full name was messed up
+# and/or not always written the same way, making contributions from the
+# same person appearing not to be so or badly displayed.
+# With this file it is possible with an easy way to clean up the repository
+# in combination with git-filter-repo too.
+# see https://github.com/newren/git-filter-repo
+#
+# 	$ git filter-repo -f --use-mailmap
+#
+
+Andrej Tobola <andrej.tobola+gifthub@gmail.com>
+bazi98 <bazi98@web.de>
+bazi98 <bazi98@web.de> bazi98 <fritz@example.com>
+Benny <Benny@users.noreply.github.com>
+Benny <Benny@users.noreply.github.com> Benny <>
+BPanther <bpanther_ts@hotmail.com>
+Christian Ege <k4230r6@googlemail.com>
+Christian Schuett <Gaucho316@hotmail.com>
+[CST] Bas <bas@coolstreamtech.com>
+[CST] Bas <bas@coolstreamtech.com> S.R. van Loon <bas@bvl-mbp-001.(none)>
+[CST] Focus <focus.cst@gmail.com>
+[CST] Focus <focus.cst@gmail.com> focus <focus@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+[CST] Lucian <lucian@coolstreamtech.com>
+[CST] Lucian <lucian@coolstreamtech.com> lucgas <lucgas@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+[CST] Micha <Micha.R@no-access.de>
+[CST] Nicu <popescunicolae7@hotmail.com>
+[CST] Nicu <popescunicolae7@hotmail.com> [CST]Nicu <popescunicolae7@hotmail.com>
+DboxOldie <DboxOldie@users.noreply.github.com> DboxOldie <>
+DboxOldie <DboxOldie@users.noreply.github.com> DboxOldie <dbo@ddt>
+defans <defans@bluepeercrew.us>
+defans <defans@bluepeercrew.us> snafed <snafed@bluepeercrew.us>
+defans <defans@bluepeercrew.us> svenhoefer, SatBaby, snafed <svenhoefer@svenhoefer.com>
+defans <defans@bluepeercrew.us> svenhoefer, snafed <svenhoefer@svenhoefer.com>
+Don de Deckelwech <dondede@gmx.de>
+Don de Deckelwech <dondede@gmx.de> Don-de-Deckelwech <32013899+Don-de-Deckelwech@users.noreply.github.com>
+Ezak <marc.szymkowiak91@googlemail.com>
+FlatTV <FlatTV@gmx.de> 
+FlatTV <FlatTV@gmx.de> FlatTV <FlatTV@linux-z6o4.site>
+Frankenstone <dampf_acc@online.de>
+Frankenstone <dampf_acc@online.de> Frankenstone <dampf_acc@yahoo.com>
+fred_feuerstein <fred_feuerstein@herr-der-mails.de>
+fred_feuerstein <fred_feuerstein@herr-der-mails.de> fredfeuerstein2 <fred_feuerstein@herr-der-mails.de>
+fred_feuerstein <fred_feuerstein@herr-der-mails.de> fredfeuerstein2 <52878780+fredfeuerstein2@users.noreply.github.com>
+Gaucho316 <Gaucho316@hotmail.com>
+GetAway <get-away@t-online.de>
+gixxpunk <thomas.harfmann@gmail.com>
+gixxpunk <thomas.harfmann@gmail.com> gandharva <gandharva@gmx.de>
+gixxpunk <thomas.harfmann@gmail.com> Striper <gandharva@gmx.de>
+gixxpunk <thomas.harfmann@gmail.com> striper <striper@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+gixxpunk <thomas.harfmann@gmail.com> striper <striper@gmx.de>
+Hendi <hendi48@freenet.de>
+Hendi <hendi48@freenet.de> Hendi48 <32822533+Hendi48@users.noreply.github.com>
+horsti58 <horsti58@gmx.net>
+horsti58 <horsti58@gmx.net> horsti58 <horsti58@gmx.netm>
+IngoF <ingo.fischer@arcormail.de>
+Jacek Jendrzej <overx300@gmail.com>
+Jacek Jendrzej <overx300@gmail.com> Jacek Jendrzej <crashdvb@googlemail.com>
+Jacek Jendrzej <overx300@gmail.com> Jacek Jendrzej <satbaby@kawaii.com>
+Jacek Jendrzej <overx300@gmail.com> satbaby <>
+Jacek Jendrzej <overx300@gmail.com> satbaby <crashdvb@googlemail.com>
+Jacek Jendrzej <overx300@gmail.com> satbaby <satbaby>
+Jacek Jendrzej <overx300@gmail.com> satbaby <satbaby@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+Jacek Jendrzej <overx300@gmail.com> j00zek <j00zek@ubuntu.(none)>
+Jacek Jendrzej <overx300@gmail.com> j00zek <zdzislaw22@windowslive.com>
+Janus <janus@debian>
+J. Krieg <bellum07@googlemail.com>
+J. Krieg <bellum07@googlemail.com> bellum <bellum07@googlemail.com>
+JohnnyRun <giannicarabelli@gmail.com>
+klauser <baumeister23@freenet.de>
+Knicko007 <knicko@glj.servebbs.com>
+Knicko007 <knicko@glj.servebbs.com> Knicko <knicko@glj.servebbs.com>
+limes007 <39467727+limes007@users.noreply.github.com>
+Marc Szymkowiak <marc.szymkowiak91@googlemail.com>
+Markus Volk <f_l_k@t-online.de>
+Markus Volk <f_l_k@t-online.de> flk <f_l_k@t-online.de>
+Markus Volk <f_l_k@t-online.de> Markus Volk <flk@linux.fritz.box>
+Markus Volk <f_l_k@t-online.de> MarkusVolk <f_l_k@t-online.de>
+martii <m4rtii@gmx.de>
+martii <m4rtii@gmx.de> martii <you@example.com>
+max_10 <max_10@gmx.de>
+max_10 <max_10@gmx.de> max10 <max_10@gmx.de>
+Michael Liebmann <tuxcode.bbg@gmail.com>
+Michael Liebmann <tuxcode.bbg@gmail.com> micha-bbg <micha-bbg@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+Michael Liebmann <tuxcode.bbg@gmail.com> micha-bbg <tuxcode.bbg@gmail.com>
+Michael Liebmann <tuxcode.bbg@gmail.com> micha-bbg <tuxcode.bbg@googlemail.com>
+Michael Liebmann <tuxcode.bbg@gmail.com> Michael Liebmann <micha-bbg@users.noreply.github.com>
+Michael Liebmann <tuxcode.bbg@gmail.com> M. Liebmann <git@tuxcode.de>
+Michael Liebmann <tuxcode.bbg@gmail.com> M. Liebmann <tuxcode.bbg@gmail.com>
+Michael Liebmann <tuxcode.bbg@gmail.com> [priv] M. Liebmann <git@tuxcode.de>
+Michael Liebmann <tuxcode.bbg@gmail.com> [priv] M. Liebmann <tuxcode.bbg@gmail.com>
+mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+NadjaW <nadja.wilx@web.de>
+nightshad <nightshad@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+ni-visitor <neutrino.images@gmail.com>
+no@ma.il <one@localhost.(none)>
+OneOfNine <oneofnine@web.de>
+redblue.pkt <redblue.pkt@orange.pl>
+redblue.pkt <redblue.pkt@orange.pl> redblue-pkt <17146148+redblue-pkt@users.noreply.github.com>
+redblue.pkt <redblue.pkt@orange.pl> redblue-pkt <redblue-pkt@orange.pl>
+retsim01 <mrdata1972+neutrino@gmail.com>
+rhabarber1848 <rhabarber1848@web.de>
+rhabarber1848 <rhabarber1848@web.de> rhabarber1848 <rhabarber1848>
+Sascha Zelzer <sascha.zelzer@gmail.com>
+SnowHead <snowhead@spinnes-netz.de>
+Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
+Stefan Seyfried <seife@tuxbox-git.slipkontur.de> seife <seife@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+Stefan Seyfried <seife@tuxbox-git.slipkontur.de> Stefan Seyfried <seife+github@b1-systems.com>
+swing99 <swing0815@googlemail.com>
+TangoCash <eric@loxat.de> Eric Loxat <eric@loxat.de>
+TangoCash <eric@loxat.de> TangoCash <DaHooD@web.de>
+TangoCash <eric@loxat.de> TangoCash <me@spamdot.com>
+Thilo Graf <dbt@novatux.de>
+Thilo Graf <dbt@novatux.de> thilo <dbt@novatux.de> 
+Thilo Graf <dbt@novatux.de> Thilo Graf <tg.pnhd@novatux.de>
+Thilo Graf <dbt@novatux.de> thilo <thilo@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+tomworld <atzeworld@msn.com>
+vanhofen <vanhofen@gmx.de>
+vanhofen <vanhofen@gmx.de> svenhoefer <svenhoefer@e54a6e83-5905-42d5-8d5c-058d10e6a962>
+vanhofen <vanhofen@gmx.de> svenhoefer <svenhoefer@svenhoefer.com>
+vanhofen <vanhofen@gmx.de> Sven Höfer <svenhoefer@svenhoefer.com>
+yjogol <yjogol2@online.de>
+yjogol <yjogol2@online.de> yjogol <yjogol@e54a6e83-5905-42d5-8d5c-058d10e6a962>

Makefile.am

@@ -1,6 +1 @@
 SUBDIRS = lib src data
-
-locale-update:
-	make -C $(top_builddir)/data/locale install-locals
-
-.PHONY: locale-update

acinclude.m4

@@ -1,5 +1,5 @@
 AC_DEFUN([TUXBOX_APPS], [
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 AM_MAINTAINER_MODE
 
 AC_GNU_SOURCE
@@ -77,37 +77,11 @@ if test "$enable_omdb_key_manage" = "no" ; then
 	omdb_key_manage_val=0
 fi
 AC_DEFINE_UNQUOTED([ENABLE_OMDB_KEY_MANAGE],[$omdb_key_manage_val],[Enable manage omdb (imdb) api dev key via gui for additional epg informations.])
-# end omdb
 
-
+if test "$enable_omdb_key_manage" = "yes" ; then
-# youtube
+	AC_DEFINE([ENABLE_OMDB_KEY_MANAGE], 1, [Enable manage omdb (imdb) api dev key via gui for additional movie informations])
-AC_ARG_WITH(youtube-dev-key,
-	AS_HELP_STRING([--with-youtube-dev-key=KEY], [API dev key for YouTube streaming.]),
-	[YT_DEV_KEY="$withval"],
-	[YT_DEV_KEY=""])
-AC_DEFINE_UNQUOTED([YT_DEV_KEY], ["$YT_DEV_KEY"], [API dev key for YouTube streaming.])
-
-AC_ARG_ENABLE([youtube-key-manage],
-	[AS_HELP_STRING([--enable-youtube-key-manage], [Enable manage youtube dev key via gui for additional epg informations. @<:@default=yes@:>@])],
-	[enable_youtube_key_manage="$enableval"],
-	[enable_youtube_key_manage="yes"])
-youtube_key_manage_val=1
-if test "$enable_youtube_key_manage" = "no" ; then
-	youtube_key_manage_val=0
 fi
-AC_DEFINE_UNQUOTED([ENABLE_YOUTUBE_KEY_MANAGE],[$youtube_key_manage_val], [Enable manage youtube dev key via gui for additional epg informations.])
+# omdb end
-
-AC_ARG_ENABLE([youtube-player],
-	[AS_HELP_STRING([--enable-youtube-player], [Enable play and control youtube streams with moviebrowser. @<:@default=yes@:>@])],
-	[enable_youtube_player="$enableval"],
-	[enable_youtube_player="yes"])
-youtube_player_val=1
-if test "$enable_youtube_player" = "no" ; then
-	youtube_player_val=0
-fi
-AC_DEFINE_UNQUOTED([ENABLE_YOUTUBE_PLAYER],[$youtube_player_val], [Enable play and control YouTube streams with moviebrowser.])
-# end youtube
-
 
 # shoutcast
 AC_ARG_WITH(shoutcast-dev-key,
@@ -128,6 +102,23 @@ AC_DEFINE_UNQUOTED([ENABLE_SHOUTCAST_KEY_MANAGE],[$shoutcast_key_manage_val], [E
 # end shoutcast
 
 
+# youtube
+AC_ARG_WITH(youtube-dev-key,
+	AS_HELP_STRING([--with-youtube-dev-key=KEY], [API dev key for YouTube streaming]),
+	[YOUTUBE_DEV_KEY="$withval"],
+	[YOUTUBE_DEV_KEY=""])
+AC_DEFINE_UNQUOTED([YOUTUBE_DEV_KEY], ["$YOUTUBE_DEV_KEY"], [API dev key for YouTube streaming])
+
+AC_ARG_ENABLE([youtube-key-manage],
+	AS_HELP_STRING([--enable-youtube-key-manage], [Enable manage YouTube dev key via gui @<:@default=yes@:>@]),
+	[enable_youtube_key_manage="$enableval"],
+	[enable_youtube_key_manage="yes"])
+
+if test "$enable_youtube_key_manage" = "yes" ; then
+	AC_DEFINE([ENABLE_YOUTUBE_KEY_MANAGE], 1, [Enable manage YouTube dev key via gui])
+fi
+# youtube end
+
 AC_ARG_WITH(libcoolstream-static-dir,
 	AS_HELP_STRING([--with-libcoolstream-static-dir=PATH], [path for static libcoolstream [[NONE]]]),
 	[LIBCOOLSTREAM_STATIC_DIR="$withval"],
@@ -156,6 +147,17 @@ AC_ARG_WITH(default-oled-theme,
 	[default_oled_theme=""])
 AC_DEFINE_UNQUOTED([DEFAULT_OLED_THEME], ["$default_oled_theme"], [Default theme for oled.])
 
+# webif content
+AC_ARG_WITH(webif,
+	AS_HELP_STRING([--without-webif], [disable installation of webif content within defined public httpd path provided by yWeb @<:@default it is enabled@:>@]),
+	[ENABLE_WEBIF="$withval"],
+	[ENABLE_WEBIF="yes"])
+AM_CONDITIONAL(ENABLE_WEBIF,test "$ENABLE_WEBIF" = "yes")
+if test "$ENABLE_WEBIF" = "yes"; then
+	AC_DEFINE(ENABLE_WEBIF, 1, [Enable installation of webif content within defined public httpd path provided by yWeb.])
+fi
+
+
 AC_MSG_CHECKING(target)
 
 if test "$TARGET" = "native"; then
@@ -488,7 +490,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: hd60, hd61, multiboxse, hd51, bre2ze4k, h7, osmini4k, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k])
+AS_HELP_STRING([], [valid for armbox: hd60, hd61, multibox, multiboxse, hd51, bre2ze4k, h7, e4hdultra, protek4k, osmini4k, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k])
 AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2]),
 	[case "${withval}" in
 		generic|raspi)
@@ -517,7 +519,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2]),
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 		;;
-		hd60|hd61|multiboxse|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
+		hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|e4hdultra|protek4k|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
 			if test "$BOXTYPE" = "armbox"; then
 				BOXMODEL="$withval"
 			else
@@ -556,11 +558,14 @@ AM_CONDITIONAL(BOXMODEL_CST_HD2, test "$BOXMODEL" = "hd2")
 # armbox
 AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60")
 AM_CONDITIONAL(BOXMODEL_HD61, test "$BOXMODEL" = "hd61")
+AM_CONDITIONAL(BOXMODEL_MULTIBOX, test "$BOXMODEL" = "multibox")
 AM_CONDITIONAL(BOXMODEL_MULTIBOXSE, test "$BOXMODEL" = "multiboxse")
 
 AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51")
 AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k")
 AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7")
+AM_CONDITIONAL(BOXMODEL_E4HDULTRA, test "$BOXMODEL" = "e4hdultra")
+AM_CONDITIONAL(BOXMODEL_PROTEK4K, test "$BOXMODEL" = "protek4k")
 
 AM_CONDITIONAL(BOXMODEL_OSMINI4K, test "$BOXMODEL" = "osmini4k")
 AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k")
@@ -606,6 +611,9 @@ case "$BOXTYPE" in
 esac
 AM_CONDITIONAL(HAVE_LIBSTB_HAL, test "$libstb_hal" = "yes")
 
+# uclibc
+AM_CONDITIONAL(HAVE_UCLIBC, test "$targetlibdir/ld-uClibc.so.0")
+
 # generic
 if test "$BOXMODEL" = "generic"; then
 	AC_DEFINE(BOXMODEL_GENERIC, 1, [generic pc])
@@ -623,6 +631,8 @@ 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" = "multibox"; then
+	AC_DEFINE(BOXMODEL_MULTIBOX, 1, [multibox])
 elif test "$BOXMODEL" = "multiboxse"; then
 	AC_DEFINE(BOXMODEL_MULTIBOXSE, 1, [multiboxse])
 
@@ -632,6 +642,10 @@ elif test "$BOXMODEL" = "bre2ze4k"; then
 	AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k])
 elif test "$BOXMODEL" = "h7"; then
 	AC_DEFINE(BOXMODEL_H7, 1, [h7])
+elif test "$BOXMODEL" = "e4hdultra"; then
+	AC_DEFINE(BOXMODEL_E4HDULTRA, 1, [e4hdultra])
+elif test "$BOXMODEL" = "protek4k"; then
+	AC_DEFINE(BOXMODEL_PROTEK4K, 1, [protek4k])
 
 elif test "$BOXMODEL" = "osmini4k"; then
         AC_DEFINE(BOXMODEL_OSMINI4K, 1, [osmini4k])
@@ -710,7 +724,7 @@ AM_CONDITIONAL(BOXMODEL_VUPLUS_MIPS, test "$vuplus_mips" = "true")
 
 # all hisilicon BOXMODELs
 case "$BOXMODEL" in
-	hd60|hd61|multiboxse)
+	hd60|hd61|multibox|multiboxse)
 		AC_DEFINE(BOXMODEL_HISILICON, 1, [hisilicon])
 		hisilicon=true
 	;;
@@ -722,7 +736,7 @@ AM_CONDITIONAL(BOXMODEL_HISILICON, test "$hisilicon" = "true")
 
 # BOXMODELs that allows to change osd resolution
 case "$BOXMODEL" in
-	hd2|hd60|hd61|multiboxse|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro)
+	hd2|hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|e4hdultra|protek4k|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro)
 		AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution])
 	;;
 esac

configure.ac

@@ -1,6 +1,6 @@
 # explicit defines for separate revision handling
 define(ver_major, 3)
-define(ver_minor, 22)
+define(ver_minor, 23)
 define(ver_micro, 0)
 define(rel_cycle, "ver_major.0")
 
@@ -38,6 +38,11 @@ AC_PROG_CXX
 AC_DISABLE_STATIC
 LT_INIT
 
+# Set default for ARFLAGS, since autoconf does not have a macro for it.
+# This allows people to set it when running configure or make
+test -n "$ARFLAGS" || ARFLAGS="cr"
+AC_SUBST(ARFLAGS)
+
 # Add build information to local_build_config.h.tmp
 # -------------------------------------------------
 rm -f local_build_config.h.tmp
@@ -174,6 +179,18 @@ AC_ARG_ENABLE(lcd4linux,
 	AC_DEFINE(ENABLE_LCD4LINUX, 1, [enable LCD4Linux support]))
 AM_CONDITIONAL(ENABLE_LCD4LINUX, test "$enable_lcd4linux" = "yes")
 
+# lcd
+AC_ARG_ENABLE(lcd,
+	AS_HELP_STRING([--enable-lcd], [enable internal lcd support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_LCD, 1, [enable internal lcd support]))
+AM_CONDITIONAL(ENABLE_LCD, test "$enable_lcd" = "yes")
+
+# lcd update
+if test "$enable_lcd" = "yes"; then
+	AC_DEFINE(LCD_UPDATE, 1, [include internal lcd update support])
+fi
+AM_CONDITIONAL(LCD_UPDATE, test "$enable_lcd" = "yes")
+
 AC_ARG_ENABLE(graphlcd,
 	AS_HELP_STRING([--enable-graphlcd], [enable GraphLCD support @<:@default=no@:>@]),
 	AC_DEFINE(ENABLE_GRAPHLCD, 1, [enable GraphLCD support]))
@@ -427,6 +444,7 @@ data/oled/icons/Makefile
 data/oled/icons/clock/Makefile
 data/oled/icons/weather/Makefile
 data/oled/themes/Makefile
+data/oled/themes/220x176/Makefile
 data/oled/themes/400x240/Makefile
 data/oled/themes/480x320/Makefile
 data/oled/themes/800x480/Makefile
@@ -448,6 +466,7 @@ data/themes/Neutrino-3.0/icons/buttons/Makefile
 data/themes/Olive-3.0/Makefile
 data/themes/Olive-3.0/icons/Makefile
 data/themes/Olive-3.0/icons/buttons/Makefile
+data/weather/Makefile
 data/webradio/Makefile
 data/webtv/Makefile
 data/y-web/Makefile
@@ -461,6 +480,7 @@ lib/connection/Makefile
 lib/hardware/coolstream/Makefile
 lib/jsoncpp/Makefile
 lib/libconfigfile/Makefile
+lib/liblcddisplay/Makefile
 lib/libdvbsub/Makefile
 lib/libeventserver/Makefile
 lib/libiw/Makefile
@@ -530,6 +550,7 @@ data/config/tobackup.conf
 
 # Oled themes
 AC_CONFIG_FILES([
+data/oled/themes/220x176/Default.otheme
 data/oled/themes/400x240/Default.otheme
 data/oled/themes/480x320/Default.otheme
 data/oled/themes/480x320/Advanced.otheme

data/Makefile.am

@@ -12,9 +12,9 @@ SUBDIRS = \
 	policy \
 	scripts \
 	themes \
+	weather \
 	webradio \
 	webtv \
-	y-web \
 	zapit
 
 if ENABLE_LUA
@@ -26,3 +26,8 @@ if ENABLE_GRAPHLCD
 SUBDIRS += \
 	oled
 endif
+
+if ENABLE_WEBIF
+SUBDIRS += \
+	y-web
+endif

data/config/bad_package_pattern.list.sample

@@ -41,6 +41,8 @@ glibc-
 gstreamer1.0-
 initscripts-
 icu
+iproute2-
+iptables-
 jpeg-tools
 kbd-
 kernel

data/icons/headers/Makefile.am

@@ -35,5 +35,4 @@ install_DATA = \
 	streaming.png \
 	timer.png \
 	upnp.png \
-	video.png \
+	video.png
-	ytplay.png

data/icons/hints/Makefile.am

@@ -21,6 +21,7 @@ install_DATA = \
 	hint_hdd.png \
 	\
 	hint_imageinfo.png \
+	hint_imagelogo.png \
 	\
 	hint_inetradio.png \
 	hint_info.png \
@@ -64,8 +65,12 @@ install_DATA = \
 	hint_vtxt.png \
 	hint_webradio.png \
 	hint_webtv.png \
-	hint_xmltv.png \
+	hint_xmltv.png
-	hint_ytplay.png
+
+if ENABLE_GRAPHLCD
+install_DATA += \
+	hint_graphlcd.png
+endif
 
 if ENABLE_PIP
 install_DATA += \

data/icons/status/markers/Makefile.am

@@ -3,6 +3,8 @@ installdir = $(ICONSDIR)
 install_DATA = \
 	marker_dialog_off.png \
 	marker_dialog_ok.png \
+	marker_dialog_ok_apply.png \
+	marker_download_later.png \
 	marker_epg.png \
 	marker_hd.png \
 	marker_hidden.png \
@@ -17,6 +19,7 @@ install_DATA = \
 	marker_streaming.png \
 	marker_timeshift.png \
 	marker_timeshift_gray.png \
+	marker_user_busy.png \
 	marker_tv.png \
 	marker_uhd.png \
 	marker_update_available.png \

data/icons/weather/Makefile.am

@@ -1,14 +1,22 @@
 installdir = $(ICONSDIR)/weather
 
 install_DATA = \
-	clear-day.png \
+	01d.png \
-	clear-night.png \
+	01n.png \
-	cloudy.png \
+	02d.png \
-	fog.png \
+	02n.png \
-	partly-cloudy-day.png \
+	03d.png \
-	partly-cloudy-night.png \
+	03n.png \
-	rain.png \
+	04d.png \
-	sleet.png \
+	04n.png \
-	snow.png \
+	09d.png \
-	unknown.png \
+	09n.png \
-	wind.png
+	10d.png \
+	10n.png \
+	11d.png \
+	11n.png \
+	13d.png \
+	13n.png \
+	50d.png \
+	50n.png \
+	unknown.png

data/locale/Makefile.am

@@ -8,49 +8,4 @@ unmaintained = \
 	nederlands.locale \
 	slovak.locale
 
-# install_DATA += $(locale_unmaintained)
+#install_DATA += $(unmaintained)
-
-if MAINTAINER_MODE
-
-master.locale=english.locale
-
-locals: sort-locals work-locals locals.h locals_intern.h
-
-$(master.locale) \
-sort-locals:
-	for locale in $(locale); do \
-		cat $(top_srcdir)/data/locale/$${locale} | LC_ALL=C sort | uniq > $${locale}; \
-	done
-
-work-locals: $(master.locale)
-	for locale in $(locale); do \
-		( cd $(top_srcdir)/data/locale; helpers/create-locals-work $${locale}; ); \
-	done
-
-ordercheck: $(master.locale)
-	cut -d' ' -f1 $(top_srcdir)/data/locale/$(master.locale) | LC_ALL=C sort | uniq > /tmp/log
-	cut -d' ' -f1 $(top_srcdir)/data/locale/$(master.locale) | uniq  | diff - /tmp/log || \
-		(echo "ERROR: $(master.locale) not ordered or contains empty lines" && false)
-
-locals.h: ordercheck
-	cut -d' ' -f1 $(top_srcdir)/data/locale/$(master.locale) | LC_ALL=C sort | uniq | tr [:lower:] [:upper:] | tr \. \_  | tr \- \_ | tr -d \? | \
-		$(top_srcdir)/data/locale/helpers/create-locals.h
-
-locals_intern.h: ordercheck
-	cut -d' ' -f1 $(top_srcdir)/data/locale/$(master.locale) | LC_ALL=C sort | uniq | \
-		$(top_srcdir)/data/locale/helpers/create-locals_intern.h
-
-check: locals.h locals_intern.h
-	diff locals.h $(top_srcdir)/src/system
-	diff locals_intern.h $(top_srcdir)/src/system
-
-install-locals: $(locale) locals.h locals_intern.h
-	cp locals.h locals_intern.h $(top_srcdir)/src/system
-	@echo "Consider committing src/system/[locals.h locals_intern.h]"
-	## ??? cp -f $(locale) $(top_srcdir)/data/locale
-	## @echo "Consider committing data/locale/[$(locale)]"
-
-locals-clean:
-	rm -f locals.h locals_intern.h $(locale)
-
-endif

data/locale/_readme.txt

@@ -1,65 +0,0 @@
-Format of .locale files:
-------------------------
-character encoding: UTF-8
-filename suffix   : .locale
-
-Files must be strictly alphabetically ordered, and must not contain
-any empty lines.
-
-Destination of .locale files:
------------------------------
-directory: /var/tuxbox/locale or /share/tuxbox/neutrino/locale
-
-Master file:
-------------
-english.locale is considered the master file.
-
-
-Verfication of .locale files:
------------------------------
-Use ./helpers/check-locale for detecting in master file
-- violations of the sorting order,
-- missing translations and
-- legacy strings.
-
-
-
-How do I add a new locale string?
----------------------------------
-1.)
-First of all, add the new string to english.locale while preserving
-the ordering. Do not add any empty lines.
-
-2.)
-Enter the directory build_tmp/neutrino-hd/data/locale.
-
-3.)
-Use for sorting 'make sort-locals', use 'make ordercheck' to for verification.
-
-4.)
-To the extent possible, update other locale file. For this, 'make work-locals'
-may be useful. if you find a file called *.locale-work, merge this into *.locale
-
-5.)
-Create new versions of the files src/system/locals.h and src/system/locals_intern.h
-using the command 'make locals.h locals_intern.h'.
-
-6.)
-Check the modifications with 'make check'
-
-7.)
-Or use for item 3-6 'make locals'
-
-8.)
-Copy the replacement file to their destination with 'make install-locals'
-
-9.)
-If committing the changes to Git, commit both the involved
-locale-files, src/system/locals.h, and src/system/locals_intern.h.
-
-Useful tools:
--------------
-- emacs (add '(file-coding-system-alist (quote (("\\.locale\\'" . utf-8-unix) ("" undecided)))) to .emacs or use "C-x <RET> c utf-8 <RET> C-x C-f english.locale")
-- iconv
-- sort
-- uxterm

data/locale/create-locale

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+locale_master="deutsch.locale"
+locale="${locale_master} english.locale"
+
+check_locale() {
+	cut -d' ' -f1 ${locale_master} | LC_ALL=C sort | uniq > /tmp/${locale_master}
+	for l in ${locale}; do
+		test $l == ${locale_master} && continue
+		echo $l:
+		echo "----------------"
+		cut -d' ' -f1 $l | diff -u - /tmp/${locale_master}
+		echo
+	done
+	rm /tmp/${locale_master}
+}
+
+sort_locale() {
+	for l in ${locale}; do
+		cat ${l} | LC_ALL=C sort | uniq > ${l}.tmp
+		mv ${l}.tmp ${l}
+	done
+}
+
+create_locale_work() {
+	for l in ${locale}; do
+		helpers/create-locale-work ${l}
+	done
+}
+
+create_locals_h() {
+	cut -d' ' -f1 ${locale_master} | LC_ALL=C sort | uniq | tr [:lower:] [:upper:] | tr \. \_  | tr \- \_ | tr -d \? | \
+		helpers/create-locals_h
+	mv locals.h ../../src/system
+}
+
+create_locals_intern_h() {
+	cut -d' ' -f1 ${locale_master} | LC_ALL=C sort | uniq | \
+		helpers/create-locals_intern_h
+	mv locals_intern.h ../../src/system
+}
+
+#check_locale
+sort_locale
+create_locale_work
+create_locals_h
+create_locals_intern_h
+
+echo "Consider committing src/system/[locals.h locals_intern.h]"
+echo "and data/locale/[${locale}]"

data/locale/deutsch.locale

@@ -271,8 +271,10 @@ channellist.edit Bearbeiten
 channellist.enablesdt_off aus
 channellist.enablesdt_on ein
 channellist.enablesdt_on_extended ein (mit PMT)
-channellist.epgtext_align_left links
+channellist.epgtext_align_left_bottom links unten
-channellist.epgtext_align_right rechts
+channellist.epgtext_align_left_middle links zentriert
+channellist.epgtext_align_right_bottom rechts unten
+channellist.epgtext_align_right_middle rechts zentiert
 channellist.extended Sendungsfortschritt anzeigen
 channellist.favs Favoriten
 channellist.foot Kanalinformationen
@@ -363,6 +365,7 @@ colorchooser.blue blau
 colorchooser.green grün
 colorchooser.red rot
 colormenu.background Hintergrundfarbe
+colormenu.channellist_description_text Textfarbe für Sendungsbeschreibungen
 colormenu.clock_textcolor Ziffernfarbe
 colormenu.fade Ein-/Ausblenden
 colormenu.font Verwendete Schriftart
@@ -370,7 +373,7 @@ colormenu.font_ttx Videotext Schriftart
 colormenu.menucolors Themes
 colormenu.osd_preset Bildschirmauswahl
 colormenu.osd_resolution OSD-Auflösung
-colormenu.progressbar_active Farbe des aktiven Teil
+colormenu.progressbar_active Farbe des aktiven Teils
 colormenu.progressbar_passive Hintergrundfarbe
 colormenu.shadow_color Schattenfarbe
 colormenu.textcolor Textfarbe
@@ -478,35 +481,35 @@ extra.dboxinfo_uptime Uptime
 extra.dboxinfo_use Nutzung
 extra.dboxinfo_used Benutzt
 extra.east Osten
-extra.fec_1_2 1/2
+extra.fec_11_15 11/15
-extra.fec_2_3 2/3
-extra.fec_2_5 2/5
-extra.fec_3_4 3/4
-extra.fec_3_5 3/5
-extra.fec_4_5 4/5
-extra.fec_5_6 5/6
-extra.fec_7_8 7/8
-extra.fec_8_9 8/9
-extra.fec_9_10 9/10
-extra.fec_auto Auto
-extra.fec_13_45 13/45
-extra.fec_9_20 9/20
 extra.fec_11_20 11/20
+extra.fec_13_18 13/18
+extra.fec_13_45 13/45
+extra.fec_1_2 1/2
+extra.fec_1_2_L 1/2L
 extra.fec_23_36 23/36
 extra.fec_25_36 25/36
-extra.fec_13_18 13/18
 extra.fec_26_45 26/45
-extra.fec_28_45 28/45
-extra.fec_7_9 7/9
-extra.fec_77_90 77/90
-extra.fec_32_45 32/45
-extra.fec_11_15 11/15
-extra.fec_1_2_L 1/2L
-extra.fec_8_15_L 8/15L
-extra.fec_3_5_L 3/5L
-extra.fec_2_3_L 2/3L
-extra.fec_5_9_L 5/9L
 extra.fec_26_45_L 26/45L
+extra.fec_28_45 28/45
+extra.fec_2_3 2/3
+extra.fec_2_3_L 2/3L
+extra.fec_2_5 2/5
+extra.fec_32_45 32/45
+extra.fec_3_4 3/4
+extra.fec_3_5 3/5
+extra.fec_3_5_L 3/5L
+extra.fec_4_5 4/5
+extra.fec_5_6 5/6
+extra.fec_5_9_L 5/9L
+extra.fec_77_90 77/90
+extra.fec_7_8 7/8
+extra.fec_7_9 7/9
+extra.fec_8_15_L 8/15L
+extra.fec_8_9 8/9
+extra.fec_9_10 9/10
+extra.fec_9_20 9/20
+extra.fec_auto Auto
 extra.key_current_transponder Aktueller Transponder
 extra.key_format_mode Videoformat
 extra.key_help Hilfe
@@ -515,12 +518,15 @@ extra.key_list_start Listenanfang
 extra.key_next43mode Nächstes Seitenformat
 extra.key_pic_mode Bildschirmformat
 extra.key_pic_size 4:3 Anzeigeverhalten
-extra.key_pip_close Stop/Start PiP
+extra.key_pip_close PiP Start/Stopp
-extra.key_pip_close_avinput Stop/Start PiP (HDMI)
+extra.key_pip_close_avinput PiP Start/Stopp (HDMI)
+extra.key_pip_rotate_ccw PiP bewegen entgegen dem Uhrzeigersinn
+extra.key_pip_rotate_cw PiP bewegen im Uhrzeigensinn
 extra.key_pip_setup PiP Konfiguration
-extra.key_pip_swap Umschalten PiP/live
+extra.key_pip_swap PiP/Live umschalten
 extra.key_record Aufnahme
 extra.key_screenshot Screenshot
+extra.key_sleep Sleeptimer
 extra.key_switchformat Nächste Auflösung
 extra.key_timeshift Timeshift
 extra.key_unlock Entsperren
@@ -641,6 +647,8 @@ extra.volume_pos Lautstärkeanzeige
 extra.volume_size Höhe der Anzeige
 extra.west Westen
 extra.zap_cycle Zap nur in Bouquet
+extra.zapit_fe_no_same Verschiedene Tuner bei gleichen Transponder
+extra.zapit_fe_retries Tuning Wiederholungen
 extra.zapit_fe_timeout Tuning Timeout
 extra.zapit_hvoltage High (13.5/18.5) Voltage
 extra.zapit_motor_speed Rotor Drehzeit
@@ -705,6 +713,7 @@ flashupdate.createimage_warning Nachfolgend wird ein Image für die %s STB erste
 flashupdate.currentversion_sep Installierte Version
 flashupdate.currentversiondate Datum
 flashupdate.currentversiontime Uhrzeit
+flashupdate.enter_flash_script Stoppe laufende Dienste ...
 flashupdate.erasefailed Flash löschen fehlgeschlagen
 flashupdate.erasing lösche Flash
 flashupdate.experimentalimage Sie haben eine Betaversion oder einen Nightly Build ausgewählt.\nBitte beachten Sie, dass diese Version ungetestet ist\nund Ihre Box nach dem Update möglicherweise nicht mehr funktionsfähig ist.\n\nSoll diese Version wirklich installiert werden?
@@ -845,23 +854,22 @@ 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.background Hintergrundbild
-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 im Standby-Modus
 glcd.brightness_dim Dimmen
 glcd.brightness_dim_time Dimmen nach
 glcd.brightness_settings Helligkeit
+glcd.brightness_standby Helligkeit im Standby-Modus
+glcd.channel_align Sendername ausrichten
+glcd.channel_size Sendername Höhe
+glcd.channel_x_position Sendername x-Position
+glcd.channel_y_position Sendername y-Position
+glcd.clock_digital_y_position Digitaluhr y-Position
+glcd.clock_simple_size Einfache Uhr Höhe
+glcd.clock_simple_y_position Einfache Uhr y-Position
 glcd.color.amber Amber
 glcd.color.black Schwarz
 glcd.color.blue Blau
@@ -883,64 +891,89 @@ glcd.color.red Rot
 glcd.color.teal Teal
 glcd.color.white Weiß
 glcd.color.yellow Gelb
-glcd.channel_x_position Sender x-Position
+glcd.color_bg Hintergrundfarbe
-glcd.channel_y_position Sender y-Position
+glcd.color_fg Textfarbe
-glcd.digital_clock_y_position Digitaluhr y-Position
 glcd.display Display-Typ
+glcd.duration_align Sendungsdauer ausrichten
+glcd.duration_show Sendungsdauer anzeigen
+glcd.duration_size Sendungsdauer Höhe
 glcd.duration_x_position Sendungsdauer x-Position
 glcd.duration_y_position Sendungsdauer y-Position
 glcd.enable GraphLCD aktiv
+glcd.end_align Sendungsende ausrichten
+glcd.end_show Sendungsende anzeigen
+glcd.end_size Sendungsende Höhe
 glcd.end_x_position Sendungsende x-Position
 glcd.end_y_position Sendungsende y-Position
+glcd.epg_align EPG ausrichten
+glcd.epg_size EPG Höhe
 glcd.epg_x_position EPG x-Position
 glcd.epg_y_position EPG y-Position
 glcd.font Schrift
 glcd.font_autoresize Automatische Schriftgröße
 glcd.head GraphLCD-Unterstützung
-glcd.logodir Senderlogo-Verzeichnis
+glcd.icon_cam_x_position Icon CI x-Position
+glcd.icon_dd_x_position Icon Ton x-Position
+glcd.icon_ecm_x_position Icon Verschlüsselung x-Position
+glcd.icon_mute_x_position Icon Mute x-Position
+glcd.icon_rec_x_position Icon Aufnahme x-Position
+glcd.icon_timer_x_position Icon Timer x-Position
+glcd.icon_ts_x_position Icon Timeshift x-Position
+glcd.icon_txt_x_position Icon Radiotext x-Position
+glcd.icon_y_percent Icons Höhe
+glcd.icon_y_position Icons y-Position
+glcd.logo_show Senderlogo anzeigen
+glcd.logo_size Senderlogo max. Höhe %
+glcd.logo_width Senderlogo max. Breite %
 glcd.logo_x_position Senderlogo x-Position
 glcd.logo_y_position Senderlogo y-Position
+glcd.logodir Senderlogo-Verzeichnis
 glcd.mirror_osd OSD-Menü auf GraphLCD anzeigen
 glcd.mirror_video Videobild auf GraphLCD anzeigen
 glcd.position_settings Positionen und Größen
+glcd.progressbar_color Fortschrittsbalken Farbe
+glcd.progressbar_show Fortschrittsbalken anzeigen
+glcd.progressbar_size Fortschrittsbalken Höhe
+glcd.progressbar_width Fortschrittsbalken Weite
+glcd.progressbar_x_position Fortschrittsbalken x-Position
+glcd.progressbar_y_position Fortschrittsbalken y-Position
 glcd.restart Neu erkennen
 glcd.scroll_speed Scroll-Geschwindigkeit
-glcd.select.bar Fortschrittsbalkenfarbe
+glcd.standby_clock Zeitanzeige im Standby
-glcd.select.bg Hintergrundfarbe
+glcd.standby_clock_analog Analoge Uhr
-glcd.select.fg Textfarbe
+glcd.standby_clock_digital Digitale Uhr
-glcd.show_duration Sendungsdauer anzeigen
+glcd.standby_clock_lcd LCD-Uhr
-glcd.show_end Sendungsende anzeigen
+glcd.standby_clock_led LED-Uhr
-glcd.show_logo Senderlogo anzeigen
+glcd.standby_clock_simple Einfache Uhr
-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.standby_weather_curr_icon_x_position Wetter-Icon heute x-Position
+glcd.standby_weather_curr_temp_x_position Temperatur heute x-Position
+glcd.standby_weather_next_icon_x_position Wetter-Icon morgen x-Position
+glcd.standby_weather_next_temp_x_position Temperatur morgen x-Position
+glcd.standby_weather_percent Wetter Höhe
+glcd.standby_weather_y_position Wetter im Standby y-Position
+glcd.start_align Sendungsstart ausrichten
+glcd.start_show Sendungsstart anzeigen
+glcd.start_size Sendungsstart Höhe
 glcd.start_x_position Sendungsstart x-Position
 glcd.start_y_position Sendungsstart y-Position
-glcd.time_in_standby Zeitanzeige im Standby
+glcd.theme Theme auswählen
+glcd.theme_settings Themes
+glcd.time_align Uhrzeit ausrichten
+glcd.time_show Uhrzeit anzeigen
+glcd.time_size Uhrzeit Höhe
+glcd.time_size_standby Uhrzeit Höhe im Standby
 glcd.time_x_position Uhrzeit x-Position
 glcd.time_y_position Uhrzeit y-Position
 glcd.volume Lautstärke
+glcd.weather_curr_icon_x_position Wetter-Icon heute x-Position
+glcd.weather_curr_temp_x_position Temperatur heute x-Position
+glcd.weather_next_icon_x_position Wetter-Icon morgen x-Position
+glcd.weather_next_temp_x_position Temperatur morgen x-Position
+glcd.weather_percent Wetter Höhe
+glcd.weather_show Wetter anzeigen
+glcd.weather_y_position Wetter y-Position
 hdd_10min 10 min.
 hdd_1min 1 min.
 hdd_20min 20 min.
@@ -958,9 +991,6 @@ hdd_format_failed Formatierung fehlgeschlagen! Stellen Sie sicher, dass der Date
 hdd_format_on_mount_failed Formatieren bei Einhänge-Fehler
 hdd_format_warn Alle Daten auf dem Datenträger werden gelöscht! Formatierung starten?
 hdd_fs Dateisystem zum formatieren
-hdd_label Datenträger-Bezeichnung
-hdd_label_hint1 Datenträger-Bezeichnung eingeben und mit Speichern übernehmen
-hdd_label_hint2 Nur bei "%s" (Aufnahme-Medium) werden die nötigen Verzeichnisse auf den Datenträger geschrieben
 hdd_info_capacity Kapazität
 hdd_info_firmware Firmware
 hdd_info_head HDD Info
@@ -973,6 +1003,9 @@ hdd_info_sector_size Sektorengröße
 hdd_info_serial Seriennummer
 hdd_info_temperature Temperatur
 hdd_info_unknown unbekannt
+hdd_label Datenträger-Bezeichnung
+hdd_label_hint1 Datenträger-Bezeichnung eingeben und mit Speichern übernehmen
+hdd_label_hint2 Nur bei "%s" (Aufnahme-Medium) werden die nötigen Verzeichnisse auf den Datenträger geschrieben
 hdd_manage Datenträger verwalten
 hdd_middle Mittel
 hdd_mount Mount
@@ -1012,7 +1045,6 @@ imageinfo.policy Datenschutz
 imageinfo.vcs Git:
 imageinfo.version Version:
 imdb.api_key IMDb API Schlüssel
-imdb.enabled IMDb-Unterstützung
 imdb.data_actors Darsteller
 imdb.data_awards Awards
 imdb.data_boxoffice Einspielergebnis
@@ -1030,6 +1062,7 @@ imdb.data_title Originaltitel
 imdb.data_votes Stimmen
 imdb.data_website Webseite
 imdb.data_writer Drehbuchautor
+imdb.enabled IMDb-Unterstützung
 imdb.head IMDb
 imdb.read_data Suche IMDb-Daten ...
 inetradio.autostart Internetradio Auto-Start
@@ -1108,6 +1141,7 @@ lcd4l_convert Konvertiere Umlaute
 lcd4l_display_type Display-Typ
 lcd4l_display_type_setup Display-Typ einstellen
 lcd4l_logodir Senderlogo-Verzeichnis
+lcd4l_screenshots Screenshots erstellen
 lcd4l_skin Display-Style
 lcd4l_skin_0 Standard
 lcd4l_skin_1 Benutzer 1
@@ -1119,7 +1153,7 @@ lcd4l_support LCD4Linux-Unterstützung
 lcd4l_support_auto automatisch
 lcd4l_support_off aus
 lcd4l_support_on ein
-lcd4l_weather Wetter im Standby-Modus
+lcd4l_weather Wetterdaten anzeigen
 lcd_info_line Zeige in Infozeile
 lcd_info_line_channelname Kanalname
 lcd_info_line_channelnumber Kanalnummer
@@ -1164,6 +1198,8 @@ lua.parameter_deprecated2 Der Parameter
 lua.versionscheck1 Ihre Lua API Version ist zu alt
 lua.versionscheck2 Erforderlich ist mindestens
 mainmenu.audioplayer Audioplayer
+mainmenu.avinputmode HDMI-Eingang (Modus)
+mainmenu.avinputmode_pip HDMI-Eingang (PiP)
 mainmenu.channels Kanalliste
 mainmenu.clearsectionsd Lösche EPG Cache
 mainmenu.games Spiele
@@ -1179,8 +1215,6 @@ mainmenu.reboot Neustart
 mainmenu.recording Aufnehmen
 mainmenu.recording_start Start
 mainmenu.recording_stop Stopp
-mainmenu.avinputmode HDMI-Eingang (Modus)
-mainmenu.avinputmode_pip HDMI-Eingang (PiP)
 mainmenu.scripts Skripte
 mainmenu.service Service
 mainmenu.settings Einstellungen
@@ -1209,9 +1243,11 @@ mbkey.copy_onefile Film kopieren
 mbkey.copy_several Film kopieren und teilen
 mbkey.cover Filmcover erzeugen/löschen
 mbkey.cut Film schneiden
+mbkey.toggle_view_ccw Ansicht umschalten entgegen dem Uhrzeigersinn
+mbkey.toggle_view_cw Ansicht umschalten im Uhrzeigersinn
 mbkey.truncate Film kürzen
-mdb.head Movie Database
 mdb.choose Movie Database wählen
+mdb.head Movie Database
 mdb.save_poster Bild speichern
 mdb.save_poster_hint Bild speichern mit "%s"
 menu.back Zurück
@@ -1266,7 +1302,7 @@ menu.hint_cache_txt Startet das Zwischenspeichern des Videotextes nach einem Kan
 menu.hint_cec_mode CEC-Modus
 menu.hint_cec_standby CEC-Standby
 menu.hint_cec_view_on CEC view ON
-menu.hint_cec_volume Beim Betätigen der Lautstärketasten wird die Lautstärke an angeschlossenen Audiogerät reguliert
+menu.hint_cec_volume Beim Betätigen der Lautstärketasten wird die Lautstärke am angeschlossenen Audiogerät reguliert
 menu.hint_channellist_additional Definiert, ob zusätzliche Informationen im Hauptfenster angezeigt werden sollen
 menu.hint_channellist_enablesdt Ermöglicht die dynamische Senderaktualisierung im laufenden Betrieb
 menu.hint_channellist_epg_align Legen Sie fest, wie der Text für das EPG in der Liste rechts vom Programmnamen ausgerichtet wird
@@ -1291,6 +1327,7 @@ menu.hint_clock_mode Schalten Sie die Uhr ein oder aus
 menu.hint_clock_seconds Legen Sie fest, ob die Sekunden angezeigt werden sollen
 menu.hint_clock_size Stellen Sie die Größe der Uhr ein
 menu.hint_clock_textcolor Konfigurieren Sie die Farbe der Ziffern
+menu.hint_color_channellist_description_text Ändern Sie die Farbe für die Sendungsbeschreibungen in der Kanalliste
 menu.hint_color_gradient Schaltet Farbverläufe für verschiedene Menüelemente ein/aus
 menu.hint_color_gradient_direction Richtung des Farbverlaufs festlegen
 menu.hint_color_gradient_separator_enable Farbverlauf für Menü-Trennlinien aktivieren/deaktivieren
@@ -1338,6 +1375,7 @@ menu.hint_fonts Konfigurieren Sie die Schriftart und die Schriftgrößen für di
 menu.hint_foot_back Ändern Sie die Fußleisten-Hintergrundfarbe
 menu.hint_foot_textcolor Ändern Sie die Fußleisten-Textfarbe
 menu.hint_games Zeige Liste der installierten Spiele
+menu.hint_glcd_support GraphLCD aktivieren/deaktivieren
 menu.hint_hdd Formatierung und Prüfung der Datenträger
 menu.hint_hdd_allow_set_recdir Erlaubt das sofortige Einstellen des neuen Datenträgers als Aufnahmemedium
 menu.hint_hdd_apply Die veränderten Einstellungen zum Sleep- und Akustik-Modus werden übernommen
@@ -1418,7 +1456,9 @@ menu.hint_key_pagedown Weisen Sie eine Taste für das Herunterblättern zu
 menu.hint_key_pageup Weisen Sie eine Taste für das Hochblättern zu
 menu.hint_key_pic_mode_active Die Taste für das Bildschirmformat deaktivieren/aktivieren
 menu.hint_key_pic_size_active Die Taste für das 4:3 Anzeigeverhalten deaktivieren/aktivieren
-menu.hint_key_pip_close Tastenzuordnung für Stop PiP oder Start mit aktuellem Kanal
+menu.hint_key_pip_close Tastenzuordnung für Start PiP mit aktuellem Kanal oder Stopp PiP
+menu.hint_key_pip_rotate_ccw Tastenzuordnung für PiP Bewegung entgegen dem Uhrzeigersinn
+menu.hint_key_pip_rotate_cw Tastenzuordnung für PiP Bewegung im Uhrzeigersinn
 menu.hint_key_pip_setup Tastenzuordnung für PiP Konfiguration
 menu.hint_key_poweroff Wählen Sie eine Taste für den Standby und für das Verhalten für Standby und Deep-Standby
 menu.hint_key_quickzap Konfigurieren Sie die Tastenbelegung für die Schnellumschaltung
@@ -1428,6 +1468,7 @@ menu.hint_key_repeatblockgeneric Die Verzögerung zwischen den Tastewiederholung
 menu.hint_key_right Wählen Sie die Funktion für die Tasten 'links' und 'rechts' im TV/Radio- und Movieplayer-Modus
 menu.hint_key_save Speichern Sie Ihre Tastenbelegungen in einer Datei namens keys.conf ab
 menu.hint_key_screenshot Weisen Sie eine Taste zu, um Menü- und/oder TV-Screenshots zu speichern
+menu.hint_key_sleep Weisen Sie eine Taste zu, um einen Sleeptimer zu setzen
 menu.hint_key_sort Weisen Sie eine Taste für das Sortieren in der Kanalliste zu
 menu.hint_key_special_active Deaktivieren oder aktivieren einiger Sondertasten
 menu.hint_key_standbyoff_add Weisen Sie eine zusätzliche Taste zum Beenden des Standby-Modus zu
@@ -1451,11 +1492,12 @@ menu.hint_lcd4l_clock_a Zeigt im Standby-Betrieb eine Analog-Uhr anstatt einer D
 menu.hint_lcd4l_convert Konvertiert Umlaute für die eingebaute LCD4Linux-Schriftart
 menu.hint_lcd4l_display_type Wählen Sie den Typ des externen Displays
 menu.hint_lcd4l_display_type_setup Einstellungen für den Typ des externen Displays
-menu.hint_lcd4l_logodir Verzeichnis für Senderlogos\nBei ungültigem Eintrag Fallback auf Standard-Logoverzeichnis
+menu.hint_lcd4l_logodir Verzeichnis für eigene Senderlogos. Bei ungültigem Eintrag werden die Standard-Logos benutzt.
+menu.hint_lcd4l_screenshots Erzeugt Screenshots des externen Displays in /tmp/lcd4linux.png
 menu.hint_lcd4l_skin Auswahl der verfügbaren Darstellungsarten\nStandard, Benutzerdefiniert, etc.
 menu.hint_lcd4l_skin_radio Wechselt die Darstellungsart, wenn der Radio-Modus aktiviert wird
-menu.hint_lcd4l_support LCD4Linux aktivieren/deaktivieren\nUnterstützte Displays: Pearl DPF, Samsung DPF, VU+SOLO4K, PNG
+menu.hint_lcd4l_support LCD4Linux aktivieren/deaktivieren\nUnterstützte Displays: Pearl DPF, Samsung SPF
-menu.hint_lcd4l_weather Zeigt im Standby-Betrieb Wetterdaten auf dem Display an
+menu.hint_lcd4l_weather Zeigt Wetterdaten auf dem Display an
 menu.hint_leds_blink Die Power-LEDs blinken, wenn sich der Receiver im Deep-Standby befindet und ein Timer aktiv ist
 menu.hint_leds_deepstandby Definiert den Status der Power-LEDs im Deep-Standby
 menu.hint_leds_record Definiert, ob die Power-LEDs blinken sollen, wenn eine Aufnahme aktiv ist
@@ -1486,7 +1528,7 @@ menu.hint_misc_energy Energieverbrauchs- und Standby-Optionen, verzögertes Auss
 menu.hint_misc_epg Diverse EPG-Einstellungen und Speicherverzeichnis für EPG-Daten
 menu.hint_misc_filebrowser Dateisystem, Dateirechte anzeigen im Dateibrowser, Startverzeichnisoptionen
 menu.hint_misc_general Standby-, Videotext- und Debuglevel-Einstellungen
-menu.hint_misc_onlineservices Konfigurieren und steuern von Online-Diensten wie Wetter, YouTube, SHOUTCast und TMDb
+menu.hint_misc_onlineservices Konfigurieren und steuern von Online-Diensten wie Wetter, TMDb, IMDb, SHOUTCast und YouTube
 menu.hint_misc_zapit Verwaltung der Start-Kanäle für den TV/Radio-Modus
 menu.hint_movie Wiedergabe von Filmen
 menu.hint_moviebrowser_fonts Ändern Sie die Schriftgrößen im Moviebrowser (Meine Aufnahmen)
@@ -1635,6 +1677,8 @@ menu.hint_scan_fastupdate Aktivieren/Deaktivieren Fastscan Auto-Update
 menu.hint_scan_fec Wählen Sie eine Transponder-FEC
 menu.hint_scan_felink Select tuner to link tuner to
 menu.hint_scan_femode Wählen Sie den Verbindungstyp für den zweiten Tuner
+menu.hint_scan_fenosame Für zwei gleiche CI Module:\nGleichen Tuner nur nutzen bei gleicher Service-ID
+menu.hint_scan_feretries Wiederholungen bei fehlgeschlagenem Tuning
 menu.hint_scan_fesetup Konfigurieren des oder der Tuner
 menu.hint_scan_fetimeout Maximale Wartezeit auf das Signal in 1/10 Sekunden
 menu.hint_scan_freq Geben Sie eine Transponder-Frequenz ein
@@ -1782,10 +1826,10 @@ 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_api_key Geben Sie den OpenWeather 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 (openweathermap.org) ein bzw. aus
-menu.hint_weather_enabled Schaltet die Wetter-Unterstützung (darksky.net) ein bzw. aus
 menu.hint_weather_location Wählen Sie eine Stadt in ihrer Nähe zur Anzeige der Wetterdaten aus
+menu.hint_weather_postalcode Geben Sie ihre Postleitzahl zur Anzeige der Wetterdaten an
 menu.hint_webradio_setup Hier konfigurierte WebRadio-Kanäle finden Sie in der Kanalverwaltung.
 menu.hint_webradio_xml_auto Lädt automatisch alle WebRadio-Dateien aus %s/ und %s/
 menu.hint_webtv_setup Hier konfigurierte WebTV-Kanäle finden Sie in der Kanalverwaltung.
@@ -1793,9 +1837,7 @@ menu.hint_webtv_xml_auto Lädt automatisch alle WebTV-Dateien aus %s/ und %s/
 menu.hint_window_size Kanalliste, EPG-Infos und einige andere Fenster werden mit diesem Faktor skaliert
 menu.hint_xmltv_setup Hier konfigurieren Sie XMLTV-Dateien, die EPG-Daten enthalten
 menu.hint_youtube_dev_id Geben Sie die YouTube Dev ID ein. Eine leere Eingabe schaltet die YouTube-Unterstützung aus
-menu.hint_youtube_enabled Schaltet die YouTube-Unterstützung ein oder aus
+menu.hint_youtube_enabled Schaltet die YouTube-Unterstützung (für Plugins) ein oder aus
-menu.hint_ytplay Wiedergabe von ausgewählten YouTube Feeds
-menu.hint_ytplay_setup Konfigurieren Sie YouTube-spezifische Optionen wie maximale Ergebnisse bei Suchen oder Cache-Verzeichnis
 menu.hint_zap_cycle Wählen Sie, ob nur innerhalb des aktiven Bouquets umgeschaltet werden kann
 menu.next Weiter
 message.frame_enable Rahmen für Meldungen und Hinweisfenster
@@ -1813,7 +1855,7 @@ messagebox.ok OK
 messagebox.yes Ja
 miscsettings.channellist Kanalliste
 miscsettings.channellist_enablesdt Transponder Hintergrundaktualisierung
-miscsettings.channellist_epgtext_align Event-Text ausrichten
+miscsettings.channellist_epgtext_alignment Event-Text ausrichten
 miscsettings.channellogos Senderlogos
 miscsettings.colored_events Sendung hervorheben
 miscsettings.colored_events_0 keine
@@ -1913,8 +1955,9 @@ miscsettings.shutdown_real Standby-Modus
 miscsettings.shutdown_real_rcdelay Verzögertes Ausschalten
 miscsettings.sleeptimer Ausschalten nach Inaktivität
 miscsettings.sleeptimer_min Sleeptimer Vorgabe
+miscsettings.streaming Streaming
 miscsettings.volume Lautstärke
-miscsettings.zapto_pre_time Umschaltstart-Vorlaufzeit
+miscsettings.zapto_pre_time Umschalt-Timer-Vorlaufzeit
 motorcontrol.calc_positions Positionen (Neu)-Berechne(n))
 motorcontrol.disable_limit Deaktiviere (soft) Limit
 motorcontrol.drive_mode Fahr-Modus
@@ -1945,8 +1988,8 @@ motorcontrol.step_increase Schrittweite rauf (c)
 motorcontrol.step_mode Schrittmodus
 motorcontrol.step_size (c) Schrittweite:
 motorcontrol.step_west Fahre Motor nach Westen (b,c)
-motorcontrol.stop_moving Stoppe bei guten Signal(moving)
+motorcontrol.stop_moving Stoppe bei guten Signal (moving)
-motorcontrol.stop_stopped Stoppe bei schlechtem Signal(stopped)
+motorcontrol.stop_stopped Stoppe bei schlechtem Signal (stopped)
 motorcontrol.store Speichere Motorposition (a)
 motorcontrol.timed_mode Zeitgesteuerter Schrittweitenmodus
 motorcontrol.user_menu Benutzermenü
@@ -1990,9 +2033,9 @@ moviebrowser.directories Verzeichnisse
 moviebrowser.directories_additional Zusätzliche Verzeichnisse
 moviebrowser.edit_book Markierung ändern
 moviebrowser.edit_book_name_info1 Neuer Markierungsname
-moviebrowser.edit_book_name_info2 
+moviebrowser.edit_book_name_info2 Geben Sie den Namen für die neue Markierung ein
 moviebrowser.edit_book_pos_info1 Neue Position (s)
-moviebrowser.edit_book_pos_info2 
+moviebrowser.edit_book_pos_info2 Geben Sie die neue Position in Sekunden ein
 moviebrowser.edit_book_type_info1 Neue Sprunglänge (s)
 moviebrowser.edit_book_type_info2 <0: zurück, >0: vor, 0: kein
 moviebrowser.edit_serie Name der Serie
@@ -2030,7 +2073,7 @@ moviebrowser.hint_newbook_forward Neuer Werbesprung gestartet.\n'%s' bestimmt di
 moviebrowser.hint_truncate Entfernt den Filmteil hinter der Filmende-Markierung
 moviebrowser.info_audio Audio
 moviebrowser.info_channel Kanal
-moviebrowser.info_elapsed Letzer Wiedergabe Stop
+moviebrowser.info_elapsed Letzer Wiedergabe-Stopp
 moviebrowser.info_file Datei
 moviebrowser.info_filename Dateiname
 moviebrowser.info_genre_major Genre
@@ -2088,7 +2131,6 @@ moviebrowser.option_browser Anzeigeoptionen
 moviebrowser.reload_at_start Filminfos neu laden bei Start
 moviebrowser.remount_at_start Filmdepot verbinden bei Start
 moviebrowser.scan_for_movies Suche Aufnahmen ...
-moviebrowser.scan_for_videos Suche YT-Videos ...
 moviebrowser.serie_auto_create Serien automatisch zuordnen
 moviebrowser.serie_head Serie
 moviebrowser.serie_name Name ändern
@@ -2127,36 +2169,11 @@ moviebrowser.update_if_dest_empty_only Übernehmen nur wenn Ziel leer
 moviebrowser.use_dir Verzeichnis verwenden
 moviebrowser.use_movie_dir Wiedergabeverzeichnis verwenden
 moviebrowser.use_rec_dir Aufnahmeverzeichnis verwenden
-moviebrowser.yt_cache Downloads
-moviebrowser.yt_cache_add Download von\n%s\nwird eingeplant.
-moviebrowser.yt_cancel Alle abbrechen
-moviebrowser.yt_cancel_transfer Download abbrechen?
-moviebrowser.yt_clear Liste leeren
-moviebrowser.yt_completed Vollständige Downloads
-moviebrowser.yt_concurrent_connections Gleichzeitige Verbindungen
-moviebrowser.yt_dl_dir Youtube download Verzeichnis
-moviebrowser.yt_error Fehler beim Laden des YouTube-Feeds
-moviebrowser.yt_failed Fehlgeschlagene Downloads
-moviebrowser.yt_history Frühere Suchen
-moviebrowser.yt_max_history Max. Anzahl früherer Suchen
-moviebrowser.yt_max_results Max. Anzahl der zu holenden Feeds
-moviebrowser.yt_most_popular Beliebteste Videos heute
-moviebrowser.yt_most_popular_all_time Beliebteste Videos
-moviebrowser.yt_orderby Sortierung nach
-moviebrowser.yt_orderby.published Veröffentlichungszeitpunkt
-moviebrowser.yt_orderby.rating Bewertung
-moviebrowser.yt_orderby.relevance Relevanz
-moviebrowser.yt_orderby.viewcount Zahl der Views
-moviebrowser.yt_pending Anstehende Downloads
-moviebrowser.yt_pref_quality Bevorzugte Qualität
-moviebrowser.yt_region Region
-moviebrowser.yt_related Passende Videos
-moviebrowser.yt_search Suche nach Stichwort
 moviecut.cancel Bearbeiten des Filmes abbrechen?
 movieplayer.bookmark Bookmarks
 movieplayer.bookmarkname Bookmark Name
-movieplayer.bookmarkname_hint1 Geben Sie den Namen für das neue Lesezeichen ein
+movieplayer.bookmarkname_hint1 Neues Lesezeichen
-movieplayer.bookmarkname_hint2 
+movieplayer.bookmarkname_hint2 Geben Sie den Namen für das neue Lesezeichen ein
 movieplayer.chapters Kapitel
 movieplayer.display_playtime Zeige Spielzeit im VFD/LCD
 movieplayer.fileplayback_audio Multiformat-Audiowiedergabe
@@ -2182,7 +2199,6 @@ movieplayer.starting Wiedergabe starten ...
 movieplayer.titles Titel
 movieplayer.toomanybookmarks Sie haben bereits zu viele Lesezeichen angelegt.\nEs muß erst ein anderes gelöscht werden.
 movieplayer.tsplayback TS Abspielen
-movieplayer.ytplayback YouTube-Feed Wiedergabe
 movieplayer.zap Umschalten während der Film- oder Timeshift-Wiedergabe nicht möglich
 mpkey.audio Tonspuren
 mpkey.bookmark Markierungen
@@ -2264,8 +2280,10 @@ nvodselector.subservice Perspektiven
 opkg.button.expert_off Standard-Modus
 opkg.button.expert_on Experten-Modus
 opkg.button.info Paket-Informationen
-opkg.button.install Paket installieren
+opkg.button.install Installieren
-opkg.button.uninstall Paket entfernen
+opkg.button.reinstall Neu installieren
+opkg.button.uninstall Deinstallieren
+opkg.button.update.check Updateprüfung
 opkg.enter.feed.address Bitte Adresse für Server-Feed oder lokalen Ordner eintragen!
 opkg.enter.feed.address.example Beispiel: http://pkg.nevis.neutrino-hd.com
 opkg.failure.install Installation fehlgeschlagen
@@ -2273,15 +2291,22 @@ opkg.failure.update Update fehlgeschlagen
 opkg.failure.upgrade Upgrade fehlgeschlagen
 opkg.feed.addresses Feed-Adressen
 opkg.install.local.package Installiere lokales Paket
+opkg.messagebox.please.wait Bitte warten...!
 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 Paket-Aktualisierung(en) verfügbar!
 opkg.success.install Installation erfolgreich!\nNeustart von Neutrino kann erforderlich sein. Jetzt neu starten?
+opkg.separator.packages.available verfügbare Pakete
+opkg.separator.packages.available.plugins verfügbare Plugins
+opkg.separator.packages.installed installiert
+opkg.separator.packages.installed.plugins installierte Plugins
+opkg.separator.upgrades.available Aktualisierungen
 opkg.title Paketverwaltung
-opkg.update.check Prüfe auf Updates ...
+opkg.title.expert.mode Paketverwaltung - Experten-Modus
-opkg.update.reading_lists Paketlisten werden eingelesen ...
+opkg.update.check Prüfe auf Aktualisierungen...
-opkg.upgrade Installierte Pakete aktualisieren
+opkg.update.reading_lists Paketlisten werden eingelesen...
+opkg.upgrade System aktualisieren
 opkg.warning_3rdparty_packages Drittanbieter-Pakete könnten Ihr System beschädigen! Sind Sie sicher, dieses Paket zu installieren?
 options.always immer
 options.default Voreinstellungen benutzen
@@ -2418,6 +2443,8 @@ recording.stop Beende Aufnahme, bitte warten ...
 recording.time_hour Stunde
 recording.time_hours Stunden
 recording.time_min Min
+recording_type.file Direkt (Datei)
+recording_type.off aus
 recordingmenu.already_found_check Prüfe, ob Titel bereits vorhanden
 recordingmenu.apids Tonspuren
 recordingmenu.apids_ac3 AC3 Tonspuren aufnehmen
@@ -2449,8 +2476,6 @@ recordingmenu.timeshift Timeshift
 recordingmenu.tsdir Timeshift Aufnahmeverzeichnis
 recordingmenu.vtxt_pid Videotext aufnehmen
 recordingmenu.zap_on_announce Umschalten bei Ankündigung
-recording_type.file Direkt (Datei)
-recording_type.off aus
 recordtimer.announce Die Aufnahme beginnt in wenigen Minuten.
 remotebox_add Hinzufügen
 remotebox_channel_na Kanal auf Remote-Box nicht verfügbar
@@ -2570,7 +2595,7 @@ scants.numberofdataservices Daten
 scants.numberofradioservices Radio
 scants.numberoftotalservices Alle
 scants.numberoftvservices TV
-scants.preverences_receiving_system Grundeinstellungen
+scants.preferences_receiving_system Grundeinstellungen
 scants.provider Anbieter
 scants.select_tp Wählen Sie einen Transponder
 scants.startnow Kanalsuche starten
@@ -2627,8 +2652,10 @@ settings.noconffile Die Einstellungen wurden nicht\ngefunden. Es werden Standard
 settings.pos_bottom_center unten zentriert
 settings.pos_bottom_left unten links
 settings.pos_bottom_right unten rechts
-settings.pos_default_center zentriert
+settings.pos_center zentriert
 settings.pos_higher_center höher zentriert
+settings.pos_left links
+settings.pos_right rechts
 settings.pos_top_center oben zentriert
 settings.pos_top_left oben links
 settings.pos_top_right oben rechts
@@ -2661,8 +2688,11 @@ streaminfo.resolution Auflösung
 streaminfo.signal Tuner
 streaminfo.videosystem Videosystem
 streaming.busy Einer oder mehrere Aufnahmeprozesse sind aktiv.\nSollte die Aufnahme eigentlich beendet sein,\nschafft ein Neustart der GUI Abhilfe.
+streaming.decryptmode HTTP Streams entschlüsseln
 streaming.dir_not_writable Das Aufnahmeverzeichnis ist nicht beschreibbar.\nAufnahmen sind daher nicht möglich.
+streaming.ecmmode Berechtigungen senden
 streaming.overflow Aufnahme-Puffer Überlauf! Bitte ggf. einige Aufnahmen beenden.
+streaming.port Streaming-Port
 streaming.slow System oder Datenträger zu langsam! Bitte ggf. einige Aufnahmen beenden.
 streaming.write_error Die Aufnahme wurde leider abgebrochen,\nda ein Fehler beim Schreiben der Daten auftrat.
 stringinput.backspace Rücklöschen
@@ -2769,14 +2799,16 @@ tmdb.enabled TMDb-Unterstützung
 tmdb.head TMDb
 tmdb.read_data Suche TMDb-Daten ...
 tunersetup.cable Kabel (DVB-C)
-tunersetup.hybrid Hybrid (DVB-C/T/T2)
+tunersetup.hybrid Hybrid (DVB-*)
 tunersetup.mode Betriebsmodus
 tunersetup.power 5V-Versorgung bei DVB-T/T2 Kanälen
+tunersetup.sat Satellit (DVB-S/S2)
 tunersetup.terr Terrestrisch (DVB-T/T2)
+tunersetup.tunersetup Tunereinstellungen
+unicable.freq Unicable Frequenz
 unicable.lnb Unicable Eingang
 unicable.pin Unicable PIN
 unicable.pin_hint PIN (1 - 255) für Benutzerfrequenz\n0 bedeutet inaktiv / aus
-unicable.freq Unicable Frequenz
 unicable.scr Unicable SCR
 unit.decimal ,
 unit.long.years Jahre
@@ -2845,16 +2877,16 @@ videomenu.hdmi_cec_mode_recorder als Sat/Kabel PVR
 videomenu.hdmi_cec_mode_tuner als Sat/Kabel STB
 videomenu.hdmi_cec_standby Aktiviere CEC Standby
 videomenu.hdmi_cec_view_on Aktiviere CEC View on
-videomenu.hdmi_cec_volume CEC Lautstärke Regelung
 videomenu.hdmi_cec_vol_audiosystem Audiosystem
 videomenu.hdmi_cec_vol_off aus
 videomenu.hdmi_cec_vol_tv TV
+videomenu.hdmi_cec_volume CEC Lautstärke Regelung
 videomenu.hdmi_colorimetry Farbprofil
 videomenu.hdmi_colorimetry_auto auto
-videomenu.hdmi_colorimetry_bt2020ncl BT 2020 ncl
 videomenu.hdmi_colorimetry_bt2020cl BT 2020 cl
-videomenu.hdmi_colorimetry_bt709 BT 709
+videomenu.hdmi_colorimetry_bt2020ncl BT 2020 ncl
 videomenu.hdmi_colorimetry_bt470 BT 470
+videomenu.hdmi_colorimetry_bt709 BT 709
 videomenu.hue Farbton
 videomenu.letterbox Letterbox
 videomenu.panscan Pan & Scan
@@ -2880,14 +2912,30 @@ videomenu.videoformat_169 16:9
 videomenu.videoformat_43 4:3
 videomenu.videomode Videosystem
 videomenu.zappingmode Umschaltverhalten
-videomenu.zappingmode_mute Schwarzes Bild
 videomenu.zappingmode_hold Standbild
-weather.api_key Wetter API Schlüssel (Dark Sky)
+videomenu.zappingmode_holdtilllock Standbild bis lock
-weather.country Länderwahl
+videomenu.zappingmode_mute Schwarzes Bild
-weather.country_deutschland Deutschland
+videomenu.zappingmode_mutetilllock Schwarzes Bild bis lock
-weather.country_norway Norwegen
+weather.api_key Wetter API Schlüssel (OpenWeather)
+weather.direction_e O
+weather.direction_ene ONO
+weather.direction_ese OSO
+weather.direction_n N
+weather.direction_ne NO
+weather.direction_nne NNO
+weather.direction_nnw NNW
+weather.direction_nw NW
+weather.direction_s S
+weather.direction_se SO
+weather.direction_sse SSO
+weather.direction_ssw SSW
+weather.direction_sw SW
+weather.direction_w W
+weather.direction_wnw WNW
+weather.direction_wsw WSW
 weather.enabled Wetter-Unterstützung
 weather.location Wetter-Standort
+weather.postalcode Wetter-Standort per Postleitzahl
 webchannels.xml.add Hinzufügen
 webchannels.xml.del Entfernen
 webchannels.xml.enter Eintragen
@@ -2916,7 +2964,7 @@ xmltv.xml.del Entfernen
 xmltv.xml.enter Eintragen
 xmltv.xml.reload Neu laden
 youtube.dev_id YouTube Dev ID
-youtube.enabled YouTube-Unterstützung
+youtube.enabled YouTube-Unterstützung (für Plugins)
 zapit.scantype Service-Auswahl
 zapit.scantype.all Alle Services
 zapit.scantype.radio Nur Radio

data/locale/helpers/check-locale

@@ -1,9 +0,0 @@
-#!/bin/sh
-cut -d' ' -f1 english.locale | sort | uniq > /tmp/log
-for i in *.locale; do                          \
-	echo $i:;                              \
-	echo "----------------";               \
-	cut -d' ' -f1 $i | diff -u - /tmp/log; \
-	echo;                                  \
-done
-rm /tmp/log

data/locale/helpers/create-locale-work

@@ -9,14 +9,14 @@
 # reorganized by Stefan Seyfried 2016-01-03, following changes:
 #  * use strict, use warnings to find errors easier
 #  * make it work with the above pragmas
-#  * tolerance against empty locales in english.locale
+#  * tolerance against empty locales in deutsch.locale
 
 use warnings;
 use strict;
 
-my $masterfilename = "english.locale";
+my $masterfilename = "deutsch.locale";
 
-$#ARGV == 0 || die("Usage: create-locals-work file.locale.");
+$#ARGV == 0 || die("Usage: create-locals-work file.locale");
 
 my $no_errors = 0;
 my $last_was_ok = 1;
@@ -31,36 +31,45 @@ my %master;
 my %locale;
 
 my $line;
-while ($line = <MASTER>) {
+while ($line = <MASTER>)
-    # master hash
+{
-    chomp $line;
+	# master hash
-    $line =~ s/^\s+//; # strip whitespace from start of line
+	chomp $line;
-    my ($key, $text) = split /\s+/, $line, 2;
+	$line =~ s/^\s+//; # strip whitespace from start of line
-    $master{$key} = $text ? $text : "";
+	my ($key, $text) = split /\s+/, $line, 2;
+	$master{$key} = $text ? $text : "";
 }
 close(MASTER);
 
-while ($line = <LOCALE>) {
+while ($line = <LOCALE>)
-    # locale hash
+{
-    chomp $line;
+	# locale hash
-    $line =~ s/^\s+//;
+	chomp $line;
-    my ($key, $text) = split /\s+/, $line, 2;
+	$line =~ s/^\s+//;
-    $locale{$key} = $text ? $text : "";
+	my ($key, $text) = split /\s+/, $line, 2;
+	$locale{$key} = $text ? $text : "";
 }
 close(LOCALE);
 
-foreach my $term (sort keys %master) {
+foreach my $term (sort keys %master)
-    if (exists $locale{$term}) {
+{
-        print OUT $term." ".$locale{$term}."\n";
+	if (exists $locale{$term})
-    } else {
+	{
-        # not found
+		print OUT $term." ".$locale{$term}."\n";
-        $no_errors++;
+	}
-        print OUT $term." TRANSLATE ".$master{$term}."\n";
+	else
-    }
+	{
+		# not found
+		$no_errors++;
+		print OUT $term." (((T))) ".$master{$term}."\n";
+	}
 }
 
-if ($no_errors == 0) {
+if ($no_errors == 0)
-    unlink($outfilename);
+{
-} else {
+	unlink($outfilename);
-    print "There were ", $no_errors, " error(s) in ", $localefilename, ".\n";
+}
+else
+{
+	print "There were ", $no_errors, " error(s) in ", $localefilename, ".\n";
 }

data/locale/helpers/create-locals_h

@@ -1,6 +1,7 @@
 #!/bin/bash
-# usage: cut -d' ' -f1 english.locale | LC_ALL=C sort | uniq | tr [:lower:] [:upper:] | tr \. \_  | tr \- \_ | tr -d \? | ./helpers/create-locals.h
+# usage: cut -d' ' -f1 deutsch.locale | LC_ALL=C sort | uniq | tr [:lower:] [:upper:] | tr \. \_  | tr \- \_ | tr -d \? | ./helpers/create-locals.h
-cat > locals.h <<EOH
+
+cat > locals.h << EOH
 #ifndef __locals__
 #define __locals__
 
@@ -28,13 +29,14 @@ cat > locals.h <<EOH
 typedef enum
 {
 EOH
+
 printf "\tNONEXISTANT_LOCALE" >> locals.h
 
 while read id; do
 	printf ",\n\tLOCALE_$id" >> locals.h;
 done
 
-cat >> locals.h <<EOF
+cat >> locals.h << EOF
 
 } neutrino_locale_t;
 #endif

data/locale/helpers/create-locals_intern_h

@@ -1,6 +1,7 @@
 #!/bin/bash
-# usage: cut -d' ' -f1 english.locale | LC_ALL=C sort | uniq | ./helpers/create-locals_intern.h
+# usage: cut -d' ' -f1 deutsch.locale | LC_ALL=C sort | uniq | ./helpers/create-locals_intern.h
-cat > locals_intern.h <<EOH
+
+cat > locals_intern.h << EOH
 #ifndef __locals_intern__
 #define __locals_intern__
 
@@ -28,13 +29,14 @@ cat > locals_intern.h <<EOH
 const char * locale_real_names[] =
 {
 EOH
+
 printf "\t\"INTERNAL ERROR - PLEASE REPORT\"" >> locals_intern.h
 
 while read id; do
 	printf ",\n\t\"$id\"" >> locals_intern.h
 done
 
-cat >> locals_intern.h <<EOF
+cat >> locals_intern.h << EOF
 
 };
 #endif

data/locale/nederlands.locale

@@ -1346,7 +1346,6 @@ menu.hint_volume_pos Selecteer positie volume indicator
 menu.hint_volume_size Selecteer volume indicator hoogte
 menu.hint_webtv_setup Hier geconfigureerde WebTV-zenders zijn in de standaard zenderlijsten zichtbaar.
 menu.hint_window_size Zenderlijst, EPG-infos en andere venster worden op deze factor geschaald
-menu.hint_ytplay Video's afspelen van de populaire video website Youtube
 menu.hint_zap_cycle Tijdens het schakelen tussen kanalen in huidige favorieten lijst
 menu.next Volgende (Druk op menu om af te sluiten)
 messagebox.back Terug
@@ -1508,10 +1507,10 @@ moviebrowser.delete_info Bestanden verwijderen, een moment geduld...
 moviebrowser.dir Pad
 moviebrowser.dir_head extra paden
 moviebrowser.edit_book Markeerpunt wijzigen
-moviebrowser.edit_book_name_info1 Geef markeerpunt een nieuwe naam
+moviebrowser.edit_book_name_info1 Nieuwe markeerpunt
-moviebrowser.edit_book_name_info2 
+moviebrowser.edit_book_name_info2 Geef markeerpunt een nieuwe naam
-moviebrowser.edit_book_pos_info1 Geef nieuwe eindpositie (s)
+moviebrowser.edit_book_pos_info1 Nieuwe positie
-moviebrowser.edit_book_pos_info2 
+moviebrowser.edit_book_pos_info2 Geef nieuwe positie in seconden
 moviebrowser.edit_book_type_info1 Geef lengte nieuwe sprong (s)
 moviebrowser.edit_book_type_info2 <0 terug , >0 voor, 0: geen
 moviebrowser.edit_serie Geef de naam van de serie op
@@ -1577,7 +1576,6 @@ moviebrowser.option_browser Browser Opties
 moviebrowser.reload_at_start Herlaad film informatie bij het starten
 moviebrowser.remount_at_start Herkoppelen bij het starten
 moviebrowser.scan_for_movies Films scannen ...
-moviebrowser.scan_for_videos YT-Videos scannen ...
 moviebrowser.serie_auto_create Series automatisch maken
 moviebrowser.serie_head Serie
 moviebrowser.serie_name Verander naam
@@ -1585,6 +1583,7 @@ moviebrowser.short_audio Audio
 moviebrowser.short_book Boek
 moviebrowser.short_channel Kanaal
 moviebrowser.short_country Land
+moviebrowser.short_elapsed 
 moviebrowser.short_filename Naam
 moviebrowser.short_format Format
 moviebrowser.short_genre_major Genre
@@ -1600,6 +1599,7 @@ moviebrowser.short_quality * (Kwaliteit)
 moviebrowser.short_recorddate Datum
 moviebrowser.short_serie Serie
 moviebrowser.short_size MB
+moviebrowser.short_spacer 
 moviebrowser.short_title Titel
 moviebrowser.start_head Start film vanaf:
 moviebrowser.start_record_start Afspelen vanaf het begin
@@ -1608,34 +1608,10 @@ moviebrowser.update_if_dest_empty_only Kopieer indien doelbestemming leeg is
 moviebrowser.use_dir Gebruik directory
 moviebrowser.use_movie_dir Gebruik film directory
 moviebrowser.use_rec_dir Gebruik opname directory
-moviebrowser.yt_cache Downloads
-moviebrowser.yt_cache_add Download of\n%s\nis scheduled.
-moviebrowser.yt_cancel Alles stoppen
-moviebrowser.yt_cancel_transfer Download stoppen?
-moviebrowser.yt_clear Clear
-moviebrowser.yt_completed Volledige downloads
-moviebrowser.yt_concurrent_connections Concurrent connecties
-moviebrowser.yt_error Laden van youtube video mislukt
-moviebrowser.yt_failed Downloads mislukt
-moviebrowser.yt_history Zoekgeschiedenis
-moviebrowser.yt_max_history Maximale zoekgeschiedenis grootte
-moviebrowser.yt_max_results Maximaal aantal resultaten
-moviebrowser.yt_most_popular Meest populair
-moviebrowser.yt_most_popular_all_time Meest populair
-moviebrowser.yt_orderby Sorteren op
-moviebrowser.yt_orderby.published Datum gepubiceerd
-moviebrowser.yt_orderby.rating rating
-moviebrowser.yt_orderby.relevance relevantie
-moviebrowser.yt_orderby.viewcount weergave teller
-moviebrowser.yt_pending Lopende downloads
-moviebrowser.yt_pref_quality Gewenste kwaliteit
-moviebrowser.yt_region Regio
-moviebrowser.yt_related Gerelateerde video's
-moviebrowser.yt_search Trefwoord
 movieplayer.bookmark Markeerpunten
 movieplayer.bookmarkname Naam markeerpunt
-movieplayer.bookmarkname_hint1 Naam invoeren voor uw markeerpunt
+movieplayer.bookmarkname_hint1 Nieuwe markeerpunt
-movieplayer.bookmarkname_hint2 
+movieplayer.bookmarkname_hint2 Naam invoeren voor uw markeerpunt
 movieplayer.chapters Delen
 movieplayer.defplugin Start-Plugin
 movieplayer.fileplayback Video afspelen
@@ -1656,7 +1632,6 @@ movieplayer.tshelp7 Ongeveer 1 minuut overslaan
 movieplayer.tshelp8 Ongeveer 5 minuten terug
 movieplayer.tshelp9 Ongeveer 5 minuten overslaan
 movieplayer.tsplayback Opname afspelen
-movieplayer.ytplayback Youtube video's
 mpkey.audio Audio track
 mpkey.bookmark Markeerpunt opslaan
 mpkey.forward Vooruit
@@ -2007,7 +1982,7 @@ scants.numberofdataservices Data
 scants.numberofradioservices Radio
 scants.numberoftotalservices Totaal
 scants.numberoftvservices TV
-scants.preverences_receiving_system Voorkeuren
+scants.preferences_receiving_system Voorkeuren
 scants.provider Provider:
 scants.select_tp Selecteer transponder
 scants.startnow start scan

data/locale/slovak.locale

@@ -643,6 +643,7 @@ extra.volume_pos Ukazovateľ hlasitosti
 extra.volume_size Výška zobrazenia
 extra.west Západne
 extra.zap_cycle Cyklické prepínanie
+extra.zapit_fe_no_same Rôzne tunery, keď je rovnaký transpondér
 extra.zapit_fe_timeout Časový limit naladenia (1 = 10 msek)
 extra.zapit_hvoltage 18V pri točení motora
 extra.zapit_motor_speed Rýchlosť točenia (10 = 1st/sek)
@@ -845,6 +846,102 @@ fsk.from_7 od 7
 fsk.to_12 do 12
 fsk.to_16 do 16
 fsk.to_7 do 7
+glcd.align_center zarovnaný
+glcd.align_left vľavo
+glcd.align_none žiadne
+glcd.align_right vpravo
+glcd.brightness Jas
+glcd.brightness_dim Stmaviť
+glcd.brightness_dim_time Stmievanie
+glcd.brightness_settings Nastavenia jasu
+glcd.brightness_standby Jas v pohotovostnom režime
+glcd.channel_align Zarovnať kanál
+glcd.channel_size Výška kanála
+glcd.channel_x_position Kanál x-pozícia
+glcd.channel_y_position Kanál y-pozícia
+glcd.clock_digital_y_position Digitálne hodiny y-pozícia
+glcd.clock_simple_size Výška jednoduchých hodín
+glcd.clock_simple_y_position Jednoduché hodiny y-pozícia
+glcd.color.amber Jantárová
+glcd.color.black Čierna
+glcd.color.blue Modrá
+glcd.color.bluegray Modrošedá
+glcd.color.brown Hnedá
+glcd.color.cyan Tyrkisová
+glcd.color.deeporange Tmavo oranžová
+glcd.color.deeppurple Tmavo fialová
+glcd.color.gray Šedá
+glcd.color.green Zelená
+glcd.color.indigo Tmavo modrá
+glcd.color.lightblue Svetlo modrá
+glcd.color.lightgreen Svetlo zelená
+glcd.color.lime Limetová
+glcd.color.orange Oranžová
+glcd.color.pink Ružová
+glcd.color.purple Fialová
+glcd.color.red Červená
+glcd.color.teal Modrozelená
+glcd.color.white Biela
+glcd.color.yellow Žltá
+glcd.color_bg Farba pozadia
+glcd.color_fg Farba textu
+glcd.display Typ displeja
+glcd.duration_align Zarovnať dĺžku programu
+glcd.duration_show Zobraziť trvanie programu
+glcd.duration_size Výška trvania programu
+glcd.duration_x_position Trvanie programu x-pozícia
+glcd.duration_y_position Trvanie programu y-pozícia
+glcd.enable Použiť grafický LCD
+glcd.end_align Zarovnať koniec programu
+glcd.end_show Zobraziť koniec programu
+glcd.end_size Výška konca programu
+glcd.end_x_position Koniec programu x-pozícia
+glcd.end_y_position Koniec programu y-pozícia
+glcd.epg_align Zarovnať EPG
+glcd.epg_size Výška EPG
+glcd.epg_x_position EPG x-pozícia
+glcd.epg_y_position EPG y-pozícia
+glcd.font Písmo
+glcd.font_autoresize Automatická veľkosť písma
+glcd.head Nastavenie grafického LCD
+glcd.logo_show Zobraziť logo stanice
+glcd.logo_size Výška loga
+glcd.logo_x_position Logo x-pozícia
+glcd.logo_y_position Logo y-pozícia
+glcd.mirror_osd Zobraziť ponuku OSD na grafickom LCD
+glcd.mirror_video Zobraziť obraz videa na grafickom LCD
+glcd.position_settings Pozície a veľkosti
+glcd.progressbar_color Farba pruhu posuvu
+glcd.progressbar_show Zobraziť indikátor priebehu
+glcd.progressbar_size Výška lišty priebehu
+glcd.progressbar_width Šírka pruhu posuvu
+glcd.progressbar_x_position Ukazovateľ priebehu x-pozícia
+glcd.progressbar_y_position Ukazovateľ priebehu y-pozícia
+glcd.restart Znova spustiť
+glcd.scroll_speed Rýchlosť rolovania
+glcd.standby_clock Zobrazenie času v pohotovostnom režime
+glcd.standby_clock_analog Analógové hodiny
+glcd.standby_clock_digital Digitálne hodiny
+glcd.standby_clock_lcd LCD hodiny
+glcd.standby_clock_led LED hodiny
+glcd.standby_clock_simple Jednoduché hodiny
+glcd.standby_settings Nastavenia pohotovostného režimu
+glcd.standby_weather Počasie v pohotovostnom stave
+glcd.start_align Zarovnať začiatik programu
+glcd.start_show Zobraziť začiatok programu
+glcd.start_size Výška začiatku programu
+glcd.start_x_position Začiatok programu x-pozícia
+glcd.start_y_position Začiatok programu y-pozícia
+glcd.theme Vyberte vzhľad
+glcd.theme_settings Nastavenia vzhľadu
+glcd.time_align Zarovnať čas
+glcd.time_show Zobraziť čas
+glcd.time_size Výška času
+glcd.time_size_standby Výška času v pohotovostnom režime
+glcd.time_x_position Čas x-pozícia
+glcd.time_y_position Čas y-pozícia
+glcd.volume Hlasitosť
+glcd.weather_show Zobraziť počasie
 hdd_10min 10 minút
 hdd_1min 1 minúta
 hdd_20min 20 minút
@@ -1129,7 +1226,7 @@ mbkey.cut Vystrihnúť film
 mbkey.truncate Skrátiť film
 menu.back Späť
 menu.cancel Zrušiť
-menu.hint_a_pic Nastavenie prehrávača hudby, prehliadača obrázkov, WebTV, TS, YouTube
+menu.hint_a_pic Nastavenie prehrávača hudby, prehliadača obrázkov, WebTV, TS
 menu.hint_adzap Automatické prepnutie prepne späť na aktuálny kanál ak uplynie zvolený čas
 menu.hint_adzap_active Automatické prepnutie je aktívne. Novým prepnutím bude deaktivované.
 menu.hint_adzap_writedata Zapísanie dát na základe stavu funkcie automatického prepnutia do zložky /tmp/adzap.data
@@ -1400,10 +1497,10 @@ menu.hint_message_fonts Zmena veľkosti písma textu správ
 menu.hint_misc_cec HDMI-CEC voľby
 menu.hint_misc_channellist HD/Nové/Odstránené zoznamy kanálov, cyklické prepnutie
 menu.hint_misc_energy Použitie pohotovostného režimu, oneskorené vypnutie\nčasovače neaktivity
-menu.hint_misc_epg Voľby uloženia/načítania EPG, voľby ukladania EPG,\nEPG zložka uloženia
+menu.hint_misc_epg Voľby uloženia/načítania EPG, voľby ukladania EPG,\nEPG priečinok uloženia
-menu.hint_misc_filebrowser Kódovanie súborového systemu, oprávnenia súboru,\nzákaz odstrániť zložky
+menu.hint_misc_filebrowser Kódovanie súborového systemu, oprávnenia súboru,\nzákaz odstrániť priečinok
-menu.hint_misc_general Spustenie do pohotovostného režimu, vyrovnávacia pamäť teletextu, hdd zložka doplnkov,\núroveň debugovania
+menu.hint_misc_general Spustenie do pohotovostného režimu, vyrovnávacia pamäť teletextu, hdd priečinok doplnkov,\núroveň debugovania
-menu.hint_misc_onlineservices Konfigurácia a ovládanie služieb naživo ako sú YouTube, SHOUTCast a TMDb
+menu.hint_misc_onlineservices Konfigurácia a riadenie živých služieb ako TMDb, IMDb, SHOUTcast a YouTube
 menu.hint_misc_zapit Východzie TV/Radio kanály
 menu.hint_movie Prehrávanie filmov
 menu.hint_moviebrowser_fonts Zmena veľkosti písma prehliadača filmov (Moje nahrávky)
@@ -1704,13 +1801,16 @@ menu.hint_volume Konfigurácia volieb okna hlasitosti
 menu.hint_volume_digits Číselné zobrazenie ukazateľa hlasitosti Zap/Vyp
 menu.hint_volume_pos Výber pozície indikátora hlasitosti
 menu.hint_volume_size Výber výšky indikátora hlasitosti
+menu.hint_weather_api_key Zadajte svoj kľúč API OpenWeather. Prázdny vstup deaktivuje podporu počasia
+menu.hint_weather_enabled Povolenie alebo zakázanie podpory počasia (openweathermap.org)
+menu.hint_weather_location Vyberte svoju lokalitu
+menu.hint_webradio_setup Kanály WebRadio tu nakonfigurované budú k dispozícii v štandartných zoznamoch kanálov
+menu.hint_webradio_xml_auto Automatické načítanie všetkých existujúcich súborov WebRadio z %s/ a %s/
 menu.hint_webtv_setup Tu nakonfigurované WebTV kanály budú k dispozícii v štandartnom zozname kanálov
 menu.hint_webtv_xml_auto Automatické načítanie všetkých existujúcich XML súborov zo zložky %s/
 menu.hint_window_size Zoznam kanálov, EPG-Infp a niektoré iné okná sú zmenšené týmto faktorom
 menu.hint_youtube_dev_id Vložte váš YouTube Dev ID. Prázdny vstup zabranuje podpore YouTube
 menu.hint_youtube_enabled Povolenie alebo zakázanie podpory YouTube
-menu.hint_ytplay Prehrávanie vybraných youtube videí
-menu.hint_ytplay_setup Konfigurácia špecifických volieb YouTube, napr. horný limit výsledkov vyhľadávania
 menu.hint_zap_cycle Pri prepínaní kanálov zotrvať v aktuálnom bukete
 menu.next Ďalej
 messagebox.back Späť
@@ -1899,10 +1999,10 @@ moviebrowser.dir Zložka
 moviebrowser.directories Zložky
 moviebrowser.directories_additional Dodatočné zložky
 moviebrowser.edit_book Zmeniť záložku
-moviebrowser.edit_book_name_info1 Zadanie nového názovu záložky
+moviebrowser.edit_book_name_info1 Názov záložky
-moviebrowser.edit_book_name_info2 Názov záložky
+moviebrowser.edit_book_name_info2 Zadanie nového názovu záložky
-moviebrowser.edit_book_pos_info1 Zadanie novej pozície
+moviebrowser.edit_book_pos_info1 Novej pozície
-moviebrowser.edit_book_pos_info2 ????
+moviebrowser.edit_book_pos_info2 Zadanie novej pozície v sekundách
 moviebrowser.edit_book_type_info1 Zadanie novej dĺžky skoku
 moviebrowser.edit_book_type_info2 <0 vzad , >0 vpred, 0: nikde
 moviebrowser.edit_serie Zadanie názvu série
@@ -1994,7 +2094,6 @@ moviebrowser.menu_truncate Skrátiť film
 moviebrowser.option_browser Možnosti prehliadača
 moviebrowser.reload_at_start Načítanie informácie o filme pri štarte
 moviebrowser.remount_at_start Pripojiť pri štarte
-moviebrowser.scan_for_movies Hľadať filmy ...
 moviebrowser.serie_auto_create Automaticky doplniť seriály
 moviebrowser.serie_head Seriály
 moviebrowser.serie_name Zmena názvu
@@ -2002,6 +2101,7 @@ moviebrowser.short_audio Zvuk
 moviebrowser.short_book Kniha
 moviebrowser.short_channel Kanál
 moviebrowser.short_country Krajina
+moviebrowser.short_elapsed 
 moviebrowser.short_filename Názov
 moviebrowser.short_format Formát
 moviebrowser.short_genre_major Hlavný žáner
@@ -2019,7 +2119,7 @@ moviebrowser.short_recorddate Dátum
 moviebrowser.short_recordtime Čas
 moviebrowser.short_serie Serial
 moviebrowser.short_size Veľkosť
-moviebrowser.short_spacer Medzera
+moviebrowser.short_spacer 
 moviebrowser.short_title Titul
 moviebrowser.start_head Pozerať film od:
 moviebrowser.start_record_start Začiatok filmu
@@ -2029,39 +2129,15 @@ moviebrowser.truncate_failed_playing Možnosť skrátiť prehrávanie filmu.
 moviebrowser.truncating Skracovanie filmu, prosím čakajte ...
 moviebrowser.ts_only Zobraziť iba nahrávky
 moviebrowser.update_if_dest_empty_only Kopírovať len ak je cieľové miesto prázdne
-moviebrowser.use_dir Použiť zložku
+moviebrowser.use_dir Použiť priečinok
-moviebrowser.use_movie_dir Použiť zložku filmov
+moviebrowser.use_movie_dir Použiť priečinok filmov
-moviebrowser.use_rec_dir Použiť zložku nahrávania
+moviebrowser.use_rec_dir Použiť priečinok nahrávania
-moviebrowser.yt_cache Stiahnuté
-moviebrowser.yt_cache_add Plánované \n%s\nsťahovanie.
-moviebrowser.yt_cancel Zrušiť všetko
-moviebrowser.yt_cancel_transfer Zrušiť sťahovanie?
-moviebrowser.yt_clear Vyčistiť
-moviebrowser.yt_completed Sťahovania ukončené
-moviebrowser.yt_concurrent_connections Súbežné spojenia
-moviebrowser.yt_error Chyba načítania youtube videa
-moviebrowser.yt_failed Chybné sťahovania
-moviebrowser.yt_history Hľadať históriu
-moviebrowser.yt_max_history Maximálna veľkosť hľadania histórie
-moviebrowser.yt_max_results Maximálny počet výsledkov
-moviebrowser.yt_most_popular Najpopulárnejšie dnes
-moviebrowser.yt_most_popular_all_time Najpopulárnejšie
-moviebrowser.yt_orderby Triediť podľa
-moviebrowser.yt_orderby.published dátum zverejnenia
-moviebrowser.yt_orderby.rating obľúbenosť
-moviebrowser.yt_orderby.relevance závažnosť
-moviebrowser.yt_orderby.viewcount sledovanosť
-moviebrowser.yt_pending Čakajúce sťahovania
-moviebrowser.yt_pref_quality Preferovaná kvalita
-moviebrowser.yt_region Región
-moviebrowser.yt_related Podobné videá
-moviebrowser.yt_search Hľadať slovo
 moviecut.cancel Zrušiť úpravu filmu?
 movieplayer.bisection_jump Priame skoky
 movieplayer.bookmark Záložky
 movieplayer.bookmarkname Názov záložky
-movieplayer.bookmarkname_hint1 Vloženie názvu novej záložky
+movieplayer.bookmarkname_hint1 Novej záložky
-movieplayer.bookmarkname_hint2 
+movieplayer.bookmarkname_hint2 Vloženie názvu novej záložky
 movieplayer.chapters Kapitoly
 movieplayer.display_playtime Zobraziť čas prehrávania na VFD
 movieplayer.fileplayback_audio Multiformátové prehrávanie zvuku
@@ -2087,9 +2163,9 @@ movieplayer.starting Spúšťa sa prehrávanie...
 movieplayer.titles Tituly
 movieplayer.toomanybookmarks Veľa záložiek.\nJe potrebné vymazať jednu najprv.
 movieplayer.tsplayback Prehrať TS
-movieplayer.ytplayback YouTube prehrávač
+movieplayer.zap Prepnutie nie je možné počas prehrávania videa alebo časového posunu
-mpkey.audio Zvuková stopa
+mpkey.audio Zvukové stopy
-mpkey.bookmark Uložiť záložku
+mpkey.bookmark Záložky
 mpkey.forward Dopredu
 mpkey.goto Zadať čas prehrávania
 mpkey.next_repeat_mode Ďalší opakovací režim
@@ -2496,7 +2572,7 @@ scants.numberofdataservices Data
 scants.numberofradioservices Rádio
 scants.numberoftotalservices Celkom
 scants.numberoftvservices TV
-scants.preverences_receiving_system Nastavenia
+scants.preferences_receiving_system Nastavenia
 scants.provider Poskytovateľ:
 scants.select_tp Výber transpondéru
 scants.startnow Spustiť prehľadávanie
@@ -2785,6 +2861,19 @@ videomenu.videoformat_149 14:9
 videomenu.videoformat_169 16:9
 videomenu.videoformat_43 4:3
 videomenu.videomode Obrazový režim
+videomenu.zappingmode Režim prepínania
+videomenu.zappingmode_mute Čierna obraz
+videomenu.zappingmode_hold Statický obraz
+weather.api_key Počasie API kľúč (OpenWeather)
+weather.enabled Počasie podpora
+weather.location Lokalita
+webchannels.xml.add Pridať
+webchannels.xml.del Odstrániť
+webchannels.xml.enter Zadať
+webchannels.xml.reload Obnoviť
+webradio.head WebRádio
+webradio.xml Súbory WebRádia
+webradio.xml.auto Automatické načítanie WebRádio súborov
 webtv.head WebTV
 webtv.xml WebTV XML súbory
 webtv.xml.add Pridať XML súbor

data/oled/themes/220x176/Default.otheme.in

@@ -0,0 +1,82 @@
+# 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=@FONTDIR@/neutrino.ttf
+glcd_channel_align=2
+glcd_channel_percent=20
+glcd_channel_x_position=0
+glcd_channel_y_position=30
+glcd_logo=true
+glcd_logo_percent=25
+glcd_logo_width_percent=100
+glcd_logo_x_position=0
+glcd_logo_y_position=30
+glcd_epg_align=2
+glcd_epg_percent=15
+glcd_epg_x_position=0
+glcd_epg_y_position=80
+glcd_start=false
+glcd_start_align=0
+glcd_start_percent=0
+glcd_start_x_position=0
+glcd_start_y_position=0
+glcd_end=false
+glcd_end_align=0
+glcd_end_percent=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_blue=62
+glcd_progressbar_color_green=62
+glcd_progressbar_color_red=62
+glcd_progressbar_percent=10
+glcd_progressbar_width=220
+glcd_progressbar_x_position=0
+glcd_progressbar_y_position=121
+glcd_time=true
+glcd_time_align=2
+glcd_time_percent=25
+glcd_time_x_position=0
+glcd_time_y_position=135
+glcd_icons_percent=6
+glcd_icons_y_position=5
+glcd_icon_cam_x_position=30
+glcd_icon_dd_x_position=60
+glcd_icon_ecm_x_position=1
+glcd_icon_mute_x_position=80
+glcd_icon_rec_x_position=178
+glcd_icon_timer_x_position=140
+glcd_icon_ts_x_position=205
+glcd_icon_txt_x_position=114
+glcd_weather=false
+glcd_weather_curr_icon_x_position=1
+glcd_weather_curr_temp_x_position=0
+glcd_weather_next_icon_x_position=180
+glcd_weather_next_temp_x_position=0
+glcd_weather_percent=20
+glcd_weather_y_position=140
+glcd_standby_weather=1
+glcd_standby_weather_curr_icon_x_position=1
+glcd_standby_weather_curr_temp_x_position=50
+glcd_standby_weather_next_icon_x_position=170
+glcd_standby_weather_next_temp_x_position=115
+glcd_standby_weather_percent=25
+glcd_standby_weather_y_position=130
+glcd_standby_clock=1
+glcd_standby_clock_digital_y_position=15
+glcd_standby_clock_simple_size=40
+glcd_standby_clock_simple_y_position=20
+glcd_position_settings=true

data/oled/themes/220x176/Makefile.am

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

data/oled/themes/Makefile.am

@@ -14,3 +14,9 @@ endif
 if BOXMODEL_VUULTIMO4K
 SUBDIRS += 800x480
 endif
+if BOXMODEL_E4HDULTRA
+SUBDIRS += 220x176
+endif
+if BOXMODEL_PROTEK4K
+SUBDIRS += 220x176
+endif

data/pictures/screensaver/Makefile.am

@@ -1,4 +1,4 @@
-installdir = $(ICONSDIR)
+installdir = $(ICONSDIR)/screensaver
 
 resolution = 1280x720
 

data/weather/Makefile.am

@@ -0,0 +1,9 @@
+configdir = $(CONFIGDIR)
+
+config_DATA = \
+	weather-favorites.xml
+
+weatherdir = $(DATADIR)/neutrino/weather
+
+weather_DATA = \
+	weather-locations.xml

data/weather/weather-favorites.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<weather>
+<!--
+	<location country="CC" city="City" latitude="xx.xxx" longitude="yy.yyy"/>
+-->
+</weather>

data/weather/weather-locations-norway.xml

@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<weather>
+	<location country="NO" city="Agotnes" latitude="60.410" longitude="5.020"/>
+	<location country="NO" city="Akrehamn-vedavagen" latitude="59.260" longitude="5.200"/>
+	<location country="NO" city="Alesund" latitude="62.480" longitude="6.200"/>
+	<location country="NO" city="Algard-figgjo" latitude="58.770" longitude="5.850"/>
+	<location country="NO" city="Alta" latitude="69.980" longitude="23.270"/>
+	<location country="NO" city="Al" latitude="60.640" longitude="8.560"/>
+	<location country="NO" city="Amot-geithus" latitude="59.900" longitude="9.900"/>
+	<location country="NO" city="Andalsnes" latitude="52.570" longitude="7.720"/>
+	<location country="NO" city="Andebu" latitude="59.330" longitude="10.080"/>
+	<location country="NO" city="Andenes" latitude="69.320" longitude="16.110"/>
+	<location country="NO" city="Aneby" latitude="60.080" longitude="10.870"/>
+	<location country="NO" city="Ardalstangen" latitude="61.240" longitude="7.700"/>
+	<location country="NO" city="Arendal" latitude="58.460" longitude="8.760"/>
+	<location country="NO" city="Arnes" latitude="60.130" longitude="11.470"/>
+	<location country="NO" city="Aroysund" latitude="59.180" longitude="10.460"/>
+	<location country="NO" city="Asgardstrand" latitude="59.350" longitude="10.460"/>
+	<location country="NO" city="Askim" latitude="59.580" longitude="11.160"/>
+	<location country="NO" city="Askoy" latitude="60.400" longitude="5.180"/>
+	<location country="NO" city="As" latitude="59.670" longitude="10.780"/>
+	<location country="NO" city="Aulifeltet" latitude="60.030" longitude="11.400"/>
+	<location country="NO" city="Aursmoen" latitude="59.920" longitude="11.430"/>
+	<location country="NO" city="Batsfjord" latitude="70.630" longitude="29.730"/>
+	<location country="NO" city="Bergen" latitude="60.380" longitude="5.340"/>
+	<location country="NO" city="Biri" latitude="60.970" longitude="10.500"/>
+	<location country="NO" city="Birkeland" latitude="58.330" longitude="8.230"/>
+	<location country="NO" city="Bjerkvik" latitude="68.560" longitude="17.520"/>
+	<location country="NO" city="Bjervamoen" latitude="59.320" longitude="9.130"/>
+	<location country="NO" city="Bjorkelangen" latitude="59.880" longitude="11.570"/>
+	<location country="NO" city="Bjornevatn" latitude="69.670" longitude="29.980"/>
+	<location country="NO" city="Blakstad" latitude="59.820" longitude="10.470"/>
+	<location country="NO" city="Bodo" latitude="67.290" longitude="14.370"/>
+	<location country="NO" city="Borkenes" latitude="68.780" longitude="16.180"/>
+	<location country="NO" city="Bo" latitude="59.420" longitude="9.060"/>
+	<location country="NO" city="Brandbu-jaren" latitude="60.430" longitude="10.470"/>
+	<location country="NO" city="Brattvag" latitude="62.600" longitude="6.450"/>
+	<location country="NO" city="Brekstad" latitude="63.680" longitude="9.680"/>
+	<location country="NO" city="Bronnoysund" latitude="65.470" longitude="12.220"/>
+	<location country="NO" city="Brumunddal" latitude="60.890" longitude="10.930"/>
+	<location country="NO" city="Bryne" latitude="58.730" longitude="5.650"/>
+	<location country="NO" city="Buvika-ilhaugen" latitude="63.250" longitude="10.070"/>
+	<location country="NO" city="Dokka" latitude="60.830" longitude="10.080"/>
+	<location country="NO" city="Dombas" latitude="62.080" longitude="9.130"/>
+	<location country="NO" city="Drammen" latitude="59.750" longitude="10.200"/>
+	<location country="NO" city="Drobak" latitude="59.670" longitude="10.650"/>
+	<location country="NO" city="Egersund" latitude="58.460" longitude="6.010"/>
+	<location country="NO" city="Eidsvoll" latitude="60.340" longitude="11.270"/>
+	<location country="NO" city="Eike" latitude="59.400" longitude="5.360"/>
+	<location country="NO" city="Elnesvagen" latitude="62.860" longitude="7.150"/>
+	<location country="NO" city="Elverum" latitude="60.890" longitude="11.540"/>
+	<location country="NO" city="Espeland" latitude="60.380" longitude="5.470"/>
+	<location country="NO" city="Evje" latitude="68.270" longitude="13.730"/>
+	<location country="NO" city="Fagernes" latitude="60.990" longitude="9.250"/>
+	<location country="NO" city="Fagerstrand" latitude="59.730" longitude="10.590"/>
+	<location country="NO" city="Fanahammeren" latitude="60.260" longitude="5.340"/>
+	<location country="NO" city="Farsund" latitude="58.090" longitude="6.780"/>
+	<location country="NO" city="Fauske" latitude="67.250" longitude="15.400"/>
+	<location country="NO" city="Fetsund" latitude="59.930" longitude="11.170"/>
+	<location country="NO" city="Fevik" latitude="58.380" longitude="8.700"/>
+	<location country="NO" city="Finnsnes" latitude="69.230" longitude="17.980"/>
+	<location country="NO" city="Fitjar" latitude="59.920" longitude="5.320"/>
+	<location country="NO" city="Flateby" latitude="59.830" longitude="11.170"/>
+	<location country="NO" city="Flekkefjord" latitude="58.310" longitude="6.680"/>
+	<location country="NO" city="Flisa" latitude="60.620" longitude="12.030"/>
+	<location country="NO" city="Floro" latitude="61.600" longitude="5.030"/>
+	<location country="NO" city="Fordesfjorden" latitude="59.420" longitude="5.400"/>
+	<location country="NO" city="Forde" latitude="61.460" longitude="5.870"/>
+	<location country="NO" city="Fosnavag-leinstrand" latitude="62.350" longitude="5.650"/>
+	<location country="NO" city="Fredrikstad-sarpsborg" latitude="59.240" longitude="10.940"/>
+	<location country="NO" city="Frekhaug" latitude="60.520" longitude="5.250"/>
+	<location country="NO" city="Geilo" latitude="60.520" longitude="8.200"/>
+	<location country="NO" city="Gjovik" latitude="60.790" longitude="10.650"/>
+	<location country="NO" city="Gjusvik" latitude="58.200" longitude="8.030"/>
+	<location country="NO" city="Glomfjord" latitude="66.820" longitude="13.970"/>
+	<location country="NO" city="Gol" latitude="60.700" longitude="8.950"/>
+	<location country="NO" city="Gran-ringstad" latitude="60.370" longitude="10.570"/>
+	<location country="NO" city="Granrudmoen" latitude="61.280" longitude="10.440"/>
+	<location country="NO" city="Gravdal" latitude="68.120" longitude="13.500"/>
+	<location country="NO" city="Grimstad" latitude="58.350" longitude="8.600"/>
+	<location country="NO" city="Gronlund" latitude="60.080" longitude="11.100"/>
+	<location country="NO" city="Gronvoll" latitude="60.120" longitude="10.940"/>
+	<location country="NO" city="Grua" latitude="60.270" longitude="10.670"/>
+	<location country="NO" city="Gullhaug" latitude="59.500" longitude="10.250"/>
+	<location country="NO" city="Hagavik" latitude="60.180" longitude="5.430"/>
+	<location country="NO" city="Halden" latitude="59.130" longitude="11.370"/>
+	<location country="NO" city="Hamar" latitude="60.810" longitude="11.080"/>
+	<location country="NO" city="Hammerfest" latitude="70.680" longitude="23.710"/>
+	<location country="NO" city="Hareid" latitude="62.370" longitude="6.030"/>
+	<location country="NO" city="Harestua" latitude="60.100" longitude="10.720"/>
+	<location country="NO" city="Harstad" latitude="68.810" longitude="16.520"/>
+	<location country="NO" city="Haugesund" latitude="59.420" longitude="5.270"/>
+	<location country="NO" city="Hauge" latitude="58.350" longitude="6.280"/>
+	<location country="NO" city="Hauknes" latitude="66.280" longitude="14.070"/>
+	<location country="NO" city="Helgeroa-nevlunghamn" latitude="59.000" longitude="9.850"/>
+	<location country="NO" city="Hermannsverk-leikanger" latitude="61.190" longitude="6.780"/>
+	<location country="NO" city="Herre" latitude="59.100" longitude="9.570"/>
+	<location country="NO" city="Hesseng" latitude="69.680" longitude="29.990"/>
+	<location country="NO" city="Holmestrand" latitude="59.500" longitude="10.310"/>
+	<location country="NO" city="Hommelvik" latitude="63.420" longitude="10.800"/>
+	<location country="NO" city="Hommersak" latitude="58.930" longitude="5.850"/>
+	<location country="NO" city="Honefoss" latitude="60.190" longitude="10.230"/>
+	<location country="NO" city="Honningsvag" latitude="70.980" longitude="25.980"/>
+	<location country="NO" city="Horten" latitude="59.420" longitude="10.470"/>
+	<location country="NO" city="Hov" latitude="60.710" longitude="10.360"/>
+	<location country="NO" city="Hoyanger" latitude="61.220" longitude="6.080"/>
+	<location country="NO" city="Husnes" latitude="59.870" longitude="5.770"/>
+	<location country="NO" city="Hylkje" latitude="60.510" longitude="5.350"/>
+	<location country="NO" city="Indre arna" latitude="60.420" longitude="5.480"/>
+	<location country="NO" city="Innbygda" latitude="61.320" longitude="12.270"/>
+	<location country="NO" city="Jessheim" latitude="60.150" longitude="11.180"/>
+	<location country="NO" city="Jevnaker" latitude="60.260" longitude="10.400"/>
+	<location country="NO" city="Jorpeland" latitude="59.020" longitude="6.050"/>
+	<location country="NO" city="Jorstadmoen-faberg" latitude="61.170" longitude="10.420"/>
+	<location country="NO" city="Kabelvag" latitude="68.210" longitude="14.480"/>
+	<location country="NO" city="Kapp" latitude="60.710" longitude="10.860"/>
+	<location country="NO" city="Karasjok" latitude="69.450" longitude="25.500"/>
+	<location country="NO" city="Karlshus" latitude="59.350" longitude="10.870"/>
+	<location country="NO" city="Kautokeino" latitude="68.980" longitude="23.130"/>
+	<location country="NO" city="Kirkenaer" latitude="60.470" longitude="12.050"/>
+	<location country="NO" city="Kirkenes" latitude="69.730" longitude="30.030"/>
+	<location country="NO" city="Kjenner" latitude="59.790" longitude="10.280"/>
+	<location country="NO" city="Klaebu" latitude="64.080" longitude="11.730"/>
+	<location country="NO" city="Kleppe-verdalen" latitude="58.780" longitude="5.640"/>
+	<location country="NO" city="Klofta" latitude="60.070" longitude="11.150"/>
+	<location country="NO" city="Knarrevik-straume" latitude="60.370" longitude="5.160"/>
+	<location country="NO" city="Knarvik" latitude="60.540" longitude="5.290"/>
+	<location country="NO" city="Kolvereid" latitude="64.850" longitude="11.600"/>
+	<location country="NO" city="Kongsberg" latitude="59.670" longitude="9.630"/>
+	<location country="NO" city="Kongsvinger" latitude="60.200" longitude="11.990"/>
+	<location country="NO" city="Kopervik" latitude="59.290" longitude="5.310"/>
+	<location country="NO" city="Koppang" latitude="61.570" longitude="11.070"/>
+	<location country="NO" city="Kragero" latitude="58.870" longitude="9.400"/>
+	<location country="NO" city="Kristiansand" latitude="58.150" longitude="7.990"/>
+	<location country="NO" city="Kristiansund" latitude="63.120" longitude="7.760"/>
+	<location country="NO" city="Kvernaland" latitude="58.790" longitude="5.730"/>
+	<location country="NO" city="Kyrksaeterora" latitude="63.280" longitude="9.100"/>
+	<location country="NO" city="Lakselv" latitude="70.050" longitude="24.930"/>
+	<location country="NO" city="Larkollen" latitude="59.330" longitude="10.670"/>
+	<location country="NO" city="Larvik" latitude="59.070" longitude="9.990"/>
+	<location country="NO" city="Lauve-viksjord" latitude="59.070" longitude="10.150"/>
+	<location country="NO" city="Leirvik" latitude="59.800" longitude="5.490"/>
+	<location country="NO" city="Leknes" latitude="68.160" longitude="13.600"/>
+	<location country="NO" city="Lervik" latitude="59.270" longitude="10.760"/>
+	<location country="NO" city="Levanger" latitude="63.750" longitude="11.320"/>
+	<location country="NO" city="Lierbyen" latitude="59.830" longitude="10.250"/>
+	<location country="NO" city="Liknes" latitude="58.320" longitude="58.320"/>
+	<location country="NO" city="Lillehammer" latitude="61.120" longitude="10.470"/>
+	<location country="NO" city="Lillesand" latitude="58.250" longitude="8.390"/>
+	<location country="NO" city="Lodingen" latitude="68.420" longitude="15.960"/>
+	<location country="NO" city="Loding" latitude="67.300" longitude="14.750"/>
+	<location country="NO" city="Lopsmarka" latitude="67.320" longitude="14.450"/>
+	<location country="NO" city="Lostad" latitude="60.110" longitude="10.930"/>
+	<location country="NO" city="Loten" latitude="60.810" longitude="11.330"/>
+	<location country="NO" city="Lyefjell" latitude="58.750" longitude="5.750"/>
+	<location country="NO" city="Lyngdal" latitude="58.150" longitude="7.100"/>
+	<location country="NO" city="Maloy" latitude="61.930" longitude="5.110"/>
+	<location country="NO" city="Malvik" latitude="63.430" longitude="10.680"/>
+	<location country="NO" city="Mandal" latitude="58.030" longitude="7.440"/>
+	<location country="NO" city="Maura" latitude="60.260" longitude="11.040"/>
+	<location country="NO" city="Melbu" latitude="68.510" longitude="14.800"/>
+	<location country="NO" city="Melhus" latitude="63.300" longitude="10.290"/>
+	<location country="NO" city="Melsomvik" latitude="59.230" longitude="10.340"/>
+	<location country="NO" city="Moelv" latitude="60.930" longitude="10.700"/>
+	<location country="NO" city="Moi" latitude="58.460" longitude="6.540"/>
+	<location country="NO" city="Molde" latitude="62.740" longitude="7.180"/>
+	<location country="NO" city="Mosjoen" latitude="65.840" longitude="13.220"/>
+	<location country="NO" city="Moss" latitude="59.430" longitude="10.680"/>
+	<location country="NO" city="Mo i rana" latitude="66.330" longitude="14.170"/>
+	<location country="NO" city="Myre" latitude="69.110" longitude="15.960"/>
+	<location country="NO" city="Mysen" latitude="59.560" longitude="11.330"/>
+	<location country="NO" city="Naerbo" latitude="58.670" longitude="5.650"/>
+	<location country="NO" city="Namsos" latitude="64.480" longitude="11.520"/>
+	<location country="NO" city="Narvik" latitude="68.450" longitude="17.420"/>
+	<location country="NO" city="Nesbyen" latitude="60.580" longitude="9.110"/>
+	<location country="NO" city="Nesna" latitude="66.210" longitude="13.030"/>
+	<location country="NO" city="Nesoddtangen" latitude="59.860" longitude="10.670"/>
+	<location country="NO" city="Nodeland" latitude="58.160" longitude="7.840"/>
+	<location country="NO" city="Nordfjordeid" latitude="61.900" longitude="6.000"/>
+	<location country="NO" city="Nordstrand" latitude="62.510" longitude="6.050"/>
+	<location country="NO" city="Norheimsund" latitude="60.370" longitude="6.140"/>
+	<location country="NO" city="Notodden" latitude="59.570" longitude="9.260"/>
+	<location country="NO" city="Odda" latitude="60.070" longitude="6.540"/>
+	<location country="NO" city="Oppdal" latitude="62.600" longitude="9.660"/>
+	<location country="NO" city="Orje" latitude="59.480" longitude="11.670"/>
+	<location country="NO" city="Orkanger-fannrem" latitude="63.300" longitude="9.860"/>
+	<location country="NO" city="Ornes" latitude="66.870" longitude="13.700"/>
+	<location country="NO" city="Orsta" latitude="62.210" longitude="6.140"/>
+	<location country="NO" city="Oslo" latitude="59.910" longitude="10.750"/>
+	<location country="NO" city="Osoyro" latitude="60.190" longitude="5.450"/>
+	<location country="NO" city="Otta" latitude="61.780" longitude="9.520"/>
+	<location country="NO" city="Ovre ardal" latitude="61.320" longitude="7.810"/>
+	<location country="NO" city="Oystese" latitude="60.400" longitude="6.210"/>
+	<location country="NO" city="Porsgrunn-skien" latitude="59.150" longitude="9.660"/>
+	<location country="NO" city="Raholt" latitude="60.270" longitude="11.180"/>
+	<location country="NO" city="Rakkestad" latitude="59.420" longitude="11.360"/>
+	<location country="NO" city="Raufoss" latitude="60.730" longitude="10.630"/>
+	<location country="NO" city="Rena" latitude="61.150" longitude="11.330"/>
+	<location country="NO" city="Rensvik" latitude="63.100" longitude="7.820"/>
+	<location country="NO" city="Revetal-bergsasen" latitude="59.360" longitude="10.280"/>
+	<location country="NO" city="Ringebu" latitude="61.550" longitude="10.110"/>
+	<location country="NO" city="Risor" latitude="58.730" longitude="9.220"/>
+	<location country="NO" city="Rjukan" latitude="59.880" longitude="8.560"/>
+	<location country="NO" city="Roa-lunner" latitude="60.300" longitude="10.620"/>
+	<location country="NO" city="Rognan" latitude="67.100" longitude="15.390"/>
+	<location country="NO" city="Roros" latitude="62.580" longitude="11.380"/>
+	<location country="NO" city="Rorvik" latitude="64.870" longitude="11.240"/>
+	<location country="NO" city="Rotnes" latitude="60.050" longitude="10.880"/>
+	<location country="NO" city="Royken" latitude="59.750" longitude="10.380"/>
+	<location country="NO" city="Ryggebyen" latitude="59.390" longitude="10.720"/>
+	<location country="NO" city="Rypefjord" latitude="70.630" longitude="23.670"/>
+	<location country="NO" city="Saetre" latitude="59.680" longitude="10.520"/>
+	<location country="NO" city="Sagvag" latitude="59.780" longitude="5.380"/>
+	<location country="NO" city="Sandane" latitude="61.780" longitude="6.220"/>
+	<location country="NO" city="Sandefjord" latitude="59.140" longitude="10.210"/>
+	<location country="NO" city="Sande" latitude="59.590" longitude="10.210"/>
+	<location country="NO" city="Sandnessjoen" latitude="66.020" longitude="12.630"/>
+	<location country="NO" city="Sauda" latitude="59.650" longitude="6.340"/>
+	<location country="NO" city="Selvik" latitude="59.570" longitude="10.270"/>
+	<location country="NO" city="Sem" latitude="59.290" longitude="10.300"/>
+	<location country="NO" city="Setermoen" latitude="68.890" longitude="18.330"/>
+	<location country="NO" city="Siggerud" latitude="59.810" longitude="10.880"/>
+	<location country="NO" city="Silsand" latitude="69.230" longitude="17.930"/>
+	<location country="NO" city="Skalevik" latitude="58.080" longitude="8.010"/>
+	<location country="NO" city="Skarnes" latitude="60.250" longitude="11.700"/>
+	<location country="NO" city="Skei-surnadalsora" latitude="62.970" longitude="8.650"/>
+	<location country="NO" city="Skiptvet" latitude="59.460" longitude="11.180"/>
+	<location country="NO" city="Ski" latitude="59.720" longitude="10.830"/>
+	<location country="NO" city="Skjeberg" latitude="59.220" longitude="11.200"/>
+	<location country="NO" city="Skjervoy" latitude="70.050" longitude="21.000"/>
+	<location country="NO" city="Skjonhaug" latitude="59.640" longitude="11.310"/>
+	<location country="NO" city="Skodje" latitude="62.510" longitude="6.670"/>
+	<location country="NO" city="Skogn" latitude="63.710" longitude="11.230"/>
+	<location country="NO" city="Skoppum" latitude="59.380" longitude="10.420"/>
+	<location country="NO" city="Skotterud" latitude="59.980" longitude="12.130"/>
+	<location country="NO" city="Skreia" latitude="60.650" longitude="10.940"/>
+	<location country="NO" city="Skudeneshamn" latitude="59.160" longitude="5.250"/>
+	<location country="NO" city="Skulestadmoen" latitude="60.690" longitude="6.450"/>
+	<location country="NO" city="Softeland" latitude="60.250" longitude="5.430"/>
+	<location country="NO" city="Sogndalsfjora" latitude="60.250" longitude="5.440"/>
+	<location country="NO" city="Sogne" latitude="58.100" longitude="7.780"/>
+	<location country="NO" city="Son-store" latitude="4700" longitude="59.520"/>
+	<location country="NO" city="Sorreisa" latitude="69.150" longitude="18.120"/>
+	<location country="NO" city="Sortland" latitude="68.710" longitude="15.380"/>
+	<location country="NO" city="Sorumsand" latitude="59.990" longitude="11.260"/>
+	<location country="NO" city="Spetalen" latitude="60.180" longitude="11.900"/>
+	<location country="NO" city="Spydeberg" latitude="59.620" longitude="11.090"/>
+	<location country="NO" city="Stange" latitude="60.730" longitude="11.220"/>
+	<location country="NO" city="Stavanger" latitude="58.970" longitude="5.710"/>
+	<location country="NO" city="Stavern" latitude="59.000" longitude="10.030"/>
+	<location country="NO" city="Steinkjer" latitude="64.020" longitude="11.480"/>
+	<location country="NO" city="Steinsasen" latitude="60.090" longitude="10.270"/>
+	<location country="NO" city="Stjordalshalsen" latitude="63.480" longitude="10.940"/>
+	<location country="NO" city="Stokke" latitude="59.230" longitude="10.310"/>
+	<location country="NO" city="Stokmarknes" latitude="68.560" longitude="14.910"/>
+	<location country="NO" city="Storen" latitude="63.040" longitude="10.260"/>
+	<location country="NO" city="Storslett" latitude="69.770" longitude="21.070"/>
+	<location country="NO" city="Stranda" latitude="62.320" longitude="6.930"/>
+	<location country="NO" city="Stryn" latitude="61.920" longitude="6.780"/>
+	<location country="NO" city="Sunde-valen" latitude="59.850" longitude="5.710"/>
+	<location country="NO" city="Sunndalsora" latitude="62.680" longitude="8.580"/>
+	<location country="NO" city="Svelvik" latitude="59.620" longitude="10.410"/>
+	<location country="NO" city="Svolvaer" latitude="68.260" longitude="14.550"/>
+	<location country="NO" city="Svortland" latitude="59.770" longitude="5.120"/>
+	<location country="NO" city="Sykkylven" latitude="62.400" longitude="6.590"/>
+	<location country="NO" city="Tananger" latitude="58.940" longitude="5.600"/>
+	<location country="NO" city="Tau" latitude="59.080" longitude="5.920"/>
+	<location country="NO" city="Teigebyen" latitude="60.230" longitude="11.000"/>
+	<location country="NO" city="Tjome" latitude="59.130" longitude="10.390"/>
+	<location country="NO" city="Tofte" latitude="59.570" longitude="10.610"/>
+	<location country="NO" city="Togrenda" latitude="59.740" longitude="10.750"/>
+	<location country="NO" city="Tomter" latitude="59.670" longitude="11.010"/>
+	<location country="NO" city="Tonsberg" latitude="59.270" longitude="10.420"/>
+	<location country="NO" city="Tranby" latitude="59.790" longitude="10.280"/>
+	<location country="NO" city="Tromso" latitude="69.660" longitude="18.940"/>
+	<location country="NO" city="Trondheim" latitude="63.440" longitude="10.400"/>
+	<location country="NO" city="Tvedestrand" latitude="58.620" longitude="8.930"/>
+	<location country="NO" city="Tveit" latitude="58.260" longitude="8.130"/>
+	<location country="NO" city="Tynset" latitude="62.280" longitude="10.770"/>
+	<location country="NO" city="Ulefoss" latitude="59.280" longitude="9.260"/>
+	<location country="NO" city="Ulsteinvik" latitude="62.340" longitude="5.870"/>
+	<location country="NO" city="Vadfoss-helle" latitude="58.900" longitude="9.360"/>
+	<location country="NO" city="Vadso" latitude="70.090" longitude="29.740"/>
+	<location country="NO" city="Vagamo" latitude="61.880" longitude="9.110"/>
+	<location country="NO" city="Vang" latitude="60.210" longitude="10.330"/>
+	<location country="NO" city="Vanse" latitude="58.100" longitude="6.690"/>
+	<location country="NO" city="Vardo" latitude="70.390" longitude="31.060"/>
+	<location country="NO" city="Varhaug" latitude="58.630" longitude="5.650"/>
+	<location country="NO" city="Vatne" latitude="62.560" longitude="6.620"/>
+	<location country="NO" city="Vear" latitude="59.250" longitude="10.360"/>
+	<location country="NO" city="Vennesla" latitude="58.260" longitude="7.960"/>
+	<location country="NO" city="Verdalsora" latitude="63.800" longitude="11.490"/>
+	<location country="NO" city="Vestby" latitude="59.600" longitude="10.740"/>
+	<location country="NO" city="Vestfossen" latitude="58.750" longitude="9.870"/>
+	<location country="NO" city="Vestnes" latitude="62.620" longitude="7.080"/>
+	<location country="NO" city="Vigrestad" latitude="58.580" longitude="5.680"/>
+	<location country="NO" city="Vikersund" latitude="59.990" longitude="10.010"/>
+	<location country="NO" city="Vinstra" latitude="61.600" longitude="9.750"/>
+	<location country="NO" city="Volda" latitude="62.150" longitude="6.070"/>
+	<location country="NO" city="Vossevangen" latitude="60.640" longitude="6.430"/>
+	<location country="NO" city="Ytre arna" latitude="60.470" longitude="5.430"/>
+	<location country="NO" city="Ytre enebakk" latitude="59.730" longitude="11.060"/>
+</weather>

data/weather/weather-locations.xml

@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<weather>
+	<location country="DE" city="Aachen" latitude="50.77" longitude="6.13"/>
+	<location country="DE" city="Ahaus" latitude="52.07" longitude="7.00"/>
+	<location country="DE" city="Ahrensburg" latitude="53.06" longitude="10.25"/>
+	<location country="DE" city="Allendorf" latitude="51.28" longitude="7.95"/>
+	<location country="DE" city="Alsenz" latitude="49.72" longitude="7.82"/>
+	<location country="DE" city="Altenbruch" latitude="53.82" longitude="8.77"/>
+	<location country="DE" city="Amberg" latitude="49.44" longitude="11.86"/>
+	<location country="DE" city="Ansbach" latitude="49.30" longitude="10.58"/>
+	<location country="DE" city="Aschaffenburg" latitude="49.97" longitude="9.15"/>
+	<location country="DE" city="Augsburg" latitude="48.37" longitude="10.88"/>
+	<location country="DE" city="Aurich" latitude="53.47" longitude="7.48"/>
+	<location country="DE" city="Bad Hersfeld" latitude="50.870" longitude="9.702"/>
+	<location country="DE" city="Bad Tölz" latitude="47.77" longitude="11.57"/>
+	<location country="DE" city="Bamberg" latitude="50.87" longitude="9.70"/>
+	<location country="DE" city="Barweiler" latitude="50.35" longitude="6.98"/>
+	<location country="DE" city="Bayreuth" latitude="49.95" longitude="11.56"/>
+	<location country="DE" city="Bedburg" latitude="50.98" longitude="6.57"/>
+	<location country="DE" city="Bergen auf Rügen" latitude="54.42" longitude="13.44"/>
+	<location country="DE" city="Bergisch-Gladbach" latitude="49.94" longitude="11.57"/>
+	<location country="DE" city="Berlin" latitude="52.52" longitude="13.40"/>
+	<location country="DE" city="Bielefeld" latitude="52.03" longitude="8.53"/>
+	<location country="DE" city="Bitburg" latitude="49.96" longitude="6.52"/>
+	<location country="DE" city="Blexen" latitude="49.96" longitude="6.52"/>
+	<location country="DE" city="Bonn" latitude="50.73" longitude="7.09"/>
+	<location country="DE" city="Bottrop" latitude="51.52" longitude="6.94"/>
+	<location country="DE" city="Brandenburg" latitude="52.41" longitude="12.53"/>
+	<location country="DE" city="Braunschweig" latitude="52.26" longitude="10.52"/>
+	<location country="DE" city="Bremen" latitude="53.07" longitude="8.80"/>
+	<location country="DE" city="Bremerhaven" latitude="53.53" longitude="8.58"/>
+	<location country="DE" city="Brüggen" latitude="51.03" longitude="6.33"/>
+	<location country="DE" city="Brunsbüttel" latitude="53.89" longitude="9.13"/>
+	<location country="DE" city="Bückeburg" latitude="52.25" longitude="9.05"/>
+	<location country="DE" city="Büttgen" latitude="51.19" longitude="6.60"/>
+	<location country="DE" city="Celle" latitude="52.25" longitude="9.05"/>
+	<location country="DE" city="Chemnitz" latitude="50.82" longitude="12.92"/>
+	<location country="DE" city="Cloppenburg" latitude="50.82" longitude="12.92"/>
+	<location country="DE" city="Coburg" latitude="50.26" longitude="10.96"/>
+	<location country="DE" city="Cottbus" latitude="51.75" longitude="14.33"/>
+	<location country="DE" city="Cuxhaven" latitude="53.85" longitude="8.68"/>
+	<location country="DE" city="Dachau" latitude="48.26" longitude="11.43"/>
+	<location country="DE" city="Darmstadt" latitude="49.87" longitude="8.65"/>
+	<location country="DE" city="Deggendorf" latitude="48.84" longitude="12.95"/>
+	<location country="DE" city="Delmenhorst" latitude="53.05" longitude="8.63"/>
+	<location country="DE" city="Dessau" latitude="51.82" longitude="12.24"/>
+	<location country="DE" city="Detmold" latitude="51.93" longitude="8.86"/>
+	<location country="DE" city="Döbeln" latitude="51.12" longitude="13.11"/>
+	<location country="DE" city="Donaueschingen" latitude="47.95" longitude="8.49"/>
+	<location country="DE" city="Dortmund" latitude="51.51" longitude="7.46"/>
+	<location country="DE" city="Dresden" latitude="51.05" longitude="13.73"/>
+	<location country="DE" city="Duhnen" latitude="53.88" longitude="8.64"/>
+	<location country="DE" city="Duisburg" latitude="51.43" longitude="6.76"/>
+	<location country="DE" city="Düsseldorf" latitude="51.22" longitude="6.77"/>
+	<location country="DE" city="Ebersberg" latitude="48.07" longitude="11.96"/>
+	<location country="DE" city="Eberswalde" latitude="52.837" longitude="13.788"/>
+	<location country="DE" city="Eckernförde" latitude="54.469" longitude="9.838"/>
+	<location country="DE" city="Eggenfelden" latitude="48.40" longitude="12.75"/>
+	<location country="DE" city="Eichstätt" latitude="48.89" longitude="11.18"/>
+	<location country="DE" city="Elmshorn" latitude="53.75" longitude="9.66"/>
+	<location country="DE" city="Emden" latitude="53.35" longitude="7.20"/>
+	<location country="DE" city="Erding" latitude="48.31" longitude="11.91"/>
+	<location country="DE" city="Erfurt" latitude="50.98" longitude="11.02"/>
+	<location country="DE" city="Erkrath" latitude="51.22" longitude="6.91"/>
+	<location country="DE" city="Erlangen" latitude="49.58" longitude="11.01"/>
+	<location country="DE" city="Eschlkam" latitude="49.29" longitude="12.91"/>
+	<location country="DE" city="Eschwege" latitude="51.18" longitude="10.03"/>
+	<location country="DE" city="Essen" latitude="51.45" longitude="7.01"/>
+	<location country="DE" city="Esslingen" latitude="48.74" longitude="9.32"/>
+	<location country="DE" city="Euskirchen" latitude="50.65" longitude="6.78"/>
+	<location country="DE" city="Eutin" latitude="54.13" longitude="10.60"/>
+	<location country="DE" city="Falkensee" latitude="52.56" longitude="13.07"/>
+	<location country="DE" city="Feucht" latitude="49.37" longitude="11.21"/>
+	<location country="DE" city="Flensburg" latitude="54.79" longitude="9.44"/>
+	<location country="DE" city="Frankfurt am Main" latitude="50.11" longitude="8.68"/>
+	<location country="DE" city="Frankfurt an der Oder" latitude="52.350" longitude="14.550"/>
+	<location country="DE" city="Freiburg" latitude="47.99" longitude="7.84"/>
+	<location country="DE" city="Freigericht" latitude="50.142" longitude="9.166"/>
+	<location country="DE" city="Freising" latitude="48.40" longitude="11.74"/>
+	<location country="DE" city="Freudenstadt" latitude="48.46" longitude="8.41"/>
+	<location country="DE" city="Freyung" latitude="48.80" longitude="13.54"/>
+	<location country="DE" city="Friedrichshafen" latitude="47.66" longitude="9.48"/>
+	<location country="DE" city="Friesoythe" latitude="53.02" longitude="7.85"/>
+	<location country="DE" city="Fritzlar" latitude="51.13" longitude="9.27"/>
+	<location country="DE" city="Fulda" latitude="50.55" longitude="9.68"/>
+	<location country="DE" city="Fürstenfeldbruck" latitude="48.17" longitude="11.24"/>
+	<location country="DE" city="Fürth" latitude="49.47" longitude="10.98"/>
+	<location country="DE" city="Garmisch-Partenkirchen" latitude="47.49" longitude="11.10"/>
+	<location country="DE" city="Geilenkirchen" latitude="50.97" longitude="6.12"/>
+	<location country="DE" city="Gelnhausen" latitude="50.20" longitude="9.19"/>
+	<location country="DE" city="Gelsenkirchen" latitude="51.52" longitude="7.09"/>
+	<location country="DE" city="Gera" latitude="50.89" longitude="12.08"/>
+	<location country="DE" city="Geretsried" latitude="47.86" longitude="11.49"/>
+	<location country="DE" city="Germersheim" latitude="49.21" longitude="8.37"/>
+	<location country="DE" city="Gettorf" latitude="54.41" longitude="9.98"/>
+	<location country="DE" city="Gießen" latitude="50.58" longitude="8.68"/>
+	<location country="DE" city="Glauchau" latitude="50.82" longitude="12.55"/>
+	<location country="DE" city="Göppingen" latitude="48.71" longitude="9.65"/>
+	<location country="DE" city="Görlitz" latitude="51.15" longitude="14.97"/>
+	<location country="DE" city="Göttingen" latitude="51.54" longitude="9.92"/>
+	<location country="DE" city="Grafenau" latitude="48.86" longitude="13.39"/>
+	<location country="DE" city="Grafenwöhr" latitude="49.71" longitude="11.91"/>
+	<location country="DE" city="Greifswald" latitude="54.09" longitude="13.39"/>
+	<location country="DE" city="Grünberg" latitude="50.59" longitude="8.96"/>
+	<location country="DE" city="Gütersloh" latitude="51.90" longitude="8.39"/>
+	<location country="DE" city="Hagen" latitude="51.37" longitude="7.46"/>
+	<location country="DE" city="Hahn" latitude="49.96" longitude="7.27"/>
+	<location country="DE" city="Halle (Saale)" latitude="51.497" longitude="11.969"/>
+	<location country="DE" city="Halle (Westfalen)" latitude="52.06" longitude="8.36"/>
+	<location country="DE" city="Hamburg" latitude="53.55" longitude="9.99"/>
+	<location country="DE" city="Hamm" latitude="51.67" longitude="7.82"/>
+	<location country="DE" city="Hanau" latitude="50.13" longitude="8.93"/>
+	<location country="DE" city="Hannover" latitude="52.38" longitude="9.73"/>
+	<location country="DE" city="Harrislee" latitude="54.80" longitude="9.39"/>
+	<location country="DE" city="Heidelberg" latitude="49.40" longitude="8.67"/>
+	<location country="DE" city="Heilbronn" latitude="49.14" longitude="9.21"/>
+	<location country="DE" city="Helgoland" latitude="54.18" longitude="7.89"/>
+	<location country="DE" city="Hennigsdorf" latitude="52.63" longitude="13.20"/>
+	<location country="DE" city="Herne" latitude="51.54" longitude="7.20"/>
+	<location country="DE" city="Hilden" latitude="51.17" longitude="6.93"/>
+	<location country="DE" city="Hildesheim" latitude="52.15" longitude="9.96"/>
+	<location country="DE" city="Hinte" latitude="53.41" longitude="7.20"/>
+	<location country="DE" city="Hochheim" latitude="50.01" longitude="8.36"/>
+	<location country="DE" city="Hockenheimring" latitude="49.33" longitude="8.57"/>
+	<location country="DE" city="Hof" latitude="50.31" longitude="11.91"/>
+	<location country="DE" city="Holzkirchen" latitude="47.88" longitude="11.70"/>
+	<location country="DE" city="Hosten" latitude="49.89" longitude="6.62"/>
+	<location country="DE" city="Hürth" latitude="50.88" longitude="6.89"/>
+	<location country="DE" city="Husby" latitude="54.50" longitude="9.48"/>
+	<location country="DE" city="Husum" latitude="54.48" longitude="9.06"/>
+	<location country="DE" city="Idar-Oberstein" latitude="49.71" longitude="7.31"/>
+	<location country="DE" city="Ingolstadt" latitude="48.77" longitude="11.43"/>
+	<location country="DE" city="Iserlohn" latitude="51.38" longitude="7.70"/>
+	<location country="DE" city="Itzehoe" latitude="53.93" longitude="9.51"/>
+	<location country="DE" city="Jever" latitude="53.57" longitude="7.90"/>
+	<location country="DE" city="Jülich" latitude="50.92" longitude="6.36"/>
+	<location country="DE" city="Kall" latitude="50.54" longitude="6.56"/>
+	<location country="DE" city="Karlsruhe" latitude="49.01" longitude="8.40"/>
+	<location country="DE" city="Kassel" latitude="51.31" longitude="9.48"/>
+	<location country="DE" city="Kaufbeuren" latitude="47.88" longitude="10.63"/>
+	<location country="DE" city="Kempten" latitude="47.73" longitude="10.32"/>
+	<location country="DE" city="Kiel" latitude="54.32" longitude="10.12"/>
+	<location country="DE" city="Kitzingen" latitude="49.73" longitude="10.15"/>
+	<location country="DE" city="Koblenz" latitude="50.36" longitude="7.59"/>
+	<location country="DE" city="Köln" latitude="50.94" longitude="6.96"/>
+	<location country="DE" city="Konstanz" latitude="47.68" longitude="9.17"/>
+	<location country="DE" city="Krefeld" latitude="51.34" longitude="6.59"/>
+	<location country="DE" city="Kronshagen" latitude="54.34" longitude="10.09"/>
+	<location country="DE" city="Krumbach" latitude="48.25" longitude="10.37"/>
+	<location country="DE" city="Laarbruch" latitude="51.60" longitude="6.15"/>
+	<location country="DE" city="Lahr" latitude="48.33" longitude="7.87"/>
+	<location country="DE" city="Landshut" latitude="48.54" longitude="12.15"/>
+	<location country="DE" city="Langenhagen" latitude="52.45" longitude="9.74"/>
+	<location country="DE" city="Lausitzring" latitude="51.54" longitude="13.89"/>
+	<location country="DE" city="Lechfeld" latitude="48.19" longitude="10.86"/>
+	<location country="DE" city="Leck" latitude="54.77" longitude="8.98"/>
+	<location country="DE" city="Leer" latitude="53.24" longitude="7.47"/>
+	<location country="DE" city="Leipzig" latitude="51.34" longitude="12.37"/>
+	<location country="DE" city="Leverkusen" latitude="51.05" longitude="7.02"/>
+	<location country="DE" city="Lindenberg" latitude="47.60" longitude="9.89"/>
+	<location country="DE" city="List" latitude="55.02" longitude="8.43"/>
+	<location country="DE" city="Lübeck" latitude="53.87" longitude="10.69"/>
+	<location country="DE" city="Lüchow" latitude="52.97" longitude="11.15"/>
+	<location country="DE" city="Luckenwalde" latitude="52.09" longitude="13.16"/>
+	<location country="DE" city="Ludwigsburg" latitude="48.89" longitude="9.20"/>
+	<location country="DE" city="Ludwigshafen" latitude="49.48" longitude="8.45"/>
+	<location country="DE" city="Lüneburg" latitude="53.25" longitude="10.41"/>
+	<location country="DE" city="Magdeburg" latitude="52.12" longitude="11.63"/>
+	<location country="DE" city="Mainz" latitude="49.99" longitude="8.25"/>
+	<location country="DE" city="Mannheim" latitude="49.49" longitude="8.47"/>
+	<location country="DE" city="Marburg" latitude="50.80" longitude="8.77"/>
+	<location country="DE" city="Marienfelde" latitude="52.42" longitude="13.37"/>
+	<location country="DE" city="Marktbreit" latitude="49.67" longitude="10.15"/>
+	<location country="DE" city="Meiningen" latitude="50.57" longitude="10.42"/>
+	<location country="DE" city="Memmingen" latitude="47.98" longitude="10.18"/>
+	<location country="DE" city="Meppen" latitude="52.70" longitude="7.30"/>
+	<location country="DE" city="Merzig" latitude="49.45" longitude="6.64"/>
+	<location country="DE" city="Minden" latitude="52.30" longitude="8.89"/>
+	<location country="DE" city="Mönchengladbach" latitude="51.18" longitude="6.44"/>
+	<location country="DE" city="Mühldorf" latitude="48.25" longitude="12.52"/>
+	<location country="DE" city="München" latitude="48.14" longitude="11.58"/>
+	<location country="DE" city="Münster" latitude="51.96" longitude="7.63"/>
+	<location country="DE" city="Murnau" latitude="47.68" longitude="11.20"/>
+	<location country="DE" city="Mylau" latitude="50.62" longitude="12.26"/>
+	<location country="DE" city="Naumburg (Saale)" latitude="51.15" longitude="11.82"/>
+	<location country="DE" city="Neuberg" latitude="48.11" longitude="12.12"/>
+	<location country="DE" city="Neubrandenburg" latitude="53.57" longitude="13.28"/>
+	<location country="DE" city="Neumarkt" latitude="49.28" longitude="11.47"/>
+	<location country="DE" city="Neumünster" latitude="54.07" longitude="9.98"/>
+	<location country="DE" city="Neunkirchen" latitude="49.35" longitude="7.19"/>
+	<location country="DE" city="Neuruppin" latitude="52.92" longitude="12.80"/>
+	<location country="DE" city="Neuss" latitude="51.20" longitude="6.69"/>
+	<location country="DE" city="Neuwied" latitude="50.44" longitude="7.47"/>
+	<location country="DE" city="Niendorf (Ostsee)" latitude="53.99" longitude="10.83"/>
+	<location country="DE" city="Norden" latitude="53.60" longitude="7.20"/>
+	<location country="DE" city="Nordenham" latitude="53.50" longitude="8.49"/>
+	<location country="DE" city="Norderney" latitude="53.71" longitude="7.16"/>
+	<location country="DE" city="Nordhausen" latitude="51.50" longitude="10"/>
+	<location country="DE" city="Nordhausen" latitude="51.50" longitude="10"/>
+	<location country="DE" city="Nordheide" latitude="53.12" longitude="8.46"/>
+	<location country="DE" city="Nordhorn" latitude="52.43" longitude="7.07"/>
+	<location country="DE" city="Nördlingen" latitude="48.85" longitude="10.49"/>
+	<location country="DE" city="Nürburgring" latitude="50.34" longitude="6.95"/>
+	<location country="DE" city="Oberhausen" latitude="51.50" longitude="6.86"/>
+	<location country="DE" city="Oberpfaffenhofen" latitude="48.07" longitude="11.26"/>
+	<location country="DE" city="Oberstdorf" latitude="47.41" longitude="10.28"/>
+	<location country="DE" city="Ochsenfurt" latitude="49.66" longitude="10.07"/>
+	<location country="DE" city="Oeversee" latitude="54.70" longitude="9.43"/>
+	<location country="DE" city="Offenbach" latitude="50.10" longitude="8.78"/>
+	<location country="DE" city="Oldenburg" latitude="53.14" longitude="8.21"/>
+	<location country="DE" city="Oldersum" latitude="53.33" longitude="7.34"/>
+	<location country="DE" city="Oranienburg" latitude="52.75" longitude="13.24"/>
+	<location country="DE" city="Osnabrück" latitude="52.28" longitude="8.05"/>
+	<location country="DE" city="Otterndorf" latitude="53.81" longitude="8.90"/>
+	<location country="DE" city="Paderborn" latitude="51.72" longitude="8.76"/>
+	<location country="DE" city="Passau" latitude="48.57" longitude="13"/>
+	<location country="DE" city="Peine" latitude="52.32" longitude="10.24"/>
+	<location country="DE" city="Pfaffenhofen" latitude="48.52" longitude="11.50"/>
+	<location country="DE" city="Pfarrkirchen" latitude="48.42" longitude="12.94"/>
+	<location country="DE" city="Pforzheim" latitude="48.89" longitude="8.69"/>
+	<location country="DE" city="Pinneberg" latitude="53.65" longitude="9.79"/>
+	<location country="DE" city="Pirmasens" latitude="49.20" longitude="7.60"/>
+	<location country="DE" city="Plauen" latitude="50.50" longitude="12.14"/>
+	<location country="DE" city="Pocking" latitude="48.40" longitude="13.32"/>
+	<location country="DE" city="Potsdam" latitude="52.39" longitude="13.06"/>
+	<location country="DE" city="Prenzlau" latitude="53.32" longitude="13.86"/>
+	<location country="DE" city="Quickborn" latitude="53.73" longitude="9.91"/>
+	<location country="DE" city="Rastede" latitude="53.24" longitude="8.20"/>
+	<location country="DE" city="Recklinghausen" latitude="51.61" longitude="7.20"/>
+	<location country="DE" city="Regensburg" latitude="49.01" longitude="12.10"/>
+	<location country="DE" city="Remscheid" latitude="51.18" longitude="7.19"/>
+	<location country="DE" city="Rendsburg" latitude="54.31" longitude="9.66"/>
+	<location country="DE" city="Rennerod" latitude="50.61" longitude="8.07"/>
+	<location country="DE" city="Rosenheim" latitude="47.86" longitude="12.12"/>
+	<location country="DE" city="Rostock" latitude="54.09" longitude="12.10"/>
+	<location country="DE" city="Rüsselsheim" latitude="50.00" longitude="8.42"/>
+	<location country="DE" city="Saarbrücken" latitude="49.230" longitude="7.000"/>
+	<location country="DE" city="Sahlenburg" latitude="53.870" longitude="8.630"/>
+	<location country="DE" city="Salzgitter" latitude="52.080" longitude="10.330"/>
+	<location country="DE" city="Salzwedel" latitude="52.850" longitude="11.150"/>
+	<location country="DE" city="Schiffdorf" latitude="53.530" longitude="8.650"/>
+	<location country="DE" city="Schleswig" latitude="54.520" longitude="9.550"/>
+	<location country="DE" city="Schrobenhausen" latitude="48.550" longitude="11.270"/>
+	<location country="DE" city="Schwabach" latitude="49.330" longitude="11.030"/>
+	<location country="DE" city="Schwäbisch Hall" latitude="49.110" longitude="9.730"/>
+	<location country="DE" city="Schweinfurt" latitude="50.050" longitude="10.230"/>
+	<location country="DE" city="Schwerin" latitude="53.630" longitude="11.380"/>
+	<location country="DE" city="Siegburg" latitude="50.800" longitude="7.200"/>
+	<location country="DE" city="Siegen" latitude="50.870" longitude="8.030"/>
+	<location country="DE" city="Solingen" latitude="51.180" longitude="7.080"/>
+	<location country="DE" city="Starnberg" latitude="48.000" longitude="11.350"/>
+	<location country="DE" city="Straubing" latitude="48.880" longitude="12.570"/>
+	<location country="DE" city="Stuttgart" latitude="48.770" longitude="9.180"/>
+	<location country="DE" city="Sulingen" latitude="52.680" longitude="8.800"/>
+	<location country="DE" city="Sylt" latitude="54.880" longitude="8.350"/>
+	<location country="DE" city="Tönning" latitude="54.320" longitude="8.950"/>
+	<location country="DE" city="Traunstein" latitude="47.87" longitude="12.62"/>
+	<location country="DE" city="Travemünde" latitude="53.970" longitude="10.870"/>
+	<location country="DE" city="Trier" latitude="49.750" longitude="6.630"/>
+	<location country="DE" city="Tübingen" latitude="48.530" longitude="9.050"/>
+	<location country="DE" city="Ulm" latitude="48.400" longitude="10.000"/>
+	<location country="DE" city="Varel" latitude="53.18" longitude="9.49"/>
+	<location country="DE" city="Veitsbronn" latitude="49.520" longitude="10.880"/>
+	<location country="DE" city="Villingen-Schwenningen" latitude="48.070" longitude="8.450"/>
+	<location country="DE" city="Vilsbiburg" latitude="48.450" longitude="12.350"/>
+	<location country="DE" city="Vilshofen" latitude="49.23" longitude="12.04"/>
+	<location country="DE" city="Waldkirchen/Bayr.-Wald" latitude="48.730" longitude="13.600"/>
+	<location country="DE" city="Wallsbüll" latitude="54.580" longitude="9.000"/>
+	<location country="DE" city="Warnemünde" latitude="54.170" longitude="12.080"/>
+	<location country="DE" city="Weiden" latitude="49.680" longitude="12.160"/>
+	<location country="DE" city="Weimar" latitude="50.980" longitude="11.320"/>
+	<location country="DE" city="Weißenburg/Bayern" latitude="49.030" longitude="10.980"/>
+	<location country="DE" city="Wernigerode" latitude="51.830" longitude="10.780"/>
+	<location country="DE" city="Westerland/Sylt" latitude="54.900" longitude="8.300"/>
+	<location country="DE" city="Westerstede" latitude="53.250" longitude="7.930"/>
+	<location country="DE" city="Wetzlar" latitude="50.550" longitude="8.500"/>
+	<location country="DE" city="Wiesbaden" latitude="50.080" longitude="8.250"/>
+	<location country="DE" city="Wilhelmshaven" latitude="53.520" longitude="8.130"/>
+	<location country="DE" city="Wittenberge" latitude="53.000" longitude="11.750"/>
+	<location country="DE" city="Wittingen" latitude="52.730" longitude="10.720"/>
+	<location country="DE" city="Wolfsburg" latitude="52.430" longitude="10.800"/>
+	<location country="DE" city="Worms" latitude="49.61" longitude="8.31"/>
+	<location country="DE" city="Wuppertal" latitude="51.270" longitude="7.180"/>
+	<location country="DE" city="Würzburg" latitude="49.790" longitude="9.940"/>
+	<location country="DE" city="Zeven" latitude="53.300" longitude="9.280"/>
+	<location country="DE" city="Zirndorf" latitude="49.450" longitude="10.950"/>
+	<location country="DE" city="Zwickau" latitude="50.720" longitude="12.500"/>
+</weather>

data/y-web/Makefile.am

@@ -11,7 +11,7 @@ install_DATA =	channels.js \
 		lcd4linux.html \
 		Y_About.yhtm \
 		Y_Baselib.js \
-		Y_blank.htm \
+		Y_Blank.yhtm \
 		Y_Blocks.txt \
 		Y_Boxcontrol_Bouquet_Editor_Edit.yhtm \
 		Y_Boxcontrol_Bouquet_Editor_Main.yhtm \
@@ -39,19 +39,19 @@ install_DATA =	channels.js \
 		Y_Menue.yhtm \
 		Y_neutrino_Blocks.txt \
 		Y_Refresh.yhtm \
-		Y_Settings_automount_liste.yhtm \
+		Y_Settings_automount_list.yhtm \
 		Y_Settings_automount.yhtm \
 		Y_Settings_Backup.yhtm \
 		Y_Settings_buttons.yhtm \
 		Y_Settings_glcd.yhtm \
 		Y_Settings_lcd.yhtm \
 		Y_Settings_Menue.yhtm \
-		Y_Settings_mount_liste.yhtm \
+		Y_Settings_mount_list.yhtm \
 		Y_Settings_mount.yhtm \
 		Y_Settings_neutrino_forms.yhtm \
 		Y_Settings_nhttpd.yhtm \
 		Y_Settings_personalize.yhtm \
-		Y_Settings_umount_liste.yhtm \
+		Y_Settings_umount_list.yhtm \
 		Y_Settings_video_audio.yhtm \
 		Y_Settings_wol.yhtm \
 		Y_Settings_xmltv.yhtm \

data/y-web/Y_Baselib.js

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

data/y-web/Y_Blocks.txt

@@ -309,10 +309,9 @@ start-block~start_wizard_page
 //<![CDATA[
 function do_submit()
 {
-
+	show_waitbox(true);
-		show_waitbox(true);
+	yhttpd_cache_clear("");
-		yhttpd_cache_clear("");
+	document.f.submit();
-		document.f.submit();
 }
 //]]>
 </script>
@@ -415,7 +414,7 @@ start-block~frame_boxcontrol
 			~
 				{=if-equal:{=var-get:startpage=}~screenshot~Y_Tools_Screenshot.yhtm?osd=1
 				~
-					Y_blank.yhtm
+					Y_Blank.yhtm
 				=}
 			=}
 		=}
@@ -427,21 +426,21 @@ end-block~frame_boxcontrol
 # ------- Lay-Frame Tools-Menu
 start-block~frame_tools
 {=var-set:sec_menu=Y_Tools_Menue.yhtm=}
-{=var-set:work=Y_blank.htm=}
+{=var-set:work=Y_Blank.yhtm=}
 {=include-block:Y_Blocks.txt;frame_secondary=}
 end-block~frame_tools
 
 # ------- Lay-Frame Settings-Menu
 start-block~frame_settings
 {=var-set:sec_menu=Y_Settings_Menue.yhtm=}
-{=var-set:work=Y_blank.htm=}
+{=var-set:work=Y_Blank.yhtm=}
 {=include-block:Y_Blocks.txt;frame_secondary=}
 end-block~frame_settings
 
 # ------- Lay-Frame Extentions-Menu
 start-block~frame_ext
 {=var-set:sec_menu=Y_Ext_Menue.yhtm=}
-{=var-set:work=Y_blank.htm=}
+{=var-set:work=Y_Blank.yhtm=}
 {=include-block:Y_Blocks.txt;frame_secondary=}
 end-block~frame_ext
 
@@ -501,7 +500,10 @@ start-block~rc_variables
 {=var-set:_rc_ax_hd60=21=}
 {=var-set:_rc_mutant_hd60=22=}
 {=var-set:_rc_ax_hd61=23=}
-{=var-set:_rc_maxytec_multiboxse=24=}
+{=var-set:_rc_maxytec_multibox=24=}
+{=var-set:_rc_maxytec_multiboxse=25=}
+{=var-set:_rc_axas_e4hd=26=}
+{=var-set:_rc_protek_4k_uhd=27=}
 end-block~rc_variables
 
 # ------- Remote
@@ -537,10 +539,13 @@ start-block~remote
 		{=if-equal:{=var-get:boxtype=}~AX HD60~			{=include-block:Y_Blocks.txt;rc_ax_hd51=}~
 		{=if-equal:{=var-get:boxtype=}~Mutant HD60~		{=include-block:Y_Blocks.txt;rc_mutant_hd60=}~
 		{=if-equal:{=var-get:boxtype=}~AX HD61~			{=include-block:Y_Blocks.txt;rc_ax_hd61=}~
+		{=if-equal:{=var-get:boxtype=}~Maxytec Multibox 4K~	{=include-block:Y_Blocks.txt;rc_mutant_hd60=}~
 		{=if-equal:{=var-get:boxtype=}~Maxytec Multibox SE 4K~	{=include-block:Y_Blocks.txt;rc_mutant_hd60=}~
+		{=if-equal:{=var-get:boxtype=}~AXAS E4HD 4K ULTRA~	{=include-block:Y_Blocks.txt;rc_axas_e4hd=}~
+		{=if-equal:{=var-get:boxtype=}~Protek 4K UHD~		{=include-block:Y_Blocks.txt;rc_protek_4k_uhd=}~
 
 		{=comment:fallback~=}					{=include-block:Y_Blocks.txt;rc_cst_v1=}
-		=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
+		=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
 	=}=}
 ~
 	{=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_dbox_philips=}~		{=include-block:Y_Blocks.txt;rc_dbox_philips=}~
@@ -568,16 +573,19 @@ start-block~remote
 	{=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_ax_hd60=}~			{=include-block:Y_Blocks.txt;rc_ax_hd51=}~
 	{=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_mutant_hd60=}~		{=include-block:Y_Blocks.txt;rc_mutant_hd60=}~
 	{=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_ax_hd61=}~			{=include-block:Y_Blocks.txt;rc_ax_hd61=}~
+	{=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_maxytec_multibox=}~	{=include-block:Y_Blocks.txt;rc_mutant_hd60=}~
 	{=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_maxytec_multiboxse=}~	{=include-block:Y_Blocks.txt;rc_mutant_hd60=}~
+	{=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_axas_e4hd=}~		{=include-block:Y_Blocks.txt;rc_axas_e4hd=}~
+	{=if-equal:{=var-get:yfbtype=}~{=var-get:_rc_protek_4k_uhd=}~		{=include-block:Y_Blocks.txt;rc_protek_4k_uhd=}~
 
 	{=comment:fallback~=}							{=include-block:Y_Blocks.txt;rc_cst_v1=}
-	=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
+	=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}=}
 =}
 end-block~remote
 
 # ------- Remote d-Box Philips/Sagem
 start-block~rc_dbox_philips
-<img src="images/rc_dbox_philips.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_dbox_philips.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="poly" href="javascript:rcsim('KEY_RIGHT')" coords="100,117,100,180,67,146,100,116" />
   <area shape="poly" href="javascript:rcsim('KEY_DOWN')" coords="36,181,101,180,66,146" />
@@ -610,7 +618,7 @@ end-block~rc_dbox_philips
 
 # ------- Remote d-Box Nokia old
 start-block~rc_dbox_nokia_old
-<img src="images/rc_dbox_nokia_old.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_dbox_nokia_old.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="rect" href="javascript:rcsim('KEY_SETUP')" coords="7,95,45,109" />
   <area shape="circle" href="javascript:rcsim('KEY_7')" coords="60,102,10" />
@@ -643,7 +651,7 @@ end-block~rc_dbox_nokia_old
 
 # ------ Remote CST V1 (HD1 / BSE)
 start-block~rc_cst_v1
-<img src="images/rc_cst_v1.jpg" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v1.jpg" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="rect" href="javascript:rcsim('KEY_POWER')" coords="134, 38, 159, 68" />
   <area shape="rect" href="javascript:rcsim('KEY_MUTE')" coords="29, 37, 56, 66" />
@@ -696,7 +704,7 @@ end-block~rc_cst_v1
 
 # ------- Remote CST V2 (NEO)
 start-block~rc_cst_v2
-<img src="images/rc_cst_v2.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v2.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="rect" href="javascript:rcsim('KEY_POWER')" coords="22, 28, 45, 50" />
   <area shape="rect" href="javascript:rcsim('KEY_MUTE')" coords="133, 29, 153, 50" />
@@ -751,14 +759,14 @@ end-block~rc_cst_v2
 # ------ Remote CST V3 (ZEE, NEO2)
 start-block~rc_cst_v3
 {=var-set:rcu=rc_cst_v3=}
-<img src="images/rc_cst_v3.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v3.png" usemap="#rc" alt="remote" />
 {=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=}
 end-block~rc_cst_v3
 
 # ------ Remote CST V4 (NEO TWIN)
 start-block~rc_cst_v4
 {=var-set:rcu=rc_cst_v4=}
-<img src="images/rc_cst_v4.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v4.png" usemap="#rc" alt="remote" />
 {=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=}
 end-block~rc_cst_v4
 
@@ -841,7 +849,7 @@ end-block~map_rc_cst_v3_v4
 
 # ------- Remote CST V5 (TANK)
 start-block~rc_cst_v5
-<img src="images/rc_cst_v5.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v5.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="circle" href="javascript:rcsim('KEY_POWER')" coords="50,42,14" alt="standby" title="{=L:rc.key_power=}" />
 
@@ -904,7 +912,7 @@ end-block~rc_cst_v5
 
 # ------- Remote CST V6 (TRINITY)
 start-block~rc_cst_v6
-<img src="images/rc_cst_v6.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v6.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="circle" coords="94,50,16" alt="standby" href="javascript:rcsim('KEY_POWER')" title="{=L:rc.key_power=}" />
   <area shape="circle" coords="150,68,13" alt="mute" href="javascript:rcsim('KEY_MUTE')" title="{=L:rc.key_mute=}" />
@@ -970,7 +978,7 @@ end-block~rc_cst_v6
 
 # ------ Remote AX HD51
 start-block~rc_ax_hd51
-<img src="images/rc_ax_hd51.png" usemap="#rc"/>
+<img src="images/rc/rc_ax_hd51.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="rect" coords="20,43,49,72" href="javascript:rcsim('KEY_POWER')" />
 <area shape="rect" coords="121,44,148,72" href="javascript:rcsim('KEY_MUTE')" />
@@ -1026,7 +1034,7 @@ end-block~rc_ax_hd51
 
 # ------ Remote Mutant HD51
 start-block~rc_mutant_hd51
-<img src="images/rc_mutant_hd51.png" usemap="#rc"/>
+<img src="images/rc/rc_mutant_hd51.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="rect" coords="18,24,53,48" href="javascript:rcsim('KEY_POWER')" />
 <area shape="rect" coords="121,21,148,47" href="javascript:rcsim('KEY_MUTE')" />
@@ -1082,7 +1090,7 @@ end-block~rc_mutant_hd51
 
 # ------ Remote WWIO BRE2ZE 4K
 start-block~rc_wwio_bre2ze4k
-<img src="images/rc_wwio_bre2ze4k.png" usemap="#rc"/>
+<img src="images/rc/rc_wwio_bre2ze4k.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="rect" coords="17,30,43,57" alt="KEY_POWER" href="javascript:rcsim('KEY_POWER')" />
 <area shape="rect" coords="90,36,113,57" alt="KEY_MODE" href="javascript:rcsim('KEY_MODE')" />
@@ -1144,7 +1152,7 @@ end-block~rc_wwio_bre2ze4k
 
 # ------ 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"/>
+<img src="images/rc/rc_vuplus.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <!-- <area shape="circle" coords="33,28,10" id="113" alt="v1_mute" href="javascript:rcsim('KEY_POWER_TV')" /> -->
 <area shape="circle" coords="142,28,10" id ="116" alt="Power" href="javascript:rcsim('KEY_POWER')" />
@@ -1197,7 +1205,7 @@ end-block~rc_vuplus
 
 # ------ Remote Air Digital Zgemma H7
 start-block~rc_zgemma_h7
-<img src="images/rc_zgemma_h7.png" usemap="#rc"/>
+<img src="images/rc/rc_zgemma_h7.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="rect" coords="58,46,25,23" alt="KEY_POWER" href="javascript:rcsim('KEY_POWER')" />
 <area shape="rect" coords="134,22,171,46" alt="KEY_MUTE" href="javascript:rcsim('KEY_MUTE')" />
@@ -1254,7 +1262,7 @@ end-block~rc_zgemma_h7
 
 # ------ Remote Mutant HD60, Maxytec Multibox SE 4K
 start-block~rc_mutant_hd60
-<img src="images/rc_mutant_hd60.png" usemap="#rc"/>
+<img src="images/rc/rc_mutant_hd60.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="circle" coords="31,76,12" href="javascript:rcsim('KEY_POWER')" />
 <area shape="circle" coords="122,76,12" href="javascript:rcsim('KEY_MUTE')" />
@@ -1309,7 +1317,7 @@ end-block~rc_mutant_hd60
 
 # ------ Remote AX HD61
 start-block~rc_ax_hd61
-<img src="images/rc_ax_hd61.png" usemap="#rc"/>
+<img src="images/rc/rc_ax_hd61.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="circle" coords="37,90,15" href="javascript:rcsim('KEY_POWER')" />
 <area shape="circle" coords="144,90,15" href="javascript:rcsim('KEY_MUTE')" />
@@ -1360,3 +1368,115 @@ start-block~rc_ax_hd61
 <area shape="rect" coords="76,266,106,296" href="javascript:rcsim('KEY_PROGRAM')" />
 </map>
 end-block~rc_ax_hd61
+
+# --- Remote Axas E4HD Ultra
+start-block~rc_axas_e4hd
+<img src="images/rc/rc_axas_e4hd.png" usemap="#rc"/>
+<map name="rc" id="rc">
+<area shape="circle" coords="32,68,13" alt="KEY_POWER" href="javascript:rcsim('KEY_POWER')" />
+<area shape="circle" coords="125,68,11" alt="KEY_MUTE" href="javascript:rcsim('KEY_MUTE')" />
+<area shape="circle" coords="80,368,22" alt="KEY_OK" href="javascript:rcsim('KEY_OK')" />
+<area shape="circle" coords="28,322,14" alt="KEY_MENU" href="javascript:rcsim('KEY_MENU')" />
+<area shape="circle" coords="127,321,15" alt="KEY_HOME" href="javascript:rcsim('KEY_HOME')" />
+<area shape="circle" coords="29,418,13" alt="KEY_EPG" href="javascript:rcsim('KEY_EPG')" />
+<area shape="circle" coords="127,417,13" alt="KEY_INFO" href="javascript:rcsim('KEY_INFO')" />
+<area shape="rect" coords="16,118,47,133" alt="KEY_1" href="javascript:rcsim('KEY_1')" />
+<area shape="rect" coords="63,117,96,134" alt="KEY_2" href="javascript:rcsim('KEY_2')" />
+<area shape="rect" coords="110,117,143,133" alt="KEY_3" href="javascript:rcsim('KEY_3')" />
+<area shape="rect" coords="16,142,50,158" alt="KEY_4" href="javascript:rcsim('KEY_4')" />
+<area shape="rect" coords="62,142,96,158" alt="KEY_5" href="javascript:rcsim('KEY_5')" />
+<area shape="rect" coords="110,141,143,159" alt="KEY_6" href="javascript:rcsim('KEY_6')" />
+<area shape="rect" coords="16,167,48,183" alt="KEY_7" href="javascript:rcsim('KEY_7')" />
+<area shape="rect" coords="63,166,96,183" alt="KEY_8" href="javascript:rcsim('KEY_8')" />
+<area shape="rect" coords="110,166,143,182" alt="KEY_9" href="javascript:rcsim('KEY_9')" />
+<area shape="rect" coords="62,191,96,207" alt="KEY_0" href="javascript:rcsim('KEY_0')" />
+<area shape="rect" coords="15,191,50,207" alt="KEY_PREVIOUS" href="javascript:rcsim('KEY_PREVIOUS')" />
+<area shape="rect" coords="110,190,143,208" alt="KEY_NEXT" href="javascript:rcsim('KEY_NEXT')" />
+<area shape="rect" coords="16,445,38,466" alt="KEY_RED" href="javascript:rcsim('KEY_RED')" />
+<area shape="rect" coords="52,445,72,466" alt="KEY_GREEN" href="javascript:rcsim('KEY_GREEN')" />
+<area shape="rect" coords="86,444,108,465" alt="KEY_YELLOW" href="javascript:rcsim('KEY_YELLOW')" />
+<area shape="rect" coords="121,444,144,466" alt="KEY_BLUE" href="javascript:rcsim('KEY_BLUE')" />
+<area shape="rect" coords="15,222,44,257" alt="KEY_VOLUMEUP" href="javascript:rcsim('KEY_VOLUMEUP')" />
+<area shape="rect" coords="14,259,44,295" alt="KEY_VOLUMEDOWN" href="javascript:rcsim('KEY_VOLUMEDOWN')" />
+<area shape="rect" coords="114,221,144,256" alt="KEY_PAGEUP" href="javascript:rcsim('KEY_PAGEUP')" />
+<area shape="rect" coords="114,259,145,293" alt="KEY_PAGEDOWN" href="javascript:rcsim('KEY_PAGEDOWN')" />
+<area shape="rect" coords="15,482,44,497" alt="KEY_PLAY" href="javascript:rcsim('KEY_PLAY')" />
+<area shape="rect" coords="49,482,76,497" alt="KEY_STOP" href="javascript:rcsim('KEY_STOP')" />
+<area shape="rect" coords="82,482,111,497" alt="KEY_PAUSE" href="javascript:rcsim('KEY_PAUSE')" />
+<area shape="rect" coords="116,481,145,497" alt="KEY_RECORD" href="javascript:rcsim('KEY_RECORD')" />
+<area shape="rect" coords="15,525,44,539" alt="KEY_PVR" href="javascript:rcsim('KEY_PVR')" />
+<area shape="rect" coords="82,525,110,539" alt="KEY_SUBTITLE" href="javascript:rcsim('KEY_SUBTITLE')" />
+<area shape="rect" coords="117,525,144,540" alt="KEY_TEXT" href="javascript:rcsim('KEY_TEXT')" />
+<area shape="rect" coords="49,525,78,541" alt="KEY_SLEEP" href="javascript:rcsim('KEY_SLEEP')" />
+<area shape="rect" coords="116,504,143,519" alt="KEY_NEXTSONG" href="javascript:rcsim('KEY_NEXTSONG')" />
+<area shape="rect" coords="83,503,110,518" alt="KEY_PREVIOUSSONG" href="javascript:rcsim('KEY_PREVIOUSSONG')" />
+<area shape="rect" coords="15,504,43,518" alt="KEY_REWIND" href="javascript:rcsim('KEY_REWIND')" />
+<area shape="rect" coords="48,504,76,517" alt="KEY_FORWARD" href="javascript:rcsim('KEY_FORWARD')" />
+<area shape="rect" coords="16,89,37,109" alt="KEY_HELP" href="javascript:rcsim('KEY_HELP')" />
+<area shape="rect" coords="51,89,72,110" alt="KEY_PROGRAM" href="javascript:rcsim('KEY_PROGRAM')" />
+<area shape="rect" coords="86,89,107,109" alt="KEY_TV2" href="javascript:rcsim('KEY_TV2')" />
+<area shape="rect" coords="121,89,143,110" alt="KEY_AUDIO" href="javascript:rcsim('KEY_AUDIO')" />
+<area shape="rect" coords="64,225,94,252" alt="KEY_MEDIA" href="javascript:rcsim('KEY_MEDIA')" />
+<area shape="rect" coords="65,267,94,293" alt="KEY_FAVORITES" href="javascript:rcsim('KEY_FAVORITES')" />
+<area shape="poly" coords="63,348,43,317,68,305,88,305,110,316,96,347,79,342,64,347,65,346,65,346" alt="KEY_UP" href="javascript:rcsim('KEY_UP')" />
+<area shape="poly" coords="42,409,63,386,75,393,92,390,93,388,114,410,109,415,113,422,86,429,61,429,43,420,42,411,42,411,42,411" alt="KEY_DOWN" href="javascript:rcsim('KEY_DOWN')" />
+<area shape="poly" coords="97,350,110,325,116,335,123,338,133,338,143,361,141,380,137,397,133,402,126,400,119,403,115,406,96,387,106,373,104,359,99,349,99,349,99,349" alt="KEY_RIGHT" href="javascript:rcsim('KEY_RIGHT')" />
+<area shape="poly" coords="43,323,63,351,55,359,55,370,58,380,61,386,41,405,35,402,29,402,20,387,17,369,19,356,23,344,26,339,36,338,45,325,45,325" alt="KEY_LEFT" href="javascript:rcsim('KEY_LEFT')" />
+</map>
+end-block~rc_axas_e4hd
+
+# --- Remote Protek 4K UHD
+start-block~rc_protek_4k_uhd
+<img src="images/rc/rc_protek_4k_uhd.png" usemap="#rc"/>
+<map name="rc" id="rc">
+<area shape="circle" coords="33,77,15" alt="KEY_POWER" href="javascript:rcsim('KEY_POWER')" />
+<area shape="circle" coords="140,77,15" alt="KEY_MUTE" href="javascript:rcsim('KEY_MUTE')" />
+<area shape="circle" coords="86,419,22" alt="KEY_OK" href="javascript:rcsim('KEY_OK')" />
+<area shape="circle" coords="28,364,15" alt="KEY_MENU" href="javascript:rcsim('KEY_MENU')" />
+<area shape="circle" coords="138,364,15" alt="KEY_HOME" href="javascript:rcsim('KEY_HOME')" />
+<area shape="circle" coords="28,474,15" alt="KEY_INFO" href="javascript:rcsim('KEY_INFO')" />
+<area shape="circle" coords="138,474,15" alt="KEY_FAVORITES" href="javascript:rcsim('KEY_FAVORITES')" />
+<area shape="rect" coords="14,100,36,120" alt="KEY_TV2" href="javascript:rcsim('KEY_TV2')" />
+<area shape="rect" coords="52,100,74,120" alt="KEY_TEXT" href="javascript:rcsim('KEY_TEXT')" />
+<area shape="rect" coords="94,100,116,120" alt="KEY_AUDIO" href="javascript:rcsim('KEY_AUDIO')" />
+<area shape="rect" coords="132,100,154,120" alt="KEY_SUBTITLE" href="javascript:rcsim('KEY_SUBTITLE')" />
+<area shape="rect" coords="14,130,50,150" alt="KEY_1" href="javascript:rcsim('KEY_1')" />
+<area shape="rect" coords="66,130,102,150" alt="KEY_2" href="javascript:rcsim('KEY_2')" />
+<area shape="rect" coords="120,130,156,150" alt="KEY_3" href="javascript:rcsim('KEY_3')" />
+<area shape="rect" coords="14,160,50,180" alt="KEY_4" href="javascript:rcsim('KEY_4')" />
+<area shape="rect" coords="66,160,102,180" alt="KEY_5" href="javascript:rcsim('KEY_5')" />
+<area shape="rect" coords="120,160,156,180" alt="KEY_6" href="javascript:rcsim('KEY_6')" />
+<area shape="rect" coords="14,190,50,210" alt="KEY_7" href="javascript:rcsim('KEY_7')" />
+<area shape="rect" coords="66,190,102,210" alt="KEY_8" href="javascript:rcsim('KEY_8')" />
+<area shape="rect" coords="120,190,156,210" alt="KEY_9" href="javascript:rcsim('KEY_9')" />
+<area shape="rect" coords="66,220,102,240" alt="KEY_0" href="javascript:rcsim('KEY_0')" />
+<area shape="rect" coords="14,220,50,240" alt="KEY_PREVIOUS" href="javascript:rcsim('KEY_PREVIOUS')" />
+<area shape="rect" coords="120,220,156,240" alt="KEY_NEXT" href="javascript:rcsim('KEY_NEXT')" />
+<area shape="rect" coords="14,502,39,526" alt="KEY_RED" href="javascript:rcsim('KEY_RED')" />
+<area shape="rect" coords="52,502,76,526" alt="KEY_GREEN" href="javascript:rcsim('KEY_GREEN')" />
+<area shape="rect" coords="94,502,116,526" alt="KEY_YELLOW" href="javascript:rcsim('KEY_YELLOW')" />
+<area shape="rect" coords="132,502,155,526" alt="KEY_BLUE" href="javascript:rcsim('KEY_BLUE')" />
+<area shape="rect" coords="15,250,45,289" alt="KEY_VOLUMEUP" href="javascript:rcsim('KEY_VOLUMEUP')" />
+<area shape="rect" coords="15,290,45,330" alt="KEY_VOLUMEDOWN" href="javascript:rcsim('KEY_VOLUMEDOWN')" />
+<area shape="rect" coords="70,250,100,289" alt="KEY_PROGRAM" href="javascript:rcsim('KEY_PROGRAM')" />
+<area shape="rect" coords="70,290,100,330" alt="KEY_EPG" href="javascript:rcsim('KEY_EPG')" />
+<area shape="rect" coords="125,250,155,289" alt="KEY_PAGEUP" href="javascript:rcsim('KEY_PAGEUP')" />
+<area shape="rect" coords="125,290,155,330" alt="KEY_PAGEDOWN" href="javascript:rcsim('KEY_PAGEDOWN')" />
+<area shape="rect" coords="15,545,45,560" alt="KEY_REWIND" href="javascript:rcsim('KEY_REWIND')" />
+<area shape="rect" coords="50,545,80,560" alt="KEY_PLAYPAUSE" href="javascript:rcsim('KEY_PLAYPAUSE')" />
+<area shape="rect" coords="85,545,115,560" alt="KEY_STOP" href="javascript:rcsim('KEY_STOP')" />
+<area shape="rect" coords="125,545,155,560" alt="KEY_FORWARD" href="javascript:rcsim('KEY_FORWARD')" />
+<area shape="rect" coords="15,570,45,585" alt="KEY_RECORD" href="javascript:rcsim('KEY_RECORD')" />
+<area shape="rect" coords="50,570,80,585" alt="KEY_PREVIOUSSONG" href="javascript:rcsim('KEY_PREVIOUSSONG')" />
+<area shape="rect" coords="85,570,115,585" alt="KEY_NEXTSONG" href="javascript:rcsim('KEY_NEXTSONG')" />
+<area shape="rect" coords="125,570,155,585" alt="KEY_PVR" href="javascript:rcsim('KEY_PVR')" />
+<area shape="rect" coords="15,592,45,607" alt="KEY_F1" href="javascript:rcsim('KEY_F1')" />
+<area shape="rect" coords="50,592,80,607" alt="KEY_F2" href="javascript:rcsim('KEY_F2')" />
+<area shape="rect" coords="85,592,115,607" alt="KEY_MEDIA" href="javascript:rcsim('KEY_MEDIA')" />
+<area shape="rect" coords="125,592,155,607" alt="KEY_HELP" href="javascript:rcsim('KEY_HELP')" />
+<area shape="circle" coords="85,364,15" alt="KEY_UP" href="javascript:rcsim('KEY_UP')" />
+<area shape="circle" coords="85,474,15" alt="KEY_DOWN" href="javascript:rcsim('KEY_DOWN')" />
+<area shape="circle" coords="138,419,15" alt="KEY_RIGHT" href="javascript:rcsim('KEY_RIGHT')" />
+<area shape="circle" coords="28,419,15" alt="KEY_LEFT" href="javascript:rcsim('KEY_LEFT')" />
+</map>
+end-block~rc_protek_4k_uhd

data/y-web/Y_Settings_automount.yhtm

@@ -110,7 +110,7 @@ function do_save2()
 
 	var _url ="/control/exec?Y_Tools&automount_setline&/var/etc/auto.net&"+mountname+"&"+mstr;
 	var res = loadSyncURL(_url);
-	window.document.location.href="/Y_Settings_automount_liste.yhtm";
+	window.document.location.href="/Y_Settings_automount_list.yhtm";
 }
 function change_type()
 {
@@ -174,7 +174,7 @@ function change_type()
 		</table>
 		<br/>
 		<button type="button" ytype="save" title="submit and save values" onClick="do_save()">Speichern</button>
-		<button type="button" ytype="cancel" title="cancel" name="abort" onClick='window.document.location.href="/Y_Settings_automount_liste.yhtm"'>Abbrechen</button>
+		<button type="button" ytype="cancel" title="cancel" name="abort" onClick='window.document.location.href="/Y_Settings_automount_list.yhtm"'>Abbrechen</button>
 	</form>
 	</div>
 </div>

data/y-web/Y_Settings_mount.yhtm

@@ -75,10 +75,10 @@ function do_submit()
 			</tr>
 		</table>
 		<br/>
-		<input type="hidden" name="tmpl" value="Y_Settings_mount_liste.yhtm"/>
+		<input type="hidden" name="tmpl" value="Y_Settings_mount_list.yhtm"/>
 		<input type="hidden" name="execute" value="func:mount-set-values"/>
 		<button type="button" ytype="save" title="submit and save values" onClick="do_submit()">Speichern</button>
-		<button type="button" ytype="cancel" title="cancel" name="abort" onClick='window.document.location.href="/Y_Settings_mount_liste.yhtm"'>Abbrechen</button>
+		<button type="button" ytype="cancel" title="cancel" name="abort" onClick='window.document.location.href="/Y_Settings_mount_list.yhtm"'>Abbrechen</button>
 	</form>
 	</div>
 </div>

data/y-web/Y_Settings_mount_list.yhtm

@@ -12,7 +12,7 @@ function do_mount()
 			nr = i;
 	}
 	document.f.execute.value = "script:Y_Tools domount "+nr;
-	document.f.tmpl.value = "Y_Settings_umount_liste.yhtm";
+	document.f.tmpl.value = "Y_Settings_umount_list.yhtm";
 	document.f.submit();
 }
 function do_edit()
@@ -36,7 +36,7 @@ function do_edit()
 		<input type="hidden" name="execute" value=""/>
 		<button type="button" ytype="edit" title="edit mount settings" onclick="do_edit()">&Auml;ndern</button>
 		<button type="button" ytype="no" title="mount selected directory" onclick="do_mount()">Mount</button>
-		<button type="button" ytype="no" title="view unmount list" onclick='window.document.location.href="/Y_Settings_umount_liste.yhtm"'>Unmount list</button>
+		<button type="button" ytype="no" title="view unmount list" onclick='window.document.location.href="/Y_Settings_umount_list.yhtm"'>Unmount list</button>
 	</form>
 	</div>
 </div>

data/y-web/Y_Settings_umount_list.yhtm

@@ -27,9 +27,9 @@ function do_unmount()
 	<div class="work_box_body">
 	<form action="/y/cgi" name="f" id="f">
 		{=func:umount_get_list=}
-		<input type="hidden" name="tmpl" value="/Y_Settings_umount_liste.yhtm"/>
+		<input type="hidden" name="tmpl" value="/Y_Settings_umount_list.yhtm"/>
 		<input type="button" value="Unmount" title="unmount selected directory" name="B1" onClick='do_unmount()'/>
-		<input type="button" value="Mount list" title="view mount list" name="B1" onClick='window.document.location.href="/Y_Settings_mount_liste.yhtm"'/>
+		<input type="button" value="Mount list" title="view mount list" name="B1" onClick='window.document.location.href="/Y_Settings_mount_list.yhtm"'/>
 		<input type="hidden" name="execute" value=""/>
 	</form>
 	</div>

data/y-web/Y_Settings_yWeb.yhtm

@@ -157,8 +157,10 @@ select {
 						<option value="{=var-get:_rc_ax_hd51=}">AX HD51</option>
 						<option value="{=var-get:_rc_ax_hd60=}">AX HD60</option>
 						<option value="{=var-get:_rc_ax_hd61=}">AX HD61</option>
+						<option value="{=var-get:_rc_axas_e4hd=}">E4HD 4K Ultra</option>
 						<option value="{=var-get:_rc_mutant_hd51=}">Mutant HD51</option>
 						<option value="{=var-get:_rc_mutant_hd60=}">Mutant HD60</option>
+						<option value="{=var-get:_rc_maxytec_multibox=}">Mayxtec Multibox 4K</option>
 						<option value="{=var-get:_rc_maxytec_multiboxse=}">Mayxtec Multibox SE 4K</option>
 						<option value="{=var-get:_rc_wwio_breeze4k=}">WWIO BRE2ZE 4K</option>
 						<option value="{=var-get:_rc_airdigital_zgemma_h7=}">AirDigital Zgemma H7</option>

data/y-web/Y_Timer_Edit.yhtm

@@ -5,7 +5,11 @@
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript">
 //<![CDATA[
-function my_display(id,state) {(state)?$(id).show():$(id).hide();}
+function my_display(id, state)
+{
+	(state) ? $(id).show() : $(id).hide();
+}
+
 function focusNMark()
 {
 	document.f.ad.select();
@@ -42,10 +46,8 @@ function onApidDefChange()
 }
 function onApidChange()
 {
-	if(document.f.apst.checked == true ||
+	if (document.f.apst.checked == true || document.f.apal.checked == true || document.f.apac.checked == true)
-		document.f.apal.checked == true ||
+		document.f.apcf.checked=false;
-		document.f.apac.checked == true)
-			document.f.apcf.checked=false;
 }
 function do_submit()
 {
@@ -55,10 +57,10 @@ function do_submit()
 function obj_set_select_value(_obj_name, _value)
 {
 	var _obj = document.getElementById(_obj_name);
-	if(_obj){
+	if (_obj)
-		for(i=0;i<_obj.length;i++)
+	{
-			if(_obj.options[i].value == _value)
+		for (i = 0; i < _obj.length; i++)
-			
+			if (_obj.options[i].value == _value)
 				_obj.selectedIndex=i;
 	}
 }
@@ -66,7 +68,7 @@ function init()
 {
 	onEventChange();
 	onEventChange2();
-	var rd="{=timer_recordingDir=}";
+	var rd = "{=timer_recordingDir=}";
 	obj_set_select_value("rec_dir", rd);
 }
 //]]>
@@ -170,7 +172,6 @@ function init()
 		</table>
 		<br/>
 
-<!--		<input type="button" value="speichern" title="submit and save values" onclick="do_submit()"/>-->
 		<button type="button" ytype="save" title="submit and save values" onclick="do_submit()">{=L:save=}</button>
 		<button type="button" ytype="cancel" title="cancel" onclick='window.document.location.href="/Y_Timer_List.yhtm"'>{=L:cancel=}</button>
 	</form>

data/y-web/Y_Tools_Glcd_Screenshot.yhtm

@@ -13,8 +13,8 @@ function do_snapshot() {
 	$('buttons').hide();
 	$('status').show();
 
-	var filename = "glcdscreenshot";
+	var filename = "screenshot-glcd";
-	if (id("filename").value != "") {
+	if (id('filename').value != "") {
 		filename = id("filename").value;
 	}
 
@@ -24,7 +24,7 @@ function do_snapshot() {
 }
 function do_showshot(_filename) {
 	if (_filename == "")
-		_filename = "glcdscreenshot";
+		_filename = "screenshot-glcd";
 
 	$('status').hide();
 	$('buttons').show();
@@ -60,7 +60,7 @@ function do_reload(){
 			</div>
 			<div class="right">
 				<form onsubmit="do_snapshot(); return false">
-				{=L:filename=}: <input type="text" value="glcdscreenshot" id="filename" size="10" />
+				{=L:filename=}: <input type="text" value="screenshot-glcd" id="filename" size="12" />
 				</form>
 			</div>
 			<div class="clear"></div>

data/y-web/Y_Tools_Menue.yhtm

@@ -27,14 +27,14 @@ function init(){
 					{=if-empty:{=var-get:automount=}~
 					<a href="javascript:void(0)" class="disabled" title="{=L:tools.not_installed=}">{=L:tools.automount=}</a>
 					~
-					{=var-set:m_link_href=Y_Settings_automount_liste.yhtm=}
+					{=var-set:m_link_href=Y_Settings_automount_list.yhtm=}
 					{=var-set:m_link_desc==}
 					{=var-set:m_link_text={=L:tools.automount=}=}
 					{=include-block:Y_Blocks.txt;management_link=}
 					=}
 				</li>
 				<li>
-					{=var-set:m_link_href=Y_Settings_mount_liste.yhtm=}
+					{=var-set:m_link_href=Y_Settings_mount_list.yhtm=}
 					{=var-set:m_link_desc={=L:tools.mounts_desc=}=}
 					{=var-set:m_link_text={=L:tools.mounts=}=}
 					{=include-block:Y_Blocks.txt;management_link=}

data/y-web/Y_Tools_Screenshot.yhtm

@@ -8,16 +8,22 @@
 //<![CDATA[
 var enableOSD;
 var enableVideo;
+var enablePiP;
 var interval;
 
 function checkEnable() {
 	enableOSD	= (document.getElementById('checkOSD').checked == true)		? 1 : 0;
 	enableVideo	= (document.getElementById('checkVideo').checked == true)	? 1 : 0;
+	enablePiP	= (document.getElementById('checkPiP').checked == true)		? 1 : 0;
 
 	if (enableOSD == 0 && enableVideo == 0) {
 		alert("{=L:bc.screenshot.checkenable=}");
 		return false;
 	}
+	if (enableVideo == 0 && enablePiP == 1) {
+		alert(unescape("{=L:bc.screenshot.checkpip=}"));
+		return false;
+	}
 	return true;
 }
 function rcsim(_key) {
@@ -48,12 +54,16 @@ function do_snapshot() {
 
 	if ("{=var-get:grab=}" != "")
 	{
+		var pip_opts = "";
+		if (enableVideo == 1 && enablePiP == 1)
+			pip_opts = "-x 1 ";
+
 		if (enableOSD == 1 && enableVideo == 1)
-			stb_exec_tools("fbshot grab -q -p /tmp/"+filename+".png");
+			stb_exec_tools("fbshot grab -q -p "+pip_opts+"/tmp/"+filename+".png");
+		else if (enableVideo == 1)
+			stb_exec_tools("fbshot grab -q -p -v "+pip_opts+"/tmp/"+filename+".png");
 		else if (enableOSD == 1)
 			stb_exec_tools("fbshot grab -q -p -o /tmp/"+filename+".png");
-		else if (enableVideo == 1)
-			stb_exec_tools("fbshot grab -q -p -v /tmp/"+filename+".png");
 	}
 	else if ("{=var-get:fbshot=}" != "" && enableVideo == 0)
 		stb_exec_tools("fbshot fbshot /tmp/"+filename+".png");
@@ -119,6 +129,9 @@ function do_reload(){
 				{=L:filename=}: <input type="text" value="screenshot" id="filename" size="10" />
 				OSD: <input id="checkOSD" name="checkOSD" type="checkbox" {=if-empty:{=osd=}~~checked="checked"=} />
 				TV: <input id="checkVideo" name="checkVideo" type="checkbox" {=if-empty:{=video=}~~checked="checked"=} />
+				{=if-empty:{=var-get:grab=}~~
+				PiP: <input id="checkPiP" name="checkPiP" type="checkbox" {=if-empty:{=pip=}~~checked="checked"=} />
+				=}
 				</form>
 			</div>
 			<div class="clear"></div>

data/y-web/Y_Version.txt

@@ -1,3 +1,3 @@
-version=2.9.0.60
+version=2023.2
-date=15.12.2021
+date=20.02.2023
-info=Tuxbox-Neutrino
+info=Neutrino-Webinterface

data/y-web/Y_neutrino_Blocks.txt

@@ -616,8 +616,9 @@ start-block~neutrino_form-data_diverse
 			<tr title="programtext position: left/right">
 				<td>Ausrichtung Programmtext</td>
 				<td>
-					<input type="radio" name="epgtext_align_right" value="false"/>links&nbsp;
+					<!-- FIXME -->
-					<input type="radio" name="epgtext_align_right" value="true"/>rechts
+					<input type="radio" name="channellist_epgtext_alignment" value="false"/>links&nbsp;
+					<input type="radio" name="channellist_epgtext_alignment" value="true"/>rechts
 				</td>
 			</tr>
 			<tr title="extended channellist: on/off">
@@ -729,7 +730,7 @@ function form_init()
 		document.f.infobar_show.selectedIndex = val;
 	obj_set_radio_value('radiotext', "{=ini-get:%(CONFIGDIR)/neutrino.conf;radiotext_enable;false~cache=}");
 
-	obj_set_radio_value('epgtext_align_right', "{=ini-get:%(CONFIGDIR)/neutrino.conf;channellist_epgtext_align_right;false~cache=}");
+	obj_set_radio_value('channellist_epgtext_alignment', "{=ini-get:%(CONFIGDIR)/neutrino.conf;channellist_epgtext_alignment;false~cache=}");
 	obj_set_radio_value('channellist_extended', "{=ini-get:%(CONFIGDIR)/neutrino.conf;channellist_extended;false~cache=}");
 
 	val = "{=ini-get:%(CONFIGDIR)/neutrino.conf;standby_off_with;0=}";
@@ -761,7 +762,7 @@ end-block~neutrino_form-data_diverse
 
 # ------- yWeb save Settings
 start-block~neutrino_diverse_save_settings
-{=ini-set:%(CONFIGDIR)/neutrino.conf;channellist_epgtext_align_right;{=epgtext_align_right=}~open=}
+{=ini-set:%(CONFIGDIR)/neutrino.conf;channellist_epgtext_alignment;{=channellist_epgtext_alignment=}~open=}
 {=ini-set:%(CONFIGDIR)/neutrino.conf;channellist_extended;{=channellist_extended=}~cache=}
 {=ini-set:%(CONFIGDIR)/neutrino.conf;filebrowser_showrights;{=filebrowser_showrights=}~cache=}
 {=ini-set:%(CONFIGDIR)/neutrino.conf;filebrowser_denydirectoryleave;{=filebrowser_denydirectoryleave=}~cache=}
@@ -1149,7 +1150,12 @@ end-block~neutrino_direct_recording_save_settings
 # ------- list possible directorys for records
 start-block~neutrino_list_record_dirs
 <select name="rec_dir" id="rec_dir" class="y_live_button">
-	<option value="{=ini-get:%(CONFIGDIR)/neutrino.conf;network_nfs_recordingdir~open=}" selected="selected">
+	{=if-empty:{=ini-get:%(CONFIGDIR)/timerd.conf;REC_DIR_{=tid=}~open=}~~
+	<option value="{=ini-get:%(CONFIGDIR)/timerd.conf;REC_DIR_{=tid=}~cache=}" selected="selected">
+		{=ini-get:%(CONFIGDIR)/timerd.conf;REC_DIR_{=tid=}~cache=}
+	</option>
+	=}
+	<option value="{=ini-get:%(CONFIGDIR)/neutrino.conf;network_nfs_recordingdir~open=}">
 		{=ini-get:%(CONFIGDIR)/neutrino.conf;network_nfs_recordingdir~cache=}
 	</option>
 	{=if-empty:{=ini-get:%(CONFIGDIR)/neutrino.conf;network_nfs_local_dir_0~cache=}~~

data/y-web/images/Makefile.am

@@ -1,95 +1,104 @@
-installdir = $(PRIVATE_HTTPDDIR)/images
+imagesdir = $(PRIVATE_HTTPDDIR)/images
 
-install_DATA =	accept.png \
+images_DATA = \
-		alert.gif \
+	accept.png \
-		arrowdown.png \
+	alert.gif \
-		arrowleft.png \
+	arrowdown.png \
-		arrowright.png \
+	arrowleft.png \
-		arrowup.png \
+	arrowright.png \
-		audiobar.png \
+	arrowup.png \
-		blank.gif \
+	audiobar.png \
-		check_green.png \
+	blank.png \
-		comment.png \
+	check_green.png \
-		cross.png \
+	comment.png \
-		elist.png \
+	cross.png \
-		exlink.gif \
+	elist.png \
-		fb.png \
+	exlink.gif \
-		help.gif \
+	fb.png \
-		hidden.png \
+	hidden.png \
-		info.png \
+	info.png \
-		inlink.gif \
+	inlink.gif \
-		key.png \
+	key.png \
-		live.png \
+	live.png \
-		lock.png \
+	lock.png \
-		modify.png \
+	modify.png \
-		new.png \
+	new.png \
-		ok.gif \
+	ok.gif \
-		popup.png \
+	popup.png \
-		properties.png \
+	properties.png \
-		radio.png \
+	radio.png \
-		record.png \
+	record.png \
-		reload.png \
+	reload.png \
-		remove.png \
+	remove.png \
-		rename.gif \
+	rename.gif \
-		save.png \
+	save.png \
-		saveall.png \
+	saveall.png \
-		snapshot.png \
+	snapshot.png \
-		stream.png \
+	stream.png \
-		streaminfo.png \
+	streaminfo.png \
-		time_add.png \
+	time_add.png \
-		time_down.png \
+	time_down.png \
-		time_up.png \
+	time_up.png \
-		tux-yweb.png \
+	tux-yweb.png \
-		unlock.png \
+	unlock.png \
-		visible.png \
+	visible.png \
-		vlc.png \
+	vlc.png \
-		volumedown.png \
+	volumedown.png \
-		volumemute.png \
+	volumemute.png \
-		volumeunmute.png \
+	volumeunmute.png \
-		volumeup.png \
+	volumeup.png \
-		wait.gif \
+	wait.gif \
-		webtv.png \
+	webtv.png \
-		wget.png \
+	wget.png \
-		x_red.png \
+	x_red.png \
-		zap.png
+	zap.png
-
-# remote controls
-install_DATA += rc_cst_v1.jpg \
-		rc_cst_v2.png \
-		rc_cst_v3.png \
-		rc_cst_v4.png \
-		rc_cst_v5.png \
-		rc_cst_v6.png \
-		rc_dbox_nokia_old.png \
-		rc_dbox_philips.png
-
-if ! BOXTYPE_CST
-install_DATA += rc_ax_hd51.png \
-		rc_ax_hd61.png \
-		rc_mutant_hd51.png \
-		rc_wwio_bre2ze4k.png \
-		rc_zgemma_h7.png \
-		rc_osmio4k.png \
-		rc_vuplus.png \
-		rc_mutant_hd60.png
-endif
 
 # file manager
-install_DATA +=	chmod.png \
+images_DATA += \
-		copy.gif \
+	chmod.png \
-		cut.png \
+	copy.gif \
-		dir_up.png \
+	cut.png \
-		download.png \
+	dir_up.png \
-		film.png \
+	download.png \
-		folder_add.png \
+	film.png \
-		ftype_file.png \
+	folder_add.png \
-		ftype_folder.png \
+	ftype_file.png \
-		ftype_link.png \
+	ftype_folder.png \
-		home.png \
+	ftype_link.png \
-		package.png \
+	home.png \
-		page_edit.png \
+	package.png \
-		paste.gif \
+	page_edit.png \
-		picture.png \
+	paste.gif \
-		text.png \
+	picture.png \
-		upload.png \
+	text.png \
-		work.gif
+	upload.png \
+	work.gif
+
+# remote controls
+imagesrcdir = $(PRIVATE_HTTPDDIR)/images/rc
+
+imagesrc_DATA = \
+	rc/rc_cst_v1.jpg \
+	rc/rc_cst_v2.png \
+	rc/rc_cst_v3.png \
+	rc/rc_cst_v4.png \
+	rc/rc_cst_v5.png \
+	rc/rc_cst_v6.png \
+	rc/rc_dbox_nokia_old.png \
+	rc/rc_dbox_philips.png
+
+if ! BOXTYPE_CST
+imagesrc_DATA += \
+	rc/rc_ax_hd51.png \
+	rc/rc_ax_hd61.png \
+	rc/rc_axas_e4hd.png \
+	rc/rc_mutant_hd51.png \
+	rc/rc_mutant_hd60.png \
+	rc/rc_osmio4k.png \
+	rc/rc_protek_4k_uhd.png \
+	rc/rc_vuplus.png \
+	rc/rc_wwio_bre2ze4k.png \
+	rc/rc_zgemma_h7.png
+endif
+
+