summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Mair <amair.sob@googlemail.com>2005-09-23 10:26:48 +0200
committerAndreas Mair <amair.sob@googlemail.com>2005-09-23 10:26:48 +0200
commit32e84da8cc92fc7c69e6ecbf6d937145018f96f2 (patch)
tree4917147a96998fb2bbc0cb8903ee2311b8b39a41
parent8c5b06e471f1254d2e750dfba3154461eb3030bc (diff)
downloadvdradmin-am-32e84da8cc92fc7c69e6ecbf6d937145018f96f2.tar.gz
vdradmin-am-32e84da8cc92fc7c69e6ecbf6d937145018f96f2.tar.bz2
2005-09-23: 0.97-am3.4v0.97-am3.4
- Send valid "Expires" header (Submitted by Ville Skyttä). - Open failure of vdradmind.done reported wrong filename (Submitted by Ville Skyttä). - Deliver validated HTML (Reported by Ville Skyttä). - Display name of recordings/timers... that will be deleted (Requested by Richard Lithvall). - Channels list in AutoTimer only shows selected channels if selective channels are active for AT. - Added "chmod" for grabbed images of TV so that everyone can read/write the file (Submitted by Udo Richter). - Added "-d" argument to set the configuration folder (Submitted by Rene Bredlau). - Fixed handling for recording on February, 29th for VDR >=1.3.26 (Submitted by Rene Bredlau). - Alternativly use Locale::Messages if Locale::gettext not found (Submitted by Ville Skyttä). - Fixed "send command" error message (Submitted by Ville Skyttä). - Display free disk size as float instead of integer (Submitted by Hardy Flor). - Step forward/backward a day in "Playing today" (Requested by Tüddelkopp) - Enable/disable selective channels in "Playing today" (Requested by Reiner Buehl) - Added images in prog_detail; needs external tool that provides these images; must be configured first! (Requested by several people) - Fixed display of login page (Reported by DrSat)
-rw-r--r--HISTORY17
-rw-r--r--INSTALL6
-rwxr-xr-xinstall.sh23
-rw-r--r--lib/URI/Escape.pm218
-rw-r--r--locale/de/LC_MESSAGES/vdradmin.mobin53268 -> 54211 bytes
-rw-r--r--locale/es/LC_MESSAGES/vdradmin.mobin51547 -> 37732 bytes
-rw-r--r--locale/fi/LC_MESSAGES/vdradmin.mobin11288 -> 11150 bytes
-rw-r--r--locale/fr/LC_MESSAGES/vdradmin.mobin54525 -> 40032 bytes
-rw-r--r--po/de.po922
-rw-r--r--po/es.po470
-rw-r--r--po/fi.po467
-rw-r--r--po/fr.po470
-rw-r--r--po/vdradmin.pot459
-rw-r--r--template/default/at_timer_list.html111
-rw-r--r--template/default/at_timer_new.html2
-rw-r--r--template/default/config.html23
-rw-r--r--template/default/help_at_timer_list.html9
-rw-r--r--template/default/help_config.html29
-rw-r--r--template/default/help_no.html2
-rw-r--r--template/default/help_rec_list.html6
-rw-r--r--template/default/help_timer_list.html7
-rw-r--r--template/default/infobox.js2
-rw-r--r--template/default/navigation.html4
-rw-r--r--template/default/prog_detail.html12
-rw-r--r--template/default/prog_list.html15
-rw-r--r--template/default/prog_list2.html31
-rw-r--r--template/default/prog_summary.html6
-rw-r--r--template/default/prog_timeline.html8
-rw-r--r--template/default/rc.html48
-rw-r--r--template/default/rec_edit.html6
-rw-r--r--template/default/rec_list.html30
-rw-r--r--template/default/style.css17
-rw-r--r--template/default/timer_list.html116
-rw-r--r--template/default/timer_new.html2
-rw-r--r--template/default/tv.html96
-rw-r--r--user.css.example11
-rwxr-xr-xvdradmind.pl346
-rw-r--r--vdradmind.pl.12
38 files changed, 2229 insertions, 1764 deletions
diff --git a/HISTORY b/HISTORY
index 49c9a78..2de0bf3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,23 @@ E-Mail: mail AT andreas DOT vdr-developer DOT org
VDR-Portal: amair
-----------------------------------------------------------
+2005-09-23: 0.97-am3.4
+- Send valid "Expires" header (Submitted by Ville Skyttä).
+- Open failure of vdradmind.done reported wrong filename (Submitted by Ville Skyttä).
+- Deliver validated HTML (Reported by Ville Skyttä).
+- Display name of recordings/timers... that will be deleted (Requested by Richard Lithvall).
+- Channels list in AutoTimer only shows selected channels if selective channels are active for AT.
+- Added "chmod" for grabbed images of TV so that everyone can read/write the file (Submitted by Udo Richter).
+- Added "-d" argument to set the configuration folder (Submitted by Rene Bredlau).
+- Fixed handling for recording on February, 29th for VDR >=1.3.26 (Submitted by Rene Bredlau).
+- Alternativly use Locale::Messages if Locale::gettext not found (Submitted by Ville Skyttä).
+- Fixed "send command" error message (Submitted by Ville Skyttä).
+- Display free disk size as float instead of integer (Submitted by Hardy Flor).
+- Step forward/backward a day in "Playing today" (Requested by Tüddelkopp)
+- Enable/disable selective channels in "Playing today" (Requested by Reiner Buehl)
+- Added images in prog_detail; needs external tool that provides these images; must be configured first! (Requested by several people)
+- Fixed display of login page (Reported by DrSat)
+
2005-07-12: 0.97-am3.3
- Fixed problems with "$" in templates (Reported by All-Ex).
- Updated all help messages.
diff --git a/INSTALL b/INSTALL
index c59acc8..d4ce84f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,7 +7,7 @@
$ cd vdradmin-VERSION
2) If you want to run VDRAdmin using a language other than set on
- our system, then before running it you have to issue:
+ 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
@@ -17,8 +17,8 @@
the missing Perl modules:
$ ./install.sh -p
-4) Now you have to deside wether you want to run VDRAdmin locally (3a)
- in this directory or install it into your system (3b).
+4) Now you have to deside wether you want to run VDRAdmin 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.
diff --git a/install.sh b/install.sh
index 9bcf969..0580ce4 100755
--- a/install.sh
+++ b/install.sh
@@ -52,15 +52,22 @@ function checkPerlModule()
[ -z "$1" ] && return 1
local MODULE=$1
+ local ALT_MODULE=$2
+ local ALT_MESSAGE=
+ [ "$ALT_MODULE" ] && ALT_MESSAGE=" or $ALT_MODULE"
- echo -n "Checking for Perl module $MODULE... "
+ echo -n "Checking for Perl module $MODULE$ALT_MESSAGE... "
perl -ce 'BEGIN{$0 =~ /(^.*\/)/; $BASENAME = $1; unshift(@INC, $BASENAME . "lib/");} use '$MODULE >/dev/null 2>&1
if [ $? -eq 2 ]; then
- echo "MISSING"
- read -p "Do you want to install it? [y/N]"
- [ $REPLY = "y" -o $REPLY = "Y" ] && su -c "perl -MCPAN -e 'install Locale::gettext'"
+ if [ "$ALT_MODULE" ]; then
+ perl -ce 'BEGIN{$0 =~ /(^.*\/)/; $BASENAME = $1; unshift(@INC, $BASENAME . "lib/");} use '$ALT_MODULE >/dev/null 2>&1
+ [ $? -eq 0 ] && echo " $ALT_MODULE found" && return 0
+ fi
+ echo " MISSING"
+ read -p "Do you want to install $MODULE? [y/N]"
+ [ "$REPLY" = "y" -o "$REPLY" = "Y" ] && su -c "perl -MCPAN -e 'install '$MODULE"
else
- echo "found"
+ echo " found"
fi
}
@@ -74,7 +81,8 @@ function perlModules()
checkPerlModule Time::Local
checkPerlModule MIME::Base64
checkPerlModule File::Temp
- checkPerlModule Locale::gettext
+ checkPerlModule Locale::gettext Locale::Messages
+ checkPerlModule URI::Escape
}
function makeDir()
@@ -162,6 +170,9 @@ function doInstall()
echo ""
fi
echo "NOTE:"
+ echo "If you want to run VDRAdmin-AM in a different language you must set the LANG environment variable (see README)."
+ echo ""
+ echo "NOTE2:"
echo "If you would like VDRAdmin-AM to start at system's boot, please modify your system's init scripts."
exit 0
}
diff --git a/lib/URI/Escape.pm b/lib/URI/Escape.pm
new file mode 100644
index 0000000..5f0de55
--- /dev/null
+++ b/lib/URI/Escape.pm
@@ -0,0 +1,218 @@
+#
+# $Id: Escape.pm,v 3.28 2004/11/05 13:58:31 gisle Exp $
+#
+
+package URI::Escape;
+use strict;
+
+=head1 NAME
+
+URI::Escape - Escape and unescape unsafe characters
+
+=head1 SYNOPSIS
+
+ use URI::Escape;
+ $safe = uri_escape("10% is enough\n");
+ $verysafe = uri_escape("foo", "\0-\377");
+ $str = uri_unescape($safe);
+
+=head1 DESCRIPTION
+
+This module provides functions to escape and unescape URI strings as
+defined by RFC 2396 (and updated by RFC 2732).
+A URI consists of a restricted set of characters,
+denoted as C<uric> in RFC 2396. The restricted set of characters
+consists of digits, letters, and a few graphic symbols chosen from
+those common to most of the character encodings and input facilities
+available to Internet users:
+
+ "A" .. "Z", "a" .. "z", "0" .. "9",
+ ";", "/", "?", ":", "@", "&", "=", "+", "$", ",", "[", "]", # reserved
+ "-", "_", ".", "!", "~", "*", "'", "(", ")"
+
+In addition, any byte (octet) can be represented in a URI by an escape
+sequence: a triplet consisting of the character "%" followed by two
+hexadecimal digits. A byte can also be represented directly by a
+character, using the US-ASCII character for that octet (iff the
+character is part of C<uric>).
+
+Some of the C<uric> characters are I<reserved> for use as delimiters
+or as part of certain URI components. These must be escaped if they are
+to be treated as ordinary data. Read RFC 2396 for further details.
+
+The functions provided (and exported by default) from this module are:
+
+=over 4
+
+=item uri_escape( $string )
+
+=item uri_escape( $string, $unsafe )
+
+Replaces each unsafe character in the $string with the corresponding
+escape sequence and returns the result. The $string argument should
+be a string of bytes. The uri_escape() function will croak if given a
+characters with code above 255. Use uri_escape_utf8() if you know you
+have such chars or/and want chars in the 128 .. 255 range treated as
+UTF-8.
+
+The uri_escape() function takes an optional second argument that
+overrides the set of characters that are to be escaped. The set is
+specified as a string that can be used in a regular expression
+character class (between [ ]). E.g.:
+
+ "\x00-\x1f\x7f-\xff" # all control and hi-bit characters
+ "a-z" # all lower case characters
+ "^A-Za-z" # everything not a letter
+
+The default set of characters to be escaped is all those which are
+I<not> part of the C<uric> character class shown above as well as the
+reserved characters. I.e. the default is:
+
+ "^A-Za-z0-9\-_.!~*'()"
+
+=item uri_escape_utf8( $string )
+
+=item uri_escape_utf8( $string, $unsafe )
+
+Works like uri_escape(), but will encode chars as UTF-8 before
+escaping them. This makes this function able do deal with characters
+with code above 255 in $string. Note that chars in the 128 .. 255
+range will be escaped differently by this function compared to what
+uri_escape() would. For chars in the 0 .. 127 range there is no
+difference.
+
+The call:
+
+ $uri = uri_escape_utf8($string);
+
+will be the same as:
+
+ use Encode qw(encode);
+ $uri = uri_escape(encode("UTF-8", $string));
+
+but will even work for perl-5.6 for chars in the 128 .. 255 range.
+
+Note: Javascript has a function called escape() that produce the
+sequence "%uXXXX" for chars in the 256 .. 65535 range. This function
+has really nothing to do with URI escaping but some folks got confused
+since it "does the right thing" in the 0 .. 255 range. Because of
+this you sometimes see "URIs" with these kind of escapes. The
+JavaScript encodeURI() function is similar to uri_escape_utf8().
+
+=item uri_unescape($string,...)
+
+Returns a string with each %XX sequence replaced with the actual byte
+(octet).
+
+This does the same as:
+
+ $string =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;
+
+but does not modify the string in-place as this RE would. Using the
+uri_unescape() function instead of the RE might make the code look
+cleaner and is a few characters less to type.
+
+In a simple benchmark test I did,
+calling the function (instead of the inline RE above) if a few chars
+were unescaped was something like 40% slower, and something like 700% slower if none were. If
+you are going to unescape a lot of times it might be a good idea to
+inline the RE.
+
+If the uri_unescape() function is passed multiple strings, then each
+one is returned unescaped.
+
+=back
+
+The module can also export the C<%escapes> hash, which contains the
+mapping from all 256 bytes to the corresponding escape codes. Lookup
+in this hash is faster than evaluating C<sprintf("%%%02X", ord($byte))>
+each time.
+
+=head1 SEE ALSO
+
+L<URI>
+
+
+=head1 COPYRIGHT
+
+Copyright 1995-2004 Gisle Aas.
+
+This program is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself.
+
+=cut
+
+use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
+use vars qw(%escapes);
+
+require Exporter;
+@ISA = qw(Exporter);
+@EXPORT = qw(uri_escape uri_unescape);
+@EXPORT_OK = qw(%escapes uri_escape_utf8);
+$VERSION = sprintf("%d.%02d", q$Revision: 3.28 $ =~ /(\d+)\.(\d+)/);
+
+use Carp ();
+
+# Build a char->hex map
+for (0..255) {
+ $escapes{chr($_)} = sprintf("%%%02X", $_);
+}
+
+my %subst; # compiled patternes
+
+sub uri_escape
+{
+ my($text, $patn) = @_;
+ return undef unless defined $text;
+ if (defined $patn){
+ unless (exists $subst{$patn}) {
+ # Because we can't compile the regex we fake it with a cached sub
+ (my $tmp = $patn) =~ s,/,\\/,g;
+ eval "\$subst{\$patn} = sub {\$_[0] =~ s/([$tmp])/\$escapes{\$1} || _fail_hi(\$1)/ge; }";
+ Carp::croak("uri_escape: $@") if $@;
+ }
+ &{$subst{$patn}}($text);
+ } else {
+ # Default unsafe characters. RFC 2732 ^(uric - reserved)
+ $text =~ s/([^A-Za-z0-9\-_.!~*'()])/$escapes{$1} || _fail_hi($1)/ge;
+ }
+ $text;
+}
+
+sub _fail_hi {
+ my $chr = shift;
+ Carp::croak(sprintf "Can't escape \\x{%04X}, try uri_escape_utf8() instead", ord($chr));
+}
+
+sub uri_escape_utf8
+{
+ my $text = shift;
+ if ($] < 5.008) {
+ $text =~ s/([^\0-\x7F])/do {my $o = ord($1); sprintf("%c%c", 0xc0 | ($o >> 6), 0x80 | ($o & 0x3f)) }/ge;
+ }
+ else {
+ utf8::encode($text);
+ }
+
+ return uri_escape($text, @_);
+}
+
+sub uri_unescape
+{
+ # Note from RFC1630: "Sequences which start with a percent sign
+ # but are not followed by two hexadecimal characters are reserved
+ # for future extension"
+ my $str = shift;
+ if (@_ && wantarray) {
+ # not executed for the common case of a single argument
+ my @str = ($str, @_); # need to copy
+ foreach (@str) {
+ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;
+ }
+ return @str;
+ }
+ $str =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg if defined $str;
+ $str;
+}
+
+1;
diff --git a/locale/de/LC_MESSAGES/vdradmin.mo b/locale/de/LC_MESSAGES/vdradmin.mo
index 8a23d5e..d75baa2 100644
--- a/locale/de/LC_MESSAGES/vdradmin.mo
+++ b/locale/de/LC_MESSAGES/vdradmin.mo
Binary files differ
diff --git a/locale/es/LC_MESSAGES/vdradmin.mo b/locale/es/LC_MESSAGES/vdradmin.mo
index 265ffab..93153ca 100644
--- a/locale/es/LC_MESSAGES/vdradmin.mo
+++ b/locale/es/LC_MESSAGES/vdradmin.mo
Binary files differ
diff --git a/locale/fi/LC_MESSAGES/vdradmin.mo b/locale/fi/LC_MESSAGES/vdradmin.mo
index d72ab00..75ff7fb 100644
--- a/locale/fi/LC_MESSAGES/vdradmin.mo
+++ b/locale/fi/LC_MESSAGES/vdradmin.mo
Binary files differ
diff --git a/locale/fr/LC_MESSAGES/vdradmin.mo b/locale/fr/LC_MESSAGES/vdradmin.mo
index ddb529d..7af7ef6 100644
--- a/locale/fr/LC_MESSAGES/vdradmin.mo
+++ b/locale/fr/LC_MESSAGES/vdradmin.mo
Binary files differ
diff --git a/po/de.po b/po/de.po
index 78dafc5..8bffcb5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,14 +13,14 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: VDRAdmin-0.97-AM3.3\n"
+"Project-Id-Version: VDRAdmin-0.97-AM3.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-12 13:18+0200\n"
-"PO-Revision-Date: 2005-07-10 12:49+0100\n"
+"POT-Creation-Date: 2005-09-23 10:28+0200\n"
+"PO-Revision-Date: 2005-09-23 12:49+0100\n"
"Last-Translator: Andreas Mair <mail@andreas.vdr-developer.org>\n"
"Language-Team: <LL.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../template/default/noperm.html:4 ../template/default/index.html:5
@@ -46,7 +46,7 @@ msgstr "charset=ISO-8859-1"
#: ../template/default/index.html:21
msgid "Your Browser does not support frames!"
-msgstr "Ihr Browser unterstützt keine Frames!"
+msgstr "Ihr Browser unterstützt keine Frames!"
#: ../template/default/timer_new.html:6 ../template/default/timer_new.html:49
msgid "Create New Timer"
@@ -59,8 +59,8 @@ msgid "Edit Timer"
msgstr "Timer editieren"
#: ../template/default/timer_new.html:53
-#: ../template/default/at_timer_list.html:47
-#: ../template/default/config.html:23 ../template/default/timer_list.html:55
+#: ../template/default/at_timer_list.html:39
+#: ../template/default/config.html:23 ../template/default/timer_list.html:47
#: ../template/default/rec_list.html:27
#: ../template/default/at_timer_new.html:24
msgid "Help"
@@ -72,13 +72,13 @@ msgid "Timer Active:"
msgstr "Timer aktiv:"
#: ../template/default/timer_new.html:75
-#: ../template/default/at_timer_list.html:135
-#: ../template/default/config.html:164 ../template/default/config.html:235
-#: ../template/default/config.html:337 ../template/default/config.html:352
-#: ../template/default/config.html:400 ../template/default/config.html:415
-#: ../template/default/config.html:446 ../template/default/config.html:455
-#: ../template/default/config.html:464 ../template/default/config.html:473
-#: ../template/default/timer_list.html:325
+#: ../template/default/at_timer_list.html:128
+#: ../template/default/config.html:170 ../template/default/config.html:241
+#: ../template/default/config.html:343 ../template/default/config.html:358
+#: ../template/default/config.html:406 ../template/default/config.html:421
+#: ../template/default/config.html:452 ../template/default/config.html:461
+#: ../template/default/config.html:470 ../template/default/config.html:479
+#: ../template/default/config.html:488 ../template/default/timer_list.html:318
#: ../template/default/at_timer_new.html:48
#: ../template/default/at_timer_new.html:52
#: ../template/default/at_timer_new.html:154
@@ -86,13 +86,13 @@ msgid "Yes"
msgstr "Ja"
#: ../template/default/timer_new.html:76
-#: ../template/default/at_timer_list.html:137
-#: ../template/default/config.html:165 ../template/default/config.html:236
-#: ../template/default/config.html:338 ../template/default/config.html:353
-#: ../template/default/config.html:401 ../template/default/config.html:416
-#: ../template/default/config.html:447 ../template/default/config.html:456
-#: ../template/default/config.html:465 ../template/default/config.html:474
-#: ../template/default/timer_list.html:326
+#: ../template/default/at_timer_list.html:130
+#: ../template/default/config.html:171 ../template/default/config.html:242
+#: ../template/default/config.html:344 ../template/default/config.html:359
+#: ../template/default/config.html:407 ../template/default/config.html:422
+#: ../template/default/config.html:453 ../template/default/config.html:462
+#: ../template/default/config.html:471 ../template/default/config.html:480
+#: ../template/default/config.html:489 ../template/default/timer_list.html:319
#: ../template/default/at_timer_new.html:49
#: ../template/default/at_timer_new.html:53
#: ../template/default/at_timer_new.html:155
@@ -102,7 +102,7 @@ msgstr "Nein"
#: ../template/default/timer_new.html:82
#: ../template/default/help_timer_new.html:36
msgid "AutoTimer Checking:"
-msgstr "Automatische Timer-Überwachung:"
+msgstr "Automatische Timer-Überwachung:"
#: ../template/default/timer_new.html:85
#: ../template/default/help_timer_new.html:39
@@ -114,13 +114,12 @@ msgstr "Sendungskennung"
msgid "Time"
msgstr "Uhrzeit"
-#: ../template/default/timer_new.html:88 ../template/default/tv.html:181
+#: ../template/default/timer_new.html:88 ../template/default/tv.html:180
#: ../template/default/help_timer_new.html:43
msgid "off"
msgstr "aus"
#: ../template/default/timer_new.html:94 ../template/default/prog_list.html:27
-#: ../template/default/prog_list2.html:30
#: ../template/default/help_timer_new.html:47
#: ../template/default/help_at_timer_new.html:46
#: ../template/default/at_timer_new.html:93
@@ -191,22 +190,22 @@ msgstr "Endzeit:"
#: ../template/default/timer_new.html:144
#: ../template/default/at_timer_list.html:21
-#: ../template/default/config.html:248 ../template/default/config.html:292
+#: ../template/default/config.html:254 ../template/default/config.html:298
#: ../template/default/timer_list.html:24
-#: ../template/default/help_config.html:94
-#: ../template/default/help_config.html:104
+#: ../template/default/help_config.html:100
+#: ../template/default/help_config.html:110
#: ../template/default/help_timer_new.html:61
#: ../template/default/help_at_timer_new.html:52
#: ../template/default/at_timer_new.html:128
msgid "Priority:"
-msgstr "Priorität:"
+msgstr "Priorität:"
#: ../template/default/timer_new.html:150
#: ../template/default/at_timer_list.html:21
-#: ../template/default/config.html:254 ../template/default/config.html:298
+#: ../template/default/config.html:260 ../template/default/config.html:304
#: ../template/default/timer_list.html:24
-#: ../template/default/help_config.html:96
-#: ../template/default/help_config.html:106
+#: ../template/default/help_config.html:102
+#: ../template/default/help_config.html:112
#: ../template/default/help_timer_new.html:63
#: ../template/default/help_at_timer_new.html:54
#: ../template/default/at_timer_new.html:136
@@ -223,7 +222,7 @@ msgstr "Titel der Aufnahme:"
msgid "Summary:"
msgstr "Zusammenfassung:"
-#: ../template/default/timer_new.html:174 ../template/default/config.html:511
+#: ../template/default/timer_new.html:174 ../template/default/config.html:526
#: ../template/default/at_timer_new.html:176
msgid "Save"
msgstr "Speichern"
@@ -235,7 +234,7 @@ msgstr "Abbrechen"
#: ../template/default/help_no.html:6 ../template/default/help_no.html:18
msgid "No Help Available"
-msgstr "Keine Hilfe verfügbar"
+msgstr "Keine Hilfe verfügbar"
#: ../template/default/help_no.html:29
msgid ""
@@ -243,7 +242,7 @@ msgid ""
"\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-developer.org</a>."
"</p>"
msgstr ""
-"Bisher keine Hilfe vorhanden. Zum Hinzufügen oder Ändern eines Textes bitte "
+"Bisher keine Hilfe vorhanden. Zum Hinzufügen oder Ändern eines Textes bitte "
"an <a href=\"mailto:mail@andreas.vdr-developer.org\">mail@andreas.vdr-"
"developer.org</a> wenden."
@@ -261,96 +260,96 @@ msgid ""
"requested. Either you supplied the wrong credentials (e.g. bad password), or "
"your browser doesn't understand how to supply the credentials required."
msgstr ""
-"Dieser Server kann nicht bestätigen, dass Sie berechtigt sind, auf das "
+"Dieser Server kann nicht bestätigen, dass Sie berechtigt sind, auf das "
"angeforderte Dokument zuzugreifen. Entweder haben Sie falsche Anmeldedaten "
"angegeben (z.B. falsches Passwort) oder Ihr Browser kann die Anmeldedaten "
-"nicht übermitteln."
+"nicht übermitteln."
#: ../template/default/at_timer_list.html:6
-#: ../template/default/at_timer_list.html:30
-#: ../template/default/config.html:223 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:88
+#: ../template/default/at_timer_list.html:31
+#: ../template/default/config.html:229 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:94
#: ../template/default/help_at_timer_list.html:6
-#: ../template/default/help_at_timer_list.html:18
+#: ../template/default/help_at_timer_list.html:22
#: ../template/default/navigation.html:49
msgid "AutoTimer"
msgstr "AutoTimer"
-#: ../template/default/at_timer_list.html:38
+#: ../template/default/at_timer_list.html:34
msgid "New AutoTimer"
msgstr "Neuer AutoTimer"
-#: ../template/default/at_timer_list.html:60
-#: ../template/default/timer_list.html:223
+#: ../template/default/at_timer_list.html:53
+#: ../template/default/timer_list.html:216
msgid "Active"
msgstr "Aktiv"
-#: ../template/default/at_timer_list.html:71
-#: ../template/default/timer_list.html:234
+#: ../template/default/at_timer_list.html:64
+#: ../template/default/timer_list.html:227
msgid "Channel"
msgstr "Sender"
-#: ../template/default/at_timer_list.html:82
-#: ../template/default/timer_list.html:256
+#: ../template/default/at_timer_list.html:75
+#: ../template/default/timer_list.html:249
msgid "Start"
msgstr "Beginn"
-#: ../template/default/at_timer_list.html:93
-#: ../template/default/timer_list.html:267
+#: ../template/default/at_timer_list.html:86
+#: ../template/default/timer_list.html:260
msgid "Stop"
msgstr "Ende"
-#: ../template/default/at_timer_list.html:104
-#: ../template/default/timer_list.html:278
+#: ../template/default/at_timer_list.html:97
+#: ../template/default/timer_list.html:271
#: ../template/default/rec_list.html:81
msgid "Name"
msgstr "Name"
-#: ../template/default/at_timer_list.html:115
-#: ../template/default/timer_list.html:289
+#: ../template/default/at_timer_list.html:108
+#: ../template/default/timer_list.html:282
#: ../template/default/rec_list.html:92
msgid "Select all/none"
-msgstr "Alle/keine auswählen"
+msgstr "Alle/keine auswählen"
-#: ../template/default/at_timer_list.html:163
-#: ../template/default/timer_list.html:355
+#: ../template/default/at_timer_list.html:156
+#: ../template/default/timer_list.html:348
msgid "Edit"
msgstr "Bearbeiten"
-#: ../template/default/at_timer_list.html:168
-#: ../template/default/timer_list.html:358
+#: ../template/default/at_timer_list.html:161
+#: ../template/default/timer_list.html:351
msgid "Delete timer?"
-msgstr "Timer löschen?"
+msgstr "Timer löschen?"
-#: ../template/default/at_timer_list.html:168
-#: ../template/default/timer_list.html:358
+#: ../template/default/at_timer_list.html:161
+#: ../template/default/timer_list.html:351
#: ../template/default/rec_list.html:140
msgid "Delete"
-msgstr "Löschen"
+msgstr "Löschen"
-#: ../template/default/at_timer_list.html:199
+#: ../template/default/at_timer_list.html:188
msgid "Force Update"
msgstr "Manuelles Update"
-#: ../template/default/at_timer_list.html:210
-#: ../template/default/timer_list.html:382
-msgid "Delete all selected timers?"
-msgstr "Ausgewählte Timer wirklich löschen?"
-
-#: ../template/default/at_timer_list.html:210
+#: ../template/default/at_timer_list.html:191
msgid "Delete Selected AutoTimers"
-msgstr "Ausgewählte AutoTimer löschen"
+msgstr "Ausgewählte AutoTimer löschen"
+
+#: ../template/default/at_timer_list.html:191
+#: ../template/default/timer_list.html:374
+msgid "Delete all selected timers?"
+msgstr "Ausgewählte Timer wirklich löschen?"
#: ../template/default/prog_summary.html:7
#: ../template/default/prog_timeline.html:7
#: ../template/default/navigation.html:29 ../template/i18n.pl:2
msgid "What's On Now?"
-msgstr "Was läuft jetzt?"
+msgstr "Was läuft jetzt?"
#: ../template/default/prog_summary.html:24
#: ../template/default/prog_timeline.html:94
msgid "What's on:"
-msgstr "Was läuft:"
+msgstr "Was läuft:"
#: ../template/default/prog_summary.html:24
#: ../template/default/prog_timeline.html:96
@@ -364,7 +363,7 @@ msgstr "um:"
#: ../template/default/prog_summary.html:43
#: ../template/default/prog_list.html:23 ../template/default/rec_list.html:149
-#: ../template/default/prog_list2.html:54
+#: ../template/default/prog_list2.html:56
msgid "Stream"
msgstr "Stream"
@@ -386,13 +385,13 @@ msgstr "Sendung aufnehmen"
#: ../template/default/config.html:5 ../template/default/config.html:19
#: ../template/default/help_config.html:9
-#: ../template/default/help_config.html:21
+#: ../template/default/help_config.html:25
#: ../template/default/navigation.html:57
msgid "Configuration"
msgstr "Konfiguration"
-#: ../template/default/config.html:36 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:36
+#: ../template/default/config.html:36 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:40
msgid "General Settings"
msgstr "Allgemeine Einstellungen"
@@ -400,186 +399,194 @@ msgstr "Allgemeine Einstellungen"
msgid "Template:"
msgstr "Template:"
-#: ../template/default/config.html:60 ../template/default/help_config.html:38
+#: ../template/default/config.html:60 ../template/default/help_config.html:42
msgid "Skin:"
msgstr "Skin:"
-#: ../template/default/config.html:72 ../template/default/help_config.html:40
+#: ../template/default/config.html:72 ../template/default/help_config.html:44
msgid "Login Page:"
msgstr "Startseite:"
-#: ../template/default/config.html:82 ../template/default/config.html:396
+#: ../template/default/config.html:82 ../template/default/config.html:402
msgid "Gets active after restarting VDRAdmin"
msgstr "Wird erst nach einem Neustart von VDRAdmin aktiv"
-#: ../template/default/config.html:84 ../template/default/help_config.html:42
+#: ../template/default/config.html:84 ../template/default/help_config.html:46
msgid "Number of channels to use:"
-msgstr "Anzahl der zu verwendenden Kanäle:"
+msgstr "Anzahl der zu verwendenden Kanäle:"
-#: ../template/default/config.html:90 ../template/default/help_config.html:44
+#: ../template/default/config.html:90 ../template/default/help_config.html:48
msgid "Local net (no login required):"
msgstr "Lokales Netz (kein Login notwendig):"
-#: ../template/default/config.html:104 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:50
+#: ../template/default/config.html:104 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:54
msgid "VDR"
msgstr "VDR"
-#: ../template/default/config.html:114 ../template/default/help_config.html:52
+#: ../template/default/config.html:114 ../template/default/help_config.html:56
msgid "Number of DVB cards:"
msgstr "Anzahl der DVB-Karten:"
-#: ../template/default/config.html:120 ../template/default/help_config.html:54
+#: ../template/default/config.html:120 ../template/default/help_config.html:58
msgid "Path to recordings:"
msgstr "Pfad der Aufnahmen:"
-#: ../template/default/config.html:126 ../template/default/help_config.html:56
+#: ../template/default/config.html:126 ../template/default/help_config.html:60
msgid "Path to configuration files:"
msgstr "Pfad zu den Konfigurationsdateien:"
-#: ../template/default/config.html:140 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:62
+#: ../template/default/config.html:132 ../template/default/help_config.html:62
+msgid "Path to EPG images:"
+msgstr "Pfad zu den EPG-Bildern:"
+
+#: ../template/default/config.html:146 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:68
msgid "Identification"
msgstr "Identifikation"
-#: ../template/default/config.html:150 ../template/default/help_config.html:64
+#: ../template/default/config.html:156 ../template/default/help_config.html:70
msgid "Username:"
msgstr "Benutzername:"
-#: ../template/default/config.html:156 ../template/default/help_config.html:66
+#: ../template/default/config.html:162 ../template/default/help_config.html:72
msgid "Password:"
msgstr "Passwort:"
-#: ../template/default/config.html:162 ../template/default/help_config.html:68
+#: ../template/default/config.html:168 ../template/default/help_config.html:74
msgid "Guest Account:"
msgstr "Gast-Zugang:"
-#: ../template/default/config.html:171 ../template/default/help_config.html:70
+#: ../template/default/config.html:177 ../template/default/help_config.html:76
msgid "Guest Username:"
msgstr "Gast Benutzername:"
-#: ../template/default/config.html:177 ../template/default/help_config.html:72
+#: ../template/default/config.html:183 ../template/default/help_config.html:78
msgid "Guest Password:"
msgstr "Gast Passwort:"
-#: ../template/default/config.html:191 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:78
+#: ../template/default/config.html:197 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:84
#: ../template/default/navigation.html:37 ../template/i18n.pl:4
msgid "Timeline"
msgstr "Zeitleiste"
-#: ../template/default/config.html:201 ../template/default/help_config.html:80
+#: ../template/default/config.html:207 ../template/default/help_config.html:86
msgid "Hours:"
msgstr "Stunden:"
-#: ../template/default/config.html:207 ../template/default/help_config.html:82
+#: ../template/default/config.html:213 ../template/default/help_config.html:88
msgid "Times:"
msgstr "Zeiten:"
-#: ../template/default/config.html:233 ../template/default/help_config.html:90
+#: ../template/default/config.html:239 ../template/default/help_config.html:96
msgid "Active:"
msgstr "Aktiv:"
-#: ../template/default/config.html:242 ../template/default/help_config.html:92
+#: ../template/default/config.html:248 ../template/default/help_config.html:98
msgid "Timeout:"
msgstr "Timeout:"
-#: ../template/default/config.html:243 ../template/default/config.html:305
-#: ../template/default/config.html:311
+#: ../template/default/config.html:249 ../template/default/config.html:311
+#: ../template/default/config.html:317
msgid "minutes"
msgstr "Minuten"
-#: ../template/default/config.html:261 ../template/default/config.html:304
-#: ../template/default/help_config.html:108
+#: ../template/default/config.html:267 ../template/default/config.html:310
+#: ../template/default/help_config.html:114
msgid "Time Margin at Start:"
msgstr "Zeitpuffer Anfang:"
-#: ../template/default/config.html:267 ../template/default/config.html:310
-#: ../template/default/help_config.html:110
+#: ../template/default/config.html:273 ../template/default/config.html:316
+#: ../template/default/help_config.html:116
msgid "Time Margin at Stop:"
msgstr "Zeitpuffer Ende:"
-#: ../template/default/config.html:282 ../template/default/timer_list.html:6
-#: ../template/default/timer_list.html:39
-#: ../template/default/help_config.html:34
-#: ../template/default/help_config.html:102
+#: ../template/default/config.html:288 ../template/default/timer_list.html:6
+#: ../template/default/timer_list.html:40
+#: ../template/default/help_config.html:38
+#: ../template/default/help_config.html:108
#: ../template/default/help_timer_list.html:6
-#: ../template/default/help_timer_list.html:18
+#: ../template/default/help_timer_list.html:22
#: ../template/default/navigation.html:45
msgid "Timer"
msgstr "Timer"
-#: ../template/default/config.html:325 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:116
+#: ../template/default/config.html:331 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:122
msgid "Streaming"
msgstr "Streaming"
-#: ../template/default/config.html:335
-#: ../template/default/help_config.html:118
+#: ../template/default/config.html:341
+#: ../template/default/help_config.html:124
msgid "Live Streaming:"
msgstr "LiveTV streamen:"
-#: ../template/default/config.html:344
-#: ../template/default/help_config.html:120
+#: ../template/default/config.html:350
+#: ../template/default/help_config.html:126
msgid "HTTP Port of Streamdev (also possible 3000/ts):"
-msgstr "HTTP-Port von Streamdev (auch möglich 3000/ts):"
+msgstr "HTTP-Port von Streamdev (auch möglich 3000/ts):"
-#: ../template/default/config.html:350
-#: ../template/default/help_config.html:122
+#: ../template/default/config.html:356
+#: ../template/default/help_config.html:128
msgid "Recordings Streaming:"
msgstr "Aufnahmen streamen:"
-#: ../template/default/config.html:359
-#: ../template/default/help_config.html:124
+#: ../template/default/config.html:365
+#: ../template/default/help_config.html:130
msgid "Path to VDR Recordings on your workstation:"
msgstr "Pfad zu den VDR-Aufnahmen auf Ihrem PC:"
-#: ../template/default/config.html:366
+#: ../template/default/config.html:372
msgid "Bandwidth of Streams:"
msgstr "Bandbreite des Streams:"
-#: ../template/default/config.html:388 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:130
+#: ../template/default/config.html:394 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:136
msgid "Expert"
msgstr "Expertenmodus"
-#: ../template/default/config.html:398
-#: ../template/default/help_config.html:133
+#: ../template/default/config.html:404
+#: ../template/default/help_config.html:139
msgid "Read EPG directly using epg.data:"
msgstr "EPG direkt aus der epg.data lesen:"
-#: ../template/default/config.html:407
-#: ../template/default/help_config.html:135
+#: ../template/default/config.html:413
+#: ../template/default/help_config.html:141
msgid "epg.data filename:"
msgstr "Dateiname der epg.data:"
-#: ../template/default/config.html:413
-#: ../template/default/help_config.html:137
+#: ../template/default/config.html:419
+#: ../template/default/help_config.html:143
msgid "VFAT:"
msgstr "VFAT:"
-#: ../template/default/config.html:434 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:143
+#: ../template/default/config.html:440 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:149
msgid "Channel Selections"
msgstr "Selektive Senderauswahl"
-#: ../template/default/config.html:444
+#: ../template/default/config.html:450
msgid "In \"Timeline\"?"
msgstr "In der \"Zeitleiste\"?"
-#: ../template/default/config.html:453
-msgid "In \"Channels\" / \"Playing Today\"?"
-msgstr "Bei \"Programmübersicht\" / \"Was läuft heute\"?"
+#: ../template/default/config.html:459
+msgid "In \"Channels\"?"
+msgstr "In der \"Programmübersicht\"?"
-#: ../template/default/config.html:462
+#: ../template/default/config.html:468
+msgid "In \"Playing Today\"?"
+msgstr "Bei \"Was läuft heute\"?"
+
+#: ../template/default/config.html:477
msgid "In \"What's On Now\"?"
-msgstr "Bei \"Was läuft jetzt\"?"
+msgstr "Bei \"Was läuft jetzt\"?"
-#: ../template/default/config.html:471
+#: ../template/default/config.html:486
msgid "In \"AutoTimer\"?"
msgstr "Bei \"AutoTimer\"?"
-#: ../template/default/config.html:512
+#: ../template/default/config.html:527
msgid "Apply"
msgstr "Anwenden"
@@ -593,54 +600,53 @@ msgstr "Dauer:"
msgid "min"
msgstr "min"
-#: ../template/default/timer_list.html:46
+#: ../template/default/timer_list.html:42
msgid "New Timer"
msgstr "Neuer Timer"
-#: ../template/default/timer_list.html:245
+#: ../template/default/timer_list.html:238
#: ../template/default/rec_list.html:59
msgid "Date"
msgstr "Datum"
-#: ../template/default/timer_list.html:310
+#: ../template/default/timer_list.html:303
msgid "This timer is inactive!"
msgstr "Diese Aufnahme ist deaktiviert!"
-#: ../template/default/timer_list.html:313
+#: ../template/default/timer_list.html:306
msgid "This timer is impossible!"
-msgstr "Diese Aufnahme ist nicht möglich!"
+msgstr "Diese Aufnahme ist nicht möglich!"
-#: ../template/default/timer_list.html:316
+#: ../template/default/timer_list.html:309
msgid "No more timers on other transponders possible!"
-msgstr "Keine weiteren Aufnahmen auf anderen Transpondern mehr möglich!"
+msgstr "Keine weiteren Aufnahmen auf anderen Transpondern mehr möglich!"
-#: ../template/default/timer_list.html:319
+#: ../template/default/timer_list.html:312
msgid "Timer OK."
-msgstr "Diese Aufnahme ist möglich."
+msgstr "Diese Aufnahme ist möglich."
-#: ../template/default/timer_list.html:324
+#: ../template/default/timer_list.html:317
msgid "Edit timer status?"
-msgstr "Timerstatus ändern?"
+msgstr "Timerstatus ändern?"
-#: ../template/default/timer_list.html:327
+#: ../template/default/timer_list.html:320
msgid "VPS"
msgstr "VPS"
-#: ../template/default/timer_list.html:328
+#: ../template/default/timer_list.html:321
msgid "Auto"
msgstr "Auto"
-#: ../template/default/timer_list.html:382
+#: ../template/default/timer_list.html:374
msgid "Delete Selected Timers"
-msgstr "Ausgewählte Timer löschen"
+msgstr "Ausgewählte Timer löschen"
#: ../template/default/prog_list.html:6 ../template/default/navigation.html:41
#: ../template/i18n.pl:5
msgid "Channels"
-msgstr "Programmübersicht"
+msgstr "Programmübersicht"
#: ../template/default/prog_list.html:33
-#: ../template/default/prog_list2.html:35
msgid "Go!"
msgstr "Go!"
@@ -652,50 +658,50 @@ msgstr "Fehler!"
msgid "TV"
msgstr "Fernseher"
-#: ../template/default/tv.html:179
+#: ../template/default/tv.html:178
msgid "Interval:"
msgstr "Intervall:"
-#: ../template/default/tv.html:182 ../template/default/tv.html:183
-#: ../template/default/tv.html:184 ../template/default/tv.html:185
-#: ../template/default/tv.html:186 ../template/default/tv.html:187
-#: ../template/default/tv.html:188
+#: ../template/default/tv.html:181 ../template/default/tv.html:182
+#: ../template/default/tv.html:183 ../template/default/tv.html:184
+#: ../template/default/tv.html:185 ../template/default/tv.html:186
+#: ../template/default/tv.html:187
msgid "sec."
msgstr "sek"
-#: ../template/default/tv.html:190 ../template/default/tv.html:197
+#: ../template/default/tv.html:189 ../template/default/tv.html:196
msgid "G"
msgstr "G"
-#: ../template/default/tv.html:190 ../template/default/tv.html:197
+#: ../template/default/tv.html:189 ../template/default/tv.html:196
msgid "Grab the picture!"
msgstr "Hole das Bild!"
-#: ../template/default/tv.html:191
+#: ../template/default/tv.html:190
msgid "Size:"
-msgstr "Größe:"
+msgstr "Größe:"
-#: ../template/default/tv.html:200
+#: ../template/default/tv.html:198
msgid "Open in separate window"
-msgstr "Öffne eigenes Fenster"
+msgstr "Öffne eigenes Fenster"
-#: ../template/default/prog_detail.html:37
+#: ../template/default/prog_detail.html:43
msgid "close"
-msgstr "schließen"
+msgstr "schließen"
-#: ../template/default/prog_detail.html:39
+#: ../template/default/prog_detail.html:45
msgid "view"
msgstr "umschalten"
-#: ../template/default/prog_detail.html:40
+#: ../template/default/prog_detail.html:46
msgid "record"
msgstr "aufnehmen"
-#: ../template/default/prog_detail.html:41
+#: ../template/default/prog_detail.html:47
msgid "search"
msgstr "Wiederholungen"
-#: ../template/default/prog_detail.html:44
+#: ../template/default/prog_detail.html:50
msgid "Lookup movie in the Internet-Movie-Database (IMDb)"
msgstr "Film in der Internet-Movie-Database (IMDb) suchen"
@@ -732,7 +738,7 @@ msgstr "Umbenennen"
#: ../template/default/rec_list.html:140
msgid "Delete recording?"
-msgstr "Aufnahme löschen?"
+msgstr "Aufnahme löschen?"
#: ../template/default/rec_list.html:169
msgid "Commands:"
@@ -740,40 +746,40 @@ msgstr "Befehle:"
#: ../template/default/rec_list.html:175
msgid "Run"
-msgstr "Ausführen"
+msgstr "Ausführen"
#: ../template/default/rec_list.html:175
msgid "Really run this command?"
-msgstr "Diesen Befehl wirklich ausführen?"
+msgstr "Diesen Befehl wirklich ausführen?"
#: ../template/default/rec_list.html:177
msgid "Delete Selected Recordings"
-msgstr "Ausgewählte Aufnahmen löschen"
+msgstr "Ausgewählte Aufnahmen löschen"
#: ../template/default/rec_list.html:177
msgid "Delete all selected recordings?"
-msgstr "Ausgewählte Aufnahmen wirklich löschen?"
+msgstr "Ausgewählte Aufnahmen wirklich löschen?"
-#: ../template/default/help_config.html:32
+#: ../template/default/help_config.html:36
msgid ""
"<p>Here you can change general settings and base settings for timers, "
"AutoTimers, channel selection and streaming parameters.</p>"
msgstr ""
-"<p>Hier können Sie allgemeine Einstellungen und Grundeinstellungen für Timer "
+"<p>Hier können Sie allgemeine Einstellungen und Grundeinstellungen für Timer "
"und AutoTimer, sowie die Senderauswahl und die Streaming Einstellungen "
"vornehmen.</p>"
-#: ../template/default/help_config.html:39
+#: ../template/default/help_config.html:43
msgid "The skin you want to use."
-msgstr "Der zu verwendende Skin (=grafische Oberflächenrepräsentation)."
+msgstr "Der zu verwendende Skin (=grafische Oberflächenrepräsentation)."
-#: ../template/default/help_config.html:41
+#: ../template/default/help_config.html:45
msgid "The page you want to see at first connect to VDRAdmin."
msgstr ""
"Die Seite, die angezeigt werden soll, wenn Sie sich das erste Mal mit "
-"VDRAdmin verbinden.</p>"
+"VDRAdmin verbinden."
-#: ../template/default/help_config.html:43
+#: ../template/default/help_config.html:47
msgid ""
"VDRAdmin will load the given number of channels from VDR and present only "
"those in any fields where channels can be selected. This also limits the EPG "
@@ -787,16 +793,17 @@ msgid ""
msgstr ""
"VDRAdmin wird nur die hier eingestellte Anzahl an Sendern vom VDR laden und "
"nur diese an allen Stellen, die die Sender anzeigen, anbieten. Dies "
-"beschränkt auch die EPG Informationen, die VDRAdmin lesen wird und "
-"vermindert somit auch den Speicherbedarf von VDRAdmin und erhöht seine "
+"beschränkt auch die EPG Informationen, die VDRAdmin lesen wird und "
+"vermindert somit auch den Speicherbedarf von VDRAdmin und erhöht seine "
"Verarbeitungsgeschwindigkeit. <strong>0</strong> schaltet diese Funktion ab "
-"und VDRAdmin wird alle verfügbaren Sender verwenden. <h4>Achtung:</h4> Diese "
-"Änderung wird nicht sofort aktiv, sondern erst, wenn sich VDRAdmin erneut "
-"mit dem VDR verbindet um die EPG Informationen aufzufrischen. Sie können "
-"dies auch über die Schaltfläche <span class=\"submit\">Manuelles Update</"
-"span> auf der <span class=\"ref_menu\">AutoTimer</span> Seite erzwingen."
-
-#: ../template/default/help_config.html:45
+"und VDRAdmin wird alle verfügbaren Sender verwenden. <h4>Achtung:</h4> Diese "
+"Änderung wird nicht sofort aktiv, sondern erst, wenn sich VDRAdmin erneut "
+"mit dem VDR verbindet um die EPG Informationen aufzufrischen. Sie können "
+"dies auch über die Schaltfläche <input type=\"submit\" class=\"submit\" "
+"value=\"Manuelles Update\"/> auf der <span class=\"ref_menu\">AutoTimer</"
+"span> Seite erzwingen."
+
+#: ../template/default/help_config.html:49
msgid ""
"Here you can specify an IP address or range that can login without providing "
"login information. For example: \"192.168.0.0/24\" will include any IP "
@@ -804,33 +811,33 @@ msgid ""
"\"192.168.0.123\"."
msgstr ""
"Hier geben Sie die IP-Adresse oder den IP-Bereich an von dem aus man sich "
-"anmelden kann, ohne dass Login-Informationen eingegeben werden müssen. Z.B. "
+"anmelden kann, ohne dass Login-Informationen eingegeben werden müssen. Z.B. "
"\"192.168.0.0/24\" beinhaltet jede IP, die mit \"192.168.0\" beginnt. "
"\"192.168.0.123/32\" beinhaltet nur die IP \"192.168.0.123\"."
-#: ../template/default/help_config.html:47
-#: ../template/default/help_config.html:59
-#: ../template/default/help_config.html:75
-#: ../template/default/help_config.html:85
-#: ../template/default/help_config.html:99
-#: ../template/default/help_config.html:113
-#: ../template/default/help_config.html:127
-#: ../template/default/help_config.html:140
-#: ../template/default/help_config.html:147
+#: ../template/default/help_config.html:51
+#: ../template/default/help_config.html:65
+#: ../template/default/help_config.html:81
+#: ../template/default/help_config.html:91
+#: ../template/default/help_config.html:105
+#: ../template/default/help_config.html:119
+#: ../template/default/help_config.html:133
+#: ../template/default/help_config.html:146
+#: ../template/default/help_config.html:153
msgid "Top"
msgstr "nach oben"
-#: ../template/default/help_config.html:53
+#: ../template/default/help_config.html:57
msgid ""
"The number of DVB cards VDR can access. Depending on this value VDRAdmin "
"will calculate critical timers in the <span class=\"ref_menu\">Timer</span> "
"menu."
msgstr ""
-"Die Anzahl der DVB-Karten, die der VDR ansprechen kann. In Abhängigkeit von "
+"Die Anzahl der DVB-Karten, die der VDR ansprechen kann. In Abhängigkeit von "
"diesem Wert berechnet VDRAdmin die kritischen Timer auf der <span class="
"\"ref_menu\">Timer</span> Seite"
-#: ../template/default/help_config.html:55
+#: ../template/default/help_config.html:59
msgid ""
"The path to VDR's recordings. It's used so that VDRAdmin can locate the "
"recordings when using <span class=\"ref_label\">Recordings Streaming</span> "
@@ -842,7 +849,7 @@ msgstr ""
"span> und <span class=\"ref_file\">reccmds.conf</span> auf der <span class="
"\"ref_menu\">Aufnahmen</span> Seite verwendet werden."
-#: ../template/default/help_config.html:57
+#: ../template/default/help_config.html:61
msgid ""
"The path where VDR's configuration files are located. If this directory "
"contains the file <span class=\"ref_file\">reccmds.conf</span> its content "
@@ -850,44 +857,48 @@ msgid ""
"menu."
msgstr ""
"Der Pfad zu den Konfigurationsdateien des VDR. Wenn dieses Verzeichnis die "
-"Datei <span class=\"ref_file\">reccmds.conf</span> enthält wird der Inhalt "
+"Datei <span class=\"ref_file\">reccmds.conf</span> enthält wird der Inhalt "
"dieser Datei auf der <span class=\"ref_menu\">Aufnahmen</span> Seite zur "
"Auswahl angezeigt."
-#: ../template/default/help_config.html:65
+#: ../template/default/help_config.html:63
+msgid "The path where the EPG images are stored."
+msgstr "Der Pfad, wo die EPG Bilder abgelegt sind."
+
+#: ../template/default/help_config.html:71
msgid ""
"The username for the main user, i.e. the user having the most privileges."
msgstr ""
-"Der Benutzername für den Hauptbenutzer, d.h. dem Benutzer mit den meisten "
+"Der Benutzername für den Hauptbenutzer, d.h. dem Benutzer mit den meisten "
"Rechten."
-#: ../template/default/help_config.html:67
+#: ../template/default/help_config.html:73
msgid "The main user's password."
msgstr "Das Passwort des Hauptbenutzers."
-#: ../template/default/help_config.html:69
+#: ../template/default/help_config.html:75
msgid ""
"If you want an user account having only limited privileges, this is for you. "
"The guest user cannot modify anything, it's only allowed to view the EPG, "
"timers, AutoTimers and recordings listings."
msgstr ""
-"Wenn Sie einen Benutzer wünschen, der nur eingeschränkte Rechte besitzt, "
-"dann aktivieren Sie diese Option. Der Gastbenutzer kann nichts ändern, es "
+"Wenn Sie einen Benutzer wünschen, der nur eingeschränkte Rechte besitzt, "
+"dann aktivieren Sie diese Option. Der Gastbenutzer kann nichts ändern, es "
"ist nur erlaubt den EPG, die Timer, AutoTimer und Aufnahmen aufzulisten."
-#: ../template/default/help_config.html:71
+#: ../template/default/help_config.html:77
msgid "The username for the guest user."
-msgstr "Der Benutzername für den Gastbenutzer."
+msgstr "Der Benutzername für den Gastbenutzer."
-#: ../template/default/help_config.html:73
+#: ../template/default/help_config.html:79
msgid "The guest user's password."
msgstr "Das Passwort des Gastbenutzers."
-#: ../template/default/help_config.html:81
+#: ../template/default/help_config.html:87
msgid "The number of hours to show in the timeline."
msgstr "Die Anzahl der Stunden, die in der Zeitleiste angezeigt wird."
-#: ../template/default/help_config.html:83
+#: ../template/default/help_config.html:89
msgid ""
"A comma separated list of times in <strong>hh:mm</strong> format that appear "
"in the selectbox placed at the top."
@@ -895,18 +906,18 @@ msgstr ""
"Eine durch Kommas getrennte Liste von Uhrzeiten im Format <strong>hh:mm</"
"strong>, die in der Auswahlliste am Seitenanfang angezeigt wird."
-#: ../template/default/help_config.html:91
+#: ../template/default/help_config.html:97
msgid "Activate or deactivate the AutoTimer function."
-msgstr "Die AutoTimer-Funktionalität aktivieren oder deaktivieren."
+msgstr "Die AutoTimer-Funktionalität aktivieren oder deaktivieren."
-#: ../template/default/help_config.html:93
+#: ../template/default/help_config.html:99
msgid "The interval, the the EPG data is checked for updating the AutoTimers."
msgstr ""
"Das Intervall indem die EPG Daten aktualisiert werden und nach neuen "
"AutoTimern gesucht wird."
-#: ../template/default/help_config.html:95
-#: ../template/default/help_config.html:105
+#: ../template/default/help_config.html:101
+#: ../template/default/help_config.html:111
#: ../template/default/help_timer_new.html:62
#: ../template/default/help_at_timer_new.html:53
msgid ""
@@ -925,24 +936,24 @@ msgid ""
"will interrupt the timer with the lowest priority in order to start "
"recording."
msgstr ""
-"Eine Zahl im Bereich <strong>0...99</strong>, die die <strong>Priorität</"
+"Eine Zahl im Bereich <strong>0...99</strong>, die die <strong>Priorität</"
"strong> dieses Timers und der von ihm programmierten Aufnahmen angibt. "
-"<strong>0</strong> ist die geringste Priorität und <strong>99</strong> die "
-"höchste. Die Priorität wird verwendet um zu entscheiden, welcher Timer "
-"gestartet werden soll für den Fall, dass zwei oder mehr Timer mit exakt der "
+"<strong>0</strong> ist die geringste Priorität und <strong>99</strong> die "
+"höchste. Die Priorität wird verwendet um zu entscheiden, welcher Timer "
+"gestartet werden soll für den Fall, dass zwei oder mehr Timer mit exakt der "
"gleichen <strong>Startzeit</strong> existieren. Der erste Timer in der Liste "
-"mit den höchsten Prioritäten wird verwendet.<br /><br />Dieser Wert wird "
-"ebenso zusammen mit der Aufnahme gespeichert und wird später verwendet um zu "
-"entscheiden, welche Aufnahme gelöscht werden soll, für den Fall, dass kein "
-"Pattenplatz mehr für eine neue Aufnahme ist. Wenn die Platte voll läuft und "
-"eine Aufnahme mehr Plattenplatz benötigt, wird eine existierende Aufnahme "
-"mit der geringsten Priorität (und deren garantierte <strong>Lebenszeit</"
-"strong> überschritten wurde) gelöscht. <br /><br />Wenn alle verfügbaren DVB-"
-"Karten belegt sind unterbricht ein Timer mit einer höheren Priorität den "
-"Timer mit der niedrigsten Priorität um die Aufnahme zu starten."
-
-#: ../template/default/help_config.html:97
-#: ../template/default/help_config.html:107
+"mit den höchsten Prioritäten wird verwendet.<br /><br />Dieser Wert wird "
+"ebenso zusammen mit der Aufnahme gespeichert und wird später verwendet um zu "
+"entscheiden, welche Aufnahme gelöscht werden soll, für den Fall, dass kein "
+"Pattenplatz mehr für eine neue Aufnahme ist. Wenn die Platte voll läuft und "
+"eine Aufnahme mehr Plattenplatz benötigt, wird eine existierende Aufnahme "
+"mit der geringsten Priorität (und deren garantierte <strong>Lebenszeit</"
+"strong> überschritten wurde) gelöscht. <br /><br />Wenn alle verfügbaren DVB-"
+"Karten belegt sind unterbricht ein Timer mit einer höheren Priorität den "
+"Timer mit der niedrigsten Priorität um die Aufnahme zu starten."
+
+#: ../template/default/help_config.html:103
+#: ../template/default/help_config.html:113
#: ../template/default/help_timer_new.html:64
#: ../template/default/help_at_timer_new.html:55
msgid ""
@@ -957,56 +968,56 @@ msgid ""
msgstr ""
"Die <strong>garantierte</strong> Lebenszeit (in Tagen) einer Aufnahme, die "
"von diesem Timer erstellt wurde. <strong>0</strong> bedeutet, dass diese "
-"Aufnahme jederzeit von einer Aufnahme mit höherer Priorität automatisch "
-"gelöscht werden kann. <strong>99</strong> heißt. dass diese Aufnahme nie "
-"automatisch gelöscht wird. Eine Zahl im Bereich <strong>1...98</strong> gibt "
-"an, dass die Aufnahme automatisch gelöscht werden kann, wenn die angegebene "
+"Aufnahme jederzeit von einer Aufnahme mit höherer Priorität automatisch "
+"gelöscht werden kann. <strong>99</strong> heißt. dass diese Aufnahme nie "
+"automatisch gelöscht wird. Eine Zahl im Bereich <strong>1...98</strong> gibt "
+"an, dass die Aufnahme automatisch gelöscht werden kann, wenn die angegebene "
"Anzahl von Tagen seit der <strong>Startzeit</strong> abgelaufen ist und "
-"Plattenplatz für eine neue Aufnahme benötigt wird."
+"Plattenplatz für eine neue Aufnahme benötigt wird."
-#: ../template/default/help_config.html:109
+#: ../template/default/help_config.html:115
msgid ""
"The number of minutes VDRAdmin subtracts from the broadcasts start time "
"found in the EPG. This value is used for timers programmed by AutoTimer and "
"timers manually programmed when pressing \"Record\" in any EPG view."
msgstr ""
"Die Anzahl von Minuten, die VDRAdmin von der Startzeit der Sendung im EPG "
-"abzieht. Dies wird jedoch nur für Timer verwendet, die vom AutoTimer oder "
+"abzieht. Dies wird jedoch nur für Timer verwendet, die vom AutoTimer oder "
"manuell durch Klicken von \"Aufnehmen\" in einer beliebigen EPG-Ansicht "
"programmiert werden."
-#: ../template/default/help_config.html:111
+#: ../template/default/help_config.html:117
msgid ""
"The number of minutes VDRAdmin adds to the broadcasts stop time found in the "
"EPG. This value is used for timers programmed by AutoTimer and timers "
"manually programmed when pressing \"Record\" in any EPG view."
msgstr ""
"Die Anzahl von Minuten, die VDRAdmin zur Stoppzeit der Sendung im EPG "
-"addiert. Dies wird jedoch nur für Timer verwendet, die vom AutoTimer oder "
+"addiert. Dies wird jedoch nur für Timer verwendet, die vom AutoTimer oder "
"manuell durch Klicken von \"Aufnehmen\" in einer beliebigen EPG-Ansicht "
"programmiert werden."
-#: ../template/default/help_config.html:119
+#: ../template/default/help_config.html:125
msgid ""
"Enable or disable live streaming using the <a href=\"http://www.magoa.net/"
"linux/\">streamdev plugin</a>. You also have to set the correct <span class="
"\"ref_label\">HTTP Port for Streamdev</span> below."
msgstr ""
-"Aktivieren oder deaktivieren des Streamens vom LiveTV. Dazu benötigen Sie "
-"das <a href=\"http://www.magoa.net/linux/\">streamdev plugin</a>. Außerdem "
+"Aktivieren oder deaktivieren des Streamens vom LiveTV. Dazu benötigen Sie "
+"das <a href=\"http://www.magoa.net/linux/\">streamdev plugin</a>. Außerdem "
"muss noch der <span class=\"ref_label\">HTTP-Port von Streamdev</span> "
"korrekt gesetzt sein."
-#: ../template/default/help_config.html:121
+#: ../template/default/help_config.html:127
msgid ""
"Here you have to set the port number your VDR's streamdev server listens for "
"connections. Additionally you can also provide the stream type you like to "
"use."
msgstr ""
-"Hier geben Sie die Portnummer des Streamdev-Servers im VDR an. Sie können "
+"Hier geben Sie die Portnummer des Streamdev-Servers im VDR an. Sie können "
"auch den zu verwendenden Streamtyp angeben."
-#: ../template/default/help_config.html:123
+#: ../template/default/help_config.html:129
msgid ""
"Enable or disable streaming of recordings.<br />Well actually this is no "
"real \"streaming\", but you have to setup your workstation so that it can "
@@ -1017,83 +1028,84 @@ msgid ""
"display."
msgstr ""
"Streamen von Aufnahmen aktivieren oder deaktivieren.<br />Es ist eigentlich "
-"kein richtiges \"Streamen\", Sie müssen nämlich Ihren PC so konfigurieren, "
-"dass dieser auf die Aufnahmen des VDR zugreifen kann. Sie können dies z.B. "
+"kein richtiges \"Streamen\", Sie müssen nämlich Ihren PC so konfigurieren, "
+"dass dieser auf die Aufnahmen des VDR zugreifen kann. Sie können dies z.B. "
"mit Samba oder NFS erreichen. VDRAdmin erstellt eine Abspielliste "
-"(Playlist), die alle Teile der ausgewählten Aufnahme enthält, und sendet "
+"(Playlist), die alle Teile der ausgewählten Aufnahme enthält, und sendet "
"diese dann zum Browser. Wenn nun der Browser und das Medienabspielprogramm "
"korrekt konfiguriert sind wird die Aufnahme am PC abgespielt."
-#: ../template/default/help_config.html:125
+#: ../template/default/help_config.html:131
msgid ""
"This is the path where your workstation can access VDR's recordings. This "
"depends on your VDR and workstation setup, for example \"\\\\vdr\\videos\" "
"or \"V:\\\" (on Windows) or \"/mnt/videos\" (on Linux)."
msgstr ""
-"Der Pfad, über den Ihr PC auf die Aufnahmen des VDR zugreifen kann. Dieser "
-"ist abhängig von der Konfiguration des VDR und des PC und kann z.B. \"\\\\vdr"
+"Der Pfad, über den Ihr PC auf die Aufnahmen des VDR zugreifen kann. Dieser "
+"ist abhängig von der Konfiguration des VDR und des PC und kann z.B. \"\\\\vdr"
"\\videos\" oder \"V:\\\" (unter Windows) oder \"/mnt/videos\" (unter Linux) "
"sein."
-#: ../template/default/help_config.html:131
+#: ../template/default/help_config.html:137
msgid ""
"<p>This section is for experts <strong>only</strong>, i.e. you know what you "
"are doing!</p>"
msgstr ""
-"<p>Dieser Bereich ist <strong>nur</strong> für Experten, d.h. Sie wissen was "
+"<p>Dieser Bereich ist <strong>nur</strong> für Experten, d.h. Sie wissen was "
"Sie tun!</p>"
-#: ../template/default/help_config.html:134
+#: ../template/default/help_config.html:140
msgid ""
"Accessing VDR's EPG through VDR's SVDRPort seems to block VDR for some time. "
"If this option is activated VDRAdmin will read the <span class=\"ref_file"
"\">epg.data</span> file directly so that VDR doesn't get blocked."
msgstr ""
-"Das Holen des EPG über den SVDRPort scheint den VDR für einige Zeit zu "
+"Das Holen des EPG über den SVDRPort scheint den VDR für einige Zeit zu "
"blockieren. Wenn Sie diese Option aktivieren liest VDRAdmin direkt die Datei "
"<span class=\"ref_file\">epg.data</span>, so dass der VDR nicht blockiert "
"wird."
-#: ../template/default/help_config.html:136
+#: ../template/default/help_config.html:142
msgid ""
"If you've enabled the option above you need to tell VDRAdmin where the <span "
"class=\"ref_file\">epg.data</span> file is located."
msgstr ""
-"Wenn Sie die Option oberhalb aktiviert haben, dann müssen Sie VDRAdmin den "
+"Wenn Sie die Option oberhalb aktiviert haben, dann müssen Sie VDRAdmin den "
"Dateinamen inklusive komplettem Pfad zur Datei <span class=\"ref_file\">epg."
"data</span> bekannt geben."
-#: ../template/default/help_config.html:138
+#: ../template/default/help_config.html:144
msgid ""
"If you have compiled VDR with the VFAT define you have to enable this "
"option. If this option is set to the wrong value, you may have problems with "
"certain recordings if you want to stream them or run reccmds on them."
msgstr ""
-"Wenn Sie den VDR mit dem VFAT Define kompiliert haben, dann müssen Sie diese "
+"Wenn Sie den VDR mit dem VFAT Define kompiliert haben, dann müssen Sie diese "
"Option aktivieren. Wenn diese Option falsch gesetzt ist, werden Sie Probleme "
"mit bestimmten Aufnahmen haben, wenn Sie diese Streamen oder einen <span "
-"class=\"ref_file\">reccmd.conf</span> Befehl darauf ausführen lassen wollen."
+"class=\"ref_file\">reccmd.conf</span> Befehl darauf ausführen lassen wollen."
-#: ../template/default/help_config.html:144
+#: ../template/default/help_config.html:150
msgid ""
"<p>If you want to limit the number of channels used in some parts of "
"VDRAdmin, this is for you!</p><p>Use the radio buttons to activate or "
"deactivate the wanted channels in the named menu.</p><p>To add channels to "
"the list of wanted channels you have to select them in the left side "
-"selectbox and click <span class=\"submit\">&gt;&gt;&gt;&gt;&gt;</span>. If "
-"you want to remove channels from the list of wanted channels you have to "
-"select them in the right side selectbox and click <span class=\"submit\">&lt;"
-"&lt;&lt;&lt;&lt;</span>.</p>"
+"selectbox and click <input type=\"submit\" class=\"submit\" value=\"&gt;&gt;"
+"&gt;&gt;&gt;\"/>. If you want to remove channels from the list of wanted "
+"channels you have to select them in the right side selectbox and click "
+"<input type=\"submit\" class=\"submit\" value=\"&lt;&lt;&lt;&lt;&lt;\"/>.</p>"
msgstr ""
-"<p>Hiermit können Sie die Anzahl der Sender für einige Teilbereiche von "
-"VDRAdmin einschränken.</p><p>Verwenden Sie die \"Ja\"/\"Nein\"-Knöpfe um die "
-"Senderauswahl für das angegebene Menü zu aktivieren oder deaktivieren.</"
-"p><p>Zum Hinzufügen von Sendern zu der Liste der ausgewählten Sender müssen "
-"Sie die gewünschten Sender im linken Auswahlfeld markieren und die "
-"Schaltfläche <span class=\"submit\">&gt;&gt;&gt;&gt;&gt;</span> anklicken. "
-"Um Sender aus dieser Liste wieder zu entfernen müssen diese im rechten "
-"Auswahlfeld markiert werden und danach die Schaltfläche <span class=\"submit"
-"\">&lt;&lt;&lt;&lt;&lt;</span> angeklickt werden.</p>"
+"<p>Hiermit können Sie die Anzahl der Sender für einige Teilbereiche von "
+"VDRAdmin einschränken.</p><p>Verwenden Sie die \"Ja\"/\"Nein\"-Knöpfe um die "
+"Senderauswahl für das angegebene Menü zu aktivieren oder deaktivieren.</"
+"p><p>Zum Hinzufügen von Sendern zu der Liste der ausgewählten Sender müssen "
+"Sie die gewünschten Sender im linken Auswahlfeld markieren und die "
+"Schaltfläche <input type=\"submit\" class=\"submit\" value=\"&gt;&gt;&gt;&gt;"
+"&gt;\"/> anklicken. Um Sender aus dieser Liste wieder zu entfernen müssen "
+"diese im rechten Auswahlfeld markiert werden und danach die Schaltfläche "
+"<input type=\"submit\" class=\"submit\" value=\"&lt;&lt;&lt;&lt;&lt;\"/> "
+"angeklickt werden.</p>"
#: ../template/default/prog_timeline.html:119
msgid "Timeline:"
@@ -1104,10 +1116,9 @@ msgid "to"
msgstr "bis"
#: ../template/default/prog_list2.html:6
-#: ../template/default/prog_list2.html:28
-#: ../template/default/navigation.html:33
+#: ../template/default/navigation.html:33 ../vdradmind.pl:2432
msgid "Playing Today"
-msgstr "Was läuft heute?"
+msgstr "Was läuft heute?"
#: ../template/default/rec_edit.html:6 ../template/default/rec_edit.html:20
msgid "Rename Recording"
@@ -1121,7 +1132,7 @@ msgstr "Alter Titel der Aufnahme:"
msgid "New Name of Recording:"
msgstr "Neuer Titel der Aufnahme:"
-#: ../template/default/help_timer_list.html:29
+#: ../template/default/help_timer_list.html:33
msgid ""
"<p>Here you will find a listing of timers known to VDR.</p><p>On top you "
"will find a chart showing a day's timers graphically. This provides an quick "
@@ -1153,54 +1164,55 @@ msgid ""
"record.<br /><span class=\"color_inactive\">&nbsp;&nbsp;&nbsp;</span> / <img "
"src=\"bilder/poempl_grau.gif\" alt=\"inactive\" align=\"absmiddle\" /> Timer "
"is not active.</p><p>In addition to these functions you can add a new timer "
-"by clicking <span class=\"submit\">New Timer</span> at the top and you can "
-"delete a number of timers at once by checking the box in the last column of "
-"those timers and clicking <span class=\"submit\">Delete Selected Timers</"
-"span>.</p>"
+"by clicking <input type=\"submit\" class=\"submit\" value=\"New Timer\"/> at "
+"the top and you can delete a number of timers at once by checking the box in "
+"the last column of those timers and clicking <input type=\"submit\" class="
+"\"submit\" value=\"Delete Selected Timers\"/>.</p>"
msgstr ""
"<p>Hier finden Sie eine Liste von allen Timern, die VDR kennt.</p><p>Im "
-"oberen Bereich finden Sie eine grafische Repräsentation der Timer für einen "
-"Tag. Dies vermittelt Ihnen einen schnellen Überblick darüber, was an einem "
-"Tag programmiert wurde und hilft Ihnen beim Erkennen von überschneidenden "
-"Timern. Wenn Sie den Mauszeiger über einen farbigen Bereich bewegen erfahren "
-"Sie seinen Namen, die Priorität und Lebenszeit sowie seine Dauer.</"
-"p>Unterhalb der grafischen Anzeige sehen Sie eine Liste der programmierten "
-"Timer. Sie können die Sortierung der Liste ändern indem Sie auf die "
-"gewünschte Spaltenüberschrift klicken.</p>Für jeden Timer haben Sie die "
-"folgenden Möglichkeiten:<dl><dt>Setzen seines Zustands</dt><dd>Dies erfolgt "
-"durch Anklicken von \"Ja\", \"Nein\", \"VPS\" oder \"Auto\" in der \"Aktiv\" "
-"Spalte.</dd><dt>Schnellanzeige seiner Priorität und Lebenszeit</dt><dd>Der "
-"Mauszeiger muss dazu über den Namen des Timers bewegt werden.</"
+"oberen Bereich finden Sie eine grafische Repräsentation der Timer für einen "
+"Tag. Dies vermittelt Ihnen einen schnellen Überblick darüber, was an einem "
+"Tag programmiert wurde und hilft Ihnen beim Erkennen von überschneidenden "
+"Timern. Wenn Sie den Mauszeiger über einen farbigen Bereich bewegen erfahren "
+"Sie seinen Namen, die Priorität und Lebenszeit sowie seine Dauer.</"
+"p><p>Unterhalb der grafischen Anzeige sehen Sie eine Liste der "
+"programmierten Timer. Sie können die Sortierung der Liste ändern indem Sie "
+"auf die gewünschte Spaltenüberschrift klicken.</p><p>Für jeden Timer haben "
+"Sie die folgenden Möglichkeiten:<dl><dt>Setzen seines Zustands</dt><dd>Dies "
+"erfolgt durch Anklicken von \"Ja\", \"Nein\", \"VPS\" oder \"Auto\" in der "
+"\"Aktiv\" Spalte.</dd><dt>Schnellanzeige seiner Priorität und Lebenszeit</"
+"dt><dd>Der Mauszeiger muss dazu über den Namen des Timers bewegt werden.</"
"dd><dt>Anzeigen seinen EPG Eintrags</dt><dd>Bei Timern, bei denen die Option "
-"<span class=\"ref_label\">Automatische Timer-Überwachung</span> auf "
+"<span class=\"ref_label\">Automatische Timer-Überwachung</span> auf "
"\"Sendungskennung\" gesetzt ist, kann durch Anklicken des Timernamens der "
-"zugehörige EPG Eintrag angezeigt werden.</dd><dt>Bearbeiten eines Timers</"
-"dt><dd>Sie können einen Timer bearbeiten indem Sie auf <img src=\"bilder/"
-"edit.gif\" alt=\"edit\" /> klicken.</dd><dt>Löschen eines Timers</dt><dd>Um "
-"einen Timer zu löschen klicken Sie bitte auf <img src=\"bilder/delete.gif\" "
+"zugehörige EPG Eintrag angezeigt werden.</dd><dt>Bearbeiten eines Timers</"
+"dt><dd>Sie können einen Timer bearbeiten indem Sie auf <img src=\"bilder/"
+"edit.gif\" alt=\"edit\" /> klicken.</dd><dt>Löschen eines Timers</dt><dd>Um "
+"einen Timer zu löschen klicken Sie bitte auf <img src=\"bilder/delete.gif\" "
"alt=\"delete\" />.</dd></dl></p><p>Der Status eines jeden Timers wird durch "
"eine bestimmte Farbe angezeigt:<br /><span class=\"col_ok\">&nbsp;&nbsp;"
"&nbsp;</span> / <img src=\"bilder/poempl_gruen.gif\" alt=\"on\" align="
"\"absmiddle\" /> Der Timer ist OK und wird aufnehmen.<br /><span class="
"\"col_collision\">&nbsp;&nbsp;&nbsp;</span> / <img src=\"bilder/poempl_gelb."
-"gif\" alt=\"problem\" align=\"absmiddle\" /> Der Timer überschneidet sich "
-"mit anderen Timern. Das ist nicht kritisch, wenn genügend DVB-Karten für die "
+"gif\" alt=\"problem\" align=\"absmiddle\" /> Der Timer überschneidet sich "
+"mit anderen Timern. Das ist nicht kritisch, wenn genügend DVB-Karten für die "
"parallelen Aufnahmen vorhanden sind.<br /><span class=\"col_conflict\">&nbsp;"
"&nbsp;&nbsp;</span> / <img src=\"bilder/poempl_rot.gif\" alt=\"impossible\" "
-"align=\"absmiddle\" /> Der Timer ist kritisch und wird höchst wahrscheinlich "
+"align=\"absmiddle\" /> Der Timer ist kritisch und wird höchst wahrscheinlich "
"<strong>nicht</strong> aufnehmen.<br /><span class=\"col_inactive\">&nbsp;"
"&nbsp;&nbsp;</span> / <img src=\"bilder/poempl_grau.gif\" alt=\"inactive\" "
"align=\"absmiddle\" /> Der Timer ist nicht aktiv.\n"
-"</p><p>Zusätzlich zu diesen Funktionen können Sie einen neuen Timer "
-"programmieren indem Sie die Schaltfläche <span class=\"submit\">Neuer Timer</"
-"span> am oberen Bildschirmrand anklicken. Am unteren Bildschirmrand finden "
-"Sie die Schaltfläche <span class=\"submit\">Ausgewählte Timer löschen</"
-"span>, mit der Sie alle Timer, die Sie in der Liste in der letzten Spalte "
-"mit einem Haken versehen haben, auf einmal löschen können.</p>"
+"</p><p>Zusätzlich zu diesen Funktionen können Sie einen neuen Timer "
+"programmieren indem Sie die Schaltfläche <input type=\"submit\" class="
+"\"submit\" value=\"Neuer Timer\"/>am oberen Bildschirmrand anklicken. Am "
+"unteren Bildschirmrand finden Sie die Schaltfläche <input type=\"submit\" "
+"class=\"submit\" value=\"Ausgewählte Timer löschen\"/>, mit der Sie alle "
+"Timer, die Sie in der Liste in der letzten Spalte mit einem Haken versehen "
+"haben, auf einmal löschen können.</p>"
#: ../template/default/help_timer_new.html:32
msgid "<p>Here you can edit a timer's settings.</p>"
-msgstr "<p>Hier können Sie die Einstellungen eines Timers bearbeiten.</p>"
+msgstr "<p>Hier können Sie die Einstellungen eines Timers bearbeiten.</p>"
#: ../template/default/help_timer_new.html:35
msgid ""
@@ -1209,15 +1221,15 @@ msgid ""
"anything meanwhile."
msgstr ""
"Aktivieren bzw. Deaktivieren des Timers. Deaktivierte Timer werden weiterhin "
-"in der Liste der verfügbaren Timer geführt, so dass sie später wieder "
-"aktiviert werden können. In der Zwischenzeit nehmen Sie dann aber nichts auf."
+"in der Liste der verfügbaren Timer geführt, so dass sie später wieder "
+"aktiviert werden können. In der Zwischenzeit nehmen Sie dann aber nichts auf."
#: ../template/default/help_timer_new.html:37
msgid ""
"Depending on how this timer has been programmed you have up to three "
"possible settings:"
msgstr ""
-"Die möglichen Optionen sind abhängig davon, wie der Timer programmiert wurde:"
+"Die möglichen Optionen sind abhängig davon, wie der Timer programmiert wurde:"
#: ../template/default/help_timer_new.html:40
msgid ""
@@ -1225,18 +1237,18 @@ msgid ""
"that this only works if the provided identification is a fix and unique "
"value! This option is not available with timers programmed in VDR."
msgstr ""
-"Der Timer wird anhand der Identifikation, die die zugehörige Sendung im EPG "
-"besitzt, überwacht. Bitte beachten Sie, dass dies nur funktioniert, wenn die "
+"Der Timer wird anhand der Identifikation, die die zugehörige Sendung im EPG "
+"besitzt, überwacht. Bitte beachten Sie, dass dies nur funktioniert, wenn die "
"Identifikation im EPG fest und eindeutig ist! Diese Option ist nicht "
-"verfügbar, wenn der Timer im VDR programmiert wurde."
+"verfügbar, wenn der Timer im VDR programmiert wurde."
#: ../template/default/help_timer_new.html:42
msgid "Monitor this timer using the start and stop time."
-msgstr "Der Timer wird anhand seiner Start- und Stoppzeit überwacht."
+msgstr "Der Timer wird anhand seiner Start- und Stoppzeit überwacht."
#: ../template/default/help_timer_new.html:44
msgid "Do not monitor this timer."
-msgstr "Der Timer wird nicht überwacht."
+msgstr "Der Timer wird nicht überwacht."
#: ../template/default/help_timer_new.html:48
msgid "The channel to record."
@@ -1253,10 +1265,10 @@ msgid ""
msgstr ""
"Der Tag an dem der Timer aktiv werden soll. Der Tag kann in zwei Formaten "
"eingegeben werden:<ul><li>Zwei Ziffern (TT). Es wird der aktuelle Monat und "
-"das aktuelle Jahr verwendet.</li><li>ISO-Norm (JJJJ-MM-TT). Damit können Sie "
-"Timer soweit in der Zukunft programmieren wie Sie wollen.</li></ul>Für den "
-"Fall, dass Sie wiederkehrende Timer programmieren wollen, können Sie die "
-"sieben Schaltflächen unterhalb des Textfeldes verwenden. Markieren Sie "
+"das aktuelle Jahr verwendet.</li><li>ISO-Norm (JJJJ-MM-TT). Damit können Sie "
+"Timer soweit in der Zukunft programmieren wie Sie wollen.</li></ul>Für den "
+"Fall, dass Sie wiederkehrende Timer programmieren wollen, können Sie die "
+"sieben Schaltflächen unterhalb des Textfeldes verwenden. Markieren Sie "
"einfach das Feld des Tages an dem der Timer aktiv werden soll."
#: ../template/default/help_timer_new.html:58
@@ -1264,8 +1276,8 @@ msgid ""
"This is the time when the timer should start recording. The first text field "
"is for \"hour\", the second for \"minute\"."
msgstr ""
-"Dies ist die Startzeit der Aufnahme. Das erste Textfeld ist für die Stunde, "
-"das zweite für die Minuten."
+"Dies ist die Startzeit der Aufnahme. Das erste Textfeld ist für die Stunde, "
+"das zweite für die Minuten."
#: ../template/default/help_timer_new.html:60
msgid ""
@@ -1273,7 +1285,7 @@ msgid ""
"is for \"hour\", the second for \"minute\"."
msgstr ""
"Die Uhrzeit zu der die Aufnahme gestoppt werden soll. Das erste Textfeld ist "
-"für die Stunde, das zweite für die Minuten."
+"für die Stunde, das zweite für die Minuten."
#: ../template/default/help_timer_new.html:66
msgid ""
@@ -1288,13 +1300,13 @@ msgid ""
"blank."
msgstr ""
"Der <strong>Dateiname</strong> den dieser Timer der Aufnahme geben wird. "
-"Sollen Unterverzeichnisse angegeben werden, so müssen diese mit '~' getrennt "
-"werden, da '/' auch Teil eines regulären Programmnamens sein kann.<br /><br /"
-">Die Schlüsselwörter <strong>TITLE</strong> und <strong>EPISODE</strong> "
+"Sollen Unterverzeichnisse angegeben werden, so müssen diese mit '~' getrennt "
+"werden, da '/' auch Teil eines regulären Programmnamens sein kann.<br /><br /"
+">Die Schlüsselwörter <strong>TITLE</strong> und <strong>EPISODE</strong> "
"werden, falls vorhanden, mit der Titel- bzw. Untertitel-Information aus dem "
"EPG zur Zeit der Aufnahme ersetzt, wenn diese Daten im EPG vorhanden sind. "
-"Sollten diese Informationen nicht verfügbar sein, so wird für <strong>TITLE</"
-"strong> der Sendername und für <strong>EPISODE</strong> ein Leerzeichen "
+"Sollten diese Informationen nicht verfügbar sein, so wird für <strong>TITLE</"
+"strong> der Sendername und für <strong>EPISODE</strong> ein Leerzeichen "
"verwendet."
#: ../template/default/help_timer_new.html:68
@@ -1309,7 +1321,7 @@ msgstr ""
"\">summary.vdr</span> bzw. <span class=\"ref_file\">info.vdr</span> der "
"Aufnahme geschrieben."
-#: ../template/default/help_at_timer_list.html:29
+#: ../template/default/help_at_timer_list.html:33
msgid ""
"<p>Here you will find a listing of automatic timers (AutoTimer) known to "
"VDRAdmin.</p><p>The list shows some information on AutoTimers. You can "
@@ -1326,39 +1338,41 @@ msgid ""
"AutoTimer is OK and will automatically program matching broadcasts.<br /"
"><img src=\"bilder/poempl_grau.gif\" alt=\"inactive\" align=\"absmiddle\" /> "
"AutoTimer is not active.</p><p>In addition to these functions you can add a "
-"new AutoTimer by clicking <span class=\"submit\">New AutoTimer</span> at the "
-"top and you can delete a number of AutoTimers at once by checking the box in "
-"the last column of those timers and clicking <span class=\"submit\">Delete "
-"Selected AutoTimers</span>.</p><p>Click <span class=\"submit\">Force Update</"
-"span> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check "
+"new AutoTimer by clicking <input type=\"submit\" class=\"submit\" value="
+"\"New AutoTimer\"/> at the top and you can delete a number of AutoTimers at "
+"once by checking the box in the last column of those timers and clicking "
+"<input type=\"submit\" class=\"submit\" value=\"Delete Selected AutoTimers\"/"
+">.</p><p>Click <input type=\"submit\" class=\"submit\" value=\"Force Update"
+"\"/> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check "
"for matching AutoTimers.</p>"
msgstr ""
"<p>Hier finden Sie eine Liste aller AutoTimer, die VDRAdmin kennt.</p><p>Die "
-"Liste zeigt Ihnen einige Informationen zu den AutoTimern. Sie können die "
-"Sortierung dieser Liste ändern indem Sie auf die Spaltenüberschriften "
-"klicken.</p><p>Für jeden AutoTimer haben Sie die folgenden Möglichkeiten:"
+"Liste zeigt Ihnen einige Informationen zu den AutoTimern. Sie können die "
+"Sortierung dieser Liste ändern indem Sie auf die Spaltenüberschriften "
+"klicken.</p><p>Für jeden AutoTimer haben Sie die folgenden Möglichkeiten:"
"<dl><dt>Setzen seines Zustands</dt><dd>Durch klicken auf \"Ja\" oder \"Nein"
-"\" in der \"Aktiv\" Spalte können Sie den AutoTimer aktivieren bzw. "
-"deaktivieren.</dd><dt>Schnellanzeige seiner Priorität und Lebenszeit</"
-"dt><dd>Der Mauszeiger muss dazu über den Namen des AutoTimers bewegt werden."
-"</dd><dt>Bearbeiten eines AutoTimers</dt><dd>Sie können einen AutoTimer "
+"\" in der \"Aktiv\" Spalte können Sie den AutoTimer aktivieren bzw. "
+"deaktivieren.</dd><dt>Schnellanzeige seiner Priorität und Lebenszeit</"
+"dt><dd>Der Mauszeiger muss dazu über den Namen des AutoTimers bewegt werden."
+"</dd><dt>Bearbeiten eines AutoTimers</dt><dd>Sie können einen AutoTimer "
"bearbeiten indem Sie auf <img src=\"bilder/edit.gif\" alt=\"edit\" /> "
-"klicken.</dd><dt>Löschen eines AutoTimers</dt><dd>Um einen Timer zu löschen "
+"klicken.</dd><dt>Löschen eines AutoTimers</dt><dd>Um einen Timer zu löschen "
"klicken Sie bitte auf <img src=\"bilder/delete.gif\" alt=\"delete\" />.</"
"dd></dl></p><p>Der Status eines jeden AutoTimers wird durch eine bestimmte "
"Farbe angezeigt:<br /><img src=\"bilder/poempl_gruen.gif\" alt=\"on\" align="
-"\"absmiddle\" /> Der AutoTimer ist OK und wird automatisch übereinstimmende "
+"\"absmiddle\" /> Der AutoTimer ist OK und wird automatisch übereinstimmende "
"Sendungen programmieren.<br /><img src=\"bilder/poempl_grau.gif\" alt="
"\"inactive\" align=\"absmiddle\" /> Der AutoTimer ist nicht aktiv.</"
-"p><p>Zusätzlich zu diesen Funktionen können Sie einen neuen AutoTimer "
-"anlegen indem Sie die Schaltfläche <span class=\"submit\">Neuer AutoTimer</"
-"span> am oberen Rand anklicken. Am unteren Bildschirmrand finden Sie die "
-"Schaltfläche <span class=\"submit\">Ausgewählte AutoTimer löschen</span>, "
-"mit der Sie alle AutoTimer, die Sie in der Liste in der letzten Spalte mit "
-"einem Haken versehen haben, auf einmal löschen können.</p><p>Mit der "
-"Schaltfläche <span class=\"submit\">Manuelles Update</span> können Sie "
+"p><p>Zusätzlich zu diesen Funktionen können Sie einen neuen AutoTimer "
+"anlegen indem Sie die Schaltfläche <input type=\"submit\" class=\"submit\" "
+"value=\"Neuer AutoTimer\"/> am oberen Rand anklicken. Am unteren "
+"Bildschirmrand finden Sie die Schaltfläche <input type=\"submit\" class="
+"\"submit\" value=\"Ausgewählte AutoTimer löschen\"/>, mit der Sie alle "
+"AutoTimer, die Sie in der Liste in der letzten Spalte mit einem Haken "
+"versehen haben, auf einmal löschen können.</p><p>Mit der Schaltfläche <input "
+"type=\"submit\" class=\"submit\" value=\"Manuelles Update\"/> können Sie "
"VDRAdmin veranlassen sich mit dem VDR zu verbinden, die aktuellen EPG Daten "
-"zu holen und anschliessend nach übereinstimmenden AutoTimern zu suchen.</p>"
+"zu holen und anschliessend nach übereinstimmenden AutoTimern zu suchen.</p>"
#: ../template/default/help_at_timer_new.html:12
#: ../template/default/help_at_timer_new.html:24
@@ -1376,13 +1390,13 @@ msgid ""
"automatically for that broadcast. That's very comfortable for irregularly "
"broadcasted series or movies you don't want to miss.</p>"
msgstr ""
-"<p>Hier können Sie die Einstellungen der automatischen Timer (AutoTimer) "
-"bearbeiten.</p><p>Die AutoTimer sind eine Schlüsselfunktion des VDRAdmin. "
+"<p>Hier können Sie die Einstellungen der automatischen Timer (AutoTimer) "
+"bearbeiten.</p><p>Die AutoTimer sind eine Schlüsselfunktion des VDRAdmin. "
"Ein AutoTimer besteht aus einem oder mehreren Suchbegriffen und einigen "
-"anderen Einstellungen, die regelmäßig im Electronic Program Guide (EPG, "
-"elektronischer Programmführer) gesucht werden. Bei einer Übereinstimmung "
-"legt AutoTimer automatisch einen neuen Timer für diese Sendung im VDR an. "
-"Das ist sehr komfortable für unregelmäßig ausgestrahlte Serien oder "
+"anderen Einstellungen, die regelmäßig im Electronic Program Guide (EPG, "
+"elektronischer Programmführer) gesucht werden. Bei einer Übereinstimmung "
+"legt AutoTimer automatisch einen neuen Timer für diese Sendung im VDR an. "
+"Das ist sehr komfortable für unregelmäßig ausgestrahlte Serien oder "
"Spielfilmen, die Sie nicht vermissen wollen.</p>"
#: ../template/default/help_at_timer_new.html:38
@@ -1398,10 +1412,10 @@ msgid ""
"so this AutoTimer only programs the (one!) next matching broadcast."
msgstr ""
"Diesen AutoTimer aktivieren oder deaktivieren. Deaktivierte AutoTimer werden "
-"weiterhin in der Liste der verfügbaren AutoTimer geführt, so dass sie später "
-"wieder aktiviert werden können. In der Zwischenzeit nehmen Sie dann aber "
-"nichts auf. Darüberhinaus können Sie dies auch auf \"einmal\" setzen, so "
-"dass dieser AutoTimer nur die als nächstes übereinstimmende Sendung (eine "
+"weiterhin in der Liste der verfügbaren AutoTimer geführt, so dass sie später "
+"wieder aktiviert werden können. In der Zwischenzeit nehmen Sie dann aber "
+"nichts auf. Darüberhinaus können Sie dies auch auf \"einmal\" setzen, so "
+"dass dieser AutoTimer nur die als nächstes übereinstimmende Sendung (eine "
"einzige!) programmiert."
#: ../template/default/help_at_timer_new.html:40
@@ -1429,23 +1443,23 @@ msgid ""
"Blacklist-string) or only one episode (when using \"Enterprise~Azati Prime\" "
"as Blacklist-string)."
msgstr ""
-"Die Auswahl der richtigen Suchbegriffe entscheidet darüber ob nur die "
-"gewünschten Sendungen oder Sendungen mit ähnlichen Namen oder überhaupt "
-"nichts aufgenommen wird.<br />Groß-/Kleinschreibung spielt keine Rolle, d.h. "
-"\"Akte X\" findet das gleiche wie \"akte x\". Sie können mehrere "
-"Suchbegriffe durch Leerzeichen getrennt angeben. Diese müssen dann "
-"<strong>alle</strong> in den gewünschten Feldern der Sendung enthalten sein, "
+"Die Auswahl der richtigen Suchbegriffe entscheidet darüber ob nur die "
+"gewünschten Sendungen oder Sendungen mit ähnlichen Namen oder überhaupt "
+"nichts aufgenommen wird.<br />Groß-/Kleinschreibung spielt keine Rolle, d.h. "
+"\"Akte X\" findet das gleiche wie \"akte x\". Sie können mehrere "
+"Suchbegriffe durch Leerzeichen getrennt angeben. Diese müssen dann "
+"<strong>alle</strong> in den gewünschten Feldern der Sendung enthalten sein, "
"um gefunden zu werden.<br />Es empfiehlt sich nur Buchstaben und Zahlen in "
"den Suchbegriffen zu verwenden, da im EPG oft Doppelpunkte, Klammern und "
-"andere Zeichen fehlen.<br />Experten können auch \"regular expressions\" "
-"verwenden. Zu deren Einsatz müssen Sie jedoch einen Blick in den Quelltext "
-"von VDRAdmin werfen (nicht dokumentierte Funktion).<br /><br />Sie können "
-"auch Sendungen, die eigentlich passen würden, ausschliessen indem Sie diese "
-"Titel der Datei <i>vdradmind.bl</i> hinzufügen, pro Zeile eine Sendung. "
+"andere Zeichen fehlen.<br />Experten können auch \"regular expressions\" "
+"verwenden. Zu deren Einsatz müssen Sie jedoch einen Blick in den Quelltext "
+"von VDRAdmin werfen (nicht dokumentierte Funktion).<br /><br />Sie können "
+"auch Sendungen, die eigentlich passen würden, ausschliessen indem Sie diese "
+"Titel der Datei <i>vdradmind.bl</i> hinzufügen, pro Zeile eine Sendung. "
"Diese Datei muss sich im Konfigurationsverzeichnis von VDRAdmin befinden. "
"Wenn eine Zeile entweder auf <u>title</u> oder <u>title~subtitle</u> aus dem "
-"EPG der Sendung paßt, so wird diese Sendung nicht automatisch programmiert. "
-"Somit können Sie eine komplette Serie (z.B. mit \"Enterprise\" als Blacklist-"
+"EPG der Sendung paßt, so wird diese Sendung nicht automatisch programmiert. "
+"Somit können Sie eine komplette Serie (z.B. mit \"Enterprise\" als Blacklist-"
"Eintrag) oder nur eine bestimmte Episode (z.B. \"Enterprise~Azati Prime\") "
"ausschliessen."
@@ -1479,35 +1493,35 @@ msgid ""
"known or wanted channels. You can define the wanted channels for AutoTimer "
"in \"Configuration\"."
msgstr ""
-"Der Sender, der auf übereinstimmende Sendungen durchsucht werden soll. Mit "
-"\"alle\" werden alle bekannten oder erwünschten Sender durchsucht. Die "
-"erwünschten Sender für den AutoTimer können auf der \"Konfiguration\" Seite "
+"Der Sender, der auf übereinstimmende Sendungen durchsucht werden soll. Mit "
+"\"alle\" werden alle bekannten oder erwünschten Sender durchsucht. Die "
+"erwünschten Sender für den AutoTimer können auf der \"Konfiguration\" Seite "
"eingestellt werden."
#: ../template/default/help_at_timer_new.html:48
#: ../template/default/at_timer_new.html:106
msgid "Starts After:"
-msgstr "Beginnt frühestens:"
+msgstr "Beginnt frühestens:"
#: ../template/default/help_at_timer_new.html:49
msgid ""
"A broadcast must start after the time entered here to match. The first text "
"field is for \"hour\", the second for \"minute\"."
msgstr ""
-"Eine Sendung darf frühestens zu der hier eingestellten Uhrzeit beginnen. Das "
+"Eine Sendung darf frühestens zu der hier eingestellten Uhrzeit beginnen. Das "
"erste Textfeld gibt die Stunden, das zweite die Minuten an."
#: ../template/default/help_at_timer_new.html:50
#: ../template/default/at_timer_new.html:117
msgid "Ends Before:"
-msgstr "Endet spätestens:"
+msgstr "Endet spätestens:"
#: ../template/default/help_at_timer_new.html:51
msgid ""
"A broadcast must end before the time entered here to match. The first text "
"field is for \"hour\", the second for \"minute\"."
msgstr ""
-"Eine Sendung darf spätestens zu der hier eingestellten Uhrzeit aufhören. Das "
+"Eine Sendung darf spätestens zu der hier eingestellten Uhrzeit aufhören. Das "
"erste Textfeld gibt die Stunden, das zweite die Minuten an."
#: ../template/default/help_at_timer_new.html:56
@@ -1521,7 +1535,7 @@ msgid ""
"to the recording's file name."
msgstr ""
"Aktivieren Sie diese Option, wenn Sie wollen, dass VDRAdmin den Untertitel "
-"der Sendung aus dem EPG an den Namen der Aufnahme anhängt."
+"der Sendung aus dem EPG an den Namen der Aufnahme anhängt."
#: ../template/default/help_at_timer_new.html:58
#: ../template/default/at_timer_new.html:152
@@ -1535,8 +1549,8 @@ msgid ""
"have been programmed automatically in the timers listing."
msgstr ""
"Wenn Sie diese Option aktivieren merkt sich VDRAdmin die Timer, die er "
-"bereits automatisch programmiert hat. Dies ist nützlich, wenn automatisch "
-"programmierte Timer in der Timerliste deaktiviert oder gelöscht werden "
+"bereits automatisch programmiert hat. Dies ist nützlich, wenn automatisch "
+"programmierte Timer in der Timerliste deaktiviert oder gelöscht werden "
"sollen."
#: ../template/default/help_at_timer_new.html:60
@@ -1569,11 +1583,11 @@ msgid ""
"resulting string."
msgstr ""
"Hier geben Sie das Verzeichnis an, in dem dieser AutoTimer die Aufnahmen "
-"ablegen soll. Sollen Unterverzeichnisse angegeben werden, dann müssen diese "
+"ablegen soll. Sollen Unterverzeichnisse angegeben werden, dann müssen diese "
"mit '~' getrennt werden (da '/' auch Teil des Programmnamens sein kann).<br /"
-">VDRAdmin wird automatisch den Titel un den Untertitel (wenn das Häkchen bei "
-"\"Serie\" gesetzt ist) anhängen.<br /><br />Sie können auch die folgenden "
-"Schlüsselwörter verwenden, die dann im endgültigen Dateinamen mit den Werten "
+">VDRAdmin wird automatisch den Titel un den Untertitel (wenn das Häkchen bei "
+"\"Serie\" gesetzt ist) anhängen.<br /><br />Sie können auch die folgenden "
+"Schlüsselwörter verwenden, die dann im endgültigen Dateinamen mit den Werten "
"ersetzt werden, die z.B. von <a href=\"http://tvmovie2vdr.vdr-developer.org"
"\">tvm2vdr</a> bereitgestellt wurden:<ul><li>%Title% - der Titel der Sendung."
"</li><li>%Subtitle% - der Untertitel der Sendung.</li><li>%Director% - der "
@@ -1584,10 +1598,10 @@ msgstr ""
"Originaltitle% - der Originaltitel der Sendung.</li><li>%FSK% - die FSK-"
"Freigabe der Sendung.</li><li>%Episode% - der Titel der Episode einer Serie."
"</li><li>%Rating% - die Bewertung der Sendung vom Bereitsteller des EPG.</"
-"li></ul><h4>Achtung:</h4>Wenn Sie die oben genannten Schlüsselwörter "
+"li></ul><h4>Achtung:</h4>Wenn Sie die oben genannten Schlüsselwörter "
"verwenden, liegt es in Ihrer Verantwortung den <strong>kompletten "
"Dateinamen</strong> der Aufnahme anzugeben! VDRAdmin wird nichts mehr "
-"anhängen."
+"anhängen."
#: ../template/default/help_rec_list.html:29
msgid ""
@@ -1615,21 +1629,21 @@ msgid ""
"\">Configuration</span> menu. You can watch the recording at your "
"workstation.</dd></dl></p><p>In addition to these functions you can delete a "
"number of recordings at once by checking the box in the last but one column "
-"of those recordings and clicking <span class=\"submit\">Delete Selected "
-"Recordings</span>.</p><p>If you've set the path the VDR's configuration "
-"files and have entries in VDR's <span class=\"ref_file\">reccmds.conf</span> "
-"you can run those commands for the selected recording by selecting the "
-"wanted command in the select box locate next to <span class=\"ref_label"
-"\">Commands:</span> and pressing the <span class=\"submit\">Run</span> "
-"button.</p>"
+"of those recordings and clicking <input type=\"submit\" class=\"submit\" "
+"value=\"Delete Selected Recordings\"/>.</p><p>If you've set the path the "
+"VDR's configuration files and have entries in VDR's <span class=\"ref_file"
+"\">reccmds.conf</span> you can run those commands for the selected recording "
+"by selecting the wanted command in the select box locate next to <span class="
+"\"ref_label\">Commands:</span> and pressing the <input type=\"submit\" class="
+"\"submit\" value=\"Run\"/> button.</p>"
msgstr ""
"<p>Hier sehen Sie eine Liste aller Aufnahmen, die auf dem VDR bereit stehen. "
-"In der Kopfzeile können Sie den gesamten und den freien Plattenplatz des VDR "
+"In der Kopfzeile können Sie den gesamten und den freien Plattenplatz des VDR "
"ablesen.</p><p>Dies Liste zeigt Ihnen einige Informationen zu den Aufnahmen. "
-"Sie können die Sortierung ändern indem Sie auf die Spaltenüberschriften "
-"klicken. Über der Liste sehen Sie den Navigationspfad. Wenn Sie den Inhalt "
+"Sie können die Sortierung ändern indem Sie auf die Spaltenüberschriften "
+"klicken. Über der Liste sehen Sie den Navigationspfad. Wenn Sie den Inhalt "
"eines zuvor besuchten Verzeichnisses sehen wollen, dann klicken Sie einfach "
-"auf den Namen des Verzeichnisses in diesem Pfad.</p><p>Jede Zeile enthält "
+"auf den Namen des Verzeichnisses in diesem Pfad.</p><p>Jede Zeile enthält "
"folgende Information:<dl><dt>Datum</dt><dd>Das Datum an dem die Aufnahme "
"stattgefunden hat. Im Falle eines Verzeichnisses wird hier die Anzahl der "
"enthaltenen Aufnahmen angezeigt.</dd><dt>Uhrzeit</dt><dd>Die Uhrzeit zu der "
@@ -1641,24 +1655,24 @@ msgstr ""
"alt=\"edit\" />)</dt><dd>Umbenennen einer Aufnahme.<br /><h4>Achtung:</"
"h4>Dies funktioniert nur, wenn der VDR das <u>RENR</u> SVDRPort Kommando "
"versteht. Dieses ist nicht im Standard-VDR enthalten sondern kann durch "
-"einen Patch hinzugefügt werden. <span class=\"ref_file\">vdr-"
+"einen Patch hinzugefügt werden. <span class=\"ref_file\">vdr-"
"aio21_svdrprename.patch</span> und <span class=\"ref_file\">enAIO-v2.2+</"
-"span> bieten dieses Kommando.</dd><dt>Löschen (<img src=\"bilder/delete.gif"
-"\" alt=\"delete\" />)</dt><dd>Löschen einer Aufnahme.</dd><dt>Streamen (<img "
+"span> bieten dieses Kommando.</dd><dt>Löschen (<img src=\"bilder/delete.gif"
+"\" alt=\"delete\" />)</dt><dd>Löschen einer Aufnahme.</dd><dt>Streamen (<img "
"src=\"bilder/stream.jpg\" alt=\"stream\" />)</dt><dd>Diese Spalte wird nur "
"angezeigt, wenn Sie auf der <span class=\"ref_menu\">Konfiguration</span> "
"Seite <span class=\"ref_label\">Aufnahmen streamen</span> aktiviert und "
-"konfiguriert haben. Sie können dann die Aufnahme auf Ihrem PC anschauen.</"
-"dd></dl></p><p>Zusätzlich zu diesen Funktionen können Sie mehrere Aufnahmen "
-"auf einmal löschen, indem Sie ein Häkchen in der vorletzten Spalte dieser "
-"Aufnahmen setzen und dann die Schaltfläche <span class=\"submit"
-"\">Ausgewählte Aufnahmen löschen</span> anklicken.</p><p>Wenn Sie den Pfad "
-"zu den VDR Konfigurationsdateien eingestellt haben und es dort die Datei "
-"<span class=\"ref_file\">reccmds.conf</span> gibt, können Sie die darin "
-"enthaltenen Befehle für die ausgewählten Aufnahmen ausführen. Dazu wählen "
-"Sie den gewünschten Befehl in der Schaltfläche neben <span class=\"ref_label"
-"\">Befehle:</span> aus und klicken dann auf <span class=\"submit"
-"\">Ausführen</span>.</p>"
+"konfiguriert haben. Sie können dann die Aufnahme auf Ihrem PC anschauen.</"
+"dd></dl></p><p>Zusätzlich zu diesen Funktionen können Sie mehrere Aufnahmen "
+"auf einmal löschen, indem Sie ein Häkchen in der vorletzten Spalte dieser "
+"Aufnahmen setzen und dann die Schaltfläche <input type=\"submit\" class="
+"\"submit\" value=\"Ausgewählte Aufnahmen löschen\"/> anklicken.</p><p>Wenn "
+"Sie den Pfad zu den VDR Konfigurationsdateien eingestellt haben und es dort "
+"die Datei <span class=\"ref_file\">reccmds.conf</span> gibt, können Sie die "
+"darin enthaltenen Befehle für die ausgewählten Aufnahmen ausführen. Dazu "
+"wählen Sie den gewünschten Befehl in der Schaltfläche neben <span class="
+"\"ref_label\">Befehle:</span> aus und klicken dann auf <input type=\"submit"
+"\" class=\"submit\" value=\"Ausführen\"/>.</p>"
#: ../template/default/at_timer_new.html:6
#: ../template/default/at_timer_new.html:20
@@ -1694,51 +1708,60 @@ msgstr "Fernseher"
msgid "Search"
msgstr "Suchen"
-#: ../vdradmind.pl:251
+#: ../vdradmind.pl:265
msgid "What's your VDR hostname (e.g video.intra.net)?"
msgstr "Wie lautet der Hostname des VDR (z.B. video.intra.net)?"
-#: ../vdradmind.pl:252
+#: ../vdradmind.pl:266
msgid "On which port does VDR listen to SVDRP queries?"
-msgstr "Auf welchem Port hört der VDR auf SVDRP-Anfragen?"
+msgstr "Auf welchem Port hört der VDR auf SVDRP-Anfragen?"
-#: ../vdradmind.pl:253
+#: ../vdradmind.pl:267
msgid "On which address should VDRAdmin listen (0.0.0.0 for any)?"
msgstr ""
-"An welcher Adresse soll VDRAdmin auf Verbindungen warten (0.0.0.0 für alle)?"
+"An welcher Adresse soll VDRAdmin auf Verbindungen warten (0.0.0.0 für alle)?"
-#: ../vdradmind.pl:254
+#: ../vdradmind.pl:268
msgid "On which port should VDRAdmin listen?"
-msgstr "Auf welchem Port soll VDRAdmin hören?"
+msgstr "Auf welchem Port soll VDRAdmin hören?"
-#: ../vdradmind.pl:255
+#: ../vdradmind.pl:269
msgid "Username?"
msgstr "Benutzername?"
-#: ../vdradmind.pl:256
+#: ../vdradmind.pl:270
msgid "Password?"
msgstr "Passwort?"
-#: ../vdradmind.pl:257
+#: ../vdradmind.pl:271
msgid "Where are your recordings stored?"
msgstr "Wo befinden sich die Aufnahmen?"
-#: ../vdradmind.pl:258
+#: ../vdradmind.pl:272
msgid "Where are your VDR's configuration files located?"
msgstr "Wo befinden sich die Konfigurationsdateien des VDR?"
-#: ../vdradmind.pl:264
+#: ../vdradmind.pl:278
msgid "Config file written successfully."
msgstr "Konfigurationsdatei wurde erfolgreich geschrieben."
-#: ../vdradmind.pl:312
+#: ../vdradmind.pl:326
#, perl-format
msgid "vdradmind.pl %s started with pid %d."
-msgstr "vdradmind.pl %s wurde mit der Prozeß-ID %d gestartet."
+msgstr "vdradmind.pl %s wurde mit der Prozeß-ID %d gestartet."
+
+#: ../vdradmind.pl:2432
+msgid "Playing Tomorrow"
+msgstr "Was läuft morgen"
+
+#: ../vdradmind.pl:2432
+#, perl-format
+msgid "Playing on the %d."
+msgstr "Was läuft am %d."
#: ../template/i18n.pl:3
msgid "Playing Today?"
-msgstr "Was läuft heute?"
+msgstr "Was läuft heute?"
#: ../template/i18n.pl:6
msgid "Timers"
@@ -1773,7 +1796,7 @@ msgstr "Zugriff auf Datei \"%s\" verweigert!"
#: ../template/i18n.pl:17
#, perl-format
msgid "Can't open file \"%s\"!"
-msgstr "Kann Datei \"%s\" nicht öffnen!"
+msgstr "Kann Datei \"%s\" nicht öffnen!"
#: ../template/i18n.pl:18
#, perl-format
@@ -1787,17 +1810,20 @@ msgstr "Fehler beim Senden eines Kommandos zu %s"
#: ../template/i18n.pl:23
msgid "Schedule"
-msgstr "Übersicht"
+msgstr "Übersicht"
+
+#~ msgid "In \"Channels\" / \"Playing Today\"?"
+#~ msgstr "Bei \"Programmübersicht\" / \"Was läuft heute\"?"
#~ msgid ""
#~ "Change the number of columns displayed in <span class=\"ref_menu\">What's "
#~ "On Now</span> with this option."
#~ msgstr ""
#~ "Hier kann die Anzahl der Spalten, die bei <span class=\"ref_menu\">Was "
-#~ "läuft jetzt</span> angezeigt werden, eingestellt werden."
+#~ "läuft jetzt</span> angezeigt werden, eingestellt werden."
#~ msgid "Number of columns in \"What's On Now\":"
-#~ msgstr "Anzahl der Spalten bei \"Was läuft jetzt\"?"
+#~ msgstr "Anzahl der Spalten bei \"Was läuft jetzt\"?"
#~ msgid "more"
#~ msgstr "mehr"
diff --git a/po/es.po b/po/es.po
index 8939ded..c1851cd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDRAdmin-0.97-AM3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-12 13:18+0200\n"
+"POT-Creation-Date: 2005-09-23 10:28+0200\n"
"PO-Revision-Date: 2005-07-06 19:40+0100\n"
"Last-Translator: r.Jung <r_jung@web.de>\n"
"Language-Team: Rudi <LL.org>\n"
@@ -62,8 +62,8 @@ msgid "Edit Timer"
msgstr "Modificar programación"
#: ../template/default/timer_new.html:53
-#: ../template/default/at_timer_list.html:47
-#: ../template/default/config.html:23 ../template/default/timer_list.html:55
+#: ../template/default/at_timer_list.html:39
+#: ../template/default/config.html:23 ../template/default/timer_list.html:47
#: ../template/default/rec_list.html:27
#: ../template/default/at_timer_new.html:24
msgid "Help"
@@ -75,13 +75,13 @@ msgid "Timer Active:"
msgstr "Programación activada:"
#: ../template/default/timer_new.html:75
-#: ../template/default/at_timer_list.html:135
-#: ../template/default/config.html:164 ../template/default/config.html:235
-#: ../template/default/config.html:337 ../template/default/config.html:352
-#: ../template/default/config.html:400 ../template/default/config.html:415
-#: ../template/default/config.html:446 ../template/default/config.html:455
-#: ../template/default/config.html:464 ../template/default/config.html:473
-#: ../template/default/timer_list.html:325
+#: ../template/default/at_timer_list.html:128
+#: ../template/default/config.html:170 ../template/default/config.html:241
+#: ../template/default/config.html:343 ../template/default/config.html:358
+#: ../template/default/config.html:406 ../template/default/config.html:421
+#: ../template/default/config.html:452 ../template/default/config.html:461
+#: ../template/default/config.html:470 ../template/default/config.html:479
+#: ../template/default/config.html:488 ../template/default/timer_list.html:318
#: ../template/default/at_timer_new.html:48
#: ../template/default/at_timer_new.html:52
#: ../template/default/at_timer_new.html:154
@@ -89,13 +89,13 @@ msgid "Yes"
msgstr "Sí"
#: ../template/default/timer_new.html:76
-#: ../template/default/at_timer_list.html:137
-#: ../template/default/config.html:165 ../template/default/config.html:236
-#: ../template/default/config.html:338 ../template/default/config.html:353
-#: ../template/default/config.html:401 ../template/default/config.html:416
-#: ../template/default/config.html:447 ../template/default/config.html:456
-#: ../template/default/config.html:465 ../template/default/config.html:474
-#: ../template/default/timer_list.html:326
+#: ../template/default/at_timer_list.html:130
+#: ../template/default/config.html:171 ../template/default/config.html:242
+#: ../template/default/config.html:344 ../template/default/config.html:359
+#: ../template/default/config.html:407 ../template/default/config.html:422
+#: ../template/default/config.html:453 ../template/default/config.html:462
+#: ../template/default/config.html:471 ../template/default/config.html:480
+#: ../template/default/config.html:489 ../template/default/timer_list.html:319
#: ../template/default/at_timer_new.html:49
#: ../template/default/at_timer_new.html:53
#: ../template/default/at_timer_new.html:155
@@ -117,13 +117,12 @@ msgstr "Identificador de la emisora"
msgid "Time"
msgstr "hora"
-#: ../template/default/timer_new.html:88 ../template/default/tv.html:181
+#: ../template/default/timer_new.html:88 ../template/default/tv.html:180
#: ../template/default/help_timer_new.html:43
msgid "off"
msgstr "apagado"
#: ../template/default/timer_new.html:94 ../template/default/prog_list.html:27
-#: ../template/default/prog_list2.html:30
#: ../template/default/help_timer_new.html:47
#: ../template/default/help_at_timer_new.html:46
#: ../template/default/at_timer_new.html:93
@@ -194,10 +193,10 @@ msgstr "Fin:"
#: ../template/default/timer_new.html:144
#: ../template/default/at_timer_list.html:21
-#: ../template/default/config.html:248 ../template/default/config.html:292
+#: ../template/default/config.html:254 ../template/default/config.html:298
#: ../template/default/timer_list.html:24
-#: ../template/default/help_config.html:94
-#: ../template/default/help_config.html:104
+#: ../template/default/help_config.html:100
+#: ../template/default/help_config.html:110
#: ../template/default/help_timer_new.html:61
#: ../template/default/help_at_timer_new.html:52
#: ../template/default/at_timer_new.html:128
@@ -206,10 +205,10 @@ msgstr "Prioridad:"
#: ../template/default/timer_new.html:150
#: ../template/default/at_timer_list.html:21
-#: ../template/default/config.html:254 ../template/default/config.html:298
+#: ../template/default/config.html:260 ../template/default/config.html:304
#: ../template/default/timer_list.html:24
-#: ../template/default/help_config.html:96
-#: ../template/default/help_config.html:106
+#: ../template/default/help_config.html:102
+#: ../template/default/help_config.html:112
#: ../template/default/help_timer_new.html:63
#: ../template/default/help_at_timer_new.html:54
#: ../template/default/at_timer_new.html:136
@@ -226,7 +225,7 @@ msgstr "Título de la grabación:"
msgid "Summary:"
msgstr "Resumen:"
-#: ../template/default/timer_new.html:174 ../template/default/config.html:511
+#: ../template/default/timer_new.html:174 ../template/default/config.html:526
#: ../template/default/at_timer_new.html:176
msgid "Save"
msgstr "Guardar"
@@ -271,80 +270,80 @@ msgstr ""
"p.e.) o por que tú navegador no soporta la forma de acceso."
#: ../template/default/at_timer_list.html:6
-#: ../template/default/at_timer_list.html:30
-#: ../template/default/config.html:223 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:88
+#: ../template/default/at_timer_list.html:31
+#: ../template/default/config.html:229 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:94
#: ../template/default/help_at_timer_list.html:6
-#: ../template/default/help_at_timer_list.html:18
+#: ../template/default/help_at_timer_list.html:22
#: ../template/default/navigation.html:49
msgid "AutoTimer"
msgstr "Autoprogramaciones"
-#: ../template/default/at_timer_list.html:38
+#: ../template/default/at_timer_list.html:34
msgid "New AutoTimer"
msgstr "Añadir autoprogramación"
-#: ../template/default/at_timer_list.html:60
-#: ../template/default/timer_list.html:223
+#: ../template/default/at_timer_list.html:53
+#: ../template/default/timer_list.html:216
msgid "Active"
msgstr "Activada"
-#: ../template/default/at_timer_list.html:71
-#: ../template/default/timer_list.html:234
+#: ../template/default/at_timer_list.html:64
+#: ../template/default/timer_list.html:227
msgid "Channel"
msgstr "Emisora"
-#: ../template/default/at_timer_list.html:82
-#: ../template/default/timer_list.html:256
+#: ../template/default/at_timer_list.html:75
+#: ../template/default/timer_list.html:249
msgid "Start"
msgstr "Comienzo"
-#: ../template/default/at_timer_list.html:93
-#: ../template/default/timer_list.html:267
+#: ../template/default/at_timer_list.html:86
+#: ../template/default/timer_list.html:260
msgid "Stop"
msgstr "Fin"
-#: ../template/default/at_timer_list.html:104
-#: ../template/default/timer_list.html:278
+#: ../template/default/at_timer_list.html:97
+#: ../template/default/timer_list.html:271
#: ../template/default/rec_list.html:81
msgid "Name"
msgstr "Título"
-#: ../template/default/at_timer_list.html:115
-#: ../template/default/timer_list.html:289
+#: ../template/default/at_timer_list.html:108
+#: ../template/default/timer_list.html:282
#: ../template/default/rec_list.html:92
msgid "Select all/none"
msgstr "Seleccionar todas/ninguna"
-#: ../template/default/at_timer_list.html:163
-#: ../template/default/timer_list.html:355
+#: ../template/default/at_timer_list.html:156
+#: ../template/default/timer_list.html:348
msgid "Edit"
msgstr "Modificar"
-#: ../template/default/at_timer_list.html:168
-#: ../template/default/timer_list.html:358
+#: ../template/default/at_timer_list.html:161
+#: ../template/default/timer_list.html:351
msgid "Delete timer?"
msgstr "¿Borrar programación?"
-#: ../template/default/at_timer_list.html:168
-#: ../template/default/timer_list.html:358
+#: ../template/default/at_timer_list.html:161
+#: ../template/default/timer_list.html:351
#: ../template/default/rec_list.html:140
msgid "Delete"
msgstr "Borrar"
-#: ../template/default/at_timer_list.html:199
+#: ../template/default/at_timer_list.html:188
msgid "Force Update"
msgstr "Actualizar ahora"
-#: ../template/default/at_timer_list.html:210
-#: ../template/default/timer_list.html:382
-msgid "Delete all selected timers?"
-msgstr "¿Estas seguro de que deseas borrar las programaciones elegidas?"
-
-#: ../template/default/at_timer_list.html:210
+#: ../template/default/at_timer_list.html:191
msgid "Delete Selected AutoTimers"
msgstr "Borrar autoprogramaciones elegidas"
+#: ../template/default/at_timer_list.html:191
+#: ../template/default/timer_list.html:374
+msgid "Delete all selected timers?"
+msgstr "¿Estas seguro de que deseas borrar las programaciones elegidas?"
+
#: ../template/default/prog_summary.html:7
#: ../template/default/prog_timeline.html:7
#: ../template/default/navigation.html:29 ../template/i18n.pl:2
@@ -368,7 +367,7 @@ msgstr " a la/s:"
#: ../template/default/prog_summary.html:43
#: ../template/default/prog_list.html:23 ../template/default/rec_list.html:149
-#: ../template/default/prog_list2.html:54
+#: ../template/default/prog_list2.html:56
msgid "Stream"
msgstr "Flujo"
@@ -390,13 +389,13 @@ msgstr "Grabar estreno"
#: ../template/default/config.html:5 ../template/default/config.html:19
#: ../template/default/help_config.html:9
-#: ../template/default/help_config.html:21
+#: ../template/default/help_config.html:25
#: ../template/default/navigation.html:57
msgid "Configuration"
msgstr "Configuraciones"
-#: ../template/default/config.html:36 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:36
+#: ../template/default/config.html:36 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:40
msgid "General Settings"
msgstr "Propiedades generales"
@@ -404,187 +403,195 @@ msgstr "Propiedades generales"
msgid "Template:"
msgstr "Interfaz:"
-#: ../template/default/config.html:60 ../template/default/help_config.html:38
+#: ../template/default/config.html:60 ../template/default/help_config.html:42
msgid "Skin:"
msgstr "Piel:"
-#: ../template/default/config.html:72 ../template/default/help_config.html:40
+#: ../template/default/config.html:72 ../template/default/help_config.html:44
msgid "Login Page:"
msgstr "Página de inicio:"
-#: ../template/default/config.html:82 ../template/default/config.html:396
+#: ../template/default/config.html:82 ../template/default/config.html:402
msgid "Gets active after restarting VDRAdmin"
msgstr "Se activará despúes de reiniciar VDRAdmin"
-#: ../template/default/config.html:84 ../template/default/help_config.html:42
+#: ../template/default/config.html:84 ../template/default/help_config.html:46
msgid "Number of channels to use:"
msgstr "Cantidad de emisoras en uso:"
-#: ../template/default/config.html:90 ../template/default/help_config.html:44
+#: ../template/default/config.html:90 ../template/default/help_config.html:48
msgid "Local net (no login required):"
msgstr "Red local (sin contraseña será)"
-#: ../template/default/config.html:104 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:50
+#: ../template/default/config.html:104 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:54
msgid "VDR"
msgstr "VDR"
-#: ../template/default/config.html:114 ../template/default/help_config.html:52
+#: ../template/default/config.html:114 ../template/default/help_config.html:56
msgid "Number of DVB cards:"
msgstr "Cantidad de tarjetas-DVB:"
-#: ../template/default/config.html:120 ../template/default/help_config.html:54
+#: ../template/default/config.html:120 ../template/default/help_config.html:58
msgid "Path to recordings:"
msgstr "Ruta de las grabaciones:"
-#: ../template/default/config.html:126 ../template/default/help_config.html:56
+#: ../template/default/config.html:126 ../template/default/help_config.html:60
msgid "Path to configuration files:"
msgstr "La ruta de los ficheros de configuración:"
-#: ../template/default/config.html:140 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:62
+#: ../template/default/config.html:132 ../template/default/help_config.html:62
+msgid "Path to EPG images:"
+msgstr ""
+
+#: ../template/default/config.html:146 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:68
msgid "Identification"
msgstr "Identificaciones"
-#: ../template/default/config.html:150 ../template/default/help_config.html:64
+#: ../template/default/config.html:156 ../template/default/help_config.html:70
msgid "Username:"
msgstr "Nombre del usuario:"
-#: ../template/default/config.html:156 ../template/default/help_config.html:66
+#: ../template/default/config.html:162 ../template/default/help_config.html:72
msgid "Password:"
msgstr "Contraseña:"
-#: ../template/default/config.html:162 ../template/default/help_config.html:68
+#: ../template/default/config.html:168 ../template/default/help_config.html:74
msgid "Guest Account:"
msgstr "Acceso como invitado:"
-#: ../template/default/config.html:171 ../template/default/help_config.html:70
+#: ../template/default/config.html:177 ../template/default/help_config.html:76
msgid "Guest Username:"
msgstr "Nombre como invitado:"
-#: ../template/default/config.html:177 ../template/default/help_config.html:72
+#: ../template/default/config.html:183 ../template/default/help_config.html:78
msgid "Guest Password:"
msgstr "Contraseña como invitado:"
-#: ../template/default/config.html:191 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:78
+#: ../template/default/config.html:197 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:84
#: ../template/default/navigation.html:37 ../template/i18n.pl:4
msgid "Timeline"
msgstr "Tabla de tiempo"
-#: ../template/default/config.html:201 ../template/default/help_config.html:80
+#: ../template/default/config.html:207 ../template/default/help_config.html:86
msgid "Hours:"
msgstr "Rango de hora/s:"
-#: ../template/default/config.html:207 ../template/default/help_config.html:82
+#: ../template/default/config.html:213 ../template/default/help_config.html:88
msgid "Times:"
msgstr "Horas:"
-#: ../template/default/config.html:233 ../template/default/help_config.html:90
+#: ../template/default/config.html:239 ../template/default/help_config.html:96
msgid "Active:"
msgstr "Activada:"
-#: ../template/default/config.html:242 ../template/default/help_config.html:92
+#: ../template/default/config.html:248 ../template/default/help_config.html:98
msgid "Timeout:"
msgstr "Actualización cada:"
-#: ../template/default/config.html:243 ../template/default/config.html:305
-#: ../template/default/config.html:311
+#: ../template/default/config.html:249 ../template/default/config.html:311
+#: ../template/default/config.html:317
msgid "minutes"
msgstr "minutos"
-#: ../template/default/config.html:261 ../template/default/config.html:304
-#: ../template/default/help_config.html:108
+#: ../template/default/config.html:267 ../template/default/config.html:310
+#: ../template/default/help_config.html:114
msgid "Time Margin at Start:"
msgstr "Más tiempo al principio:"
-#: ../template/default/config.html:267 ../template/default/config.html:310
-#: ../template/default/help_config.html:110
+#: ../template/default/config.html:273 ../template/default/config.html:316
+#: ../template/default/help_config.html:116
msgid "Time Margin at Stop:"
msgstr "Más tiempo al final:"
-#: ../template/default/config.html:282 ../template/default/timer_list.html:6
-#: ../template/default/timer_list.html:39
-#: ../template/default/help_config.html:34
-#: ../template/default/help_config.html:102
+#: ../template/default/config.html:288 ../template/default/timer_list.html:6
+#: ../template/default/timer_list.html:40
+#: ../template/default/help_config.html:38
+#: ../template/default/help_config.html:108
#: ../template/default/help_timer_list.html:6
-#: ../template/default/help_timer_list.html:18
+#: ../template/default/help_timer_list.html:22
#: ../template/default/navigation.html:45
msgid "Timer"
msgstr "Programaciones"
-#: ../template/default/config.html:325 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:116
+#: ../template/default/config.html:331 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:122
msgid "Streaming"
msgstr "Flujo"
-#: ../template/default/config.html:335
-#: ../template/default/help_config.html:118
+#: ../template/default/config.html:341
+#: ../template/default/help_config.html:124
msgid "Live Streaming:"
msgstr "Flujo en vivo:"
-#: ../template/default/config.html:344
-#: ../template/default/help_config.html:120
+#: ../template/default/config.html:350
+#: ../template/default/help_config.html:126
msgid "HTTP Port of Streamdev (also possible 3000/ts):"
msgstr "Puerto-HTTP para el flujo (3000/ts también posible):"
-#: ../template/default/config.html:350
-#: ../template/default/help_config.html:122
+#: ../template/default/config.html:356
+#: ../template/default/help_config.html:128
msgid "Recordings Streaming:"
msgstr "Flujo de grabaciones:"
-#: ../template/default/config.html:359
-#: ../template/default/help_config.html:124
+#: ../template/default/config.html:365
+#: ../template/default/help_config.html:130
msgid "Path to VDR Recordings on your workstation:"
msgstr "La ruta de las grabaciones de VDR en tu ordenador"
-#: ../template/default/config.html:366
+#: ../template/default/config.html:372
msgid "Bandwidth of Streams:"
msgstr "Ancho de banda del flujo:"
-#: ../template/default/config.html:388 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:130
+#: ../template/default/config.html:394 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:136
msgid "Expert"
msgstr "Experto"
-#: ../template/default/config.html:398
-#: ../template/default/help_config.html:133
+#: ../template/default/config.html:404
+#: ../template/default/help_config.html:139
msgid "Read EPG directly using epg.data:"
msgstr "Utiliza el fichero \"epg.data\" para leer EPG:"
-#: ../template/default/config.html:407
-#: ../template/default/help_config.html:135
+#: ../template/default/config.html:413
+#: ../template/default/help_config.html:141
msgid "epg.data filename:"
msgstr "nombre del fichero \"epg.data\":"
# msgstr "¿Usar en \"Estrenos ahora\"?"
-#: ../template/default/config.html:413
-#: ../template/default/help_config.html:137
+#: ../template/default/config.html:419
+#: ../template/default/help_config.html:143
msgid "VFAT:"
msgstr "VFAT:"
-#: ../template/default/config.html:434 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:143
+#: ../template/default/config.html:440 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:149
msgid "Channel Selections"
msgstr "Emisoras preferidas"
-#: ../template/default/config.html:444
+#: ../template/default/config.html:450
msgid "In \"Timeline\"?"
msgstr "¿Usar en \"Tabla de tiempo\"?"
-#: ../template/default/config.html:453
-msgid "In \"Channels\" / \"Playing Today\"?"
-msgstr "¿Usar en \"Datos de la guía electrónica (EPG)\"?"
+#: ../template/default/config.html:459
+msgid "In \"Channels\"?"
+msgstr ""
-#: ../template/default/config.html:462
+#: ../template/default/config.html:468
+msgid "In \"Playing Today\"?"
+msgstr ""
+
+#: ../template/default/config.html:477
msgid "In \"What's On Now\"?"
msgstr "¿Usar en \"Estrenos ahora\"?"
-#: ../template/default/config.html:471
+#: ../template/default/config.html:486
msgid "In \"AutoTimer\"?"
msgstr "¿Usar en \"Autoprogramaciones\"?"
-#: ../template/default/config.html:512
+#: ../template/default/config.html:527
msgid "Apply"
msgstr "Establecer"
@@ -598,44 +605,44 @@ msgstr "Duración:"
msgid "min"
msgstr "min"
-#: ../template/default/timer_list.html:46
+#: ../template/default/timer_list.html:42
msgid "New Timer"
msgstr "Añadir programación"
-#: ../template/default/timer_list.html:245
+#: ../template/default/timer_list.html:238
#: ../template/default/rec_list.html:59
msgid "Date"
msgstr "Fecha"
-#: ../template/default/timer_list.html:310
+#: ../template/default/timer_list.html:303
msgid "This timer is inactive!"
msgstr "¡Ésta programación está desactivada!"
-#: ../template/default/timer_list.html:313
+#: ../template/default/timer_list.html:306
msgid "This timer is impossible!"
msgstr "¡Ésta programación es imposible!"
-#: ../template/default/timer_list.html:316
+#: ../template/default/timer_list.html:309
msgid "No more timers on other transponders possible!"
msgstr "¡No se puede añadir más programaciones!"
-#: ../template/default/timer_list.html:319
+#: ../template/default/timer_list.html:312
msgid "Timer OK."
msgstr "Ésta programación es posible."
-#: ../template/default/timer_list.html:324
+#: ../template/default/timer_list.html:317
msgid "Edit timer status?"
msgstr "¿Cambiar estado de la programación?"
-#: ../template/default/timer_list.html:327
+#: ../template/default/timer_list.html:320
msgid "VPS"
msgstr "VPS"
-#: ../template/default/timer_list.html:328
+#: ../template/default/timer_list.html:321
msgid "Auto"
msgstr "Auto"
-#: ../template/default/timer_list.html:382
+#: ../template/default/timer_list.html:374
msgid "Delete Selected Timers"
msgstr "Borrar programaciones elegidas"
@@ -645,7 +652,6 @@ msgid "Channels"
msgstr "Emisoras"
#: ../template/default/prog_list.html:33
-#: ../template/default/prog_list2.html:35
msgid "Go!"
msgstr "¡venga!"
@@ -657,50 +663,50 @@ msgstr "¡Error!"
msgid "TV"
msgstr "TV"
-#: ../template/default/tv.html:179
+#: ../template/default/tv.html:178
msgid "Interval:"
msgstr "Intervalo:"
-#: ../template/default/tv.html:182 ../template/default/tv.html:183
-#: ../template/default/tv.html:184 ../template/default/tv.html:185
-#: ../template/default/tv.html:186 ../template/default/tv.html:187
-#: ../template/default/tv.html:188
+#: ../template/default/tv.html:181 ../template/default/tv.html:182
+#: ../template/default/tv.html:183 ../template/default/tv.html:184
+#: ../template/default/tv.html:185 ../template/default/tv.html:186
+#: ../template/default/tv.html:187
msgid "sec."
msgstr "seg"
-#: ../template/default/tv.html:190 ../template/default/tv.html:197
+#: ../template/default/tv.html:189 ../template/default/tv.html:196
msgid "G"
msgstr "C"
-#: ../template/default/tv.html:190 ../template/default/tv.html:197
+#: ../template/default/tv.html:189 ../template/default/tv.html:196
msgid "Grab the picture!"
msgstr "¡Captura la imagen!"
-#: ../template/default/tv.html:191
+#: ../template/default/tv.html:190
msgid "Size:"
msgstr "Dimensiones:"
-#: ../template/default/tv.html:200
+#: ../template/default/tv.html:198
msgid "Open in separate window"
msgstr "Abrir en una ventana seperada"
-#: ../template/default/prog_detail.html:37
+#: ../template/default/prog_detail.html:43
msgid "close"
msgstr "cerrar"
-#: ../template/default/prog_detail.html:39
+#: ../template/default/prog_detail.html:45
msgid "view"
msgstr "cambiar"
-#: ../template/default/prog_detail.html:40
+#: ../template/default/prog_detail.html:46
msgid "record"
msgstr "grabar"
-#: ../template/default/prog_detail.html:41
+#: ../template/default/prog_detail.html:47
msgid "search"
msgstr "repeticiones"
-#: ../template/default/prog_detail.html:44
+#: ../template/default/prog_detail.html:50
msgid "Lookup movie in the Internet-Movie-Database (IMDb)"
msgstr "Buscar la película en la base de datos de películas en Internet (IMDb)"
@@ -759,7 +765,7 @@ msgstr "Borrar grabaciones elegidas"
msgid "Delete all selected recordings?"
msgstr "¿Estas seguro de que deseas borrar las grabaciones elegidas?"
-#: ../template/default/help_config.html:32
+#: ../template/default/help_config.html:36
msgid ""
"<p>Here you can change general settings and base settings for timers, "
"AutoTimers, channel selection and streaming parameters.</p>"
@@ -768,15 +774,15 @@ msgstr ""
"y de las autoprogramaciones, como las emisoras preferidas y además los "
"ajustes del flujo</p>"
-#: ../template/default/help_config.html:39
+#: ../template/default/help_config.html:43
msgid "The skin you want to use."
msgstr "El piel deseado."
-#: ../template/default/help_config.html:41
+#: ../template/default/help_config.html:45
msgid "The page you want to see at first connect to VDRAdmin."
msgstr "La página que quieres ver al inicio del VDRAdmin."
-#: ../template/default/help_config.html:43
+#: ../template/default/help_config.html:47
msgid ""
"VDRAdmin will load the given number of channels from VDR and present only "
"those in any fields where channels can be selected. This also limits the EPG "
@@ -799,7 +805,7 @@ msgstr ""
"puede forzar una actualización manualmente en el menú <span class=\"ref_menu"
"\">Autoprogramaciones</span> o reiniciando VDRAdmin."
-#: ../template/default/help_config.html:45
+#: ../template/default/help_config.html:49
msgid ""
"Here you can specify an IP address or range that can login without providing "
"login information. For example: \"192.168.0.0/24\" will include any IP "
@@ -811,19 +817,19 @@ msgstr ""
"\" incluye cada IP empezando en \"192.168.0\", \"192.168.0.123/32\" resulta "
"\"192.168.0.123\"."
-#: ../template/default/help_config.html:47
-#: ../template/default/help_config.html:59
-#: ../template/default/help_config.html:75
-#: ../template/default/help_config.html:85
-#: ../template/default/help_config.html:99
-#: ../template/default/help_config.html:113
-#: ../template/default/help_config.html:127
-#: ../template/default/help_config.html:140
-#: ../template/default/help_config.html:147
+#: ../template/default/help_config.html:51
+#: ../template/default/help_config.html:65
+#: ../template/default/help_config.html:81
+#: ../template/default/help_config.html:91
+#: ../template/default/help_config.html:105
+#: ../template/default/help_config.html:119
+#: ../template/default/help_config.html:133
+#: ../template/default/help_config.html:146
+#: ../template/default/help_config.html:153
msgid "Top"
msgstr "Tope"
-#: ../template/default/help_config.html:53
+#: ../template/default/help_config.html:57
msgid ""
"The number of DVB cards VDR can access. Depending on this value VDRAdmin "
"will calculate critical timers in the <span class=\"ref_menu\">Timer</span> "
@@ -833,7 +839,7 @@ msgstr ""
"calculará programaciones criticas en el menú <span class=\"ref_menu"
"\">Programaciones</span>"
-#: ../template/default/help_config.html:55
+#: ../template/default/help_config.html:59
msgid ""
"The path to VDR's recordings. It's used so that VDRAdmin can locate the "
"recordings when using <span class=\"ref_label\">Recordings Streaming</span> "
@@ -845,7 +851,7 @@ msgstr ""
"y <span class=\"ref_file\">reccmds.conf</span> en el menú <span class="
"\"ref_menu\">Grabaciones</span>."
-#: ../template/default/help_config.html:57
+#: ../template/default/help_config.html:61
msgid ""
"The path where VDR's configuration files are located. If this directory "
"contains the file <span class=\"ref_file\">reccmds.conf</span> its content "
@@ -856,16 +862,20 @@ msgstr ""
"archivo <span class=\"ref_file\">reccmds.conf</span> su contenido verás en "
"un campo de selección en el menú <span class=\"ref_menu\">Grabaciones</span>."
-#: ../template/default/help_config.html:65
+#: ../template/default/help_config.html:63
+msgid "The path where the EPG images are stored."
+msgstr ""
+
+#: ../template/default/help_config.html:71
msgid ""
"The username for the main user, i.e. the user having the most privileges."
msgstr "El nombre del usuario, p.e. el usuario con todos privilegios."
-#: ../template/default/help_config.html:67
+#: ../template/default/help_config.html:73
msgid "The main user's password."
msgstr "La contraseña del usuario."
-#: ../template/default/help_config.html:69
+#: ../template/default/help_config.html:75
msgid ""
"If you want an user account having only limited privileges, this is for you. "
"The guest user cannot modify anything, it's only allowed to view the EPG, "
@@ -875,19 +885,19 @@ msgstr ""
"permite modificar nada. Además sólo va a ver EPG, programaciones, "
"autoprogramaciones y grabaciones."
-#: ../template/default/help_config.html:71
+#: ../template/default/help_config.html:77
msgid "The username for the guest user."
msgstr "Nombre del invitado."
-#: ../template/default/help_config.html:73
+#: ../template/default/help_config.html:79
msgid "The guest user's password."
msgstr "Contraseña del invitado."
-#: ../template/default/help_config.html:81
+#: ../template/default/help_config.html:87
msgid "The number of hours to show in the timeline."
msgstr "Cantidad de horas visibles en la tabla de tiempo."
-#: ../template/default/help_config.html:83
+#: ../template/default/help_config.html:89
msgid ""
"A comma separated list of times in <strong>hh:mm</strong> format that appear "
"in the selectbox placed at the top."
@@ -895,18 +905,18 @@ msgstr ""
"Una lista separada por coma con el formato <strong>hh:mm</strong>, que "
"aparece en la lista de selección al principio de la página."
-#: ../template/default/help_config.html:91
+#: ../template/default/help_config.html:97
msgid "Activate or deactivate the AutoTimer function."
msgstr "Activar o desactivar la funcción autoprogramación"
-#: ../template/default/help_config.html:93
+#: ../template/default/help_config.html:99
msgid "The interval, the the EPG data is checked for updating the AutoTimers."
msgstr ""
"El intervalo de búsqueda que va a realizar VDRAdmin para actualizar las "
"autoprogramaciones."
-#: ../template/default/help_config.html:95
-#: ../template/default/help_config.html:105
+#: ../template/default/help_config.html:101
+#: ../template/default/help_config.html:111
#: ../template/default/help_timer_new.html:62
#: ../template/default/help_at_timer_new.html:53
msgid ""
@@ -940,8 +950,8 @@ msgstr ""
"<br />Si todas las tarjetas DVB estan ocupadas una programación va a "
"interumpir otra con una prioridad más baja, para iniciar su grabación."
-#: ../template/default/help_config.html:97
-#: ../template/default/help_config.html:107
+#: ../template/default/help_config.html:103
+#: ../template/default/help_config.html:113
#: ../template/default/help_timer_new.html:64
#: ../template/default/help_at_timer_new.html:55
msgid ""
@@ -963,7 +973,7 @@ msgstr ""
"grabación nueva, cuando se han pasado los dias ajustados y garantizados "
"desde su <strong>dia de grabación</strong>."
-#: ../template/default/help_config.html:109
+#: ../template/default/help_config.html:115
msgid ""
"The number of minutes VDRAdmin subtracts from the broadcasts start time "
"found in the EPG. This value is used for timers programmed by AutoTimer and "
@@ -974,7 +984,7 @@ msgstr ""
"programaciones programadas de Autoprogramaciones como aquellas programadas "
"haciendo clíc en \"Grabar\" en cualquier vista de EPG."
-#: ../template/default/help_config.html:111
+#: ../template/default/help_config.html:117
msgid ""
"The number of minutes VDRAdmin adds to the broadcasts stop time found in the "
"EPG. This value is used for timers programmed by AutoTimer and timers "
@@ -985,7 +995,7 @@ msgstr ""
"para programaciones programadas de Autoprogramaciones como aquellas "
"programadas haciendo clíc en \"Grabar\" en cualquier vista de EPG."
-#: ../template/default/help_config.html:119
+#: ../template/default/help_config.html:125
msgid ""
"Enable or disable live streaming using the <a href=\"http://www.magoa.net/"
"linux/\">streamdev plugin</a>. You also have to set the correct <span class="
@@ -996,7 +1006,7 @@ msgstr ""
"correctamente el <span class=\"ref_label\">puerto HTTP para flujo</span> más "
"abajo."
-#: ../template/default/help_config.html:121
+#: ../template/default/help_config.html:127
msgid ""
"Here you have to set the port number your VDR's streamdev server listens for "
"connections. Additionally you can also provide the stream type you like to "
@@ -1005,7 +1015,7 @@ msgstr ""
"Aquí se ajusta el numero del puerto del servidor del streamdev de VDR. "
"Además puedes elegir el tipo del flujo."
-#: ../template/default/help_config.html:123
+#: ../template/default/help_config.html:129
msgid ""
"Enable or disable streaming of recordings.<br />Well actually this is no "
"real \"streaming\", but you have to setup your workstation so that it can "
@@ -1023,7 +1033,7 @@ msgstr ""
"navegador y reproductor multimedia, verás las grabaciones en la pantalla del "
"ordenador."
-#: ../template/default/help_config.html:125
+#: ../template/default/help_config.html:131
msgid ""
"This is the path where your workstation can access VDR's recordings. This "
"depends on your VDR and workstation setup, for example \"\\\\vdr\\videos\" "
@@ -1033,7 +1043,7 @@ msgstr ""
"Depende de la configuración de los dos, p.e. \"\\\\vdr\\videos\" o \"V:\\"
"\" (en Windows) o \"/mnt/videos\" (en Linux)."
-#: ../template/default/help_config.html:131
+#: ../template/default/help_config.html:137
msgid ""
"<p>This section is for experts <strong>only</strong>, i.e. you know what you "
"are doing!</p>"
@@ -1041,7 +1051,7 @@ msgstr ""
"<p>Esta sección es <strong>sólo</strong> para expertos, ¡es bastante "
"importante saber que haces!</p>"
-#: ../template/default/help_config.html:134
+#: ../template/default/help_config.html:140
msgid ""
"Accessing VDR's EPG through VDR's SVDRPort seems to block VDR for some time. "
"If this option is activated VDRAdmin will read the <span class=\"ref_file"
@@ -1052,7 +1062,7 @@ msgstr ""
"fichero <span class=\"ref_file\">epg.data</span> directamente, evitando así "
"un bloqueo de VDR. "
-#: ../template/default/help_config.html:136
+#: ../template/default/help_config.html:142
msgid ""
"If you've enabled the option above you need to tell VDRAdmin where the <span "
"class=\"ref_file\">epg.data</span> file is located."
@@ -1060,7 +1070,7 @@ msgstr ""
"Si la opción de arriba está habilitada, hace falta verificar la ubicación "
"del fichero de <span class=\"ref_file\">epg.data</span> de VDRAdmin."
-#: ../template/default/help_config.html:138
+#: ../template/default/help_config.html:144
msgid ""
"If you have compiled VDR with the VFAT define you have to enable this "
"option. If this option is set to the wrong value, you may have problems with "
@@ -1070,16 +1080,17 @@ msgstr ""
"opción. Si no está activada, puede causar problemas con flujos sobre red o "
"ejecutando un orden del fichero <span class=\"ref_file\">reccmd.conf</span>."
-#: ../template/default/help_config.html:144
+#: ../template/default/help_config.html:150
+#, fuzzy
msgid ""
"<p>If you want to limit the number of channels used in some parts of "
"VDRAdmin, this is for you!</p><p>Use the radio buttons to activate or "
"deactivate the wanted channels in the named menu.</p><p>To add channels to "
"the list of wanted channels you have to select them in the left side "
-"selectbox and click <span class=\"submit\">&gt;&gt;&gt;&gt;&gt;</span>. If "
-"you want to remove channels from the list of wanted channels you have to "
-"select them in the right side selectbox and click <span class=\"submit\">&lt;"
-"&lt;&lt;&lt;&lt;</span>.</p>"
+"selectbox and click <input type=\"submit\" class=\"submit\" value=\"&gt;&gt;"
+"&gt;&gt;&gt;\"/>. If you want to remove channels from the list of wanted "
+"channels you have to select them in the right side selectbox and click "
+"<input type=\"submit\" class=\"submit\" value=\"&lt;&lt;&lt;&lt;&lt;\"/>.</p>"
msgstr ""
"<p>Aquí se puede limitar la cantidad de emisoras visibles en diferentes "
"partes del VDRAdmin!</p>\n"
@@ -1100,8 +1111,7 @@ msgid "to"
msgstr "hasta"
#: ../template/default/prog_list2.html:6
-#: ../template/default/prog_list2.html:28
-#: ../template/default/navigation.html:33
+#: ../template/default/navigation.html:33 ../vdradmind.pl:2432
msgid "Playing Today"
msgstr "Estrenos hoy"
@@ -1117,7 +1127,8 @@ msgstr "Título actual de la grabación:"
msgid "New Name of Recording:"
msgstr "Título nuevo de la grabación:"
-#: ../template/default/help_timer_list.html:29
+#: ../template/default/help_timer_list.html:33
+#, fuzzy
msgid ""
"<p>Here you will find a listing of timers known to VDR.</p><p>On top you "
"will find a chart showing a day's timers graphically. This provides an quick "
@@ -1149,10 +1160,10 @@ msgid ""
"record.<br /><span class=\"color_inactive\">&nbsp;&nbsp;&nbsp;</span> / <img "
"src=\"bilder/poempl_grau.gif\" alt=\"inactive\" align=\"absmiddle\" /> Timer "
"is not active.</p><p>In addition to these functions you can add a new timer "
-"by clicking <span class=\"submit\">New Timer</span> at the top and you can "
-"delete a number of timers at once by checking the box in the last column of "
-"those timers and clicking <span class=\"submit\">Delete Selected Timers</"
-"span>.</p>"
+"by clicking <input type=\"submit\" class=\"submit\" value=\"New Timer\"/> at "
+"the top and you can delete a number of timers at once by checking the box in "
+"the last column of those timers and clicking <input type=\"submit\" class="
+"\"submit\" value=\"Delete Selected Timers\"/>.</p>"
msgstr ""
"<p>Aquí encontarás una lista de programaciones conocidas para VDR.</p>\n"
"<p>Al tope hay un dibujo mostrando las programaciones del dia graficamente. "
@@ -1314,7 +1325,8 @@ msgstr ""
"fichero <span class=\"ref_file\">summary.vdr</span> o <span class=\"ref_file"
"\">info.vdr</span> de la grabación."
-#: ../template/default/help_at_timer_list.html:29
+#: ../template/default/help_at_timer_list.html:33
+#, fuzzy
msgid ""
"<p>Here you will find a listing of automatic timers (AutoTimer) known to "
"VDRAdmin.</p><p>The list shows some information on AutoTimers. You can "
@@ -1331,11 +1343,12 @@ msgid ""
"AutoTimer is OK and will automatically program matching broadcasts.<br /"
"><img src=\"bilder/poempl_grau.gif\" alt=\"inactive\" align=\"absmiddle\" /> "
"AutoTimer is not active.</p><p>In addition to these functions you can add a "
-"new AutoTimer by clicking <span class=\"submit\">New AutoTimer</span> at the "
-"top and you can delete a number of AutoTimers at once by checking the box in "
-"the last column of those timers and clicking <span class=\"submit\">Delete "
-"Selected AutoTimers</span>.</p><p>Click <span class=\"submit\">Force Update</"
-"span> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check "
+"new AutoTimer by clicking <input type=\"submit\" class=\"submit\" value="
+"\"New AutoTimer\"/> at the top and you can delete a number of AutoTimers at "
+"once by checking the box in the last column of those timers and clicking "
+"<input type=\"submit\" class=\"submit\" value=\"Delete Selected AutoTimers\"/"
+">.</p><p>Click <input type=\"submit\" class=\"submit\" value=\"Force Update"
+"\"/> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check "
"for matching AutoTimers.</p>"
msgstr ""
"<p>Aqui se encuentra una lista de todos las autoprogramaciones conocidas por "
@@ -1608,6 +1621,7 @@ msgstr ""
"grabación! VDRAdmin no añadirá nada más."
#: ../template/default/help_rec_list.html:29
+#, fuzzy
msgid ""
"<p>Here you will find a listing of recordings known to VDR. The headline "
"will also show you VDR's total and free disk space.</p><p>The listing "
@@ -1633,13 +1647,13 @@ msgid ""
"\">Configuration</span> menu. You can watch the recording at your "
"workstation.</dd></dl></p><p>In addition to these functions you can delete a "
"number of recordings at once by checking the box in the last but one column "
-"of those recordings and clicking <span class=\"submit\">Delete Selected "
-"Recordings</span>.</p><p>If you've set the path the VDR's configuration "
-"files and have entries in VDR's <span class=\"ref_file\">reccmds.conf</span> "
-"you can run those commands for the selected recording by selecting the "
-"wanted command in the select box locate next to <span class=\"ref_label"
-"\">Commands:</span> and pressing the <span class=\"submit\">Run</span> "
-"button.</p>"
+"of those recordings and clicking <input type=\"submit\" class=\"submit\" "
+"value=\"Delete Selected Recordings\"/>.</p><p>If you've set the path the "
+"VDR's configuration files and have entries in VDR's <span class=\"ref_file"
+"\">reccmds.conf</span> you can run those commands for the selected recording "
+"by selecting the wanted command in the select box locate next to <span class="
+"\"ref_label\">Commands:</span> and pressing the <input type=\"submit\" class="
+"\"submit\" value=\"Run\"/> button.</p>"
msgstr ""
"<p>Aquí se ve una lista de todas las grabaciones disponibles en el VDR. En "
"la fila encabezada se puede ver el espacio total y libre del VDR.</p>\n"
@@ -1721,47 +1735,56 @@ msgstr "Televisión"
msgid "Search"
msgstr "Buscar"
-#: ../vdradmind.pl:251
+#: ../vdradmind.pl:265
msgid "What's your VDR hostname (e.g video.intra.net)?"
msgstr "¿Cuál es el nombre del sitio del VDR (p.e. video.intra.net)?"
-#: ../vdradmind.pl:252
+#: ../vdradmind.pl:266
msgid "On which port does VDR listen to SVDRP queries?"
msgstr "¿Cuál puerto esta vigilando VDR para requeridas de SVDRP?"
-#: ../vdradmind.pl:253
+#: ../vdradmind.pl:267
msgid "On which address should VDRAdmin listen (0.0.0.0 for any)?"
msgstr "¿En qué dirección debe VDRAdmin escuchar (0.0.0.0 para todas)?"
-#: ../vdradmind.pl:254
+#: ../vdradmind.pl:268
msgid "On which port should VDRAdmin listen?"
msgstr "¿Qué puerto debe VDRAdmin esperar órdenes?"
-#: ../vdradmind.pl:255
+#: ../vdradmind.pl:269
msgid "Username?"
msgstr "¿Nombre del usuario?"
-#: ../vdradmind.pl:256
+#: ../vdradmind.pl:270
msgid "Password?"
msgstr "¿Contraseña?"
-#: ../vdradmind.pl:257
+#: ../vdradmind.pl:271
msgid "Where are your recordings stored?"
msgstr "Introduce la ruta de las grabaciones:"
-#: ../vdradmind.pl:258
+#: ../vdradmind.pl:272
msgid "Where are your VDR's configuration files located?"
msgstr "Introduce la ruta de los archivos de configuración:"
-#: ../vdradmind.pl:264
+#: ../vdradmind.pl:278
msgid "Config file written successfully."
msgstr "¡Los archivos de configuración han creado!"
-#: ../vdradmind.pl:312
+#: ../vdradmind.pl:326
#, perl-format
msgid "vdradmind.pl %s started with pid %d."
msgstr "vdradmind.pl %s se ha iniciado con pid %d."
+#: ../vdradmind.pl:2432
+msgid "Playing Tomorrow"
+msgstr ""
+
+#: ../vdradmind.pl:2432
+#, perl-format
+msgid "Playing on the %d."
+msgstr ""
+
#: ../template/i18n.pl:3
msgid "Playing Today?"
msgstr "Estrenos hoy"
@@ -1815,6 +1838,9 @@ msgstr "Error mientras mandó el orden a %s "
msgid "Schedule"
msgstr "Vista general"
+#~ msgid "In \"Channels\" / \"Playing Today\"?"
+#~ msgstr "¿Usar en \"Datos de la guía electrónica (EPG)\"?"
+
#~ msgid "more"
#~ msgstr "más"
diff --git a/po/fi.po b/po/fi.po
index d00e238..5148191 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDRAdmin-0.97-AM3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-12 13:18+0200\n"
+"POT-Creation-Date: 2005-09-23 10:28+0200\n"
"PO-Revision-Date: 2005-06-17 12:36+0200\n"
"Last-Translator: Rofa\n"
"Language-Team: Suomi\n"
@@ -51,8 +51,8 @@ msgid "Edit Timer"
msgstr "Muokkaa ajastinta"
#: ../template/default/timer_new.html:53
-#: ../template/default/at_timer_list.html:47
-#: ../template/default/config.html:23 ../template/default/timer_list.html:55
+#: ../template/default/at_timer_list.html:39
+#: ../template/default/config.html:23 ../template/default/timer_list.html:47
#: ../template/default/rec_list.html:27
#: ../template/default/at_timer_new.html:24
msgid "Help"
@@ -64,13 +64,13 @@ msgid "Timer Active:"
msgstr "Aktiivinen:"
#: ../template/default/timer_new.html:75
-#: ../template/default/at_timer_list.html:135
-#: ../template/default/config.html:164 ../template/default/config.html:235
-#: ../template/default/config.html:337 ../template/default/config.html:352
-#: ../template/default/config.html:400 ../template/default/config.html:415
-#: ../template/default/config.html:446 ../template/default/config.html:455
-#: ../template/default/config.html:464 ../template/default/config.html:473
-#: ../template/default/timer_list.html:325
+#: ../template/default/at_timer_list.html:128
+#: ../template/default/config.html:170 ../template/default/config.html:241
+#: ../template/default/config.html:343 ../template/default/config.html:358
+#: ../template/default/config.html:406 ../template/default/config.html:421
+#: ../template/default/config.html:452 ../template/default/config.html:461
+#: ../template/default/config.html:470 ../template/default/config.html:479
+#: ../template/default/config.html:488 ../template/default/timer_list.html:318
#: ../template/default/at_timer_new.html:48
#: ../template/default/at_timer_new.html:52
#: ../template/default/at_timer_new.html:154
@@ -78,13 +78,13 @@ msgid "Yes"
msgstr "Kyllä"
#: ../template/default/timer_new.html:76
-#: ../template/default/at_timer_list.html:137
-#: ../template/default/config.html:165 ../template/default/config.html:236
-#: ../template/default/config.html:338 ../template/default/config.html:353
-#: ../template/default/config.html:401 ../template/default/config.html:416
-#: ../template/default/config.html:447 ../template/default/config.html:456
-#: ../template/default/config.html:465 ../template/default/config.html:474
-#: ../template/default/timer_list.html:326
+#: ../template/default/at_timer_list.html:130
+#: ../template/default/config.html:171 ../template/default/config.html:242
+#: ../template/default/config.html:344 ../template/default/config.html:359
+#: ../template/default/config.html:407 ../template/default/config.html:422
+#: ../template/default/config.html:453 ../template/default/config.html:462
+#: ../template/default/config.html:471 ../template/default/config.html:480
+#: ../template/default/config.html:489 ../template/default/timer_list.html:319
#: ../template/default/at_timer_new.html:49
#: ../template/default/at_timer_new.html:53
#: ../template/default/at_timer_new.html:155
@@ -106,13 +106,12 @@ msgstr "Lähetteen tunniste"
msgid "Time"
msgstr "Aika"
-#: ../template/default/timer_new.html:88 ../template/default/tv.html:181
+#: ../template/default/timer_new.html:88 ../template/default/tv.html:180
#: ../template/default/help_timer_new.html:43
msgid "off"
msgstr "Pois"
#: ../template/default/timer_new.html:94 ../template/default/prog_list.html:27
-#: ../template/default/prog_list2.html:30
#: ../template/default/help_timer_new.html:47
#: ../template/default/help_at_timer_new.html:46
#: ../template/default/at_timer_new.html:93
@@ -183,10 +182,10 @@ msgstr "Lopetusaika:"
#: ../template/default/timer_new.html:144
#: ../template/default/at_timer_list.html:21
-#: ../template/default/config.html:248 ../template/default/config.html:292
+#: ../template/default/config.html:254 ../template/default/config.html:298
#: ../template/default/timer_list.html:24
-#: ../template/default/help_config.html:94
-#: ../template/default/help_config.html:104
+#: ../template/default/help_config.html:100
+#: ../template/default/help_config.html:110
#: ../template/default/help_timer_new.html:61
#: ../template/default/help_at_timer_new.html:52
#: ../template/default/at_timer_new.html:128
@@ -195,10 +194,10 @@ msgstr "Prioriteetti:"
#: ../template/default/timer_new.html:150
#: ../template/default/at_timer_list.html:21
-#: ../template/default/config.html:254 ../template/default/config.html:298
+#: ../template/default/config.html:260 ../template/default/config.html:304
#: ../template/default/timer_list.html:24
-#: ../template/default/help_config.html:96
-#: ../template/default/help_config.html:106
+#: ../template/default/help_config.html:102
+#: ../template/default/help_config.html:112
#: ../template/default/help_timer_new.html:63
#: ../template/default/help_at_timer_new.html:54
#: ../template/default/at_timer_new.html:136
@@ -215,7 +214,7 @@ msgstr "Tallenteen nimi:"
msgid "Summary:"
msgstr "Tallenteen kuvaus:"
-#: ../template/default/timer_new.html:174 ../template/default/config.html:511
+#: ../template/default/timer_new.html:174 ../template/default/config.html:526
#: ../template/default/at_timer_new.html:176
msgid "Save"
msgstr "Tallenna"
@@ -256,80 +255,80 @@ msgstr ""
"Käyttäjätunnistus ei onnistu! Tarkista syöttämäsi käyttäjätunnus/salasana."
#: ../template/default/at_timer_list.html:6
-#: ../template/default/at_timer_list.html:30
-#: ../template/default/config.html:223 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:88
+#: ../template/default/at_timer_list.html:31
+#: ../template/default/config.html:229 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:94
#: ../template/default/help_at_timer_list.html:6
-#: ../template/default/help_at_timer_list.html:18
+#: ../template/default/help_at_timer_list.html:22
#: ../template/default/navigation.html:49
msgid "AutoTimer"
msgstr "Automaattiset ajastimet"
-#: ../template/default/at_timer_list.html:38
+#: ../template/default/at_timer_list.html:34
msgid "New AutoTimer"
msgstr "Uusi automaattinen ajastin"
-#: ../template/default/at_timer_list.html:60
-#: ../template/default/timer_list.html:223
+#: ../template/default/at_timer_list.html:53
+#: ../template/default/timer_list.html:216
msgid "Active"
msgstr "Aktiivinen"
-#: ../template/default/at_timer_list.html:71
-#: ../template/default/timer_list.html:234
+#: ../template/default/at_timer_list.html:64
+#: ../template/default/timer_list.html:227
msgid "Channel"
msgstr "Kanava"
-#: ../template/default/at_timer_list.html:82
-#: ../template/default/timer_list.html:256
+#: ../template/default/at_timer_list.html:75
+#: ../template/default/timer_list.html:249
msgid "Start"
msgstr "Aloitus"
-#: ../template/default/at_timer_list.html:93
-#: ../template/default/timer_list.html:267
+#: ../template/default/at_timer_list.html:86
+#: ../template/default/timer_list.html:260
msgid "Stop"
msgstr "Lopetus"
-#: ../template/default/at_timer_list.html:104
-#: ../template/default/timer_list.html:278
+#: ../template/default/at_timer_list.html:97
+#: ../template/default/timer_list.html:271
#: ../template/default/rec_list.html:81
msgid "Name"
msgstr "Nimi"
-#: ../template/default/at_timer_list.html:115
-#: ../template/default/timer_list.html:289
+#: ../template/default/at_timer_list.html:108
+#: ../template/default/timer_list.html:282
#: ../template/default/rec_list.html:92
msgid "Select all/none"
msgstr "Valitse kaikki/ei yhtään"
-#: ../template/default/at_timer_list.html:163
-#: ../template/default/timer_list.html:355
+#: ../template/default/at_timer_list.html:156
+#: ../template/default/timer_list.html:348
msgid "Edit"
msgstr "Muokkaa"
-#: ../template/default/at_timer_list.html:168
-#: ../template/default/timer_list.html:358
+#: ../template/default/at_timer_list.html:161
+#: ../template/default/timer_list.html:351
msgid "Delete timer?"
msgstr "Poistetaanko ajastin?"
-#: ../template/default/at_timer_list.html:168
-#: ../template/default/timer_list.html:358
+#: ../template/default/at_timer_list.html:161
+#: ../template/default/timer_list.html:351
#: ../template/default/rec_list.html:140
msgid "Delete"
msgstr "Poista"
-#: ../template/default/at_timer_list.html:199
+#: ../template/default/at_timer_list.html:188
msgid "Force Update"
msgstr "Päivitä"
-#: ../template/default/at_timer_list.html:210
-#: ../template/default/timer_list.html:382
-msgid "Delete all selected timers?"
-msgstr "Poistetaanko valitut ajastimet?"
-
-#: ../template/default/at_timer_list.html:210
+#: ../template/default/at_timer_list.html:191
msgid "Delete Selected AutoTimers"
msgstr "Poista valitut automaattiset ajastimet"
+#: ../template/default/at_timer_list.html:191
+#: ../template/default/timer_list.html:374
+msgid "Delete all selected timers?"
+msgstr "Poistetaanko valitut ajastimet?"
+
#: ../template/default/prog_summary.html:7
#: ../template/default/prog_timeline.html:7
#: ../template/default/navigation.html:29 ../template/i18n.pl:2
@@ -353,7 +352,7 @@ msgstr "kello:"
#: ../template/default/prog_summary.html:43
#: ../template/default/prog_list.html:23 ../template/default/rec_list.html:149
-#: ../template/default/prog_list2.html:54
+#: ../template/default/prog_list2.html:56
msgid "Stream"
msgstr "Toista"
@@ -375,13 +374,13 @@ msgstr "tallenna"
#: ../template/default/config.html:5 ../template/default/config.html:19
#: ../template/default/help_config.html:9
-#: ../template/default/help_config.html:21
+#: ../template/default/help_config.html:25
#: ../template/default/navigation.html:57
msgid "Configuration"
msgstr "Asetukset"
-#: ../template/default/config.html:36 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:36
+#: ../template/default/config.html:36 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:40
msgid "General Settings"
msgstr "Yleiset"
@@ -389,186 +388,194 @@ msgstr "Yleiset"
msgid "Template:"
msgstr "Pohja:"
-#: ../template/default/config.html:60 ../template/default/help_config.html:38
+#: ../template/default/config.html:60 ../template/default/help_config.html:42
msgid "Skin:"
msgstr "Ulkoasu:"
-#: ../template/default/config.html:72 ../template/default/help_config.html:40
+#: ../template/default/config.html:72 ../template/default/help_config.html:44
msgid "Login Page:"
msgstr "Aloitussivu:"
-#: ../template/default/config.html:82 ../template/default/config.html:396
+#: ../template/default/config.html:82 ../template/default/config.html:402
msgid "Gets active after restarting VDRAdmin"
msgstr "Aktivoituu VDRAdminin uudelleen käynnistyksellä"
-#: ../template/default/config.html:84 ../template/default/help_config.html:42
+#: ../template/default/config.html:84 ../template/default/help_config.html:46
msgid "Number of channels to use:"
msgstr "Kanavien lukumäärä:"
-#: ../template/default/config.html:90 ../template/default/help_config.html:44
+#: ../template/default/config.html:90 ../template/default/help_config.html:48
msgid "Local net (no login required):"
msgstr "Käyttäjätunnukseton osoiteavaruus:"
-#: ../template/default/config.html:104 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:50
+#: ../template/default/config.html:104 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:54
msgid "VDR"
msgstr "VDR"
-#: ../template/default/config.html:114 ../template/default/help_config.html:52
+#: ../template/default/config.html:114 ../template/default/help_config.html:56
msgid "Number of DVB cards:"
msgstr "DVB-korttien lukumäärä:"
-#: ../template/default/config.html:120 ../template/default/help_config.html:54
+#: ../template/default/config.html:120 ../template/default/help_config.html:58
msgid "Path to recordings:"
msgstr "VDR-tallenteiden polku:"
-#: ../template/default/config.html:126 ../template/default/help_config.html:56
+#: ../template/default/config.html:126 ../template/default/help_config.html:60
msgid "Path to configuration files:"
msgstr "Konfigurointitiedostojen polku:"
-#: ../template/default/config.html:140 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:62
+#: ../template/default/config.html:132 ../template/default/help_config.html:62
+msgid "Path to EPG images:"
+msgstr ""
+
+#: ../template/default/config.html:146 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:68
msgid "Identification"
msgstr "Käyttäjätunnistus"
-#: ../template/default/config.html:150 ../template/default/help_config.html:64
+#: ../template/default/config.html:156 ../template/default/help_config.html:70
msgid "Username:"
msgstr "Käyttäjätunnus:"
-#: ../template/default/config.html:156 ../template/default/help_config.html:66
+#: ../template/default/config.html:162 ../template/default/help_config.html:72
msgid "Password:"
msgstr "Salasana:"
-#: ../template/default/config.html:162 ../template/default/help_config.html:68
+#: ../template/default/config.html:168 ../template/default/help_config.html:74
msgid "Guest Account:"
msgstr "Sallitaanko vierailija:"
-#: ../template/default/config.html:171 ../template/default/help_config.html:70
+#: ../template/default/config.html:177 ../template/default/help_config.html:76
msgid "Guest Username:"
msgstr "Vierailijan käyttäjätunnus:"
-#: ../template/default/config.html:177 ../template/default/help_config.html:72
+#: ../template/default/config.html:183 ../template/default/help_config.html:78
msgid "Guest Password:"
msgstr "Vierailijan salasana:"
-#: ../template/default/config.html:191 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:78
+#: ../template/default/config.html:197 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:84
#: ../template/default/navigation.html:37 ../template/i18n.pl:4
msgid "Timeline"
msgstr "Aikajana"
-#: ../template/default/config.html:201 ../template/default/help_config.html:80
+#: ../template/default/config.html:207 ../template/default/help_config.html:86
msgid "Hours:"
msgstr "Pituus tunteina:"
-#: ../template/default/config.html:207 ../template/default/help_config.html:82
+#: ../template/default/config.html:213 ../template/default/help_config.html:88
msgid "Times:"
msgstr "Ajankohdat:"
-#: ../template/default/config.html:233 ../template/default/help_config.html:90
+#: ../template/default/config.html:239 ../template/default/help_config.html:96
msgid "Active:"
msgstr "Käytössä:"
-#: ../template/default/config.html:242 ../template/default/help_config.html:92
+#: ../template/default/config.html:248 ../template/default/help_config.html:98
msgid "Timeout:"
msgstr "Odotusaika:"
-#: ../template/default/config.html:243 ../template/default/config.html:305
-#: ../template/default/config.html:311
+#: ../template/default/config.html:249 ../template/default/config.html:311
+#: ../template/default/config.html:317
msgid "minutes"
msgstr "minuuttia"
-#: ../template/default/config.html:261 ../template/default/config.html:304
-#: ../template/default/help_config.html:108
+#: ../template/default/config.html:267 ../template/default/config.html:310
+#: ../template/default/help_config.html:114
msgid "Time Margin at Start:"
msgstr "Aloitusmarginaali:"
-#: ../template/default/config.html:267 ../template/default/config.html:310
-#: ../template/default/help_config.html:110
+#: ../template/default/config.html:273 ../template/default/config.html:316
+#: ../template/default/help_config.html:116
msgid "Time Margin at Stop:"
msgstr "Lopetusmarginaali:"
-#: ../template/default/config.html:282 ../template/default/timer_list.html:6
-#: ../template/default/timer_list.html:39
-#: ../template/default/help_config.html:34
-#: ../template/default/help_config.html:102
+#: ../template/default/config.html:288 ../template/default/timer_list.html:6
+#: ../template/default/timer_list.html:40
+#: ../template/default/help_config.html:38
+#: ../template/default/help_config.html:108
#: ../template/default/help_timer_list.html:6
-#: ../template/default/help_timer_list.html:18
+#: ../template/default/help_timer_list.html:22
#: ../template/default/navigation.html:45
msgid "Timer"
msgstr "Ajastimet"
-#: ../template/default/config.html:325 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:116
+#: ../template/default/config.html:331 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:122
msgid "Streaming"
msgstr "Suoratoisto"
-#: ../template/default/config.html:335
-#: ../template/default/help_config.html:118
+#: ../template/default/config.html:341
+#: ../template/default/help_config.html:124
msgid "Live Streaming:"
msgstr "Live-kuvan suoratoisto:"
-#: ../template/default/config.html:344
-#: ../template/default/help_config.html:120
+#: ../template/default/config.html:350
+#: ../template/default/help_config.html:126
msgid "HTTP Port of Streamdev (also possible 3000/ts):"
msgstr "Streamdev-laajennoksen HTTP-portti (esim. 3000/ts):"
-#: ../template/default/config.html:350
-#: ../template/default/help_config.html:122
+#: ../template/default/config.html:356
+#: ../template/default/help_config.html:128
msgid "Recordings Streaming:"
msgstr "Tallenteiden suoratoisto:"
-#: ../template/default/config.html:359
-#: ../template/default/help_config.html:124
+#: ../template/default/config.html:365
+#: ../template/default/help_config.html:130
msgid "Path to VDR Recordings on your workstation:"
msgstr "VDR-tallenteiden polku työasemallasi:"
-#: ../template/default/config.html:366
+#: ../template/default/config.html:372
msgid "Bandwidth of Streams:"
msgstr "Kaistanleveys:"
-#: ../template/default/config.html:388 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:130
+#: ../template/default/config.html:394 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:136
msgid "Expert"
msgstr "Guru-käyttäjä"
-#: ../template/default/config.html:398
-#: ../template/default/help_config.html:133
+#: ../template/default/config.html:404
+#: ../template/default/help_config.html:139
msgid "Read EPG directly using epg.data:"
msgstr "Lue ohjelmatiedot suoraan tiedostosta:"
-#: ../template/default/config.html:407
-#: ../template/default/help_config.html:135
+#: ../template/default/config.html:413
+#: ../template/default/help_config.html:141
msgid "epg.data filename:"
msgstr "Tiedosto ohjelmatiedoille:"
-#: ../template/default/config.html:413
-#: ../template/default/help_config.html:137
+#: ../template/default/config.html:419
+#: ../template/default/help_config.html:143
msgid "VFAT:"
msgstr "VFAT-tuki:"
-#: ../template/default/config.html:434 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:143
+#: ../template/default/config.html:440 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:149
msgid "Channel Selections"
msgstr "Kanavavalinnat"
-#: ../template/default/config.html:444
+#: ../template/default/config.html:450
msgid "In \"Timeline\"?"
msgstr "Käytä kanavavalintoja \"Aikajana\"-sivulla"
-#: ../template/default/config.html:453
-msgid "In \"Channels\" / \"Playing Today\"?"
-msgstr "Käytä kanavavalintoja \"Kanavat\"- ja \"Ohjelmisto tänään\"-sivuilla"
+#: ../template/default/config.html:459
+msgid "In \"Channels\"?"
+msgstr ""
+
+#: ../template/default/config.html:468
+msgid "In \"Playing Today\"?"
+msgstr ""
-#: ../template/default/config.html:462
+#: ../template/default/config.html:477
msgid "In \"What's On Now\"?"
msgstr "Käytä kanavavalintoja \"Menossa nyt\"-sivulla"
-#: ../template/default/config.html:471
+#: ../template/default/config.html:486
msgid "In \"AutoTimer\"?"
msgstr "Käytä kanavavalintoja \"Automaattiset ajastimet\"-sivulla"
-#: ../template/default/config.html:512
+#: ../template/default/config.html:527
msgid "Apply"
msgstr "Käytä"
@@ -582,44 +589,44 @@ msgstr "Kesto:"
msgid "min"
msgstr "min"
-#: ../template/default/timer_list.html:46
+#: ../template/default/timer_list.html:42
msgid "New Timer"
msgstr "Uusi ajastin"
-#: ../template/default/timer_list.html:245
+#: ../template/default/timer_list.html:238
#: ../template/default/rec_list.html:59
msgid "Date"
msgstr "Päivämäärä"
-#: ../template/default/timer_list.html:310
+#: ../template/default/timer_list.html:303
msgid "This timer is inactive!"
msgstr "Ajastin ei ole aktiivinen!"
-#: ../template/default/timer_list.html:313
+#: ../template/default/timer_list.html:306
msgid "This timer is impossible!"
msgstr "Ajastin ei ole mahdollinen!"
-#: ../template/default/timer_list.html:316
+#: ../template/default/timer_list.html:309
msgid "No more timers on other transponders possible!"
msgstr "Maksimimäärä ajastimia käytössä!"
-#: ../template/default/timer_list.html:319
+#: ../template/default/timer_list.html:312
msgid "Timer OK."
msgstr "Ajastin kunnossa."
-#: ../template/default/timer_list.html:324
+#: ../template/default/timer_list.html:317
msgid "Edit timer status?"
msgstr "Muokataanko ajastinta?"
-#: ../template/default/timer_list.html:327
+#: ../template/default/timer_list.html:320
msgid "VPS"
msgstr "VPS"
-#: ../template/default/timer_list.html:328
+#: ../template/default/timer_list.html:321
msgid "Auto"
msgstr "Automaattinen"
-#: ../template/default/timer_list.html:382
+#: ../template/default/timer_list.html:374
msgid "Delete Selected Timers"
msgstr "Poista valitut ajastimet"
@@ -629,7 +636,6 @@ msgid "Channels"
msgstr "Kanavat"
#: ../template/default/prog_list.html:33
-#: ../template/default/prog_list2.html:35
msgid "Go!"
msgstr "Siirry"
@@ -641,50 +647,50 @@ msgstr "Virhe!"
msgid "TV"
msgstr "TV"
-#: ../template/default/tv.html:179
+#: ../template/default/tv.html:178
msgid "Interval:"
msgstr "Päivitysväli:"
-#: ../template/default/tv.html:182 ../template/default/tv.html:183
-#: ../template/default/tv.html:184 ../template/default/tv.html:185
-#: ../template/default/tv.html:186 ../template/default/tv.html:187
-#: ../template/default/tv.html:188
+#: ../template/default/tv.html:181 ../template/default/tv.html:182
+#: ../template/default/tv.html:183 ../template/default/tv.html:184
+#: ../template/default/tv.html:185 ../template/default/tv.html:186
+#: ../template/default/tv.html:187
msgid "sec."
msgstr "s"
-#: ../template/default/tv.html:190 ../template/default/tv.html:197
+#: ../template/default/tv.html:189 ../template/default/tv.html:196
msgid "G"
msgstr "K"
-#: ../template/default/tv.html:190 ../template/default/tv.html:197
+#: ../template/default/tv.html:189 ../template/default/tv.html:196
msgid "Grab the picture!"
msgstr "Kuvankaappaus"
-#: ../template/default/tv.html:191
+#: ../template/default/tv.html:190
msgid "Size:"
msgstr "Koko:"
-#: ../template/default/tv.html:200
+#: ../template/default/tv.html:198
msgid "Open in separate window"
msgstr "Avaa omaan ikkunaan"
-#: ../template/default/prog_detail.html:37
+#: ../template/default/prog_detail.html:43
msgid "close"
msgstr "sulje"
-#: ../template/default/prog_detail.html:39
+#: ../template/default/prog_detail.html:45
msgid "view"
msgstr "katso"
-#: ../template/default/prog_detail.html:40
+#: ../template/default/prog_detail.html:46
msgid "record"
msgstr "tallenna"
-#: ../template/default/prog_detail.html:41
+#: ../template/default/prog_detail.html:47
msgid "search"
msgstr "etsi"
-#: ../template/default/prog_detail.html:44
+#: ../template/default/prog_detail.html:50
msgid "Lookup movie in the Internet-Movie-Database (IMDb)"
msgstr "etsi IMDB:stä"
@@ -743,21 +749,21 @@ msgstr "Poista valitut tallenteet"
msgid "Delete all selected recordings?"
msgstr "Poistetaanko valitut tallenteet?"
-#: ../template/default/help_config.html:32
+#: ../template/default/help_config.html:36
msgid ""
"<p>Here you can change general settings and base settings for timers, "
"AutoTimers, channel selection and streaming parameters.</p>"
msgstr ""
-#: ../template/default/help_config.html:39
+#: ../template/default/help_config.html:43
msgid "The skin you want to use."
msgstr ""
-#: ../template/default/help_config.html:41
+#: ../template/default/help_config.html:45
msgid "The page you want to see at first connect to VDRAdmin."
msgstr ""
-#: ../template/default/help_config.html:43
+#: ../template/default/help_config.html:47
msgid ""
"VDRAdmin will load the given number of channels from VDR and present only "
"those in any fields where channels can be selected. This also limits the EPG "
@@ -770,7 +776,7 @@ msgid ""
"restart VDRAdmin."
msgstr ""
-#: ../template/default/help_config.html:45
+#: ../template/default/help_config.html:49
msgid ""
"Here you can specify an IP address or range that can login without providing "
"login information. For example: \"192.168.0.0/24\" will include any IP "
@@ -778,26 +784,26 @@ msgid ""
"\"192.168.0.123\"."
msgstr ""
-#: ../template/default/help_config.html:47
-#: ../template/default/help_config.html:59
-#: ../template/default/help_config.html:75
-#: ../template/default/help_config.html:85
-#: ../template/default/help_config.html:99
-#: ../template/default/help_config.html:113
-#: ../template/default/help_config.html:127
-#: ../template/default/help_config.html:140
-#: ../template/default/help_config.html:147
+#: ../template/default/help_config.html:51
+#: ../template/default/help_config.html:65
+#: ../template/default/help_config.html:81
+#: ../template/default/help_config.html:91
+#: ../template/default/help_config.html:105
+#: ../template/default/help_config.html:119
+#: ../template/default/help_config.html:133
+#: ../template/default/help_config.html:146
+#: ../template/default/help_config.html:153
msgid "Top"
msgstr "Alkuun"
-#: ../template/default/help_config.html:53
+#: ../template/default/help_config.html:57
msgid ""
"The number of DVB cards VDR can access. Depending on this value VDRAdmin "
"will calculate critical timers in the <span class=\"ref_menu\">Timer</span> "
"menu."
msgstr ""
-#: ../template/default/help_config.html:55
+#: ../template/default/help_config.html:59
msgid ""
"The path to VDR's recordings. It's used so that VDRAdmin can locate the "
"recordings when using <span class=\"ref_label\">Recordings Streaming</span> "
@@ -805,7 +811,7 @@ msgid ""
"\"ref_menu\">Recordings</span> menu."
msgstr ""
-#: ../template/default/help_config.html:57
+#: ../template/default/help_config.html:61
msgid ""
"The path where VDR's configuration files are located. If this directory "
"contains the file <span class=\"ref_file\">reccmds.conf</span> its content "
@@ -813,50 +819,54 @@ msgid ""
"menu."
msgstr ""
-#: ../template/default/help_config.html:65
+#: ../template/default/help_config.html:63
+msgid "The path where the EPG images are stored."
+msgstr ""
+
+#: ../template/default/help_config.html:71
msgid ""
"The username for the main user, i.e. the user having the most privileges."
msgstr ""
-#: ../template/default/help_config.html:67
+#: ../template/default/help_config.html:73
msgid "The main user's password."
msgstr ""
-#: ../template/default/help_config.html:69
+#: ../template/default/help_config.html:75
msgid ""
"If you want an user account having only limited privileges, this is for you. "
"The guest user cannot modify anything, it's only allowed to view the EPG, "
"timers, AutoTimers and recordings listings."
msgstr ""
-#: ../template/default/help_config.html:71
+#: ../template/default/help_config.html:77
msgid "The username for the guest user."
msgstr ""
-#: ../template/default/help_config.html:73
+#: ../template/default/help_config.html:79
msgid "The guest user's password."
msgstr ""
-#: ../template/default/help_config.html:81
+#: ../template/default/help_config.html:87
msgid "The number of hours to show in the timeline."
msgstr ""
-#: ../template/default/help_config.html:83
+#: ../template/default/help_config.html:89
msgid ""
"A comma separated list of times in <strong>hh:mm</strong> format that appear "
"in the selectbox placed at the top."
msgstr ""
-#: ../template/default/help_config.html:91
+#: ../template/default/help_config.html:97
msgid "Activate or deactivate the AutoTimer function."
msgstr ""
-#: ../template/default/help_config.html:93
+#: ../template/default/help_config.html:99
msgid "The interval, the the EPG data is checked for updating the AutoTimers."
msgstr ""
-#: ../template/default/help_config.html:95
-#: ../template/default/help_config.html:105
+#: ../template/default/help_config.html:101
+#: ../template/default/help_config.html:111
#: ../template/default/help_timer_new.html:62
#: ../template/default/help_at_timer_new.html:53
msgid ""
@@ -876,8 +886,8 @@ msgid ""
"recording."
msgstr ""
-#: ../template/default/help_config.html:97
-#: ../template/default/help_config.html:107
+#: ../template/default/help_config.html:103
+#: ../template/default/help_config.html:113
#: ../template/default/help_timer_new.html:64
#: ../template/default/help_at_timer_new.html:55
msgid ""
@@ -891,35 +901,35 @@ msgid ""
"recording has passed by."
msgstr ""
-#: ../template/default/help_config.html:109
+#: ../template/default/help_config.html:115
msgid ""
"The number of minutes VDRAdmin subtracts from the broadcasts start time "
"found in the EPG. This value is used for timers programmed by AutoTimer and "
"timers manually programmed when pressing \"Record\" in any EPG view."
msgstr ""
-#: ../template/default/help_config.html:111
+#: ../template/default/help_config.html:117
msgid ""
"The number of minutes VDRAdmin adds to the broadcasts stop time found in the "
"EPG. This value is used for timers programmed by AutoTimer and timers "
"manually programmed when pressing \"Record\" in any EPG view."
msgstr ""
-#: ../template/default/help_config.html:119
+#: ../template/default/help_config.html:125
msgid ""
"Enable or disable live streaming using the <a href=\"http://www.magoa.net/"
"linux/\">streamdev plugin</a>. You also have to set the correct <span class="
"\"ref_label\">HTTP Port for Streamdev</span> below."
msgstr ""
-#: ../template/default/help_config.html:121
+#: ../template/default/help_config.html:127
msgid ""
"Here you have to set the port number your VDR's streamdev server listens for "
"connections. Additionally you can also provide the stream type you like to "
"use."
msgstr ""
-#: ../template/default/help_config.html:123
+#: ../template/default/help_config.html:129
msgid ""
"Enable or disable streaming of recordings.<br />Well actually this is no "
"real \"streaming\", but you have to setup your workstation so that it can "
@@ -930,49 +940,49 @@ msgid ""
"display."
msgstr ""
-#: ../template/default/help_config.html:125
+#: ../template/default/help_config.html:131
msgid ""
"This is the path where your workstation can access VDR's recordings. This "
"depends on your VDR and workstation setup, for example \"\\\\vdr\\videos\" "
"or \"V:\\\" (on Windows) or \"/mnt/videos\" (on Linux)."
msgstr ""
-#: ../template/default/help_config.html:131
+#: ../template/default/help_config.html:137
msgid ""
"<p>This section is for experts <strong>only</strong>, i.e. you know what you "
"are doing!</p>"
msgstr ""
-#: ../template/default/help_config.html:134
+#: ../template/default/help_config.html:140
msgid ""
"Accessing VDR's EPG through VDR's SVDRPort seems to block VDR for some time. "
"If this option is activated VDRAdmin will read the <span class=\"ref_file"
"\">epg.data</span> file directly so that VDR doesn't get blocked."
msgstr ""
-#: ../template/default/help_config.html:136
+#: ../template/default/help_config.html:142
msgid ""
"If you've enabled the option above you need to tell VDRAdmin where the <span "
"class=\"ref_file\">epg.data</span> file is located."
msgstr ""
-#: ../template/default/help_config.html:138
+#: ../template/default/help_config.html:144
msgid ""
"If you have compiled VDR with the VFAT define you have to enable this "
"option. If this option is set to the wrong value, you may have problems with "
"certain recordings if you want to stream them or run reccmds on them."
msgstr ""
-#: ../template/default/help_config.html:144
+#: ../template/default/help_config.html:150
msgid ""
"<p>If you want to limit the number of channels used in some parts of "
"VDRAdmin, this is for you!</p><p>Use the radio buttons to activate or "
"deactivate the wanted channels in the named menu.</p><p>To add channels to "
"the list of wanted channels you have to select them in the left side "
-"selectbox and click <span class=\"submit\">&gt;&gt;&gt;&gt;&gt;</span>. If "
-"you want to remove channels from the list of wanted channels you have to "
-"select them in the right side selectbox and click <span class=\"submit\">&lt;"
-"&lt;&lt;&lt;&lt;</span>.</p>"
+"selectbox and click <input type=\"submit\" class=\"submit\" value=\"&gt;&gt;"
+"&gt;&gt;&gt;\"/>. If you want to remove channels from the list of wanted "
+"channels you have to select them in the right side selectbox and click "
+"<input type=\"submit\" class=\"submit\" value=\"&lt;&lt;&lt;&lt;&lt;\"/>.</p>"
msgstr ""
#: ../template/default/prog_timeline.html:119
@@ -984,8 +994,7 @@ msgid "to"
msgstr "-"
#: ../template/default/prog_list2.html:6
-#: ../template/default/prog_list2.html:28
-#: ../template/default/navigation.html:33
+#: ../template/default/navigation.html:33 ../vdradmind.pl:2432
msgid "Playing Today"
msgstr "Ohjelmisto tänään"
@@ -1001,7 +1010,7 @@ msgstr "Tallenteen alkuperäinen nimi:"
msgid "New Name of Recording:"
msgstr "Tallenteen uusi nimi:"
-#: ../template/default/help_timer_list.html:29
+#: ../template/default/help_timer_list.html:33
msgid ""
"<p>Here you will find a listing of timers known to VDR.</p><p>On top you "
"will find a chart showing a day's timers graphically. This provides an quick "
@@ -1033,10 +1042,10 @@ msgid ""
"record.<br /><span class=\"color_inactive\">&nbsp;&nbsp;&nbsp;</span> / <img "
"src=\"bilder/poempl_grau.gif\" alt=\"inactive\" align=\"absmiddle\" /> Timer "
"is not active.</p><p>In addition to these functions you can add a new timer "
-"by clicking <span class=\"submit\">New Timer</span> at the top and you can "
-"delete a number of timers at once by checking the box in the last column of "
-"those timers and clicking <span class=\"submit\">Delete Selected Timers</"
-"span>.</p>"
+"by clicking <input type=\"submit\" class=\"submit\" value=\"New Timer\"/> at "
+"the top and you can delete a number of timers at once by checking the box in "
+"the last column of those timers and clicking <input type=\"submit\" class="
+"\"submit\" value=\"Delete Selected Timers\"/>.</p>"
msgstr ""
#: ../template/default/help_timer_new.html:32
@@ -1118,7 +1127,7 @@ msgid ""
"file of the recording."
msgstr ""
-#: ../template/default/help_at_timer_list.html:29
+#: ../template/default/help_at_timer_list.html:33
msgid ""
"<p>Here you will find a listing of automatic timers (AutoTimer) known to "
"VDRAdmin.</p><p>The list shows some information on AutoTimers. You can "
@@ -1135,11 +1144,12 @@ msgid ""
"AutoTimer is OK and will automatically program matching broadcasts.<br /"
"><img src=\"bilder/poempl_grau.gif\" alt=\"inactive\" align=\"absmiddle\" /> "
"AutoTimer is not active.</p><p>In addition to these functions you can add a "
-"new AutoTimer by clicking <span class=\"submit\">New AutoTimer</span> at the "
-"top and you can delete a number of AutoTimers at once by checking the box in "
-"the last column of those timers and clicking <span class=\"submit\">Delete "
-"Selected AutoTimers</span>.</p><p>Click <span class=\"submit\">Force Update</"
-"span> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check "
+"new AutoTimer by clicking <input type=\"submit\" class=\"submit\" value="
+"\"New AutoTimer\"/> at the top and you can delete a number of AutoTimers at "
+"once by checking the box in the last column of those timers and clicking "
+"<input type=\"submit\" class=\"submit\" value=\"Delete Selected AutoTimers\"/"
+">.</p><p>Click <input type=\"submit\" class=\"submit\" value=\"Force Update"
+"\"/> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check "
"for matching AutoTimers.</p>"
msgstr ""
@@ -1329,13 +1339,13 @@ msgid ""
"\">Configuration</span> menu. You can watch the recording at your "
"workstation.</dd></dl></p><p>In addition to these functions you can delete a "
"number of recordings at once by checking the box in the last but one column "
-"of those recordings and clicking <span class=\"submit\">Delete Selected "
-"Recordings</span>.</p><p>If you've set the path the VDR's configuration "
-"files and have entries in VDR's <span class=\"ref_file\">reccmds.conf</span> "
-"you can run those commands for the selected recording by selecting the "
-"wanted command in the select box locate next to <span class=\"ref_label"
-"\">Commands:</span> and pressing the <span class=\"submit\">Run</span> "
-"button.</p>"
+"of those recordings and clicking <input type=\"submit\" class=\"submit\" "
+"value=\"Delete Selected Recordings\"/>.</p><p>If you've set the path the "
+"VDR's configuration files and have entries in VDR's <span class=\"ref_file"
+"\">reccmds.conf</span> you can run those commands for the selected recording "
+"by selecting the wanted command in the select box locate next to <span class="
+"\"ref_label\">Commands:</span> and pressing the <input type=\"submit\" class="
+"\"submit\" value=\"Run\"/> button.</p>"
msgstr ""
#: ../template/default/at_timer_new.html:6
@@ -1372,47 +1382,56 @@ msgstr "Katso TV:tä"
msgid "Search"
msgstr "Etsi"
-#: ../vdradmind.pl:251
+#: ../vdradmind.pl:265
msgid "What's your VDR hostname (e.g video.intra.net)?"
msgstr "Anna VDR-koneesi nimi (esim. video.intra.net):"
-#: ../vdradmind.pl:252
+#: ../vdradmind.pl:266
msgid "On which port does VDR listen to SVDRP queries?"
msgstr "Anna VDR-koneesi käyttämä SVDRP-portti:"
-#: ../vdradmind.pl:253
+#: ../vdradmind.pl:267
msgid "On which address should VDRAdmin listen (0.0.0.0 for any)?"
msgstr "Anna VDRAdminin käyttämä osoiteavaruus (0.0.0.0 ei rajoituksia):"
-#: ../vdradmind.pl:254
+#: ../vdradmind.pl:268
msgid "On which port should VDRAdmin listen?"
msgstr "Anna VDRAdminin käyttämä portti:"
-#: ../vdradmind.pl:255
+#: ../vdradmind.pl:269
msgid "Username?"
msgstr "Anna käyttäjätunnus VDRAdminia varten:"
-#: ../vdradmind.pl:256
+#: ../vdradmind.pl:270
msgid "Password?"
msgstr "Anna salasana VDRAdminia varten:"
-#: ../vdradmind.pl:257
+#: ../vdradmind.pl:271
msgid "Where are your recordings stored?"
msgstr "Anna VDR-koneesi tallennehakemiston polku:"
-#: ../vdradmind.pl:258
+#: ../vdradmind.pl:272
msgid "Where are your VDR's configuration files located?"
msgstr "Anna VDR-koneesi konfigurointihakemiston polku:"
-#: ../vdradmind.pl:264
+#: ../vdradmind.pl:278
msgid "Config file written successfully."
msgstr "VDRAdminin konfigurointitiedosto muodostettu."
-#: ../vdradmind.pl:312
+#: ../vdradmind.pl:326
#, perl-format
msgid "vdradmind.pl %s started with pid %d."
msgstr "vdradmind.pl %s käynnistetty prosessitunnisteella %d."
+#: ../vdradmind.pl:2432
+msgid "Playing Tomorrow"
+msgstr ""
+
+#: ../vdradmind.pl:2432
+#, perl-format
+msgid "Playing on the %d."
+msgstr ""
+
#: ../template/i18n.pl:3
msgid "Playing Today?"
msgstr "Tänään"
@@ -1465,3 +1484,7 @@ msgstr "Komennon lähetys VDR:lle epäonnistui (%s)"
#: ../template/i18n.pl:23
msgid "Schedule"
msgstr "Ohjelmisto"
+
+#~ msgid "In \"Channels\" / \"Playing Today\"?"
+#~ msgstr ""
+#~ "Käytä kanavavalintoja \"Kanavat\"- ja \"Ohjelmisto tänään\"-sivuilla"
diff --git a/po/fr.po b/po/fr.po
index 9a0bd9a..1e0515b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDRAdmin-0.97-AM3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-12 13:18+0200\n"
+"POT-Creation-Date: 2005-09-23 10:28+0200\n"
"PO-Revision-Date: 2005-06-23 09:16+0000\n"
"Last-Translator: Bads\n"
"Language-Team: <fr@li.org>\n"
@@ -65,8 +65,8 @@ msgid "Edit Timer"
msgstr "Editer Programmation"
#: ../template/default/timer_new.html:53
-#: ../template/default/at_timer_list.html:47
-#: ../template/default/config.html:23 ../template/default/timer_list.html:55
+#: ../template/default/at_timer_list.html:39
+#: ../template/default/config.html:23 ../template/default/timer_list.html:47
#: ../template/default/rec_list.html:27
#: ../template/default/at_timer_new.html:24
msgid "Help"
@@ -78,13 +78,13 @@ msgid "Timer Active:"
msgstr "Programmation Active :"
#: ../template/default/timer_new.html:75
-#: ../template/default/at_timer_list.html:135
-#: ../template/default/config.html:164 ../template/default/config.html:235
-#: ../template/default/config.html:337 ../template/default/config.html:352
-#: ../template/default/config.html:400 ../template/default/config.html:415
-#: ../template/default/config.html:446 ../template/default/config.html:455
-#: ../template/default/config.html:464 ../template/default/config.html:473
-#: ../template/default/timer_list.html:325
+#: ../template/default/at_timer_list.html:128
+#: ../template/default/config.html:170 ../template/default/config.html:241
+#: ../template/default/config.html:343 ../template/default/config.html:358
+#: ../template/default/config.html:406 ../template/default/config.html:421
+#: ../template/default/config.html:452 ../template/default/config.html:461
+#: ../template/default/config.html:470 ../template/default/config.html:479
+#: ../template/default/config.html:488 ../template/default/timer_list.html:318
#: ../template/default/at_timer_new.html:48
#: ../template/default/at_timer_new.html:52
#: ../template/default/at_timer_new.html:154
@@ -92,13 +92,13 @@ msgid "Yes"
msgstr "Oui"
#: ../template/default/timer_new.html:76
-#: ../template/default/at_timer_list.html:137
-#: ../template/default/config.html:165 ../template/default/config.html:236
-#: ../template/default/config.html:338 ../template/default/config.html:353
-#: ../template/default/config.html:401 ../template/default/config.html:416
-#: ../template/default/config.html:447 ../template/default/config.html:456
-#: ../template/default/config.html:465 ../template/default/config.html:474
-#: ../template/default/timer_list.html:326
+#: ../template/default/at_timer_list.html:130
+#: ../template/default/config.html:171 ../template/default/config.html:242
+#: ../template/default/config.html:344 ../template/default/config.html:359
+#: ../template/default/config.html:407 ../template/default/config.html:422
+#: ../template/default/config.html:453 ../template/default/config.html:462
+#: ../template/default/config.html:471 ../template/default/config.html:480
+#: ../template/default/config.html:489 ../template/default/timer_list.html:319
#: ../template/default/at_timer_new.html:49
#: ../template/default/at_timer_new.html:53
#: ../template/default/at_timer_new.html:155
@@ -120,13 +120,12 @@ msgstr "Identification Transmission"
msgid "Time"
msgstr "Horaires"
-#: ../template/default/timer_new.html:88 ../template/default/tv.html:181
+#: ../template/default/timer_new.html:88 ../template/default/tv.html:180
#: ../template/default/help_timer_new.html:43
msgid "off"
msgstr "off"
#: ../template/default/timer_new.html:94 ../template/default/prog_list.html:27
-#: ../template/default/prog_list2.html:30
#: ../template/default/help_timer_new.html:47
#: ../template/default/help_at_timer_new.html:46
#: ../template/default/at_timer_new.html:93
@@ -197,10 +196,10 @@ msgstr "Heure De Fin :"
#: ../template/default/timer_new.html:144
#: ../template/default/at_timer_list.html:21
-#: ../template/default/config.html:248 ../template/default/config.html:292
+#: ../template/default/config.html:254 ../template/default/config.html:298
#: ../template/default/timer_list.html:24
-#: ../template/default/help_config.html:94
-#: ../template/default/help_config.html:104
+#: ../template/default/help_config.html:100
+#: ../template/default/help_config.html:110
#: ../template/default/help_timer_new.html:61
#: ../template/default/help_at_timer_new.html:52
#: ../template/default/at_timer_new.html:128
@@ -209,10 +208,10 @@ msgstr "Priorité :"
#: ../template/default/timer_new.html:150
#: ../template/default/at_timer_list.html:21
-#: ../template/default/config.html:254 ../template/default/config.html:298
+#: ../template/default/config.html:260 ../template/default/config.html:304
#: ../template/default/timer_list.html:24
-#: ../template/default/help_config.html:96
-#: ../template/default/help_config.html:106
+#: ../template/default/help_config.html:102
+#: ../template/default/help_config.html:112
#: ../template/default/help_timer_new.html:63
#: ../template/default/help_at_timer_new.html:54
#: ../template/default/at_timer_new.html:136
@@ -229,7 +228,7 @@ msgstr "Titre d'Enregistrement :"
msgid "Summary:"
msgstr "Sommaire :"
-#: ../template/default/timer_new.html:174 ../template/default/config.html:511
+#: ../template/default/timer_new.html:174 ../template/default/config.html:526
#: ../template/default/at_timer_new.html:176
msgid "Save"
msgstr "Enregistrer"
@@ -272,80 +271,80 @@ msgstr ""
"de passe), ou votre navigateur n'a pu fournir les informations requises."
#: ../template/default/at_timer_list.html:6
-#: ../template/default/at_timer_list.html:30
-#: ../template/default/config.html:223 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:88
+#: ../template/default/at_timer_list.html:31
+#: ../template/default/config.html:229 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:94
#: ../template/default/help_at_timer_list.html:6
-#: ../template/default/help_at_timer_list.html:18
+#: ../template/default/help_at_timer_list.html:22
#: ../template/default/navigation.html:49
msgid "AutoTimer"
msgstr "Auto-Programmation"
-#: ../template/default/at_timer_list.html:38
+#: ../template/default/at_timer_list.html:34
msgid "New AutoTimer"
msgstr "Nouvelle Auto-Programmation"
-#: ../template/default/at_timer_list.html:60
-#: ../template/default/timer_list.html:223
+#: ../template/default/at_timer_list.html:53
+#: ../template/default/timer_list.html:216
msgid "Active"
msgstr "Actif"
-#: ../template/default/at_timer_list.html:71
-#: ../template/default/timer_list.html:234
+#: ../template/default/at_timer_list.html:64
+#: ../template/default/timer_list.html:227
msgid "Channel"
msgstr "Chaîne"
-#: ../template/default/at_timer_list.html:82
-#: ../template/default/timer_list.html:256
+#: ../template/default/at_timer_list.html:75
+#: ../template/default/timer_list.html:249
msgid "Start"
msgstr "Début"
-#: ../template/default/at_timer_list.html:93
-#: ../template/default/timer_list.html:267
+#: ../template/default/at_timer_list.html:86
+#: ../template/default/timer_list.html:260
msgid "Stop"
msgstr "Fin"
-#: ../template/default/at_timer_list.html:104
-#: ../template/default/timer_list.html:278
+#: ../template/default/at_timer_list.html:97
+#: ../template/default/timer_list.html:271
#: ../template/default/rec_list.html:81
msgid "Name"
msgstr "Nom"
-#: ../template/default/at_timer_list.html:115
-#: ../template/default/timer_list.html:289
+#: ../template/default/at_timer_list.html:108
+#: ../template/default/timer_list.html:282
#: ../template/default/rec_list.html:92
msgid "Select all/none"
msgstr "Selectionner toutl/rien"
-#: ../template/default/at_timer_list.html:163
-#: ../template/default/timer_list.html:355
+#: ../template/default/at_timer_list.html:156
+#: ../template/default/timer_list.html:348
msgid "Edit"
msgstr "Editer"
-#: ../template/default/at_timer_list.html:168
-#: ../template/default/timer_list.html:358
+#: ../template/default/at_timer_list.html:161
+#: ../template/default/timer_list.html:351
msgid "Delete timer?"
msgstr "Supprimer Programmation ?"
-#: ../template/default/at_timer_list.html:168
-#: ../template/default/timer_list.html:358
+#: ../template/default/at_timer_list.html:161
+#: ../template/default/timer_list.html:351
#: ../template/default/rec_list.html:140
msgid "Delete"
msgstr "Supprimer"
-#: ../template/default/at_timer_list.html:199
+#: ../template/default/at_timer_list.html:188
msgid "Force Update"
msgstr "Forcer Mise à jour"
-#: ../template/default/at_timer_list.html:210
-#: ../template/default/timer_list.html:382
-msgid "Delete all selected timers?"
-msgstr "Supprimer Programmations Sélectionnées ?"
-
-#: ../template/default/at_timer_list.html:210
+#: ../template/default/at_timer_list.html:191
msgid "Delete Selected AutoTimers"
msgstr "Supprimer Auto-Programmations Sélectionnées"
+#: ../template/default/at_timer_list.html:191
+#: ../template/default/timer_list.html:374
+msgid "Delete all selected timers?"
+msgstr "Supprimer Programmations Sélectionnées ?"
+
#: ../template/default/prog_summary.html:7
#: ../template/default/prog_timeline.html:7
#: ../template/default/navigation.html:29 ../template/i18n.pl:2
@@ -369,7 +368,7 @@ msgstr "à :"
#: ../template/default/prog_summary.html:43
#: ../template/default/prog_list.html:23 ../template/default/rec_list.html:149
-#: ../template/default/prog_list2.html:54
+#: ../template/default/prog_list2.html:56
msgid "Stream"
msgstr "Flux"
@@ -391,13 +390,13 @@ msgstr "Enregistrer"
#: ../template/default/config.html:5 ../template/default/config.html:19
#: ../template/default/help_config.html:9
-#: ../template/default/help_config.html:21
+#: ../template/default/help_config.html:25
#: ../template/default/navigation.html:57
msgid "Configuration"
msgstr "Configuration"
-#: ../template/default/config.html:36 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:36
+#: ../template/default/config.html:36 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:40
msgid "General Settings"
msgstr "Paramètres Généraux"
@@ -405,186 +404,194 @@ msgstr "Paramètres Généraux"
msgid "Template:"
msgstr "Gabarit :"
-#: ../template/default/config.html:60 ../template/default/help_config.html:38
+#: ../template/default/config.html:60 ../template/default/help_config.html:42
msgid "Skin:"
msgstr "Thème :"
-#: ../template/default/config.html:72 ../template/default/help_config.html:40
+#: ../template/default/config.html:72 ../template/default/help_config.html:44
msgid "Login Page:"
msgstr "Page de Démarrage :"
-#: ../template/default/config.html:82 ../template/default/config.html:396
+#: ../template/default/config.html:82 ../template/default/config.html:402
msgid "Gets active after restarting VDRAdmin"
msgstr "Etre actif après le redémarrage de VDRAdmin"
-#: ../template/default/config.html:84 ../template/default/help_config.html:42
+#: ../template/default/config.html:84 ../template/default/help_config.html:46
msgid "Number of channels to use:"
msgstr "Nombre de chaînes à utiliser :"
-#: ../template/default/config.html:90 ../template/default/help_config.html:44
+#: ../template/default/config.html:90 ../template/default/help_config.html:48
msgid "Local net (no login required):"
msgstr "Réseau local (login non nécessaire) :"
-#: ../template/default/config.html:104 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:50
+#: ../template/default/config.html:104 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:54
msgid "VDR"
msgstr "VDR"
-#: ../template/default/config.html:114 ../template/default/help_config.html:52
+#: ../template/default/config.html:114 ../template/default/help_config.html:56
msgid "Number of DVB cards:"
msgstr "Nbre de Cartes DVB :"
-#: ../template/default/config.html:120 ../template/default/help_config.html:54
+#: ../template/default/config.html:120 ../template/default/help_config.html:58
msgid "Path to recordings:"
msgstr "Chemin des Enregistrements VDR :"
-#: ../template/default/config.html:126 ../template/default/help_config.html:56
+#: ../template/default/config.html:126 ../template/default/help_config.html:60
msgid "Path to configuration files:"
msgstr "Chemin vers les fichiers de configuration :"
-#: ../template/default/config.html:140 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:62
+#: ../template/default/config.html:132 ../template/default/help_config.html:62
+msgid "Path to EPG images:"
+msgstr ""
+
+#: ../template/default/config.html:146 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:68
msgid "Identification"
msgstr "Identification"
-#: ../template/default/config.html:150 ../template/default/help_config.html:64
+#: ../template/default/config.html:156 ../template/default/help_config.html:70
msgid "Username:"
msgstr "Identifiant :"
-#: ../template/default/config.html:156 ../template/default/help_config.html:66
+#: ../template/default/config.html:162 ../template/default/help_config.html:72
msgid "Password:"
msgstr "Mot de Passe :"
-#: ../template/default/config.html:162 ../template/default/help_config.html:68
+#: ../template/default/config.html:168 ../template/default/help_config.html:74
msgid "Guest Account:"
msgstr "Compte d'Invité :"
-#: ../template/default/config.html:171 ../template/default/help_config.html:70
+#: ../template/default/config.html:177 ../template/default/help_config.html:76
msgid "Guest Username:"
msgstr "Identifiant Invité :"
-#: ../template/default/config.html:177 ../template/default/help_config.html:72
+#: ../template/default/config.html:183 ../template/default/help_config.html:78
msgid "Guest Password:"
msgstr "Mot de Passe Invité :"
-#: ../template/default/config.html:191 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:78
+#: ../template/default/config.html:197 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:84
#: ../template/default/navigation.html:37 ../template/i18n.pl:4
msgid "Timeline"
msgstr "Chronologie"
-#: ../template/default/config.html:201 ../template/default/help_config.html:80
+#: ../template/default/config.html:207 ../template/default/help_config.html:86
msgid "Hours:"
msgstr "Heures :"
-#: ../template/default/config.html:207 ../template/default/help_config.html:82
+#: ../template/default/config.html:213 ../template/default/help_config.html:88
msgid "Times:"
msgstr "Périodes :"
-#: ../template/default/config.html:233 ../template/default/help_config.html:90
+#: ../template/default/config.html:239 ../template/default/help_config.html:96
msgid "Active:"
msgstr "Active :"
-#: ../template/default/config.html:242 ../template/default/help_config.html:92
+#: ../template/default/config.html:248 ../template/default/help_config.html:98
msgid "Timeout:"
msgstr "Timeout :"
-#: ../template/default/config.html:243 ../template/default/config.html:305
-#: ../template/default/config.html:311
+#: ../template/default/config.html:249 ../template/default/config.html:311
+#: ../template/default/config.html:317
msgid "minutes"
msgstr "minutes"
-#: ../template/default/config.html:261 ../template/default/config.html:304
-#: ../template/default/help_config.html:108
+#: ../template/default/config.html:267 ../template/default/config.html:310
+#: ../template/default/help_config.html:114
msgid "Time Margin at Start:"
msgstr "Marge avant :"
-#: ../template/default/config.html:267 ../template/default/config.html:310
-#: ../template/default/help_config.html:110
+#: ../template/default/config.html:273 ../template/default/config.html:316
+#: ../template/default/help_config.html:116
msgid "Time Margin at Stop:"
msgstr "Marge après :"
-#: ../template/default/config.html:282 ../template/default/timer_list.html:6
-#: ../template/default/timer_list.html:39
-#: ../template/default/help_config.html:34
-#: ../template/default/help_config.html:102
+#: ../template/default/config.html:288 ../template/default/timer_list.html:6
+#: ../template/default/timer_list.html:40
+#: ../template/default/help_config.html:38
+#: ../template/default/help_config.html:108
#: ../template/default/help_timer_list.html:6
-#: ../template/default/help_timer_list.html:18
+#: ../template/default/help_timer_list.html:22
#: ../template/default/navigation.html:45
msgid "Timer"
msgstr "Programmation"
-#: ../template/default/config.html:325 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:116
+#: ../template/default/config.html:331 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:122
msgid "Streaming"
msgstr "Emission de Flux"
-#: ../template/default/config.html:335
-#: ../template/default/help_config.html:118
+#: ../template/default/config.html:341
+#: ../template/default/help_config.html:124
msgid "Live Streaming:"
msgstr "Emission de Flux en direct:"
-#: ../template/default/config.html:344
-#: ../template/default/help_config.html:120
+#: ../template/default/config.html:350
+#: ../template/default/help_config.html:126
msgid "HTTP Port of Streamdev (also possible 3000/ts):"
msgstr "Port HTTP Streamdev (aussi possible 3000/ts) :"
-#: ../template/default/config.html:350
-#: ../template/default/help_config.html:122
+#: ../template/default/config.html:356
+#: ../template/default/help_config.html:128
msgid "Recordings Streaming:"
msgstr "Emission d'Enregistrements"
-#: ../template/default/config.html:359
-#: ../template/default/help_config.html:124
+#: ../template/default/config.html:365
+#: ../template/default/help_config.html:130
msgid "Path to VDR Recordings on your workstation:"
msgstr "Chemin vers les Enregistrements VDR sur votre poste de travail :"
-#: ../template/default/config.html:366
+#: ../template/default/config.html:372
msgid "Bandwidth of Streams:"
msgstr "Bande Passante Flux :"
-#: ../template/default/config.html:388 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:130
+#: ../template/default/config.html:394 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:136
msgid "Expert"
msgstr "Expert"
-#: ../template/default/config.html:398
-#: ../template/default/help_config.html:133
+#: ../template/default/config.html:404
+#: ../template/default/help_config.html:139
msgid "Read EPG directly using epg.data:"
msgstr "Lire l'EPG en utilisant directement epg.data :"
-#: ../template/default/config.html:407
-#: ../template/default/help_config.html:135
+#: ../template/default/config.html:413
+#: ../template/default/help_config.html:141
msgid "epg.data filename:"
msgstr "Nom du fichier epg.data :"
-#: ../template/default/config.html:413
-#: ../template/default/help_config.html:137
+#: ../template/default/config.html:419
+#: ../template/default/help_config.html:143
msgid "VFAT:"
msgstr "VFAT:"
-#: ../template/default/config.html:434 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:143
+#: ../template/default/config.html:440 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:149
msgid "Channel Selections"
msgstr "Sélections Chaînes"
-#: ../template/default/config.html:444
+#: ../template/default/config.html:450
msgid "In \"Timeline\"?"
msgstr "Dans \"Chronologie\" ?"
-#: ../template/default/config.html:453
-msgid "In \"Channels\" / \"Playing Today\"?"
-msgstr "Dans \"Chaînes\" / \"Joué Aujourd'hui\" ?"
+#: ../template/default/config.html:459
+msgid "In \"Channels\"?"
+msgstr ""
+
+#: ../template/default/config.html:468
+msgid "In \"Playing Today\"?"
+msgstr ""
-#: ../template/default/config.html:462
+#: ../template/default/config.html:477
msgid "In \"What's On Now\"?"
msgstr "Dans \"En ce Moment\" ?"
-#: ../template/default/config.html:471
+#: ../template/default/config.html:486
msgid "In \"AutoTimer\"?"
msgstr "Dans \"Auto-Programmations\" ?"
-#: ../template/default/config.html:512
+#: ../template/default/config.html:527
msgid "Apply"
msgstr "Appliquer"
@@ -598,44 +605,44 @@ msgstr "Durée :"
msgid "min"
msgstr "min"
-#: ../template/default/timer_list.html:46
+#: ../template/default/timer_list.html:42
msgid "New Timer"
msgstr "Nouvelle Programmation"
-#: ../template/default/timer_list.html:245
+#: ../template/default/timer_list.html:238
#: ../template/default/rec_list.html:59
msgid "Date"
msgstr "Date"
-#: ../template/default/timer_list.html:310
+#: ../template/default/timer_list.html:303
msgid "This timer is inactive!"
msgstr "Cette Programmation est inactive !"
-#: ../template/default/timer_list.html:313
+#: ../template/default/timer_list.html:306
msgid "This timer is impossible!"
msgstr "Cette Programmation est impossible !"
-#: ../template/default/timer_list.html:316
+#: ../template/default/timer_list.html:309
msgid "No more timers on other transponders possible!"
msgstr "Pas plus de Programmations possibles !"
-#: ../template/default/timer_list.html:319
+#: ../template/default/timer_list.html:312
msgid "Timer OK."
msgstr "Programmation OK."
-#: ../template/default/timer_list.html:324
+#: ../template/default/timer_list.html:317
msgid "Edit timer status?"
msgstr "Changer Statut Programmation ?"
-#: ../template/default/timer_list.html:327
+#: ../template/default/timer_list.html:320
msgid "VPS"
msgstr "VPS"
-#: ../template/default/timer_list.html:328
+#: ../template/default/timer_list.html:321
msgid "Auto"
msgstr "Auto"
-#: ../template/default/timer_list.html:382
+#: ../template/default/timer_list.html:374
msgid "Delete Selected Timers"
msgstr "Supprimer Programmations Sélectionnées"
@@ -645,7 +652,6 @@ msgid "Channels"
msgstr "Chaînes"
#: ../template/default/prog_list.html:33
-#: ../template/default/prog_list2.html:35
msgid "Go!"
msgstr "Ok !"
@@ -657,50 +663,50 @@ msgstr "Erreur !"
msgid "TV"
msgstr "TV"
-#: ../template/default/tv.html:179
+#: ../template/default/tv.html:178
msgid "Interval:"
msgstr "Intervalle :"
-#: ../template/default/tv.html:182 ../template/default/tv.html:183
-#: ../template/default/tv.html:184 ../template/default/tv.html:185
-#: ../template/default/tv.html:186 ../template/default/tv.html:187
-#: ../template/default/tv.html:188
+#: ../template/default/tv.html:181 ../template/default/tv.html:182
+#: ../template/default/tv.html:183 ../template/default/tv.html:184
+#: ../template/default/tv.html:185 ../template/default/tv.html:186
+#: ../template/default/tv.html:187
msgid "sec."
msgstr "sec."
-#: ../template/default/tv.html:190 ../template/default/tv.html:197
+#: ../template/default/tv.html:189 ../template/default/tv.html:196
msgid "G"
msgstr "R"
-#: ../template/default/tv.html:190 ../template/default/tv.html:197
+#: ../template/default/tv.html:189 ../template/default/tv.html:196
msgid "Grab the picture!"
msgstr "Rafraîchir!"
-#: ../template/default/tv.html:191
+#: ../template/default/tv.html:190
msgid "Size:"
msgstr "Taille :"
-#: ../template/default/tv.html:200
+#: ../template/default/tv.html:198
msgid "Open in separate window"
msgstr "Ouvrir dans une nouvelle fenêtre"
-#: ../template/default/prog_detail.html:37
+#: ../template/default/prog_detail.html:43
msgid "close"
msgstr "fermer"
-#: ../template/default/prog_detail.html:39
+#: ../template/default/prog_detail.html:45
msgid "view"
msgstr "vue"
-#: ../template/default/prog_detail.html:40
+#: ../template/default/prog_detail.html:46
msgid "record"
msgstr "enregistrer"
-#: ../template/default/prog_detail.html:41
+#: ../template/default/prog_detail.html:47
msgid "search"
msgstr "rechercher"
-#: ../template/default/prog_detail.html:44
+#: ../template/default/prog_detail.html:50
msgid "Lookup movie in the Internet-Movie-Database (IMDb)"
msgstr "Plus de details sur Internet"
@@ -759,7 +765,7 @@ msgstr "Supprimer Enregistrements Sélectionnés"
msgid "Delete all selected recordings?"
msgstr "Supprimer Enregistrements Sélectionnés ?"
-#: ../template/default/help_config.html:32
+#: ../template/default/help_config.html:36
msgid ""
"<p>Here you can change general settings and base settings for timers, "
"AutoTimers, channel selection and streaming parameters.</p>"
@@ -768,15 +774,15 @@ msgstr ""
"programmations, les Auto-Programmations, la sélection des chaines et les "
"paramétrages de diffusion.</p>"
-#: ../template/default/help_config.html:39
+#: ../template/default/help_config.html:43
msgid "The skin you want to use."
msgstr "Le thème que vous désirez utiliser."
-#: ../template/default/help_config.html:41
+#: ../template/default/help_config.html:45
msgid "The page you want to see at first connect to VDRAdmin."
msgstr "La page que vous désirez voir à la première connection à VDRAdmin."
-#: ../template/default/help_config.html:43
+#: ../template/default/help_config.html:47
msgid ""
"VDRAdmin will load the given number of channels from VDR and present only "
"those in any fields where channels can be selected. This also limits the EPG "
@@ -800,7 +806,7 @@ msgstr ""
"dans le menu <span class=\"ref_menu\">Auto-Programmation</span>ou redémarrer "
"VDRAdmin."
-#: ../template/default/help_config.html:45
+#: ../template/default/help_config.html:49
msgid ""
"Here you can specify an IP address or range that can login without providing "
"login information. For example: \"192.168.0.0/24\" will include any IP "
@@ -812,19 +818,19 @@ msgstr ""
"toute adresse commencant par \"192.168.0\", \"192.168.0.123/32\" inclura "
"seulement \"192.168.0.123\"."
-#: ../template/default/help_config.html:47
-#: ../template/default/help_config.html:59
-#: ../template/default/help_config.html:75
-#: ../template/default/help_config.html:85
-#: ../template/default/help_config.html:99
-#: ../template/default/help_config.html:113
-#: ../template/default/help_config.html:127
-#: ../template/default/help_config.html:140
-#: ../template/default/help_config.html:147
+#: ../template/default/help_config.html:51
+#: ../template/default/help_config.html:65
+#: ../template/default/help_config.html:81
+#: ../template/default/help_config.html:91
+#: ../template/default/help_config.html:105
+#: ../template/default/help_config.html:119
+#: ../template/default/help_config.html:133
+#: ../template/default/help_config.html:146
+#: ../template/default/help_config.html:153
msgid "Top"
msgstr "Haut"
-#: ../template/default/help_config.html:53
+#: ../template/default/help_config.html:57
msgid ""
"The number of DVB cards VDR can access. Depending on this value VDRAdmin "
"will calculate critical timers in the <span class=\"ref_menu\">Timer</span> "
@@ -834,7 +840,7 @@ msgstr ""
"VDRAdmin calculera les programmations critiques an le menu <span class="
"\"ref_menu\">Programmation</span>."
-#: ../template/default/help_config.html:55
+#: ../template/default/help_config.html:59
msgid ""
"The path to VDR's recordings. It's used so that VDRAdmin can locate the "
"recordings when using <span class=\"ref_label\">Recordings Streaming</span> "
@@ -847,7 +853,7 @@ msgstr ""
"\">reccmds.conf</span> dans le menu <span class=\"ref_menu"
"\">Enregistrements</span>."
-#: ../template/default/help_config.html:57
+#: ../template/default/help_config.html:61
msgid ""
"The path where VDR's configuration files are located. If this directory "
"contains the file <span class=\"ref_file\">reccmds.conf</span> its content "
@@ -859,17 +865,21 @@ msgstr ""
"dans une boite de sélection dans le menu <span class=\"ref_menu"
"\">Enregistrements</span>."
-#: ../template/default/help_config.html:65
+#: ../template/default/help_config.html:63
+msgid "The path where the EPG images are stored."
+msgstr ""
+
+#: ../template/default/help_config.html:71
msgid ""
"The username for the main user, i.e. the user having the most privileges."
msgstr ""
"Le nom d l'utilisateur principal, celui possédant le plus de privilèges."
-#: ../template/default/help_config.html:67
+#: ../template/default/help_config.html:73
msgid "The main user's password."
msgstr "Le mot de passe de l'utilisateur principal."
-#: ../template/default/help_config.html:69
+#: ../template/default/help_config.html:75
msgid ""
"If you want an user account having only limited privileges, this is for you. "
"The guest user cannot modify anything, it's only allowed to view the EPG, "
@@ -880,19 +890,19 @@ msgstr ""
"seulement autoriser à voir le guides électronique des programmes, les "
"programmations, les Auto-Programmations et la liste des enregistrements."
-#: ../template/default/help_config.html:71
+#: ../template/default/help_config.html:77
msgid "The username for the guest user."
msgstr "Le nom de l'utilisateur invité."
-#: ../template/default/help_config.html:73
+#: ../template/default/help_config.html:79
msgid "The guest user's password."
msgstr "Le mot de passe de l'invité."
-#: ../template/default/help_config.html:81
+#: ../template/default/help_config.html:87
msgid "The number of hours to show in the timeline."
msgstr "Le nombre d'heures à afficher dans la ligne du temps."
-#: ../template/default/help_config.html:83
+#: ../template/default/help_config.html:89
msgid ""
"A comma separated list of times in <strong>hh:mm</strong> format that appear "
"in the selectbox placed at the top."
@@ -900,18 +910,18 @@ msgstr ""
"Une liste d'horaires séparés par des virgules au format <strong>hh:mm</"
"strong> qui apparaissent dans la boites de sélection placée en haut."
-#: ../template/default/help_config.html:91
+#: ../template/default/help_config.html:97
msgid "Activate or deactivate the AutoTimer function."
msgstr "Avtive ou désactive la fonction d'Auto-Programmation."
-#: ../template/default/help_config.html:93
+#: ../template/default/help_config.html:99
msgid "The interval, the the EPG data is checked for updating the AutoTimers."
msgstr ""
"L'interval durant lequel les données du guide éléctronique des programmes "
"sont vérifiées pour mettre à jour les Auto-Programmations."
-#: ../template/default/help_config.html:95
-#: ../template/default/help_config.html:105
+#: ../template/default/help_config.html:101
+#: ../template/default/help_config.html:111
#: ../template/default/help_timer_new.html:62
#: ../template/default/help_at_timer_new.html:53
msgid ""
@@ -947,8 +957,8 @@ msgstr ""
"une priorité plus élevée interrompra la programmation avec la priorité la "
"plus faible pour démarrer l'enregistrement."
-#: ../template/default/help_config.html:97
-#: ../template/default/help_config.html:107
+#: ../template/default/help_config.html:103
+#: ../template/default/help_config.html:113
#: ../template/default/help_timer_new.html:64
#: ../template/default/help_at_timer_new.html:55
msgid ""
@@ -971,7 +981,7 @@ msgstr ""
"enregistrement, jusqu'à ce que le nombre de jour donné depuis la date de "
"<strong>démarrage</strong> de l'enregistrement soit dépassé."
-#: ../template/default/help_config.html:109
+#: ../template/default/help_config.html:115
msgid ""
"The number of minutes VDRAdmin subtracts from the broadcasts start time "
"found in the EPG. This value is used for timers programmed by AutoTimer and "
@@ -983,7 +993,7 @@ msgstr ""
"une pression sur \"Enregistrement\" sur tout affichage d'un guide "
"électronique des programmes."
-#: ../template/default/help_config.html:111
+#: ../template/default/help_config.html:117
msgid ""
"The number of minutes VDRAdmin adds to the broadcasts stop time found in the "
"EPG. This value is used for timers programmed by AutoTimer and timers "
@@ -996,7 +1006,7 @@ msgstr ""
"une pression sur \"Enregistrement\" sur tout affichage d'un guide "
"électronique des programmes."
-#: ../template/default/help_config.html:119
+#: ../template/default/help_config.html:125
msgid ""
"Enable or disable live streaming using the <a href=\"http://www.magoa.net/"
"linux/\">streamdev plugin</a>. You also have to set the correct <span class="
@@ -1007,7 +1017,7 @@ msgstr ""
"réglage correct du <span class=\"ref_label\">Port HTTP pour Streamdev</span> "
"ci-dessous."
-#: ../template/default/help_config.html:121
+#: ../template/default/help_config.html:127
msgid ""
"Here you have to set the port number your VDR's streamdev server listens for "
"connections. Additionally you can also provide the stream type you like to "
@@ -1017,7 +1027,7 @@ msgstr ""
"VDR sera à l'écoute pour toute connection. Additionellement vous pouvez "
"aussi fournir le type de flux que vous désirez utiliser."
-#: ../template/default/help_config.html:123
+#: ../template/default/help_config.html:129
msgid ""
"Enable or disable streaming of recordings.<br />Well actually this is no "
"real \"streaming\", but you have to setup your workstation so that it can "
@@ -1036,7 +1046,7 @@ msgstr ""
"configurés corectement, vous pourrez voir les enregistrements sur votre "
"station."
-#: ../template/default/help_config.html:125
+#: ../template/default/help_config.html:131
msgid ""
"This is the path where your workstation can access VDR's recordings. This "
"depends on your VDR and workstation setup, for example \"\\\\vdr\\videos\" "
@@ -1046,7 +1056,7 @@ msgstr ""
"Cela dépend des réglages de votre VDR et de votre station, par exemple \"\\"
"\\vdr\\videos\" ou \"V:\\\" (sur Windows) ou \"/mnt/videos\" (sur Linux)."
-#: ../template/default/help_config.html:131
+#: ../template/default/help_config.html:137
msgid ""
"<p>This section is for experts <strong>only</strong>, i.e. you know what you "
"are doing!</p>"
@@ -1054,7 +1064,7 @@ msgstr ""
"<p>Cette section est pour les experts <strong>seulement</strong>. Vous devez "
"savoir ce que vous faites!</p>"
-#: ../template/default/help_config.html:134
+#: ../template/default/help_config.html:140
msgid ""
"Accessing VDR's EPG through VDR's SVDRPort seems to block VDR for some time. "
"If this option is activated VDRAdmin will read the <span class=\"ref_file"
@@ -1064,7 +1074,7 @@ msgstr ""
"temps. Si cette option est activée, VDRAdmin lira le fichier <span class="
"\"ref_file\">epg.data</span> directement, et donc VDR ne sera pas bloqué."
-#: ../template/default/help_config.html:136
+#: ../template/default/help_config.html:142
msgid ""
"If you've enabled the option above you need to tell VDRAdmin where the <span "
"class=\"ref_file\">epg.data</span> file is located."
@@ -1072,7 +1082,7 @@ msgstr ""
"Si vous activez cette option ci-dessus, vous avez besoin de dire à VDRAdmin "
"où est situé le fichier <span class=\"ref_file\">epg.data</span>."
-#: ../template/default/help_config.html:138
+#: ../template/default/help_config.html:144
msgid ""
"If you have compiled VDR with the VFAT define you have to enable this "
"option. If this option is set to the wrong value, you may have problems with "
@@ -1083,16 +1093,17 @@ msgstr ""
"avoir des problèmes avec certains enregistrements si vous voulez les envoyer "
"en flux ou lancer des runcmds sur ceux-xi."
-#: ../template/default/help_config.html:144
+#: ../template/default/help_config.html:150
+#, fuzzy
msgid ""
"<p>If you want to limit the number of channels used in some parts of "
"VDRAdmin, this is for you!</p><p>Use the radio buttons to activate or "
"deactivate the wanted channels in the named menu.</p><p>To add channels to "
"the list of wanted channels you have to select them in the left side "
-"selectbox and click <span class=\"submit\">&gt;&gt;&gt;&gt;&gt;</span>. If "
-"you want to remove channels from the list of wanted channels you have to "
-"select them in the right side selectbox and click <span class=\"submit\">&lt;"
-"&lt;&lt;&lt;&lt;</span>.</p>"
+"selectbox and click <input type=\"submit\" class=\"submit\" value=\"&gt;&gt;"
+"&gt;&gt;&gt;\"/>. If you want to remove channels from the list of wanted "
+"channels you have to select them in the right side selectbox and click "
+"<input type=\"submit\" class=\"submit\" value=\"&lt;&lt;&lt;&lt;&lt;\"/>.</p>"
msgstr ""
"<p>Si vous voulez limiter le nombre de chaines dans certaines partie de "
"VDRAdmin, ceci est pour vous!</p><p>Utilisez les boutons radio pour activer "
@@ -1112,8 +1123,7 @@ msgid "to"
msgstr "à"
#: ../template/default/prog_list2.html:6
-#: ../template/default/prog_list2.html:28
-#: ../template/default/navigation.html:33
+#: ../template/default/navigation.html:33 ../vdradmind.pl:2432
msgid "Playing Today"
msgstr "Joué Aujourd'hui"
@@ -1129,7 +1139,8 @@ msgstr "Nom Original d'Enregistrement :"
msgid "New Name of Recording:"
msgstr "Nouveau Nom d'Enregistrement :"
-#: ../template/default/help_timer_list.html:29
+#: ../template/default/help_timer_list.html:33
+#, fuzzy
msgid ""
"<p>Here you will find a listing of timers known to VDR.</p><p>On top you "
"will find a chart showing a day's timers graphically. This provides an quick "
@@ -1161,10 +1172,10 @@ msgid ""
"record.<br /><span class=\"color_inactive\">&nbsp;&nbsp;&nbsp;</span> / <img "
"src=\"bilder/poempl_grau.gif\" alt=\"inactive\" align=\"absmiddle\" /> Timer "
"is not active.</p><p>In addition to these functions you can add a new timer "
-"by clicking <span class=\"submit\">New Timer</span> at the top and you can "
-"delete a number of timers at once by checking the box in the last column of "
-"those timers and clicking <span class=\"submit\">Delete Selected Timers</"
-"span>.</p>"
+"by clicking <input type=\"submit\" class=\"submit\" value=\"New Timer\"/> at "
+"the top and you can delete a number of timers at once by checking the box in "
+"the last column of those timers and clicking <input type=\"submit\" class="
+"\"submit\" value=\"Delete Selected Timers\"/>.</p>"
msgstr ""
"<p>Vous trouverez ici une liste des programmation connues de VDR.</p><p>Au "
"dessus vous trouverez un graphique montrant les programmations d'un jour. "
@@ -1320,7 +1331,8 @@ msgstr ""
"fichier <span class=\"ref_file\">summary.vdr</span> ou <span class=\"ref_file"
"\">info.vdr</span> de l'enregistrement."
-#: ../template/default/help_at_timer_list.html:29
+#: ../template/default/help_at_timer_list.html:33
+#, fuzzy
msgid ""
"<p>Here you will find a listing of automatic timers (AutoTimer) known to "
"VDRAdmin.</p><p>The list shows some information on AutoTimers. You can "
@@ -1337,11 +1349,12 @@ msgid ""
"AutoTimer is OK and will automatically program matching broadcasts.<br /"
"><img src=\"bilder/poempl_grau.gif\" alt=\"inactive\" align=\"absmiddle\" /> "
"AutoTimer is not active.</p><p>In addition to these functions you can add a "
-"new AutoTimer by clicking <span class=\"submit\">New AutoTimer</span> at the "
-"top and you can delete a number of AutoTimers at once by checking the box in "
-"the last column of those timers and clicking <span class=\"submit\">Delete "
-"Selected AutoTimers</span>.</p><p>Click <span class=\"submit\">Force Update</"
-"span> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check "
+"new AutoTimer by clicking <input type=\"submit\" class=\"submit\" value="
+"\"New AutoTimer\"/> at the top and you can delete a number of AutoTimers at "
+"once by checking the box in the last column of those timers and clicking "
+"<input type=\"submit\" class=\"submit\" value=\"Delete Selected AutoTimers\"/"
+">.</p><p>Click <input type=\"submit\" class=\"submit\" value=\"Force Update"
+"\"/> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check "
"for matching AutoTimers.</p>"
msgstr ""
"<p>Vous trouverez ici une liste des programmations automatiques (Auto-"
@@ -1603,6 +1616,7 @@ msgstr ""
"enregistrements! VDRAdmin n'ajoutera rien au nom résultant."
#: ../template/default/help_rec_list.html:29
+#, fuzzy
msgid ""
"<p>Here you will find a listing of recordings known to VDR. The headline "
"will also show you VDR's total and free disk space.</p><p>The listing "
@@ -1628,13 +1642,13 @@ msgid ""
"\">Configuration</span> menu. You can watch the recording at your "
"workstation.</dd></dl></p><p>In addition to these functions you can delete a "
"number of recordings at once by checking the box in the last but one column "
-"of those recordings and clicking <span class=\"submit\">Delete Selected "
-"Recordings</span>.</p><p>If you've set the path the VDR's configuration "
-"files and have entries in VDR's <span class=\"ref_file\">reccmds.conf</span> "
-"you can run those commands for the selected recording by selecting the "
-"wanted command in the select box locate next to <span class=\"ref_label"
-"\">Commands:</span> and pressing the <span class=\"submit\">Run</span> "
-"button.</p>"
+"of those recordings and clicking <input type=\"submit\" class=\"submit\" "
+"value=\"Delete Selected Recordings\"/>.</p><p>If you've set the path the "
+"VDR's configuration files and have entries in VDR's <span class=\"ref_file"
+"\">reccmds.conf</span> you can run those commands for the selected recording "
+"by selecting the wanted command in the select box locate next to <span class="
+"\"ref_label\">Commands:</span> and pressing the <input type=\"submit\" class="
+"\"submit\" value=\"Run\"/> button.</p>"
msgstr ""
"<p>Vous trouverez ici une liste des enregistrements connus de VDR. L'en-tête "
"vous affiche aussi l'espace total et libre pour VDR</p><p>La liste vous "
@@ -1706,47 +1720,56 @@ msgstr "Regarder TV"
msgid "Search"
msgstr "Rechercher"
-#: ../vdradmind.pl:251
+#: ../vdradmind.pl:265
msgid "What's your VDR hostname (e.g video.intra.net)?"
msgstr "Quel est votre Nom d'Hôte (ex video.intra.net) ?"
-#: ../vdradmind.pl:252
+#: ../vdradmind.pl:266
msgid "On which port does VDR listen to SVDRP queries?"
msgstr "Sur quel port VDR écoute les requêtes SVDRP ?"
-#: ../vdradmind.pl:253
+#: ../vdradmind.pl:267
msgid "On which address should VDRAdmin listen (0.0.0.0 for any)?"
msgstr "Sur quel adresse VDRAdmin doit-il écouter (0.0.0.0 pour toutes) ?"
-#: ../vdradmind.pl:254
+#: ../vdradmind.pl:268
msgid "On which port should VDRAdmin listen?"
msgstr "Sur quel port VDRAdmin doit-il écouter ?"
-#: ../vdradmind.pl:255
+#: ../vdradmind.pl:269
msgid "Username?"
msgstr "Identifiant ?"
-#: ../vdradmind.pl:256
+#: ../vdradmind.pl:270
msgid "Password?"
msgstr "Mot de Passe ?"
-#: ../vdradmind.pl:257
+#: ../vdradmind.pl:271
msgid "Where are your recordings stored?"
msgstr "Où vos enregistrements sont-ils stockés ?"
-#: ../vdradmind.pl:258
+#: ../vdradmind.pl:272
msgid "Where are your VDR's configuration files located?"
msgstr "Où sont vos fichiers de configuration de VDR ?"
-#: ../vdradmind.pl:264
+#: ../vdradmind.pl:278
msgid "Config file written successfully."
msgstr "Fichier de configuration écrit avec succès."
-#: ../vdradmind.pl:312
+#: ../vdradmind.pl:326
#, perl-format
msgid "vdradmind.pl %s started with pid %d."
msgstr "vdradmin.pl %s a démarré avec le pid %d."
+#: ../vdradmind.pl:2432
+msgid "Playing Tomorrow"
+msgstr ""
+
+#: ../vdradmind.pl:2432
+#, perl-format
+msgid "Playing on the %d."
+msgstr ""
+
#: ../template/i18n.pl:3
msgid "Playing Today?"
msgstr "Aujourd'hui ?"
@@ -1800,6 +1823,9 @@ msgstr "Erreur en envoyant la commande à %s"
msgid "Schedule"
msgstr "Programmateur"
+#~ msgid "In \"Channels\" / \"Playing Today\"?"
+#~ msgstr "Dans \"Chaînes\" / \"Joué Aujourd'hui\" ?"
+
#~ msgid "more"
#~ msgstr "suite"
diff --git a/po/vdradmin.pot b/po/vdradmin.pot
index 089aa37..57c2bce 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: 2005-07-12 13:18+0200\n"
+"POT-Creation-Date: 2005-09-23 10:28+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"
@@ -52,8 +52,8 @@ msgid "Edit Timer"
msgstr ""
#: ../template/default/timer_new.html:53
-#: ../template/default/at_timer_list.html:47
-#: ../template/default/config.html:23 ../template/default/timer_list.html:55
+#: ../template/default/at_timer_list.html:39
+#: ../template/default/config.html:23 ../template/default/timer_list.html:47
#: ../template/default/rec_list.html:27
#: ../template/default/at_timer_new.html:24
msgid "Help"
@@ -65,13 +65,13 @@ msgid "Timer Active:"
msgstr ""
#: ../template/default/timer_new.html:75
-#: ../template/default/at_timer_list.html:135
-#: ../template/default/config.html:164 ../template/default/config.html:235
-#: ../template/default/config.html:337 ../template/default/config.html:352
-#: ../template/default/config.html:400 ../template/default/config.html:415
-#: ../template/default/config.html:446 ../template/default/config.html:455
-#: ../template/default/config.html:464 ../template/default/config.html:473
-#: ../template/default/timer_list.html:325
+#: ../template/default/at_timer_list.html:128
+#: ../template/default/config.html:170 ../template/default/config.html:241
+#: ../template/default/config.html:343 ../template/default/config.html:358
+#: ../template/default/config.html:406 ../template/default/config.html:421
+#: ../template/default/config.html:452 ../template/default/config.html:461
+#: ../template/default/config.html:470 ../template/default/config.html:479
+#: ../template/default/config.html:488 ../template/default/timer_list.html:318
#: ../template/default/at_timer_new.html:48
#: ../template/default/at_timer_new.html:52
#: ../template/default/at_timer_new.html:154
@@ -79,13 +79,13 @@ msgid "Yes"
msgstr ""
#: ../template/default/timer_new.html:76
-#: ../template/default/at_timer_list.html:137
-#: ../template/default/config.html:165 ../template/default/config.html:236
-#: ../template/default/config.html:338 ../template/default/config.html:353
-#: ../template/default/config.html:401 ../template/default/config.html:416
-#: ../template/default/config.html:447 ../template/default/config.html:456
-#: ../template/default/config.html:465 ../template/default/config.html:474
-#: ../template/default/timer_list.html:326
+#: ../template/default/at_timer_list.html:130
+#: ../template/default/config.html:171 ../template/default/config.html:242
+#: ../template/default/config.html:344 ../template/default/config.html:359
+#: ../template/default/config.html:407 ../template/default/config.html:422
+#: ../template/default/config.html:453 ../template/default/config.html:462
+#: ../template/default/config.html:471 ../template/default/config.html:480
+#: ../template/default/config.html:489 ../template/default/timer_list.html:319
#: ../template/default/at_timer_new.html:49
#: ../template/default/at_timer_new.html:53
#: ../template/default/at_timer_new.html:155
@@ -107,13 +107,12 @@ msgstr ""
msgid "Time"
msgstr ""
-#: ../template/default/timer_new.html:88 ../template/default/tv.html:181
+#: ../template/default/timer_new.html:88 ../template/default/tv.html:180
#: ../template/default/help_timer_new.html:43
msgid "off"
msgstr ""
#: ../template/default/timer_new.html:94 ../template/default/prog_list.html:27
-#: ../template/default/prog_list2.html:30
#: ../template/default/help_timer_new.html:47
#: ../template/default/help_at_timer_new.html:46
#: ../template/default/at_timer_new.html:93
@@ -184,10 +183,10 @@ msgstr ""
#: ../template/default/timer_new.html:144
#: ../template/default/at_timer_list.html:21
-#: ../template/default/config.html:248 ../template/default/config.html:292
+#: ../template/default/config.html:254 ../template/default/config.html:298
#: ../template/default/timer_list.html:24
-#: ../template/default/help_config.html:94
-#: ../template/default/help_config.html:104
+#: ../template/default/help_config.html:100
+#: ../template/default/help_config.html:110
#: ../template/default/help_timer_new.html:61
#: ../template/default/help_at_timer_new.html:52
#: ../template/default/at_timer_new.html:128
@@ -196,10 +195,10 @@ msgstr ""
#: ../template/default/timer_new.html:150
#: ../template/default/at_timer_list.html:21
-#: ../template/default/config.html:254 ../template/default/config.html:298
+#: ../template/default/config.html:260 ../template/default/config.html:304
#: ../template/default/timer_list.html:24
-#: ../template/default/help_config.html:96
-#: ../template/default/help_config.html:106
+#: ../template/default/help_config.html:102
+#: ../template/default/help_config.html:112
#: ../template/default/help_timer_new.html:63
#: ../template/default/help_at_timer_new.html:54
#: ../template/default/at_timer_new.html:136
@@ -216,7 +215,7 @@ msgstr ""
msgid "Summary:"
msgstr ""
-#: ../template/default/timer_new.html:174 ../template/default/config.html:511
+#: ../template/default/timer_new.html:174 ../template/default/config.html:526
#: ../template/default/at_timer_new.html:176
msgid "Save"
msgstr ""
@@ -253,78 +252,78 @@ msgid ""
msgstr ""
#: ../template/default/at_timer_list.html:6
-#: ../template/default/at_timer_list.html:30
-#: ../template/default/config.html:223 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:88
+#: ../template/default/at_timer_list.html:31
+#: ../template/default/config.html:229 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:94
#: ../template/default/help_at_timer_list.html:6
-#: ../template/default/help_at_timer_list.html:18
+#: ../template/default/help_at_timer_list.html:22
#: ../template/default/navigation.html:49
msgid "AutoTimer"
msgstr ""
-#: ../template/default/at_timer_list.html:38
+#: ../template/default/at_timer_list.html:34
msgid "New AutoTimer"
msgstr ""
-#: ../template/default/at_timer_list.html:60
-#: ../template/default/timer_list.html:223
+#: ../template/default/at_timer_list.html:53
+#: ../template/default/timer_list.html:216
msgid "Active"
msgstr ""
-#: ../template/default/at_timer_list.html:71
-#: ../template/default/timer_list.html:234
+#: ../template/default/at_timer_list.html:64
+#: ../template/default/timer_list.html:227
msgid "Channel"
msgstr ""
-#: ../template/default/at_timer_list.html:82
-#: ../template/default/timer_list.html:256
+#: ../template/default/at_timer_list.html:75
+#: ../template/default/timer_list.html:249
msgid "Start"
msgstr ""
-#: ../template/default/at_timer_list.html:93
-#: ../template/default/timer_list.html:267
+#: ../template/default/at_timer_list.html:86
+#: ../template/default/timer_list.html:260
msgid "Stop"
msgstr ""
-#: ../template/default/at_timer_list.html:104
-#: ../template/default/timer_list.html:278
+#: ../template/default/at_timer_list.html:97
+#: ../template/default/timer_list.html:271
#: ../template/default/rec_list.html:81
msgid "Name"
msgstr ""
-#: ../template/default/at_timer_list.html:115
-#: ../template/default/timer_list.html:289
+#: ../template/default/at_timer_list.html:108
+#: ../template/default/timer_list.html:282
#: ../template/default/rec_list.html:92
msgid "Select all/none"
msgstr ""
-#: ../template/default/at_timer_list.html:163
-#: ../template/default/timer_list.html:355
+#: ../template/default/at_timer_list.html:156
+#: ../template/default/timer_list.html:348
msgid "Edit"
msgstr ""
-#: ../template/default/at_timer_list.html:168
-#: ../template/default/timer_list.html:358
+#: ../template/default/at_timer_list.html:161
+#: ../template/default/timer_list.html:351
msgid "Delete timer?"
msgstr ""
-#: ../template/default/at_timer_list.html:168
-#: ../template/default/timer_list.html:358
+#: ../template/default/at_timer_list.html:161
+#: ../template/default/timer_list.html:351
#: ../template/default/rec_list.html:140
msgid "Delete"
msgstr ""
-#: ../template/default/at_timer_list.html:199
+#: ../template/default/at_timer_list.html:188
msgid "Force Update"
msgstr ""
-#: ../template/default/at_timer_list.html:210
-#: ../template/default/timer_list.html:382
-msgid "Delete all selected timers?"
+#: ../template/default/at_timer_list.html:191
+msgid "Delete Selected AutoTimers"
msgstr ""
-#: ../template/default/at_timer_list.html:210
-msgid "Delete Selected AutoTimers"
+#: ../template/default/at_timer_list.html:191
+#: ../template/default/timer_list.html:374
+msgid "Delete all selected timers?"
msgstr ""
#: ../template/default/prog_summary.html:7
@@ -350,7 +349,7 @@ msgstr ""
#: ../template/default/prog_summary.html:43
#: ../template/default/prog_list.html:23 ../template/default/rec_list.html:149
-#: ../template/default/prog_list2.html:54
+#: ../template/default/prog_list2.html:56
msgid "Stream"
msgstr ""
@@ -372,13 +371,13 @@ msgstr ""
#: ../template/default/config.html:5 ../template/default/config.html:19
#: ../template/default/help_config.html:9
-#: ../template/default/help_config.html:21
+#: ../template/default/help_config.html:25
#: ../template/default/navigation.html:57
msgid "Configuration"
msgstr ""
-#: ../template/default/config.html:36 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:36
+#: ../template/default/config.html:36 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:40
msgid "General Settings"
msgstr ""
@@ -386,186 +385,194 @@ msgstr ""
msgid "Template:"
msgstr ""
-#: ../template/default/config.html:60 ../template/default/help_config.html:38
+#: ../template/default/config.html:60 ../template/default/help_config.html:42
msgid "Skin:"
msgstr ""
-#: ../template/default/config.html:72 ../template/default/help_config.html:40
+#: ../template/default/config.html:72 ../template/default/help_config.html:44
msgid "Login Page:"
msgstr ""
-#: ../template/default/config.html:82 ../template/default/config.html:396
+#: ../template/default/config.html:82 ../template/default/config.html:402
msgid "Gets active after restarting VDRAdmin"
msgstr ""
-#: ../template/default/config.html:84 ../template/default/help_config.html:42
+#: ../template/default/config.html:84 ../template/default/help_config.html:46
msgid "Number of channels to use:"
msgstr ""
-#: ../template/default/config.html:90 ../template/default/help_config.html:44
+#: ../template/default/config.html:90 ../template/default/help_config.html:48
msgid "Local net (no login required):"
msgstr ""
-#: ../template/default/config.html:104 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:50
+#: ../template/default/config.html:104 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:54
msgid "VDR"
msgstr ""
-#: ../template/default/config.html:114 ../template/default/help_config.html:52
+#: ../template/default/config.html:114 ../template/default/help_config.html:56
msgid "Number of DVB cards:"
msgstr ""
-#: ../template/default/config.html:120 ../template/default/help_config.html:54
+#: ../template/default/config.html:120 ../template/default/help_config.html:58
msgid "Path to recordings:"
msgstr ""
-#: ../template/default/config.html:126 ../template/default/help_config.html:56
+#: ../template/default/config.html:126 ../template/default/help_config.html:60
msgid "Path to configuration files:"
msgstr ""
-#: ../template/default/config.html:140 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:62
+#: ../template/default/config.html:132 ../template/default/help_config.html:62
+msgid "Path to EPG images:"
+msgstr ""
+
+#: ../template/default/config.html:146 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:68
msgid "Identification"
msgstr ""
-#: ../template/default/config.html:150 ../template/default/help_config.html:64
+#: ../template/default/config.html:156 ../template/default/help_config.html:70
msgid "Username:"
msgstr ""
-#: ../template/default/config.html:156 ../template/default/help_config.html:66
+#: ../template/default/config.html:162 ../template/default/help_config.html:72
msgid "Password:"
msgstr ""
-#: ../template/default/config.html:162 ../template/default/help_config.html:68
+#: ../template/default/config.html:168 ../template/default/help_config.html:74
msgid "Guest Account:"
msgstr ""
-#: ../template/default/config.html:171 ../template/default/help_config.html:70
+#: ../template/default/config.html:177 ../template/default/help_config.html:76
msgid "Guest Username:"
msgstr ""
-#: ../template/default/config.html:177 ../template/default/help_config.html:72
+#: ../template/default/config.html:183 ../template/default/help_config.html:78
msgid "Guest Password:"
msgstr ""
-#: ../template/default/config.html:191 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:78
+#: ../template/default/config.html:197 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:84
#: ../template/default/navigation.html:37 ../template/i18n.pl:4
msgid "Timeline"
msgstr ""
-#: ../template/default/config.html:201 ../template/default/help_config.html:80
+#: ../template/default/config.html:207 ../template/default/help_config.html:86
msgid "Hours:"
msgstr ""
-#: ../template/default/config.html:207 ../template/default/help_config.html:82
+#: ../template/default/config.html:213 ../template/default/help_config.html:88
msgid "Times:"
msgstr ""
-#: ../template/default/config.html:233 ../template/default/help_config.html:90
+#: ../template/default/config.html:239 ../template/default/help_config.html:96
msgid "Active:"
msgstr ""
-#: ../template/default/config.html:242 ../template/default/help_config.html:92
+#: ../template/default/config.html:248 ../template/default/help_config.html:98
msgid "Timeout:"
msgstr ""
-#: ../template/default/config.html:243 ../template/default/config.html:305
-#: ../template/default/config.html:311
+#: ../template/default/config.html:249 ../template/default/config.html:311
+#: ../template/default/config.html:317
msgid "minutes"
msgstr ""
-#: ../template/default/config.html:261 ../template/default/config.html:304
-#: ../template/default/help_config.html:108
+#: ../template/default/config.html:267 ../template/default/config.html:310
+#: ../template/default/help_config.html:114
msgid "Time Margin at Start:"
msgstr ""
-#: ../template/default/config.html:267 ../template/default/config.html:310
-#: ../template/default/help_config.html:110
+#: ../template/default/config.html:273 ../template/default/config.html:316
+#: ../template/default/help_config.html:116
msgid "Time Margin at Stop:"
msgstr ""
-#: ../template/default/config.html:282 ../template/default/timer_list.html:6
-#: ../template/default/timer_list.html:39
-#: ../template/default/help_config.html:34
-#: ../template/default/help_config.html:102
+#: ../template/default/config.html:288 ../template/default/timer_list.html:6
+#: ../template/default/timer_list.html:40
+#: ../template/default/help_config.html:38
+#: ../template/default/help_config.html:108
#: ../template/default/help_timer_list.html:6
-#: ../template/default/help_timer_list.html:18
+#: ../template/default/help_timer_list.html:22
#: ../template/default/navigation.html:45
msgid "Timer"
msgstr ""
-#: ../template/default/config.html:325 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:116
+#: ../template/default/config.html:331 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:122
msgid "Streaming"
msgstr ""
-#: ../template/default/config.html:335
-#: ../template/default/help_config.html:118
+#: ../template/default/config.html:341
+#: ../template/default/help_config.html:124
msgid "Live Streaming:"
msgstr ""
-#: ../template/default/config.html:344
-#: ../template/default/help_config.html:120
+#: ../template/default/config.html:350
+#: ../template/default/help_config.html:126
msgid "HTTP Port of Streamdev (also possible 3000/ts):"
msgstr ""
-#: ../template/default/config.html:350
-#: ../template/default/help_config.html:122
+#: ../template/default/config.html:356
+#: ../template/default/help_config.html:128
msgid "Recordings Streaming:"
msgstr ""
-#: ../template/default/config.html:359
-#: ../template/default/help_config.html:124
+#: ../template/default/config.html:365
+#: ../template/default/help_config.html:130
msgid "Path to VDR Recordings on your workstation:"
msgstr ""
-#: ../template/default/config.html:366
+#: ../template/default/config.html:372
msgid "Bandwidth of Streams:"
msgstr ""
-#: ../template/default/config.html:388 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:130
+#: ../template/default/config.html:394 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:136
msgid "Expert"
msgstr ""
-#: ../template/default/config.html:398
-#: ../template/default/help_config.html:133
+#: ../template/default/config.html:404
+#: ../template/default/help_config.html:139
msgid "Read EPG directly using epg.data:"
msgstr ""
-#: ../template/default/config.html:407
-#: ../template/default/help_config.html:135
+#: ../template/default/config.html:413
+#: ../template/default/help_config.html:141
msgid "epg.data filename:"
msgstr ""
-#: ../template/default/config.html:413
-#: ../template/default/help_config.html:137
+#: ../template/default/config.html:419
+#: ../template/default/help_config.html:143
msgid "VFAT:"
msgstr ""
-#: ../template/default/config.html:434 ../template/default/help_config.html:34
-#: ../template/default/help_config.html:143
+#: ../template/default/config.html:440 ../template/default/help_config.html:38
+#: ../template/default/help_config.html:149
msgid "Channel Selections"
msgstr ""
-#: ../template/default/config.html:444
+#: ../template/default/config.html:450
msgid "In \"Timeline\"?"
msgstr ""
-#: ../template/default/config.html:453
-msgid "In \"Channels\" / \"Playing Today\"?"
+#: ../template/default/config.html:459
+msgid "In \"Channels\"?"
msgstr ""
-#: ../template/default/config.html:462
+#: ../template/default/config.html:468
+msgid "In \"Playing Today\"?"
+msgstr ""
+
+#: ../template/default/config.html:477
msgid "In \"What's On Now\"?"
msgstr ""
-#: ../template/default/config.html:471
+#: ../template/default/config.html:486
msgid "In \"AutoTimer\"?"
msgstr ""
-#: ../template/default/config.html:512
+#: ../template/default/config.html:527
msgid "Apply"
msgstr ""
@@ -579,44 +586,44 @@ msgstr ""
msgid "min"
msgstr ""
-#: ../template/default/timer_list.html:46
+#: ../template/default/timer_list.html:42
msgid "New Timer"
msgstr ""
-#: ../template/default/timer_list.html:245
+#: ../template/default/timer_list.html:238
#: ../template/default/rec_list.html:59
msgid "Date"
msgstr ""
-#: ../template/default/timer_list.html:310
+#: ../template/default/timer_list.html:303
msgid "This timer is inactive!"
msgstr ""
-#: ../template/default/timer_list.html:313
+#: ../template/default/timer_list.html:306
msgid "This timer is impossible!"
msgstr ""
-#: ../template/default/timer_list.html:316
+#: ../template/default/timer_list.html:309
msgid "No more timers on other transponders possible!"
msgstr ""
-#: ../template/default/timer_list.html:319
+#: ../template/default/timer_list.html:312
msgid "Timer OK."
msgstr ""
-#: ../template/default/timer_list.html:324
+#: ../template/default/timer_list.html:317
msgid "Edit timer status?"
msgstr ""
-#: ../template/default/timer_list.html:327
+#: ../template/default/timer_list.html:320
msgid "VPS"
msgstr ""
-#: ../template/default/timer_list.html:328
+#: ../template/default/timer_list.html:321
msgid "Auto"
msgstr ""
-#: ../template/default/timer_list.html:382
+#: ../template/default/timer_list.html:374
msgid "Delete Selected Timers"
msgstr ""
@@ -626,7 +633,6 @@ msgid "Channels"
msgstr ""
#: ../template/default/prog_list.html:33
-#: ../template/default/prog_list2.html:35
msgid "Go!"
msgstr ""
@@ -638,50 +644,50 @@ msgstr ""
msgid "TV"
msgstr ""
-#: ../template/default/tv.html:179
+#: ../template/default/tv.html:178
msgid "Interval:"
msgstr ""
-#: ../template/default/tv.html:182 ../template/default/tv.html:183
-#: ../template/default/tv.html:184 ../template/default/tv.html:185
-#: ../template/default/tv.html:186 ../template/default/tv.html:187
-#: ../template/default/tv.html:188
+#: ../template/default/tv.html:181 ../template/default/tv.html:182
+#: ../template/default/tv.html:183 ../template/default/tv.html:184
+#: ../template/default/tv.html:185 ../template/default/tv.html:186
+#: ../template/default/tv.html:187
msgid "sec."
msgstr ""
-#: ../template/default/tv.html:190 ../template/default/tv.html:197
+#: ../template/default/tv.html:189 ../template/default/tv.html:196
msgid "G"
msgstr ""
-#: ../template/default/tv.html:190 ../template/default/tv.html:197
+#: ../template/default/tv.html:189 ../template/default/tv.html:196
msgid "Grab the picture!"
msgstr ""
-#: ../template/default/tv.html:191
+#: ../template/default/tv.html:190
msgid "Size:"
msgstr ""
-#: ../template/default/tv.html:200
+#: ../template/default/tv.html:198
msgid "Open in separate window"
msgstr ""
-#: ../template/default/prog_detail.html:37
+#: ../template/default/prog_detail.html:43
msgid "close"
msgstr ""
-#: ../template/default/prog_detail.html:39
+#: ../template/default/prog_detail.html:45
msgid "view"
msgstr ""
-#: ../template/default/prog_detail.html:40
+#: ../template/default/prog_detail.html:46
msgid "record"
msgstr ""
-#: ../template/default/prog_detail.html:41
+#: ../template/default/prog_detail.html:47
msgid "search"
msgstr ""
-#: ../template/default/prog_detail.html:44
+#: ../template/default/prog_detail.html:50
msgid "Lookup movie in the Internet-Movie-Database (IMDb)"
msgstr ""
@@ -740,21 +746,21 @@ msgstr ""
msgid "Delete all selected recordings?"
msgstr ""
-#: ../template/default/help_config.html:32
+#: ../template/default/help_config.html:36
msgid ""
"<p>Here you can change general settings and base settings for timers, "
"AutoTimers, channel selection and streaming parameters.</p>"
msgstr ""
-#: ../template/default/help_config.html:39
+#: ../template/default/help_config.html:43
msgid "The skin you want to use."
msgstr ""
-#: ../template/default/help_config.html:41
+#: ../template/default/help_config.html:45
msgid "The page you want to see at first connect to VDRAdmin."
msgstr ""
-#: ../template/default/help_config.html:43
+#: ../template/default/help_config.html:47
msgid ""
"VDRAdmin will load the given number of channels from VDR and present only "
"those in any fields where channels can be selected. This also limits the EPG "
@@ -767,7 +773,7 @@ msgid ""
"restart VDRAdmin."
msgstr ""
-#: ../template/default/help_config.html:45
+#: ../template/default/help_config.html:49
msgid ""
"Here you can specify an IP address or range that can login without providing "
"login information. For example: \"192.168.0.0/24\" will include any IP "
@@ -775,26 +781,26 @@ msgid ""
"\"192.168.0.123\"."
msgstr ""
-#: ../template/default/help_config.html:47
-#: ../template/default/help_config.html:59
-#: ../template/default/help_config.html:75
-#: ../template/default/help_config.html:85
-#: ../template/default/help_config.html:99
-#: ../template/default/help_config.html:113
-#: ../template/default/help_config.html:127
-#: ../template/default/help_config.html:140
-#: ../template/default/help_config.html:147
+#: ../template/default/help_config.html:51
+#: ../template/default/help_config.html:65
+#: ../template/default/help_config.html:81
+#: ../template/default/help_config.html:91
+#: ../template/default/help_config.html:105
+#: ../template/default/help_config.html:119
+#: ../template/default/help_config.html:133
+#: ../template/default/help_config.html:146
+#: ../template/default/help_config.html:153
msgid "Top"
msgstr ""
-#: ../template/default/help_config.html:53
+#: ../template/default/help_config.html:57
msgid ""
"The number of DVB cards VDR can access. Depending on this value VDRAdmin "
"will calculate critical timers in the <span class=\"ref_menu\">Timer</span> "
"menu."
msgstr ""
-#: ../template/default/help_config.html:55
+#: ../template/default/help_config.html:59
msgid ""
"The path to VDR's recordings. It's used so that VDRAdmin can locate the "
"recordings when using <span class=\"ref_label\">Recordings Streaming</span> "
@@ -802,7 +808,7 @@ msgid ""
"\"ref_menu\">Recordings</span> menu."
msgstr ""
-#: ../template/default/help_config.html:57
+#: ../template/default/help_config.html:61
msgid ""
"The path where VDR's configuration files are located. If this directory "
"contains the file <span class=\"ref_file\">reccmds.conf</span> its content "
@@ -810,50 +816,54 @@ msgid ""
"menu."
msgstr ""
-#: ../template/default/help_config.html:65
+#: ../template/default/help_config.html:63
+msgid "The path where the EPG images are stored."
+msgstr ""
+
+#: ../template/default/help_config.html:71
msgid ""
"The username for the main user, i.e. the user having the most privileges."
msgstr ""
-#: ../template/default/help_config.html:67
+#: ../template/default/help_config.html:73
msgid "The main user's password."
msgstr ""
-#: ../template/default/help_config.html:69
+#: ../template/default/help_config.html:75
msgid ""
"If you want an user account having only limited privileges, this is for you. "
"The guest user cannot modify anything, it's only allowed to view the EPG, "
"timers, AutoTimers and recordings listings."
msgstr ""
-#: ../template/default/help_config.html:71
+#: ../template/default/help_config.html:77
msgid "The username for the guest user."
msgstr ""
-#: ../template/default/help_config.html:73
+#: ../template/default/help_config.html:79
msgid "The guest user's password."
msgstr ""
-#: ../template/default/help_config.html:81
+#: ../template/default/help_config.html:87
msgid "The number of hours to show in the timeline."
msgstr ""
-#: ../template/default/help_config.html:83
+#: ../template/default/help_config.html:89
msgid ""
"A comma separated list of times in <strong>hh:mm</strong> format that appear "
"in the selectbox placed at the top."
msgstr ""
-#: ../template/default/help_config.html:91
+#: ../template/default/help_config.html:97
msgid "Activate or deactivate the AutoTimer function."
msgstr ""
-#: ../template/default/help_config.html:93
+#: ../template/default/help_config.html:99
msgid "The interval, the the EPG data is checked for updating the AutoTimers."
msgstr ""
-#: ../template/default/help_config.html:95
-#: ../template/default/help_config.html:105
+#: ../template/default/help_config.html:101
+#: ../template/default/help_config.html:111
#: ../template/default/help_timer_new.html:62
#: ../template/default/help_at_timer_new.html:53
msgid ""
@@ -873,8 +883,8 @@ msgid ""
"recording."
msgstr ""
-#: ../template/default/help_config.html:97
-#: ../template/default/help_config.html:107
+#: ../template/default/help_config.html:103
+#: ../template/default/help_config.html:113
#: ../template/default/help_timer_new.html:64
#: ../template/default/help_at_timer_new.html:55
msgid ""
@@ -888,35 +898,35 @@ msgid ""
"recording has passed by."
msgstr ""
-#: ../template/default/help_config.html:109
+#: ../template/default/help_config.html:115
msgid ""
"The number of minutes VDRAdmin subtracts from the broadcasts start time "
"found in the EPG. This value is used for timers programmed by AutoTimer and "
"timers manually programmed when pressing \"Record\" in any EPG view."
msgstr ""
-#: ../template/default/help_config.html:111
+#: ../template/default/help_config.html:117
msgid ""
"The number of minutes VDRAdmin adds to the broadcasts stop time found in the "
"EPG. This value is used for timers programmed by AutoTimer and timers "
"manually programmed when pressing \"Record\" in any EPG view."
msgstr ""
-#: ../template/default/help_config.html:119
+#: ../template/default/help_config.html:125
msgid ""
"Enable or disable live streaming using the <a href=\"http://www.magoa.net/"
"linux/\">streamdev plugin</a>. You also have to set the correct <span class="
"\"ref_label\">HTTP Port for Streamdev</span> below."
msgstr ""
-#: ../template/default/help_config.html:121
+#: ../template/default/help_config.html:127
msgid ""
"Here you have to set the port number your VDR's streamdev server listens for "
"connections. Additionally you can also provide the stream type you like to "
"use."
msgstr ""
-#: ../template/default/help_config.html:123
+#: ../template/default/help_config.html:129
msgid ""
"Enable or disable streaming of recordings.<br />Well actually this is no "
"real \"streaming\", but you have to setup your workstation so that it can "
@@ -927,49 +937,49 @@ msgid ""
"display."
msgstr ""
-#: ../template/default/help_config.html:125
+#: ../template/default/help_config.html:131
msgid ""
"This is the path where your workstation can access VDR's recordings. This "
"depends on your VDR and workstation setup, for example \"\\\\vdr\\videos\" "
"or \"V:\\\" (on Windows) or \"/mnt/videos\" (on Linux)."
msgstr ""
-#: ../template/default/help_config.html:131
+#: ../template/default/help_config.html:137
msgid ""
"<p>This section is for experts <strong>only</strong>, i.e. you know what you "
"are doing!</p>"
msgstr ""
-#: ../template/default/help_config.html:134
+#: ../template/default/help_config.html:140
msgid ""
"Accessing VDR's EPG through VDR's SVDRPort seems to block VDR for some time. "
"If this option is activated VDRAdmin will read the <span class=\"ref_file"
"\">epg.data</span> file directly so that VDR doesn't get blocked."
msgstr ""
-#: ../template/default/help_config.html:136
+#: ../template/default/help_config.html:142
msgid ""
"If you've enabled the option above you need to tell VDRAdmin where the <span "
"class=\"ref_file\">epg.data</span> file is located."
msgstr ""
-#: ../template/default/help_config.html:138
+#: ../template/default/help_config.html:144
msgid ""
"If you have compiled VDR with the VFAT define you have to enable this "
"option. If this option is set to the wrong value, you may have problems with "
"certain recordings if you want to stream them or run reccmds on them."
msgstr ""
-#: ../template/default/help_config.html:144
+#: ../template/default/help_config.html:150
msgid ""
"<p>If you want to limit the number of channels used in some parts of "
"VDRAdmin, this is for you!</p><p>Use the radio buttons to activate or "
"deactivate the wanted channels in the named menu.</p><p>To add channels to "
"the list of wanted channels you have to select them in the left side "
-"selectbox and click <span class=\"submit\">&gt;&gt;&gt;&gt;&gt;</span>. If "
-"you want to remove channels from the list of wanted channels you have to "
-"select them in the right side selectbox and click <span class=\"submit\">&lt;"
-"&lt;&lt;&lt;&lt;</span>.</p>"
+"selectbox and click <input type=\"submit\" class=\"submit\" value=\"&gt;&gt;"
+"&gt;&gt;&gt;\"/>. If you want to remove channels from the list of wanted "
+"channels you have to select them in the right side selectbox and click "
+"<input type=\"submit\" class=\"submit\" value=\"&lt;&lt;&lt;&lt;&lt;\"/>.</p>"
msgstr ""
#: ../template/default/prog_timeline.html:119
@@ -981,8 +991,7 @@ msgid "to"
msgstr ""
#: ../template/default/prog_list2.html:6
-#: ../template/default/prog_list2.html:28
-#: ../template/default/navigation.html:33
+#: ../template/default/navigation.html:33 ../vdradmind.pl:2432
msgid "Playing Today"
msgstr ""
@@ -998,7 +1007,7 @@ msgstr ""
msgid "New Name of Recording:"
msgstr ""
-#: ../template/default/help_timer_list.html:29
+#: ../template/default/help_timer_list.html:33
msgid ""
"<p>Here you will find a listing of timers known to VDR.</p><p>On top you "
"will find a chart showing a day's timers graphically. This provides an quick "
@@ -1030,10 +1039,10 @@ msgid ""
"record.<br /><span class=\"color_inactive\">&nbsp;&nbsp;&nbsp;</span> / <img "
"src=\"bilder/poempl_grau.gif\" alt=\"inactive\" align=\"absmiddle\" /> Timer "
"is not active.</p><p>In addition to these functions you can add a new timer "
-"by clicking <span class=\"submit\">New Timer</span> at the top and you can "
-"delete a number of timers at once by checking the box in the last column of "
-"those timers and clicking <span class=\"submit\">Delete Selected Timers</"
-"span>.</p>"
+"by clicking <input type=\"submit\" class=\"submit\" value=\"New Timer\"/> at "
+"the top and you can delete a number of timers at once by checking the box in "
+"the last column of those timers and clicking <input type=\"submit\" class="
+"\"submit\" value=\"Delete Selected Timers\"/>.</p>"
msgstr ""
#: ../template/default/help_timer_new.html:32
@@ -1115,7 +1124,7 @@ msgid ""
"file of the recording."
msgstr ""
-#: ../template/default/help_at_timer_list.html:29
+#: ../template/default/help_at_timer_list.html:33
msgid ""
"<p>Here you will find a listing of automatic timers (AutoTimer) known to "
"VDRAdmin.</p><p>The list shows some information on AutoTimers. You can "
@@ -1132,11 +1141,12 @@ msgid ""
"AutoTimer is OK and will automatically program matching broadcasts.<br /"
"><img src=\"bilder/poempl_grau.gif\" alt=\"inactive\" align=\"absmiddle\" /> "
"AutoTimer is not active.</p><p>In addition to these functions you can add a "
-"new AutoTimer by clicking <span class=\"submit\">New AutoTimer</span> at the "
-"top and you can delete a number of AutoTimers at once by checking the box in "
-"the last column of those timers and clicking <span class=\"submit\">Delete "
-"Selected AutoTimers</span>.</p><p>Click <span class=\"submit\">Force Update</"
-"span> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check "
+"new AutoTimer by clicking <input type=\"submit\" class=\"submit\" value="
+"\"New AutoTimer\"/> at the top and you can delete a number of AutoTimers at "
+"once by checking the box in the last column of those timers and clicking "
+"<input type=\"submit\" class=\"submit\" value=\"Delete Selected AutoTimers\"/"
+">.</p><p>Click <input type=\"submit\" class=\"submit\" value=\"Force Update"
+"\"/> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check "
"for matching AutoTimers.</p>"
msgstr ""
@@ -1326,13 +1336,13 @@ msgid ""
"\">Configuration</span> menu. You can watch the recording at your "
"workstation.</dd></dl></p><p>In addition to these functions you can delete a "
"number of recordings at once by checking the box in the last but one column "
-"of those recordings and clicking <span class=\"submit\">Delete Selected "
-"Recordings</span>.</p><p>If you've set the path the VDR's configuration "
-"files and have entries in VDR's <span class=\"ref_file\">reccmds.conf</span> "
-"you can run those commands for the selected recording by selecting the "
-"wanted command in the select box locate next to <span class=\"ref_label"
-"\">Commands:</span> and pressing the <span class=\"submit\">Run</span> "
-"button.</p>"
+"of those recordings and clicking <input type=\"submit\" class=\"submit\" "
+"value=\"Delete Selected Recordings\"/>.</p><p>If you've set the path the "
+"VDR's configuration files and have entries in VDR's <span class=\"ref_file"
+"\">reccmds.conf</span> you can run those commands for the selected recording "
+"by selecting the wanted command in the select box locate next to <span class="
+"\"ref_label\">Commands:</span> and pressing the <input type=\"submit\" class="
+"\"submit\" value=\"Run\"/> button.</p>"
msgstr ""
#: ../template/default/at_timer_new.html:6
@@ -1369,47 +1379,56 @@ msgstr ""
msgid "Search"
msgstr ""
-#: ../vdradmind.pl:251
+#: ../vdradmind.pl:265
msgid "What's your VDR hostname (e.g video.intra.net)?"
msgstr ""
-#: ../vdradmind.pl:252
+#: ../vdradmind.pl:266
msgid "On which port does VDR listen to SVDRP queries?"
msgstr ""
-#: ../vdradmind.pl:253
+#: ../vdradmind.pl:267
msgid "On which address should VDRAdmin listen (0.0.0.0 for any)?"
msgstr ""
-#: ../vdradmind.pl:254
+#: ../vdradmind.pl:268
msgid "On which port should VDRAdmin listen?"
msgstr ""
-#: ../vdradmind.pl:255
+#: ../vdradmind.pl:269
msgid "Username?"
msgstr ""
-#: ../vdradmind.pl:256
+#: ../vdradmind.pl:270
msgid "Password?"
msgstr ""
-#: ../vdradmind.pl:257
+#: ../vdradmind.pl:271
msgid "Where are your recordings stored?"
msgstr ""
-#: ../vdradmind.pl:258
+#: ../vdradmind.pl:272
msgid "Where are your VDR's configuration files located?"
msgstr ""
-#: ../vdradmind.pl:264
+#: ../vdradmind.pl:278
msgid "Config file written successfully."
msgstr ""
-#: ../vdradmind.pl:312
+#: ../vdradmind.pl:326
#, perl-format
msgid "vdradmind.pl %s started with pid %d."
msgstr ""
+#: ../vdradmind.pl:2432
+msgid "Playing Tomorrow"
+msgstr ""
+
+#: ../vdradmind.pl:2432
+#, perl-format
+msgid "Playing on the %d."
+msgstr ""
+
#: ../template/i18n.pl:3
msgid "Playing Today?"
msgstr ""
diff --git a/template/default/at_timer_list.html b/template/default/at_timer_list.html
index d24d8b1..6064c8b 100644
--- a/template/default/at_timer_list.html
+++ b/template/default/at_timer_list.html
@@ -23,39 +23,32 @@
END
%?>
</script>
- <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
- <tr>
- <td class="col_left">
- <td class="col_title">
- <h1><%! AutoTimer !%></h1>
- </td>
- <td class="col_other">
- <span>
- <table border="0" cellspacing="0" cellpadding="0">
- <tr height="20">
- <td width="12" height="20" background="bilder/gbutton_left.gif"></td>
- <td align="center" height="20" background="bilder/gbutton_middle.gif">
- <a href="<tmpl_var naturl>"><div class="gbutton"><%! New AutoTimer !%></div></a>
- </td>
- <td width="12" height="20" background="bilder/gbutton_right.gif"></td>
- </tr>
- </table>
- </span>
- </td>
+ <form action="<tmpl_var url>" method="get" name="FormName0">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
+ <tr>
+ <td class="col_left">
+ <td class="col_title">
+ <h1><%! AutoTimer !%></h1>
+ </td>
+ <td class="col_other">
+ <input type="submit" class="submit" name="new_at" value="<%! New AutoTimer !%>" />
+ <input type="hidden" name="aktion" value="at_timer_new" />
+ </td>
<tmpl_if name="help_url">
- <td class="col_help">
- <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>"/></a>
- </td>
+ <td class="col_help">
+ <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>"/></a>
+ </td>
</tmpl_if>
- <td class="col_right"></td>
- </tr>
- </table>
+ <td class="col_right"></td>
+ </tr>
+ </table>
+ </form>
<form action="<tmpl_var url>" method="get" name="FormName">
<table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="list">
<tr class="heading">
<td class="col_left"></td>
- <td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>>
+ <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>">
<h2>
<a href="<tmpl_var sortbyactiveurl>"><%! Active !%>
<tmpl_if sortbyactive>
@@ -66,7 +59,7 @@
</a>
</h2>
</td>
- <td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>>
+ <td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>">
<h2>
<a href="<tmpl_var sortbychannelurl>"><%! Channel !%>
<tmpl_if sortbychannel>
@@ -77,7 +70,7 @@
</a>
</h2>
</td>
- <td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>>
+ <td class="col_start <tmpl_if sortbystart>selected</tmpl_if>">
<h2>
<a href="<tmpl_var sortbystarturl>"><%! Start !%>
<tmpl_if sortbystart>
@@ -88,7 +81,7 @@
</a>
</h2>
</td>
- <td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>>
+ <td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>">
<h2>
<a href="<tmpl_var sortbystopurl>"><%! Stop !%>
<tmpl_if sortbystop>
@@ -99,7 +92,7 @@
</a>
</h2>
</td>
- <td class="col_name" <tmpl_if sortbypattern>selected="yes"</tmpl_if>>
+ <td class="col_name <tmpl_if sortbypattern>selected</tmpl_if>">
<h2>
<a href="<tmpl_var sortbypatternurl>"><%! Name !%>
<tmpl_if sortbypattern>
@@ -117,11 +110,11 @@
</tr>
<tr class="row_spacer">
<td class="col_left"></td>
- <td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>></td>
- <td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>></td>
- <td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>></td>
- <td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>></td>
- <td class="col_name" <tmpl_if sortbypattern>selected="yes"</tmpl_if>></td>
+ <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"></td>
+ <td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>"></td>
+ <td class="col_start <tmpl_if sortbystart>selected</tmpl_if>"></td>
+ <td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>"></td>
+ <td class="col_name <tmpl_if sortbypattern>selected</tmpl_if>"></td>
<td colspan="3"></td>
<td class="col_right"></td>
</tr>
@@ -129,31 +122,31 @@
<tmpl_loop at_timer_loop>
<tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>">
<td class="col_left"></td>
- <td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>>
+ <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>">
<div>
<tmpl_if active>
- <a href="<tmpl_var toggleurl>"><img src="bilder/poempl_gruen.gif" alt="" width="19" height="19" align="absmiddle" border="0"/> <%! Yes !%></a>
+ <a href="<tmpl_var toggleurl>"><img src="bilder/poempl_gruen.gif" alt="" width="19" height="19" align="middle" border="0"/> <%! Yes !%></a>
<tmpl_else>
- <a href="<tmpl_var toggleurl>"><img src="bilder/poempl_grau.gif" alt="" width="19" height="19" align="absmiddle" border="0"/> <%! No !%></a>
+ <a href="<tmpl_var toggleurl>"><img src="bilder/poempl_grau.gif" alt="" width="19" height="19" align="middle" border="0"/> <%! No !%></a>
</tmpl_if>
</div>
</td>
- <td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>>
+ <td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>">
<div>
<tmpl_if channel><a href="<tmpl_var proglink>"><tmpl_var channel></a><tmpl_else>-</tmpl_if>
</div>
</td>
- <td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>>
+ <td class="col_start <tmpl_if sortbystart>selected</tmpl_if>">
<div>
<tmpl_if start><tmpl_var start><tmpl_else>-</tmpl_if>
</div>
</td>
- <td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>>
+ <td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>">
<div>
<tmpl_if stop><tmpl_var stop><tmpl_else>-</tmpl_if>
</div>
</td>
- <td class="col_name" onMouseOver="tip('VDR-<tmpl_var id>'); return true;" onMouseOut="untip(); return true;" <tmpl_if sortbypattern>selected="yes"</tmpl_if>>
+ <td class="col_name <tmpl_if sortbypattern>selected</tmpl_if>" onMouseOver="tip('VDR-<tmpl_var id>'); return true;" onMouseOut="untip(); return true;">
<div>
<tmpl_var pattern>
</div>
@@ -165,7 +158,7 @@
</td>
<td class="col_delete">
<div>
- <a href="javascript:del('<%! Delete timer? !%>', '<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" height="17" width="17" border="0" title="<%! Delete !%>"/></a>
+ <a href="javascript:del('<%! Delete timer? !%>\n\n&quot;<tmpl_var pattern>&quot;', '<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" height="17" width="17" border="0" title="<%! Delete !%>"/></a>
</div>
</td>
<td class="col_checkbox">
@@ -179,11 +172,11 @@
<tr class="footer">
<td class="col_left"></td>
- <td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>></td>
- <td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>></td>
- <td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>></td>
- <td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>></td>
- <td class="col_name" <tmpl_if sortbypattern>selected="yes"</tmpl_if>></td>
+ <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"></td>
+ <td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>"></td>
+ <td class="col_start <tmpl_if sortbystart>selected</tmpl_if>"></td>
+ <td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>"></td>
+ <td class="col_name <tmpl_if sortbypattern>selected</tmpl_if>"></td>
<td colspan="3"></td>
<td class="col_right"></td>
</tr>
@@ -192,30 +185,14 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" id="buttons">
<tr>
<td align="left">
- <table border="0" cellspacing="0" cellpadding="0">
- <tr height="20">
- <td width="12" height="20" background="bilder/gbutton_left.gif"></td>
- <td align="center" height="20" background="bilder/gbutton_middle.gif">
- <a href="<tmpl_var force_update_url>"><div class="gbutton"><%! Force Update !%></div></a>
- </td>
- <td width="12" height="20" background="bilder/gbutton_right.gif"></td>
- </tr>
- </table>
+ <input type="submit" class="submit" name="at_force" value="<%! Force Update !%>" />
</td>
<td align="right">
- <table border="0" cellspacing="0" cellpadding="0">
- <tr height="20">
- <td width="12" height="20" background="bilder/gbutton_left.gif"></td>
- <td align="center" height="20" background="bilder/gbutton_middle.gif">
- <a href="javascript:mdel_old('<%! Delete all selected timers? !%>');"><div class="gbutton"><%! Delete Selected AutoTimers !%></div></a>
- </td>
- <td width="12" height="20" background="bilder/gbutton_right.gif"></td>
- </tr>
- </table>
+ <input type="submit" class="submit" name="at_delete" value="<%! Delete Selected AutoTimers !%>" onclick="return mdel_old('<%! Delete all selected timers? !%>');" />
</td>
</tr>
</table>
- <input type="hidden" name="aktion" value="at_timer_delete"/>
+ <input type="hidden" name="aktion" value="at_timer_aktion"/>
</form>
</body>
diff --git a/template/default/at_timer_new.html b/template/default/at_timer_new.html
index afafbb2..d1e14ce 100644
--- a/template/default/at_timer_new.html
+++ b/template/default/at_timer_new.html
@@ -29,7 +29,7 @@
</table>
<div id="content">
- <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group">
<tr class="heading">
<td class="col_left"></td>
<td colspan="2"></td>
diff --git a/template/default/config.html b/template/default/config.html
index 2f6e104..1e240af 100644
--- a/template/default/config.html
+++ b/template/default/config.html
@@ -127,6 +127,12 @@
<td class="col_value"><input type="text" name="VDRCONFDIR" value="<tmpl_var VDRCONFDIR>" size="20" maxlength="256" /></td>
<td class="col_right"></td>
</tr>
+ <tr class="row_even">
+ <td class="col_left"></td>
+ <td class="col_label"><h5><%! Path to EPG images: !%></h5></td>
+ <td class="col_value"><input type="text" name="EPGIMAGES" value="<tmpl_var EPGIMAGES>" size="20" maxlength="256" /></td>
+ <td class="col_right"></td>
+ </tr>
<tr class="footer">
<td class="col_left"></td>
<td colspan="2"></td>
@@ -450,7 +456,7 @@
</tr>
<tr class="row_even">
<td class="col_left"></td>
- <td class="col_label"><h5><%! In "Channels" / "Playing Today"? !%></h5></td>
+ <td class="col_label"><h5><%! In "Channels"? !%></h5></td>
<td class="col_value" colspan="2">
<input type="radio" name="CHANNELS_WANTED_PRG" value="1" id="prg_yes" <tmpl_if CHANNELS_WANTED_PRG>checked</tmpl_if> /><label for="prg_yes"><%! Yes !%></label>
<input type="radio" name="CHANNELS_WANTED_PRG" value="0" id="prg_no"<tmpl_unless CHANNELS_WANTED_PRG>checked</tmpl_unless> /><label for="prg_no"><%! No !%> </label>
@@ -459,6 +465,15 @@
</tr>
<tr class="row_odd">
<td class="col_left"></td>
+ <td class="col_label"><h5><%! In "Playing Today"? !%></h5></td>
+ <td class="col_value" colspan="2">
+ <input type="radio" name="CHANNELS_WANTED_PRG2" value="1" id="prg2_yes" <tmpl_if CHANNELS_WANTED_PRG2>checked</tmpl_if> /><label for="prg2_yes"><%! Yes !%></label>
+ <input type="radio" name="CHANNELS_WANTED_PRG2" value="0" id="prg2_no"<tmpl_unless CHANNELS_WANTED_PRG2>checked</tmpl_unless> /><label for="prg2_no"><%! No !%> </label>
+ </td>
+ <td class="col_right"></td>
+ </tr>
+ <tr class="row_even">
+ <td class="col_left"></td>
<td class="col_label"><h5><%! In "What's On Now"? !%></h5></td>
<td class="col_value" colspan="2">
<input type="radio" name="CHANNELS_WANTED_SUMMARY" value="1" id="sum_yes" <tmpl_if CHANNELS_WANTED_SUMMARY>checked</tmpl_if> /><label for="sum_yes"><%! Yes !%></label>
@@ -466,16 +481,16 @@
</td>
<td class="col_right"></td>
</tr>
- <tr class="row_even">
+ <tr class="row_odd">
<td class="col_left"></td>
- <td class="col_label"><h5><%! In "AutoTimer"? !%><h5></td>
+ <td class="col_label"><h5><%! In "AutoTimer"? !%></h5></td>
<td class="col_value" colspan="2">
<input type="radio" name="CHANNELS_WANTED_AUTOTIMER" value="1" id="wat_yes" <tmpl_if CHANNELS_WANTED_AUTOTIMER>checked</tmpl_if> /><label for="wat_yes"><%! Yes !%></label>
<input type="radio" name="CHANNELS_WANTED_AUTOTIMER" value="0" id="wat_no" <tmpl_unless CHANNELS_WANTED_AUTOTIMER>checked</tmpl_unless> /><label for="wat_no"><%! No !%></label>
</td>
<td class="col_right"></td>
</tr>
- <tr class="row_odd">
+ <tr class="row_even">
<td class="col_left"></td>
<td class="col_channels">
<select name="all_channels" size="8" multiple>
diff --git a/template/default/help_at_timer_list.html b/template/default/help_at_timer_list.html
index 9f2c473..c837536 100644
--- a/template/default/help_at_timer_list.html
+++ b/template/default/help_at_timer_list.html
@@ -12,6 +12,10 @@
</head>
<body id="at_timer_list">
+<form onsubmit="return false;">
+ <input type="hidden" name="aktion" value="show_help"/>
+ <input type="hidden" name="area" value="<tmpl_var area>"/>
+
<table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group">
<tr class="heading">
<td class="col_left"></td>
@@ -44,8 +48,8 @@
<img src="bilder/poempl_gruen.gif" alt="on" align="absmiddle" /> AutoTimer is OK and will automatically program matching broadcasts.<br />
<img src="bilder/poempl_grau.gif" alt="inactive" align="absmiddle" /> AutoTimer is not active.
</p>
- <p>In addition to these functions you can add a new AutoTimer by clicking <span class="submit">New AutoTimer</span> at the top and you can delete a number of AutoTimers at once by checking the box in the last column of those timers and clicking <span class="submit">Delete Selected AutoTimers</span>.</p>
- <p>Click <span class="submit">Force Update</span> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check for matching AutoTimers.</p> !%>
+ <p>In addition to these functions you can add a new AutoTimer by clicking <input type="submit" class="submit" value="New AutoTimer"/> at the top and you can delete a number of AutoTimers at once by checking the box in the last column of those timers and clicking <input type="submit" class="submit" value="Delete Selected AutoTimers"/>.</p>
+ <p>Click <input type="submit" class="submit" value="Force Update"/> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check for matching AutoTimers.</p> !%>
</td>
<td class="col_right"></td>
</tr>
@@ -55,6 +59,7 @@
<td class="col_right"></td>
</tr>
</table>
+</form>
</body>
</html>
diff --git a/template/default/help_config.html b/template/default/help_config.html
index acc7d59..705412b 100644
--- a/template/default/help_config.html
+++ b/template/default/help_config.html
@@ -15,10 +15,14 @@
</head>
<body id="config">
+<form onsubmit="return false;">
+ <input type="hidden" name="aktion" value="show_help"/>
+ <input type="hidden" name="area" value="<tmpl_var area>"/>
+
<table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group">
<tr class="heading">
<td class="col_left"></td>
- <td><h2><a name="top"></a><%! Configuration !%></h2></td>
+ <td><h2><a id="top" name="top"></a><%! Configuration !%></h2></td>
<td class="col_right"></td>
</tr>
<tr class="row_spacer">
@@ -33,7 +37,7 @@
<div class="links">
[<a href="#general"><%! General Settings !%></a>] [<a href="#vdr"><%! VDR !%></a>] [<a href="#identification"><%! Identification !%></a>] [<a href="#timeline"><%! Timeline !%></a>] [<a href="#autotimer"><%! AutoTimer !%></a>] [<a href="#timer"><%! Timer !%></a>] [<a href="#streaming"><%! Streaming !%></a>] [<a href="#expert"><%! Expert !%></a>] [<a href="#channels"><%! Channel Selections !%></a>]
</div>
- <div class="group"><a name="general"></a><h3><%! General Settings !%></h3>
+ <div class="group"><a id="general" name="general"></a><h3><%! General Settings !%></h3>
<dl>
<dt><%! Skin: !%></dt>
<dd><%! The skin you want to use. !%></dd>
@@ -47,7 +51,7 @@
<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
</div>
- <div class="group"><a name="vdr"></a><h3><%! VDR !%></h3>
+ <div class="group"><a id="vdr" name="vdr"></a><h3><%! VDR !%></h3>
<dl>
<dt><%! Number of DVB cards: !%></dt>
<dd><%! The number of DVB cards VDR can access. Depending on this value VDRAdmin will calculate critical timers in the <span class="ref_menu">Timer</span> menu. !%></dd>
@@ -55,11 +59,13 @@
<dd><%! The path to VDR's recordings. It's used so that VDRAdmin can locate the recordings when using <span class="ref_label">Recordings Streaming</span> and <span class="ref_file">reccmds.conf</span> in the <span class="ref_menu">Recordings</span> menu. !%></dd>
<dt><%! Path to configuration files: !%></dt>
<dd><%! The path where VDR's configuration files are located. If this directory contains the file <span class="ref_file">reccmds.conf</span> its content is shown in a selectbox in the <span class="ref_menu">Recordings</span> menu. !%></dd>
+ <dt><%! Path to EPG images: !%></dt>
+ <dd><%! The path where the EPG images are stored. !%></dd>
</dl>
<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
</div>
- <div class="group"><a name="identification"></a><h3><%! Identification !%></h3>
+ <div class="group"><a id="identification" name="identification"></a><h3><%! Identification !%></h3>
<dl>
<dt><%! Username: !%></dt>
<dd><%! The username for the main user, i.e. the user having the most privileges. !%></dd>
@@ -75,7 +81,7 @@
<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
</div>
- <div class="group"><a name="timeline"></a><h3><%! Timeline !%></h3>
+ <div class="group"><a id="timeline" name="timeline"></a><h3><%! Timeline !%></h3>
<dl>
<dt><%! Hours: !%></dt>
<dd><%! The number of hours to show in the timeline. !%></dd>
@@ -85,7 +91,7 @@
<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
</div>
- <div class="group"><a name="autotimer"></a><h3><%! AutoTimer !%></h3>
+ <div class="group"><a id="autotimer" name="autotimer"></a><h3><%! AutoTimer !%></h3>
<dl>
<dt><%! Active: !%></dt>
<dd><%! Activate or deactivate the AutoTimer function. !%></dd>
@@ -99,7 +105,7 @@
<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
</div>
- <div class="group"><a name="timer"></a><h3><%! Timer !%></h3>
+ <div class="group"><a id="timer" name="timer"></a><h3><%! Timer !%></h3>
<dl>
<dt><%! Priority: !%></dt>
<dd><%! An integer in the range <strong>0...99</strong>, defining the <strong>priority</strong> of this timer and of recordings created by this timer. <strong>0</strong> represents the lowest value, <strong>99</strong> the highest. The priority is used to decide which timer shall be started in case there are two or more timers with the exact same <strong>start</strong> time. The first timer in the list with the highest priority will be used.<br /><br />This value is also stored with the recording and is later used to decide which recording to remove from disk in order to free space for a new recording. If the disk runs full and a new recording needs more space, an existing recording with the lowest priority (and which has exceeded its guaranteed <strong>lifetime</strong>) will be removed.<br /><br />If all available DVB cards are currently occupied, a timer with a higher priority will interrupt the timer with the lowest priority in order to start recording. !%></dd>
@@ -113,7 +119,7 @@
<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
</div>
- <div class="group"><a name="streaming"></a><h3><%! Streaming !%></h3>
+ <div class="group"><a id="streaming" name="streaming"></a><h3><%! Streaming !%></h3>
<dl>
<dt><%! Live Streaming: !%></dt>
<dd><%! Enable or disable live streaming using the <a href="http://www.magoa.net/linux/">streamdev plugin</a>. You also have to set the correct <span class="ref_label">HTTP Port for Streamdev</span> below. !%></dd>
@@ -127,7 +133,7 @@
<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
</div>
- <div class="group"><a name="expert"></a><h3><%! Expert !%></h3>
+ <div class="group"><a id="expert" name="expert"></a><h3><%! Expert !%></h3>
<%! <p>This section is for experts <strong>only</strong>, i.e. you know what you are doing!</p> !%>
<dl>
<dt><%! Read EPG directly using epg.data: !%></dt>
@@ -140,10 +146,10 @@
<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
</div>
- <div class="group"><a name="channels"></a><h3><%! Channel Selections !%></h3>
+ <div class="group"><a id="channels" name="channels"></a><h3><%! Channel Selections !%></h3>
<%! <p>If you want to limit the number of channels used in some parts of VDRAdmin, this is for you!</p>
<p>Use the radio buttons to activate or deactivate the wanted channels in the named menu.</p>
- <p>To add channels to the list of wanted channels you have to select them in the left side selectbox and click <span class="submit">&gt;&gt;&gt;&gt;&gt;</span>. If you want to remove channels from the list of wanted channels you have to select them in the right side selectbox and click <span class="submit">&lt;&lt;&lt;&lt;&lt;</span>.</p> !%>
+ <p>To add channels to the list of wanted channels you have to select them in the left side selectbox and click <input type="submit" class="submit" value="&gt;&gt;&gt;&gt;&gt;"/>. If you want to remove channels from the list of wanted channels you have to select them in the right side selectbox and click <input type="submit" class="submit" value="&lt;&lt;&lt;&lt;&lt;"/>.</p> !%>
<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
</div>
</td>
@@ -155,6 +161,7 @@
<td class="col_right"></td>
</tr>
</table>
+</form>
</body>
</html>
diff --git a/template/default/help_no.html b/template/default/help_no.html
index ce4d70a..2dcf4a5 100644
--- a/template/default/help_no.html
+++ b/template/default/help_no.html
@@ -11,7 +11,7 @@
</tmpl_if>
</head>
-<body id="timer_list">
+<body id="no">
<table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group">
<tr class="heading">
<td class="col_left"></td>
diff --git a/template/default/help_rec_list.html b/template/default/help_rec_list.html
index da6ff33..4835ca3 100644
--- a/template/default/help_rec_list.html
+++ b/template/default/help_rec_list.html
@@ -11,7 +11,7 @@
</tmpl_if>
</head>
-<body id="timer_list">
+<body id="rec_list">
<table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group">
<tr class="heading">
<td class="col_left"></td>
@@ -44,8 +44,8 @@
<dd>This column is only shown if you activated and configured <span class="ref_label">Recordings Streaming</span> in the <span class="ref_menu">Configuration</span> menu. You can watch the recording at your workstation.</dd>
</dl>
</p>
- <p>In addition to these functions you can delete a number of recordings at once by checking the box in the last but one column of those recordings and clicking <span class="submit">Delete Selected Recordings</span>.</p>
- <p>If you've set the path the VDR's configuration files and have entries in VDR's <span class="ref_file">reccmds.conf</span> you can run those commands for the selected recording by selecting the wanted command in the select box locate next to <span class="ref_label">Commands:</span> and pressing the <span class="submit">Run</span> button.</p> !%>
+ <p>In addition to these functions you can delete a number of recordings at once by checking the box in the last but one column of those recordings and clicking <input type="submit" class="submit" value="Delete Selected Recordings"/>.</p>
+ <p>If you've set the path the VDR's configuration files and have entries in VDR's <span class="ref_file">reccmds.conf</span> you can run those commands for the selected recording by selecting the wanted command in the select box locate next to <span class="ref_label">Commands:</span> and pressing the <input type="submit" class="submit" value="Run"/> button.</p> !%>
</td>
<td class="col_right"></td>
</tr>
diff --git a/template/default/help_timer_list.html b/template/default/help_timer_list.html
index 3e6503a..b2a4479 100644
--- a/template/default/help_timer_list.html
+++ b/template/default/help_timer_list.html
@@ -12,6 +12,10 @@
</head>
<body id="timer_list">
+<form onsubmit="return false;">
+ <input type="hidden" name="aktion" value="show_help"/>
+ <input type="hidden" name="area" value="<tmpl_var area>"/>
+
<table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group">
<tr class="heading">
<td class="col_left"></td>
@@ -49,7 +53,7 @@
<span class="color_conflict">&nbsp;&nbsp;&nbsp;</span> / <img src="bilder/poempl_rot.gif" alt="impossible" align="absmiddle" /> Timer is critical and will most likely <strong>not</strong> record.<br />
<span class="color_inactive">&nbsp;&nbsp;&nbsp;</span> / <img src="bilder/poempl_grau.gif" alt="inactive" align="absmiddle" /> Timer is not active.
</p>
- <p>In addition to these functions you can add a new timer by clicking <span class="submit">New Timer</span> at the top and you can delete a number of timers at once by checking the box in the last column of those timers and clicking <span class="submit">Delete Selected Timers</span>.</p> !%>
+ <p>In addition to these functions you can add a new timer by clicking <input type="submit" class="submit" value="New Timer"/> at the top and you can delete a number of timers at once by checking the box in the last column of those timers and clicking <input type="submit" class="submit" value="Delete Selected Timers"/>.</p> !%>
</td>
<td class="col_right"></td>
</tr>
@@ -59,6 +63,7 @@
<td class="col_right"></td>
</tr>
</table>
+</form>
</body>
</html>
diff --git a/template/default/infobox.js b/template/default/infobox.js
index 5b81179..a4f8781 100644
--- a/template/default/infobox.js
+++ b/template/default/infobox.js
@@ -60,6 +60,8 @@ function tip(name){
}
function showtip(){
+ if (isNaN(x)) return;
+
idiv.left=(((x+260)<winW)?x+12:x-255)+px; idiv.top=(((y+90)<winH)?y+12:y-90)+px;
idiv.visibility=ns4?"show":"visible";
// window.status="idiv="+idiv+"X:"+(idiv.left?idiv.left:"NAN")+", Y:"+(idiv.top?idiv.top:"NAN")+", x:"+x+", y:"+y;
diff --git a/template/default/navigation.html b/template/default/navigation.html
index 24adc50..041cf5e 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="50px" width="150px" border="0" /><tmpl_else><img src="bilder/logo_other.gif" alt="" height="50px" width="150px" border="0" /></tmpl_if></a>
+ <a href="./" target="_top"><tmpl_if linvdr><img src="bilder/logo_linvdr.gif" alt="" height="50px" width="150px" border="0" /><tmpl_else><img src="bilder/logo_other.gif" alt="" height="50" width="150" border="0" /></tmpl_if></a>
</div>
<div class="separator"></div>
<div class="navi">
@@ -38,7 +38,7 @@
</div>
<div class="separator"></div>
<div class="navi">
- <a href="vdradmin.pl?aktion=prog_list" target="main"><%! Channels !%>
+ <a href="vdradmin.pl?aktion=prog_list" target="main"><%! Channels !%></a>
</div>
<div class="separator"></div>
<div class="navi">
diff --git a/template/default/prog_detail.html b/template/default/prog_detail.html
index d62f677..34821d6 100644
--- a/template/default/prog_detail.html
+++ b/template/default/prog_detail.html
@@ -34,14 +34,20 @@
</tmpl_if>
<br />
<tmpl_var text><br /><br />
+ <tmpl_if epgimages>
+ <tmpl_loop epgimages>
+ <img src="<tmpl_var image>"/>
+ </tmpl_loop>
+ <br /><br />
+ </tmpl_if>
&nbsp;<a href="javascript:window.close()">[<%! close !%>]</a>
<tmpl_if date>
&nbsp;<a href="javascript:callurl('<tmpl_var switchurl>')">[<%! view !%>]</a>
&nbsp;<a href="javascript:window.close();opener.location.href='<tmpl_var recurl>'">[<%! record !%>]</a>
- &nbsp;<a href="vdradmin.pl?search=<tmpl_var title>&aktion=prog_summary&submit=go11)" target="main">[<%! search !%>]</a>
+ &nbsp;<a href="vdradmin.pl?search=<tmpl_var find_title>&amp;aktion=prog_summary&amp;submit=go11)" target="main">[<%! search !%>]</a>
</tmpl_if>
- <tmpl_if title>
- &nbsp;<a href="http://akas.imdb.com/Tsearch?title=<tmpl_var title>" target="_blank" title="<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>">[IMDb]</a>
+ <tmpl_if imdburl>
+ &nbsp;<a href="http://akas.imdb.com/Tsearch?title=<tmpl_var find_title>" target="_blank" title="<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>">[IMDb]</a>
</tmpl_if>
</td>
<td class="col_right"></td>
diff --git a/template/default/prog_list.html b/template/default/prog_list.html
index f4fc6c7..032cc58 100644
--- a/template/default/prog_list.html
+++ b/template/default/prog_list.html
@@ -8,7 +8,7 @@
<tmpl_if usercss>
<link href="user.css" rel="stylesheet" media="screen" type="text/css" />
</tmpl_if>
- <script language="JavaScript" src="library.js"></script>
+ <script type="text/javascript" language="JavaScript" src="library.js"></script>
</head>
<body id="prog_list">
@@ -20,12 +20,12 @@
<h1>
<a href="javascript:callurl('<tmpl_var switchurl>');"><tmpl_var progname></a>&nbsp;&nbsp;
<tmpl_if stream_live_on>
- <a href="<tmpl_var streamurl>"><img src="bilder/stream.jpg" alt="stream" title="<%! Stream !%>" height="17" align="center" border="0" /></a>
+ <a href="<tmpl_var streamurl>"><img src="bilder/stream.jpg" alt="stream" title="<%! Stream !%>" height="17" align="middle" border="0" /></a>
</tmpl_if>
</h1>
</td>
<td class="col_other"><%! Channel: !%>&nbsp;
- <select name="vdr_id" class="submit" onchange="window.open('<tmpl_var url>?aktion=prog_list&vdr_id=' + this.options[this.selectedIndex].value,'main')">
+ <select name="vdr_id" class="submit" onchange="window.open('<tmpl_var url>?aktion=prog_list&amp;vdr_id=' + this.options[this.selectedIndex].value,'main')">
<tmpl_loop chanloop>
<option value="<tmpl_var vdr_id>" <tmpl_if current>selected</tmpl_if>><tmpl_var name></option>
</tmpl_loop>
@@ -58,14 +58,17 @@
<tmpl_else>
<tmpl_unless endd>
<tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>">
- <td class="col_left"><a name="<tmpl_var anchor>">&nbsp;</a></td>
+ <td class="col_left"><a id="<tmpl_var anchor>" name="<tmpl_var anchor>">&nbsp;</a></td>
<td class="col_duration">
<tmpl_var emit> - <tmpl_var duration>
</td>
<td class="col_title">
<h3><tmpl_var title></h3>
- <tmpl_unless subtitle><br /></tmpl_unless>
- <h4><tmpl_var subtitle></h4>
+ <tmpl_if subtitle>
+ <h4><tmpl_var subtitle></h4>
+ <tmpl_else>
+ <br />
+ </tmpl_if>
</td>
<td class="col_info">
<tmpl_if infurl>
diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html
index bbe7768..081bbe2 100644
--- a/template/default/prog_list2.html
+++ b/template/default/prog_list2.html
@@ -25,17 +25,19 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
<tr>
<td class="col_left"></td>
- <td class="col_title"><h1><%! Playing Today !%></h1></td>
-<!-- TODO: really need this?
- <td class="col_other"><%! Channel: !%>&nbsp;
- <select name="vdr_id" class="submit" onchange="window.open('<tmpl_var url>?aktion=prog_list&vdr_id=' + this.options[this.selectedIndex].value,'main')">
-<tmpl_loop chanloop>
- <option value="<tmpl_var vdr_id>" <tmpl_if current>selected</tmpl_if>><tmpl_var name></option>
-</tmpl_loop>
- </select>&nbsp;<input type="submit" name="submit" value="<%! Go! !%>" />
- <a href="javascript:toolbar('<tmpl_var toolbarurl>');" target="toolbar"><img src="bilder/spacer.gif" border="0" /></a>
+ <td class="col_title"><h1><tmpl_var title></h1></td>
+ <td class="col_other">
+ <tmpl_if prevdayurl>
+ <a href="<tmpl_var prevdayurl>"><img src="bilder/pfeile_nachlinks.gif" border="0" width="28" height="17" /></a>
+ <tmpl_else>
+ <img src="bilder/pfeile_nachlinks_soft.gif" border="0" width="28" height="17" />
+ </tmpl_if>
+ <tmpl_if nextdayurl>
+ <a href="<tmpl_var nextdayurl>"><img src="bilder/pfeile_nachrechts.gif" border="0" width="29" height="17" /></a>
+ <tmpl_else>
+ <img src="bilder/pfeile_nachrechts_soft.gif" border="0" width="29" height="17" />
+ </tmpl_if>
</td>
--->
<td class="col_right"></td>
</tr>
</table>
@@ -64,12 +66,17 @@
<tmpl_else>
<tmpl_unless endd>
<tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>">
- <td class="col_left"><a name="<tmpl_var anchor>">&nbsp;</a></td>
+ <td class="col_left"><a id="<tmpl_var anchor>" name="<tmpl_var anchor>">&nbsp;</a></td>
<td class="col_duration">
<tmpl_var emit> - <tmpl_var duration>
</td>
<td class="col_title">
- <h3><tmpl_var title></h3><tmpl_unless subtitle><br /></tmpl_unless><h4><tmpl_var subtitle></h4>
+ <h3><tmpl_var title></h3>
+ <tmpl_if subtitle>
+ <h4><tmpl_var subtitle></h4>
+ <tmpl_else>
+ <br />
+ </tmpl_if>
</td>
<td class="col_info">
<tmpl_if infurl><a href="javascript:popup('<tmpl_var infurl>');"><img src="bilder/info_button.gif" border="0" /></a><tmpl_else><img src="bilder/info_button_disabled.gif" border="0" /></tmpl_if>
diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html
index 606b76d..0d3b9ac 100644
--- a/template/default/prog_summary.html
+++ b/template/default/prog_summary.html
@@ -9,7 +9,7 @@
<tmpl_if usercss>
<link href="user.css" rel="stylesheet" media="screen" type="text/css" />
</tmpl_if>
- <script language="JavaScript" src="library.js"></script>
+ <script type="text/javascript" language="JavaScript" src="library.js"></script>
</head>
<body id="prog_summary">
@@ -37,7 +37,7 @@
<tr class="heading">
<td class="col_left"></td>
<td>
- <a name="<tmpl_var anchor>"></a>
+ <a id="<tmpl_var anchor>" name="<tmpl_var anchor>"></a>
<h2><a href="<tmpl_var proglink>"><tmpl_var progname></a></h2>
<tmpl_if stream_live_on>
&nbsp;<a href="<tmpl_var streamurl>" title="<%! Stream !%>">[S]</a>
@@ -71,7 +71,7 @@
<td>
<tmpl_if recurl>
<a href="javascript:callurl('<tmpl_var switchurl>');"><img src="bilder/sum_view.gif" width="58" height="22" border="0" alt="<%! TV select !%>" onmouseover="window.status='<%! TV select !%>';return true" title="<%! TV select !%>" /></a>
- <a href="vdradmin.pl?search=<tmpl_var title>&aktion=prog_summary&submit=go11)"><img src="bilder/sum_find.gif" width="58" height="22" border="0" alt="<%! Search for other show times !%>" onmouseover="window.status='<%! Search for other show times !%>';return true" title="<%! Search for other show times !%>" /></a>
+ <a href="vdradmin.pl?search=<tmpl_var find_title>&amp;aktion=prog_summary&amp;submit=go11)"><img src="bilder/sum_find.gif" width="58" height="22" border="0" alt="<%! Search for other show times !%>" onmouseover="window.status='<%! Search for other show times !%>';return true" title="<%! Search for other show times !%>" /></a>
<tmpl_if summary>
<a href="javascript:popup('<tmpl_var infurl>');"><img src="bilder/sum_info.gif" width="58" height="22" border="0" alt="<%! More Information !%>" onmouseover="window.status='<%! More Information !%>';return true" title="<%! More Information !%>" /></a>
<tmpl_else>
diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html
index 046b368..bad19e7 100644
--- a/template/default/prog_timeline.html
+++ b/template/default/prog_timeline.html
@@ -52,7 +52,7 @@
#bigtable { position:absolute; top:100px; left: <?% left %?>px; z-index: 1; }
</style>
- <script language="JavaScript">
+ <script type="text/javascript" language="JavaScript">
function Go(x) {
if(x =="nothing") {
document.forms[0].reset();
@@ -96,7 +96,7 @@
<option value="<?% nowurl %?>"><%! now !%></option>
<?% FOREACH timer = times %?>
<?% timer_o_dopp = timer | replace('\:', '') %?>
- <option value="<?% nowurl %?>&time=<?% timer_o_dopp %?>" <?% "selected" IF now == timer %?>><?% timer %?></option>
+ <option value="<?% nowurl %?>&amp;time=<?% timer_o_dopp %?>" <?% "selected" IF now == timer %?>><?% timer %?></option>
<?% END %?>
</select>
&nbsp;|&nbsp;<%! at: !%>&nbsp;
@@ -117,7 +117,7 @@
<tr class="heading">
<td class="col_left"></td>
<td colspan="3" width='<?% breite + seite %?>'><h2><%! Timeline: !%>&nbsp;<?% date.format(akt_sekunde, '%H:%M') %?>&nbsp;<%! o'clock !%>&nbsp;<%! to !%>&nbsp;<?% date.format(bis_sec, '%H:%M') %?>&nbsp;<%! o'clock !%></h2></td>
- <td class="col_navi"><?% IF akt_stunde <= jetzt_stunde %?><img src="bilder/pfeile_nachlinks_soft.gif" border="0" width="28" height="17" /><?% ELSE %?><a href="<?% nowurl %?>&time=<?% akt_stunde - zeitrahmen | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachlinks.gif" border="0" width="28" height="17" /></a><?% END %?><a href="<?% nowurl %?>&time=<?% bis_stunde | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachrechts.gif" border="0" width="29" height="17" /></a></td>
+ <td class="col_navi"><?% IF akt_stunde <= jetzt_stunde %?><img src="bilder/pfeile_nachlinks_soft.gif" border="0" width="28" height="17" /><?% ELSE %?><a href="<?% nowurl %?>&amp;time=<?% akt_stunde - zeitrahmen | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachlinks.gif" border="0" width="28" height="17" /></a><?% END %?><a href="<?% nowurl %?>&amp;time=<?% bis_stunde | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachrechts.gif" border="0" width="29" height="17" /></a></td>
<td class="col_right"></td>
</tr>
<tr class="row_spacer">
@@ -219,7 +219,7 @@
<td width="1" class="<?% td_class %?>" onMouseOver="tip('VDR-<?% show.vdr_id %?>-<?% counter %?>'); return true;" onMouseOut="untip(); return true;">
<img src="bilder/spacer.gif" width="<?% laenge_pix %?>" height="1" border="0" hspace="0" /><br />
<nobr>
- <?% IF show.summary %?><a href="javascript:popup('./vdradmin.pl?aktion=prog_detail&epg_id=<?% show.anchor %?>&vdr_id=<?% show.vdr_id %?>');"><?% END %?>
+ <?% IF show.summary %?><a href="javascript:popup('./vdradmin.pl?aktion=prog_detail&amp;epg_id=<?% show.anchor %?>&amp;vdr_id=<?% show.vdr_id %?>');"><?% END %?>
<?% IF laenge_chars > 2 %?>
<?% show.title | truncate( laenge_chars ) %?>
<?% ELSE %?>
diff --git a/template/default/rc.html b/template/default/rc.html
index b7b788e..1c18c65 100644
--- a/template/default/rc.html
+++ b/template/default/rc.html
@@ -8,18 +8,18 @@
<tmpl_if usercss>
<link href="user.css" rel="stylesheet" media="screen" type="text/css" />
</tmpl_if>
- <script language="JavaScript">
+ <script type="text/javascript" language="JavaScript">
<!--
function switch_channel(url) {
Now = new Date();
- document.switchimage.src = url + "&" + Now.getTime();
+ document.switchimage.src = url + "&amp;" + Now.getTime();
}
//-->
</script>
</head>
<body id="rc">
- <table width="200" border="0" cellspacing="0" cellpadding="0" background="bilder/fern_back.jpg">
+ <table width="200" border="0" cellspacing="0" cellpadding="0" style="background-image: url(bilder/fern_back.jpg);">
<tr>
<td></td>
<td><img src="bilder/spacer.gif" alt="" height="20" width="50" border="0" /></td>
@@ -28,7 +28,7 @@
<tr>
<td></td>
<td></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=power');"><img src="bilder/fern_03.jpg" alt="" height="27" width="68" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=power');"><img src="bilder/fern_03.jpg" alt="" height="27" width="68" border="0" /></a></td>
</tr>
<tr>
<td></td>
@@ -36,23 +36,23 @@
<td></td>
</tr>
<tr>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=1');"><img src="bilder/fern_05.jpg" alt="" height="28" width="67" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=2');"><img src="bilder/fern_06.jpg" alt="" height="28" width="66" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=3');"><img src="bilder/fern_07.jpg" alt="" height="28" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=1');"><img src="bilder/fern_05.jpg" alt="" height="28" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=2');"><img src="bilder/fern_06.jpg" alt="" height="28" width="66" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=3');"><img src="bilder/fern_07.jpg" alt="" height="28" width="67" border="0" /></a></td>
</tr>
<tr>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=4');"><img src="bilder/fern_08.jpg" alt="" height="28" width="67" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=5');"><img src="bilder/fern_09.jpg" alt="" height="28" width="66" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=6');"><img src="bilder/fern_10.jpg" alt="" height="28" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=4');"><img src="bilder/fern_08.jpg" alt="" height="28" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=5');"><img src="bilder/fern_09.jpg" alt="" height="28" width="66" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=6');"><img src="bilder/fern_10.jpg" alt="" height="28" width="67" border="0" /></a></td>
</tr>
<tr>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=7');"><img src="bilder/fern_11.jpg" alt="" height="28" width="67" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=8');"><img src="bilder/fern_12.jpg" alt="" height="28" width="66" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=9');"><img src="bilder/fern_13.jpg" alt="" height="28" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=7');"><img src="bilder/fern_11.jpg" alt="" height="28" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=8');"><img src="bilder/fern_12.jpg" alt="" height="28" width="66" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=9');"><img src="bilder/fern_13.jpg" alt="" height="28" width="67" border="0" /></a></td>
</tr>
<tr>
<td></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=0');"><img src="bilder/fern_15.jpg" alt="" height="28" width="66" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=0');"><img src="bilder/fern_15.jpg" alt="" height="28" width="66" border="0" /></a></td>
<td></td>
</tr>
<tr>
@@ -61,12 +61,12 @@
<td></td>
</tr>
<tr>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=menu');"><img src="bilder/fern_18.jpg" alt="" height="27" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=menu');"><img src="bilder/fern_18.jpg" alt="" height="27" width="67" border="0" /></a></td>
<td></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=back');"><img src="bilder/fern_19.jpg" alt="" height="27" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=back');"><img src="bilder/fern_19.jpg" alt="" height="27" width="67" border="0" /></a></td>
</tr>
<tr>
- <td colspan="3"><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=red');"><img src="bilder/fern_22.jpg" alt="" height="28" width="50" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=green');"><img src="bilder/fern_23.jpg" alt="" height="28" width="49" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=yellow');"><img src="bilder/fern_24.jpg" alt="" height="28" width="51" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=blue');"><img src="bilder/fern_25.jpg" alt="" height="28" width="50" border="0" /></a></td>
+ <td colspan="3"><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=red');"><img src="bilder/fern_22.jpg" alt="" height="28" width="50" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=green');"><img src="bilder/fern_23.jpg" alt="" height="28" width="49" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=yellow');"><img src="bilder/fern_24.jpg" alt="" height="28" width="51" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=blue');"><img src="bilder/fern_25.jpg" alt="" height="28" width="50" border="0" /></a></td>
</tr>
<tr>
<td></td>
@@ -75,7 +75,7 @@
</tr>
<tr>
<td></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=up');"><img src="bilder/fern_28.jpg" alt="" height="27" width="66" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=up');"><img src="bilder/fern_28.jpg" alt="" height="27" width="66" border="0" /></a></td>
<td></td>
</tr>
<tr>
@@ -84,9 +84,9 @@
<td></td>
</tr>
<tr>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=left');"><img src="bilder/fern_31.jpg" alt="" height="27" width="67" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=ok');"><img src="bilder/fern_32.jpg" alt="" height="27" width="66" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=right');"><img src="bilder/fern_33.jpg" alt="" height="27" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=left');"><img src="bilder/fern_31.jpg" alt="" height="27" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=ok');"><img src="bilder/fern_32.jpg" alt="" height="27" width="66" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=right');"><img src="bilder/fern_33.jpg" alt="" height="27" width="67" border="0" /></a></td>
</tr>
<tr>
<td></td>
@@ -95,7 +95,7 @@
</tr>
<tr>
<td></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=down');"><img src="bilder/fern_36.jpg" alt="" height="27" width="66" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=down');"><img src="bilder/fern_36.jpg" alt="" height="27" width="66" border="0" /></a></td>
<td></td>
</tr>
<tr>
@@ -104,9 +104,9 @@
<td><img src="bilder/spacer.gif" name="switchimage" width="1" height="1" /> </td>
</tr>
<tr>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumeMinus');"><img src="bilder/fern_39.jpg" alt="" height="27" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=VolumeMinus');"><img src="bilder/fern_39.jpg" alt="" height="27" width="67" border="0" /></a></td>
<td></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumePlus');"><img src="bilder/fern_40.jpg" alt="" height="27" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=VolumePlus');"><img src="bilder/fern_40.jpg" alt="" height="27" width="67" border="0" /></a></td>
</tr>
<tr>
<td></td>
diff --git a/template/default/rec_edit.html b/template/default/rec_edit.html
index 2b12a7d..c77c255 100644
--- a/template/default/rec_edit.html
+++ b/template/default/rec_edit.html
@@ -25,7 +25,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group">
<tr class="heading">
- <td class="col_left"/td>
+ <td class="col_left"</td>
<td colspan="2"></td>
<td class="col_right"></td>
</tr>
@@ -37,13 +37,13 @@
<tr class="row_odd">
<td class="col_left"></td>
<td class="col_label"><h5><%! Original Name of Recording: !%></h5></td>
- <td class="col_value"><input type="text" name="title" value="<tmpl_var title>" size="55" readonly /></td>
+ <td class="col_value"><input type="text" name="title" value="<tmpl_var title escape="HTML">" size="55" readonly /></td>
<td class="col_right"></td>
</tr>
<tr class="row_even">
<td class="col_left"></td>
<td class="col_label"><h5><%! New Name of Recording: !%></h5></td>
- <td class="col_value"><input type="text" name="nn" value="<tmpl_var title>" size="55" /></td>
+ <td class="col_value"><input type="text" name="nn" value="<tmpl_var title escape="HTML">" size="55" /></td>
<td class="col_right"></td>
</tr>
<tr class="footer">
diff --git a/template/default/rec_list.html b/template/default/rec_list.html
index 7694224..28aa4a4 100644
--- a/template/default/rec_list.html
+++ b/template/default/rec_list.html
@@ -54,7 +54,7 @@
</colgroup>
<tr class="heading">
<td class="col_left"></td>
- <td class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>>
+ <td class="col_date <tmpl_if sortbydate>selected</tmpl_if>">
<h2>
<a href="<tmpl_var sortbydateurl>"><%! Date !%>
<tmpl_if sortbydate>
@@ -65,7 +65,7 @@
</a>
</h2>
</td>
- <td class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>>
+ <td class="col_time <tmpl_if sortbytime>selected</tmpl_if>">
<h2>
<a href="<tmpl_var sortbytimeurl>"><%! Time !%>
<tmpl_if sortbytime>
@@ -76,7 +76,7 @@
</a>
</h2>
</td>
- <td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>>
+ <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>">
<h2>
<a href="<tmpl_var sortbynameurl>"><%! Name !%>
<tmpl_if sortbyname>
@@ -97,9 +97,9 @@
</tr>
<tr class="row_spacer">
<td class="col_left"></td>
- <td class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>></td>
- <td class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>></td>
- <td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>></td>
+ <td class="col_date <tmpl_if sortbydate>selected</tmpl_if>"></td>
+ <td class="col_time <tmpl_if sortbytime>selected</tmpl_if>"></td>
+ <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"></td>
<td colspan="<tmpl_if stream_rec_on>4<tmpl_else>3</tmpl_if>"></td>
<td class="col_right"></td>
</tr>
@@ -107,11 +107,11 @@
<tmpl_loop recloop>
<tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>">
<td class="col_left"></td>
- <td class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>>
+ <td class="col_date <tmpl_if sortbydate>selected</tmpl_if>">
<span class="date"><tmpl_var date></span>
<tmpl_if isfolder><span class="total"><%! Total !%></span></tmpl_if>
</td>
- <td class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>>
+ <td class="col_time <tmpl_if sortbytime>selected</tmpl_if>">
<span class="time"><tmpl_var time></span>
<span class="new">
<tmpl_if isfolder>
@@ -123,11 +123,11 @@
</tmpl_if>
</span>
</td>
- <td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>>
+ <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>">
<tmpl_if isfolder>
- <a href="<tmpl_var infurl>"><img align="absmiddle" src="bilder/folder_video.gif" border="0" />&nbsp;<tmpl_var name></a>
+ <a href="<tmpl_var infurl>"><img align="middle" src="bilder/folder_video.gif" border="0" />&nbsp;<tmpl_var name></a>
<tmpl_else>
- <a href="javascript:popup('<tmpl_var infurl>');"><img align="absmiddle" src="bilder/aktion.gif" border="0" />&nbsp;<tmpl_var name></a>
+ <a href="javascript:popup('<tmpl_var infurl>');"><img align="middle" src="bilder/aktion.gif" border="0" />&nbsp;<tmpl_var name></a>
</tmpl_if>
</td>
<td class="col_edit">
@@ -137,7 +137,7 @@
</td>
<td class="col_delete">
<tmpl_unless isfolder>
- <a href="javascript:del('<%! Delete recording? !%>', '<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" title="<%! Delete !%>" height="17" width="17" border="0" /></a>
+ <a href="javascript:del('<%! Delete recording? !%>\n\n&quot;<tmpl_var name>&quot;', '<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" title="<%! Delete !%>" height="17" width="17" border="0" /></a>
</tmpl_unless>
</td>
<td class="col_checkbox">
@@ -156,9 +156,9 @@
<tr class="footer">
<td class="col_left"></td>
- <td class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>></td>
- <td class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>></td>
- <td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>></td>
+ <td class="col_date <tmpl_if sortbydate>selected</tmpl_if>"></td>
+ <td class="col_time <tmpl_if sortbytime>selected</tmpl_if>"></td>
+ <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"></td>
<td colspan="<tmpl_if stream_rec_on>4<tmpl_else>3</tmpl_if>"></td>
<td class="col_right"></td>
</tr>
diff --git a/template/default/style.css b/template/default/style.css
index 3f57d09..e24ed8a 100644
--- a/template/default/style.css
+++ b/template/default/style.css
@@ -8,7 +8,6 @@ textarea { color: black; font-weight: normal; font-size: 11px; }
select { color: black; font-weight: normal; font-size: 11px; }
b { font-weight: bold }
i { font-style: italic }
-.gbutton { color: black; font-weight: bold; }
.submit { height: 20px; }
h1 { margin-right: 12px; margin-left: 12px; font-size: 13px; font-weight: bold; color: black; display: inline; }
@@ -39,19 +38,19 @@ label + input { margin-left: 1em; }
.col_wanted_channels { text-align: left; padding: 10px; width: 40%; }
.col_navi { text-align: right; white-space: nowrap; }
-.heading td[selected] { background-image: url("bilder/uebersicht_oben_selected.gif"); }
+.heading td.selected { background-image: url("bilder/uebersicht_oben_selected.gif"); }
.heading td { background-image: url("bilder/uebersicht_oben.gif"); }
.heading .col_left { background-image: url("bilder/uebersicht_oben_links.gif"); }
.heading .col_right { background-image: url("bilder/uebersicht_oben_rechts.gif"); }
-.row_odd td[selected] { background-image: url("bilder/uebersicht_mitte_dark_selected.gif"); }
+.row_odd td.selected { background-image: url("bilder/uebersicht_mitte_dark_selected.gif"); }
.row_odd td { background-image: url("bilder/uebersicht_mitte_dark.gif"); }
.row_odd .col_left { background-image: url("bilder/uebersicht_links_dark.gif"); }
.row_odd .col_right { background-image: url("bilder/uebersicht_rechts_dark.gif"); }
-.row_even td[selected], .row_spacer td[selected] { background-image: url("bilder/uebersicht_mitte_selected.gif"); }
+.row_even td.selected, .row_spacer td.selected { background-image: url("bilder/uebersicht_mitte_selected.gif"); }
.row_even td, .row_spacer td { background-image: url("bilder/uebersicht_mitte.gif"); }
.row_even .col_left, .row_spacer .col_left { background-image: url("bilder/uebersicht_links.gif"); }
.row_even .col_right, .row_spacer .col_right { background-image: url("bilder/uebersicht_rechts.gif"); }
-.footer td[selected] { height: 30px; background-image: url("bilder/uebersicht_unten_selected.gif"); }
+.footer td.selected { height: 30px; background-image: url("bilder/uebersicht_unten_selected.gif"); }
.footer td { height: 30px; background-image: url("bilder/uebersicht_unten.gif"); }
.footer .col_left { background-image: url("bilder/uebersicht_unten_links.gif"); }
.footer .col_right { background-image: url("bilder/uebersicht_unten_rechts.gif"); }
@@ -70,7 +69,7 @@ label + input { margin-left: 1em; }
#heading .col_left { min-width: 15px; width: 15px; background-image: url("bilder/nav_button_back_start.gif"); }
#heading .col_title { background-image: url("bilder/nav_button_back_mitte.gif"); }
#heading .col_other { text-align: right; background-image: url("bilder/nav_button_back_mitte.gif"); }
-#heading .col_other span { float: right; }
+#heading .col_other table { display: inline; }
#heading .col_help { text-align: center; width: 45px; background-image: url("bilder/nav_button_back_mitte.gif"); }
#heading .col_right { min-width: 15px; width: 15px; background-image: url("bilder/nav_button_back_end.gif"); }
@@ -110,10 +109,10 @@ label + input { margin-left: 1em; }
#prog_summary .footer td { height: 38px; width: 246px; background-image: url("bilder/sum_bottom_mid.gif"); text-align: center; vertical-align: middle; }
#prog_summary .footer .col_left { min-width: 12px; width: 12px; height: 38px; background-image: url("bilder/sum_bottom_left.gif"); }
#prog_summary .footer .col_right { min-width: 12px; width: 12px; height: 38px; background-image: url("bilder/sum_bottom_right.gif"); }
-#prog_summary .date { text-align: right; margin-top: 1em; float: left; }
-#prog_summary .duration { text-align: right; margin-top: 1em; }
+#prog_summary .date { text-align: right; margin-top: 3px; float: left; }
+#prog_summary .duration { text-align: right; margin-top: 3px; }
#prog_summary .title { margin-top: 1em; width: 246px; overflow: hidden; white-space: nowrap; }
-#prog_summary .summary { margin-top: 1em; margin-bottom: 1em; width: 240px; height: 100px; overflow: hidden; white-space: normal; }
+#prog_summary .summary { margin-top: 1em; margin-bottom: 3px; width: 240px; height: 124px; overflow: hidden; white-space: normal; }
/* Tooltips */
.tt_table { width: 250px; border: 2px solid #333399; background-color: #ccccff; }
diff --git a/template/default/timer_list.html b/template/default/timer_list.html
index afc95a1..66dc2e9 100644
--- a/template/default/timer_list.html
+++ b/template/default/timer_list.html
@@ -33,31 +33,24 @@
faktor=2.2;
%?>
- <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
- <tr>
- <td class="col_left"></td>
- <td class="col_title"><h1><%! Timer !%></h1></td>
- <td class="col_other">
- <span>
- <table border="0" cellspacing="0" cellpadding="0">
- <tr height="20">
- <td width="12" height="20" background="bilder/gbutton_left.gif"></td>
- <td align="center" height="20" background="bilder/gbutton_middle.gif">
- <a href="<tmpl_var nturl>"><div class="gbutton"><%! New Timer !%></div></a>
- </td>
- <td width="12" height="20" background="bilder/gbutton_right.gif"></td>
- </tr>
- </table>
- </span>
- </td>
+ <form action="<tmpl_var url>" method="get" name="FormName0">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
+ <tr>
+ <td class="col_left"></td>
+ <td class="col_title"><h1><%! Timer !%></h1></td>
+ <td class="col_other">
+ <input type="submit" class="submit" value="<%! New Timer !%>" name="new_timer"/>
+ <input type="hidden" name="aktion" value="timer_new_form"/>
+ </td>
<tmpl_if help_url>
- <td class="col_help">
- <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>" /></a>
- </td>
+ <td class="col_help">
+ <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>" /></a>
+ </td>
</tmpl_if>
- <td class="col_right"></td>
- </tr>
- </table>
+ <td class="col_right"></td>
+ </tr>
+ </table>
+ </form>
<div id="content">
<form action="<tmpl_var url>" method="get" name="FormName1">
@@ -66,7 +59,7 @@
<td class="col_left"></td>
<td><h2><tmpl_var title></h2></td>
<td align="right">
- <select name="vdr_id" class="submit" onchange="window.open('<tmpl_var url>?aktion=timer_list&timer=' + this.options[this.selectedIndex].value,'main')">
+ <select name="vdr_id" class="submit" onchange="window.open('<tmpl_var url>?aktion=timer_list&amp;timer=' + this.options[this.selectedIndex].value,'main')">
<tmpl_loop day_loop>
<option value="<tmpl_var sortfield>" <tmpl_if current>selected</tmpl_if>><tmpl_var day></option>
</tmpl_loop>
@@ -211,14 +204,14 @@
<col class="col_start"/>
<col class="col_stop"/>
<col class="col_name"/>
- <col class0"col_edit"/>
+ <col class="col_edit"/>
<col class="col_delete"/>
<col class="col_checkbox"/>
<col class="col_right"/>
</colgroup>
<tr class="heading">
<td class="col_left"></td>
- <td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>>
+ <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>">
<h2>
<a href="<tmpl_var sortbyactiveurl>"><%! Active !%>
<tmpl_if sortbyactive>
@@ -229,7 +222,7 @@
</a>
</h2>
</td>
- <td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>>
+ <td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>">
<h2>
<a href="<tmpl_var sortbychannelurl>"><%! Channel !%>
<tmpl_if sortbychannel>
@@ -240,7 +233,7 @@
</a>
</h2>
</td>
- <td class="col_date" <tmpl_if sortbyday>selected="yes"</tmpl_if>>
+ <td class="col_date <tmpl_if sortbyday>selected</tmpl_if>">
<h2>
<a href="<tmpl_var sortbydayurl>"><%! Date !%>
<tmpl_if sortbyday>
@@ -251,7 +244,7 @@
</a>
</h2>
</td>
- <td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>>
+ <td class="col_start <tmpl_if sortbystart>selected</tmpl_if>">
<h2>
<a href="<tmpl_var sortbystarturl>"><%! Start !%>
<tmpl_if sortbystart>
@@ -262,7 +255,7 @@
</a>
</h2>
</td>
- <td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>>
+ <td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>">
<h2>
<a href="<tmpl_var sortbystopurl>"><%! Stop !%>
<tmpl_if sortbystop>
@@ -273,7 +266,7 @@
</a>
</h2>
</td>
- <td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>>
+ <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>">
<h2>
<a href="<tmpl_var sortbynameurl>"><%! Name !%>
<tmpl_if sortbyname>
@@ -291,12 +284,12 @@
</tr>
<tr class="row_spacer">
<td class="col_left"></td>
- <td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>></td>
- <td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>></td>
- <td class="col_date" <tmpl_if sortbyday>selected="yes"</tmpl_if>></td>
- <td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>></td>
- <td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>></td>
- <td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>></td>
+ <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"></td>
+ <td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>"></td>
+ <td class="col_date <tmpl_if sortbyday>selected</tmpl_if>"></td>
+ <td class="col_start <tmpl_if sortbystart>selected</tmpl_if>"></td>
+ <td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>"></td>
+ <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"></td>
<td colspan="3"></td>
<td class="col_right"></td>
</tr>
@@ -304,24 +297,24 @@
<tmpl_loop timer_loop>
<tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>">
<td class="col_left"></td>
- <td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>>
+ <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>">
<div>
<tmpl_if expr="(active%32768) == 0">
- <img src="bilder/poempl_grau.gif" alt="inactive" title="<%! This timer is inactive! !%>" width="19" height="19" align="absmiddle" border="0" />
+ <img src="bilder/poempl_grau.gif" alt="inactive" title="<%! This timer is inactive! !%>" width="19" height="19" align="middle" border="0" />
<tmpl_else>
<tmpl_if critical>
- <img src="bilder/poempl_rot.gif" alt="impossible" title="<%! This timer is impossible! !%>" width="19" height="19" align="absmiddle" border="0" />
+ <img src="bilder/poempl_rot.gif" alt="impossible" title="<%! This timer is impossible! !%>" width="19" height="19" align="middle" border="0" />
<tmpl_else>
<tmpl_if collision>
- <img src="bilder/poempl_gelb.gif" alt="nomore" title="<%! No more timers on other transponders possible! !%>" width="19" height="19" align="absmiddle" border="0" />
+ <img src="bilder/poempl_gelb.gif" alt="nomore" title="<%! No more timers on other transponders possible! !%>" width="19" height="19" align="middle" border="0" />
<tmpl_else>
<tmpl_if active>
- <img src="bilder/poempl_gruen.gif" alt="possible" title="<%! Timer OK. !%>" width="19" height="19" align="absmiddle" border="0" />
+ <img src="bilder/poempl_gruen.gif" alt="possible" title="<%! Timer OK. !%>" width="19" height="19" align="middle" border="0" />
</tmpl_if>
</tmpl_if>
</tmpl_if>
</tmpl_if>
- <a href="javascript:change('<%! Edit timer status? !%>','<tmpl_var toggleurl>&timer=<?% current %?>');">
+ <a href="javascript:change('<%! Edit timer status? !%>','<tmpl_var toggleurl>&amp;timer=<?% current %?>');">
<tmpl_if expr="active == 1"><%! Yes !%></tmpl_if>
<tmpl_if expr="(active%32768) == 0"><%! No !%></tmpl_if>
<tmpl_if expr="active == 5"><%! VPS !%></tmpl_if>
@@ -329,21 +322,21 @@
</a>
</div>
</td>
- <td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>>
+ <td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>">
<div><a href="<tmpl_var proglink>"><tmpl_var cdesc></a></div>
</td>
- <td class="col_date" <tmpl_if sortbyday>selected="yes"</tmpl_if>>
+ <td class="col_date <tmpl_if sortbyday>selected</tmpl_if>">
<div><tmpl_var dor></div>
</td>
- <td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>>
+ <td class="col_start <tmpl_if sortbystart>selected</tmpl_if>">
<div><tmpl_var start></div>
</td>
- <td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>>
+ <td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>">
<div><tmpl_var stop></div>
</td>
- <td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>>
+ <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>">
<div onMouseOver="tip('VDR-<tmpl_var id>'); return true;" onMouseOut="untip(); return true;">
- <tmpl_if recording><img align="absmiddle" src="bilder/rec.gif" border="0" />&nbsp;</tmpl_if>
+ <tmpl_if recording><img align="middle" src="bilder/rec.gif" border="0" />&nbsp;</tmpl_if>
<tmpl_if infurl>
<a href="javascript:popup('<tmpl_var infurl>');"><tmpl_var title></a>
<tmpl_else>
@@ -355,7 +348,7 @@
<div><a href="<tmpl_var modurl>"><img src="bilder/edit.gif" alt="edit" title="<%! Edit !%>" height="17" width="17" border="0" /></a></div>
</td>
<td class="col_delete">
- <div><a href="javascript:del('<%! Delete timer? !%>','<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" title="<%! Delete !%>" height="17" width="17" border="0" /></a></div>
+ <div><a href="javascript:del('<%! Delete timer? !%>\n\n&quot;<tmpl_var title>&quot;','<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" title="<%! Delete !%>" height="17" width="17" border="0" /></a></div>
</td>
<td class="col_checkbox">
<div><input type="checkbox" name="xxxx_<tmpl_var id>" /></div>
@@ -366,23 +359,22 @@
<tr class="footer">
<td class="col_left"></td>
- <td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>></td>
- <td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>></td>
- <td class="col_date" <tmpl_if sortbyday>selected="yes"</tmpl_if>></td>
- <td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>></td>
- <td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>></td>
- <td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>></td>
+ <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"></td>
+ <td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>"></td>
+ <td class="col_date <tmpl_if sortbyday>selected</tmpl_if>"></td>
+ <td class="col_start <tmpl_if sortbystart>selected</tmpl_if>"></td>
+ <td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>"></td>
+ <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"></td>
<td colspan="3"></td>
<td class="col_right"></td>
</tr>
</table>
- </div>
- <div id="buttons">
- <input type="submit" class="submit" name="timer_delete" value="<%! Delete Selected Timers !%>" onclick="return mdel('<%! Delete all selected timers? !%>');" />
- </div>
- <input type="hidden" name="aktion" value="timer_delete" />
- </form>
+ <div id="buttons">
+ <input type="submit" class="submit" name="timer_delete" value="<%! Delete Selected Timers !%>" onclick="return mdel('<%! Delete all selected timers? !%>');" />
+ </div>
+ <input type="hidden" name="aktion" value="timer_delete" />
+ </form>
</div>
</body>
</html>
diff --git a/template/default/timer_new.html b/template/default/timer_new.html
index 75f8224..d900f73 100644
--- a/template/default/timer_new.html
+++ b/template/default/timer_new.html
@@ -119,7 +119,7 @@
</tr>
<tr class="row_odd">
<td class="col_left"></td>
- <td class="col_label"><h5><%! Start Time: !%><h5></td>
+ <td class="col_label"><h5><%! Start Time: !%></h5></td>
<td class="col_value">
<input type="text" name="starth" value="<tmpl_var starth>" size="2" maxlength="2" />
<b>&nbsp;:&nbsp;</b>
diff --git a/template/default/tv.html b/template/default/tv.html
index fc606e0..0be28bc 100644
--- a/template/default/tv.html
+++ b/template/default/tv.html
@@ -9,7 +9,7 @@
<link href="user.css" rel="stylesheet" media="screen" type="text/css" />
</tmpl_if>
<script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
- <script language="JavaScript">
+ <script type="text/javascript" language="JavaScript">
<!--
var aktiv;
var interval = 5;
@@ -17,13 +17,13 @@
function switch_channel(url) {
Now = new Date();
- document.switchimage.src = url + "&" + Now.getTime();
+ document.switchimage.src = url + "&amp;" + Now.getTime();
window.setTimeout("WebcamUpdate()", 500);
}
function WebcamUpdate() {
Now = new Date();
- NewPicUrl = "<tmpl_var url>&size=" + size + "&" + Now.getTime();
+ NewPicUrl = "<tmpl_var url>&amp;size=" + size + "&amp;" + Now.getTime();
document.Bild.src = NewPicUrl;
}
@@ -60,15 +60,15 @@
}
function tv_open() {
- window.open("./vdradmin.pl?aktion=tv_show&new_win=1", "_blank", "width=615, height=548, resizable=yes, scrollbars=no, status=no, toolbar=no");
+ window.open("./vdradmin.pl?aktion=tv_show&amp;new_win=1", "_blank", "width=615, height=548, resizable=yes, scrollbars=no, status=no, toolbar=no");
}
//-->
</script>
</head>
<body onLoad="go()" id="tv">
- <form name="liveform">
- <table width="200" border="0" cellspacing="0" cellpadding="0" background="bilder/tv_bottom.gif">
+ <form action="<tmpl_var url>" method="get" name="liveform">
+ <table width="200" border="0" cellspacing="0" cellpadding="0" style="background-image: url(bilder/tv_bottom.gif);">
<tr>
<td align="center" valign="middle"><img name="Bild" src="<tmpl_var url>" border="1" hspace="2" vspace="2" /></td>
<td><img src="bilder/spacer.gif" name="switchimage" width="2" height="1" /></td>
@@ -82,7 +82,7 @@
<tr>
<td></td>
<td></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=power');"><img src="bilder/fern_03.jpg" alt="" height="27" width="68" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=power');"><img src="bilder/fern_03.jpg" alt="" height="27" width="68" border="0" /></a></td>
</tr>
<tr>
<td></td>
@@ -90,23 +90,23 @@
<td></td>
</tr>
<tr>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=1');"><img src="bilder/fern_05.jpg" alt="" height="28" width="67" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=2');"><img src="bilder/fern_06.jpg" alt="" height="28" width="66" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=3');"><img src="bilder/fern_07.jpg" alt="" height="28" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=1');"><img src="bilder/fern_05.jpg" alt="" height="28" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=2');"><img src="bilder/fern_06.jpg" alt="" height="28" width="66" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=3');"><img src="bilder/fern_07.jpg" alt="" height="28" width="67" border="0" /></a></td>
</tr>
<tr>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=4');"><img src="bilder/fern_08.jpg" alt="" height="28" width="67" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=5');"><img src="bilder/fern_09.jpg" alt="" height="28" width="66" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=6');"><img src="bilder/fern_10.jpg" alt="" height="28" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=4');"><img src="bilder/fern_08.jpg" alt="" height="28" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=5');"><img src="bilder/fern_09.jpg" alt="" height="28" width="66" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=6');"><img src="bilder/fern_10.jpg" alt="" height="28" width="67" border="0" /></a></td>
</tr>
<tr>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=7');"><img src="bilder/fern_11.jpg" alt="" height="28" width="67" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=8');"><img src="bilder/fern_12.jpg" alt="" height="28" width="66" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=9');"><img src="bilder/fern_13.jpg" alt="" height="28" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=7');"><img src="bilder/fern_11.jpg" alt="" height="28" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=8');"><img src="bilder/fern_12.jpg" alt="" height="28" width="66" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=9');"><img src="bilder/fern_13.jpg" alt="" height="28" width="67" border="0" /></a></td>
</tr>
<tr>
<td></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=0');"><img src="bilder/fern_15.jpg" alt="" height="28" width="66" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=0');"><img src="bilder/fern_15.jpg" alt="" height="28" width="66" border="0" /></a></td>
<td></td>
</tr>
<tr>
@@ -115,12 +115,12 @@
<td></td>
</tr>
<tr>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=menu');"><img src="bilder/fern_18.jpg" alt="" height="27" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=menu');"><img src="bilder/fern_18.jpg" alt="" height="27" width="67" border="0" /></a></td>
<td></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=back');"><img src="bilder/fern_19.jpg" alt="" height="27" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=back');"><img src="bilder/fern_19.jpg" alt="" height="27" width="67" border="0" /></a></td>
</tr>
<tr>
- <td colspan="3"><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=red');"><img src="bilder/fern_22.jpg" alt="" height="28" width="50" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=green');"><img src="bilder/fern_23.jpg" alt="" height="28" width="49" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=yellow');"><img src="bilder/fern_24.jpg" alt="" height="28" width="51" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=blue');"><img src="bilder/fern_25.jpg" alt="" height="28" width="50" border="0" /></a></td>
+ <td colspan="3"><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=red');"><img src="bilder/fern_22.jpg" alt="" height="28" width="50" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=green');"><img src="bilder/fern_23.jpg" alt="" height="28" width="49" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=yellow');"><img src="bilder/fern_24.jpg" alt="" height="28" width="51" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=blue');"><img src="bilder/fern_25.jpg" alt="" height="28" width="50" border="0" /></a></td>
</tr>
<tr>
<td></td>
@@ -129,7 +129,7 @@
</tr>
<tr>
<td></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=up');"><img src="bilder/fern_28.jpg" alt="" height="27" width="66" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=up');"><img src="bilder/fern_28.jpg" alt="" height="27" width="66" border="0" /></a></td>
<td></td>
</tr>
<tr>
@@ -138,9 +138,9 @@
<td></td>
</tr>
<tr>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=left');"><img src="bilder/fern_31.jpg" alt="" height="27" width="67" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=ok');"><img src="bilder/fern_32.jpg" alt="" height="27" width="66" border="0" /></a></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=right');"><img src="bilder/fern_33.jpg" alt="" height="27" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=left');"><img src="bilder/fern_31.jpg" alt="" height="27" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=ok');"><img src="bilder/fern_32.jpg" alt="" height="27" width="66" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=right');"><img src="bilder/fern_33.jpg" alt="" height="27" width="67" border="0" /></a></td>
</tr>
<tr>
<td></td>
@@ -149,7 +149,7 @@
</tr>
<tr>
<td></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=down');"><img src="bilder/fern_36.jpg" alt="" height="27" width="66" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=down');"><img src="bilder/fern_36.jpg" alt="" height="27" width="66" border="0" /></a></td>
<td></td>
</tr>
<tr>
@@ -158,9 +158,9 @@
<td></td>
</tr>
<tr>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumeMinus');"><img src="bilder/fern_39.jpg" alt="" height="27" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=VolumeMinus');"><img src="bilder/fern_39.jpg" alt="" height="27" width="67" border="0" /></a></td>
<td></td>
- <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumePlus');"><img src="bilder/fern_40.jpg" alt="" height="27" width="67" border="0" /></a></td>
+ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=VolumePlus');"><img src="bilder/fern_40.jpg" alt="" height="27" width="67" border="0" /></a></td>
</tr>
<tr>
<td></td>
@@ -174,28 +174,26 @@
<td colspan="3"></td>
</tr>
<tr valign="middle">
- <td valign="middle">
- <nobr>
- <h5><%! Interval: !%></h5>
- <select name="Seconds" class="submit" onChange="v_changeInterval(this.options[this.selectedIndex].value)">
- <option value="0"><%! off !%></option>
- <option value="1"> 1 <%! sec. !%></option>
- <option value="2"> 2 <%! sec. !%></option>
- <option value="3"> 3 <%! sec. !%></option>
- <option value="5" selected> 5 <%! sec. !%></option>
- <option value="10">10 <%! sec. !%></option>
- <option value="30">30 <%! sec. !%></option>
- <option value="60">60 <%! sec. !%></option>
- </select>
- <input type="button" class="submit" name="livebild" value='<%! G !%>' title="<%! Grab the picture! !%>" onClick="WebcamUpdate()" />
- &nbsp;&nbsp;<h5><%! Size: !%></h5>
- <select name="Size" class="submit" onChange="v_changeSize(this.options[this.selectedIndex].value)">
- <option value="full">1:1</option>
- <option value="half" selected>1:2</option>
- <option value="quarter">1:4</option>
- </select>
- <input type="button" class="submit" name="livebild" value='<%! G !%>' title="<%! Grab the picture! !%>" onClick="WebcamUpdate()" />
- </nobr>
+ <td valign="middle" style="white-space: nowrap;">
+ <h5><%! Interval: !%></h5>
+ <select name="Seconds" class="submit" onChange="v_changeInterval(this.options[this.selectedIndex].value)">
+ <option value="0"><%! off !%></option>
+ <option value="1"> 1 <%! sec. !%></option>
+ <option value="2"> 2 <%! sec. !%></option>
+ <option value="3"> 3 <%! sec. !%></option>
+ <option value="5" selected> 5 <%! sec. !%></option>
+ <option value="10">10 <%! sec. !%></option>
+ <option value="30">30 <%! sec. !%></option>
+ <option value="60">60 <%! sec. !%></option>
+ </select>
+ <input type="button" class="submit" name="livebild" value='<%! G !%>' title="<%! Grab the picture! !%>" onClick="WebcamUpdate()" />
+ &nbsp;&nbsp;<h5><%! Size: !%></h5>
+ <select name="Size" class="submit" onChange="v_changeSize(this.options[this.selectedIndex].value)">
+ <option value="full">1:1</option>
+ <option value="half" selected>1:2</option>
+ <option value="quarter">1:4</option>
+ </select>
+ <input type="button" class="submit" name="livebild" value='<%! G !%>' title="<%! Grab the picture! !%>" onClick="WebcamUpdate()" />
</td>
<td colspan="2" align="right"><tmpl_unless new_win><a href="javascript:tv_open();"><%! Open in separate window !%></a>&nbsp;&nbsp;</tmpl_unless></td>
</tr>
diff --git a/user.css.example b/user.css.example
index d54f5e3..a80277c 100644
--- a/user.css.example
+++ b/user.css.example
@@ -1,17 +1,17 @@
/* The user.css is mainly an example to demonstrate the possibilities */
/* don't want background images */
-td, .heading td, .footer td, .heading td[selected], .footer td[selected], #prog_summary .heading td, #prog_summary .footer td, .row_even td[selected], .row_even td, .row_odd td[selected], .row_odd td { background-image: none; background-repeat: no-repeat; }
+td, .heading td, .footer td, .heading td.selected, .footer td.selected, #prog_summary .heading td, #prog_summary .footer td, .row_even td.selected, .row_even td, .row_odd td.selected, .row_odd td { background-image: none; background-repeat: no-repeat; }
tr { height: 17px; }
.heading { height: 17px; }
-.row_spacer, .row_spacer td, .row_spacer td[selected], .footer, .footer td, .footer td[selected], .col_left, .col_right { display: none; }
+.row_spacer, .row_spacer td, .row_spacer td.selected, .footer, .footer td, .footer td.selected, .col_left, .col_right { display: none; }
tr.heading { height: 17px; }
-.heading td[selected] { background-color: #aab0aa; height: 17px; }
+.heading td.selected { background-color: #aab0aa; height: 17px; }
.heading td { background-color: #838183; height: 17px; }
-.row_even td[selected] { background-color: #dee6f6; }
+.row_even td.selected { background-color: #dee6f6; }
.row_even td { background-color: #eeeeff; }
-.row_odd td[selected] { background-color: #d5def6; }
+.row_odd td.selected { background-color: #d5def6; }
.row_odd td { background-color: #f6faff; }
td.col_navi { text-align: right; background-color: #f6faff; white-space: nowrap; height: 17px; }
@@ -30,7 +30,6 @@ td.col_navi { text-align: right; background-color: #f6faff; white-space: nowrap;
/* Dirty hack, must find other solution */
td[bgcolor] { background-color: black; }
-.gbutton { border: 1px solid black; padding: 5px 10px 2px 10px; height: 20px; background-color: #eeeeff; border-radius: 10px; -moz-border-radius: 10px; }
#prog_summary .heading a { font-weight: bold; font-style: italic; letter-spacing: 0.1em; color: white; padding: 2px 2px; }
#prog_summary .group { margin: 3px; display: inline; float: left; }
#prog_summary tr.footer { display: table-row; background-image: none; background-color: #f6faff; margin: 0px; padding: 0px; }
diff --git a/vdradmind.pl b/vdradmind.pl
index c56bd95..54ff969 100755
--- a/vdradmind.pl
+++ b/vdradmind.pl
@@ -58,6 +58,7 @@ use POSIX ":sys_wait_h", qw(strftime mktime locale_h);
use MIME::Base64();
use File::Temp ();
use Shell qw(ps);
+use URI::Escape;
$SIG{CHLD} = sub { wait };
@@ -93,6 +94,7 @@ $CONFIG{SERVERPORT} = 8001;
$CONFIG{LOCAL_NET} = "0.0.0.0/32";
$CONFIG{VIDEODIR} = "/video";
$CONFIG{VDRCONFDIR} = "$CONFIG{VIDEODIR}";
+$CONFIG{EPGIMAGES} = "$CONFIG{VIDEODIR}/epgimages";
$CONFIG{VDRVFAT} = 1;
#
$CONFIG{TEMPLATE} = "default";
@@ -143,12 +145,13 @@ $CONFIG{MAIL_SERVER} = "your.email.server";
$CONFIG{CHANNELS_WANTED} = "";
$CONFIG{CHANNELS_WANTED_AUTOTIMER} = "";
$CONFIG{CHANNELS_WANTED_PRG} = "";
+$CONFIG{CHANNELS_WANTED_PRG2} = "";
$CONFIG{CHANNELS_WANTED_TIMELINE} = "";
$CONFIG{CHANNELS_WANTED_SUMMARY} = "";
#
$CONFIG{PROG_SUMMARY_COLS} = 3;
-my $VERSION = "0.97-am3.3";
+my $VERSION = "0.97-am3.4";
my $SERVERVERSION = "vdradmind/$VERSION";
my $LINVDR = isLinVDR();
my $VDRVERSION = 0;
@@ -195,6 +198,7 @@ my $Xconfig = {
CACHE_SIZE => 10000, # Tuning for Templates
COMPILE_EXT => 'cache', # Tuning for Templates
COMPILE_DIR => '/tmp', # Tuning for Templates
+# DEBUG => DEBUG_ALL,
};
# create Template object
@@ -216,7 +220,7 @@ my(%mimehash) = (
js => "application/x-javascript",
swf => "application/x-shockwave-flash"
);
-my @LOGINPAGES = qw(prog_list prog_list2 prog_summary prog_timeline timer_list rec_list);
+my @LOGINPAGES = qw(prog_summary prog_list2 prog_timeline prog_list timer_list rec_list);
$SIG{INT} = \&Shutdown;
@@ -238,14 +242,24 @@ for(my $i = 0; $i < scalar(@ARGV); $i++) {
if(/-h|--help/) {
print("Usage $0 [OPTION]...\n");
print("A perl client for the Linux Video Disk Recorder.\n\n");
- print(" -nf --nofork don't fork\n");
- print(" -c --config run configuration dialog\n");
- print(" -k --kill kill a forked vdradmind.pl\n");
- print(" -h --help this message\n");
+ print(" -nf --nofork don't fork\n");
+ print(" -c --config run configuration dialog\n");
+ print(" -d [dir] --cfgdir [dir] use [dir] for configuration files\n");
+ print(" -k --kill kill a forked vdradmind.pl\n");
+ print(" -h --help this message\n");
print("\nReport bugs to <mail\@andreas.vdr-developer.org>.\n");
exit(0);
}
if(/--nofork|-nf/) { $DAEMON = 0; last; }
+ if(/--cfgdir|-d/) {
+ $ETCDIR = $ARGV[++$i];
+ $CONFFILE = "${ETCDIR}/vdradmind.conf";
+ $AT_FILENAME = "${ETCDIR}/vdradmind.at";
+ $DONE_FILENAME = "${ETCDIR}/vdradmind.done";
+ $BL_FILENAME = "${ETCDIR}/vdradmind.bl";
+ $USER_CSS = "${ETCDIR}/user.css";
+ next;
+ }
if(/--config|-c/) {
ReadConfig() if(-e $CONFFILE);
$CONFIG{VDR_HOST} = Question(gettext("What's your VDR hostname (e.g video.intra.net)?"), $CONFIG{VDR_HOST});
@@ -409,12 +423,17 @@ while(true) {
if($Request eq "/vdradmin.pl") {
$q = CGI->new($Query);
my $aktion;
+ my $real_aktion = $q->param("aktion");
+ if ($real_aktion eq "at_timer_aktion") {
+ $aktion = "at_timer_delete" if ($q->param("at_delete"));
+ $aktion = "force_update" if ($q->param("at_force"));
+ }
my @ALLOWED_FUNCTIONS;
$Guest ? (@ALLOWED_FUNCTIONS = @GUEST_USER) : (@ALLOWED_FUNCTIONS = @TRUSTED_USER);
for(@ALLOWED_FUNCTIONS) {
- ($aktion = $q->param("aktion")) if($q->param("aktion") eq $_);
+ ($aktion = $real_aktion) if($real_aktion eq $_);
}
if($aktion) {
eval("(\$http_status, \$bytes_transfered) = $aktion();");
@@ -692,9 +711,9 @@ sub EPG_buildTree {
my($event_id, $time, $duration) = ($1, $2, $3);
my($title, $subtitle, $summary);
while($_ = $SVDRP->readoneline) {
-# if(/^T (.*)/) { $title = $1; $title =~ s/\|/<br>/sig }
-# if(/^S (.*)/) { $subtitle = $1; $subtitle =~ s/\|/<br>/sig }
-# if(/^D (.*)/) { $summary = $1; $summary =~ s/\|/<br>/sig }
+# if(/^T (.*)/) { $title = $1; $title =~ s/\|/<br \/>/sig }
+# if(/^S (.*)/) { $subtitle = $1; $subtitle =~ s/\|/<br \/>/sig }
+# if(/^D (.*)/) { $summary = $1; $summary =~ s/\|/<br \/>/sig }
if(/^T (.*)/) { $title = $1; }
if(/^S (.*)/) { $subtitle = $1; }
if(/^D (.*)/) { $summary = $1; }
@@ -852,7 +871,7 @@ sub header {
# PrintToClient("Cache-Control: max-age=0", CRLF);
PrintToClient("Cache-Control: private", CRLF);
PrintToClient("Pragma: no-cache", CRLF);
- PrintToClient("Expires: -1", CRLF);
+ PrintToClient("Expires: Thu, 01 Jan 1970 00:00:00 GMT", CRLF);
} else {
PrintToClient("Expires: ", headerTime(time() + 3600), CRLF);
PrintToClient("Cache-Control: max-age=3600", CRLF);
@@ -922,6 +941,9 @@ sub SendFile {
$FileWithPath = sprintf('%s/%s/%s/%s', $TEMPLATEDIR, $CONFIG{TEMPLATE}, $CONFIG{SKIN}, $File);
} elsif($File eq "user.css" and -e "$USER_CSS") {
$FileWithPath = "$USER_CSS";
+ } elsif($File =~ "^epg/" ) {
+ $File =~ s/^epg\///;
+ $FileWithPath = $CONFIG{EPGIMAGES} . "/" . $File;
}
if(-e $FileWithPath) {
@@ -1122,6 +1144,7 @@ sub AutoTimer {
for my $at (@at) {
next if(!$at->{active});
next if(($at->{channel}) && ($at->{channel} != $event->{vdr_id}));
+#printf("AT: " . $at->{channel} . " - " . $at->{pattern} . " --- " . $event->{vdr_id} . " - " . $event->{title} . "\n");
my $SearchStr;
if($at->{section} & 1) {
@@ -1456,18 +1479,19 @@ sub CheckTimers {
# look for matching event_id on the same channel -- it's unique
if($timer->{event_id} == $event->{event_id}) {
Log(LOG_CHECKTIMER, sprintf("CheckTimers: Checking timer \"%s\" (No. %s) for changes by Event-ID", $timer->{title}, $timer->{id}));
- my $ntitle = $timer->{title};
- if($event->{subtitle}) {
- if($ntitle =~ /(.*\~|^)$event->{title}\~(.*)$/) {
- $ntitle=$1 . $event->{title} . "~" . $event->{subtitle};
- }
- }
+ # don't check for title
+ #my $ntitle = $timer->{title};
+ #if($event->{subtitle}) {
+ # if($ntitle =~ /(.*\~|^)$event->{title}\~(.*)$/) {
+ # $ntitle=$1 . $event->{title} . "~" . $event->{subtitle};
+ # }
+ #}
# update timer if the existing one differs from the EPG
#if(($timer->{title} ne ($event->{subtitle} ? ($event->{title} . "~" . $event->{subtitle}) : $event->{title})) ||
# (($event->{summary}) && (!$timer->{summary})) ||
- if($timer->{title} ne $ntitle ||
- (($event->{summary}) && (!$timer->{summary})) ||
+ # don't check for changed title, as this will break autotimers' "directory" setting
+ if((($event->{summary}) && (!$timer->{summary})) ||
($timer->{start} ne ($event->{start} - $CONFIG{TM_MARGIN_BEGIN} * 60)) ||
($timer->{stop} ne ($event->{stop} + $CONFIG{TM_MARGIN_END} * 60))) {
Log(LOG_CHECKTIMER, sprintf("CheckTimers: Timer \"%s\" (No. %s, Event-ID %s, %s - %s) differs from EPG: \"%s\", Event-ID %s, %s - %s)", $timer->{title}, $timer->{id}, $timer->{event_id}, strftime("%Y%m%d-%H%M", localtime($timer->{start})), strftime("%Y%m%d-%H%M", localtime($timer->{stop})), $event->{title}, $event->{event_id}, strftime("%Y%m%d-%H%M", localtime($event->{start})), strftime("%Y%m%d-%H%M", localtime($event->{stop}))));
@@ -1482,7 +1506,9 @@ sub CheckTimers {
$timer->{lft},
# always add subtitle if there is one
#$event->{subtitle} ? ($event->{title} . "~" . $event->{subtitle}) : $event->{title},
- $ntitle,
+ # don't update title as this may differ from what has been set by the user
+ #$ntitle,
+ $timer->{title},
# If there already is a summary, the user might have changed it -- leave it untouched.
$timer->{summary} ? $timer->{summary} : $event->{summary},
);
@@ -1670,7 +1696,7 @@ sub ParseTimer {
collision => 0,
critical => 0,
first => $first,
- proglink => sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $vdr_id)
+ proglink => sprintf("%s?aktion=prog_list&amp;vdr_id=%s", $MyURL, $vdr_id)
});
$first = 0;
}
@@ -1695,7 +1721,7 @@ sub ParseTimer {
collision => 0,
critical => 0,
first => -1,
- proglink => sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $vdr_id)
+ proglink => sprintf("%s?aktion=prog_list&amp;vdr_id=%s", $MyURL, $vdr_id)
});
}
@@ -1732,7 +1758,7 @@ sub LoadTranslation {
sub HelpURL {
my $area = shift;
- return(sprintf("%s?aktion=show_help&area=%s", $MyURL, $area));
+ return(sprintf("%s?aktion=show_help&amp;area=%s", $MyURL, $area));
}
sub ProgTimer {
@@ -2031,7 +2057,7 @@ sub Einheit {
$zahl /= 1024;
$einheit++;
}
- return(int($zahl) . $einheiten[$einheit]);
+ return(sprintf("%1.*f", $einheit, $zahl) . $einheiten[$einheit]);
}
sub MBToMinutes {
@@ -2044,7 +2070,7 @@ sub MBToMinutes {
sub VideoDiskFree {
$_ = join("", SendCMD("stat disk"));
- if(/^(\d+)MB (\d+)MB (\d+)%$/) {
+ if(/^(\d+)MB (\d+)MB (\d+)%.*?$/) {
return(Einheit($1), MBToMinutes($1), Einheit($2), MBToMinutes($2), $3);
} elsif(/^Command unrecognized: "stat"$/) {
#print "VDR doesnt know about this extension\n";
@@ -2142,7 +2168,7 @@ sub prog_detail {
my $vdr_id = $q->param("vdr_id");
my $epg_id = $q->param("epg_id");
- my($channel_name, $title, $subtitle, $start, $stop, $date, $text);
+ my($channel_name, $title, $subtitle, $start, $stop, $date, $text, @epgimages);
if($vdr_id && $epg_id) {
for(@{$EPG{$vdr_id}}) {
@@ -2155,6 +2181,14 @@ sub prog_detail {
$stop = my_strftime("%H:%M", $_->{stop});
$text = $_->{summary};
$date = my_strftime("%A, %x", $_->{start});
+
+ # find epgimages
+ if($CONFIG{EPGIMAGES} && -d $CONFIG{EPGIMAGES}) {
+ for my $epgimage (<$CONFIG{EPGIMAGES}/$epg_id*>) {
+ $epgimage =~ s/.*\///g;
+ push(@epgimages, { image => "epg/" . $epgimage });
+ }
+ }
last;
}
}
@@ -2163,26 +2197,30 @@ sub prog_detail {
my $displaytext = $text;
my $displaytitle = $title;
my $displaysubtitle = $subtitle;
+ my $find_title = $title;
- $displaytext =~ s/\n/<br>\n/g;
- $displaytext =~ s/\|/<br>\n/g;
- $displaytitle =~ s/\n/<br>\n/g;
- $displaytitle =~ s/\|/<br>\n/g;
- $displaysubtitle =~ s/\n/<br>\n/g;
- $displaysubtitle =~ s/\|/<br>\n/g;
+ $displaytext =~ s/\n/<br \/>\n/g;
+ $displaytext =~ s/\|/<br \/>\n/g;
+ $displaytitle =~ s/\n/<br \/>\n/g;
+ $displaytitle =~ s/\|/<br \/>\n/g;
+ $displaysubtitle =~ s/\n/<br \/>\n/g;
+ $displaysubtitle =~ s/\|/<br \/>\n/g;
+ $find_title =~ s/^.*~\([^~]*\)/\1/;
my $template = TemplateNew("prog_detail.html");
my $vars = {
usercss => $UserCSS,
title => $displaytitle ? $displaytitle : undef,
- recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s", $MyURL, $epg_id, $vdr_id),
- switchurl => sprintf("%s?aktion=prog_switch&channel=%s", $MyURL, $vdr_id),
+ recurl => sprintf("%s?aktion=timer_new_form&amp;epg_id=%s&amp;vdr_id=%s", $MyURL, $epg_id, $vdr_id),
+ switchurl => sprintf("%s?aktion=prog_switch&amp;channel=%s", $MyURL, $vdr_id),
channel_name => $channel_name,
subtitle => $displaysubtitle,
start => $start,
stop => $stop,
text => $displaytext ? $displaytext : undef,
- date => $date
+ date => $date,
+ find_title => uri_escape($find_title),
+ epgimages => \@epgimages
};
$template->param($vars);
my $output;
@@ -2245,8 +2283,8 @@ sub prog_list {
push(@show, {
title => $event->{channel_name} . " | " . my_strftime("%A, %x", $event->{start}),
newd => 1,
- next_channel => $next_channel ? "$MyURL?aktion=prog_list&vdr_id=$next_channel" : undef,
- prev_channel => $prev_channel ? "$MyURL?aktion=prog_list&vdr_id=$prev_channel" : undef,
+ next_channel => $next_channel ? "$MyURL?aktion=prog_list&amp;vdr_id=$next_channel" : undef,
+ prev_channel => $prev_channel ? "$MyURL?aktion=prog_list&amp;vdr_id=$prev_channel" : undef,
});
$day = strftime("%d", localtime($event->{start}));
}
@@ -2254,12 +2292,12 @@ sub prog_list {
ssse => $event->{start},
emit => my_strftime("%H:%M", $event->{start}),
duration => my_strftime("%H:%M", $event->{stop}),
- title => $event->{title},
- subtitle => $event->{subtitle},
- recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}),
- infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}) : undef,
+ title => CGI::escapeHTML($event->{title}),
+ subtitle => CGI::escapeHTML($event->{subtitle}),
+ recurl => sprintf("%s?aktion=timer_new_form&amp;epg_id=%s&amp;vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}),
+ infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&amp;epg_id=%s&amp;vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}) : undef,
newd => 0,
- anchor => $event->{event_id}
+ anchor => "id" . $event->{event_id}
});
$progname = $event->{progname};
$cnumber = $event->{cnumber};
@@ -2277,8 +2315,8 @@ sub prog_list {
loop => \@show,
chanloop => \@channel,
progname => GetChannelDescByNumber($vdr_id),
- switchurl => "$MyURL?aktion=prog_switch&channel=" . $vdr_id,
- streamurl => "$MyURL?aktion=live_stream&channel=" . $vdr_id,
+ switchurl => "$MyURL?aktion=prog_switch&amp;channel=" . $vdr_id,
+ streamurl => "$MyURL?aktion=live_stream&amp;channel=" . $vdr_id,
stream_live_on => $CONFIG{ST_FUNC} && $CONFIG{ST_LIVE_ON},
toolbarurl => "$MyURL?aktion=toolbar"
};
@@ -2300,14 +2338,19 @@ sub prog_list {
#############################################################################
sub prog_list2 {
return if(UptoDate());
-
+
+ my $current_day = my_strftime("%d");
+ my $last_day = 0;
+ my $day = $current_day;
+ $day = $q->param("day") if ($q->param("day"));
+
#
my $vdr_id;
my @channel;
for my $channel (@CHAN) {
# if its wished, display only wanted channels
- if($CONFIG{CHANNELS_WANTED_PRG}) {
+ if($CONFIG{CHANNELS_WANTED_PRG2}) {
my $found = 0;
for my $n (split(",", $CONFIG{CHANNELS_WANTED})) {
($found = 1) if($n eq $channel->{vdr_id});
@@ -2339,22 +2382,23 @@ sub prog_list2 {
($prev_channel = $channel[$ci - 1]->{vdr_id}) if($ci > 0);
($next_channel = $channel[$ci + 1]->{vdr_id}) if($ci < $#channel);
-
- my $day = 0;
my $dayflag = 0;
-
for my $event (@{$EPG{$vdr_id}}) {
- if(my_strftime("%d", $event->{start}) != $day) { # new day
- $day = strftime("%d", localtime($event->{start}));
- $dayflag++;
- }
+ my $event_day = my_strftime("%d", $event->{start});
+# print("EVENT: " . $event->{title} . " - " . $event_day . "\n");
+ if($event_day == $day) {
+ $dayflag = 1 if ($dayflag == 0);
+ } else {
+ $last_day = $event_day if ($event_day > $last_day);
+ $dayflag = 0;
+ }
if($dayflag == 1) {
push(@show, {
title => $event->{channel_name} . " | " . my_strftime("%A, %x", $event->{start}),
newd => 1,
- streamurl => "$MyURL?aktion=live_stream&channel=" . $event->{vdr_id},
+ streamurl => "$MyURL?aktion=live_stream&amp;channel=" . $event->{vdr_id},
undef,
undef,
});
@@ -2367,12 +2411,12 @@ sub prog_list2 {
ssse => $event->{start},
emit => my_strftime("%H:%M", $event->{start}),
duration => my_strftime("%H:%M", $event->{stop}),
- title => $event->{title},
- subtitle => $event->{subtitle},
- recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}),
- infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}) : undef,
+ title => CGI::escapeHTML($event->{title}),
+ subtitle => CGI::escapeHTML($event->{subtitle}),
+ recurl => sprintf("%s?aktion=timer_new_form&amp;epg_id=%s&amp;vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}),
+ infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&amp;epg_id=%s&amp;vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}) : undef,
newd => 0,
- anchor => $event->{event_id}
+ anchor => "id" . $event->{event_id}
});
$progname = $event->{progname};
$cnumber = $event->{cnumber};
@@ -2385,13 +2429,16 @@ sub prog_list2 {
#
my($template) = TemplateNew("prog_list2.html");
my $vars = {
+ title => $day == $current_day ? gettext("Playing Today") : ($day == $current_day + 1 ? gettext("Playing Tomorrow") : sprintf(gettext("Playing on the %d."), $day)),
usercss => $UserCSS,
url => $MyURL,
loop => \@show,
chanloop => \@channel,
progname => GetChannelDescByNumber($vdr_id),
- switchurl => "$MyURL?aktion=prog_switch&channel=" . $vdr_id,
+ switchurl => "$MyURL?aktion=prog_switch&amp;channel=" . $vdr_id,
stream_live_on => $CONFIG{ST_FUNC} && $CONFIG{ST_LIVE_ON},
+ prevdayurl => $day > $current_day ? "$MyURL?aktion=prog_list2&amp;day=" . ($day - 1) : undef,
+ nextdayurl => $last_day > $day ? "$MyURL?aktion=prog_list2&amp;day=" . ($day + 1) : undef,
toolbarurl => "$MyURL?aktion=toolbar"
};
$template->param($vars);
@@ -2435,9 +2482,9 @@ sub timer_list {
} else {
$timer->{active} = 0;
}
- $timer->{delurl} = $MyURL . "?aktion=timer_delete&timer_id=" . $timer->{id},
- $timer->{modurl} = $MyURL . "?aktion=timer_new_form&timer_id=" . $timer->{id},
- $timer->{toggleurl} = sprintf("%s?aktion=timer_toggle&active=%s&id=%s", $MyURL, ($timer->{active} & 1) ? 0 : 1, $timer->{id}),
+ $timer->{delurl} = $MyURL . "?aktion=timer_delete&amp;timer_id=" . $timer->{id},
+ $timer->{modurl} = $MyURL . "?aktion=timer_new_form&amp;timer_id=" . $timer->{id},
+ $timer->{toggleurl} = sprintf("%s?aktion=timer_toggle&amp;active=%s&amp;id=%s", $MyURL, ($timer->{active} & 1) ? 0 : 1, $timer->{id}),
$timer->{dor} = my_strftime("%a %d.%m", $timer->{startsse}); #TODO
$timer->{title} =~ s/"/\&quot;/g;
@@ -2450,7 +2497,7 @@ sub timer_list {
$timer->{starttime} = my_strftime("%y%m%d", $timer->{startsse});
$timer->{stoptime} = my_strftime("%y%m%d", $timer->{stopsse});
$timer->{sortfield} = $timer->{cdesc} . $timer->{startsse};
- $timer->{infurl} = $timer->{event_id} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s", $MyURL, $timer->{event_id}, $timer->{vdr_id}) : undef,
+ $timer->{infurl} = $timer->{event_id} ? sprintf("%s?aktion=prog_detail&amp;epg_id=%s&amp;vdr_id=%s", $MyURL, $timer->{event_id}, $timer->{vdr_id}) : undef,
$timer->{start} = my_strftime("%H:%M", $timer->{start});
$timer->{stop} = my_strftime("%H:%M", $timer->{stop});
@@ -2644,12 +2691,12 @@ sub timer_list {
my $template = TemplateNew("timer_list.html");
my $vars = {
- sortbydayurl => "$MyURL?aktion=timer_list&sortby=day&desc=$desc",
- sortbychannelurl => "$MyURL?aktion=timer_list&sortby=channel&desc=$desc",
- sortbynameurl => "$MyURL?aktion=timer_list&sortby=name&desc=$desc",
- sortbyactiveurl => "$MyURL?aktion=timer_list&sortby=active&desc=$desc",
- sortbystarturl => "$MyURL?aktion=timer_list&sortby=start&desc=$desc",
- sortbystopurl => "$MyURL?aktion=timer_list&sortby=stop&desc=$desc",
+ sortbydayurl => "$MyURL?aktion=timer_list&amp;sortby=day&amp;desc=$desc",
+ sortbychannelurl => "$MyURL?aktion=timer_list&amp;sortby=channel&amp;desc=$desc",
+ sortbynameurl => "$MyURL?aktion=timer_list&amp;sortby=name&amp;desc=$desc",
+ sortbyactiveurl => "$MyURL?aktion=timer_list&amp;sortby=active&amp;desc=$desc",
+ sortbystarturl => "$MyURL?aktion=timer_list&amp;sortby=start&amp;desc=$desc",
+ sortbystopurl => "$MyURL?aktion=timer_list&amp;sortby=stop&amp;desc=$desc",
sortbyday => ($sortby eq "day") ? 1 : 0,
sortbychannel => ($sortby eq "channel") ? 1 : 0,
sortbyname => ($sortby eq "name") ? 1 : 0,
@@ -2661,7 +2708,6 @@ sub timer_list {
timers => \@timer2,
timers2 => \@timer2,
day_loop => \@days,
- nturl => $MyURL . "?aktion=timer_new_form",
url => $MyURL,
help_url => HelpURL("timer_list"),
current => $current,
@@ -3015,19 +3061,19 @@ sub at_timer_list {
$_->{stop} = substr($_->{stop}, 0, 2) . ":" . substr($_->{stop}, 2, 5);
}
$_->{pattern} =~ s/"/\&quot;/g;
- $_->{modurl} = $MyURL . "?aktion=at_timer_edit&id=$id";
- $_->{delurl} = $MyURL . "?aktion=at_timer_delete&id=$id";
+ $_->{modurl} = $MyURL . "?aktion=at_timer_edit&amp;id=$id";
+ $_->{delurl} = $MyURL . "?aktion=at_timer_delete&amp;id=$id";
$_->{prio} = $_->{prio} ? $_->{prio} : $CONFIG{AT_PRIORITY};
$_->{lft} = $_->{lft} ? $_->{lft} : $CONFIG{AT_LIFETIME};
$_->{id} = $id;
- $_->{proglink} = sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $_->{channel});
+ $_->{proglink} = sprintf("%s?aktion=prog_list&amp;vdr_id=%s", $MyURL, $_->{channel});
$_->{channel} = GetChannelDescByNumber($_->{channel});
$_->{sortbyactive} = 1 if($sortby eq "active");
$_->{sortbychannel} = 1 if($sortby eq "channel");
$_->{sortbypattern} = 1 if($sortby eq "pattern");
$_->{sortbystart} = 1 if($sortby eq "start");
$_->{sortbystop} = 1 if($sortby eq "stop");
- $_->{toggleurl} = sprintf("%s?aktion=at_timer_toggle&active=%s&id=%s", $MyURL, ($_->{active} & 1) ? 0 : 1, $_->{id}),
+ $_->{toggleurl} = sprintf("%s?aktion=at_timer_toggle&amp;active=%s&amp;id=%s", $MyURL, ($_->{active} & 1) ? 0 : 1, $_->{id}),
push(@at, $_);
}
my @timer = sort({ lc($a->{pattern}) cmp lc($b->{pattern}) } @at);
@@ -3069,11 +3115,11 @@ sub at_timer_list {
my $template = TemplateNew("at_timer_list.html");
my $vars = {
usercss => $UserCSS,
- sortbychannelurl => "$MyURL?aktion=at_timer_list&sortby=channel&desc=$desc",
- sortbypatternurl => "$MyURL?aktion=at_timer_list&sortby=pattern&desc=$desc",
- sortbyactiveurl => "$MyURL?aktion=at_timer_list&sortby=active&desc=$desc",
- sortbystarturl => "$MyURL?aktion=at_timer_list&sortby=start&desc=$desc",
- sortbystopurl => "$MyURL?aktion=at_timer_list&sortby=stop&desc=$desc",
+ sortbychannelurl => "$MyURL?aktion=at_timer_list&amp;sortby=channel&amp;desc=$desc",
+ sortbypatternurl => "$MyURL?aktion=at_timer_list&amp;sortby=pattern&amp;desc=$desc",
+ sortbyactiveurl => "$MyURL?aktion=at_timer_list&amp;sortby=active&amp;desc=$desc",
+ sortbystarturl => "$MyURL?aktion=at_timer_list&amp;sortby=start&amp;desc=$desc",
+ sortbystopurl => "$MyURL?aktion=at_timer_list&amp;sortby=stop&amp;desc=$desc",
sortbychannel => ($sortby eq "channel") ? 1 : 0,
sortbypattern => ($sortby eq "pattern") ? 1 : 0,
sortbyactive => ($sortby eq "active") ? 1 : 0,
@@ -3082,10 +3128,7 @@ sub at_timer_list {
desc => $desc,
at_timer_loop => \@timer,
at_timer_loop2 => \@timer,
- naturl => $MyURL . "?aktion=at_timer_new",
- #naturl => $MyURL . "?aktion=at_timer_new&active=1",
url => $MyURL,
- force_update_url => "$MyURL?aktion=force_update",
help_url => HelpURL("at_timer_list")
};
$template->param($vars);
@@ -3122,9 +3165,17 @@ sub at_timer_edit {
#
my @chans;
for my $chan (@CHAN) {
- if($chan->{vdr_id}) {
- $chan->{cur} = ($chan->{vdr_id} == $at[$id-1]->{channel}) ? 1 : 0;
- push(@chans, $chan);
+ if($CONFIG{CHANNELS_WANTED_AUTOTIMER}) {
+ my $found = 0;
+ for my $n (split(",", $CONFIG{CHANNELS_WANTED})) {
+ ($found = 1) if($n eq $chan->{vdr_id});
+ }
+ next if(!$found);
+ push(@chans, $chan);
+# if($chan->{vdr_id}) {
+# $chan->{cur} = ($chan->{vdr_id} == $at[$id-1]->{channel}) ? 1 : 0;
+# push(@chans, $chan);
+# }
}
}
@@ -3164,6 +3215,17 @@ sub at_timer_edit {
}
sub at_timer_new {
+ my @chans;
+ for my $chan (@CHAN) {
+ if($CONFIG{CHANNELS_WANTED_AUTOTIMER}) {
+ my $found = 0;
+ for my $n (split(",", $CONFIG{CHANNELS_WANTED})) {
+ ($found = 1) if($n eq $chan->{vdr_id});
+ }
+ next if(!$found);
+ push(@chans, $chan);
+ }
+ }
my $template = TemplateNew("at_timer_new.html");
my $vars = {
usercss => $UserCSS,
@@ -3172,7 +3234,8 @@ sub at_timer_new {
done => $q->param("done"),
title => 1,
wday_mon => 1, wday_tue=>1, wday_wed=>1, wday_thu=>1, wday_fri=>1, wday_sat=>1, wday_sun=>1,
- channels => \@CHAN,
+ channels => \@chans,
+ #channels => \@CHAN,
prio => $CONFIG{AT_PRIORITY},
lft => $CONFIG{AT_LIFETIME},
newtimer => 1,
@@ -3384,11 +3447,11 @@ sub prog_timeline {
progname => $event->{channel_name},
summary => $event->{summary},
vdr_id => $event->{vdr_id},
- proglink => sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $event->{vdr_id}),
- switchurl=> sprintf("%s?aktion=prog_switch&channel=%s", $MyURL, $event->{vdr_id}),
- infurl => ($event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}) : undef),
- recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}),
- anchor => $event->{event_id},
+ proglink => sprintf("%s?aktion=prog_list&amp;vdr_id=%s", $MyURL, $event->{vdr_id}),
+ switchurl=> sprintf("%s?aktion=prog_switch&amp;channel=%s", $MyURL, $event->{vdr_id}),
+ infurl => ($event->{summary} ? sprintf("%s?aktion=prog_detail&amp;epg_id=%s&amp;vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}) : undef),
+ recurl => sprintf("%s?aktion=timer_new_form&amp;epg_id=%s&amp;vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}),
+ anchor => "id" . $event->{event_id},
timer => ( defined $TIM->{ $event->{title} } && $TIM->{ $event->{title} }->{vdr_id} == $event->{vdr_id} ? 1 : 0 ),
});
}
@@ -3493,16 +3556,16 @@ sub prog_summary {
next if(!$found);
}
- my $displaytext = $event->{summary};
- my $displaytitle = $event->{title};
- my $displaysubtitle = $event->{subtitle};
+ my $displaytext = CGI::escapeHTML($event->{summary});
+ my $displaytitle = CGI::escapeHTML($event->{title});
+ my $displaysubtitle = CGI::escapeHTML($event->{subtitle});
- $displaytext =~ s/\n/<br>\n/g;
- $displaytext =~ s/\|/<br>\n/g;
- $displaytitle =~ s/\n/<br>\n/g;
- $displaytitle =~ s/\|/<br>\n/g;
- $displaysubtitle =~ s/\n/<br>\n/g;
- $displaysubtitle =~ s/\|/<br>\n/g;
+ $displaytext =~ s/\n/<br \/>\n/g;
+ $displaytext =~ s/\|/<br \/>\n/g;
+ $displaytitle =~ s/\n/<br \/>\n/g;
+ $displaytitle =~ s/\|/<br \/>\n/g;
+ $displaysubtitle =~ s/\n/<br \/>\n/g;
+ $displaysubtitle =~ s/\|/<br \/>\n/g;
push(@show, {
date => my_strftime("%x", $event->{start}),
@@ -3514,13 +3577,14 @@ sub prog_summary {
progname => $event->{channel_name},
summary => $displaytext,
vdr_id => $event->{vdr_id},
- proglink => sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $event->{vdr_id}),
- switchurl => sprintf("%s?aktion=prog_switch&channel=%s", $MyURL, $event->{vdr_id}),
- streamurl => sprintf("%s?aktion=live_stream&channel=%s", $MyURL, $event->{vdr_id}),
+ proglink => sprintf("%s?aktion=prog_list&amp;vdr_id=%s", $MyURL, $event->{vdr_id}),
+ switchurl => sprintf("%s?aktion=prog_switch&amp;channel=%s", $MyURL, $event->{vdr_id}),
+ streamurl => sprintf("%s?aktion=live_stream&amp;channel=%s", $MyURL, $event->{vdr_id}),
stream_live_on => $CONFIG{ST_FUNC} && $CONFIG{ST_LIVE_ON},
- infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}) : undef,
- recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}),
- anchor => $event->{event_id}
+ infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&amp;epg_id=%s&amp;vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}) : undef,
+ recurl => sprintf("%s?aktion=timer_new_form&amp;epg_id=%s&amp;vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}),
+ find_title => uri_escape($event->{title}),
+ anchor => "id" . $event->{event_id}
});
last if(!$search);
}
@@ -3654,7 +3718,7 @@ sub rec_list {
}
if(!$found) {
push(@all_recordings, {
- name => $tmp[$i],
+ name => CGI::escapeHTML($tmp[$i]),
recording_id => $recording_id,
parent => $parent,
isfolder => 1,
@@ -3663,17 +3727,28 @@ sub rec_list {
sortbydate => ($sortby eq "date") ? 1 : 0,
sortbytime => ($sortby eq "time") ? 1 : 0,
sortbyname => ($sortby eq "name") ? 1 : 0,
- infurl => sprintf("%s?aktion=rec_list&parent=%s", $MyURL, $recording_id)
+ infurl => sprintf("%s?aktion=rec_list&amp;parent=%s", $MyURL, $recording_id)
});
}
}
#
+ my $yearofrecording;
+ if ( $VDRVERSION >= 10326 ) {
+ $yearofrecording = "20".substr($date,6,2);
+ } else {
+ # old way of vdradmin to handle the date while vdr did not report the year
+ # current year was assumed.
+ # This will fail for example for a recording on the 29.2. if the current
+ # year does not have this date
+ $yearofrecording = my_strftime("%Y");
+ } # endif
+
push(@all_recordings, {
- sse => timelocal(undef, substr($time, 3, 2), substr($time, 0, 2), substr($date, 0, 2), (substr($date, 3, 2) - 1), my_strftime("%Y")),
+ sse => timelocal(undef, substr($time, 3, 2), substr($time, 0, 2), substr($date, 0, 2), (substr($date, 3, 2)- 1), $yearofrecording),
date => $date,
time => $time,
- name => $name,
+ name => CGI::escapeHTML($name),
serie => $serie,
episode => $episode,
parent => $parent,
@@ -3682,10 +3757,10 @@ sub rec_list {
sortbydate => ($sortby eq "date") ? 1 : 0,
sortbytime => ($sortby eq "time") ? 1 : 0,
sortbyname => ($sortby eq "name") ? 1 : 0,
- delurl => $MyURL . "?aktion=rec_delete&rec_delete=y&id=$id",
- editurl => $MyURL . "?aktion=rec_edit&id=$id",
- infurl => $MyURL . "?aktion=rec_detail&id=$id",
- streamurl => $MyURL . "?aktion=rec_stream&id=$id",
+ delurl => $MyURL . "?aktion=rec_delete&amp;rec_delete=y&amp;id=$id",
+ editurl => $MyURL . "?aktion=rec_edit&amp;id=$id",
+ infurl => $MyURL . "?aktion=rec_detail&amp;id=$id",
+ streamurl => $MyURL . "?aktion=rec_stream&amp;id=$id",
stream_rec_on => $CONFIG{ST_FUNC} && $CONFIG{ST_REC_ON}
});
}
@@ -3709,8 +3784,8 @@ sub rec_list {
for my $recording (@all_recordings) {
if($recording->{recording_id} eq $rparent) {
push(@path, {
- name => $recording->{name},
- url => ($recording->{recording_id} ne $parent) ? sprintf("%s?aktion=rec_list&parent=%s", $MyURL, $recording->{recording_id}) : ""
+ name => CGI::escapeHTML($recording->{name}),
+ url => ($recording->{recording_id} ne $parent) ? sprintf("%s?aktion=rec_list&amp;parent=%s", $MyURL, $recording->{recording_id}) : ""
});
$rparent = $recording->{parent};
last;
@@ -3721,7 +3796,7 @@ sub rec_list {
}
push(@path, {
name => $MESSAGE{overview},
- url => ($parent ne 0) ? sprintf("%s?aktion=rec_list&parent=%s", $MyURL, 0) : ""
+ url => ($parent ne 0) ? sprintf("%s?aktion=rec_list&amp;parent=%s", $MyURL, 0) : ""
});
@path = reverse(@path);
@@ -3765,9 +3840,9 @@ sub rec_list {
my $vars = {
usercss => $UserCSS,
recloop => \@recordings,
- sortbydateurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=date&desc=$desc&parent=$parent",
- sortbytimeurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=time&desc=$desc&parent=$parent",
- sortbynameurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=name&desc=$desc&parent=$parent",
+ sortbydateurl => "$MyURL?aktion=rec_list&amp;parent=$parent&amp;sortby=date&amp;desc=$desc&amp;parent=$parent",
+ sortbytimeurl => "$MyURL?aktion=rec_list&amp;parent=$parent&amp;sortby=time&amp;desc=$desc&amp;parent=$parent",
+ sortbynameurl => "$MyURL?aktion=rec_list&amp;parent=$parent&amp;sortby=name&amp;desc=$desc&amp;parent=$parent",
sortbydate => ($sortby eq "date") ? 1 : 0,
sortbytime => ($sortby eq "time") ? 1 : 0,
sortbyname => ($sortby eq "name") ? 1 : 0,
@@ -3815,18 +3890,21 @@ sub rec_detail {
my $displaytext = $text;
my $displaytitle = $title;
my $displaysubtitle = $subtitle;
+ my $imdb_title = $title;
- $displaytext =~ s/\n/<br>\n/g;
- $displaytext =~ s/\|/<br>\n/g;
- $displaytitle =~ s/\n/<br>\n/g;
- $displaytitle =~ s/\|/<br>\n/g;
- $displaysubtitle =~ s/\n/<br>\n/g;
- $displaysubtitle =~ s/\|/<br>\n/g;
+ $displaytext =~ s/\n/<br \/>\n/g;
+ $displaytext =~ s/\|/<br \/>\n/g;
+ $displaytitle =~ s/\n/<br \/>\n/g;
+ $displaytitle =~ s/\|/<br \/>\n/g;
+ $displaysubtitle =~ s/\n/<br \/>\n/g;
+ $displaysubtitle =~ s/\|/<br \/>\n/g;
+ $imdb_title =~ s/^.*~\([^~]*\)/\1/;
$vars = {
text => $displaytext ? $displaytext : undef,
title => $displaytitle ? $displaytitle : undef,
- subtitle => $displaysubtitle ? $displaysubtitle : undef
+ subtitle => $displaysubtitle ? $displaysubtitle : undef,
+ imdburl => "http://akas.imdb.com/Tsearch?title=" . $imdb_title
};
} else {
my($text); my($first) = 1;
@@ -3839,7 +3917,7 @@ sub rec_detail {
$first = 0;
} else {
if($text) {
- $text .= "<br>";
+ $text .= "<br \/>";
}
$text .= "$_ ";
}
@@ -3847,10 +3925,15 @@ sub rec_detail {
}
}
+printf("TITLE: $title\n");
+ my $imdb_title = $title;
+ $imdb_title =~ s/^.*\~//;
$title =~ s/\~/ - /g;
+printf("IMDBTITLE: " . $imdb_title . "\n");
$vars = {
usercss => $UserCSS,
text => $text ? $text : "",
+ imdburl => "http://akas.imdb.com/Tsearch?title=" . $imdb_title,
title => $title
};
}
@@ -4166,7 +4249,8 @@ sub show_help {
#############################################################################
sub grab_picture {
my $size = $q->param("size");
- my $file = new File::Temp("vdr-XXXXX", UNLINK => 1, SUFFIX => ".jpg");
+ my $file = new File::Temp(TEMPLATE => "vdr-XXXXX", DIR => File::Spec->tmpdir(), UNLINK => 1, SUFFIX => ".jpg");
+ chmod 0666,$file;
my $maxwidth = 768;
my $maxheight = 576;
my($width, $height);
@@ -4347,7 +4431,7 @@ sub command {
if($SOCKET) {
my $result = send($SOCKET, $cmd, 0);
if($result != length($cmd)) {
- main::HTMLError($ERROR_MESSAGE{send_command}, $CONFIG{VDR_HOST});
+ main::HTMLError(sprintf($ERROR_MESSAGE{send_command}, $CONFIG{VDR_HOST}));
} else {
$query = true;
}
diff --git a/vdradmind.pl.1 b/vdradmind.pl.1
index f64da84..29f21bb 100644
--- a/vdradmind.pl.1
+++ b/vdradmind.pl.1
@@ -17,7 +17,7 @@ By default
.B vdradmind.pl
will listen on port 8001.
.PP
-.B Note: Your VDR must be configured to be accesable vie SVDRP from the machine, you run vdradmind.pl from.
+.B Note: Your VDR must be configured to be accessible via SVDRP from the machine, you run vdradmind.pl from.
.SH OPTIONS