diff options
author | Andreas Mair <amair.sob@googlemail.com> | 2006-07-07 11:43:39 +0200 |
---|---|---|
committer | Andreas Mair <amair.sob@googlemail.com> | 2006-07-07 11:43:39 +0200 |
commit | f04236038448cce41ff2af10e2d0ccfcd8df378a (patch) | |
tree | 33979f482e9c11cf86a0ba10c3d0ed47a1e3d1a4 | |
parent | ada389d94b34bfef75be700a6cb4e3f05ee102ff (diff) | |
download | vdradmin-am-3.4.6rc.tar.gz vdradmin-am-3.4.6rc.tar.bz2 |
2006-07-07: 3.4.6rcv3.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).
-rw-r--r-- | CREDITS | 1 | ||||
-rw-r--r-- | HISTORY | 7 | ||||
-rw-r--r-- | INSTALL | 46 | ||||
-rw-r--r-- | Makefile | 39 | ||||
-rw-r--r-- | README.translators | 6 | ||||
-rw-r--r-- | contrib/gentoo.rc.vdradmind | 20 | ||||
l--------- | contrib/udpc.pl | 1 | ||||
-rwxr-xr-x | contrib/udpd.pl | 52 | ||||
-rw-r--r-- | contrib/user.css.example (renamed from user.css.example) | 0 | ||||
-rw-r--r-- | contrib/vdradmind.bl_example (renamed from vdradmind.bl_example) | 0 | ||||
-rwxr-xr-x | install.sh | 2 | ||||
-rw-r--r-- | locale/de/LC_MESSAGES/vdradmin.mo | bin | 62179 -> 62287 bytes | |||
-rw-r--r-- | locale/es/LC_MESSAGES/vdradmin.mo | bin | 60430 -> 60430 bytes | |||
-rw-r--r-- | locale/fi/LC_MESSAGES/vdradmin.mo | bin | 17673 -> 17673 bytes | |||
-rw-r--r-- | locale/fr/LC_MESSAGES/vdradmin.mo | bin | 63006 -> 63006 bytes | |||
-rw-r--r-- | locale/nl/LC_MESSAGES/vdradmin.mo | bin | 60035 -> 60035 bytes | |||
-rw-r--r-- | locale/ru/LC_MESSAGES/vdradmin.mo | bin | 58356 -> 58356 bytes | |||
-rwxr-xr-x | make.sh | 97 | ||||
-rw-r--r-- | po/Makefile | 8 | ||||
-rw-r--r-- | po/de.po | 80 | ||||
-rw-r--r-- | po/es.po | 80 | ||||
-rw-r--r-- | po/fi.po | 80 | ||||
-rw-r--r-- | po/fr.po | 80 | ||||
-rw-r--r-- | po/nl.po | 80 | ||||
-rw-r--r-- | po/ru.po | 80 | ||||
-rw-r--r-- | po/vdradmin.pot | 80 | ||||
-rw-r--r--[-rwxr-xr-x] | template/default/default/logo.png (renamed from template/default/default/logo_other.png) | bin | 4122 -> 4122 bytes | |||
-rw-r--r-- | template/default/default/logo_linvdr.gif | bin | 2551 -> 0 bytes | |||
-rw-r--r-- | template/default/favicon.ico | bin | 3262 -> 0 bytes | |||
-rw-r--r-- | template/default/navigation.html | 2 | ||||
-rw-r--r-- | template/default/prog_summary.html | 4 | ||||
-rw-r--r-- | template/default/prog_timeline.html | 10 | ||||
-rw-r--r-- | template/default/style.css | 19 | ||||
-rw-r--r-- | template/default/timeline.js | 38 | ||||
-rwxr-xr-x | vdradmind.pl | 42 |
35 files changed, 488 insertions, 466 deletions
@@ -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 @@ -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. @@ -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="<language code>" - Where <language code> has to be one of: de_DE, es_ES, fi_FI or fr_FR - (en_GB is default). + Where <language code> 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 <tom at linvdr dot org> -## - -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/user.css.example b/contrib/user.css.example index 7e212b2..7e212b2 100644 --- a/user.css.example +++ b/contrib/user.css.example diff --git a/vdradmind.bl_example b/contrib/vdradmind.bl_example index 3791048..3791048 100644 --- a/vdradmind.bl_example +++ b/contrib/vdradmind.bl_example @@ -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 Binary files differindex 22a78a7..f75b3c8 100644 --- a/locale/de/LC_MESSAGES/vdradmin.mo +++ b/locale/de/LC_MESSAGES/vdradmin.mo diff --git a/locale/es/LC_MESSAGES/vdradmin.mo b/locale/es/LC_MESSAGES/vdradmin.mo Binary files differindex 8333cd6..b1efe6a 100644 --- a/locale/es/LC_MESSAGES/vdradmin.mo +++ b/locale/es/LC_MESSAGES/vdradmin.mo diff --git a/locale/fi/LC_MESSAGES/vdradmin.mo b/locale/fi/LC_MESSAGES/vdradmin.mo Binary files differindex 315f5d5..3f3e746 100644 --- a/locale/fi/LC_MESSAGES/vdradmin.mo +++ b/locale/fi/LC_MESSAGES/vdradmin.mo diff --git a/locale/fr/LC_MESSAGES/vdradmin.mo b/locale/fr/LC_MESSAGES/vdradmin.mo Binary files differindex 00ab1e6..0486829 100644 --- a/locale/fr/LC_MESSAGES/vdradmin.mo +++ b/locale/fr/LC_MESSAGES/vdradmin.mo diff --git a/locale/nl/LC_MESSAGES/vdradmin.mo b/locale/nl/LC_MESSAGES/vdradmin.mo Binary files differindex 5c2885a..b6c78d9 100644 --- a/locale/nl/LC_MESSAGES/vdradmin.mo +++ b/locale/nl/LC_MESSAGES/vdradmin.mo diff --git a/locale/ru/LC_MESSAGES/vdradmin.mo b/locale/ru/LC_MESSAGES/vdradmin.mo Binary files differindex f3c1623..7c0d70c 100644 --- a/locale/ru/LC_MESSAGES/vdradmin.mo +++ b/locale/ru/LC_MESSAGES/vdradmin.mo @@ -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 @@ -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 <mail@andreas.vdr-developer.org>\n" "Language-Team: <LL.org>\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ählte Timer wirklich löschen?" #: ../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 "" "<input type=\"submit\" class=\"submit\" value=\"<<<<<\"/> " "angeklickt werden.</p>" -#: ../template/default/prog_timeline.html:75 -#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4118 +#: ../template/default/prog_timeline.html:76 +#: ../template/default/prog_timeline.html:195 ../vdradmind.pl:4131 msgid "now" msgstr "jetzt" -#: ../template/default/prog_timeline.html:77 +#: ../template/default/prog_timeline.html:78 msgid "to" msgstr "bis" -#: ../template/default/prog_timeline.html:200 +#: ../template/default/prog_timeline.html:201 msgid "at:" msgstr "um:" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2785 +#: ../template/default/prog_timeline.html:216 +msgid "You need JavaScript to use the timeline!" +msgstr "FÃr die Zeitleiste muss JavaScript aktiviert sein!" + +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2798 msgid "Playing Today" msgstr "Was läuft heute" @@ -2017,7 +2021,7 @@ msgstr "Abgelegt in" msgid "No matches found!" msgstr "Nicht gefunden" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4759 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4772 msgid "Playing Today?" msgstr "Was läuft heute?" @@ -2250,48 +2254,48 @@ msgstr "Fehler beim Senden eines Kommandos zu %s" msgid "Can't find EPG entry!" msgstr "EPG-Eintrag wurde nicht gefunden!" -#: ../vdradmind.pl:2785 +#: ../vdradmind.pl:2798 msgid "Playing Tomorrow" msgstr "Was läuft morgen" -#: ../vdradmind.pl:2785 +#: ../vdradmind.pl:2798 #, perl-format msgid "Playing on the %s" msgstr "Was läuft am %s" -#: ../vdradmind.pl:4123 +#: ../vdradmind.pl:4136 msgid "next" msgstr "als nächstes" -#: ../vdradmind.pl:4142 +#: ../vdradmind.pl:4155 msgid "What's on after" msgstr "Was läuft nach" -#: ../vdradmind.pl:4142 +#: ../vdradmind.pl:4155 msgid "What's on at" msgstr "Was läuft um" -#: ../vdradmind.pl:4147 +#: ../vdradmind.pl:4160 msgid "Suitable matches for:" msgstr "Suchergebnis für" -#: ../vdradmind.pl:4149 +#: ../vdradmind.pl:4162 msgid "short view" msgstr "Listenansicht" -#: ../vdradmind.pl:4149 +#: ../vdradmind.pl:4162 msgid "long view" msgstr "Ausführliche Ansicht" -#: ../vdradmind.pl:4206 +#: ../vdradmind.pl:4219 msgid "Schedule" msgstr "Übersicht" -#: ../vdradmind.pl:4759 +#: ../vdradmind.pl:4772 msgid "Timers" msgstr "Timer" -#: ../vdradmind.pl:4827 +#: ../vdradmind.pl:4840 msgid "System default" msgstr "Systemstandard" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.2\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-06-27 18:39+0100\n" "Last-Translator: Rudibert <jung.ruediger@gmail.com>\n" "Language-Team: Rudi <LL.org>\n" @@ -149,43 +149,43 @@ msgid "Day Of Recording:" msgstr "Día de la grabación:" #: ../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 "Lunes" #: ../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 "Martes" #: ../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 "Miércoles" #: ../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 "Jueves" #: ../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 "Viernes" #: ../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 "Sábado" #: ../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 "Domingo" @@ -198,14 +198,14 @@ msgstr "Comienzo:" #: ../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 "h." @@ -395,25 +395,25 @@ msgstr "¿Estas seguro de que deseas borrar las programaciones elegidas?" #: ../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 "Estrenos ahora" #: ../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 "Se puede ver:" #: ../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 " a la/s:" #: ../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 "EPG por emisoras" @@ -557,7 +557,7 @@ msgstr "Contraseña como invitado:" #: ../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 "Tabla de tiempo" @@ -758,12 +758,12 @@ msgid "Apply" msgstr "Establecer" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:131 +#: ../template/default/prog_timeline.html:132 msgid "Duration:" msgstr "Duración:" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:132 +#: ../template/default/prog_timeline.html:133 msgid "min" msgstr "min" @@ -905,7 +905,7 @@ msgstr "Resumen:" #: ../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 "Grabaciones" @@ -1382,20 +1382,24 @@ msgstr "" "\"submit\" class=\"submit\" value=\">>>>>\"/>. Para desmarcar " "emisoras funcciona viceversa.</p>" -#: ../template/default/prog_timeline.html:75 -#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4118 +#: ../template/default/prog_timeline.html:76 +#: ../template/default/prog_timeline.html:195 ../vdradmind.pl:4131 msgid "now" msgstr "ahora" -#: ../template/default/prog_timeline.html:77 +#: ../template/default/prog_timeline.html:78 msgid "to" msgstr "hasta" -#: ../template/default/prog_timeline.html:200 +#: ../template/default/prog_timeline.html:201 msgid "at:" msgstr " a la/s:" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2785 +#: ../template/default/prog_timeline.html:216 +msgid "You need JavaScript to use the timeline!" +msgstr "" + +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2798 msgid "Playing Today" msgstr "Estrenos hoy" @@ -2046,7 +2050,7 @@ msgstr "Guardado en" msgid "No matches found!" msgstr "Nada igual encontrado!" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4759 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4772 msgid "Playing Today?" msgstr "¿Estrenos hoy?" @@ -2277,48 +2281,48 @@ msgstr "Error mientras mandó el orden a %s " msgid "Can't find EPG entry!" msgstr "No se encuentra el registro en la EPG!" -#: ../vdradmind.pl:2785 +#: ../vdradmind.pl:2798 msgid "Playing Tomorrow" msgstr "Estrenos mañana" -#: ../vdradmind.pl:2785 +#: ../vdradmind.pl:2798 #, perl-format msgid "Playing on the %s" msgstr "Estrenos en %s" -#: ../vdradmind.pl:4123 +#: ../vdradmind.pl:4136 msgid "next" msgstr "próximo" -#: ../vdradmind.pl:4142 +#: ../vdradmind.pl:4155 msgid "What's on after" msgstr "Se puede ver después:" -#: ../vdradmind.pl:4142 +#: ../vdradmind.pl:4155 msgid "What's on at" msgstr "Se puede ver a la/s:" -#: ../vdradmind.pl:4147 +#: ../vdradmind.pl:4160 msgid "Suitable matches for:" msgstr "Emparejamientos convenientes para:" -#: ../vdradmind.pl:4149 +#: ../vdradmind.pl:4162 msgid "short view" msgstr "Vista rapida" -#: ../vdradmind.pl:4149 +#: ../vdradmind.pl:4162 msgid "long view" msgstr "Vista detallada" -#: ../vdradmind.pl:4206 +#: ../vdradmind.pl:4219 msgid "Schedule" msgstr "Vista general" -#: ../vdradmind.pl:4759 +#: ../vdradmind.pl:4772 msgid "Timers" msgstr "Programaciones" -#: ../vdradmind.pl:4827 +#: ../vdradmind.pl:4840 msgid "System default" msgstr "Defecto del sistema" @@ -7,7 +7,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-06-26 12:36+0200\n" "Last-Translator: Rofa\n" "Language-Team: Suomi\n" @@ -137,43 +137,43 @@ msgid "Day Of Recording:" msgstr "Päivä:" #: ../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 "Maanantai" #: ../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 "Tiistai" #: ../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 "Keskiviikko" #: ../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 "Torstai" #: ../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 "Perjantai" #: ../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 "Lauantai" #: ../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 "Sunnuntai" @@ -186,14 +186,14 @@ msgstr "Aloitusaika:" #: ../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 " " @@ -379,25 +379,25 @@ msgstr "Poistetaanko valitut ajastimet?" #: ../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 "Menossa nyt" #: ../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 "Menossa" #: ../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 " " #: ../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 "Kanavat" @@ -541,7 +541,7 @@ msgstr "Vierailijan salasana:" #: ../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 "Aikajana" @@ -741,12 +741,12 @@ msgid "Apply" msgstr "Käytä" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:131 +#: ../template/default/prog_timeline.html:132 msgid "Duration:" msgstr "Kesto:" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:132 +#: ../template/default/prog_timeline.html:133 msgid "min" msgstr "min" @@ -888,7 +888,7 @@ msgstr "Kuvaus:" #: ../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 "Tallenteet" @@ -1255,20 +1255,24 @@ msgid "" "<input type=\"submit\" class=\"submit\" value=\"<<<<<\"/>.</p>" msgstr "" -#: ../template/default/prog_timeline.html:75 -#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4118 +#: ../template/default/prog_timeline.html:76 +#: ../template/default/prog_timeline.html:195 ../vdradmind.pl:4131 msgid "now" msgstr "nyt" -#: ../template/default/prog_timeline.html:77 +#: ../template/default/prog_timeline.html:78 msgid "to" msgstr "-" -#: ../template/default/prog_timeline.html:200 +#: ../template/default/prog_timeline.html:201 msgid "at:" msgstr "kello:" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2785 +#: ../template/default/prog_timeline.html:216 +msgid "You need JavaScript to use the timeline!" +msgstr "" + +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2798 msgid "Playing Today" msgstr "Ohjelmisto tänään" @@ -1682,7 +1686,7 @@ msgstr "Tallennehakemisto" msgid "No matches found!" msgstr "Ei löytynyt yhtään hakutulosta!" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4759 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4772 msgid "Playing Today?" msgstr "Tänään" @@ -1910,47 +1914,47 @@ msgstr "Komennon lähetys VDR:lle epäonnistui (%s)" msgid "Can't find EPG entry!" msgstr "Ohjelman tietoja ei löydy ohjelmaoppaasta!" -#: ../vdradmind.pl:2785 +#: ../vdradmind.pl:2798 msgid "Playing Tomorrow" msgstr "Ohjelmisto huomenna" -#: ../vdradmind.pl:2785 +#: ../vdradmind.pl:2798 #, perl-format msgid "Playing on the %s" msgstr "Ohjelmisto %d päivä" -#: ../vdradmind.pl:4123 +#: ../vdradmind.pl:4136 msgid "next" msgstr "seuraavaksi" -#: ../vdradmind.pl:4142 +#: ../vdradmind.pl:4155 msgid "What's on after" msgstr "Menossa seuraavaksi" -#: ../vdradmind.pl:4142 +#: ../vdradmind.pl:4155 msgid "What's on at" msgstr "Menossa" -#: ../vdradmind.pl:4147 +#: ../vdradmind.pl:4160 msgid "Suitable matches for:" msgstr "Hakutulokset termille:" -#: ../vdradmind.pl:4149 +#: ../vdradmind.pl:4162 msgid "short view" msgstr "lyhyt näkymä" -#: ../vdradmind.pl:4149 +#: ../vdradmind.pl:4162 msgid "long view" msgstr "pitkä näkymä" -#: ../vdradmind.pl:4206 +#: ../vdradmind.pl:4219 msgid "Schedule" msgstr "Ohjelmisto" -#: ../vdradmind.pl:4759 +#: ../vdradmind.pl:4772 msgid "Timers" msgstr "Ajastimet" -#: ../vdradmind.pl:4827 +#: ../vdradmind.pl:4840 msgid "System default" msgstr "Oletus" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.4\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-05-21 00:34+0100\n" "Last-Translator: NIVAL Michaël <mnival@club-internet.fr>\n" "Language-Team: Trois Six <trois.six@free.fr>\n" @@ -134,43 +134,43 @@ msgid "Day Of Recording:" msgstr "Jour d'Enregistrement :" #: ../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 "Lundi" #: ../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 "Mardi" #: ../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 "Mercredi" #: ../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 "Jeudi" #: ../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 "Vendredi" #: ../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 "Samedi" #: ../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 "Dimanche" @@ -183,14 +183,14 @@ msgstr "Heure De Début :" #: ../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 "Heure" @@ -378,25 +378,25 @@ msgstr "Supprimer Programmations Sélectionnées ?" #: ../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 "En ce Moment ?" #: ../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 "En ce moment :" #: ../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 "à" #: ../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 "Chaînes" @@ -540,7 +540,7 @@ msgstr "Mot de Passe Invité :" #: ../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 "Chronologie" @@ -740,12 +740,12 @@ msgid "Apply" msgstr "Appliquer" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:131 +#: ../template/default/prog_timeline.html:132 msgid "Duration:" msgstr "Durée :" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:132 +#: ../template/default/prog_timeline.html:133 msgid "min" msgstr "min" @@ -887,7 +887,7 @@ msgstr "Description :" #: ../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 "Enregistrements" @@ -1373,20 +1373,24 @@ msgstr "" "les sélectionner dans la liste de sélection de droite et cliquez sur <input " "type=\"submit\" class=\"submit\" value=\"<<<<<\"/>.</p>" -#: ../template/default/prog_timeline.html:75 -#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4118 +#: ../template/default/prog_timeline.html:76 +#: ../template/default/prog_timeline.html:195 ../vdradmind.pl:4131 msgid "now" msgstr "maintenant" -#: ../template/default/prog_timeline.html:77 +#: ../template/default/prog_timeline.html:78 msgid "to" msgstr "à" -#: ../template/default/prog_timeline.html:200 +#: ../template/default/prog_timeline.html:201 msgid "at:" msgstr "à :" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2785 +#: ../template/default/prog_timeline.html:216 +msgid "You need JavaScript to use the timeline!" +msgstr "" + +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2798 msgid "Playing Today" msgstr "Joué Aujourd'hui" @@ -2017,7 +2021,7 @@ msgstr "Stockés dans" msgid "No matches found!" msgstr "Aucune correspondance trouvée !" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4759 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4772 msgid "Playing Today?" msgstr "Aujourd'hui ?" @@ -2247,48 +2251,48 @@ msgstr "Erreur en envoyant la commande à %s" msgid "Can't find EPG entry!" msgstr "" -#: ../vdradmind.pl:2785 +#: ../vdradmind.pl:2798 msgid "Playing Tomorrow" msgstr "Joué demain" -#: ../vdradmind.pl:2785 +#: ../vdradmind.pl:2798 #, fuzzy, perl-format msgid "Playing on the %s" msgstr "En cours sur la %d." -#: ../vdradmind.pl:4123 +#: ../vdradmind.pl:4136 msgid "next" msgstr "suivant" -#: ../vdradmind.pl:4142 +#: ../vdradmind.pl:4155 msgid "What's on after" msgstr "Que se passe-t-il ensuite" -#: ../vdradmind.pl:4142 +#: ../vdradmind.pl:4155 msgid "What's on at" msgstr "Que se passe-t-il à telle heure" -#: ../vdradmind.pl:4147 +#: ../vdradmind.pl:4160 msgid "Suitable matches for:" msgstr "Correspondances trouvées pour :" -#: ../vdradmind.pl:4149 +#: ../vdradmind.pl:4162 msgid "short view" msgstr "Court aperçu" -#: ../vdradmind.pl:4149 +#: ../vdradmind.pl:4162 msgid "long view" msgstr "Long aperçu" -#: ../vdradmind.pl:4206 +#: ../vdradmind.pl:4219 msgid "Schedule" msgstr "Programmateur" -#: ../vdradmind.pl:4759 +#: ../vdradmind.pl:4772 msgid "Timers" msgstr "Programmations" -#: ../vdradmind.pl:4827 +#: ../vdradmind.pl:4840 msgid "System default" msgstr "Par défaut" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: nl\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-06-25 12:49+0200\n" "Last-Translator: Roel <rl.koelewijn@home.nl>\n" "Language-Team: Nederlands <nl@li.org>\n" @@ -140,43 +140,43 @@ msgid "Day Of Recording:" msgstr "Dag van opname" #: ../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 "Maandag" #: ../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 "Dinsdag" #: ../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 "Woensdag" #: ../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 "Donderdag" #: ../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 "Vrijdag" #: ../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 "Zaterdag" #: ../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 "Zondag" @@ -189,14 +189,14 @@ msgstr "Start tijd:" #: ../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 "Uur" @@ -384,25 +384,25 @@ msgstr "Verwijder alle geselecteerde timers?" #: ../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 "Wat is er nu op?" #: ../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 "Wat is er op:" #: ../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 "om" #: ../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 "Kanalen" @@ -546,7 +546,7 @@ msgstr "Wachtwoord gast" #: ../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 "Tijdlijn" @@ -746,12 +746,12 @@ msgid "Apply" msgstr "Toepassen" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:131 +#: ../template/default/prog_timeline.html:132 msgid "Duration:" msgstr "Duur:" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:132 +#: ../template/default/prog_timeline.html:133 msgid "min" msgstr "min" @@ -893,7 +893,7 @@ msgstr "Omschrijving:" #: ../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 "Opnames" @@ -1366,20 +1366,24 @@ msgstr "" "deze lijst de te verwijderen kanalen en klik op<input type=\"submit\" class=" "\"submit\" value=\"<<<<<\"/>.</p>" -#: ../template/default/prog_timeline.html:75 -#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4118 +#: ../template/default/prog_timeline.html:76 +#: ../template/default/prog_timeline.html:195 ../vdradmind.pl:4131 msgid "now" msgstr "nu" -#: ../template/default/prog_timeline.html:77 +#: ../template/default/prog_timeline.html:78 msgid "to" msgstr "naar " -#: ../template/default/prog_timeline.html:200 +#: ../template/default/prog_timeline.html:201 msgid "at:" msgstr "om:" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2785 +#: ../template/default/prog_timeline.html:216 +msgid "You need JavaScript to use the timeline!" +msgstr "" + +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2798 msgid "Playing Today" msgstr "Programma vandaag " @@ -1985,7 +1989,7 @@ msgstr "Opgeslagen in" msgid "No matches found!" msgstr "Geen overeenkomsten gevonden!" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4759 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4772 msgid "Playing Today?" msgstr "Speelt vandaag?" @@ -2215,47 +2219,47 @@ msgstr "Fout tijdens verzenden van commando op %s" msgid "Can't find EPG entry!" msgstr "Kan geen EPG gegevens vinden!" -#: ../vdradmind.pl:2785 +#: ../vdradmind.pl:2798 msgid "Playing Tomorrow" msgstr "Speelt morgen" -#: ../vdradmind.pl:2785 +#: ../vdradmind.pl:2798 #, perl-format msgid "Playing on the %s" msgstr "Speelt op de %s" -#: ../vdradmind.pl:4123 +#: ../vdradmind.pl:4136 msgid "next" msgstr "volgende" -#: ../vdradmind.pl:4142 +#: ../vdradmind.pl:4155 msgid "What's on after" msgstr "Wat is er op na" -#: ../vdradmind.pl:4142 +#: ../vdradmind.pl:4155 msgid "What's on at" msgstr "Wat is er op om:" -#: ../vdradmind.pl:4147 +#: ../vdradmind.pl:4160 msgid "Suitable matches for:" msgstr "Bruikbare overeenkomsten voor:" -#: ../vdradmind.pl:4149 +#: ../vdradmind.pl:4162 msgid "short view" msgstr "beknopt tonen" -#: ../vdradmind.pl:4149 +#: ../vdradmind.pl:4162 msgid "long view" msgstr "uitgebreid tonen" -#: ../vdradmind.pl:4206 +#: ../vdradmind.pl:4219 msgid "Schedule" msgstr "Schema" -#: ../vdradmind.pl:4759 +#: ../vdradmind.pl:4772 msgid "Timers" msgstr "Timers" -#: ../vdradmind.pl:4827 +#: ../vdradmind.pl:4840 msgid "System default" msgstr "Systeem standaard" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.3\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-06-26 10:53+0100\n" "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n" "Language-Team: Allrussian <LL.org>\n" @@ -147,43 +147,43 @@ msgid "Day Of Recording:" msgstr "´ÕÝì ×ÐߨáØ:" #: ../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 "¿ÞÝÕÔÕÛìÝØÚ" #: ../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 "²âÞàÝØÚ" #: ../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 "ÁàÕÔÐ" #: ../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 "ÇÕâÒÕàÓ" #: ../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 "¿ïâÝØæÐ" #: ../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 "ÁãÑÑÞâÐ" #: ../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 "²ÞáÚàÕáÕÝØÕ" @@ -196,14 +196,14 @@ msgstr "½ÐçÐÛÞ:" #: ../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 "ÇÐáÞÒ" @@ -389,25 +389,25 @@ msgstr "ÃÔÐÛØâì ÒáÕ ÒëÑàÐÝÝëÕ °ÒâÞâÐÙÜÕàë?" #: ../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 "ÇâÞ ØÔÕâ áÕÙçÐá?" #: ../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 "ÇâÞ áÕÙçÐá:" #: ../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 "Ò" #: ../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 "ÂÕÛÕÓØÔ" @@ -551,7 +551,7 @@ msgstr "¿ÐàÞÛì ÔÛï ÓÞáâï:" #: ../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 "³àÐäØÚ ÒàÕÜÕÝØ" @@ -751,12 +751,12 @@ msgid "Apply" msgstr "¿àØÜÕÝØâì" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:131 +#: ../template/default/prog_timeline.html:132 msgid "Duration:" msgstr "¿àÞÔÞÛÖØâÕÛìÝÞáâì:" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:132 +#: ../template/default/prog_timeline.html:133 msgid "min" msgstr "ÜØÝ" @@ -898,7 +898,7 @@ msgstr "¾ßØáÐÝØÕ:" #: ../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 "·ÐߨáØ" @@ -1353,20 +1353,24 @@ msgstr "" "ÝÐÖÐâì ÝÐ ÚÝÞßÚã <input type=\"submit\" class=\"submit\" value=\">>>" ">>\"/>.ÃÔÐÛØâì ÚÐÝÐÛë Ø× íâÞÓÞ áߨáÚÐ ÜÞÖÝÞ ÒëÔÕÛØÒ " -#: ../template/default/prog_timeline.html:75 -#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4118 +#: ../template/default/prog_timeline.html:76 +#: ../template/default/prog_timeline.html:195 ../vdradmind.pl:4131 msgid "now" msgstr "áÕÙçÐá" -#: ../template/default/prog_timeline.html:77 +#: ../template/default/prog_timeline.html:78 msgid "to" msgstr "ÔÞ" -#: ../template/default/prog_timeline.html:200 +#: ../template/default/prog_timeline.html:201 msgid "at:" msgstr "Ò:" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2785 +#: ../template/default/prog_timeline.html:216 +msgid "You need JavaScript to use the timeline!" +msgstr "" + +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2798 msgid "Playing Today" msgstr "ÇâÞ ÑãÔÕâ áÕÓÞÔÝï?" @@ -1961,7 +1965,7 @@ msgstr "ÁÞåàÐÝÕÝÝÞ Ò" msgid "No matches found!" msgstr "ÁÞÒßÐÔÕÝØÙ ÝÕ ÝÐÙÔÕÝÞ!" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4759 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4772 msgid "Playing Today?" msgstr "ÇâÞ ÑãÔÕâ áÕÓÞÔÝï?" @@ -2192,48 +2196,48 @@ msgstr "¾èØÑÚÐ ßàØ ÞâßàÐÒÛÕÝØØ ÚÞÜÐÝÔë Ú %s" msgid "Can't find EPG entry!" msgstr "½Õâ EPG ×ÐߨáÕÙ!" -#: ../vdradmind.pl:2785 +#: ../vdradmind.pl:2798 msgid "Playing Tomorrow" msgstr "¿àÞÓàÐÜÜÐ ÝÐ ×ÐÒâàÐ" -#: ../vdradmind.pl:2785 +#: ../vdradmind.pl:2798 #, perl-format msgid "Playing on the %s" msgstr "²ÞáßàÞØ×ÒÕáâØ %s." -#: ../vdradmind.pl:4123 +#: ../vdradmind.pl:4136 msgid "next" msgstr "áÛÕÔ." -#: ../vdradmind.pl:4142 +#: ../vdradmind.pl:4155 msgid "What's on after" msgstr "ÇâÞ ßÞâÞÜ" -#: ../vdradmind.pl:4142 +#: ../vdradmind.pl:4155 msgid "What's on at" msgstr "ÇâÞ Ò:" -#: ../vdradmind.pl:4147 +#: ../vdradmind.pl:4160 msgid "Suitable matches for:" msgstr "ÀÕ×ãÛìâÐâë ßÞØáÚÐ ÔÛï" -#: ../vdradmind.pl:4149 +#: ../vdradmind.pl:4162 msgid "short view" msgstr "áÞÚàÐéÕÝÝÐï ØÝäÞàÜÐæØï" -#: ../vdradmind.pl:4149 +#: ../vdradmind.pl:4162 msgid "long view" msgstr "ÀÐáèØàÕÝÝÐï ØÝäÞàÜÐæØï" -#: ../vdradmind.pl:4206 +#: ../vdradmind.pl:4219 msgid "Schedule" msgstr "ÀÐáߨáÐÝØÕ" -#: ../vdradmind.pl:4759 +#: ../vdradmind.pl:4772 msgid "Timers" msgstr "ÂÐÙÜÕàë" -#: ../vdradmind.pl:4827 +#: ../vdradmind.pl:4840 msgid "System default" msgstr "ÁØáâÕÜÝëÙ áâÐÝÔÐàâ" diff --git a/po/vdradmin.pot b/po/vdradmin.pot index d19669d..8bacf8b 100644 --- a/po/vdradmin.pot +++ b/po/vdradmin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -138,43 +138,43 @@ msgid "Day Of Recording:" msgstr "" #: ../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 "" #: ../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 "" #: ../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 "" #: ../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 "" #: ../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 "" #: ../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 "" #: ../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 "" @@ -187,14 +187,14 @@ msgstr "" #: ../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 "" @@ -376,25 +376,25 @@ msgstr "" #: ../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 "" #: ../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 "" #: ../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 "" #: ../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 "" @@ -538,7 +538,7 @@ msgstr "" #: ../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 "" @@ -738,12 +738,12 @@ msgid "Apply" msgstr "" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:131 +#: ../template/default/prog_timeline.html:132 msgid "Duration:" msgstr "" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:132 +#: ../template/default/prog_timeline.html:133 msgid "min" msgstr "" @@ -885,7 +885,7 @@ msgstr "" #: ../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 "" @@ -1248,20 +1248,24 @@ msgid "" "<input type=\"submit\" class=\"submit\" value=\"<<<<<\"/>.</p>" msgstr "" -#: ../template/default/prog_timeline.html:75 -#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4118 +#: ../template/default/prog_timeline.html:76 +#: ../template/default/prog_timeline.html:195 ../vdradmind.pl:4131 msgid "now" msgstr "" -#: ../template/default/prog_timeline.html:77 +#: ../template/default/prog_timeline.html:78 msgid "to" msgstr "" -#: ../template/default/prog_timeline.html:200 +#: ../template/default/prog_timeline.html:201 msgid "at:" msgstr "" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2785 +#: ../template/default/prog_timeline.html:216 +msgid "You need JavaScript to use the timeline!" +msgstr "" + +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2798 msgid "Playing Today" msgstr "" @@ -1675,7 +1679,7 @@ msgstr "" msgid "No matches found!" msgstr "" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4759 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4772 msgid "Playing Today?" msgstr "" @@ -1893,47 +1897,47 @@ msgstr "" msgid "Can't find EPG entry!" msgstr "" -#: ../vdradmind.pl:2785 +#: ../vdradmind.pl:2798 msgid "Playing Tomorrow" msgstr "" -#: ../vdradmind.pl:2785 +#: ../vdradmind.pl:2798 #, perl-format msgid "Playing on the %s" msgstr "" -#: ../vdradmind.pl:4123 +#: ../vdradmind.pl:4136 msgid "next" msgstr "" -#: ../vdradmind.pl:4142 +#: ../vdradmind.pl:4155 msgid "What's on after" msgstr "" -#: ../vdradmind.pl:4142 +#: ../vdradmind.pl:4155 msgid "What's on at" msgstr "" -#: ../vdradmind.pl:4147 +#: ../vdradmind.pl:4160 msgid "Suitable matches for:" msgstr "" -#: ../vdradmind.pl:4149 +#: ../vdradmind.pl:4162 msgid "short view" msgstr "" -#: ../vdradmind.pl:4149 +#: ../vdradmind.pl:4162 msgid "long view" msgstr "" -#: ../vdradmind.pl:4206 +#: ../vdradmind.pl:4219 msgid "Schedule" msgstr "" -#: ../vdradmind.pl:4759 +#: ../vdradmind.pl:4772 msgid "Timers" msgstr "" -#: ../vdradmind.pl:4827 +#: ../vdradmind.pl:4840 msgid "System default" msgstr "" diff --git a/template/default/default/logo_other.png b/template/default/default/logo.png Binary files differindex ff68769..ff68769 100755..100644 --- a/template/default/default/logo_other.png +++ b/template/default/default/logo.png diff --git a/template/default/default/logo_linvdr.gif b/template/default/default/logo_linvdr.gif Binary files differdeleted file mode 100644 index 504265b..0000000 --- a/template/default/default/logo_linvdr.gif +++ /dev/null diff --git a/template/default/favicon.ico b/template/default/favicon.ico Binary files differdeleted file mode 100644 index 4f30dbc..0000000 --- a/template/default/favicon.ico +++ /dev/null diff --git a/template/default/navigation.html b/template/default/navigation.html index 3bf3754..2cbd194 100644 --- a/template/default/navigation.html +++ b/template/default/navigation.html @@ -22,7 +22,7 @@ <body id="navigation"> <div class="logo"> - <a href="./" target="_top"><tmpl_if linvdr><img src="bilder/logo_linvdr.gif" alt="" height="50" width="150" border="0" /><tmpl_else><img src="bilder/logo_other.png" alt="" height="50" width="150" border="0" /></tmpl_if></a> + <a href="./" target="_top"><img src="bilder/logo.png" alt="" height="50" width="150" border="0" /></a> </div> <div class="nav_bar"> <div class="navi" id="prog_summary"> diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html index 40c9782..8600489 100644 --- a/template/default/prog_summary.html +++ b/template/default/prog_summary.html @@ -114,9 +114,7 @@ </tmpl_if> </div> - <tmpl_if summary> - <div class="epg_summary"><tmpl_var summary></div> - </tmpl_if> + <div class="epg_summary"><tmpl_var summary></div> </td> </tr> </table> diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html index 406fe0d..69d3fff 100644 --- a/template/default/prog_timeline.html +++ b/template/default/prog_timeline.html @@ -39,6 +39,7 @@ margin:0px;
text-align:left;
table-layout:fixed;
+ overflow:hidden;
}
td.prgname {
margin: 0 2px;
@@ -189,7 +190,7 @@ <td class="col_other">
<%! What's on: !%>
<select name="Auswahl" class="submit" onChange="Go(this.form.Auswahl.options[this.form.Auswahl.options.selectedIndex].value)" width="100">
- <option value="<?% nowurl %?>"></option>
+ <option value="<?% nowurl %?>">-</option>
<?% select_now = (now == date.format(date.now, '%H:%M')) %?>
<option value="<?% nowurl %?>" <?% "selected" IF select_now %?>><%! now !%></option>
<?% FOREACH timer = times %?>
@@ -209,6 +210,13 @@ var tl = new TimeLine(<?% now_sec %?>, "<?% nowurl %?>", <?% px_per_min %?>, <?% end_min %?>);
BuildContent();
</script>
+ <noscript>
+ <p>
+ <center>
+ <h1><%! You need JavaScript to use the timeline! !%></h1>
+ </center>
+ </p>
+ </noscript>
</form>
</body>
</html>
diff --git a/template/default/style.css b/template/default/style.css index 79c2d64..301e377 100644 --- a/template/default/style.css +++ b/template/default/style.css @@ -478,24 +478,27 @@ body.help .heading { top: 32px; left: 3px; } +#prog_timeline .timertable, #prog_timeline .prgtable { - border-color: #c4cdd7; -} -#prog_timeline .timertable { - background: red; - border-color: #ffcdd7; + border-color: #6d96a9; } #prog_timeline #timeline { background: red; } #prog_timeline .color_current { - background-color: #e6ffe9; +/*TODO xbackground-color: #e6ffe9;*/ + background-color: #b4e29c; +} +#prog_timeline .color_summary { + background-color: #dee6ee; } #prog_timeline .color_broadcast { - background-color: #f7fffa; +/*TODO background-color: #f7fffa;*/ + background-color: #ffffff; } #prog_timeline .color_timer { - background-color: #ffeee9; +/*TODO xbackground-color: #ffeee9;*/ + background-color: #ffb2b4; } #prog_timeline .color_spacer { background-color: #e0e0e0; diff --git a/template/default/timeline.js b/template/default/timeline.js index a4a7750..7dd5a53 100644 --- a/template/default/timeline.js +++ b/template/default/timeline.js @@ -78,17 +78,15 @@ function TimeLine(_req_sec, _now_url, _px_per_min, _end_min) {
this.table_w = this.innerWidth - 8;
}
-// this.px_per_min = _px_per_min;
-
- this.table_w10 = Div(this.table_w, 10);
- my_min = this.table_w10 < 100 ? 100 : this.table_w10;
- this.px_per_min = Div((this.table_w - my_min), _end_min);
+ //this.table_w -= tab.offsetLeft;
+ this.px_per_min = _px_per_min;
-// this.end_min = Div(this.table_w - this.name_w, this.px_per_min);
-// if (this.end_min > _end_min)
-// {
+ this.end_min = Div(this.table_w - this.name_w, this.px_per_min);
+ if (this.end_min > _end_min)
+ {
+ this.px_per_min = Div(this.table_w - this.name_w, _end_min);
this.end_min = _end_min;
-// }
+ }
this.end_min -= this.end_min % 30;
this.event_w = this.end_min * this.px_per_min;
this.name_w = this.table_w - this.event_w;
@@ -132,7 +130,7 @@ function BuildHeader() + ' ' + trans.to + ' '
+ format_date('%H:%M', tl.end_sec) + ' ' + trans.o_clock);
W('</h2>');
- W('<br/>');
+ W('<br />');
W('</td>');
W('<td id="header_navi" class="col_navi">');
if (tl.start_sec < tl.first_sec + 1800)
@@ -190,7 +188,7 @@ function BuildTimeScale() var w = tl.px_per_min * (tl.end_min - min < 30) ? tl.end_min - min : 30;
var t = tl.start_sec + min * 60;
W('<td colspan="6" class="' + c + '">');
- W('<img src="bilder/spacer.gif" width="' + w + '" height="1" border="0" /><br/>');
+ W('<img src="bilder/spacer.gif" width="' + w + '" height="1" border="0" /><br />');
W('<span class="date_time">' + format_date('%H:%M', t) + '</span>');
W('</td>');
}
@@ -202,7 +200,7 @@ function BuildTimeScale() var c = min % 10 ? 'color1' : 'color2';
var w = tl.px_per_min * 5;
W('<td width="' + tl.px_per_min + '" height="' + tl.min5_h + '" class="' + c + '">');
- W('<img src="bilder/spacer.gif" width="' + w + '" height="1" border="0" /><br/>');
+ W('<img src="bilder/spacer.gif" width="' + w + '" height="1" border="0" /><br />');
W('</td>');
}
W('</tr>');
@@ -225,7 +223,7 @@ function BuildChannel(channel, td_class) W('<tr>');
/* Channel name */
W('<td width="' + tl.name_w + '" class="' + td_class + '">');
- W('<img src="bilder/spacer.gif" width="' + tl.name_w + '" height="1" border="0"/><br/>');
+ W('<img src="bilder/spacer.gif" width="' + tl.name_w + '" height="1" border="0"/><br />');
W('<nobr>');
W('<a href="' + channel.url + '" class="channel_name">');
W(channel.name);
@@ -271,7 +269,11 @@ function BuildChannel(channel, td_class) {
td_class = "color_current";
}
- else
+ else if (event.summary)
+ {
+ td_class = "color_summary";
+ }
+ else
{
td_class = "color_broadcast";
}
@@ -286,6 +288,10 @@ function BuildChannel(channel, td_class) BuildEvent(channel.vdr_id, i, event, td_class, px_w);
old_stop_min = stop_min;
}
+ if (old_stop_min < tl.end_min)
+ {
+ BuildSpacer((tl.end_min - old_stop_min) * tl.px_per_min);
+ }
W('</nobr>');
W('</td>');
W('</tr>');
@@ -296,9 +302,9 @@ function BuildSpacer(width) W('<table border="0" align="left" cellpadding="0" cellspacing="0" width="' + width + '" class="prgtable">');
W('<tr>');
W('<td width="1" class="color_spacer">');
- W('<img src="bilder/spacer.gif" width="1" height="1" border="0"/><br/>');
+ W('<img src="bilder/spacer.gif" width="1" height="1" border="0"/><br />');
W('<nobr>');
- W('<img src="bilder/spacer.gif" width="1" height="8" border="0"/>');
+ W('<img src="bilder/spacer.gif" width="1" height="8" border="0"/> ');
W('</nobr>');
W('</td>');
W('</tr>');
diff --git a/vdradmind.pl b/vdradmind.pl index 0ca395d..329a327 100755 --- a/vdradmind.pl +++ b/vdradmind.pl @@ -28,7 +28,7 @@ require 5.004; -my $VERSION = "3.4.6beta5"; +my $VERSION = "3.4.6rc"; my $BASENAME; my $EXENAME; @@ -213,7 +213,6 @@ $CONFIG{REC_EXT} = "m3u"; $CONFIG{PS_VIEW} = "ext"; my $SERVERVERSION = "vdradmind/$VERSION"; -my $LINVDR = isLinVDR(); my $VDRVERSION = 0; # Numeric VDR version, e.g. 10344 my $VDRVERSION_HR; # Human readable VDR version, e.g. 1.3.44 my %ERROR_MESSAGE; @@ -2235,13 +2234,13 @@ sub ChannelHasEPG { sub Encode_Referer { if ($_[0]) { $_ = $_[0]; } else { $_ = $Referer; } -# $_ =~ s/\~/\\\~/g; + $_ =~ s/\~/\\\~/g; return (MIME::Base64::encode_base64($_)); } sub Decode_Referer { my $ref = MIME::Base64::decode_base64(shift); -# $ref =~ s/\\\~/\~/g; + $ref =~ s/\\\~/\~/g; return ($ref); } @@ -2405,9 +2404,7 @@ sub show_index { sub show_navi { my $template = TemplateNew("navigation.html"); - my $vars = { usercss => $UserCSS, - linvdr => $LINVDR - }; + my $vars = { usercss => $UserCSS }; $template->param($vars); my $output; my $out = $template->output; @@ -2778,6 +2775,19 @@ sub prog_list2 { ); } @days = sort({ $a->{sort} <=> $b->{sort} } @days); + my $prev_day; + my $cur_day; + my $next_day; + foreach (@days) { + if($_->{sort} == $day) { + $cur_day = $_->{sort}; + next; + } elsif($cur_day) { + $next_day = $_->{sort}; + last; + } + $prev_day = $_->{sort} unless($cur_day); + } # my ($template) = TemplateNew("prog_list2.html"); @@ -2793,8 +2803,8 @@ sub prog_list2 { progname => GetChannelDescByNumber($vdr_id), switchurl => "$MyURL?aktion=prog_switch&channel=" . $vdr_id, stream_live_on => $CONFIG{ST_FUNC} && $CONFIG{ST_LIVE_ON}, - prevdayurl => $day > $current_day ? "$MyURL?aktion=prog_list2&day=" . ($day - 1) . ($param_time ? "&time=$param_time" : undef) : undef, - nextdayurl => $last_day > $day ? "$MyURL?aktion=prog_list2&day=" . ($day + 1) . ($param_time ? "&time=$param_time" : undef) : undef, + prevdayurl => $prev_day ? "$MyURL?aktion=prog_list2&day=" . $prev_day . ($param_time ? "&time=$param_time" : undef) : undef, + nextdayurl => $next_day ? "$MyURL?aktion=prog_list2&day=" . $next_day . ($param_time ? "&time=$param_time" : undef) : undef, toolbarurl => "$MyURL?aktion=toolbar" }; $template->param($vars); @@ -5017,18 +5027,6 @@ sub force_update { RedirectToReferer("$MyURL?aktion=prog_summary"); } -sub isLinVDR { - my $file = "/etc/linvdr-release"; - my $content; - if (-e $file) { - open(FILE, $file); - $content = <FILE>; - chomp($content); - close(FILE); - } - return ($content); -} - sub loadCommandsConf { my $conf_file = shift; my @commands; @@ -5222,7 +5220,7 @@ sub command { $cmd = $cmd . CRLF; if ($SOCKET && $SOCKET->connected()) { my $result = send($SOCKET, $cmd, 0); - if ($result != length($cmd)) { #TODO: ??? + if ($result != length($cmd)) { main::HTMLError(sprintf($ERROR_MESSAGE{send_command}, $CONFIG{VDR_HOST})); } else { $query = true; |