summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY14
-rw-r--r--locale/de/LC_MESSAGES/vdradmin.mobin60389 -> 60452 bytes
-rw-r--r--locale/es/LC_MESSAGES/vdradmin.mobin58526 -> 58595 bytes
-rw-r--r--locale/fi/LC_MESSAGES/vdradmin.mobin13851 -> 13912 bytes
-rw-r--r--locale/fr/LC_MESSAGES/vdradmin.mobin34108 -> 34108 bytes
-rw-r--r--locale/nl/LC_MESSAGES/vdradmin.mobin58202 -> 58282 bytes
-rw-r--r--po/de.po91
-rw-r--r--po/es.po93
-rw-r--r--po/fi.po85
-rw-r--r--po/fr.po85
-rw-r--r--po/nl.po107
-rw-r--r--po/vdradmin.pot83
-rw-r--r--template/default/about.html4
-rw-r--r--template/default/bilder/noise.gifbin0 -> 11824 bytes
l---------template/default/copper/noise.gif1
l---------template/default/default/noise.gif1
-rw-r--r--template/default/help.html4
-rw-r--r--template/default/prog_summary.html2
-rwxr-xr-xvdradmind.pl83
19 files changed, 360 insertions, 293 deletions
diff --git a/HISTORY b/HISTORY
index f10e5d5..63115c4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4,6 +4,20 @@ E-Mail: mail AT andreas DOT vdr-developer DOT org
VDR-Portal: amair
-----------------------------------------------------------
+2006-03-02: 3.4.3a
+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).
+- Fixed "Length of base64 data not a multiple of 4" warning (Reported by Johan Larsson).
+
2006-02-10: 3.4.3rc3
- Changed handling of refering pages; should work much better now.
diff --git a/locale/de/LC_MESSAGES/vdradmin.mo b/locale/de/LC_MESSAGES/vdradmin.mo
index 0b0bfaf..bff08ec 100644
--- a/locale/de/LC_MESSAGES/vdradmin.mo
+++ b/locale/de/LC_MESSAGES/vdradmin.mo
Binary files differ
diff --git a/locale/es/LC_MESSAGES/vdradmin.mo b/locale/es/LC_MESSAGES/vdradmin.mo
index 18c7a8d..c71c6e3 100644
--- a/locale/es/LC_MESSAGES/vdradmin.mo
+++ b/locale/es/LC_MESSAGES/vdradmin.mo
Binary files differ
diff --git a/locale/fi/LC_MESSAGES/vdradmin.mo b/locale/fi/LC_MESSAGES/vdradmin.mo
index 1eea106..5eb3e1b 100644
--- a/locale/fi/LC_MESSAGES/vdradmin.mo
+++ b/locale/fi/LC_MESSAGES/vdradmin.mo
Binary files differ
diff --git a/locale/fr/LC_MESSAGES/vdradmin.mo b/locale/fr/LC_MESSAGES/vdradmin.mo
index d7cfc60..bcff654 100644
--- a/locale/fr/LC_MESSAGES/vdradmin.mo
+++ b/locale/fr/LC_MESSAGES/vdradmin.mo
Binary files differ
diff --git a/locale/nl/LC_MESSAGES/vdradmin.mo b/locale/nl/LC_MESSAGES/vdradmin.mo
index fd2f415..b163479 100644
--- a/locale/nl/LC_MESSAGES/vdradmin.mo
+++ b/locale/nl/LC_MESSAGES/vdradmin.mo
Binary files differ
diff --git a/po/de.po b/po/de.po
index 6d16527..ab1c6ce 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDRAdmin-AM-3.4.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-30 12:21+0100\n"
+"POT-Creation-Date: 2006-03-01 08:07+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"
@@ -64,7 +64,7 @@ msgstr "Timer editieren"
#: ../template/default/config.html:23 ../template/default/timer_list.html:51
#: ../template/default/rec_list.html:27
#: ../template/default/at_timer_new.html:24
-#: ../template/default/navigation.html:76 ../template/default/help.html:6
+#: ../template/default/navigation.html:70 ../template/default/help.html:6
msgid "Help"
msgstr "Hilfe"
@@ -183,13 +183,12 @@ msgstr "Startzeit:"
#: ../template/default/timer_new.html:127
#: ../template/default/timer_new.html:138
-#: ../template/default/prog_summary.html:21
#: ../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
+#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3908
msgid "o'clock"
msgstr "Uhr"
@@ -356,7 +355,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:4439
+#: ../template/default/navigation.html:30 ../vdradmind.pl:4483
msgid "What's On Now?"
msgstr "Was läuft jetzt?"
@@ -481,7 +480,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:4441
+#: ../template/default/navigation.html:38 ../vdradmind.pl:4485
msgid "Timeline"
msgstr "Zeitleiste"
@@ -755,7 +754,7 @@ msgid "Delete Selected Timers"
msgstr "Ausgewählte Timer löschen"
#: ../template/default/prog_list.html:6 ../template/default/navigation.html:42
-#: ../vdradmind.pl:4442
+#: ../vdradmind.pl:4486
msgid "Channels"
msgstr "Programmübersicht"
@@ -821,7 +820,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:4444
+#: ../template/default/navigation.html:54 ../vdradmind.pl:4488
msgid "Recordings"
msgstr "Aufnahmen"
@@ -1311,7 +1310,7 @@ msgid "to"
msgstr "bis"
#: ../template/default/prog_list2.html:6
-#: ../template/default/navigation.html:34 ../vdradmind.pl:2538
+#: ../template/default/navigation.html:34 ../vdradmind.pl:2565
msgid "Playing Today"
msgstr "Was läuft heute?"
@@ -1929,14 +1928,14 @@ msgstr "Nicht gefunden"
msgid "Watch TV"
msgstr "Fernseher"
-#: ../template/default/navigation.html:70
-msgid "Search"
-msgstr "Suchen"
-
-#: ../template/default/navigation.html:80 ../template/default/about.html:6
+#: ../template/default/navigation.html:74 ../template/default/about.html:6
msgid "About"
msgstr "Über"
+#: ../template/default/navigation.html:78
+msgid "Search"
+msgstr "Suchen"
+
#: ../template/default/help.html:18
msgid "Getting Help and Reporting Bugs"
msgstr "Hilfe bekommen und Fehler melden"
@@ -1953,24 +1952,24 @@ msgstr ""
#: ../template/default/help.html:31
msgid ""
"If this doesn't provide the information you need you can try to get help at "
-"<a href=\"http://www.vdrportal.de\" target=\"_new\">VDR-Portal</a> if you "
+"<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> if you "
"understand German language. Please use the announcement thread if possible, "
"search for:"
msgstr ""
"Wenn dies nicht die benötigte Information liefert, dann können Sie versuchen "
-"Hilfe im <a href=\"http://www.vdrportal.de\" target=\"_new\">VDR-Portal</a> "
-"zu bekommen. Bitte verwenden Sie hierfür wenn möglich den "
+"Hilfe im <a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</"
+"a> zu bekommen. Bitte verwenden Sie hierfür wenn möglich den "
"Ankündigungsthread, suchen Sie dafür nach:"
#: ../template/default/help.html:32
msgid ""
"If you think you have found a bug please check that it's a new one and "
"report it in the <a href=\"http://www.vdr-developer.org/mantisbt/main_page."
-"php\" target=\"_new\">VDRAdmin-AM BugTracking system</a>."
+"php\" target=\"_blank\">VDRAdmin-AM BugTracking system</a>."
msgstr ""
"Wenn Sie meinen, dass Sie einen Fehler gefunden haben, dann überprüfen Sie "
"im <a href=\"http://www.vdr-developer.org/mantisbt/main_page.php\" target="
-"\"_new\">VDRAdmin-AM BugTracking System</a>, ob es sich um einen neuen "
+"\"_blank\">VDRAdmin-AM BugTracking System</a>, ob es sich um einen neuen "
"Fehler handelt und legen Sie gegebenenfalls einen neuen Fehlerbericht an."
#: ../template/default/about.html:18
@@ -2017,112 +2016,116 @@ msgstr "Deutsch:"
msgid "Spanish:"
msgstr "Spanisch:"
-#: ../vdradmind.pl:286
+#: ../vdradmind.pl:289
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:287
+#: ../vdradmind.pl:290
msgid "On which port does VDR listen to SVDRP queries?"
msgstr "Auf welchem Port hört der VDR auf SVDRP-Anfragen?"
-#: ../vdradmind.pl:288
+#: ../vdradmind.pl:291
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:289
+#: ../vdradmind.pl:292
msgid "On which port should VDRAdmin-AM listen?"
msgstr "Auf welchem Port soll VDRAdmin-AM hören?"
-#: ../vdradmind.pl:290
+#: ../vdradmind.pl:293
msgid "Username?"
msgstr "Benutzername?"
-#: ../vdradmind.pl:291
+#: ../vdradmind.pl:294
msgid "Password?"
msgstr "Passwort?"
-#: ../vdradmind.pl:292
+#: ../vdradmind.pl:295
msgid "Where are your recordings stored?"
msgstr "Wo befinden sich die Aufnahmen?"
-#: ../vdradmind.pl:293
+#: ../vdradmind.pl:296
msgid "Where are your VDR's configuration files located?"
msgstr "Wo befinden sich die Konfigurationsdateien des VDR?"
-#: ../vdradmind.pl:299
+#: ../vdradmind.pl:302
msgid "Config file written successfully."
msgstr "Konfigurationsdatei wurde erfolgreich geschrieben."
-#: ../vdradmind.pl:351
+#: ../vdradmind.pl:354
#, perl-format
msgid "vdradmind.pl %s started with pid %d."
msgstr "vdradmind.pl %s wurde mit der Prozeß-ID %d gestartet."
-#: ../vdradmind.pl:405 ../vdradmind.pl:997 ../vdradmind.pl:1841
+#: ../vdradmind.pl:408 ../vdradmind.pl:1000 ../vdradmind.pl:1865
msgid "Not found"
msgstr "Nicht gefunden"
-#: ../vdradmind.pl:405 ../vdradmind.pl:1842
+#: ../vdradmind.pl:408 ../vdradmind.pl:1866
msgid "The requested URL was not found on this server!"
msgstr "Die angeforderte URL konnte auf dem Server nicht gefunden werden!"
-#: ../vdradmind.pl:473 ../vdradmind.pl:993 ../vdradmind.pl:1844
+#: ../vdradmind.pl:476 ../vdradmind.pl:996 ../vdradmind.pl:1868
msgid "Forbidden"
msgstr "Verboten"
-#: ../vdradmind.pl:473 ../vdradmind.pl:1845
+#: ../vdradmind.pl:476 ../vdradmind.pl:1869
msgid "You don't have permission to access this function!"
msgstr "Sie haben nicht die Erlaubnis diese Funktion aufzurufen!"
-#: ../vdradmind.pl:993 ../vdradmind.pl:1846
+#: ../vdradmind.pl:996 ../vdradmind.pl:1870
#, perl-format
msgid "Access to file \"%s\" denied!"
msgstr "Zugriff auf Datei \"%s\" verweigert!"
-#: ../vdradmind.pl:997 ../vdradmind.pl:1843
+#: ../vdradmind.pl:1000 ../vdradmind.pl:1867
#, perl-format
msgid "The URL \"%s\" was not found on this server!"
msgstr "Die URL \"%s\" wurde auf dem Server nicht gefunden!"
-#: ../vdradmind.pl:1847
+#: ../vdradmind.pl:1871
#, perl-format
msgid "Can't open file \"%s\"!"
msgstr "Kann Datei \"%s\" nicht öffnen!"
-#: ../vdradmind.pl:1848
+#: ../vdradmind.pl:1872
#, perl-format
msgid "Can't connect to VDR at %s!"
msgstr "Konnte Verbindung zu %s nicht aufbauen!"
-#: ../vdradmind.pl:1849
+#: ../vdradmind.pl:1873
#, perl-format
msgid "Error while sending command to VDR at %s"
msgstr "Fehler beim Senden eines Kommandos zu %s"
-#: ../vdradmind.pl:2538
+#: ../vdradmind.pl:2565
msgid "Playing Tomorrow"
msgstr "Was läuft morgen"
-#: ../vdradmind.pl:2538
+#: ../vdradmind.pl:2565
#, perl-format
msgid "Playing on the %d."
msgstr "Was läuft am %d."
-#: ../vdradmind.pl:3920
+#: ../vdradmind.pl:3908
+msgid "Suitable matches for:"
+msgstr "Suchergebnis für"
+
+#: ../vdradmind.pl:3963
msgid "Schedule"
msgstr "Übersicht"
-#: ../vdradmind.pl:4440
+#: ../vdradmind.pl:4484
msgid "Playing Today?"
msgstr "Was läuft heute?"
-#: ../vdradmind.pl:4443
+#: ../vdradmind.pl:4487
msgid "Timers"
msgstr "Timer"
-#: ../vdradmind.pl:4506
+#: ../vdradmind.pl:4550
msgid "System default"
msgstr "Systemstandard"
diff --git a/po/es.po b/po/es.po
index e68793c..279cb16 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: VDRAdmin-AM-3.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-30 12:21+0100\n"
-"PO-Revision-Date: 2006-01-17 18:08+0100\n"
-"Last-Translator: propietario <propietario@wanadoo.es>\n"
+"POT-Creation-Date: 2006-03-01 08:07+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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
@@ -68,7 +68,7 @@ msgstr "Modificar programación"
#: ../template/default/config.html:23 ../template/default/timer_list.html:51
#: ../template/default/rec_list.html:27
#: ../template/default/at_timer_new.html:24
-#: ../template/default/navigation.html:76 ../template/default/help.html:6
+#: ../template/default/navigation.html:70 ../template/default/help.html:6
msgid "Help"
msgstr "Ayuda"
@@ -187,13 +187,12 @@ msgstr "Comienzo:"
#: ../template/default/timer_new.html:127
#: ../template/default/timer_new.html:138
-#: ../template/default/prog_summary.html:21
#: ../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
+#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3908
msgid "o'clock"
msgstr "h."
@@ -361,7 +360,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:4439
+#: ../template/default/navigation.html:30 ../vdradmind.pl:4483
msgid "What's On Now?"
msgstr "Estrenos ahora"
@@ -486,7 +485,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:4441
+#: ../template/default/navigation.html:38 ../vdradmind.pl:4485
msgid "Timeline"
msgstr "Tabla de tiempo"
@@ -761,7 +760,7 @@ msgid "Delete Selected Timers"
msgstr "Borrar programaciones elegidas"
#: ../template/default/prog_list.html:6 ../template/default/navigation.html:42
-#: ../vdradmind.pl:4442
+#: ../vdradmind.pl:4486
msgid "Channels"
msgstr "EPG por emisoras"
@@ -827,7 +826,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:4444
+#: ../template/default/navigation.html:54 ../vdradmind.pl:4488
msgid "Recordings"
msgstr "Grabaciones"
@@ -1311,7 +1310,7 @@ msgid "to"
msgstr "hasta"
#: ../template/default/prog_list2.html:6
-#: ../template/default/navigation.html:34 ../vdradmind.pl:2538
+#: ../template/default/navigation.html:34 ../vdradmind.pl:2565
msgid "Playing Today"
msgstr "Estrenos hoy"
@@ -1958,14 +1957,14 @@ msgstr "Nada igual encontrado!"
msgid "Watch TV"
msgstr "Televisión"
-#: ../template/default/navigation.html:70
-msgid "Search"
-msgstr "Buscar"
-
-#: ../template/default/navigation.html:80 ../template/default/about.html:6
+#: ../template/default/navigation.html:74 ../template/default/about.html:6
msgid "About"
msgstr "Acerca de"
+#: ../template/default/navigation.html:78
+msgid "Search"
+msgstr "Buscar"
+
#: ../template/default/help.html:18
msgid "Getting Help and Reporting Bugs"
msgstr "Recibir ayuda y comentar \"Bugs\" (fallos)"
@@ -1982,12 +1981,12 @@ msgstr ""
#: ../template/default/help.html:31
msgid ""
"If this doesn't provide the information you need you can try to get help at "
-"<a href=\"http://www.vdrportal.de\" target=\"_new\">VDR-Portal</a> if you "
+"<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> if you "
"understand German language. Please use the announcement thread if possible, "
"search for:"
msgstr ""
"Si no te sirve esta información puedes intentar conseguir ayuda en la página "
-"<a href=\"http://www.vdrportal.de\" target=\"_new\">VDR-Portal</a> si "
+"<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> si "
"entiendes alemán (lo siento...). Para empezar alli aprovecha la funcción "
"\"suchen\" por:"
@@ -1995,11 +1994,11 @@ msgstr ""
msgid ""
"If you think you have found a bug please check that it's a new one and "
"report it in the <a href=\"http://www.vdr-developer.org/mantisbt/main_page."
-"php\" target=\"_new\">VDRAdmin-AM BugTracking system</a>."
+"php\" target=\"_blank\">VDRAdmin-AM BugTracking system</a>."
msgstr ""
"Si crees, que has encontrado un fallo, asegúrate que sea un fallo "
"desconocido y entonces comentalo en <a href=\"http://www.vdr-developer.org/"
-"mantisbt/main_page.php\" target=\"_new\">VDRAdmin-AM BugTracking system "
+"mantisbt/main_page.php\" target=\"_blank\">VDRAdmin-AM BugTracking system "
"(sistema de seguimiento de fallos)</a>."
#: ../template/default/about.html:18
@@ -2046,109 +2045,113 @@ msgstr "Alemán:"
msgid "Spanish:"
msgstr "Español:"
-#: ../vdradmind.pl:286
+#: ../vdradmind.pl:289
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:287
+#: ../vdradmind.pl:290
msgid "On which port does VDR listen to SVDRP queries?"
msgstr "¿Cuál puerto esta vigilando VDR para requeridas de SVDRP?"
-#: ../vdradmind.pl:288
+#: ../vdradmind.pl:291
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:289
+#: ../vdradmind.pl:292
msgid "On which port should VDRAdmin-AM listen?"
msgstr "¿Qué puerto debe VDRAdmin-AM esperar órdenes?"
-#: ../vdradmind.pl:290
+#: ../vdradmind.pl:293
msgid "Username?"
msgstr "¿Nombre del usuario?"
-#: ../vdradmind.pl:291
+#: ../vdradmind.pl:294
msgid "Password?"
msgstr "¿Contraseña?"
-#: ../vdradmind.pl:292
+#: ../vdradmind.pl:295
msgid "Where are your recordings stored?"
msgstr "Introduce la ruta de las grabaciones:"
-#: ../vdradmind.pl:293
+#: ../vdradmind.pl:296
msgid "Where are your VDR's configuration files located?"
msgstr "Introduce la ruta de los archivos de configuración:"
-#: ../vdradmind.pl:299
+#: ../vdradmind.pl:302
msgid "Config file written successfully."
msgstr "¡Los archivos de configuración han creado!"
-#: ../vdradmind.pl:351
+#: ../vdradmind.pl:354
#, perl-format
msgid "vdradmind.pl %s started with pid %d."
msgstr "vdradmind.pl %s se ha iniciado con pid %d."
-#: ../vdradmind.pl:405 ../vdradmind.pl:997 ../vdradmind.pl:1841
+#: ../vdradmind.pl:408 ../vdradmind.pl:1000 ../vdradmind.pl:1865
msgid "Not found"
msgstr "No encontrado"
-#: ../vdradmind.pl:405 ../vdradmind.pl:1842
+#: ../vdradmind.pl:408 ../vdradmind.pl:1866
msgid "The requested URL was not found on this server!"
msgstr "¡No encontrado la URL requerida, en el servidor!"
-#: ../vdradmind.pl:473 ../vdradmind.pl:993 ../vdradmind.pl:1844
+#: ../vdradmind.pl:476 ../vdradmind.pl:996 ../vdradmind.pl:1868
msgid "Forbidden"
msgstr "Prohibido"
-#: ../vdradmind.pl:473 ../vdradmind.pl:1845
+#: ../vdradmind.pl:476 ../vdradmind.pl:1869
msgid "You don't have permission to access this function!"
msgstr "¡No tienes permiso para ésta funcción!"
-#: ../vdradmind.pl:993 ../vdradmind.pl:1846
+#: ../vdradmind.pl:996 ../vdradmind.pl:1870
#, perl-format
msgid "Access to file \"%s\" denied!"
msgstr "¡Acceso al archivo \"%s\" negado!"
-#: ../vdradmind.pl:997 ../vdradmind.pl:1843
+#: ../vdradmind.pl:1000 ../vdradmind.pl:1867
#, perl-format
msgid "The URL \"%s\" was not found on this server!"
msgstr "¡No encontrado la URL %s en el servidor!"
-#: ../vdradmind.pl:1847
+#: ../vdradmind.pl:1871
#, perl-format
msgid "Can't open file \"%s\"!"
msgstr "¡No se pudo abrir el archivo \"%s\" !"
-#: ../vdradmind.pl:1848
+#: ../vdradmind.pl:1872
#, perl-format
msgid "Can't connect to VDR at %s!"
msgstr "¡No se pudo estabilizar la conexión a %s!"
-#: ../vdradmind.pl:1849
+#: ../vdradmind.pl:1873
#, perl-format
msgid "Error while sending command to VDR at %s"
msgstr "Error mientras mandó el orden a %s "
-#: ../vdradmind.pl:2538
+#: ../vdradmind.pl:2565
msgid "Playing Tomorrow"
msgstr "Estrenos mañana"
-#: ../vdradmind.pl:2538
+#: ../vdradmind.pl:2565
#, perl-format
msgid "Playing on the %d."
msgstr "Estrenos en %d"
-#: ../vdradmind.pl:3920
+#: ../vdradmind.pl:3908
+msgid "Suitable matches for:"
+msgstr "Emparejamientos convenientes para:"
+
+#: ../vdradmind.pl:3963
msgid "Schedule"
msgstr "Vista general"
-#: ../vdradmind.pl:4440
+#: ../vdradmind.pl:4484
msgid "Playing Today?"
msgstr "¿Estrenos hoy?"
-#: ../vdradmind.pl:4443
+#: ../vdradmind.pl:4487
msgid "Timers"
msgstr "Programaciones"
-#: ../vdradmind.pl:4506
+#: ../vdradmind.pl:4550
msgid "System default"
msgstr "Defecto del sistema"
diff --git a/po/fi.po b/po/fi.po
index e904b05..ad55bd9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDRAdmin-AM-3.4.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-30 12:21+0100\n"
+"POT-Creation-Date: 2006-03-01 08:07+0100\n"
"PO-Revision-Date: 2006-01-18 12:36+0200\n"
"Last-Translator: Rofa\n"
"Language-Team: Suomi\n"
@@ -56,7 +56,7 @@ msgstr "Muokkaa ajastinta"
#: ../template/default/config.html:23 ../template/default/timer_list.html:51
#: ../template/default/rec_list.html:27
#: ../template/default/at_timer_new.html:24
-#: ../template/default/navigation.html:76 ../template/default/help.html:6
+#: ../template/default/navigation.html:70 ../template/default/help.html:6
msgid "Help"
msgstr "Opaste"
@@ -175,13 +175,12 @@ msgstr "Aloitusaika:"
#: ../template/default/timer_new.html:127
#: ../template/default/timer_new.html:138
-#: ../template/default/prog_summary.html:21
#: ../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
+#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3908
msgid "o'clock"
msgstr " "
@@ -345,7 +344,7 @@ msgstr "Poistetaanko valitut ajastimet?"
#: ../template/default/prog_summary.html:7
#: ../template/default/prog_timeline.html:7
-#: ../template/default/navigation.html:30 ../vdradmind.pl:4439
+#: ../template/default/navigation.html:30 ../vdradmind.pl:4483
msgid "What's On Now?"
msgstr "Menossa nyt"
@@ -470,7 +469,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:4441
+#: ../template/default/navigation.html:38 ../vdradmind.pl:4485
msgid "Timeline"
msgstr "Aikajana"
@@ -744,7 +743,7 @@ msgid "Delete Selected Timers"
msgstr "Poista valitut ajastimet"
#: ../template/default/prog_list.html:6 ../template/default/navigation.html:42
-#: ../vdradmind.pl:4442
+#: ../vdradmind.pl:4486
msgid "Channels"
msgstr "Kanavat"
@@ -810,7 +809,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:4444
+#: ../template/default/navigation.html:54 ../vdradmind.pl:4488
msgid "Recordings"
msgstr "Tallenteet"
@@ -1180,7 +1179,7 @@ msgid "to"
msgstr "-"
#: ../template/default/prog_list2.html:6
-#: ../template/default/navigation.html:34 ../vdradmind.pl:2538
+#: ../template/default/navigation.html:34 ../vdradmind.pl:2565
msgid "Playing Today"
msgstr "Ohjelmisto tänään"
@@ -1590,14 +1589,14 @@ msgstr "Ei löytynyt yhtään hakutulosta!"
msgid "Watch TV"
msgstr "Katso TV:tä"
-#: ../template/default/navigation.html:70
-msgid "Search"
-msgstr "Etsi"
-
-#: ../template/default/navigation.html:80 ../template/default/about.html:6
+#: ../template/default/navigation.html:74 ../template/default/about.html:6
msgid "About"
msgstr "Tietoja"
+#: ../template/default/navigation.html:78
+msgid "Search"
+msgstr "Etsi"
+
#: ../template/default/help.html:18
msgid "Getting Help and Reporting Bugs"
msgstr "Avunsaanti ja virheiden raportointi"
@@ -1611,7 +1610,7 @@ msgstr ""
#: ../template/default/help.html:31
msgid ""
"If this doesn't provide the information you need you can try to get help at "
-"<a href=\"http://www.vdrportal.de\" target=\"_new\">VDR-Portal</a> if you "
+"<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> if you "
"understand German language. Please use the announcement thread if possible, "
"search for:"
msgstr ""
@@ -1620,7 +1619,7 @@ msgstr ""
msgid ""
"If you think you have found a bug please check that it's a new one and "
"report it in the <a href=\"http://www.vdr-developer.org/mantisbt/main_page."
-"php\" target=\"_new\">VDRAdmin-AM BugTracking system</a>."
+"php\" target=\"_blank\">VDRAdmin-AM BugTracking system</a>."
msgstr ""
#: ../template/default/about.html:18
@@ -1667,109 +1666,113 @@ msgstr "Saksa:"
msgid "Spanish:"
msgstr "Espanja:"
-#: ../vdradmind.pl:286
+#: ../vdradmind.pl:289
msgid "What's your VDR hostname (e.g video.intra.net)?"
msgstr "Anna VDR-koneesi nimi (esim. video.intra.net):"
-#: ../vdradmind.pl:287
+#: ../vdradmind.pl:290
msgid "On which port does VDR listen to SVDRP queries?"
msgstr "Anna VDR-koneesi käyttämä SVDRP-portti:"
-#: ../vdradmind.pl:288
+#: ../vdradmind.pl:291
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:289
+#: ../vdradmind.pl:292
msgid "On which port should VDRAdmin-AM listen?"
msgstr "Anna VDRAdmin-AM käyttämä portti:"
-#: ../vdradmind.pl:290
+#: ../vdradmind.pl:293
msgid "Username?"
msgstr "Anna käyttäjätunnus VDRAdmin-AM varten:"
-#: ../vdradmind.pl:291
+#: ../vdradmind.pl:294
msgid "Password?"
msgstr "Anna salasana VDRAdmin-AM varten:"
-#: ../vdradmind.pl:292
+#: ../vdradmind.pl:295
msgid "Where are your recordings stored?"
msgstr "Anna VDR-koneesi tallennehakemiston polku:"
-#: ../vdradmind.pl:293
+#: ../vdradmind.pl:296
msgid "Where are your VDR's configuration files located?"
msgstr "Anna VDR-koneesi konfigurointihakemiston polku:"
-#: ../vdradmind.pl:299
+#: ../vdradmind.pl:302
msgid "Config file written successfully."
msgstr "VDRAdmin-AM konfigurointitiedosto muodostettu."
-#: ../vdradmind.pl:351
+#: ../vdradmind.pl:354
#, perl-format
msgid "vdradmind.pl %s started with pid %d."
msgstr "vdradmind.pl %s käynnistetty prosessitunnisteella %d."
-#: ../vdradmind.pl:405 ../vdradmind.pl:997 ../vdradmind.pl:1841
+#: ../vdradmind.pl:408 ../vdradmind.pl:1000 ../vdradmind.pl:1865
msgid "Not found"
msgstr "Ei löydy"
-#: ../vdradmind.pl:405 ../vdradmind.pl:1842
+#: ../vdradmind.pl:408 ../vdradmind.pl:1866
msgid "The requested URL was not found on this server!"
msgstr "Pyydettyä URL:ia ei löydy palvelimelta!"
-#: ../vdradmind.pl:473 ../vdradmind.pl:993 ../vdradmind.pl:1844
+#: ../vdradmind.pl:476 ../vdradmind.pl:996 ../vdradmind.pl:1868
msgid "Forbidden"
msgstr "Kielletty"
-#: ../vdradmind.pl:473 ../vdradmind.pl:1845
+#: ../vdradmind.pl:476 ../vdradmind.pl:1869
msgid "You don't have permission to access this function!"
msgstr "Puutteelliset käyttäjäoikeudet haluttuun toimintoon!"
-#: ../vdradmind.pl:993 ../vdradmind.pl:1846
+#: ../vdradmind.pl:996 ../vdradmind.pl:1870
#, perl-format
msgid "Access to file \"%s\" denied!"
msgstr "Pääsy tiedostoon \"%s\" evätty!"
-#: ../vdradmind.pl:997 ../vdradmind.pl:1843
+#: ../vdradmind.pl:1000 ../vdradmind.pl:1867
#, perl-format
msgid "The URL \"%s\" was not found on this server!"
msgstr "URL:ia \"%s\" ei löydy palvelimelta!"
-#: ../vdradmind.pl:1847
+#: ../vdradmind.pl:1871
#, perl-format
msgid "Can't open file \"%s\"!"
msgstr "Tiedoston \"%s\" avaus ei onnistu!"
-#: ../vdradmind.pl:1848
+#: ../vdradmind.pl:1872
#, perl-format
msgid "Can't connect to VDR at %s!"
msgstr "VDR:ään ei saada yhteyttä (%s)"
-#: ../vdradmind.pl:1849
+#: ../vdradmind.pl:1873
#, perl-format
msgid "Error while sending command to VDR at %s"
msgstr "Komennon lähetys VDR:lle epäonnistui (%s)"
-#: ../vdradmind.pl:2538
+#: ../vdradmind.pl:2565
msgid "Playing Tomorrow"
msgstr "Ohjelmisto huomenna"
-#: ../vdradmind.pl:2538
+#: ../vdradmind.pl:2565
#, perl-format
msgid "Playing on the %d."
msgstr "Ohjelmisto %d. päivä"
-#: ../vdradmind.pl:3920
+#: ../vdradmind.pl:3908
+msgid "Suitable matches for:"
+msgstr "Hakutulokset termille:"
+
+#: ../vdradmind.pl:3963
msgid "Schedule"
msgstr "Ohjelmisto"
-#: ../vdradmind.pl:4440
+#: ../vdradmind.pl:4484
msgid "Playing Today?"
msgstr "Tänään"
-#: ../vdradmind.pl:4443
+#: ../vdradmind.pl:4487
msgid "Timers"
msgstr "Ajastimet"
-#: ../vdradmind.pl:4506
+#: ../vdradmind.pl:4550
msgid "System default"
msgstr "Oletus"
diff --git a/po/fr.po b/po/fr.po
index 29dd7c5..fea4be8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDRAdmin-AM-3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-30 12:21+0100\n"
+"POT-Creation-Date: 2006-03-01 08:07+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"
@@ -70,7 +70,7 @@ msgstr "Editer Programmation"
#: ../template/default/config.html:23 ../template/default/timer_list.html:51
#: ../template/default/rec_list.html:27
#: ../template/default/at_timer_new.html:24
-#: ../template/default/navigation.html:76 ../template/default/help.html:6
+#: ../template/default/navigation.html:70 ../template/default/help.html:6
msgid "Help"
msgstr "Aide"
@@ -189,13 +189,12 @@ msgstr "Heure De Début :"
#: ../template/default/timer_new.html:127
#: ../template/default/timer_new.html:138
-#: ../template/default/prog_summary.html:21
#: ../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
+#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3908
msgid "o'clock"
msgstr "Heure"
@@ -361,7 +360,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:4439
+#: ../template/default/navigation.html:30 ../vdradmind.pl:4483
msgid "What's On Now?"
msgstr "En ce Moment ?"
@@ -486,7 +485,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:4441
+#: ../template/default/navigation.html:38 ../vdradmind.pl:4485
msgid "Timeline"
msgstr "Chronologie"
@@ -769,7 +768,7 @@ msgid "Delete Selected Timers"
msgstr "Supprimer Programmations Sélectionnées"
#: ../template/default/prog_list.html:6 ../template/default/navigation.html:42
-#: ../vdradmind.pl:4442
+#: ../vdradmind.pl:4486
msgid "Channels"
msgstr "Chaînes"
@@ -835,7 +834,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:4444
+#: ../template/default/navigation.html:54 ../vdradmind.pl:4488
msgid "Recordings"
msgstr "Enregistrements"
@@ -1324,7 +1323,7 @@ msgid "to"
msgstr "à"
#: ../template/default/prog_list2.html:6
-#: ../template/default/navigation.html:34 ../vdradmind.pl:2538
+#: ../template/default/navigation.html:34 ../vdradmind.pl:2565
msgid "Playing Today"
msgstr "Joué Aujourd'hui"
@@ -1949,15 +1948,15 @@ msgstr "Non trouvé"
msgid "Watch TV"
msgstr "Regarder TV"
-#: ../template/default/navigation.html:70
-msgid "Search"
-msgstr "Rechercher"
-
-#: ../template/default/navigation.html:80 ../template/default/about.html:6
+#: ../template/default/navigation.html:74 ../template/default/about.html:6
#, fuzzy
msgid "About"
msgstr "Auto"
+#: ../template/default/navigation.html:78
+msgid "Search"
+msgstr "Rechercher"
+
#: ../template/default/help.html:18
msgid "Getting Help and Reporting Bugs"
msgstr ""
@@ -1971,7 +1970,7 @@ msgstr ""
#: ../template/default/help.html:31
msgid ""
"If this doesn't provide the information you need you can try to get help at "
-"<a href=\"http://www.vdrportal.de\" target=\"_new\">VDR-Portal</a> if you "
+"<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> if you "
"understand German language. Please use the announcement thread if possible, "
"search for:"
msgstr ""
@@ -1980,7 +1979,7 @@ msgstr ""
msgid ""
"If you think you have found a bug please check that it's a new one and "
"report it in the <a href=\"http://www.vdr-developer.org/mantisbt/main_page."
-"php\" target=\"_new\">VDRAdmin-AM BugTracking system</a>."
+"php\" target=\"_blank\">VDRAdmin-AM BugTracking system</a>."
msgstr ""
#: ../template/default/about.html:18
@@ -2030,110 +2029,114 @@ msgstr ""
msgid "Spanish:"
msgstr ""
-#: ../vdradmind.pl:286
+#: ../vdradmind.pl:289
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:287
+#: ../vdradmind.pl:290
msgid "On which port does VDR listen to SVDRP queries?"
msgstr "Sur quel port VDR écoute les requêtes SVDRP ?"
-#: ../vdradmind.pl:288
+#: ../vdradmind.pl:291
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:289
+#: ../vdradmind.pl:292
msgid "On which port should VDRAdmin-AM listen?"
msgstr "Sur quel port VDRAdmin-AM doit-il écouter ?"
-#: ../vdradmind.pl:290
+#: ../vdradmind.pl:293
msgid "Username?"
msgstr "Identifiant ?"
-#: ../vdradmind.pl:291
+#: ../vdradmind.pl:294
msgid "Password?"
msgstr "Mot de Passe ?"
-#: ../vdradmind.pl:292
+#: ../vdradmind.pl:295
msgid "Where are your recordings stored?"
msgstr "Où vos enregistrements sont-ils stockés ?"
-#: ../vdradmind.pl:293
+#: ../vdradmind.pl:296
msgid "Where are your VDR's configuration files located?"
msgstr "Où sont vos fichiers de configuration de VDR ?"
-#: ../vdradmind.pl:299
+#: ../vdradmind.pl:302
msgid "Config file written successfully."
msgstr "Fichier de configuration écrit avec succès."
-#: ../vdradmind.pl:351
+#: ../vdradmind.pl:354
#, perl-format
msgid "vdradmind.pl %s started with pid %d."
msgstr "vdradmin.pl %s a démarré avec le pid %d."
-#: ../vdradmind.pl:405 ../vdradmind.pl:997 ../vdradmind.pl:1841
+#: ../vdradmind.pl:408 ../vdradmind.pl:1000 ../vdradmind.pl:1865
msgid "Not found"
msgstr "Non trouvé"
-#: ../vdradmind.pl:405 ../vdradmind.pl:1842
+#: ../vdradmind.pl:408 ../vdradmind.pl:1866
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:473 ../vdradmind.pl:993 ../vdradmind.pl:1844
+#: ../vdradmind.pl:476 ../vdradmind.pl:996 ../vdradmind.pl:1868
msgid "Forbidden"
msgstr "Interdit"
-#: ../vdradmind.pl:473 ../vdradmind.pl:1845
+#: ../vdradmind.pl:476 ../vdradmind.pl:1869
msgid "You don't have permission to access this function!"
msgstr "Vous n'avez pas la permission d'accéder à cette fonction !"
-#: ../vdradmind.pl:993 ../vdradmind.pl:1846
+#: ../vdradmind.pl:996 ../vdradmind.pl:1870
#, perl-format
msgid "Access to file \"%s\" denied!"
msgstr "Accès au fichier \"%s\" interdit !"
-#: ../vdradmind.pl:997 ../vdradmind.pl:1843
+#: ../vdradmind.pl:1000 ../vdradmind.pl:1867
#, 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:1847
+#: ../vdradmind.pl:1871
#, perl-format
msgid "Can't open file \"%s\"!"
msgstr "Ne peut pas ouvrir le fichier \"%s\" !"
-#: ../vdradmind.pl:1848
+#: ../vdradmind.pl:1872
#, perl-format
msgid "Can't connect to VDR at %s!"
msgstr "Ne peut se connecter à %s !"
-#: ../vdradmind.pl:1849
+#: ../vdradmind.pl:1873
#, perl-format
msgid "Error while sending command to VDR at %s"
msgstr "Erreur en envoyant la commande à %s"
-#: ../vdradmind.pl:2538
+#: ../vdradmind.pl:2565
msgid "Playing Tomorrow"
msgstr "Joué demain"
-#: ../vdradmind.pl:2538
+#: ../vdradmind.pl:2565
#, perl-format
msgid "Playing on the %d."
msgstr "En cours sur la %d."
-#: ../vdradmind.pl:3920
+#: ../vdradmind.pl:3908
+msgid "Suitable matches for:"
+msgstr ""
+
+#: ../vdradmind.pl:3963
msgid "Schedule"
msgstr "Programmateur"
-#: ../vdradmind.pl:4440
+#: ../vdradmind.pl:4484
msgid "Playing Today?"
msgstr "Aujourd'hui ?"
-#: ../vdradmind.pl:4443
+#: ../vdradmind.pl:4487
msgid "Timers"
msgstr "Programmations"
-#: ../vdradmind.pl:4506
+#: ../vdradmind.pl:4550
msgid "System default"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 7accf29..05f1afb 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: nl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-30 12:21+0100\n"
-"PO-Revision-Date: 2006-01-27 20:37+0100\n"
+"POT-Creation-Date: 2006-03-01 08:07+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"
"MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "Timer bewerken"
#: ../template/default/config.html:23 ../template/default/timer_list.html:51
#: ../template/default/rec_list.html:27
#: ../template/default/at_timer_new.html:24
-#: ../template/default/navigation.html:76 ../template/default/help.html:6
+#: ../template/default/navigation.html:70 ../template/default/help.html:6
msgid "Help"
msgstr "Help"
@@ -178,13 +178,12 @@ msgstr "Start tijd:"
#: ../template/default/timer_new.html:127
#: ../template/default/timer_new.html:138
-#: ../template/default/prog_summary.html:21
#: ../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
+#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3908
msgid "o'clock"
msgstr "Uur"
@@ -350,7 +349,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:4439
+#: ../template/default/navigation.html:30 ../vdradmind.pl:4483
msgid "What's On Now?"
msgstr "Wat is er nu op?"
@@ -475,7 +474,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:4441
+#: ../template/default/navigation.html:38 ../vdradmind.pl:4485
msgid "Timeline"
msgstr "Tijdlijn"
@@ -734,7 +733,7 @@ msgstr "Auto"
#: ../template/default/timer_list.html:380
msgid "activate"
-msgstr "Aktiven"
+msgstr "Aktiveren"
#: ../template/default/timer_list.html:381
msgid "inactivate"
@@ -749,7 +748,7 @@ msgid "Delete Selected Timers"
msgstr "Verwijder geselecteerde timers"
#: ../template/default/prog_list.html:6 ../template/default/navigation.html:42
-#: ../vdradmind.pl:4442
+#: ../vdradmind.pl:4486
msgid "Channels"
msgstr "Kanalen"
@@ -782,7 +781,7 @@ msgstr "G"
#: ../template/default/tv.html:206 ../template/default/tv.html:213
msgid "Grab the picture!"
-msgstr "Grab het beeld!"
+msgstr "Snapshot maken!"
#: ../template/default/tv.html:207
msgid "Size:"
@@ -815,7 +814,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:4444
+#: ../template/default/navigation.html:54 ../vdradmind.pl:4488
msgid "Recordings"
msgstr "Opnames"
@@ -1295,7 +1294,7 @@ msgid "to"
msgstr "naar "
#: ../template/default/prog_list2.html:6
-#: ../template/default/navigation.html:34 ../vdradmind.pl:2538
+#: ../template/default/navigation.html:34 ../vdradmind.pl:2565
msgid "Playing Today"
msgstr "Programma vandaag "
@@ -1367,12 +1366,12 @@ msgstr ""
"\"VPS\" of \"Auto\" in de \"Aktief\" kolom.</dd><dt>Om snel de prioriteit en "
"levensduur te tonen</dt><dd> Door de muis cursor over de timers titel te "
"bewegen</dd><dt>kunt u de EPG informatie tonen .</dt><dd>Timers die zijn "
-"ingesteld op span class=\"ref_label\">AutoTimer Controle</span> tot "
+"ingesteld op <span class=\"ref_label\">AutoTimer Controle</span> tot "
"\"Transmissie Identificatie\" zal de overeenkomstige EPG informatie tonen "
"als u klikt op de timer titel.</dd><dt>Bewerken van een timer</dt><dd>U kunt "
"een timer bewerken door te klikken op<img src=\"bilder/edit.gif\" alt=\"edit"
"\" />.</dd><dt>Verwijder de timer</dt><dd> Om een timer te verwijderen klik "
-"op img src=\"bilder/delete.gif\" alt=\"delete\" />.</dd></dl></p><p>Iedere "
+"op <img src=\"bilder/delete.gif\" alt=\"delete\" />.</dd></dl></p><p>Iedere "
"timers aktiviteit wordt getoond door verschillend gekleurde vakjes (in de "
"overzichtslijst) of beelden (in de lijst overzicht):<br /><span class="
"\"color_ok\">&nbsp;&nbsp;&nbsp;</span> / <img src=\"bilder/poempl_gruen.gif"
@@ -1897,14 +1896,14 @@ msgstr "Geen overeenkomsten gevonden!"
msgid "Watch TV"
msgstr "TV bekijken"
-#: ../template/default/navigation.html:70
-msgid "Search"
-msgstr "Zoeken"
-
-#: ../template/default/navigation.html:80 ../template/default/about.html:6
+#: ../template/default/navigation.html:74 ../template/default/about.html:6
msgid "About"
msgstr "Over"
+#: ../template/default/navigation.html:78
+msgid "Search"
+msgstr "Zoeken"
+
#: ../template/default/help.html:18
msgid "Getting Help and Reporting Bugs"
msgstr "Voor het verkrijgen van hulp en melden van bugs"
@@ -1921,24 +1920,24 @@ msgstr ""
#: ../template/default/help.html:31
msgid ""
"If this doesn't provide the information you need you can try to get help at "
-"<a href=\"http://www.vdrportal.de\" target=\"_new\">VDR-Portal</a> if you "
+"<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> if you "
"understand German language. Please use the announcement thread if possible, "
"search for:"
msgstr ""
"Als dit niet de informatie verschaft die u zoekt dan kunt u het proberen op "
-"<a href=\"http://www.vdrportal.de\" target=\"_new\">VDR-Portal</a> als u de "
-"duitse taal verstaat. Gebruik graag de bekendmakingen draad indien mogelijk, "
-"zoek naar:"
+"<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> als u "
+"de duitse taal verstaat. Gebruik graag de bekendmakingen draad indien "
+"mogelijk, zoek naar:"
#: ../template/default/help.html:32
msgid ""
"If you think you have found a bug please check that it's a new one and "
"report it in the <a href=\"http://www.vdr-developer.org/mantisbt/main_page."
-"php\" target=\"_new\">VDRAdmin-AM BugTracking system</a>."
+"php\" target=\"_blank\">VDRAdmin-AM BugTracking system</a>."
msgstr ""
"Als u denkt een bug gevonden te hebben controleer dan graag eerst of dit een "
"nieuwe is en meld het in de <a href=\"http://www.vdr-developer.org/mantisbt/"
-"main_page.php\" target=\"_new\">VDRAdmin-AM BugTracking systeem</a>."
+"main_page.php\" target=\"_blank\">VDRAdmin-AM BugTracking systeem</a>."
#: ../template/default/about.html:18
msgid "Authors"
@@ -1950,11 +1949,11 @@ msgstr "Huidige auteur (VDRAdmin-AM branch):"
#: ../template/default/about.html:34
msgid "Original author (VDRAdmin):"
-msgstr "Originele auteru van (VDRAdmin):"
+msgstr "Originele auteur van (VDRAdmin):"
#: ../template/default/about.html:48
msgid "Translation Team"
-msgstr "Vertalings team"
+msgstr "Vertalers team"
#: ../template/default/about.html:58
msgid "Dutch:"
@@ -1984,109 +1983,113 @@ msgstr "Duits:"
msgid "Spanish:"
msgstr "Spaans:"
-#: ../vdradmind.pl:286
+#: ../vdradmind.pl:289
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:287
+#: ../vdradmind.pl:290
msgid "On which port does VDR listen to SVDRP queries?"
msgstr "Op welke poort luister VDR naar SVDRP verzoeken?"
-#: ../vdradmind.pl:288
+#: ../vdradmind.pl:291
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:289
+#: ../vdradmind.pl:292
msgid "On which port should VDRAdmin-AM listen?"
msgstr "Naar welke poort moet VDRAdmin-AM luisteren?"
-#: ../vdradmind.pl:290
+#: ../vdradmind.pl:293
msgid "Username?"
msgstr "Gebruikersnaam?"
-#: ../vdradmind.pl:291
+#: ../vdradmind.pl:294
msgid "Password?"
msgstr "Wachtwoord?"
-#: ../vdradmind.pl:292
+#: ../vdradmind.pl:295
msgid "Where are your recordings stored?"
msgstr "Waar worden uw opnames opgeslagen?"
-#: ../vdradmind.pl:293
+#: ../vdradmind.pl:296
msgid "Where are your VDR's configuration files located?"
msgstr "Waar bevinden zicht de VDR's configuratie bestanden?"
-#: ../vdradmind.pl:299
+#: ../vdradmind.pl:302
msgid "Config file written successfully."
msgstr "Configuratie bestanden succesvol weggeschreven."
-#: ../vdradmind.pl:351
+#: ../vdradmind.pl:354
#, perl-format
msgid "vdradmind.pl %s started with pid %d."
msgstr "vdradmind.pl %s gestart met pid %d."
-#: ../vdradmind.pl:405 ../vdradmind.pl:997 ../vdradmind.pl:1841
+#: ../vdradmind.pl:408 ../vdradmind.pl:1000 ../vdradmind.pl:1865
msgid "Not found"
msgstr "Niet gevonden"
-#: ../vdradmind.pl:405 ../vdradmind.pl:1842
+#: ../vdradmind.pl:408 ../vdradmind.pl:1866
msgid "The requested URL was not found on this server!"
msgstr "De gevraagde URl is niet gevonden op deze server!"
-#: ../vdradmind.pl:473 ../vdradmind.pl:993 ../vdradmind.pl:1844
+#: ../vdradmind.pl:476 ../vdradmind.pl:996 ../vdradmind.pl:1868
msgid "Forbidden"
msgstr "Verboden"
-#: ../vdradmind.pl:473 ../vdradmind.pl:1845
+#: ../vdradmind.pl:476 ../vdradmind.pl:1869
msgid "You don't have permission to access this function!"
msgstr "U heeft geen toestemming om deze functie te gebruiken!"
-#: ../vdradmind.pl:993 ../vdradmind.pl:1846
+#: ../vdradmind.pl:996 ../vdradmind.pl:1870
#, perl-format
msgid "Access to file \"%s\" denied!"
msgstr "Toegang tot bestand \"%s\" geweigerd!"
-#: ../vdradmind.pl:997 ../vdradmind.pl:1843
+#: ../vdradmind.pl:1000 ../vdradmind.pl:1867
#, perl-format
msgid "The URL \"%s\" was not found on this server!"
msgstr "De URl \"%s\" is niet gevonden op deze server!"
-#: ../vdradmind.pl:1847
+#: ../vdradmind.pl:1871
#, perl-format
msgid "Can't open file \"%s\"!"
msgstr "Kan bestand \"%s\" niet openen!"
-#: ../vdradmind.pl:1848
+#: ../vdradmind.pl:1872
#, perl-format
msgid "Can't connect to VDR at %s!"
msgstr "Kan niet met VDR verbinden op %s!"
-#: ../vdradmind.pl:1849
+#: ../vdradmind.pl:1873
#, perl-format
msgid "Error while sending command to VDR at %s"
msgstr "Fout tijdens verzenden van commando op %s"
-#: ../vdradmind.pl:2538
+#: ../vdradmind.pl:2565
msgid "Playing Tomorrow"
msgstr "Speelt morgen"
-#: ../vdradmind.pl:2538
+#: ../vdradmind.pl:2565
#, perl-format
msgid "Playing on the %d."
msgstr "Speelt op de %d."
-#: ../vdradmind.pl:3920
+#: ../vdradmind.pl:3908
+msgid "Suitable matches for:"
+msgstr "Bruikbare overeenkomsten voor:"
+
+#: ../vdradmind.pl:3963
msgid "Schedule"
msgstr "Schema"
-#: ../vdradmind.pl:4440
+#: ../vdradmind.pl:4484
msgid "Playing Today?"
msgstr "Speelt vandaag?"
-#: ../vdradmind.pl:4443
+#: ../vdradmind.pl:4487
msgid "Timers"
msgstr "Timers"
-#: ../vdradmind.pl:4506
+#: ../vdradmind.pl:4550
msgid "System default"
msgstr "Systeem standaard"
diff --git a/po/vdradmin.pot b/po/vdradmin.pot
index 876ec2b..3fcdd1b 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-01-30 12:21+0100\n"
+"POT-Creation-Date: 2006-03-01 08:07+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"
@@ -57,7 +57,7 @@ msgstr ""
#: ../template/default/config.html:23 ../template/default/timer_list.html:51
#: ../template/default/rec_list.html:27
#: ../template/default/at_timer_new.html:24
-#: ../template/default/navigation.html:76 ../template/default/help.html:6
+#: ../template/default/navigation.html:70 ../template/default/help.html:6
msgid "Help"
msgstr ""
@@ -176,13 +176,12 @@ msgstr ""
#: ../template/default/timer_new.html:127
#: ../template/default/timer_new.html:138
-#: ../template/default/prog_summary.html:21
#: ../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
+#: ../template/default/at_timer_new.html:122 ../vdradmind.pl:3908
msgid "o'clock"
msgstr ""
@@ -342,7 +341,7 @@ msgstr ""
#: ../template/default/prog_summary.html:7
#: ../template/default/prog_timeline.html:7
-#: ../template/default/navigation.html:30 ../vdradmind.pl:4439
+#: ../template/default/navigation.html:30 ../vdradmind.pl:4483
msgid "What's On Now?"
msgstr ""
@@ -467,7 +466,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:4441
+#: ../template/default/navigation.html:38 ../vdradmind.pl:4485
msgid "Timeline"
msgstr ""
@@ -741,7 +740,7 @@ msgid "Delete Selected Timers"
msgstr ""
#: ../template/default/prog_list.html:6 ../template/default/navigation.html:42
-#: ../vdradmind.pl:4442
+#: ../vdradmind.pl:4486
msgid "Channels"
msgstr ""
@@ -807,7 +806,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:4444
+#: ../template/default/navigation.html:54 ../vdradmind.pl:4488
msgid "Recordings"
msgstr ""
@@ -1177,7 +1176,7 @@ msgid "to"
msgstr ""
#: ../template/default/prog_list2.html:6
-#: ../template/default/navigation.html:34 ../vdradmind.pl:2538
+#: ../template/default/navigation.html:34 ../vdradmind.pl:2565
msgid "Playing Today"
msgstr ""
@@ -1587,12 +1586,12 @@ msgstr ""
msgid "Watch TV"
msgstr ""
-#: ../template/default/navigation.html:70
-msgid "Search"
+#: ../template/default/navigation.html:74 ../template/default/about.html:6
+msgid "About"
msgstr ""
-#: ../template/default/navigation.html:80 ../template/default/about.html:6
-msgid "About"
+#: ../template/default/navigation.html:78
+msgid "Search"
msgstr ""
#: ../template/default/help.html:18
@@ -1608,7 +1607,7 @@ msgstr ""
#: ../template/default/help.html:31
msgid ""
"If this doesn't provide the information you need you can try to get help at "
-"<a href=\"http://www.vdrportal.de\" target=\"_new\">VDR-Portal</a> if you "
+"<a href=\"http://www.vdrportal.de\" target=\"_blank\">VDR-Portal</a> if you "
"understand German language. Please use the announcement thread if possible, "
"search for:"
msgstr ""
@@ -1617,7 +1616,7 @@ msgstr ""
msgid ""
"If you think you have found a bug please check that it's a new one and "
"report it in the <a href=\"http://www.vdr-developer.org/mantisbt/main_page."
-"php\" target=\"_new\">VDRAdmin-AM BugTracking system</a>."
+"php\" target=\"_blank\">VDRAdmin-AM BugTracking system</a>."
msgstr ""
#: ../template/default/about.html:18
@@ -1664,109 +1663,113 @@ msgstr ""
msgid "Spanish:"
msgstr ""
-#: ../vdradmind.pl:286
+#: ../vdradmind.pl:289
msgid "What's your VDR hostname (e.g video.intra.net)?"
msgstr ""
-#: ../vdradmind.pl:287
+#: ../vdradmind.pl:290
msgid "On which port does VDR listen to SVDRP queries?"
msgstr ""
-#: ../vdradmind.pl:288
+#: ../vdradmind.pl:291
msgid "On which address should VDRAdmin-AM listen (0.0.0.0 for any)?"
msgstr ""
-#: ../vdradmind.pl:289
+#: ../vdradmind.pl:292
msgid "On which port should VDRAdmin-AM listen?"
msgstr ""
-#: ../vdradmind.pl:290
+#: ../vdradmind.pl:293
msgid "Username?"
msgstr ""
-#: ../vdradmind.pl:291
+#: ../vdradmind.pl:294
msgid "Password?"
msgstr ""
-#: ../vdradmind.pl:292
+#: ../vdradmind.pl:295
msgid "Where are your recordings stored?"
msgstr ""
-#: ../vdradmind.pl:293
+#: ../vdradmind.pl:296
msgid "Where are your VDR's configuration files located?"
msgstr ""
-#: ../vdradmind.pl:299
+#: ../vdradmind.pl:302
msgid "Config file written successfully."
msgstr ""
-#: ../vdradmind.pl:351
+#: ../vdradmind.pl:354
#, perl-format
msgid "vdradmind.pl %s started with pid %d."
msgstr ""
-#: ../vdradmind.pl:405 ../vdradmind.pl:997 ../vdradmind.pl:1841
+#: ../vdradmind.pl:408 ../vdradmind.pl:1000 ../vdradmind.pl:1865
msgid "Not found"
msgstr ""
-#: ../vdradmind.pl:405 ../vdradmind.pl:1842
+#: ../vdradmind.pl:408 ../vdradmind.pl:1866
msgid "The requested URL was not found on this server!"
msgstr ""
-#: ../vdradmind.pl:473 ../vdradmind.pl:993 ../vdradmind.pl:1844
+#: ../vdradmind.pl:476 ../vdradmind.pl:996 ../vdradmind.pl:1868
msgid "Forbidden"
msgstr ""
-#: ../vdradmind.pl:473 ../vdradmind.pl:1845
+#: ../vdradmind.pl:476 ../vdradmind.pl:1869
msgid "You don't have permission to access this function!"
msgstr ""
-#: ../vdradmind.pl:993 ../vdradmind.pl:1846
+#: ../vdradmind.pl:996 ../vdradmind.pl:1870
#, perl-format
msgid "Access to file \"%s\" denied!"
msgstr ""
-#: ../vdradmind.pl:997 ../vdradmind.pl:1843
+#: ../vdradmind.pl:1000 ../vdradmind.pl:1867
#, perl-format
msgid "The URL \"%s\" was not found on this server!"
msgstr ""
-#: ../vdradmind.pl:1847
+#: ../vdradmind.pl:1871
#, perl-format
msgid "Can't open file \"%s\"!"
msgstr ""
-#: ../vdradmind.pl:1848
+#: ../vdradmind.pl:1872
#, perl-format
msgid "Can't connect to VDR at %s!"
msgstr ""
-#: ../vdradmind.pl:1849
+#: ../vdradmind.pl:1873
#, perl-format
msgid "Error while sending command to VDR at %s"
msgstr ""
-#: ../vdradmind.pl:2538
+#: ../vdradmind.pl:2565
msgid "Playing Tomorrow"
msgstr ""
-#: ../vdradmind.pl:2538
+#: ../vdradmind.pl:2565
#, perl-format
msgid "Playing on the %d."
msgstr ""
-#: ../vdradmind.pl:3920
+#: ../vdradmind.pl:3908
+msgid "Suitable matches for:"
+msgstr ""
+
+#: ../vdradmind.pl:3963
msgid "Schedule"
msgstr ""
-#: ../vdradmind.pl:4440
+#: ../vdradmind.pl:4484
msgid "Playing Today?"
msgstr ""
-#: ../vdradmind.pl:4443
+#: ../vdradmind.pl:4487
msgid "Timers"
msgstr ""
-#: ../vdradmind.pl:4506
+#: ../vdradmind.pl:4550
msgid "System default"
msgstr ""
diff --git a/template/default/about.html b/template/default/about.html
index a649f29..1f3da4b 100644
--- a/template/default/about.html
+++ b/template/default/about.html
@@ -26,13 +26,13 @@
<tr class="row_even">
<td class="col_left"></td>
<td class="col_label" width="100px"><h4><%! Current author (VDRAdmin-AM branch): !%></h4></td>
- <td class="col_value"><a href="mailto:mail@andreas.vdr-developer.org">Andreas Mair</a> (<a href="http://andreas.vdr-developer.org">Homepage</a>)</td>
+ <td class="col_value"><a href="mailto:mail@andreas.vdr-developer.org">Andreas Mair</a> (<a href="http://andreas.vdr-developer.org" target="_blank">Homepage</a>)</td>
<td class="col_right"></td>
</tr>
<tr class="row_even">
<td class="col_left"></td>
<td class="col_label"><h4><%! Original author (VDRAdmin): !%></h4></td>
- <td class="col_value">Thomas Koch (<a href="http://www.linvdr.org">Homepage</a>)</td>
+ <td class="col_value">Thomas Koch (<a href="http://www.linvdr.org" target="_blank">Homepage</a>)</td>
<td class="col_right"></td>
</tr>
<tr class="footer">
diff --git a/template/default/bilder/noise.gif b/template/default/bilder/noise.gif
new file mode 100644
index 0000000..251bf38
--- /dev/null
+++ b/template/default/bilder/noise.gif
Binary files differ
diff --git a/template/default/copper/noise.gif b/template/default/copper/noise.gif
new file mode 120000
index 0000000..2c5b189
--- /dev/null
+++ b/template/default/copper/noise.gif
@@ -0,0 +1 @@
+../bilder/noise.gif \ No newline at end of file
diff --git a/template/default/default/noise.gif b/template/default/default/noise.gif
new file mode 120000
index 0000000..2c5b189
--- /dev/null
+++ b/template/default/default/noise.gif
@@ -0,0 +1 @@
+../bilder/noise.gif \ No newline at end of file
diff --git a/template/default/help.html b/template/default/help.html
index 834235a..6ccc542 100644
--- a/template/default/help.html
+++ b/template/default/help.html
@@ -28,8 +28,8 @@
<td>
<ul>
<li><%! If you need help please first try to use the online help you'll find on some pages. You can access it by clicking <img src="bilder/help.gif"/>. !%></li>
- <li><%! If this doesn't provide the information you need you can try to get help at <a href="http://www.vdrportal.de" target="_new">VDR-Portal</a> if you understand German language. Please use the announcement thread if possible, search for: !%> &quot;[ANNOUNCE] <tmpl_var myversion>&quot;</li>
- <li><%! If you think you have found a bug please check that it's a new one and report it in the <a href="http://www.vdr-developer.org/mantisbt/main_page.php" target="_new">VDRAdmin-AM BugTracking system</a>. !%></li>
+ <li><%! If this doesn't provide the information you need you can try to get help at <a href="http://www.vdrportal.de" target="_blank">VDR-Portal</a> if you understand German language. Please use the announcement thread if possible, search for: !%> &quot;[ANNOUNCE] <tmpl_var myversion>&quot;</li>
+ <li><%! If you think you have found a bug please check that it's a new one and report it in the <a href="http://www.vdr-developer.org/mantisbt/main_page.php" target="_blank">VDRAdmin-AM BugTracking system</a>. !%></li>
</td>
<td class="col_right"></td>
</tr>
diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html
index 5dbbce2..91dddfd 100644
--- a/template/default/prog_summary.html
+++ b/template/default/prog_summary.html
@@ -18,7 +18,7 @@
<tr>
<td class="col_left"></td>
<td class="col_title">
- <h1><tmpl_var now>&nbsp;<%! o'clock !%></h1>
+ <h1><tmpl_var title></h1>
</td>
<td class="col_other">
<%! What's on: !%>&nbsp;<a href="<tmpl_var nowurl>"><%! now !%></a>&nbsp;|<%! at: !%>&nbsp;
diff --git a/vdradmind.pl b/vdradmind.pl
index a141ca1..3dbff1a 100755
--- a/vdradmind.pl
+++ b/vdradmind.pl
@@ -64,6 +64,9 @@ use File::Temp ();
use Shell qw(ps locale);
use URI::Escape;
+my $can_use_net_smtp = 1;
+$can_use_net_smtp = undef unless(eval {require Net::SMTP});
+
# Some users have problems if the LANGUAGE env variable is set
# so it's cleared here.
$LANGUAGE="";
@@ -176,7 +179,7 @@ $CONFIG{TV_EXT} = "m3u";
$CONFIG{REC_MIMETYPE} = "video/x-mpegurl";
$CONFIG{REC_EXT} = "m3u";
-my $VERSION = "3.4.3rc3";
+my $VERSION = "3.4.3a";
my $SERVERVERSION = "vdradmind/$VERSION";
my $LINVDR = isLinVDR();
my $VDRVERSION = 0;
@@ -1439,21 +1442,27 @@ sub AT_ProgTimer {
my $Update = 0;
for(ParseTimer(1)) {
if($_->{vdr_id} == $channel) {
- if(($event_id) && ($_->{event_id} == $event_id)) {
- $found = 1;
- last;
- }
- if($_->{start} eq $start) {
- $found = 1;
- last;
- }
- if(($VDRVERSION < 010323) && ($_->{dor} eq my_strftime("%Y-%m-%d", $start))) {
- $found = 1;
- last;
- }
- if(($_->{dor} == my_strftime("%d", $start))) {
- $found = 1;
- last;
+ if($event_id && $_->{event_id}) {
+ if($_->{event_id} == $event_id) {
+ $found = 1;
+ last;
+ }
+ } 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;
+ }
+ }
}
}
}
@@ -1474,7 +1483,7 @@ sub AT_ProgTimer {
$title,
$CONFIG{TM_ADD_SUMMARY} ? $summary : ""
);
- if ($CONFIG{AT_SENDMAIL} == 1 && eval { require Net::SMTP }) {
+ if ($CONFIG{AT_SENDMAIL} == 1 && $can_use_net_smtp) {
my $sum = $summary;
# remove all HTML-Tags from text
$sum =~ s/\<[^\>]+\>/ /g;
@@ -1493,7 +1502,12 @@ sub AT_ProgTimer {
$smtp->to($CONFIG{MAIL_TO});
$smtp->data();
$smtp->datasend("To: $CONFIG{MAIL_TO}\n");
- $smtp->datasend("Subject: AUTOTIMER: New timer created for $title\n");
+ my $qptitle = my_encode_qp($title);
+ $smtp->datasend("Subject: AUTOTIMER: New timer created for $qptitle\n");
+ $smtp->datasend("From: VDRAdmin-AM AutoTimer <autotimer\@$CONFIG{MAIL_FROMDOMAIN}>\n");
+ $smtp->datasend("MIME-Version: 1.0\n");
+ $smtp->datasend("Content-Type: text/plain; charset=iso-8859-1\n");
+ $smtp->datasend("Content-Transfer-Encoding: 8bit\n");
$smtp->datasend("\n");
$smtp->datasend("Created AUTOTIMER for $title\n");
$smtp->datasend("===========================================================================\n\n");
@@ -1509,10 +1523,25 @@ sub AT_ProgTimer {
print("SMTP failed! Please check your email settings.\n");
Log(LOG_FATALERROR, "SMTP failed! Please check your email settings.");
}
- }
+ } elsif ($CONFIG{AT_SENDMAIL} == 1) {
+ print("Missing Perl module Net::SMTP.\nAutoTimer email notification disabled.\n");
+ Log(LOG_FATALERROR, "Missing Perl module Net::SMTP. AutoTimer email notification disabled.");
+ }
}
}
+sub my_encode_qp {
+ my $title = shift;
+ if ($title =~ /[\001-\037\200-\377]/)
+ {
+ my $qptitle = $title;
+ $qptitle = "=?iso-8859-1?b?" . MIME::Base64::encode_base64($title, "") . "?=";
+ $qptitle =~ s#(=\?iso-8859-1\?b\?[^\?]{56})(?!\?=)#$1?=\n =?iso-8859-1?b?#g while($qptitle =~ /=\?iso-8859-1\?b\?[^\?]{57,}\?=/);
+ return $qptitle;
+ }
+ return $title;
+}
+
sub PackStatus {
# make a 32 bit signed int with high 16 Bit as event_id and low 16 Bit as
# active value
@@ -3518,6 +3547,7 @@ sub at_timer_delete {
}
sub at_timer_test {
+ my $id = $q->param("id");
my @chans;
for my $chan (@CHAN) {
if($CONFIG{CHANNELS_WANTED_AUTOTIMER}) {
@@ -3555,6 +3585,7 @@ sub at_timer_test {
my $pattern = $q->param("pattern");
$pattern =~ s/"/\&quot;/g;
my $vars = {
+ id => $id,
usercss => $UserCSS,
url => $MyURL,
channels => \@chans,
@@ -3777,7 +3808,8 @@ sub prog_summary {
$search =~ s/([\+\?\.\*\^\$\(\)\[\]\{\}\|\\])/\\$1/g;
}
}
-
+
+ my $now = time();
my(@show, @shows, @temp);
for(keys(%EPG)) {
for my $event (@{$EPG{$_}}) {
@@ -3848,7 +3880,7 @@ sub prog_summary {
proglink => sprintf("%s?aktion=prog_list&amp;vdr_id=%s", $MyURL, $event->{vdr_id}),
switchurl => sprintf("%s?aktion=prog_switch&amp;channel=%s", $MyURL, $event->{vdr_id}),
streamurl => sprintf("%s%s?aktion=live_stream&amp;channel=%s", $MyStreamBase, $CONFIG{TV_EXT}, $event->{vdr_id}),
- stream_live_on => $CONFIG{ST_FUNC} && $CONFIG{ST_LIVE_ON},
+ stream_live_on => $event->{start} <= $now && $now <= $event->{stop} ? $CONFIG{ST_FUNC} && $CONFIG{ST_LIVE_ON} : undef,
infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&amp;epg_id=%s&amp;vdr_id=%s&amp;referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself) : undef,
recurl => sprintf("%s?aktion=timer_new_form&amp;epg_id=%s&amp;vdr_id=%s&amp;referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself),
find_title => uri_escape($event->{title}),
@@ -3880,6 +3912,7 @@ sub prog_summary {
usercss => $UserCSS,
rows => \@shows,
now => strftime("%H:%M", localtime($event_time)),
+ title => $search ? gettext("Suitable matches for:") . " " . $search : strftime("%H:%M", localtime($event_time)) . " " . gettext("o'clock"),
nowurl => $MyURL . "?aktion=prog_summary",
url => $MyURL
};
@@ -4693,9 +4726,8 @@ sub grab_picture {
if ($VDRVERSION < 10338) {
# Grab using temporary file
my $file = new File::Temp(TEMPLATE => "vdr-XXXXX", DIR => File::Spec->tmpdir(), UNLINK => 1, SUFFIX => ".jpg");
- chmod 0666,$file;
+ chmod 0666,$file if(-e $file);
SendCMD("grab $file jpeg 70 $width $height");
- #SendCMD("grab $file jpeg");
if(-e $file && -r $file) {
return(header("200", "image/jpeg", ReadFile($file)));
} else {
@@ -4706,13 +4738,14 @@ sub grab_picture {
print " - VDR Admin may read $file\n";
print " - VDR has access to /dev/video* files\n";
print " - you have a full featured card\n";
+ return SendFile("bilder/spacer.gif");
}
} else {
my $image;
for (SendCMD("grab .jpg 70 $width $height")) {
+ return SendFile("bilder/noise.gif") if(/Grab image failed/);
$image .= $_ unless(/Grabbed image/);
}
- #TODO: "Grab image failed" -> predefined image
return(header("200", "image/jpeg", MIME::Base64::decode_base64($image)));
}
}
@@ -4784,7 +4817,7 @@ sub subnetcheck {
}
#############################################################################
-# communikation with vdr
+# communication with vdr
#############################################################################
package SVDRP;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-20 19:34:43 +0000