From f04236038448cce41ff2af10e2d0ccfcd8df378a Mon Sep 17 00:00:00 2001
From: Andreas Mair
Date: Fri, 7 Jul 2006 11:43:39 +0200
Subject: 2006-07-07: 3.4.6rc - Replaced: Makefiles by make.sh (run "./make.sh"
for usage information"). - Removed: LinVDR logo. - Changed: colors in
timeline. - Fixed: layout problems in prog_summary detail view (Reported by
Sven Soltau). - Fixed: moving forward/backward at the end/start of a month
(Reported by foobar42).
---
CREDITS | 1 +
HISTORY | 7 +++
INSTALL | 46 +++++++--------
Makefile | 39 -------------
README.translators | 6 +-
contrib/gentoo.rc.vdradmind | 20 -------
contrib/udpc.pl | 1 -
contrib/udpd.pl | 52 -----------------
contrib/user.css.example | 27 +++++++++
contrib/vdradmind.bl_example | 2 +
install.sh | 2 +-
locale/de/LC_MESSAGES/vdradmin.mo | Bin 62179 -> 62287 bytes
locale/es/LC_MESSAGES/vdradmin.mo | Bin 60430 -> 60430 bytes
locale/fi/LC_MESSAGES/vdradmin.mo | Bin 17673 -> 17673 bytes
locale/fr/LC_MESSAGES/vdradmin.mo | Bin 63006 -> 63006 bytes
locale/nl/LC_MESSAGES/vdradmin.mo | Bin 60035 -> 60035 bytes
locale/ru/LC_MESSAGES/vdradmin.mo | Bin 58356 -> 58356 bytes
make.sh | 97 +++++++++++++++++++++++++++++++
po/Makefile | 8 ---
po/de.po | 80 +++++++++++++------------
po/es.po | 80 +++++++++++++------------
po/fi.po | 80 +++++++++++++------------
po/fr.po | 80 +++++++++++++------------
po/nl.po | 80 +++++++++++++------------
po/ru.po | 80 +++++++++++++------------
po/vdradmin.pot | 80 +++++++++++++------------
template/default/default/logo.png | Bin 0 -> 4122 bytes
template/default/default/logo_linvdr.gif | Bin 2551 -> 0 bytes
template/default/default/logo_other.png | Bin 4122 -> 0 bytes
template/default/favicon.ico | Bin 3262 -> 0 bytes
template/default/navigation.html | 2 +-
template/default/prog_summary.html | 4 +-
template/default/prog_timeline.html | 10 +++-
template/default/style.css | 19 +++---
template/default/timeline.js | 38 +++++++-----
user.css.example | 27 ---------
vdradmind.bl_example | 2 -
vdradmind.pl | 42 +++++++------
38 files changed, 517 insertions(+), 495 deletions(-)
delete mode 100644 Makefile
delete mode 100644 contrib/gentoo.rc.vdradmind
delete mode 120000 contrib/udpc.pl
delete mode 100755 contrib/udpd.pl
create mode 100644 contrib/user.css.example
create mode 100644 contrib/vdradmind.bl_example
create mode 100755 make.sh
delete mode 100644 po/Makefile
create mode 100644 template/default/default/logo.png
delete mode 100644 template/default/default/logo_linvdr.gif
delete mode 100755 template/default/default/logo_other.png
delete mode 100644 template/default/favicon.ico
delete mode 100644 user.css.example
delete mode 100644 vdradmind.bl_example
diff --git a/CREDITS b/CREDITS
index 49cee15..2f78275 100644
--- a/CREDITS
+++ b/CREDITS
@@ -9,3 +9,4 @@ The translation team:
- Finish: Rolf Ahrenberg, Rolf.Ahrenberg@sci.fi
- French: Trois Six (also at vdrportal.de), map, lobotomise, bads
- Spanish: Rüdiger Jung, rudibert at the vdrportal.de
+- Russian: Oleg Roitburd and Allrussian-forum translation team
diff --git a/HISTORY b/HISTORY
index e687264..78be0dd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,13 @@ E-Mail: mail AT andreas DOT vdr-developer DOT org
VDR-Portal: amair
-----------------------------------------------------------
+2006-07-07: 3.4.6rc
+- Replaced: Makefiles by make.sh (run "./make.sh" for usage information").
+- Removed: LinVDR logo.
+- Changed: colors in timeline.
+- Fixed: layout problems in prog_summary detail view (Reported by Sven Soltau).
+- Fixed: moving forward/backward at the end/start of a month (Reported by foobar42).
+
2006-06-30: 3.4.6beta5
- Changed: "channels" column in timeline uses max 10% of available width.
- Fixed: programming a timer in prog_detail in FireFox.
diff --git a/INSTALL b/INSTALL
index d4ce84f..7e6d07e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -3,71 +3,67 @@
***********************************************************
1) Unpack the archive somewhere:
- $ tar xvjf vdradmin-VERSION.tar.bz2
- $ cd vdradmin-VERSION
+ $ tar xvjf vdradmin-am-VERSION.tar.bz2
+ $ cd vdradmin-am-VERSION
-2) If you want to run VDRAdmin using a language other than set on
+2) If you want to run VDRAdmin-AM using a language other than set on
your system, then before running it you have to issue:
$ export LANG=""
- Where has to be one of: de_DE, es_ES, fi_FI or fr_FR
- (en_GB is default).
+ Where has to be one of: de_DE, es_ES, fi_FI, fr_FR,
+ nl_NL or ru_RU (en_GB is default).
3) Check if your system provides all requirements and optionally install
the missing Perl modules:
$ ./install.sh -p
-4) Now you have to deside wether you want to run VDRAdmin locally (4a)
+4) Now you have to deside wether you want to run VDRAdmin-AM locally (4a)
in this directory or install it into your system (4b).
4a) run locally (=no installation)
- First you have to configure VDRAdmin. This only has to be done once.
+ First you have to configure VDRAdmin-AM. This only has to be done once.
$ ./vdradmind.pl --config
Some questions about the configuration will be asked.
- Now you're done and you can run VDRAdmin:
+ Now you're done and you can run VDRAdmin-AM:
$ ./vdradmind.pl
4b) install into system
- $ ./install.sh
-
- Now you have to configure VDRAdmin:
- $ vdradmind.pl --config
+ $ ./make.sh install
Some questions about the configuration will asked.
- Now you're done and you can run VDRAdmin:
+ Now you're done and you can run VDRAdmin-AM:
$ vdradmind.pl
-5) If you want VDRAdmin to run automatically on system boot, you have
+5) If you want VDRAdmin-AM to run automatically on system boot, you have
to add a startup script to the wanted runlevel. Please consult your
- Linux distribution's documentation. Maybe you'll also find some help
- in VDRAdmin's "contrib" directory.
+ Linux distribution's documentation.
Please also note that you might have to set the wanted language in
that startup as shown in (2).
-6) No matter how you run VDRAdmin, you now can point your browser to
+6) No matter how you run VDRAdmin-AM, you now can point your browser to
the given parameters (e.g. http://localhost:8001).
***********************************************************
-*** Removing VDRAdmin from your system ***
+*** Removing VDRAdmin-AM from your system ***
***********************************************************
1) Uninstall depends on the kind of installation you did:
1a) run locally (=no installation)
There is not much to do.
- Simply remove to folder VDRAdmin has been created while unpacking:
- $ rm -rf vdradmin-VERSION.tar.bz2
+ Simply remove to folder VDRAdmin-AM has been created while unpacking:
+ $ rm -rf vdradmin-am-VERSION.tar.bz2
1b) installed to your system
- You need the unpacked VDRAdmin archive. Enter it and run uninstall.sh:
- $ cd vdradmin-VERSION.tar.bz2
- $ ./uninstall.sh
+ You need the unpacked VDRAdmin-AM archive. Enter it and run uninstall.sh:
+ $ cd vdradmin-am-VERSION.tar.bz2
+ $ ./make.sh uninstall
- You might want to delete your VDRAdmin's configuration files:
+ You might want to delete your VDRAdmin-AM's configuration files:
$ rm -rf /etc/vdradmin
This of course only works if you didn't change the default install
@@ -80,7 +76,7 @@
***********************************************************
-*** Hide VDRAdmin behind apache ***
+*** Hide VDRAdmin-AM behind apache ***
***********************************************************
you will need apache with mod_proxy and these lines in httpd.conf:
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 5c9d879..0000000
--- a/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-DESTDIR=
-LIBDIR=/usr/share/vdradmin
-ETCDIR=/etc/vdradmin
-DOCDIR=/usr/share/doc/vdradmin
-BINDIR=/usr/bin
-LOCDIR=/usr/share/locale/
-MANDIR=/usr/share/man/man1/
-LOGDIR=/var/log
-PIDFILE=/var/run/vdradmind.pid
-VIDEODIR=/video
-EPGIMAGES=$(VIDEODIR)/epgimages
-VDRCONF=$(VIDEODIR)
-EPGDATA=$(VIDEODIR)/epg.data
-
-LANGS=de es fr fi nl ru
-
-po/build_stamp:
- $(MAKE) -C po LANGS="$(LANGS)"
- for lang in $(LANGS); do \
- [ ! -d locale/$$lang/LC_MESSAGES/ ] && mkdir -p locale/$$lang/LC_MESSAGES/; \
- install -m 644 po/$$lang.mo locale/$$lang/LC_MESSAGES/vdradmin.mo; \
- done
-
-all: po/build_stamp
- touch build_stamp
-
-clean:
- $(MAKE) -C po clean
- -rm -f build_stamp
-
-distclean: clean
- rm -f vdradmind.conf vdradmind.at vdradmind.bl vdradmind.done vdradmind.pid vdradmind.log
-
-install:
- @./install.sh -c
-
-uninstall:
- @./uninstall.sh
-
diff --git a/README.translators b/README.translators
index 2693a89..18c4c1c 100644
--- a/README.translators
+++ b/README.translators
@@ -1,4 +1,4 @@
-VDRAdmin-am translators guide
+VDRAdmin-AM translators guide
==============================
Since vdradmin-0.97-am3.2 almost every text has been extracted from the
@@ -53,7 +53,7 @@ The basic work flow for a translation looks like this:
a new *.mo-file from your changed *.po-file.
Please note, that you have to restart vdradmind.pl after any changes you
- make to the translation. In order to allow vdradmin to select your language,
+ make to the translation. In order to allow VDRAdmin-AM to select your language,
you must have the appropriate locales installed on your system (see
`locale -a`). You should make sure, that the correct locale is selected
with the LANG and LC_* environemt variables.
@@ -62,7 +62,7 @@ The basic work flow for a translation looks like this:
mail AT andreas DOT vdr-developer DOT org
-6) When changes have been made to vdradmin-am, that cause some messages to
+6) When changes have been made to VDRAdmin-AM, that cause some messages to
change, the *.po-files will by modified and we will send them to the
translators. The process then starts with 2) again and we will include your
new translation with the next release.
diff --git a/contrib/gentoo.rc.vdradmind b/contrib/gentoo.rc.vdradmind
deleted file mode 100644
index b0f8fb5..0000000
--- a/contrib/gentoo.rc.vdradmind
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /cvsroot/gentoo-deutsch/ebuilds/net-www/vdradmind/files/rc.vdradmind,v 1.2 2003/05/26 20:06:22 mad Exp $
-
-depend() {
- need vdr
-}
-
-start() {
- ebegin "Starting vdradmind"
- /usr/bin/vdradmind.pl
- eend $?
-}
-
-stop() {
- ebegin "Stopping vdradmind"
- start-stop-daemon --stop --quiet --pidfile /var/run/vdradmind.pid
- eend $?
-}
diff --git a/contrib/udpc.pl b/contrib/udpc.pl
deleted file mode 120000
index 7888567..0000000
--- a/contrib/udpc.pl
+++ /dev/null
@@ -1 +0,0 @@
-udpd.pl
\ No newline at end of file
diff --git a/contrib/udpd.pl b/contrib/udpd.pl
deleted file mode 100755
index c4a38f1..0000000
--- a/contrib/udpd.pl
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/perl
-
-##
-# Simple UDP Server/Client to display messages in VDR
-#
-# 22.02.2004 by Thomas Koch
-##
-
-use IO::Socket;
-use IO::Socket::INET 1.26;
-use strict;
-
-my $myself = join("", $0 =~ /^.*\/(.*)/);
-
-# Server
-if($myself eq "udpd.pl") {
- my $pid = fork();
- if($pid != 0) {
- exit(0);
- }
- my($Socket) = IO::Socket::INET->new(
- Proto => 'udp',
- LocalPort => 4711,
- Reuse => 1
- ) || die;
- my $message;
- while($Socket->recv($message, 1024)) {
- my($port, $ipaddr) = sockaddr_in($Socket->peername);
- my $hishost = gethostbyaddr($ipaddr, AF_INET);
- system("logger udpd: client $hishost with message \\'$message\\'");
- for(my $z = 0; $z < 3; $z++) {
- for(my $i = 0; $i < 3; $i++) {
- system("svdrpsend.pl mesg $message 2>/dev/null >/dev/null");
- }
- sleep(3);
- }
- }
- exit(0);
-}
-
-# Client
-if($myself eq "udpc.pl") {
- my $message = join(" ", @ARGV);
- my $Socket = IO::Socket::INET->new(
- PeerAddr => inet_ntoa(INADDR_BROADCAST),
- PeerPort => 4711,
- Proto => 'udp',
- Broadcast => 1
- ) || die;
- my $result = $Socket->send($message);
-}
-
diff --git a/contrib/user.css.example b/contrib/user.css.example
new file mode 100644
index 0000000..7e212b2
--- /dev/null
+++ b/contrib/user.css.example
@@ -0,0 +1,27 @@
+/* The user.css is mainly an example to demonstrate the possibilities */
+
+/*
+ Disable items in navigation bar.
+ For valid ids read navigation.html.
+*/
+#rc {
+ display: none;
+}
+#tv {
+ display: none;
+}
+
+/*
+ Disable action icons.
+ e.g.: close, switch, record, imdb, info, stream
+*/
+/* disable info and stream buttons in lists */
+.list .action.info,
+.list .action.stream {
+ display: none;
+}
+
+/* Disable scrollbars in prog_summary detail view. */
+#prog_summary .epg_summary {
+ overflow: auto;
+}
diff --git a/contrib/vdradmind.bl_example b/contrib/vdradmind.bl_example
new file mode 100644
index 0000000..3791048
--- /dev/null
+++ b/contrib/vdradmind.bl_example
@@ -0,0 +1,2 @@
+Dr. Stefan Frank: Der Arzt, dem die Frauen vertrauen
+Der Prinz von Bel-Air
diff --git a/install.sh b/install.sh
index 8201898..bbd9922 100755
--- a/install.sh
+++ b/install.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (c) 2005 Andreas Mair
+# Copyright (c) 2005/6 Andreas Mair
#
#
# Download and patchscript for VDRAdmin-AM
diff --git a/locale/de/LC_MESSAGES/vdradmin.mo b/locale/de/LC_MESSAGES/vdradmin.mo
index 22a78a7..f75b3c8 100644
Binary files a/locale/de/LC_MESSAGES/vdradmin.mo and b/locale/de/LC_MESSAGES/vdradmin.mo differ
diff --git a/locale/es/LC_MESSAGES/vdradmin.mo b/locale/es/LC_MESSAGES/vdradmin.mo
index 8333cd6..b1efe6a 100644
Binary files a/locale/es/LC_MESSAGES/vdradmin.mo and b/locale/es/LC_MESSAGES/vdradmin.mo differ
diff --git a/locale/fi/LC_MESSAGES/vdradmin.mo b/locale/fi/LC_MESSAGES/vdradmin.mo
index 315f5d5..3f3e746 100644
Binary files a/locale/fi/LC_MESSAGES/vdradmin.mo and b/locale/fi/LC_MESSAGES/vdradmin.mo differ
diff --git a/locale/fr/LC_MESSAGES/vdradmin.mo b/locale/fr/LC_MESSAGES/vdradmin.mo
index 00ab1e6..0486829 100644
Binary files a/locale/fr/LC_MESSAGES/vdradmin.mo and b/locale/fr/LC_MESSAGES/vdradmin.mo differ
diff --git a/locale/nl/LC_MESSAGES/vdradmin.mo b/locale/nl/LC_MESSAGES/vdradmin.mo
index 5c2885a..b6c78d9 100644
Binary files a/locale/nl/LC_MESSAGES/vdradmin.mo and b/locale/nl/LC_MESSAGES/vdradmin.mo differ
diff --git a/locale/ru/LC_MESSAGES/vdradmin.mo b/locale/ru/LC_MESSAGES/vdradmin.mo
index f3c1623..7c0d70c 100644
Binary files a/locale/ru/LC_MESSAGES/vdradmin.mo and b/locale/ru/LC_MESSAGES/vdradmin.mo differ
diff --git a/make.sh b/make.sh
new file mode 100755
index 0000000..545e2c3
--- /dev/null
+++ b/make.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+LANGS="de es fr fi nl ru"
+DIST_FILES="COPYING CREDITS FAQ HISTORY INSTALL README README.translators REQUIREMENTS contrib convert.pl install.sh lib locale make.sh template uninstall.sh vdradmind.pl vdradmind.pl.1"
+INSTALL_SH=./install.sh
+TMPDIR=/tmp
+
+#TODO:
+# - dist / distclean / clean
+
+function Usage()
+{
+ echo "Usage: $0 cvs"
+ echo " cvs - always use this after a \"cvs update \" or \"cvs checkout\""
+ echo " install - install VDRAdmin-AM"
+ echo " uninstall - uninstall VDRAdmin-AM"
+ echo " po - convert .po files to .mo files"
+ echo " dist - create distribution archive"
+ exit 1
+}
+
+function Error()
+{
+ [ "$1" ] && echo $*
+ exit 1
+}
+
+function do_po()
+{
+ for L in $LANGS
+ do
+ [ -d locale/$L/LC_MESSAGES/ ] || mkdir -p locale/$L/LC_MESSAGES/
+ msgfmt po/$L.po -o po/$L.mo
+ install -m 644 po/$L.mo locale/$L/LC_MESSAGES/vdradmin.mo
+ done
+}
+
+function do_cvs()
+{
+ # Create missing symbolic links
+ [ -e uninstall.sh ] || ln -s install.sh uninstall.sh
+ [ -e README ] || ln -s INSTALL README
+}
+
+function getVersion()
+{
+ grep "^my \$VERSION" vdradmind.pl | sed -e 's/^[^\"]*\"\([^\"]*\)\".*$/\1/'
+}
+
+function do_dist()
+{
+ local DIST_NAME=vdradmin-am-$(getVersion)
+ mkdir -p $TMPDIR/$DIST_NAME
+ cp -a $DIST_FILES $TMPDIR/$DIST_NAME
+ mkdir -p $TMPDIR/$DIST_NAME/po
+ cp -a po/*.po po/*.pot $TMPDIR/$DIST_NAME/po
+ (
+ cd $TMPDIR
+ tar --exclude CVS -cjf $DIST_NAME.tar.bz2 $DIST_NAME
+ rm -rf $TMPDIR/$DIST_NAME
+ )
+ mv $TMPDIR/$DIST_NAME.tar.bz2 .
+}
+
+[ "$1" ] || Usage
+[ -x $INSTALL_SH ] || Error "$INSTALL_SH not found!"
+
+while [ $1 ]
+do
+ case $1 in
+ cvs)
+ do_cvs
+ ;;
+
+ install)
+ $INSTALL_SH -c
+ ;;
+
+ uninstall)
+ $INSTALL_SH -u
+ ;;
+
+ po)
+ do_po
+ ;;
+
+ dist)
+ do_dist
+ ;;
+
+ *)
+ Error "Unknown command \"$1\""
+ ;;
+ esac
+ shift
+done
+
diff --git a/po/Makefile b/po/Makefile
deleted file mode 100644
index 3fa2aa8..0000000
--- a/po/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-all: $(LANGS)
-
-$(LANGS):
- msgfmt $@.po -o $@.mo
-
-clean:
- -rm -f *.mo
- -rm -f build_stamp
diff --git a/po/de.po b/po/de.po
index 0525b34..4ca9189 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDRAdmin-AM-3.4.6\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-30 14:22+0200\n"
+"POT-Creation-Date: 2006-07-07 08:42+0200\n"
"PO-Revision-Date: 2006-03-30 14:49+0100\n"
"Last-Translator: Andreas Mair \n"
"Language-Team: \n"
@@ -145,43 +145,43 @@ msgid "Day Of Recording:"
msgstr "Tag der Aufnahme:"
#: ../template/default/timer_new.html:92
-#: ../template/default/prog_timeline.html:79
+#: ../template/default/prog_timeline.html:80
#: ../template/default/at_timer_new.html:62
msgid "Monday"
msgstr "Montag"
#: ../template/default/timer_new.html:93
-#: ../template/default/prog_timeline.html:80
+#: ../template/default/prog_timeline.html:81
#: ../template/default/at_timer_new.html:63
msgid "Tuesday"
msgstr "Dienstag"
#: ../template/default/timer_new.html:94
-#: ../template/default/prog_timeline.html:81
+#: ../template/default/prog_timeline.html:82
#: ../template/default/at_timer_new.html:64
msgid "Wednesday"
msgstr "Mittwoch"
#: ../template/default/timer_new.html:95
-#: ../template/default/prog_timeline.html:82
+#: ../template/default/prog_timeline.html:83
#: ../template/default/at_timer_new.html:65
msgid "Thursday"
msgstr "Donnerstag"
#: ../template/default/timer_new.html:96
-#: ../template/default/prog_timeline.html:83
+#: ../template/default/prog_timeline.html:84
#: ../template/default/at_timer_new.html:66
msgid "Friday"
msgstr "Freitag"
#: ../template/default/timer_new.html:97
-#: ../template/default/prog_timeline.html:84
+#: ../template/default/prog_timeline.html:85
#: ../template/default/at_timer_new.html:67
msgid "Saturday"
msgstr "Samstag"
#: ../template/default/timer_new.html:98
-#: ../template/default/prog_timeline.html:78
+#: ../template/default/prog_timeline.html:79
#: ../template/default/at_timer_new.html:68
msgid "Sunday"
msgstr "Sonntag"
@@ -194,14 +194,14 @@ msgstr "Startzeit:"
#: ../template/default/timer_new.html:107
#: ../template/default/timer_new.html:119
#: ../template/default/prog_summary.html:33
-#: ../template/default/prog_timeline.html:76
-#: ../template/default/prog_timeline.html:187
-#: ../template/default/prog_timeline.html:202
+#: ../template/default/prog_timeline.html:77
+#: ../template/default/prog_timeline.html:188
+#: ../template/default/prog_timeline.html:203
#: ../template/default/prog_list2.html:31
#: ../template/default/at_timer_new.html:88
#: ../template/default/at_timer_new.html:97
-#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133
-#: ../vdradmind.pl:4147
+#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4146
+#: ../vdradmind.pl:4160
msgid "o'clock"
msgstr "Uhr"
@@ -390,25 +390,25 @@ msgstr "Ausgew
#: ../template/default/prog_summary.html:7
#: ../template/default/navigation.html:29
-#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4759
+#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4772
msgid "What's On Now?"
msgstr "Was läuft jetzt?"
#: ../template/default/prog_summary.html:27
-#: ../template/default/prog_timeline.html:190
+#: ../template/default/prog_timeline.html:191
#: ../template/default/prog_summary2.html:27
msgid "What's on:"
msgstr "Was läuft:"
#: ../template/default/prog_summary.html:33
-#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133
+#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4146
msgid "at"
msgstr "um"
#: ../template/default/prog_summary.html:47
#: ../template/default/prog_list.html:6 ../template/default/prog_list2.html:53
#: ../template/default/navigation.html:38
-#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4759
+#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4772
msgid "Channels"
msgstr "Programmübersicht"
@@ -552,7 +552,7 @@ msgstr "Gast Passwort:"
#: ../template/default/config.html:151 ../template/default/help_config.html:30
#: ../template/default/help_config.html:78
#: ../template/default/prog_timeline.html:7
-#: ../template/default/navigation.html:35 ../vdradmind.pl:4759
+#: ../template/default/navigation.html:35 ../vdradmind.pl:4772
msgid "Timeline"
msgstr "Zeitleiste"
@@ -752,12 +752,12 @@ msgid "Apply"
msgstr "Anwenden"
#: ../template/default/timer_list.html:27
-#: ../template/default/prog_timeline.html:131
+#: ../template/default/prog_timeline.html:132
msgid "Duration:"
msgstr "Dauer:"
#: ../template/default/timer_list.html:27
-#: ../template/default/prog_timeline.html:132
+#: ../template/default/prog_timeline.html:133
msgid "min"
msgstr "min"
@@ -899,7 +899,7 @@ msgstr "Beschreibung:"
#: ../template/default/rec_list.html:6 ../template/default/rec_list.html:17
#: ../template/default/help_rec_list.html:6
#: ../template/default/help_rec_list.html:17
-#: ../template/default/navigation.html:47 ../vdradmind.pl:4759
+#: ../template/default/navigation.html:47 ../vdradmind.pl:4772
msgid "Recordings"
msgstr "Aufnahmen"
@@ -1382,20 +1382,24 @@ msgstr ""
" "
"angeklickt werden.