diff options
| author | Andreas Mair <amair.sob@googlemail.com> | 2006-03-08 11:34:02 +0100 |
|---|---|---|
| committer | Andreas Mair <amair.sob@googlemail.com> | 2006-03-08 11:34:02 +0100 |
| commit | 2723bd07c1a821c2198f43a313570c600907c327 (patch) | |
| tree | feece2d6565c4f8508dfd2cf8aedc2e07959d25c | |
| parent | fd84627622f927bb6bf6f5c5d9e02295355a22c3 (diff) | |
| download | vdradmin-am-3.4.4beta.tar.gz vdradmin-am-3.4.4beta.tar.bz2 | |
2006-03-08: 3.4.4betav3.4.4beta
- Added script "convert.sh" to convert the AutoTimer information in VDR's timers.conf to the new format (see "convert.sh" for usage).
- Use the summary/aux timer field to store AutoTimer information to be compatible to VDR v1.3.44 and later.
- Removed "Add summary to new timers" option. The EPG summary is no longer copied to the timer's summary/aux field (for VDR 1.3.44+) or always copied (VDR 1.3.43-).
- Made summary textfield readonly while adding/editing a timer.
- Unless NO_EVENTID or NO_EVENTID_ON is used the EPG-ID is stored in every (auto)timer set using VDRAdmin-AM.
- For every timer the current start/stop margins are saved in its summary/aux field. These are used for checking AutoTimers by time.
- Fixed bug while checking for already programmed (auto)timers if not using EPG-ID.
| -rw-r--r-- | HISTORY | 17 | ||||
| l--------- | contrib/udpc.pl (renamed from udpc.pl) | 0 | ||||
| -rwxr-xr-x | contrib/udpd.pl (renamed from udpd.pl) | 0 | ||||
| -rwxr-xr-x | convert.pl | 64 | ||||
| -rw-r--r-- | locale/de/LC_MESSAGES/vdradmin.mo | bin | 60452 -> 60491 bytes | |||
| -rw-r--r-- | locale/es/LC_MESSAGES/vdradmin.mo | bin | 58595 -> 58595 bytes | |||
| -rw-r--r-- | locale/fi/LC_MESSAGES/vdradmin.mo | bin | 13912 -> 13912 bytes | |||
| -rw-r--r-- | locale/fr/LC_MESSAGES/vdradmin.mo | bin | 34108 -> 34108 bytes | |||
| -rw-r--r-- | locale/nl/LC_MESSAGES/vdradmin.mo | bin | 58282 -> 58282 bytes | |||
| -rw-r--r-- | po/de.po | 116 | ||||
| -rw-r--r-- | po/es.po | 116 | ||||
| -rw-r--r-- | po/fi.po | 116 | ||||
| -rw-r--r-- | po/fr.po | 116 | ||||
| -rw-r--r-- | po/nl.po | 116 | ||||
| -rw-r--r-- | po/vdradmin.pot | 116 | ||||
| -rw-r--r-- | template/default/config.html | 4 | ||||
| -rw-r--r-- | template/default/copper/style.css | 1 | ||||
| -rw-r--r-- | template/default/default/style.css | 7 | ||||
| -rw-r--r-- | template/default/help_config.html | 4 | ||||
| -rw-r--r-- | template/default/style.css | 3 | ||||
| -rw-r--r-- | template/default/timer_list.html | 2 | ||||
| -rw-r--r-- | template/default/timer_new.html | 13 | ||||
| -rwxr-xr-x | vdradmind.pl | 366 |
23 files changed, 644 insertions, 533 deletions
@@ -4,18 +4,21 @@ E-Mail: mail AT andreas DOT vdr-developer DOT org VDR-Portal: amair ----------------------------------------------------------- -2006-03-02: 3.4.3a +2006-03-08: 3.4.4beta +- Added script "convert.sh" to convert the AutoTimer information in VDR's timers.conf to the new format (see "convert.sh" for usage). +- Use the summary/aux timer field to store AutoTimer information to be compatible to VDR v1.3.44 and later. +- Removed "Add summary to new timers" option. The EPG summary is no longer copied to the timer's summary/aux field (for VDR 1.3.44+) or always copied (VDR 1.3.43-). +- Made summary textfield readonly while adding/editing a timer. +- Unless NO_EVENTID or NO_EVENTID_ON is used the EPG-ID is stored in every (auto)timer set using VDRAdmin-AM. +- For every timer the current start/stop margins are saved in its summary/aux field. These are used for checking AutoTimers by time. +- Fixed bug while checking for already programmed (auto)timers if not using EPG-ID. + 2006-03-01: 3.4.3 -- **************************************************** - ** This release is not compatible to VDR >=1.3.44 ** - **************************************************** -- Show TV noise if grabbing fails (only VDR >= v1.3.38). -- Fixed: don't crash (on LinVDR) if AutoTimer email notification is enabled but Net::SMTP is missing (Reported by Foobar42). -- Fixed: testing an AutoTimer that is edited (not newly added) lead to a new AutoTimer instead of replacing the old one. - Don't show streaming button in prog_summary if event is currently not broadcasted (Requested by Hardy Flor). - Show search pattern in prog_summary instead of current time (Reported by Hardy Flor). - Send correct encoded emails for AutoTimer notifications (Thanks a lot to Ferdinand Grassmann for reporting/ideas/testing). - Do not program timers in the past (Reported by Ferdinand Grassmann). +- Send default image if TV grabbing fails. - Fixed "Length of base64 data not a multiple of 4" warning (Reported by Johan Larsson). 2006-02-10: 3.4.3rc3 diff --git a/udpc.pl b/contrib/udpc.pl index 7888567..7888567 120000 --- a/udpc.pl +++ b/contrib/udpc.pl diff --git a/udpd.pl b/contrib/udpd.pl index c4a38f1..c4a38f1 100755 --- a/udpd.pl +++ b/contrib/udpd.pl diff --git a/convert.pl b/convert.pl new file mode 100755 index 0000000..84303f0 --- /dev/null +++ b/convert.pl @@ -0,0 +1,64 @@ +#!/usr/bin/perl + +use strict; + +if(scalar(@ARGV) != 3) { + print("Usage: convert.pl <vdradmin-am config> <timers in> <timers out>\n"); + print("\t<vdradmin-am config> VDRAdmin-AM's vdradmind.conf\n"); + print("\t<timers in> Source timers.conf\n"); + print("\t<timers out> Destination timers.conf\n"); + exit 1; +} + +my %CONFIG; +my $CONFFILE = @ARGV[0]; +my $timers_in = @ARGV[1]; +my $timers_out = @ARGV[2]; + +ReadConfig(); + +print("Converting $timers_in to $timers_out\n"); +my $in = open(FH_IN, "<$timers_in") if(-e "$timers_in"); +my $out = open(FH_OUT, ">$timers_out"); +if($in and $out) { + while(<FH_IN>) { + chomp; + s/#.*//; + s/^\s+//; + s/\s+$//; + next unless length; + my ($status, $channel, $day, $start, $stop, $priority, $lifetime, $file, $aux) = split(":", $_); + my $autotimer = 1 if($status & 0x8000); + my $active = $status & 0x7FFF; + my $event_id = $status >> 16; + if($autotimer) { + $autotimer = 2 if($event_id); + $aux .= "|" if($aux); + $aux .= "<vdradmin-am><epgid>$event_id</epg_id><autotimer>$autotimer</autotimer><bstart>$CONFIG{TM_MARGIN_BEGIN}</bstart><bstop>$CONFIG{TM_MARGIN_END}</bstop></vdradmin-am>"; + } + print(FH_OUT "$active:$channel:$day:$start:$stop:$priority:$lifetime:$file:$aux\n"); + } + close(FH_IN); + close(FH_OUT); + print("\nNOTE:\n"); + print("Please check the new timers.conf for errors before replacing the old timers.conf!\n"); +} else { + print("Failed to open files!\n"); + exit 1; +} + +sub ReadConfig { + if(-e $CONFFILE) { + open(CONF, $CONFFILE); + while(<CONF>) { + chomp; + my($key, $value) = split(/ \= /, $_, 2); + $CONFIG{$key} = $value; + } + close(CONF); + } else { + print "$CONFFILE doesn't exist. Exiting\n"; + exit(1); + } + return(0); +} diff --git a/locale/de/LC_MESSAGES/vdradmin.mo b/locale/de/LC_MESSAGES/vdradmin.mo Binary files differindex bff08ec..9f0f328 100644 --- a/locale/de/LC_MESSAGES/vdradmin.mo +++ b/locale/de/LC_MESSAGES/vdradmin.mo diff --git a/locale/es/LC_MESSAGES/vdradmin.mo b/locale/es/LC_MESSAGES/vdradmin.mo Binary files differindex c71c6e3..c5ef15f 100644 --- a/locale/es/LC_MESSAGES/vdradmin.mo +++ b/locale/es/LC_MESSAGES/vdradmin.mo diff --git a/locale/fi/LC_MESSAGES/vdradmin.mo b/locale/fi/LC_MESSAGES/vdradmin.mo Binary files differindex 5eb3e1b..49c1327 100644 --- a/locale/fi/LC_MESSAGES/vdradmin.mo +++ b/locale/fi/LC_MESSAGES/vdradmin.mo diff --git a/locale/fr/LC_MESSAGES/vdradmin.mo b/locale/fr/LC_MESSAGES/vdradmin.mo Binary files differindex bcff654..68ebd8d 100644 --- a/locale/fr/LC_MESSAGES/vdradmin.mo +++ b/locale/fr/LC_MESSAGES/vdradmin.mo diff --git a/locale/nl/LC_MESSAGES/vdradmin.mo b/locale/nl/LC_MESSAGES/vdradmin.mo Binary files differindex b163479..eeedc1a 100644 --- a/locale/nl/LC_MESSAGES/vdradmin.mo +++ b/locale/nl/LC_MESSAGES/vdradmin.mo @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-01 08:07+0100\n" +"POT-Creation-Date: 2006-03-08 11:04+0100\n" "PO-Revision-Date: 2006-01-19 14:49+0100\n" "Last-Translator: Andreas Mair <mail@andreas.vdr-developer.org>\n" "Language-Team: <LL.org>\n" @@ -114,94 +114,94 @@ msgstr "Nein" msgid "AutoTimer Checking:" msgstr "Automatische Timer-Überwachung:" -#: ../template/default/timer_new.html:85 +#: ../template/default/timer_new.html:86 #: ../template/default/help_timer_new.html:39 msgid "Transmission Identification" msgstr "Sendungskennung" -#: ../template/default/timer_new.html:87 ../template/default/rec_list.html:70 +#: ../template/default/timer_new.html:88 ../template/default/rec_list.html:70 #: ../template/default/help_timer_new.html:41 msgid "Time" msgstr "Uhrzeit" -#: ../template/default/timer_new.html:88 ../template/default/tv.html:197 +#: ../template/default/timer_new.html:89 ../template/default/tv.html:197 #: ../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/timer_new.html:95 ../template/default/prog_list.html:27 #: ../template/default/help_timer_new.html:47 #: ../template/default/help_at_timer_new.html:46 #: ../template/default/at_timer_new.html:93 msgid "Channel:" msgstr "Sender:" -#: ../template/default/timer_new.html:106 +#: ../template/default/timer_new.html:107 #: ../template/default/help_timer_new.html:49 msgid "Day Of Recording:" msgstr "Tag der Aufnahme:" -#: ../template/default/timer_new.html:110 +#: ../template/default/timer_new.html:111 #: ../template/default/at_timer_new.html:81 msgid "Monday" msgstr "Montag" -#: ../template/default/timer_new.html:111 +#: ../template/default/timer_new.html:112 #: ../template/default/at_timer_new.html:82 msgid "Tuesday" msgstr "Dienstag" -#: ../template/default/timer_new.html:112 +#: ../template/default/timer_new.html:113 #: ../template/default/at_timer_new.html:83 msgid "Wednesday" msgstr "Mittwoch" -#: ../template/default/timer_new.html:113 +#: ../template/default/timer_new.html:114 #: ../template/default/at_timer_new.html:84 msgid "Thursday" msgstr "Donnerstag" -#: ../template/default/timer_new.html:114 +#: ../template/default/timer_new.html:115 #: ../template/default/at_timer_new.html:85 msgid "Friday" msgstr "Freitag" -#: ../template/default/timer_new.html:115 +#: ../template/default/timer_new.html:116 #: ../template/default/at_timer_new.html:86 msgid "Saturday" msgstr "Samstag" -#: ../template/default/timer_new.html:116 +#: ../template/default/timer_new.html:117 #: ../template/default/at_timer_new.html:87 msgid "Sunday" msgstr "Sonntag" -#: ../template/default/timer_new.html:122 +#: ../template/default/timer_new.html:123 #: ../template/default/help_timer_new.html:57 msgid "Start Time:" msgstr "Startzeit:" -#: ../template/default/timer_new.html:127 -#: ../template/default/timer_new.html:138 +#: ../template/default/timer_new.html:128 +#: ../template/default/timer_new.html:139 #: ../template/default/prog_summary.html:26 #: ../template/default/prog_timeline.html:95 #: ../template/default/prog_timeline.html:108 #: ../template/default/prog_timeline.html:123 #: ../template/default/at_timer_new.html:111 -#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3908 +#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3925 msgid "o'clock" msgstr "Uhr" -#: ../template/default/timer_new.html:133 +#: ../template/default/timer_new.html:134 #: ../template/default/help_timer_new.html:59 msgid "End Time:" msgstr "Endzeit:" -#: ../template/default/timer_new.html:144 +#: ../template/default/timer_new.html:145 msgid "Use VPS:" msgstr "VPS verwenden:" -#: ../template/default/timer_new.html:150 +#: ../template/default/timer_new.html:151 #: ../template/default/at_timer_list.html:24 #: ../template/default/config.html:279 ../template/default/config.html:371 #: ../template/default/timer_list.html:27 @@ -213,7 +213,7 @@ msgstr "VPS verwenden:" msgid "Priority:" msgstr "Priorität:" -#: ../template/default/timer_new.html:156 +#: ../template/default/timer_new.html:157 #: ../template/default/at_timer_list.html:24 #: ../template/default/config.html:285 ../template/default/config.html:377 #: ../template/default/timer_list.html:27 @@ -225,22 +225,26 @@ msgstr "Priorität:" msgid "Lifetime:" msgstr "Lebenszeit:" -#: ../template/default/timer_new.html:162 +#: ../template/default/timer_new.html:163 #: ../template/default/help_timer_new.html:65 msgid "Title of Recording:" msgstr "Titel der Aufnahme:" -#: ../template/default/timer_new.html:168 ../template/default/rec_edit.html:57 +#: ../template/default/timer_new.html:169 ../template/default/rec_edit.html:57 #: ../template/default/help_timer_new.html:67 msgid "Summary:" msgstr "Zusammenfassung:" -#: ../template/default/timer_new.html:180 ../template/default/config.html:659 +#: ../template/default/timer_new.html:169 +msgid "readonly" +msgstr "unveränderbar" + +#: ../template/default/timer_new.html:181 ../template/default/config.html:659 #: ../template/default/at_timer_new.html:176 msgid "Save" msgstr "Speichern" -#: ../template/default/timer_new.html:181 ../template/default/rec_edit.html:70 +#: ../template/default/timer_new.html:182 ../template/default/rec_edit.html:70 #: ../template/default/at_timer_new.html:178 msgid "Cancel" msgstr "Abbrechen" @@ -355,7 +359,7 @@ msgstr "Ausgewählte Timer wirklich löschen?" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../vdradmind.pl:4483 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4500 msgid "What's On Now?" msgstr "Was läuft jetzt?" @@ -480,7 +484,7 @@ msgstr "Gast Passwort:" #: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../vdradmind.pl:4485 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4502 msgid "Timeline" msgstr "Zeitleiste" @@ -754,7 +758,7 @@ msgid "Delete Selected Timers" msgstr "Ausgewählte Timer löschen" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../vdradmind.pl:4486 +#: ../vdradmind.pl:4503 msgid "Channels" msgstr "Programmübersicht" @@ -820,7 +824,7 @@ msgstr "Film in der Internet-Movie-Database (IMDb) suchen" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../vdradmind.pl:4488 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4505 msgid "Recordings" msgstr "Aufnahmen" @@ -1310,7 +1314,7 @@ msgid "to" msgstr "bis" #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2565 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2601 msgid "Playing Today" msgstr "Was läuft heute?" @@ -2016,116 +2020,116 @@ msgstr "Deutsch:" msgid "Spanish:" msgstr "Spanisch:" -#: ../vdradmind.pl:289 +#: ../vdradmind.pl:292 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:290 +#: ../vdradmind.pl:293 msgid "On which port does VDR listen to SVDRP queries?" msgstr "Auf welchem Port hört der VDR auf SVDRP-Anfragen?" -#: ../vdradmind.pl:291 +#: ../vdradmind.pl:294 msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?" msgstr "" "An welcher Adresse soll VDRAdmin-AM auf Verbindungen warten (0.0.0.0 für " "alle)?" -#: ../vdradmind.pl:292 +#: ../vdradmind.pl:295 msgid "On which port should VDRAdmin-AM listen?" msgstr "Auf welchem Port soll VDRAdmin-AM hören?" -#: ../vdradmind.pl:293 +#: ../vdradmind.pl:296 msgid "Username?" msgstr "Benutzername?" -#: ../vdradmind.pl:294 +#: ../vdradmind.pl:297 msgid "Password?" msgstr "Passwort?" -#: ../vdradmind.pl:295 +#: ../vdradmind.pl:298 msgid "Where are your recordings stored?" msgstr "Wo befinden sich die Aufnahmen?" -#: ../vdradmind.pl:296 +#: ../vdradmind.pl:299 msgid "Where are your VDR's configuration files located?" msgstr "Wo befinden sich die Konfigurationsdateien des VDR?" -#: ../vdradmind.pl:302 +#: ../vdradmind.pl:305 msgid "Config file written successfully." msgstr "Konfigurationsdatei wurde erfolgreich geschrieben." -#: ../vdradmind.pl:354 +#: ../vdradmind.pl:357 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s wurde mit der Prozeß-ID %d gestartet." -#: ../vdradmind.pl:408 ../vdradmind.pl:1000 ../vdradmind.pl:1865 +#: ../vdradmind.pl:411 ../vdradmind.pl:1003 ../vdradmind.pl:1916 msgid "Not found" msgstr "Nicht gefunden" -#: ../vdradmind.pl:408 ../vdradmind.pl:1866 +#: ../vdradmind.pl:411 ../vdradmind.pl:1917 msgid "The requested URL was not found on this server!" msgstr "Die angeforderte URL konnte auf dem Server nicht gefunden werden!" -#: ../vdradmind.pl:476 ../vdradmind.pl:996 ../vdradmind.pl:1868 +#: ../vdradmind.pl:479 ../vdradmind.pl:999 ../vdradmind.pl:1919 msgid "Forbidden" msgstr "Verboten" -#: ../vdradmind.pl:476 ../vdradmind.pl:1869 +#: ../vdradmind.pl:479 ../vdradmind.pl:1920 msgid "You don't have permission to access this function!" msgstr "Sie haben nicht die Erlaubnis diese Funktion aufzurufen!" -#: ../vdradmind.pl:996 ../vdradmind.pl:1870 +#: ../vdradmind.pl:999 ../vdradmind.pl:1921 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Zugriff auf Datei \"%s\" verweigert!" -#: ../vdradmind.pl:1000 ../vdradmind.pl:1867 +#: ../vdradmind.pl:1003 ../vdradmind.pl:1918 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "Die URL \"%s\" wurde auf dem Server nicht gefunden!" -#: ../vdradmind.pl:1871 +#: ../vdradmind.pl:1922 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Kann Datei \"%s\" nicht öffnen!" -#: ../vdradmind.pl:1872 +#: ../vdradmind.pl:1923 #, perl-format msgid "Can't connect to VDR at %s!" msgstr "Konnte Verbindung zu %s nicht aufbauen!" -#: ../vdradmind.pl:1873 +#: ../vdradmind.pl:1924 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Fehler beim Senden eines Kommandos zu %s" -#: ../vdradmind.pl:2565 +#: ../vdradmind.pl:2601 msgid "Playing Tomorrow" msgstr "Was läuft morgen" -#: ../vdradmind.pl:2565 +#: ../vdradmind.pl:2601 #, perl-format msgid "Playing on the %d." msgstr "Was läuft am %d." -#: ../vdradmind.pl:3908 +#: ../vdradmind.pl:3925 msgid "Suitable matches for:" msgstr "Suchergebnis für" -#: ../vdradmind.pl:3963 +#: ../vdradmind.pl:3980 msgid "Schedule" msgstr "Übersicht" -#: ../vdradmind.pl:4484 +#: ../vdradmind.pl:4501 msgid "Playing Today?" msgstr "Was läuft heute?" -#: ../vdradmind.pl:4487 +#: ../vdradmind.pl:4504 msgid "Timers" msgstr "Timer" -#: ../vdradmind.pl:4550 +#: ../vdradmind.pl:4567 msgid "System default" msgstr "Systemstandard" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-01 08:07+0100\n" +"POT-Creation-Date: 2006-03-08 11:04+0100\n" "PO-Revision-Date: 2006-02-28 19:15+0100\n" "Last-Translator: rudibert <r_jung@web.de>\n" "Language-Team: Rudi <LL.org>\n" @@ -118,94 +118,94 @@ msgstr "No" msgid "AutoTimer Checking:" msgstr "Autovigilancia de las programaciones:" -#: ../template/default/timer_new.html:85 +#: ../template/default/timer_new.html:86 #: ../template/default/help_timer_new.html:39 msgid "Transmission Identification" msgstr "Identificador de la emisora" -#: ../template/default/timer_new.html:87 ../template/default/rec_list.html:70 +#: ../template/default/timer_new.html:88 ../template/default/rec_list.html:70 #: ../template/default/help_timer_new.html:41 msgid "Time" msgstr "hora" -#: ../template/default/timer_new.html:88 ../template/default/tv.html:197 +#: ../template/default/timer_new.html:89 ../template/default/tv.html:197 #: ../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/timer_new.html:95 ../template/default/prog_list.html:27 #: ../template/default/help_timer_new.html:47 #: ../template/default/help_at_timer_new.html:46 #: ../template/default/at_timer_new.html:93 msgid "Channel:" msgstr "Emisora:" -#: ../template/default/timer_new.html:106 +#: ../template/default/timer_new.html:107 #: ../template/default/help_timer_new.html:49 msgid "Day Of Recording:" msgstr "Día de la grabación:" -#: ../template/default/timer_new.html:110 +#: ../template/default/timer_new.html:111 #: ../template/default/at_timer_new.html:81 msgid "Monday" msgstr "Lunes" -#: ../template/default/timer_new.html:111 +#: ../template/default/timer_new.html:112 #: ../template/default/at_timer_new.html:82 msgid "Tuesday" msgstr "Martes" -#: ../template/default/timer_new.html:112 +#: ../template/default/timer_new.html:113 #: ../template/default/at_timer_new.html:83 msgid "Wednesday" msgstr "Miércoles" -#: ../template/default/timer_new.html:113 +#: ../template/default/timer_new.html:114 #: ../template/default/at_timer_new.html:84 msgid "Thursday" msgstr "Jueves" -#: ../template/default/timer_new.html:114 +#: ../template/default/timer_new.html:115 #: ../template/default/at_timer_new.html:85 msgid "Friday" msgstr "Viernes" -#: ../template/default/timer_new.html:115 +#: ../template/default/timer_new.html:116 #: ../template/default/at_timer_new.html:86 msgid "Saturday" msgstr "Sábado" -#: ../template/default/timer_new.html:116 +#: ../template/default/timer_new.html:117 #: ../template/default/at_timer_new.html:87 msgid "Sunday" msgstr "Domingo" -#: ../template/default/timer_new.html:122 +#: ../template/default/timer_new.html:123 #: ../template/default/help_timer_new.html:57 msgid "Start Time:" msgstr "Comienzo:" -#: ../template/default/timer_new.html:127 -#: ../template/default/timer_new.html:138 +#: ../template/default/timer_new.html:128 +#: ../template/default/timer_new.html:139 #: ../template/default/prog_summary.html:26 #: ../template/default/prog_timeline.html:95 #: ../template/default/prog_timeline.html:108 #: ../template/default/prog_timeline.html:123 #: ../template/default/at_timer_new.html:111 -#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3908 +#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3925 msgid "o'clock" msgstr "h." -#: ../template/default/timer_new.html:133 +#: ../template/default/timer_new.html:134 #: ../template/default/help_timer_new.html:59 msgid "End Time:" msgstr "Fin:" -#: ../template/default/timer_new.html:144 +#: ../template/default/timer_new.html:145 msgid "Use VPS:" msgstr "Utiliza VPS:" -#: ../template/default/timer_new.html:150 +#: ../template/default/timer_new.html:151 #: ../template/default/at_timer_list.html:24 #: ../template/default/config.html:279 ../template/default/config.html:371 #: ../template/default/timer_list.html:27 @@ -217,7 +217,7 @@ msgstr "Utiliza VPS:" msgid "Priority:" msgstr "Prioridad:" -#: ../template/default/timer_new.html:156 +#: ../template/default/timer_new.html:157 #: ../template/default/at_timer_list.html:24 #: ../template/default/config.html:285 ../template/default/config.html:377 #: ../template/default/timer_list.html:27 @@ -229,22 +229,26 @@ msgstr "Prioridad:" msgid "Lifetime:" msgstr "Durabilidad:" -#: ../template/default/timer_new.html:162 +#: ../template/default/timer_new.html:163 #: ../template/default/help_timer_new.html:65 msgid "Title of Recording:" msgstr "Título de la grabación:" -#: ../template/default/timer_new.html:168 ../template/default/rec_edit.html:57 +#: ../template/default/timer_new.html:169 ../template/default/rec_edit.html:57 #: ../template/default/help_timer_new.html:67 msgid "Summary:" msgstr "Resumen:" -#: ../template/default/timer_new.html:180 ../template/default/config.html:659 +#: ../template/default/timer_new.html:169 +msgid "readonly" +msgstr "" + +#: ../template/default/timer_new.html:181 ../template/default/config.html:659 #: ../template/default/at_timer_new.html:176 msgid "Save" msgstr "Guardar" -#: ../template/default/timer_new.html:181 ../template/default/rec_edit.html:70 +#: ../template/default/timer_new.html:182 ../template/default/rec_edit.html:70 #: ../template/default/at_timer_new.html:178 msgid "Cancel" msgstr "Cancelar" @@ -360,7 +364,7 @@ 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:30 ../vdradmind.pl:4483 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4500 msgid "What's On Now?" msgstr "Estrenos ahora" @@ -485,7 +489,7 @@ msgstr "Contraseña como invitado:" #: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../vdradmind.pl:4485 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4502 msgid "Timeline" msgstr "Tabla de tiempo" @@ -760,7 +764,7 @@ msgid "Delete Selected Timers" msgstr "Borrar programaciones elegidas" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../vdradmind.pl:4486 +#: ../vdradmind.pl:4503 msgid "Channels" msgstr "EPG por emisoras" @@ -826,7 +830,7 @@ msgstr "Buscar la película en la base de datos de películas en Internet (IMDb)" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../vdradmind.pl:4488 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4505 msgid "Recordings" msgstr "Grabaciones" @@ -1310,7 +1314,7 @@ msgid "to" msgstr "hasta" #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2565 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2601 msgid "Playing Today" msgstr "Estrenos hoy" @@ -2045,113 +2049,113 @@ msgstr "Alemán:" msgid "Spanish:" msgstr "Español:" -#: ../vdradmind.pl:289 +#: ../vdradmind.pl:292 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:290 +#: ../vdradmind.pl:293 msgid "On which port does VDR listen to SVDRP queries?" msgstr "¿Cuál puerto esta vigilando VDR para requeridas de SVDRP?" -#: ../vdradmind.pl:291 +#: ../vdradmind.pl:294 msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?" msgstr "¿En qué dirección debe VDRAdmin-AM escuchar (0.0.0.0 para todas)?" -#: ../vdradmind.pl:292 +#: ../vdradmind.pl:295 msgid "On which port should VDRAdmin-AM listen?" msgstr "¿Qué puerto debe VDRAdmin-AM esperar órdenes?" -#: ../vdradmind.pl:293 +#: ../vdradmind.pl:296 msgid "Username?" msgstr "¿Nombre del usuario?" -#: ../vdradmind.pl:294 +#: ../vdradmind.pl:297 msgid "Password?" msgstr "¿Contraseña?" -#: ../vdradmind.pl:295 +#: ../vdradmind.pl:298 msgid "Where are your recordings stored?" msgstr "Introduce la ruta de las grabaciones:" -#: ../vdradmind.pl:296 +#: ../vdradmind.pl:299 msgid "Where are your VDR's configuration files located?" msgstr "Introduce la ruta de los archivos de configuración:" -#: ../vdradmind.pl:302 +#: ../vdradmind.pl:305 msgid "Config file written successfully." msgstr "¡Los archivos de configuración han creado!" -#: ../vdradmind.pl:354 +#: ../vdradmind.pl:357 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s se ha iniciado con pid %d." -#: ../vdradmind.pl:408 ../vdradmind.pl:1000 ../vdradmind.pl:1865 +#: ../vdradmind.pl:411 ../vdradmind.pl:1003 ../vdradmind.pl:1916 msgid "Not found" msgstr "No encontrado" -#: ../vdradmind.pl:408 ../vdradmind.pl:1866 +#: ../vdradmind.pl:411 ../vdradmind.pl:1917 msgid "The requested URL was not found on this server!" msgstr "¡No encontrado la URL requerida, en el servidor!" -#: ../vdradmind.pl:476 ../vdradmind.pl:996 ../vdradmind.pl:1868 +#: ../vdradmind.pl:479 ../vdradmind.pl:999 ../vdradmind.pl:1919 msgid "Forbidden" msgstr "Prohibido" -#: ../vdradmind.pl:476 ../vdradmind.pl:1869 +#: ../vdradmind.pl:479 ../vdradmind.pl:1920 msgid "You don't have permission to access this function!" msgstr "¡No tienes permiso para ésta funcción!" -#: ../vdradmind.pl:996 ../vdradmind.pl:1870 +#: ../vdradmind.pl:999 ../vdradmind.pl:1921 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "¡Acceso al archivo \"%s\" negado!" -#: ../vdradmind.pl:1000 ../vdradmind.pl:1867 +#: ../vdradmind.pl:1003 ../vdradmind.pl:1918 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "¡No encontrado la URL %s en el servidor!" -#: ../vdradmind.pl:1871 +#: ../vdradmind.pl:1922 #, perl-format msgid "Can't open file \"%s\"!" msgstr "¡No se pudo abrir el archivo \"%s\" !" -#: ../vdradmind.pl:1872 +#: ../vdradmind.pl:1923 #, perl-format msgid "Can't connect to VDR at %s!" msgstr "¡No se pudo estabilizar la conexión a %s!" -#: ../vdradmind.pl:1873 +#: ../vdradmind.pl:1924 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Error mientras mandó el orden a %s " -#: ../vdradmind.pl:2565 +#: ../vdradmind.pl:2601 msgid "Playing Tomorrow" msgstr "Estrenos mañana" -#: ../vdradmind.pl:2565 +#: ../vdradmind.pl:2601 #, perl-format msgid "Playing on the %d." msgstr "Estrenos en %d" -#: ../vdradmind.pl:3908 +#: ../vdradmind.pl:3925 msgid "Suitable matches for:" msgstr "Emparejamientos convenientes para:" -#: ../vdradmind.pl:3963 +#: ../vdradmind.pl:3980 msgid "Schedule" msgstr "Vista general" -#: ../vdradmind.pl:4484 +#: ../vdradmind.pl:4501 msgid "Playing Today?" msgstr "¿Estrenos hoy?" -#: ../vdradmind.pl:4487 +#: ../vdradmind.pl:4504 msgid "Timers" msgstr "Programaciones" -#: ../vdradmind.pl:4550 +#: ../vdradmind.pl:4567 msgid "System default" msgstr "Defecto del sistema" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-01 08:07+0100\n" +"POT-Creation-Date: 2006-03-08 11:04+0100\n" "PO-Revision-Date: 2006-01-18 12:36+0200\n" "Last-Translator: Rofa\n" "Language-Team: Suomi\n" @@ -106,94 +106,94 @@ msgstr "Ei" msgid "AutoTimer Checking:" msgstr "Hakuajastimen tarkistus:" -#: ../template/default/timer_new.html:85 +#: ../template/default/timer_new.html:86 #: ../template/default/help_timer_new.html:39 msgid "Transmission Identification" msgstr "Lähetteen tunniste" -#: ../template/default/timer_new.html:87 ../template/default/rec_list.html:70 +#: ../template/default/timer_new.html:88 ../template/default/rec_list.html:70 #: ../template/default/help_timer_new.html:41 msgid "Time" msgstr "Aika" -#: ../template/default/timer_new.html:88 ../template/default/tv.html:197 +#: ../template/default/timer_new.html:89 ../template/default/tv.html:197 #: ../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/timer_new.html:95 ../template/default/prog_list.html:27 #: ../template/default/help_timer_new.html:47 #: ../template/default/help_at_timer_new.html:46 #: ../template/default/at_timer_new.html:93 msgid "Channel:" msgstr "Kanava:" -#: ../template/default/timer_new.html:106 +#: ../template/default/timer_new.html:107 #: ../template/default/help_timer_new.html:49 msgid "Day Of Recording:" msgstr "Päivä:" -#: ../template/default/timer_new.html:110 +#: ../template/default/timer_new.html:111 #: ../template/default/at_timer_new.html:81 msgid "Monday" msgstr "Maanantai" -#: ../template/default/timer_new.html:111 +#: ../template/default/timer_new.html:112 #: ../template/default/at_timer_new.html:82 msgid "Tuesday" msgstr "Tiistai" -#: ../template/default/timer_new.html:112 +#: ../template/default/timer_new.html:113 #: ../template/default/at_timer_new.html:83 msgid "Wednesday" msgstr "Keskiviikko" -#: ../template/default/timer_new.html:113 +#: ../template/default/timer_new.html:114 #: ../template/default/at_timer_new.html:84 msgid "Thursday" msgstr "Torstai" -#: ../template/default/timer_new.html:114 +#: ../template/default/timer_new.html:115 #: ../template/default/at_timer_new.html:85 msgid "Friday" msgstr "Perjantai" -#: ../template/default/timer_new.html:115 +#: ../template/default/timer_new.html:116 #: ../template/default/at_timer_new.html:86 msgid "Saturday" msgstr "Lauantai" -#: ../template/default/timer_new.html:116 +#: ../template/default/timer_new.html:117 #: ../template/default/at_timer_new.html:87 msgid "Sunday" msgstr "Sunnuntai" -#: ../template/default/timer_new.html:122 +#: ../template/default/timer_new.html:123 #: ../template/default/help_timer_new.html:57 msgid "Start Time:" msgstr "Aloitusaika:" -#: ../template/default/timer_new.html:127 -#: ../template/default/timer_new.html:138 +#: ../template/default/timer_new.html:128 +#: ../template/default/timer_new.html:139 #: ../template/default/prog_summary.html:26 #: ../template/default/prog_timeline.html:95 #: ../template/default/prog_timeline.html:108 #: ../template/default/prog_timeline.html:123 #: ../template/default/at_timer_new.html:111 -#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3908 +#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3925 msgid "o'clock" msgstr " " -#: ../template/default/timer_new.html:133 +#: ../template/default/timer_new.html:134 #: ../template/default/help_timer_new.html:59 msgid "End Time:" msgstr "Lopetusaika:" -#: ../template/default/timer_new.html:144 +#: ../template/default/timer_new.html:145 msgid "Use VPS:" msgstr "VPS-toiminto:" -#: ../template/default/timer_new.html:150 +#: ../template/default/timer_new.html:151 #: ../template/default/at_timer_list.html:24 #: ../template/default/config.html:279 ../template/default/config.html:371 #: ../template/default/timer_list.html:27 @@ -205,7 +205,7 @@ msgstr "VPS-toiminto:" msgid "Priority:" msgstr "Prioriteetti:" -#: ../template/default/timer_new.html:156 +#: ../template/default/timer_new.html:157 #: ../template/default/at_timer_list.html:24 #: ../template/default/config.html:285 ../template/default/config.html:377 #: ../template/default/timer_list.html:27 @@ -217,22 +217,26 @@ msgstr "Prioriteetti:" msgid "Lifetime:" msgstr "Elinaika:" -#: ../template/default/timer_new.html:162 +#: ../template/default/timer_new.html:163 #: ../template/default/help_timer_new.html:65 msgid "Title of Recording:" msgstr "Tallenteen nimi:" -#: ../template/default/timer_new.html:168 ../template/default/rec_edit.html:57 +#: ../template/default/timer_new.html:169 ../template/default/rec_edit.html:57 #: ../template/default/help_timer_new.html:67 msgid "Summary:" msgstr "Tallenteen kuvaus:" -#: ../template/default/timer_new.html:180 ../template/default/config.html:659 +#: ../template/default/timer_new.html:169 +msgid "readonly" +msgstr "" + +#: ../template/default/timer_new.html:181 ../template/default/config.html:659 #: ../template/default/at_timer_new.html:176 msgid "Save" msgstr "Tallenna" -#: ../template/default/timer_new.html:181 ../template/default/rec_edit.html:70 +#: ../template/default/timer_new.html:182 ../template/default/rec_edit.html:70 #: ../template/default/at_timer_new.html:178 msgid "Cancel" msgstr "Peru" @@ -344,7 +348,7 @@ msgstr "Poistetaanko valitut ajastimet?" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../vdradmind.pl:4483 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4500 msgid "What's On Now?" msgstr "Menossa nyt" @@ -469,7 +473,7 @@ msgstr "Vierailijan salasana:" #: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../vdradmind.pl:4485 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4502 msgid "Timeline" msgstr "Aikajana" @@ -743,7 +747,7 @@ msgid "Delete Selected Timers" msgstr "Poista valitut ajastimet" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../vdradmind.pl:4486 +#: ../vdradmind.pl:4503 msgid "Channels" msgstr "Kanavat" @@ -809,7 +813,7 @@ msgstr "etsi IMDB:stä" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../vdradmind.pl:4488 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4505 msgid "Recordings" msgstr "Tallenteet" @@ -1179,7 +1183,7 @@ msgid "to" msgstr "-" #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2565 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2601 msgid "Playing Today" msgstr "Ohjelmisto tänään" @@ -1666,113 +1670,113 @@ msgstr "Saksa:" msgid "Spanish:" msgstr "Espanja:" -#: ../vdradmind.pl:289 +#: ../vdradmind.pl:292 msgid "What's your VDR hostname (e.g video.intra.net)?" msgstr "Anna VDR-koneesi nimi (esim. video.intra.net):" -#: ../vdradmind.pl:290 +#: ../vdradmind.pl:293 msgid "On which port does VDR listen to SVDRP queries?" msgstr "Anna VDR-koneesi käyttämä SVDRP-portti:" -#: ../vdradmind.pl:291 +#: ../vdradmind.pl:294 msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?" msgstr "Anna VDRAdmin-AM käyttämä osoiteavaruus (0.0.0.0 ei rajoituksia):" -#: ../vdradmind.pl:292 +#: ../vdradmind.pl:295 msgid "On which port should VDRAdmin-AM listen?" msgstr "Anna VDRAdmin-AM käyttämä portti:" -#: ../vdradmind.pl:293 +#: ../vdradmind.pl:296 msgid "Username?" msgstr "Anna käyttäjätunnus VDRAdmin-AM varten:" -#: ../vdradmind.pl:294 +#: ../vdradmind.pl:297 msgid "Password?" msgstr "Anna salasana VDRAdmin-AM varten:" -#: ../vdradmind.pl:295 +#: ../vdradmind.pl:298 msgid "Where are your recordings stored?" msgstr "Anna VDR-koneesi tallennehakemiston polku:" -#: ../vdradmind.pl:296 +#: ../vdradmind.pl:299 msgid "Where are your VDR's configuration files located?" msgstr "Anna VDR-koneesi konfigurointihakemiston polku:" -#: ../vdradmind.pl:302 +#: ../vdradmind.pl:305 msgid "Config file written successfully." msgstr "VDRAdmin-AM konfigurointitiedosto muodostettu." -#: ../vdradmind.pl:354 +#: ../vdradmind.pl:357 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s käynnistetty prosessitunnisteella %d." -#: ../vdradmind.pl:408 ../vdradmind.pl:1000 ../vdradmind.pl:1865 +#: ../vdradmind.pl:411 ../vdradmind.pl:1003 ../vdradmind.pl:1916 msgid "Not found" msgstr "Ei löydy" -#: ../vdradmind.pl:408 ../vdradmind.pl:1866 +#: ../vdradmind.pl:411 ../vdradmind.pl:1917 msgid "The requested URL was not found on this server!" msgstr "Pyydettyä URL:ia ei löydy palvelimelta!" -#: ../vdradmind.pl:476 ../vdradmind.pl:996 ../vdradmind.pl:1868 +#: ../vdradmind.pl:479 ../vdradmind.pl:999 ../vdradmind.pl:1919 msgid "Forbidden" msgstr "Kielletty" -#: ../vdradmind.pl:476 ../vdradmind.pl:1869 +#: ../vdradmind.pl:479 ../vdradmind.pl:1920 msgid "You don't have permission to access this function!" msgstr "Puutteelliset käyttäjäoikeudet haluttuun toimintoon!" -#: ../vdradmind.pl:996 ../vdradmind.pl:1870 +#: ../vdradmind.pl:999 ../vdradmind.pl:1921 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Pääsy tiedostoon \"%s\" evätty!" -#: ../vdradmind.pl:1000 ../vdradmind.pl:1867 +#: ../vdradmind.pl:1003 ../vdradmind.pl:1918 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "URL:ia \"%s\" ei löydy palvelimelta!" -#: ../vdradmind.pl:1871 +#: ../vdradmind.pl:1922 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Tiedoston \"%s\" avaus ei onnistu!" -#: ../vdradmind.pl:1872 +#: ../vdradmind.pl:1923 #, perl-format msgid "Can't connect to VDR at %s!" msgstr "VDR:ään ei saada yhteyttä (%s)" -#: ../vdradmind.pl:1873 +#: ../vdradmind.pl:1924 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Komennon lähetys VDR:lle epäonnistui (%s)" -#: ../vdradmind.pl:2565 +#: ../vdradmind.pl:2601 msgid "Playing Tomorrow" msgstr "Ohjelmisto huomenna" -#: ../vdradmind.pl:2565 +#: ../vdradmind.pl:2601 #, perl-format msgid "Playing on the %d." msgstr "Ohjelmisto %d. päivä" -#: ../vdradmind.pl:3908 +#: ../vdradmind.pl:3925 msgid "Suitable matches for:" msgstr "Hakutulokset termille:" -#: ../vdradmind.pl:3963 +#: ../vdradmind.pl:3980 msgid "Schedule" msgstr "Ohjelmisto" -#: ../vdradmind.pl:4484 +#: ../vdradmind.pl:4501 msgid "Playing Today?" msgstr "Tänään" -#: ../vdradmind.pl:4487 +#: ../vdradmind.pl:4504 msgid "Timers" msgstr "Ajastimet" -#: ../vdradmind.pl:4550 +#: ../vdradmind.pl:4567 msgid "System default" msgstr "Oletus" @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-01 08:07+0100\n" +"POT-Creation-Date: 2006-03-08 11:04+0100\n" "PO-Revision-Date: 2005-10-04 14:02+0100\n" "Last-Translator: Trois Six <trois.six@free.fr>\n" "Language-Team: <fr@li.org>\n" @@ -120,94 +120,94 @@ msgstr "Non" msgid "AutoTimer Checking:" msgstr "Vérification Auto-Programmation :" -#: ../template/default/timer_new.html:85 +#: ../template/default/timer_new.html:86 #: ../template/default/help_timer_new.html:39 msgid "Transmission Identification" msgstr "Identification Transmission" -#: ../template/default/timer_new.html:87 ../template/default/rec_list.html:70 +#: ../template/default/timer_new.html:88 ../template/default/rec_list.html:70 #: ../template/default/help_timer_new.html:41 msgid "Time" msgstr "Horaires" -#: ../template/default/timer_new.html:88 ../template/default/tv.html:197 +#: ../template/default/timer_new.html:89 ../template/default/tv.html:197 #: ../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/timer_new.html:95 ../template/default/prog_list.html:27 #: ../template/default/help_timer_new.html:47 #: ../template/default/help_at_timer_new.html:46 #: ../template/default/at_timer_new.html:93 msgid "Channel:" msgstr "Chaîne :" -#: ../template/default/timer_new.html:106 +#: ../template/default/timer_new.html:107 #: ../template/default/help_timer_new.html:49 msgid "Day Of Recording:" msgstr "Jour d'Enregistrement :" -#: ../template/default/timer_new.html:110 +#: ../template/default/timer_new.html:111 #: ../template/default/at_timer_new.html:81 msgid "Monday" msgstr "Lundi" -#: ../template/default/timer_new.html:111 +#: ../template/default/timer_new.html:112 #: ../template/default/at_timer_new.html:82 msgid "Tuesday" msgstr "Mardi" -#: ../template/default/timer_new.html:112 +#: ../template/default/timer_new.html:113 #: ../template/default/at_timer_new.html:83 msgid "Wednesday" msgstr "Mercredi" -#: ../template/default/timer_new.html:113 +#: ../template/default/timer_new.html:114 #: ../template/default/at_timer_new.html:84 msgid "Thursday" msgstr "Jeudi" -#: ../template/default/timer_new.html:114 +#: ../template/default/timer_new.html:115 #: ../template/default/at_timer_new.html:85 msgid "Friday" msgstr "Vendredi" -#: ../template/default/timer_new.html:115 +#: ../template/default/timer_new.html:116 #: ../template/default/at_timer_new.html:86 msgid "Saturday" msgstr "Samedi" -#: ../template/default/timer_new.html:116 +#: ../template/default/timer_new.html:117 #: ../template/default/at_timer_new.html:87 msgid "Sunday" msgstr "Dimanche" -#: ../template/default/timer_new.html:122 +#: ../template/default/timer_new.html:123 #: ../template/default/help_timer_new.html:57 msgid "Start Time:" msgstr "Heure De Début :" -#: ../template/default/timer_new.html:127 -#: ../template/default/timer_new.html:138 +#: ../template/default/timer_new.html:128 +#: ../template/default/timer_new.html:139 #: ../template/default/prog_summary.html:26 #: ../template/default/prog_timeline.html:95 #: ../template/default/prog_timeline.html:108 #: ../template/default/prog_timeline.html:123 #: ../template/default/at_timer_new.html:111 -#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3908 +#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3925 msgid "o'clock" msgstr "Heure" -#: ../template/default/timer_new.html:133 +#: ../template/default/timer_new.html:134 #: ../template/default/help_timer_new.html:59 msgid "End Time:" msgstr "Heure De Fin :" -#: ../template/default/timer_new.html:144 +#: ../template/default/timer_new.html:145 msgid "Use VPS:" msgstr "" -#: ../template/default/timer_new.html:150 +#: ../template/default/timer_new.html:151 #: ../template/default/at_timer_list.html:24 #: ../template/default/config.html:279 ../template/default/config.html:371 #: ../template/default/timer_list.html:27 @@ -219,7 +219,7 @@ msgstr "" msgid "Priority:" msgstr "Priorité :" -#: ../template/default/timer_new.html:156 +#: ../template/default/timer_new.html:157 #: ../template/default/at_timer_list.html:24 #: ../template/default/config.html:285 ../template/default/config.html:377 #: ../template/default/timer_list.html:27 @@ -231,22 +231,26 @@ msgstr "Priorité :" msgid "Lifetime:" msgstr "Chronologie :" -#: ../template/default/timer_new.html:162 +#: ../template/default/timer_new.html:163 #: ../template/default/help_timer_new.html:65 msgid "Title of Recording:" msgstr "Titre d'Enregistrement :" -#: ../template/default/timer_new.html:168 ../template/default/rec_edit.html:57 +#: ../template/default/timer_new.html:169 ../template/default/rec_edit.html:57 #: ../template/default/help_timer_new.html:67 msgid "Summary:" msgstr "Sommaire :" -#: ../template/default/timer_new.html:180 ../template/default/config.html:659 +#: ../template/default/timer_new.html:169 +msgid "readonly" +msgstr "" + +#: ../template/default/timer_new.html:181 ../template/default/config.html:659 #: ../template/default/at_timer_new.html:176 msgid "Save" msgstr "Enregistrer" -#: ../template/default/timer_new.html:181 ../template/default/rec_edit.html:70 +#: ../template/default/timer_new.html:182 ../template/default/rec_edit.html:70 #: ../template/default/at_timer_new.html:178 msgid "Cancel" msgstr "Annuler" @@ -360,7 +364,7 @@ msgstr "Supprimer Programmations Sélectionnées ?" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../vdradmind.pl:4483 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4500 msgid "What's On Now?" msgstr "En ce Moment ?" @@ -485,7 +489,7 @@ msgstr "Mot de Passe Invité :" #: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../vdradmind.pl:4485 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4502 msgid "Timeline" msgstr "Chronologie" @@ -768,7 +772,7 @@ msgid "Delete Selected Timers" msgstr "Supprimer Programmations Sélectionnées" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../vdradmind.pl:4486 +#: ../vdradmind.pl:4503 msgid "Channels" msgstr "Chaînes" @@ -834,7 +838,7 @@ msgstr "Plus de details sur Internet" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../vdradmind.pl:4488 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4505 msgid "Recordings" msgstr "Enregistrements" @@ -1323,7 +1327,7 @@ msgid "to" msgstr "à " #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2565 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2601 msgid "Playing Today" msgstr "Joué Aujourd'hui" @@ -2029,114 +2033,114 @@ msgstr "" msgid "Spanish:" msgstr "" -#: ../vdradmind.pl:289 +#: ../vdradmind.pl:292 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:290 +#: ../vdradmind.pl:293 msgid "On which port does VDR listen to SVDRP queries?" msgstr "Sur quel port VDR écoute les requêtes SVDRP ?" -#: ../vdradmind.pl:291 +#: ../vdradmind.pl:294 msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?" msgstr "Sur quel adresse VDRAdmin-AM doit-il écouter (0.0.0.0 pour toutes) ?" -#: ../vdradmind.pl:292 +#: ../vdradmind.pl:295 msgid "On which port should VDRAdmin-AM listen?" msgstr "Sur quel port VDRAdmin-AM doit-il écouter ?" -#: ../vdradmind.pl:293 +#: ../vdradmind.pl:296 msgid "Username?" msgstr "Identifiant ?" -#: ../vdradmind.pl:294 +#: ../vdradmind.pl:297 msgid "Password?" msgstr "Mot de Passe ?" -#: ../vdradmind.pl:295 +#: ../vdradmind.pl:298 msgid "Where are your recordings stored?" msgstr "Où vos enregistrements sont-ils stockés ?" -#: ../vdradmind.pl:296 +#: ../vdradmind.pl:299 msgid "Where are your VDR's configuration files located?" msgstr "Où sont vos fichiers de configuration de VDR ?" -#: ../vdradmind.pl:302 +#: ../vdradmind.pl:305 msgid "Config file written successfully." msgstr "Fichier de configuration écrit avec succès." -#: ../vdradmind.pl:354 +#: ../vdradmind.pl:357 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmin.pl %s a démarré avec le pid %d." -#: ../vdradmind.pl:408 ../vdradmind.pl:1000 ../vdradmind.pl:1865 +#: ../vdradmind.pl:411 ../vdradmind.pl:1003 ../vdradmind.pl:1916 msgid "Not found" msgstr "Non trouvé" -#: ../vdradmind.pl:408 ../vdradmind.pl:1866 +#: ../vdradmind.pl:411 ../vdradmind.pl:1917 msgid "The requested URL was not found on this server!" msgstr "L'URL demandée n'a pas été trouvée sur le serveur !" -#: ../vdradmind.pl:476 ../vdradmind.pl:996 ../vdradmind.pl:1868 +#: ../vdradmind.pl:479 ../vdradmind.pl:999 ../vdradmind.pl:1919 msgid "Forbidden" msgstr "Interdit" -#: ../vdradmind.pl:476 ../vdradmind.pl:1869 +#: ../vdradmind.pl:479 ../vdradmind.pl:1920 msgid "You don't have permission to access this function!" msgstr "Vous n'avez pas la permission d'accéder à cette fonction !" -#: ../vdradmind.pl:996 ../vdradmind.pl:1870 +#: ../vdradmind.pl:999 ../vdradmind.pl:1921 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Accès au fichier \"%s\" interdit !" -#: ../vdradmind.pl:1000 ../vdradmind.pl:1867 +#: ../vdradmind.pl:1003 ../vdradmind.pl:1918 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "L'URL \"%s\" n'a pas été trouvée sur le serveur !" -#: ../vdradmind.pl:1871 +#: ../vdradmind.pl:1922 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Ne peut pas ouvrir le fichier \"%s\" !" -#: ../vdradmind.pl:1872 +#: ../vdradmind.pl:1923 #, perl-format msgid "Can't connect to VDR at %s!" msgstr "Ne peut se connecter à %s !" -#: ../vdradmind.pl:1873 +#: ../vdradmind.pl:1924 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Erreur en envoyant la commande à %s" -#: ../vdradmind.pl:2565 +#: ../vdradmind.pl:2601 msgid "Playing Tomorrow" msgstr "Joué demain" -#: ../vdradmind.pl:2565 +#: ../vdradmind.pl:2601 #, perl-format msgid "Playing on the %d." msgstr "En cours sur la %d." -#: ../vdradmind.pl:3908 +#: ../vdradmind.pl:3925 msgid "Suitable matches for:" msgstr "" -#: ../vdradmind.pl:3963 +#: ../vdradmind.pl:3980 msgid "Schedule" msgstr "Programmateur" -#: ../vdradmind.pl:4484 +#: ../vdradmind.pl:4501 msgid "Playing Today?" msgstr "Aujourd'hui ?" -#: ../vdradmind.pl:4487 +#: ../vdradmind.pl:4504 msgid "Timers" msgstr "Programmations" -#: ../vdradmind.pl:4550 +#: ../vdradmind.pl:4567 msgid "System default" msgstr "" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-01 08:07+0100\n" +"POT-Creation-Date: 2006-03-08 11:04+0100\n" "PO-Revision-Date: 2006-02-28 19:53+0100\n" "Last-Translator: Roel <rl.koelewijn@home.nl>\n" "Language-Team: Nederlands <nl@li.org>\n" @@ -109,94 +109,94 @@ msgstr "Nee" msgid "AutoTimer Checking:" msgstr "Auto timer controle" -#: ../template/default/timer_new.html:85 +#: ../template/default/timer_new.html:86 #: ../template/default/help_timer_new.html:39 msgid "Transmission Identification" msgstr "Verzend indentificatie" -#: ../template/default/timer_new.html:87 ../template/default/rec_list.html:70 +#: ../template/default/timer_new.html:88 ../template/default/rec_list.html:70 #: ../template/default/help_timer_new.html:41 msgid "Time" msgstr "Tijd " -#: ../template/default/timer_new.html:88 ../template/default/tv.html:197 +#: ../template/default/timer_new.html:89 ../template/default/tv.html:197 #: ../template/default/help_timer_new.html:43 msgid "off" msgstr "Uit " -#: ../template/default/timer_new.html:94 ../template/default/prog_list.html:27 +#: ../template/default/timer_new.html:95 ../template/default/prog_list.html:27 #: ../template/default/help_timer_new.html:47 #: ../template/default/help_at_timer_new.html:46 #: ../template/default/at_timer_new.html:93 msgid "Channel:" msgstr "Kanaal" -#: ../template/default/timer_new.html:106 +#: ../template/default/timer_new.html:107 #: ../template/default/help_timer_new.html:49 msgid "Day Of Recording:" msgstr "Dag van opname" -#: ../template/default/timer_new.html:110 +#: ../template/default/timer_new.html:111 #: ../template/default/at_timer_new.html:81 msgid "Monday" msgstr "Maandag" -#: ../template/default/timer_new.html:111 +#: ../template/default/timer_new.html:112 #: ../template/default/at_timer_new.html:82 msgid "Tuesday" msgstr "Dinsdag" -#: ../template/default/timer_new.html:112 +#: ../template/default/timer_new.html:113 #: ../template/default/at_timer_new.html:83 msgid "Wednesday" msgstr "Woensdag" -#: ../template/default/timer_new.html:113 +#: ../template/default/timer_new.html:114 #: ../template/default/at_timer_new.html:84 msgid "Thursday" msgstr "Donderdag" -#: ../template/default/timer_new.html:114 +#: ../template/default/timer_new.html:115 #: ../template/default/at_timer_new.html:85 msgid "Friday" msgstr "Vrijdag" -#: ../template/default/timer_new.html:115 +#: ../template/default/timer_new.html:116 #: ../template/default/at_timer_new.html:86 msgid "Saturday" msgstr "Zaterdag" -#: ../template/default/timer_new.html:116 +#: ../template/default/timer_new.html:117 #: ../template/default/at_timer_new.html:87 msgid "Sunday" msgstr "Zondag" -#: ../template/default/timer_new.html:122 +#: ../template/default/timer_new.html:123 #: ../template/default/help_timer_new.html:57 msgid "Start Time:" msgstr "Start tijd:" -#: ../template/default/timer_new.html:127 -#: ../template/default/timer_new.html:138 +#: ../template/default/timer_new.html:128 +#: ../template/default/timer_new.html:139 #: ../template/default/prog_summary.html:26 #: ../template/default/prog_timeline.html:95 #: ../template/default/prog_timeline.html:108 #: ../template/default/prog_timeline.html:123 #: ../template/default/at_timer_new.html:111 -#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3908 +#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3925 msgid "o'clock" msgstr "Uur" -#: ../template/default/timer_new.html:133 +#: ../template/default/timer_new.html:134 #: ../template/default/help_timer_new.html:59 msgid "End Time:" msgstr "Eind tijd" -#: ../template/default/timer_new.html:144 +#: ../template/default/timer_new.html:145 msgid "Use VPS:" msgstr "Gebruik VPS" -#: ../template/default/timer_new.html:150 +#: ../template/default/timer_new.html:151 #: ../template/default/at_timer_list.html:24 #: ../template/default/config.html:279 ../template/default/config.html:371 #: ../template/default/timer_list.html:27 @@ -208,7 +208,7 @@ msgstr "Gebruik VPS" msgid "Priority:" msgstr "Prioriteit:" -#: ../template/default/timer_new.html:156 +#: ../template/default/timer_new.html:157 #: ../template/default/at_timer_list.html:24 #: ../template/default/config.html:285 ../template/default/config.html:377 #: ../template/default/timer_list.html:27 @@ -220,22 +220,26 @@ msgstr "Prioriteit:" msgid "Lifetime:" msgstr "Levensduur:" -#: ../template/default/timer_new.html:162 +#: ../template/default/timer_new.html:163 #: ../template/default/help_timer_new.html:65 msgid "Title of Recording:" msgstr "Titel van opname:" -#: ../template/default/timer_new.html:168 ../template/default/rec_edit.html:57 +#: ../template/default/timer_new.html:169 ../template/default/rec_edit.html:57 #: ../template/default/help_timer_new.html:67 msgid "Summary:" msgstr "Omschrijving:" -#: ../template/default/timer_new.html:180 ../template/default/config.html:659 +#: ../template/default/timer_new.html:169 +msgid "readonly" +msgstr "" + +#: ../template/default/timer_new.html:181 ../template/default/config.html:659 #: ../template/default/at_timer_new.html:176 msgid "Save" msgstr "Opslaan" -#: ../template/default/timer_new.html:181 ../template/default/rec_edit.html:70 +#: ../template/default/timer_new.html:182 ../template/default/rec_edit.html:70 #: ../template/default/at_timer_new.html:178 msgid "Cancel" msgstr "Annuleren" @@ -349,7 +353,7 @@ msgstr "Verwijder alle geselecteerde timers?" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../vdradmind.pl:4483 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4500 msgid "What's On Now?" msgstr "Wat is er nu op?" @@ -474,7 +478,7 @@ msgstr "Wachtwoord gast" #: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../vdradmind.pl:4485 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4502 msgid "Timeline" msgstr "Tijdlijn" @@ -748,7 +752,7 @@ msgid "Delete Selected Timers" msgstr "Verwijder geselecteerde timers" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../vdradmind.pl:4486 +#: ../vdradmind.pl:4503 msgid "Channels" msgstr "Kanalen" @@ -814,7 +818,7 @@ msgstr "Zoek de film op bij de Internet-Movie-Database (IMDb)" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../vdradmind.pl:4488 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4505 msgid "Recordings" msgstr "Opnames" @@ -1294,7 +1298,7 @@ msgid "to" msgstr "naar " #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2565 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2601 msgid "Playing Today" msgstr "Programma vandaag " @@ -1983,113 +1987,113 @@ msgstr "Duits:" msgid "Spanish:" msgstr "Spaans:" -#: ../vdradmind.pl:289 +#: ../vdradmind.pl:292 msgid "What's your VDR hostname (e.g video.intra.net)?" msgstr "Wat de de hostnaam van de VDR (b.v. video.intra.net)?" -#: ../vdradmind.pl:290 +#: ../vdradmind.pl:293 msgid "On which port does VDR listen to SVDRP queries?" msgstr "Op welke poort luister VDR naar SVDRP verzoeken?" -#: ../vdradmind.pl:291 +#: ../vdradmind.pl:294 msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?" msgstr "Naar welk adres moet VDRAdmin-AM luisteren (0.0.0.0 voor alles)?" -#: ../vdradmind.pl:292 +#: ../vdradmind.pl:295 msgid "On which port should VDRAdmin-AM listen?" msgstr "Naar welke poort moet VDRAdmin-AM luisteren?" -#: ../vdradmind.pl:293 +#: ../vdradmind.pl:296 msgid "Username?" msgstr "Gebruikersnaam?" -#: ../vdradmind.pl:294 +#: ../vdradmind.pl:297 msgid "Password?" msgstr "Wachtwoord?" -#: ../vdradmind.pl:295 +#: ../vdradmind.pl:298 msgid "Where are your recordings stored?" msgstr "Waar worden uw opnames opgeslagen?" -#: ../vdradmind.pl:296 +#: ../vdradmind.pl:299 msgid "Where are your VDR's configuration files located?" msgstr "Waar bevinden zicht de VDR's configuratie bestanden?" -#: ../vdradmind.pl:302 +#: ../vdradmind.pl:305 msgid "Config file written successfully." msgstr "Configuratie bestanden succesvol weggeschreven." -#: ../vdradmind.pl:354 +#: ../vdradmind.pl:357 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s gestart met pid %d." -#: ../vdradmind.pl:408 ../vdradmind.pl:1000 ../vdradmind.pl:1865 +#: ../vdradmind.pl:411 ../vdradmind.pl:1003 ../vdradmind.pl:1916 msgid "Not found" msgstr "Niet gevonden" -#: ../vdradmind.pl:408 ../vdradmind.pl:1866 +#: ../vdradmind.pl:411 ../vdradmind.pl:1917 msgid "The requested URL was not found on this server!" msgstr "De gevraagde URl is niet gevonden op deze server!" -#: ../vdradmind.pl:476 ../vdradmind.pl:996 ../vdradmind.pl:1868 +#: ../vdradmind.pl:479 ../vdradmind.pl:999 ../vdradmind.pl:1919 msgid "Forbidden" msgstr "Verboden" -#: ../vdradmind.pl:476 ../vdradmind.pl:1869 +#: ../vdradmind.pl:479 ../vdradmind.pl:1920 msgid "You don't have permission to access this function!" msgstr "U heeft geen toestemming om deze functie te gebruiken!" -#: ../vdradmind.pl:996 ../vdradmind.pl:1870 +#: ../vdradmind.pl:999 ../vdradmind.pl:1921 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Toegang tot bestand \"%s\" geweigerd!" -#: ../vdradmind.pl:1000 ../vdradmind.pl:1867 +#: ../vdradmind.pl:1003 ../vdradmind.pl:1918 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "De URl \"%s\" is niet gevonden op deze server!" -#: ../vdradmind.pl:1871 +#: ../vdradmind.pl:1922 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Kan bestand \"%s\" niet openen!" -#: ../vdradmind.pl:1872 +#: ../vdradmind.pl:1923 #, perl-format msgid "Can't connect to VDR at %s!" msgstr "Kan niet met VDR verbinden op %s!" -#: ../vdradmind.pl:1873 +#: ../vdradmind.pl:1924 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Fout tijdens verzenden van commando op %s" -#: ../vdradmind.pl:2565 +#: ../vdradmind.pl:2601 msgid "Playing Tomorrow" msgstr "Speelt morgen" -#: ../vdradmind.pl:2565 +#: ../vdradmind.pl:2601 #, perl-format msgid "Playing on the %d." msgstr "Speelt op de %d." -#: ../vdradmind.pl:3908 +#: ../vdradmind.pl:3925 msgid "Suitable matches for:" msgstr "Bruikbare overeenkomsten voor:" -#: ../vdradmind.pl:3963 +#: ../vdradmind.pl:3980 msgid "Schedule" msgstr "Schema" -#: ../vdradmind.pl:4484 +#: ../vdradmind.pl:4501 msgid "Playing Today?" msgstr "Speelt vandaag?" -#: ../vdradmind.pl:4487 +#: ../vdradmind.pl:4504 msgid "Timers" msgstr "Timers" -#: ../vdradmind.pl:4550 +#: ../vdradmind.pl:4567 msgid "System default" msgstr "Systeem standaard" diff --git a/po/vdradmin.pot b/po/vdradmin.pot index 3fcdd1b..7d8eb94 100644 --- a/po/vdradmin.pot +++ b/po/vdradmin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-01 08:07+0100\n" +"POT-Creation-Date: 2006-03-08 11:04+0100\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" @@ -107,94 +107,94 @@ msgstr "" msgid "AutoTimer Checking:" msgstr "" -#: ../template/default/timer_new.html:85 +#: ../template/default/timer_new.html:86 #: ../template/default/help_timer_new.html:39 msgid "Transmission Identification" msgstr "" -#: ../template/default/timer_new.html:87 ../template/default/rec_list.html:70 +#: ../template/default/timer_new.html:88 ../template/default/rec_list.html:70 #: ../template/default/help_timer_new.html:41 msgid "Time" msgstr "" -#: ../template/default/timer_new.html:88 ../template/default/tv.html:197 +#: ../template/default/timer_new.html:89 ../template/default/tv.html:197 #: ../template/default/help_timer_new.html:43 msgid "off" msgstr "" -#: ../template/default/timer_new.html:94 ../template/default/prog_list.html:27 +#: ../template/default/timer_new.html:95 ../template/default/prog_list.html:27 #: ../template/default/help_timer_new.html:47 #: ../template/default/help_at_timer_new.html:46 #: ../template/default/at_timer_new.html:93 msgid "Channel:" msgstr "" -#: ../template/default/timer_new.html:106 +#: ../template/default/timer_new.html:107 #: ../template/default/help_timer_new.html:49 msgid "Day Of Recording:" msgstr "" -#: ../template/default/timer_new.html:110 +#: ../template/default/timer_new.html:111 #: ../template/default/at_timer_new.html:81 msgid "Monday" msgstr "" -#: ../template/default/timer_new.html:111 +#: ../template/default/timer_new.html:112 #: ../template/default/at_timer_new.html:82 msgid "Tuesday" msgstr "" -#: ../template/default/timer_new.html:112 +#: ../template/default/timer_new.html:113 #: ../template/default/at_timer_new.html:83 msgid "Wednesday" msgstr "" -#: ../template/default/timer_new.html:113 +#: ../template/default/timer_new.html:114 #: ../template/default/at_timer_new.html:84 msgid "Thursday" msgstr "" -#: ../template/default/timer_new.html:114 +#: ../template/default/timer_new.html:115 #: ../template/default/at_timer_new.html:85 msgid "Friday" msgstr "" -#: ../template/default/timer_new.html:115 +#: ../template/default/timer_new.html:116 #: ../template/default/at_timer_new.html:86 msgid "Saturday" msgstr "" -#: ../template/default/timer_new.html:116 +#: ../template/default/timer_new.html:117 #: ../template/default/at_timer_new.html:87 msgid "Sunday" msgstr "" -#: ../template/default/timer_new.html:122 +#: ../template/default/timer_new.html:123 #: ../template/default/help_timer_new.html:57 msgid "Start Time:" msgstr "" -#: ../template/default/timer_new.html:127 -#: ../template/default/timer_new.html:138 +#: ../template/default/timer_new.html:128 +#: ../template/default/timer_new.html:139 #: ../template/default/prog_summary.html:26 #: ../template/default/prog_timeline.html:95 #: ../template/default/prog_timeline.html:108 #: ../template/default/prog_timeline.html:123 #: ../template/default/at_timer_new.html:111 -#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3908 +#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3925 msgid "o'clock" msgstr "" -#: ../template/default/timer_new.html:133 +#: ../template/default/timer_new.html:134 #: ../template/default/help_timer_new.html:59 msgid "End Time:" msgstr "" -#: ../template/default/timer_new.html:144 +#: ../template/default/timer_new.html:145 msgid "Use VPS:" msgstr "" -#: ../template/default/timer_new.html:150 +#: ../template/default/timer_new.html:151 #: ../template/default/at_timer_list.html:24 #: ../template/default/config.html:279 ../template/default/config.html:371 #: ../template/default/timer_list.html:27 @@ -206,7 +206,7 @@ msgstr "" msgid "Priority:" msgstr "" -#: ../template/default/timer_new.html:156 +#: ../template/default/timer_new.html:157 #: ../template/default/at_timer_list.html:24 #: ../template/default/config.html:285 ../template/default/config.html:377 #: ../template/default/timer_list.html:27 @@ -218,22 +218,26 @@ msgstr "" msgid "Lifetime:" msgstr "" -#: ../template/default/timer_new.html:162 +#: ../template/default/timer_new.html:163 #: ../template/default/help_timer_new.html:65 msgid "Title of Recording:" msgstr "" -#: ../template/default/timer_new.html:168 ../template/default/rec_edit.html:57 +#: ../template/default/timer_new.html:169 ../template/default/rec_edit.html:57 #: ../template/default/help_timer_new.html:67 msgid "Summary:" msgstr "" -#: ../template/default/timer_new.html:180 ../template/default/config.html:659 +#: ../template/default/timer_new.html:169 +msgid "readonly" +msgstr "" + +#: ../template/default/timer_new.html:181 ../template/default/config.html:659 #: ../template/default/at_timer_new.html:176 msgid "Save" msgstr "" -#: ../template/default/timer_new.html:181 ../template/default/rec_edit.html:70 +#: ../template/default/timer_new.html:182 ../template/default/rec_edit.html:70 #: ../template/default/at_timer_new.html:178 msgid "Cancel" msgstr "" @@ -341,7 +345,7 @@ msgstr "" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../vdradmind.pl:4483 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4500 msgid "What's On Now?" msgstr "" @@ -466,7 +470,7 @@ msgstr "" #: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../vdradmind.pl:4485 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4502 msgid "Timeline" msgstr "" @@ -740,7 +744,7 @@ msgid "Delete Selected Timers" msgstr "" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../vdradmind.pl:4486 +#: ../vdradmind.pl:4503 msgid "Channels" msgstr "" @@ -806,7 +810,7 @@ msgstr "" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../vdradmind.pl:4488 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4505 msgid "Recordings" msgstr "" @@ -1176,7 +1180,7 @@ msgid "to" msgstr "" #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2565 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2601 msgid "Playing Today" msgstr "" @@ -1663,113 +1667,113 @@ msgstr "" msgid "Spanish:" msgstr "" -#: ../vdradmind.pl:289 +#: ../vdradmind.pl:292 msgid "What's your VDR hostname (e.g video.intra.net)?" msgstr "" -#: ../vdradmind.pl:290 +#: ../vdradmind.pl:293 msgid "On which port does VDR listen to SVDRP queries?" msgstr "" -#: ../vdradmind.pl:291 +#: ../vdradmind.pl:294 msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?" msgstr "" -#: ../vdradmind.pl:292 +#: ../vdradmind.pl:295 msgid "On which port should VDRAdmin-AM listen?" msgstr "" -#: ../vdradmind.pl:293 +#: ../vdradmind.pl:296 msgid "Username?" msgstr "" -#: ../vdradmind.pl:294 +#: ../vdradmind.pl:297 msgid "Password?" msgstr "" -#: ../vdradmind.pl:295 +#: ../vdradmind.pl:298 msgid "Where are your recordings stored?" msgstr "" -#: ../vdradmind.pl:296 +#: ../vdradmind.pl:299 msgid "Where are your VDR's configuration files located?" msgstr "" -#: ../vdradmind.pl:302 +#: ../vdradmind.pl:305 msgid "Config file written successfully." msgstr "" -#: ../vdradmind.pl:354 +#: ../vdradmind.pl:357 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "" -#: ../vdradmind.pl:408 ../vdradmind.pl:1000 ../vdradmind.pl:1865 +#: ../vdradmind.pl:411 ../vdradmind.pl:1003 ../vdradmind.pl:1916 msgid "Not found" msgstr "" -#: ../vdradmind.pl:408 ../vdradmind.pl:1866 +#: ../vdradmind.pl:411 ../vdradmind.pl:1917 msgid "The requested URL was not found on this server!" msgstr "" -#: ../vdradmind.pl:476 ../vdradmind.pl:996 ../vdradmind.pl:1868 +#: ../vdradmind.pl:479 ../vdradmind.pl:999 ../vdradmind.pl:1919 msgid "Forbidden" msgstr "" -#: ../vdradmind.pl:476 ../vdradmind.pl:1869 +#: ../vdradmind.pl:479 ../vdradmind.pl:1920 msgid "You don't have permission to access this function!" msgstr "" -#: ../vdradmind.pl:996 ../vdradmind.pl:1870 +#: ../vdradmind.pl:999 ../vdradmind.pl:1921 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "" -#: ../vdradmind.pl:1000 ../vdradmind.pl:1867 +#: ../vdradmind.pl:1003 ../vdradmind.pl:1918 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "" -#: ../vdradmind.pl:1871 +#: ../vdradmind.pl:1922 #, perl-format msgid "Can't open file \"%s\"!" msgstr "" -#: ../vdradmind.pl:1872 +#: ../vdradmind.pl:1923 #, perl-format msgid "Can't connect to VDR at %s!" msgstr "" -#: ../vdradmind.pl:1873 +#: ../vdradmind.pl:1924 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "" -#: ../vdradmind.pl:2565 +#: ../vdradmind.pl:2601 msgid "Playing Tomorrow" msgstr "" -#: ../vdradmind.pl:2565 +#: ../vdradmind.pl:2601 #, perl-format msgid "Playing on the %d." msgstr "" -#: ../vdradmind.pl:3908 +#: ../vdradmind.pl:3925 msgid "Suitable matches for:" msgstr "" -#: ../vdradmind.pl:3963 +#: ../vdradmind.pl:3980 msgid "Schedule" msgstr "" -#: ../vdradmind.pl:4484 +#: ../vdradmind.pl:4501 msgid "Playing Today?" msgstr "" -#: ../vdradmind.pl:4487 +#: ../vdradmind.pl:4504 msgid "Timers" msgstr "" -#: ../vdradmind.pl:4550 +#: ../vdradmind.pl:4567 msgid "System default" msgstr "" diff --git a/template/default/config.html b/template/default/config.html index 60d6c02..0b8904d 100644 --- a/template/default/config.html +++ b/template/default/config.html @@ -408,7 +408,7 @@ </td> <td class="col_right"></td> </tr> - <tr class="row_odd"> +<!-- <tr class="row_odd"> <td class="col_left"></td> <td class="col_label"><h5><%! Add summary to new timers: !%></h5></td> <td class="col_value"> @@ -416,7 +416,7 @@ <input type="radio" name="TM_ADD_SUMMARY" value="0" id="tm_add_summary_no" <tmpl_unless tm_add_summary>checked</tmpl_unless> /><label for="tm_add_summary_no"><%! No !%></label> </td> <td class="col_right"></td> - </tr> + </tr>--> <tr class="footer"> <td class="col_left"></td> <td colspan="2"></td> diff --git a/template/default/copper/style.css b/template/default/copper/style.css index 6bbb183..20e5210 100644 --- a/template/default/copper/style.css +++ b/template/default/copper/style.css @@ -15,6 +15,7 @@ h2 { margin: 0px; font-size: 11px; font-weight: bold; color: black; display: inl h3 { margin: 0px; font-size: 11px; font-weight: bold; color: black; } h4 { margin: 0px; font-size: 11px; font-weight: normal; font-style: italic; color: black; } h5 { margin: 1px 5px; font-size: 11px; font-weight: normal; color: black; text-align: right; } +h6 { margin: 1px 5px; font-size: 10px; font-weight: normal; color: black; text-align: right; } label { cursor: default; } diff --git a/template/default/default/style.css b/template/default/default/style.css index f2ec8c6..f15d39a 100644 --- a/template/default/default/style.css +++ b/template/default/default/style.css @@ -81,6 +81,13 @@ h5 { color: black; text-align: right; } +h6 { + margin: 1px 5px; + font-size: 10px; + font-weight: normal; + color: black; + text-align: right; +} label { cursor: default; diff --git a/template/default/help_config.html b/template/default/help_config.html index 98ffdc2..b58e31f 100644 --- a/template/default/help_config.html +++ b/template/default/help_config.html @@ -137,8 +137,8 @@ <dd><%! Here you can (de-)activate the tooltips in the timeline. !%></dd> <dt><%! Tooltips in list: !%></dt> <dd><%! Here you can (de-)activate the tooltips in the list. !%></dd> - <dt><%! Add summary to new timers: !%></dt> - <dd><%! If you don't want VDRAdmin-AM to add the summary taken from EPG to new timers you can switch it off here. !%></dd> +<!-- <dt><%! Add summary to new timers: !%></dt> + <dd><%! If you don't want VDRAdmin-AM to add the summary taken from EPG to new timers you can switch it off here. !%></dd>--> </dl> <div class="top_link">[<a href="#top"><%! Top !%></a>]</div> </div> diff --git a/template/default/style.css b/template/default/style.css index 7d88708..5fa78df 100644 --- a/template/default/style.css +++ b/template/default/style.css @@ -15,6 +15,7 @@ h2 { margin: 0px; font-size: 11px; font-weight: bold; color: black; display: inl h3 { margin: 0px; font-size: 11px; font-weight: bold; color: black; } h4 { margin: 0px; font-size: 11px; font-weight: normal; font-style: italic; color: black; } h5 { margin: 1px 5px; font-size: 11px; font-weight: normal; color: black; text-align: right; } +h6 { margin: 1px 5px; font-size: 10px; font-weight: normal; color: black; text-align: right; } label { cursor: default; } @@ -59,7 +60,7 @@ label + input { margin-left: 1em; } .col_duration { padding-left: 3px; padding-right: 3px; width: 120px; vertical-align: top; } .col_name, .col_title * { padding-left: 3px; padding-right: 3px; min-width: 50px; white-space: normal; } .col_info, .col_record { width: 65px; text-align: center; } -.col_active { width: 75px; max-width: 75px; } +.col_active { width: 75px; } .col_stream { width: 70px; max-width: 70px; } .col_channel { width: 120px; } .col_start, .col_stop, .col_date, .col_time { width: 66px; text-align: right; } diff --git a/template/default/timer_list.html b/template/default/timer_list.html index f5b128c..68bb232 100644 --- a/template/default/timer_list.html +++ b/template/default/timer_list.html @@ -322,7 +322,7 @@ <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> - <tmpl_if expr="active == 32769"><%! Auto !%></tmpl_if> + <tmpl_if expr="autotimer">(<%! Auto !%>)</tmpl_if> </a> </div> </td> diff --git a/template/default/timer_new.html b/template/default/timer_new.html index 19751e1..b6ac8c5 100644 --- a/template/default/timer_new.html +++ b/template/default/timer_new.html @@ -81,11 +81,12 @@ <td class="col_left"></td> <td class="col_label"><h5><%! AutoTimer Checking: !%></h5></td> <td class="col_value"> - <tmpl_if expr="event_id > 1"> - <input type="radio" name="event_id" value="<tmpl_var event_id>" id="event_id" checked /><label for="event_id"><%! Transmission Identification !%></label> + <input type="hidden" name="event_id" value="<tmpl_var event_id>"/> + <tmpl_if expr="at_epg == 1"> + <input type="radio" name="autotimer" value="2" id="event_id" <tmpl_if expr="autotimer == 2">checked</tmpl_if> /><label for="event_id"><%! Transmission Identification !%></label> </tmpl_if> - <input type="radio" name="event_id" value="1" id="event_time" <tmpl_if expr="event_id == 1">checked</tmpl_if> /><label for="event_time"><%! Time !%></label> - <input type="radio" name="event_id" value="0" id="event_off" <tmpl_if expr="event_id == 0">checked</tmpl_if> /><label for="event_off"><%! off !%></label> + <input type="radio" name="autotimer" value="1" id="event_time" <tmpl_if expr="autotimer == 1">checked</tmpl_if> /><label for="event_time"><%! Time !%></label> + <input type="radio" name="autotimer" value="0" id="event_off" <tmpl_if expr="autotimer == 0">checked</tmpl_if> /><label for="event_off"><%! off !%></label> </td> <td class="col_right"></td> </tr> @@ -165,8 +166,8 @@ </tr> <tr class="row_odd"> <td class="col_left"></td> - <td class="col_label" valign="top"><h5><%! Summary: !%></h5></td> - <td class="col_value"><textarea name="summary" rows="6" cols="80"><tmpl_var summary></textarea></td> + <td class="col_label" valign="top"><h5><%! Summary: !%></h5><h6>(<%! readonly !%>)</h6></td> + <td class="col_value"><textarea name="summary" rows="6" cols="80" readonly="readonly"><tmpl_var summary></textarea></td> <td class="col_right"></td> </tr> <tr class="footer"> diff --git a/vdradmind.pl b/vdradmind.pl index 3dbff1a..4042366 100755 --- a/vdradmind.pl +++ b/vdradmind.pl @@ -34,7 +34,6 @@ BEGIN { $0 =~ /(^.*\/)/; $EXENAME = $0; $BASENAME = $1; - #TODO: $0 = "vdradmind"; # does this harm any external script that depends on vdradmind.pl? unshift(@INC, "/usr/share/vdradmin/lib"); unshift(@INC, $BASENAME . "lib/"); } @@ -80,6 +79,10 @@ my $SEARCH_FILES_IN_SYSTEM = 0; my $VDR_MAX_SVDRP_LENGTH = 10000; # validate this value my $SUPPORTED_LOCALE_PREFIXES = "^(de|en|es|fi|fr|nl)_"; +my $AT_BY_EVENT_ID = 2; +my $AT_BY_TIME = 1; +my $AT_OFF = 0; + sub true () { 1 }; sub false () { 0 }; sub CRLF () { "\r\n" }; @@ -142,7 +145,7 @@ $CONFIG{TM_MARGIN_BEGIN} = 10; $CONFIG{TM_MARGIN_END} = 10; $CONFIG{TM_TT_TIMELINE} = 1; $CONFIG{TM_TT_LIST} = 1; -$CONFIG{TM_ADD_SUMMARY} = 0; +#$CONFIG{TM_ADD_SUMMARY} = 0; # $CONFIG{ST_FUNC} = 1; $CONFIG{ST_REC_ON} = 0; @@ -179,7 +182,7 @@ $CONFIG{TV_EXT} = "m3u"; $CONFIG{REC_MIMETYPE} = "video/x-mpegurl"; $CONFIG{REC_EXT} = "m3u"; -my $VERSION = "3.4.3a"; +my $VERSION = "3.4.4beta"; my $SERVERVERSION = "vdradmind/$VERSION"; my $LINVDR = isLinVDR(); my $VDRVERSION = 0; @@ -492,7 +495,7 @@ while(true) { ############################################################################# ############################################################################# -sub GetChannelDesc { +sub GetChannelDesc { #TODO: unused my(%hash); for(@CHAN) { $hash{$_->{id}} = $_->{name}; @@ -529,7 +532,7 @@ sub ReadFile { return($buf); } -sub GetChannelID { +sub GetChannelID { #TODO: unused my($sid) = $_[0]; for(@CHAN) { if($_->{id} == $sid) { @@ -538,7 +541,7 @@ sub GetChannelID { } } -sub EURL { +sub EURL { #TODO: unused my($text) = @_; $text =~ s/([^0-9a-zA-Z])/sprintf("%%%2.2x", ord($1))/ge; return($text); @@ -555,7 +558,7 @@ sub HTMLError { } -sub FillInZero { +sub FillInZero { #TODO: unused my($str, $length) = @_; while(length($str) < $length) { $str = "0$str"; @@ -701,7 +704,7 @@ sub EPG_getEntry { } } -sub getNumberOfElements { +sub getNumberOfElements { #TODO: unused my $ref = shift; if($ref) { return(@{$ref}); @@ -836,7 +839,7 @@ sub SendCMD { return(@output); } -sub mygmtime() { +sub mygmtime() { #TODO: unused gmtime; } @@ -1004,6 +1007,19 @@ sub SendFile { ############################################################################# # autotimer functions ############################################################################# +sub can_do_eventid_autotimer { + # check if we may use Event-IDs in general or not + return 0 if($CONFIG{NO_EVENTID} == 1); + + my $vdr_id = shift; + # check if the current channel is on the Event-ID-blacklist + for my $n (split(",", $CONFIG{NO_EVENTID_ON})) { + return 0 if($n == $vdr_id); + } + + return 1; +} + sub AT_Read { my(@at); if(-e $AT_FILENAME) { @@ -1397,7 +1413,7 @@ sub AutoTimer { } else { Log(LOG_AT, sprintf("AutoTimer: Programming Timer \"%s\" (Event-ID %s, %s - %s)", $title, $event->{event_id}, strftime("%Y%m%d-%H%M", localtime($event->{start})), strftime("%Y%m%d-%H%M", localtime($event->{stop})))); - AT_ProgTimer(0x8001, $event->{event_id}, $event->{vdr_id}, $event->{start}, $event->{stop}, $title, $event->{summary}, $at->{prio}, $at->{lft}); + AT_ProgTimer(1, $event->{event_id}, $event->{vdr_id}, $event->{start}, $event->{stop}, $title, $event->{summary}, $at); if ($at->{active} == 2) { Log(LOG_AT, sprintf("AutoTimer: Disabling one-shot Timer")); @@ -1428,39 +1444,36 @@ sub AutoTimer { sub AT_ProgTimer { - my($active, $event_id, $channel, $start, $stop, $title, $summary, $prio, $lft) = @_; - - $title =~ s/\|/\:/g; + my($active, $event_id, $channel, $start, $stop, $title, $summary, $at) = @_; $start -= ($CONFIG{TM_MARGIN_BEGIN} * 60); $stop += ($CONFIG{TM_MARGIN_END} * 60); - ($prio = $CONFIG{AT_PRIORITY}) if(!$prio); - ($lft = $CONFIG{AT_LIFETIME}) if(!$lft); - + my $start_fmt = my_strftime("%H%M", $start); my $found = 0; - my $Update = 0; for(ParseTimer(1)) { if($_->{vdr_id} == $channel) { - if($event_id && $_->{event_id}) { - if($_->{event_id} == $event_id) { - $found = 1; + if($event_id && $_->{event_id}) { + if($_->{event_id} == $event_id) { + $found = 1; last; - } - } else { - if($_->{start} eq $start) { - $found = 1; + } + } else { + if($_->{start} eq $start) { + $found = 1; last; - } - if($VDRVERSION < 10323) { - if ($_->{dor} eq my_strftime("%Y-%m-%d", $start)) { - $found = 1; - last; - } - } else { - if($_->{dor} == my_strftime("%d", $start)) { - $found = 1; - last; + } + if($start_fmt eq my_strftime("%H%M", $_->{start})) { + if($VDRVERSION < 10323) { + if($_->{dor} == my_strftime("%d", $start)) { + $found = 1; + last; + } + } else { + if($_->{dor} eq my_strftime("%Y-%m-%d", $start)) { + $found = 1; + last; + } } } } @@ -1470,6 +1483,14 @@ sub AT_ProgTimer { # we will only programm new timers, CheckTimers is responsible for # updating existing timers if (!$found) { + $title =~ s/\|/\:/g; + + my $autotimer=2; + unless(can_do_eventid_autotimer($channel)) { + $event_id = 0; + $autotimer = 1; + } + Log(LOG_AT, sprintf("AT_ProgTimer: Programming Timer \"%s\" (Event-ID %s, %s - %s)", $title, $event_id, strftime("%Y%m%d-%H%M", localtime($start)), strftime("%Y%m%d-%H%M", localtime($stop)))); ProgTimer( 0, @@ -1478,10 +1499,10 @@ sub AT_ProgTimer { $channel, $start, $stop, - $prio, - $lft, + $at->{prio} ? $at->{prio} : $CONFIG{AT_PRIORITY}, + $at->{lft} ? $at->{lft} : $CONFIG{AT_LIFETIME}, $title, - $CONFIG{TM_ADD_SUMMARY} ? $summary : "" + append_timer_metadata($VDRVERSION < 10344 ? $summary : undef, $event_id, $autotimer, $CONFIG{TM_MARGIN_BEGIN}, $CONFIG{TM_MARGIN_END}, $at->{pattern}) ); if ($CONFIG{AT_SENDMAIL} == 1 && $can_use_net_smtp) { my $sum = $summary; @@ -1542,7 +1563,7 @@ sub my_encode_qp { return $title; } -sub PackStatus { +sub PackStatus { #TODO: unused # make a 32 bit signed int with high 16 Bit as event_id and low 16 Bit as # active value my($active, $event_id) = @_; @@ -1566,13 +1587,13 @@ sub PackStatus { } } -sub UnpackActive { +sub UnpackActive { #TODO: unused my($tmstatus) = @_; # strip the first 16 bit return ($tmstatus & 0xFFFF); } -sub UnpackEvent_id { +sub UnpackEvent_id { #TODO: unused my($tmstatus) = @_; # remove the lower 16 bit by shifting the value 16 bits to the right return $tmstatus >> 16; @@ -1582,53 +1603,40 @@ sub CheckTimers { my $event; for my $timer (ParseTimer(1)) { - # only check autotimers (16th bit set) with event_id - if( ($timer->{active} & 0x8000) && ($timer->{event_id})) { + # match by event_id + if($timer->{autotimer} == $AT_BY_EVENT_ID) { for $event (@{$EPG{$timer->{vdr_id}}}) { # 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})); - # 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})) || - # don't check for changed title, as this will break autotimers' "directory" setting - if(($CONFIG{TM_ADD_SUMMARY} && ($event->{summary}) && (!$timer->{summary})) || - ($timer->{start} ne ($event->{start} - $CONFIG{TM_MARGIN_BEGIN} * 60)) || - ($timer->{stop} ne ($event->{stop} + $CONFIG{TM_MARGIN_END} * 60))) { + # (don't check for changed title, as this will break autotimers' "directory" setting) + if(($timer->{start} ne ($event->{start} - $timer->{bstart} * 60)) || + ($timer->{stop} ne ($event->{stop} + $timer->{bstop} * 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})))); ProgTimer( $timer->{id}, $timer->{active}, $timer->{event_id}, $timer->{vdr_id}, - $event->{start} - $CONFIG{TM_MARGIN_BEGIN} * 60, - $event->{stop} + $CONFIG{TM_MARGIN_END} * 60, + $event->{start} - $timer->{bstart} * 60, + $event->{stop} + $timer->{bstop} * 60, $timer->{prio}, $timer->{lft}, - # always add subtitle if there is one - #$event->{subtitle} ? ($event->{title} . "~" . $event->{subtitle}) : $event->{title}, # 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} : ( $CONFIG{TM_ADD_SUMMARY} ? $event->{summary} : "" ), + # leave summary untouched. + $timer->{summary}, ); Log(LOG_CHECKTIMER, sprintf("CheckTimers: Timer %s updated.", $timer->{id})); } } } } - # all autotimers without event_id will be updated by channel number and start/stop time - elsif( ($timer->{active} & 0x8000) && (!$timer->{event_id})) { - # We're checking only timers which doesn't record + # match by channel number and start/stop time + elsif($timer->{autotimer} == $AT_BY_TIME) { + # We're checking only timers which don't record if ($timer->{start} > time()) { Log(LOG_CHECKTIMER, sprintf("CheckTimers: Checking timer \"%s\" (No. %s) for changes by recording time", $timer->{title}, $timer->{id})); my @eventlist; @@ -1642,7 +1650,7 @@ sub CheckTimers { # now we have all events in eventlist that touch the old timer margins # check for each event how probable it is matching the old timer if(scalar(@eventlist) > 0) { - my $origlen = ($timer->{stop} - $CONFIG{TM_MARGIN_END} * 60) - ($timer->{start} + $CONFIG{TM_MARGIN_BEGIN} * 60); + my $origlen = ($timer->{stop} - $timer->{bstop} * 60) - ($timer->{start} + $timer->{bstart} * 60); my $maxwight = 0; $event = $eventlist[0]; @@ -1668,23 +1676,22 @@ sub CheckTimers { } } # update timer if the existing one differs from the EPG - if(($CONFIG{TM_ADD_SUMMARY} && ($event->{summary}) && (!$timer->{summary})) || - ($timer->{start} > ($event->{start} - $CONFIG{TM_MARGIN_BEGIN} * 60)) || - ($timer->{stop} < ($event->{stop} + $CONFIG{TM_MARGIN_END} * 60))) { + if(($timer->{start} > ($event->{start} - $timer->{bstart} * 60)) || + ($timer->{stop} < ($event->{stop} + $timer->{bstop} * 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})))); ProgTimer( $timer->{id}, $timer->{active}, 0, $timer->{vdr_id}, - $timer->{start} > ($event->{start} - $CONFIG{TM_MARGIN_BEGIN} * 60) ? $event->{start} - $CONFIG{TM_MARGIN_BEGIN} * 60 : $timer->{start}, - $timer->{stop} < ($event->{stop} + $CONFIG{TM_MARGIN_END} * 60) ? $event->{stop} + $CONFIG{TM_MARGIN_END} * 60 : $timer->{stop}, + $timer->{start} > ($event->{start} - $timer->{bstart} * 60) ? $event->{start} - $timer->{bstart} * 60 : $timer->{start}, + $timer->{stop} < ($event->{stop} + $timer->{bstop} * 60) ? $event->{stop} + $timer->{bstop} * 60 : $timer->{stop}, $timer->{prio}, $timer->{lft}, # don't touch the title since we're not too sure about the event $timer->{title}, - # If there already is a summary, the user might have changed it -- leave it untouched. - $timer->{summary} ? $timer->{summary} : ( $CONFIG{TM_ADD_SUMMARY} ? $event->{summary} : "" ), + # leave summary untouched. + $timer->{summary}, ); Log(LOG_CHECKTIMER, sprintf("CheckTimers: Timer %s updated.", $timer->{id})); } @@ -1712,7 +1719,7 @@ sub my_mktime { } sub ParseTimer { - my $pc = shift; + my $pc = shift; #TODO: what's this supposed to do? my $tid = shift; my $entry = 1; @@ -1721,19 +1728,18 @@ sub ParseTimer { last if(/^No timers defined/); chomp; my($id, $temp) = split(/ /, $_, 2); - my($tmstatus, $vdr_id, $dor, $start, $stop, $prio, $lft, $title, $summary) = split(/\:/, $temp, 9); + my($active, $vdr_id, $dor, $start, $stop, $prio, $lft, $title, $summary) = split(/\:/, $temp, 9); my($startsse, $stopsse, $weekday, $off, $perrec, $length, $first); - my($active, $event_id); - $active = UnpackActive($tmstatus); - $event_id = UnpackEvent_id($tmstatus); + my($autotimer, $event_id, $bstart, $bstop, $pattern); + ($autotimer, $event_id, $bstart, $bstop, $pattern) = extract_timer_metadata($summary); # VDR > 1.3.24 sets a bit if it's currently recording my $recording = 0; $recording = 1 if(($active & 8) == 8); $active = 1 if($active == 3 || $active == 9); - #$active = 1 if(($active & 1) == 1); + #$active = 1 if(($active & 1) == 1); #TODO # replace "|" by ":" in timer's title (man vdr.5) $title =~ s/\|/\:/g; @@ -1813,7 +1819,11 @@ 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&vdr_id=%s", $MyURL, $vdr_id), + autotimer => $autotimer, + bstart => $bstart, + bstop => $bstop, + pattern => $pattern }); $first = 0; } @@ -1840,7 +1850,11 @@ 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&vdr_id=%s", $MyURL, $vdr_id), + autotimer => $autotimer, + bstart => $bstart, + bstop => $bstop, + pattern => $pattern }); } @@ -1857,6 +1871,36 @@ sub ParseTimer { } } +# extract out own metadata from a timer's aux field. +sub extract_timer_metadata { + my $aux = shift; + return unless( $aux =~ /<vdradmin-am>(.*)<\/vdradmin-am>/i); + $aux = $1; + my $epg_id = $1 if ($aux =~ /<epgid>(.*)<\/epgid>/i); + my $autotimer = $1 if ($aux =~ /<autotimer>(.*)<\/autotimer>/i); + my $bstart = $1 if ($aux =~ /<bstart>(.*)<\/bstart>/i); + my $bstop = $1 if ($aux =~ /<bstop>(.*)<\/bstop>/i); + my $pattern = $1 if ($aux =~ /<pattern>(.*)<\/pattern>/i); + return ($autotimer, $epg_id, $bstart, $bstop, $pattern); +} + +sub append_timer_metadata { + my ($aux, $epg_id, $autotimer, $bstart, $bstop, $pattern) = @_; + # remove old autotimer info + $aux =~ s/\|?<vdradmin-am>.*<\/vdradmin-am>//i; + $aux = substr($aux, 0, 9000) if($VDRVERSION < 10336 and length($aux) > 9000); + # add a new line if VDR<1.3.44 because then there might be a summary + $aux .= "|" if($VDRVERSION < 10344 and length($aux)); + $aux .= "<vdradmin-am>"; + $aux .= "<epgid>$epg_id</epgid>" if($epg_id); + $aux .= "<autotimer>$autotimer</autotimer>" if($autotimer); + $aux .= "<bstart>$bstart</bstart>" if($bstart); + $aux .= "<bstop>$bstop</bstop>" if($bstop); + $aux .= "<pattern>$pattern</pattern>" if($pattern); + $aux .= "</vdradmin-am>"; + return $aux; +} + ############################################################################# # Tools ############################################################################# @@ -1894,29 +1938,15 @@ sub ProgTimer { $title =~ s/\:/|/g; # replace ":" by "|" in timer's title (man vdr.5) - if(($CONFIG{NO_EVENTID} == 1) && ($event_id > 0)) { - $event_id = 0; - Log(LOG_CHECKTIMER, sprintf("ProgTimer: Event-ID removed for recording \"%s\"", $title)); - } else { - for my $n (split(",", $CONFIG{NO_EVENTID_ON})) { - if(($n == $channel) && ($event_id > 0)) { - $event_id = 0; - Log(LOG_CHECKTIMER, sprintf("ProgTimer: Event-ID removed for recording \"%s\" on channel %s", $title, $channel)); - } - } - } - my $send_cmd = $timer_id ? "modt $timer_id" : "newt"; - my $send_active = $active & 0x8000 ? PackStatus($active, $event_id) : $active; my $send_dor = $dor ? $dor : RemoveLeadingZero(strftime("%d", localtime($start))); - my $send_summary = ($VDRVERSION >= 10336) ? $summary : substr($summary, 0, $VDR_MAX_SVDRP_LENGTH - 9 - length($send_cmd) - length($send_active) - length($channel) - length($send_dor) - 8 - length($prio) - length($lft) - length($title)); + my $send_summary = ($VDRVERSION >= 10336) ? $summary : substr($summary, 0, $VDR_MAX_SVDRP_LENGTH - 9 - length($send_cmd) - length($active) - length($channel) - length($send_dor) - 8 - length($prio) - length($lft) - length($title)); - Log(LOG_AT, sprintf("ProgTimer: Programming Timer \"%s\" (Channel %s, Event-ID %s, %s - %s, Active %s)", $title, $channel, $event_id, my_strftime("%Y%m%d-%H%M", $start), my_strftime("%Y%m%d-%H%M", $stop), $send_active)); + Log(LOG_AT, sprintf("ProgTimer: Programming Timer \"%s\" (Channel %s, Event-ID %s, %s - %s, Active %s)", $title, $channel, $event_id, my_strftime("%Y%m%d-%H%M", $start), my_strftime("%Y%m%d-%H%M", $stop), $active)); my $return = SendCMD( sprintf("%s %s:%s:%s:%s:%s:%s:%s:%s:%s", $send_cmd, - # only autotimers with 16th bit set will be extended by the event_id - $send_active, + $active, $channel, $send_dor, strftime("%H%M", localtime($start)), @@ -1939,7 +1969,7 @@ sub RedirectToReferer { } } -sub salt { +sub salt { #TODO: unused $_ = $_[0]; my $string; my($offset1, $offset2); @@ -2054,7 +2084,7 @@ sub my_strfgmtime { return(strftime($format, $time ? gmtime($time) : gmtime(time))); } -sub GetFirstChannel { +sub GetFirstChannel { #TODO: unused return($CHAN[0]->{service_id}); } @@ -2075,13 +2105,13 @@ sub Decode_Referer { return(MIME::Base64::decode_base64(shift)); } -sub encode_ref { +sub encode_ref { #TODO: unused my($tmp) = $_[0]->url(-relative=>1,-query=>1); my(undef, $query) = split(/\?/, $tmp, 2); return(MIME::Base64::encode_base64($query)); } -sub decode_ref { +sub decode_ref { #TODO: unused return(MIME::Base64::decode_base64($_[0])); } @@ -2280,8 +2310,7 @@ sub toolbar { return(header("200", "text/html", $template->output)); } -# obsolete? -sub show_top { +sub show_top { #TODO: unused? my $template = TemplateNew("top.html"); return(header("200", "text/html", $template->output)); } @@ -2617,7 +2646,7 @@ sub timer_list { if($VDRVERSION < 10324 && $timer->{recording} == 0 && $timer->{startsse} < time() && $timer->{stopsse} > time() && ($timer->{active} & 1)) { $timer->{recording} = 1; } - if($timer->{active} & 1) { + if($timer->{active} & 1) { #TODO if($timer->{active} & 0x8000) { $timer->{active} = 0x8001; } @@ -2914,13 +2943,14 @@ sub timer_new_form { my $this_event; if($epg_id) { # new timer my $this = EPG_getEntry($vdr_id, $epg_id); - $this_event->{active} = 0x8001; + $this_event->{active} = 1; $this_event->{event_id} = $this->{event_id}; $this_event->{start} = $this->{start} - ($CONFIG{TM_MARGIN_BEGIN} * 60); $this_event->{stop} = $this->{stop} + ($CONFIG{TM_MARGIN_END} * 60); $this_event->{dor} = $this->{dor}; $this_event->{title} = $this->{title}; - $this_event->{summary}= $CONFIG{TM_ADD_SUMMARY} ? $this->{summary} : ""; + # Do NOT append EPG summary if VDR >= 10344 as this will be done by VDR itself + $this_event->{summary}= $this->{summary} if($VDRVERSION < 10344); $this_event->{vdr_id} = $this->{vdr_id}; } elsif($timer_id) { # edit existing timer $this_event = ParseTimer(0, $timer_id); @@ -2939,21 +2969,7 @@ sub timer_new_form { # determine referer (redirect to where we come from) my $ref = getReferer(); - - # check if we may use Event-IDs in general or not - if($CONFIG{NO_EVENTID} == 1) { - # OK, remove Event-ID - $this_event->{event_id} = 0; - } else { - # check if the current channel is on the Event-ID-blacklist - for my $n (split(",", $CONFIG{NO_EVENTID_ON})) { - if($n == $this_event->{vdr_id}) { - # OK, remove Event-ID, on this channel no recording may have one. - $this_event->{event_id} = 0; - } - } - } - + my $displaysummary = $this_event->{summary}; $displaysummary =~ s/\|/\n/g; my $displaytitle = $this_event->{title}; @@ -2963,7 +2979,7 @@ sub timer_new_form { usercss => $UserCSS, url => $MyURL, active => $this_event->{active} & 1, - event_id => ($this_event->{event_id} << 1) + (($this_event->{active} & 0x8000) >> 15), + event_id => $this_event->{event_id}, starth => my_strftime("%H", $this_event->{start}), startm => my_strftime("%M", $this_event->{start}), stoph => $this_event->{stop} ? my_strftime("%H", $this_event->{stop}) : "00", @@ -2977,6 +2993,8 @@ sub timer_new_form { timer_id => $timer_id ? $timer_id : 0, channels => \@channels, newtimer => $timer_id ? 0 : 1, + autotimer => $timer_id ? $this_event->{autotimer} : $AT_OFF, + at_epg => $this_event->{event_id} > 0 ? can_do_eventid_autotimer($this_event->{vdr_id}) : 0, referer => $ref ? Encode_Referer($ref) : undef, help_url => HelpURL("timer_new") }; @@ -2996,59 +3014,46 @@ sub timer_add { my $data; if($q->param("save")) { - if($q->param("starth") =~ /\d+/ && $q->param("starth") < 24 && $q->param("starth") >= 0) { - $data->{start} = $q->param("starth"); - } else { print "Help!\n"; } - if($q->param("startm") =~ /\d+/ && $q->param("startm") < 60 && $q->param("startm") >= 0) { - $data->{start} .= $q->param("startm"); - } else { print "Help!\n"; } - - if($q->param("stoph") =~ /\d+/ && $q->param("stoph") < 24 && $q->param("stoph") >= 0) { - $data->{stop} = $q->param("stoph"); - } else { print "Help!\n"; } - if($q->param("stopm") =~ /\d+/ && $q->param("stopm") < 60 && $q->param("stopm") >= 0) { - $data->{stop} .= $q->param("stopm"); - } else { print "Help!\n"; } - - if($q->param("prio") =~ /\d+/) { - $data->{prio} = $q->param("prio"); - } - - if($q->param("lft") =~ /\d+/) { - $data->{lft} = $q->param("lft"); + my $value = $q->param("starth"); + if($value =~ /\d+/ && $value < 24 && $value >= 0) { + $data->{start} = sprintf("%02d", $value); + } else { + print "Help!\n"; + $data->{start} = "00"; } - - if($q->param("active") == 0 || $q->param("active") == 1) { - $data->{active} = $q->param("active"); - } - - if($q->param("vps") == 1) { - $data->{active} |= 4; + $value = $q->param("startm"); + if($value =~ /\d+/ && $value < 60 && $value >= 0) { + $data->{start} .= sprintf("%02d", $value); + } else { + print "Help!\n"; + $data->{start} .= "00"; } - if($q->param("event_id") == 0) { - $data->{event_id} = 0; + $value = $q->param("stoph"); + if($value =~ /\d+/ && $value < 24 && $value >= 0) { + $data->{stop} = sprintf("%02d", $value); + } else { + print "Help!\n"; + $data->{stop} = "00"; } - - # if($q->param("event_id") == 1 && $data->{active} == 1) { - if($q->param("event_id") == 1) { - $data->{event_id} = 0; - $data->{active} |= 0x8000; + $value = $q->param("stopm"); + if($value =~ /\d+/ && $value < 60 && $value >= 0) { + $data->{stop} .= sprintf("%02d", $value); + } else { + print "Help!\n"; + $data->{stop} .= "00"; } - # if($q->param("event_id") > 1 && $data->{active} == 1) { - if($q->param("event_id") > 1) { - $data->{event_id} = ($q->param("event_id") >> 1); - $data->{active} |= 0x8000; - } + $data->{active} = $q->param("active"); + $data->{autotimer} = $q->param("autotimer"); + $data->{event_id} = $q->param("event_id"); - if($q->param("dor") =~ /[0-9MTWTFSS@-]+/) { - $data->{dor} = $q->param("dor"); - } - - if($q->param("channel") =~ /\d+/) { - $data->{channel} = $q->param("channel"); - } + $data->{prio} = $1 if($q->param("prio") =~ /(\d+)/); + $data->{lft} = $1 if($q->param("lft") =~ /(\d+)/); + $data->{dor} = $1 if($q->param("dor") =~ /([0-9MTWTFSS@\-]+)/); + $data->{channel} = $1 if($q->param("channel") =~ /(\d+)/); + + $data->{active} |= 4 if($q->param("vps") == 1); if(length($q->param("title")) > 0) { $data->{title} = $q->param("title"); @@ -3069,14 +3074,19 @@ sub timer_add { $dor = 1; } $data->{startsse} = my_mktime(substr($data->{start}, 2, 2), - substr($data->{start}, 0, 2), $dor, - (my_strftime("%m") - 1), my_strftime("%Y")); + substr($data->{start}, 0, 2), + $dor, + (my_strftime("%m") - 1), + my_strftime("%Y")); $data->{stopsse} = my_mktime(substr($data->{stop}, 2, 2), - substr($data->{stop}, 0, 2), - $data->{stop} > $data->{start} ? $dor : $dor + 1, - (my_strftime("%m") - 1), my_strftime("%Y")); - + substr($data->{stop}, 0, 2), + $data->{stop} > $data->{start} ? $dor : $dor + 1, + (my_strftime("%m") - 1), + my_strftime("%Y")); + + $data->{event_id} = 0 unless(can_do_eventid_autotimer($data->{channel})); + my $return = ProgTimer( $timer_id, $data->{active}, @@ -3087,7 +3097,7 @@ sub timer_add { $data->{prio}, $data->{lft}, $data->{title}, - $data->{summary}, + append_timer_metadata($data->{summary}, $data->{event_id}, $data->{autotimer}, $CONFIG{TM_MARGIN_BEGIN}, $CONFIG{TM_MARGIN_END}, undef), ($dor == 1) ? $data->{dor} : undef ); @@ -3613,7 +3623,7 @@ sub at_timer_test { done => $q->param("done"), directory => $q->param("directory"), at_test => 1, - matches => \@at_matches + matches => \@at_matches }; $template->param($vars); my $output; @@ -3808,7 +3818,7 @@ sub prog_summary { $search =~ s/([\+\?\.\*\^\$\(\)\[\]\{\}\|\\])/\\$1/g; } } - + my $now = time(); my(@show, @shows, @temp); for(keys(%EPG)) { |