diff options
| author | Andreas Mair <amair.sob@googlemail.com> | 2006-06-30 14:12:35 +0200 |
|---|---|---|
| committer | Andreas Mair <amair.sob@googlemail.com> | 2006-06-30 14:12:35 +0200 |
| commit | ada389d94b34bfef75be700a6cb4e3f05ee102ff (patch) | |
| tree | f93833f9f9e82ca287dd9502ebeeac6993a1598f | |
| parent | f823ff4bdab5bea277c34d8804de946d7c7961e1 (diff) | |
| download | vdradmin-am-3.4.6beta5.tar.gz vdradmin-am-3.4.6beta5.tar.bz2 | |
2006-06-30: 3.4.6beta5v3.4.6beta5
- Changed: "channels" column in timeline uses max 10% of available width.
- Fixed: programming a timer in prog_detail in FireFox.
- Fixed: HTML warnings.
- Fixed: find repeatings containing "&" in prog_detail (Bug #0000104, Reported by hajo).
- Changed: TV and remote control to better fit new "default" theme.
- Fixed: correct sorting in prog_list2 selectbox at the end of a month (Reported by sirtobi).
- Fixed: Extracting VDR version number.
30 files changed, 391 insertions, 369 deletions
@@ -4,6 +4,15 @@ E-Mail: mail AT andreas DOT vdr-developer DOT org VDR-Portal: amair ----------------------------------------------------------- +2006-06-30: 3.4.6beta5 +- Changed: "channels" column in timeline uses max 10% of available width. +- Fixed: programming a timer in prog_detail in FireFox. +- Fixed: HTML warnings. +- Fixed: find repeatings containing "&" in prog_detail (Bug #0000104, Reported by hajo). +- Changed: TV and remote control to better fit new "default" theme. +- Fixed: correct sorting in prog_list2 selectbox at the end of a month (Reported by sirtobi). +- Fixed: Extracting VDR version number. + 2006-06-26: 3.4.6beta4 - Changed: CSS a little bit. - Rewrote: prog_timeline to make it more dynamic (needs JavaScript) (Submitted by Torsten Herz). diff --git a/locale/de/LC_MESSAGES/vdradmin.mo b/locale/de/LC_MESSAGES/vdradmin.mo Binary files differindex 49f0032..22a78a7 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 895a7c6..8333cd6 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 7b59dac..315f5d5 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 0c82b88..00ab1e6 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 0c6d929..5c2885a 100644 --- a/locale/nl/LC_MESSAGES/vdradmin.mo +++ b/locale/nl/LC_MESSAGES/vdradmin.mo diff --git a/locale/ru/LC_MESSAGES/vdradmin.mo b/locale/ru/LC_MESSAGES/vdradmin.mo Binary files differindex a76a48c..f3c1623 100644 --- a/locale/ru/LC_MESSAGES/vdradmin.mo +++ b/locale/ru/LC_MESSAGES/vdradmin.mo @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-26 11:22+0200\n" +"POT-Creation-Date: 2006-06-30 14:22+0200\n" "PO-Revision-Date: 2006-03-30 14:49+0100\n" "Last-Translator: Andreas Mair <mail@andreas.vdr-developer.org>\n" "Language-Team: <LL.org>\n" @@ -127,7 +127,7 @@ msgstr "Sendungskennung" msgid "Time" msgstr "Uhrzeit" -#: ../template/default/timer_new.html:74 ../template/default/tv.html:192 +#: ../template/default/timer_new.html:74 ../template/default/tv.html:79 #: ../template/default/help_timer_new.html:35 msgid "off" msgstr "aus" @@ -200,8 +200,8 @@ msgstr "Startzeit:" #: ../template/default/prog_list2.html:31 #: ../template/default/at_timer_new.html:88 #: ../template/default/at_timer_new.html:97 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 -#: ../vdradmind.pl:4150 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133 +#: ../vdradmind.pl:4147 msgid "o'clock" msgstr "Uhr" @@ -390,7 +390,7 @@ msgstr "Ausgewählte Timer wirklich löschen?" #: ../template/default/prog_summary.html:7 #: ../template/default/navigation.html:29 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4762 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4759 msgid "What's On Now?" msgstr "Was läuft jetzt?" @@ -401,14 +401,14 @@ msgid "What's on:" msgstr "Was läuft:" #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133 msgid "at" msgstr "um" #: ../template/default/prog_summary.html:47 #: ../template/default/prog_list.html:6 ../template/default/prog_list2.html:53 #: ../template/default/navigation.html:38 -#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4762 +#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4759 msgid "Channels" msgstr "Programmübersicht" @@ -552,7 +552,7 @@ msgstr "Gast Passwort:" #: ../template/default/config.html:151 ../template/default/help_config.html:30 #: ../template/default/help_config.html:78 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:35 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:35 ../vdradmind.pl:4759 msgid "Timeline" msgstr "Zeitleiste" @@ -833,34 +833,34 @@ msgstr "Go!" msgid "Error!" msgstr "Fehler!" -#: ../template/default/tv.html:5 +#: ../template/default/tv.html:5 ../template/default/tv.html:75 msgid "TV" msgstr "Fernseher" -#: ../template/default/tv.html:190 +#: ../template/default/tv.html:77 msgid "Interval:" msgstr "Intervall:" -#: ../template/default/tv.html:193 ../template/default/tv.html:194 -#: ../template/default/tv.html:195 ../template/default/tv.html:196 -#: ../template/default/tv.html:197 ../template/default/tv.html:198 -#: ../template/default/tv.html:199 +#: ../template/default/tv.html:80 ../template/default/tv.html:81 +#: ../template/default/tv.html:82 ../template/default/tv.html:83 +#: ../template/default/tv.html:84 ../template/default/tv.html:85 +#: ../template/default/tv.html:86 msgid "sec." msgstr "sek" -#: ../template/default/tv.html:201 ../template/default/tv.html:208 +#: ../template/default/tv.html:88 ../template/default/tv.html:95 msgid "G" msgstr "G" -#: ../template/default/tv.html:201 ../template/default/tv.html:208 +#: ../template/default/tv.html:88 ../template/default/tv.html:95 msgid "Grab the picture!" msgstr "Hole das Bild!" -#: ../template/default/tv.html:202 +#: ../template/default/tv.html:89 msgid "Size:" msgstr "Größe:" -#: ../template/default/tv.html:210 +#: ../template/default/tv.html:97 msgid "Open in separate window" msgstr "Öffne eigenes Fenster" @@ -899,7 +899,7 @@ msgstr "Beschreibung:" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:17 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 -#: ../template/default/navigation.html:47 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:47 ../vdradmind.pl:4759 msgid "Recordings" msgstr "Aufnahmen" @@ -1383,7 +1383,7 @@ msgstr "" "angeklickt werden.</p>" #: ../template/default/prog_timeline.html:75 -#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4121 +#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4118 msgid "now" msgstr "jetzt" @@ -1395,7 +1395,7 @@ msgstr "bis" msgid "at:" msgstr "um:" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2788 +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2785 msgid "Playing Today" msgstr "Was läuft heute" @@ -2017,7 +2017,7 @@ msgstr "Abgelegt in" msgid "No matches found!" msgstr "Nicht gefunden" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4759 msgid "Playing Today?" msgstr "Was läuft heute?" @@ -2104,11 +2104,12 @@ msgstr "Hilfe bekommen und Fehler melden" #: ../template/default/about.html:84 msgid "" "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.png\"/>." +"pages. You can access it by clicking <img src=\"bilder/help.png\" alt=\"\" /" +">." msgstr "" "Wenn Sie Hilfe benötigen, dann werfen Sie bitte zuerst einen Blick in die " "Online-Hilfe, die für einige Seiten verfügbar ist. Sie können Sie aufrufen " -"indem Sie <img src=\"bilder/help.png\"/> anklicken." +"indem Sie <img src=\"bilder/help.png\" alt=\"\" /> anklicken." #: ../template/default/about.html:85 msgid "" @@ -2245,52 +2246,52 @@ msgstr "" msgid "Error while sending command to VDR at %s" msgstr "Fehler beim Senden eines Kommandos zu %s" -#: ../vdradmind.pl:2532 +#: ../vdradmind.pl:2528 msgid "Can't find EPG entry!" msgstr "EPG-Eintrag wurde nicht gefunden!" -#: ../vdradmind.pl:2788 +#: ../vdradmind.pl:2785 msgid "Playing Tomorrow" msgstr "Was läuft morgen" -#: ../vdradmind.pl:2788 +#: ../vdradmind.pl:2785 #, perl-format msgid "Playing on the %s" msgstr "Was läuft am %s" -#: ../vdradmind.pl:4126 +#: ../vdradmind.pl:4123 msgid "next" msgstr "als nächstes" -#: ../vdradmind.pl:4145 +#: ../vdradmind.pl:4142 msgid "What's on after" msgstr "Was läuft nach" -#: ../vdradmind.pl:4145 +#: ../vdradmind.pl:4142 msgid "What's on at" msgstr "Was läuft um" -#: ../vdradmind.pl:4150 +#: ../vdradmind.pl:4147 msgid "Suitable matches for:" msgstr "Suchergebnis für" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4149 msgid "short view" msgstr "Listenansicht" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4149 msgid "long view" msgstr "Ausführliche Ansicht" -#: ../vdradmind.pl:4209 +#: ../vdradmind.pl:4206 msgid "Schedule" msgstr "Übersicht" -#: ../vdradmind.pl:4762 +#: ../vdradmind.pl:4759 msgid "Timers" msgstr "Timer" -#: ../vdradmind.pl:4830 +#: ../vdradmind.pl:4827 msgid "System default" msgstr "Systemstandard" @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-26 11:22+0200\n" -"PO-Revision-Date: 2006-05-26 18:12+0100\n" -"Last-Translator: user <solidpc@gmail.com>\n" +"POT-Creation-Date: 2006-06-30 14:22+0200\n" +"PO-Revision-Date: 2006-06-27 18:39+0100\n" +"Last-Translator: Rudibert <jung.ruediger@gmail.com>\n" "Language-Team: Rudi <LL.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -131,7 +131,7 @@ msgstr "Identificador de la emisora" msgid "Time" msgstr "hora" -#: ../template/default/timer_new.html:74 ../template/default/tv.html:192 +#: ../template/default/timer_new.html:74 ../template/default/tv.html:79 #: ../template/default/help_timer_new.html:35 msgid "off" msgstr "apagado" @@ -204,8 +204,8 @@ msgstr "Comienzo:" #: ../template/default/prog_list2.html:31 #: ../template/default/at_timer_new.html:88 #: ../template/default/at_timer_new.html:97 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 -#: ../vdradmind.pl:4150 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133 +#: ../vdradmind.pl:4147 msgid "o'clock" msgstr "h." @@ -395,7 +395,7 @@ msgstr "¿Estas seguro de que deseas borrar las programaciones elegidas?" #: ../template/default/prog_summary.html:7 #: ../template/default/navigation.html:29 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4762 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4759 msgid "What's On Now?" msgstr "Estrenos ahora" @@ -406,14 +406,14 @@ msgid "What's on:" msgstr "Se puede ver:" #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133 msgid "at" msgstr " a la/s:" #: ../template/default/prog_summary.html:47 #: ../template/default/prog_list.html:6 ../template/default/prog_list2.html:53 #: ../template/default/navigation.html:38 -#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4762 +#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4759 msgid "Channels" msgstr "EPG por emisoras" @@ -557,7 +557,7 @@ msgstr "Contraseña como invitado:" #: ../template/default/config.html:151 ../template/default/help_config.html:30 #: ../template/default/help_config.html:78 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:35 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:35 ../vdradmind.pl:4759 msgid "Timeline" msgstr "Tabla de tiempo" @@ -571,7 +571,7 @@ msgstr "Horas:" #: ../template/default/config.html:159 msgid "Also used for other EPG views!" -msgstr "" +msgstr "También se usa para otras vistas de la EPG!" #: ../template/default/config.html:162 ../template/default/config.html:231 #: ../template/default/help_config.html:84 @@ -839,34 +839,34 @@ msgstr "¡Venga!" msgid "Error!" msgstr "¡Error!" -#: ../template/default/tv.html:5 +#: ../template/default/tv.html:5 ../template/default/tv.html:75 msgid "TV" msgstr "TV" -#: ../template/default/tv.html:190 +#: ../template/default/tv.html:77 msgid "Interval:" msgstr "Intervalo:" -#: ../template/default/tv.html:193 ../template/default/tv.html:194 -#: ../template/default/tv.html:195 ../template/default/tv.html:196 -#: ../template/default/tv.html:197 ../template/default/tv.html:198 -#: ../template/default/tv.html:199 +#: ../template/default/tv.html:80 ../template/default/tv.html:81 +#: ../template/default/tv.html:82 ../template/default/tv.html:83 +#: ../template/default/tv.html:84 ../template/default/tv.html:85 +#: ../template/default/tv.html:86 msgid "sec." msgstr "seg" -#: ../template/default/tv.html:201 ../template/default/tv.html:208 +#: ../template/default/tv.html:88 ../template/default/tv.html:95 msgid "G" msgstr "C" -#: ../template/default/tv.html:201 ../template/default/tv.html:208 +#: ../template/default/tv.html:88 ../template/default/tv.html:95 msgid "Grab the picture!" msgstr "¡Captura la imagen!" -#: ../template/default/tv.html:202 +#: ../template/default/tv.html:89 msgid "Size:" msgstr "Dimensiones:" -#: ../template/default/tv.html:210 +#: ../template/default/tv.html:97 msgid "Open in separate window" msgstr "Abrir en una ventana separada" @@ -905,7 +905,7 @@ msgstr "Resumen:" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:17 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 -#: ../template/default/navigation.html:47 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:47 ../vdradmind.pl:4759 msgid "Recordings" msgstr "Grabaciones" @@ -1383,7 +1383,7 @@ msgstr "" "emisoras funcciona viceversa.</p>" #: ../template/default/prog_timeline.html:75 -#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4121 +#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4118 msgid "now" msgstr "ahora" @@ -1395,7 +1395,7 @@ msgstr "hasta" msgid "at:" msgstr " a la/s:" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2788 +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2785 msgid "Playing Today" msgstr "Estrenos hoy" @@ -2028,7 +2028,7 @@ msgstr "todos" #: ../template/default/at_timer_new.html:101 msgid "Override Start/Stop Margins:" -msgstr "" +msgstr "Reemplazar los margenes de tiempo para Inicio/Fin:" #: ../template/default/at_timer_new.html:155 msgid "Test" @@ -2046,7 +2046,7 @@ msgstr "Guardado en" msgid "No matches found!" msgstr "Nada igual encontrado!" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4759 msgid "Playing Today?" msgstr "¿Estrenos hoy?" @@ -2055,9 +2055,8 @@ msgid "Watch TV" msgstr "Televisión" #: ../template/default/navigation.html:56 -#, fuzzy msgid "Commands" -msgstr "Órdenes:" +msgstr "Comandos:" #: ../template/default/navigation.html:62 ../template/default/about.html:6 msgid "About" @@ -2134,11 +2133,12 @@ msgstr "Recibir ayuda y comentar \"Bugs\" (fallos)" #: ../template/default/about.html:84 msgid "" "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.png\"/>." +"pages. You can access it by clicking <img src=\"bilder/help.png\" alt=\"\" /" +">." msgstr "" "Si hace falta ayuda, intenta primero \"Online Help\" (Ayuda en linea) que " "encontraras en algunas páginas. Tienes acceso haciendo clic encima de <img " -"src=\"bilder/help.png\"/>." +"src=\"bilder/help.png\" alt=\"\" />." #: ../template/default/about.html:85 msgid "" @@ -2273,52 +2273,52 @@ msgstr "" msgid "Error while sending command to VDR at %s" msgstr "Error mientras mandó el orden a %s " -#: ../vdradmind.pl:2532 +#: ../vdradmind.pl:2528 msgid "Can't find EPG entry!" -msgstr "" +msgstr "No se encuentra el registro en la EPG!" -#: ../vdradmind.pl:2788 +#: ../vdradmind.pl:2785 msgid "Playing Tomorrow" msgstr "Estrenos mañana" -#: ../vdradmind.pl:2788 -#, fuzzy, perl-format +#: ../vdradmind.pl:2785 +#, perl-format msgid "Playing on the %s" -msgstr "Estrenos en %d" +msgstr "Estrenos en %s" -#: ../vdradmind.pl:4126 +#: ../vdradmind.pl:4123 msgid "next" msgstr "próximo" -#: ../vdradmind.pl:4145 +#: ../vdradmind.pl:4142 msgid "What's on after" msgstr "Se puede ver después:" -#: ../vdradmind.pl:4145 +#: ../vdradmind.pl:4142 msgid "What's on at" msgstr "Se puede ver a la/s:" -#: ../vdradmind.pl:4150 +#: ../vdradmind.pl:4147 msgid "Suitable matches for:" msgstr "Emparejamientos convenientes para:" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4149 msgid "short view" msgstr "Vista rapida" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4149 msgid "long view" msgstr "Vista detallada" -#: ../vdradmind.pl:4209 +#: ../vdradmind.pl:4206 msgid "Schedule" msgstr "Vista general" -#: ../vdradmind.pl:4762 +#: ../vdradmind.pl:4759 msgid "Timers" msgstr "Programaciones" -#: ../vdradmind.pl:4830 +#: ../vdradmind.pl:4827 msgid "System default" msgstr "Defecto del sistema" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-26 11:22+0200\n" -"PO-Revision-Date: 2006-01-18 12:36+0200\n" +"POT-Creation-Date: 2006-06-30 14:22+0200\n" +"PO-Revision-Date: 2006-06-26 12:36+0200\n" "Last-Translator: Rofa\n" "Language-Team: Suomi\n" "MIME-Version: 1.0\n" @@ -119,7 +119,7 @@ msgstr "Lähetteen tunniste" msgid "Time" msgstr "Aika" -#: ../template/default/timer_new.html:74 ../template/default/tv.html:192 +#: ../template/default/timer_new.html:74 ../template/default/tv.html:79 #: ../template/default/help_timer_new.html:35 msgid "off" msgstr "Pois" @@ -192,8 +192,8 @@ msgstr "Aloitusaika:" #: ../template/default/prog_list2.html:31 #: ../template/default/at_timer_new.html:88 #: ../template/default/at_timer_new.html:97 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 -#: ../vdradmind.pl:4150 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133 +#: ../vdradmind.pl:4147 msgid "o'clock" msgstr " " @@ -379,7 +379,7 @@ msgstr "Poistetaanko valitut ajastimet?" #: ../template/default/prog_summary.html:7 #: ../template/default/navigation.html:29 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4762 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4759 msgid "What's On Now?" msgstr "Menossa nyt" @@ -390,14 +390,14 @@ msgid "What's on:" msgstr "Menossa" #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133 msgid "at" msgstr " " #: ../template/default/prog_summary.html:47 #: ../template/default/prog_list.html:6 ../template/default/prog_list2.html:53 #: ../template/default/navigation.html:38 -#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4762 +#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4759 msgid "Channels" msgstr "Kanavat" @@ -541,7 +541,7 @@ msgstr "Vierailijan salasana:" #: ../template/default/config.html:151 ../template/default/help_config.html:30 #: ../template/default/help_config.html:78 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:35 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:35 ../vdradmind.pl:4759 msgid "Timeline" msgstr "Aikajana" @@ -822,34 +822,34 @@ msgstr "Siirry" msgid "Error!" msgstr "Virhe!" -#: ../template/default/tv.html:5 +#: ../template/default/tv.html:5 ../template/default/tv.html:75 msgid "TV" msgstr "TV" -#: ../template/default/tv.html:190 +#: ../template/default/tv.html:77 msgid "Interval:" msgstr "Päivitysväli:" -#: ../template/default/tv.html:193 ../template/default/tv.html:194 -#: ../template/default/tv.html:195 ../template/default/tv.html:196 -#: ../template/default/tv.html:197 ../template/default/tv.html:198 -#: ../template/default/tv.html:199 +#: ../template/default/tv.html:80 ../template/default/tv.html:81 +#: ../template/default/tv.html:82 ../template/default/tv.html:83 +#: ../template/default/tv.html:84 ../template/default/tv.html:85 +#: ../template/default/tv.html:86 msgid "sec." msgstr "s" -#: ../template/default/tv.html:201 ../template/default/tv.html:208 +#: ../template/default/tv.html:88 ../template/default/tv.html:95 msgid "G" msgstr "K" -#: ../template/default/tv.html:201 ../template/default/tv.html:208 +#: ../template/default/tv.html:88 ../template/default/tv.html:95 msgid "Grab the picture!" msgstr "Kuvankaappaus" -#: ../template/default/tv.html:202 +#: ../template/default/tv.html:89 msgid "Size:" msgstr "Koko:" -#: ../template/default/tv.html:210 +#: ../template/default/tv.html:97 msgid "Open in separate window" msgstr "Avaa omaan ikkunaan" @@ -888,7 +888,7 @@ msgstr "Kuvaus:" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:17 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 -#: ../template/default/navigation.html:47 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:47 ../vdradmind.pl:4759 msgid "Recordings" msgstr "Tallenteet" @@ -910,7 +910,7 @@ msgstr "kpl" #: ../template/default/rec_list.html:104 ../template/default/rec_list.html:107 msgid "New" -msgstr "Uusi" +msgstr "uusi" #: ../template/default/rec_list.html:121 ../template/default/rec_edit.html:44 msgid "Rename" @@ -1256,7 +1256,7 @@ msgid "" msgstr "" #: ../template/default/prog_timeline.html:75 -#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4121 +#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4118 msgid "now" msgstr "nyt" @@ -1268,13 +1268,13 @@ msgstr "-" msgid "at:" msgstr "kello:" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2788 +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2785 msgid "Playing Today" msgstr "Ohjelmisto tänään" #: ../template/default/prog_list2.html:29 msgid "starting at" -msgstr "alkaa kello" +msgstr "alkaen kello" #: ../template/default/rec_edit.html:6 ../template/default/rec_edit.html:19 msgid "Rename Recording" @@ -1682,7 +1682,7 @@ msgstr "Tallennehakemisto" msgid "No matches found!" msgstr "Ei löytynyt yhtään hakutulosta!" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4759 msgid "Playing Today?" msgstr "Tänään" @@ -1769,9 +1769,11 @@ msgstr "Avunsaanti ja virheiden raportointi" #: ../template/default/about.html:84 msgid "" "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.png\"/>." +"pages. You can access it by clicking <img src=\"bilder/help.png\" alt=\"\" /" +">." msgstr "" -"Saat opasteen näytille painamalla <img src=\"bilder/help.png\"/> -kuvaketta." +"Saat opasteen näytille painamalla <img src=\"bilder/help.png\" alt=\"\" /> -" +"kuvaketta." #: ../template/default/about.html:85 msgid "" @@ -1904,51 +1906,51 @@ msgstr "" msgid "Error while sending command to VDR at %s" msgstr "Komennon lähetys VDR:lle epäonnistui (%s)" -#: ../vdradmind.pl:2532 +#: ../vdradmind.pl:2528 msgid "Can't find EPG entry!" msgstr "Ohjelman tietoja ei löydy ohjelmaoppaasta!" -#: ../vdradmind.pl:2788 +#: ../vdradmind.pl:2785 msgid "Playing Tomorrow" msgstr "Ohjelmisto huomenna" -#: ../vdradmind.pl:2788 -#, fuzzy, perl-format +#: ../vdradmind.pl:2785 +#, perl-format msgid "Playing on the %s" -msgstr "Ohjelmisto %d. päivä" +msgstr "Ohjelmisto %d päivä" -#: ../vdradmind.pl:4126 +#: ../vdradmind.pl:4123 msgid "next" msgstr "seuraavaksi" -#: ../vdradmind.pl:4145 +#: ../vdradmind.pl:4142 msgid "What's on after" msgstr "Menossa seuraavaksi" -#: ../vdradmind.pl:4145 +#: ../vdradmind.pl:4142 msgid "What's on at" msgstr "Menossa" -#: ../vdradmind.pl:4150 +#: ../vdradmind.pl:4147 msgid "Suitable matches for:" msgstr "Hakutulokset termille:" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4149 msgid "short view" msgstr "lyhyt näkymä" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4149 msgid "long view" msgstr "pitkä näkymä" -#: ../vdradmind.pl:4209 +#: ../vdradmind.pl:4206 msgid "Schedule" msgstr "Ohjelmisto" -#: ../vdradmind.pl:4762 +#: ../vdradmind.pl:4759 msgid "Timers" msgstr "Ajastimet" -#: ../vdradmind.pl:4830 +#: ../vdradmind.pl:4827 msgid "System default" msgstr "Oletus" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-26 11:22+0200\n" +"POT-Creation-Date: 2006-06-30 14:22+0200\n" "PO-Revision-Date: 2006-05-21 00:34+0100\n" "Last-Translator: NIVAL Michaël <mnival@club-internet.fr>\n" "Language-Team: Trois Six <trois.six@free.fr>\n" @@ -116,7 +116,7 @@ msgstr "Identification Transmission" msgid "Time" msgstr "Horaires" -#: ../template/default/timer_new.html:74 ../template/default/tv.html:192 +#: ../template/default/timer_new.html:74 ../template/default/tv.html:79 #: ../template/default/help_timer_new.html:35 msgid "off" msgstr "off" @@ -189,8 +189,8 @@ msgstr "Heure De Début :" #: ../template/default/prog_list2.html:31 #: ../template/default/at_timer_new.html:88 #: ../template/default/at_timer_new.html:97 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 -#: ../vdradmind.pl:4150 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133 +#: ../vdradmind.pl:4147 msgid "o'clock" msgstr "Heure" @@ -378,7 +378,7 @@ msgstr "Supprimer Programmations Sélectionnées ?" #: ../template/default/prog_summary.html:7 #: ../template/default/navigation.html:29 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4762 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4759 msgid "What's On Now?" msgstr "En ce Moment ?" @@ -389,14 +389,14 @@ msgid "What's on:" msgstr "En ce moment :" #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133 msgid "at" msgstr "à" #: ../template/default/prog_summary.html:47 #: ../template/default/prog_list.html:6 ../template/default/prog_list2.html:53 #: ../template/default/navigation.html:38 -#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4762 +#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4759 msgid "Channels" msgstr "Chaînes" @@ -540,7 +540,7 @@ msgstr "Mot de Passe Invité :" #: ../template/default/config.html:151 ../template/default/help_config.html:30 #: ../template/default/help_config.html:78 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:35 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:35 ../vdradmind.pl:4759 msgid "Timeline" msgstr "Chronologie" @@ -821,34 +821,34 @@ msgstr "Ok !" msgid "Error!" msgstr "Erreur !" -#: ../template/default/tv.html:5 +#: ../template/default/tv.html:5 ../template/default/tv.html:75 msgid "TV" msgstr "TV" -#: ../template/default/tv.html:190 +#: ../template/default/tv.html:77 msgid "Interval:" msgstr "Intervalle :" -#: ../template/default/tv.html:193 ../template/default/tv.html:194 -#: ../template/default/tv.html:195 ../template/default/tv.html:196 -#: ../template/default/tv.html:197 ../template/default/tv.html:198 -#: ../template/default/tv.html:199 +#: ../template/default/tv.html:80 ../template/default/tv.html:81 +#: ../template/default/tv.html:82 ../template/default/tv.html:83 +#: ../template/default/tv.html:84 ../template/default/tv.html:85 +#: ../template/default/tv.html:86 msgid "sec." msgstr "sec." -#: ../template/default/tv.html:201 ../template/default/tv.html:208 +#: ../template/default/tv.html:88 ../template/default/tv.html:95 msgid "G" msgstr "R" -#: ../template/default/tv.html:201 ../template/default/tv.html:208 +#: ../template/default/tv.html:88 ../template/default/tv.html:95 msgid "Grab the picture!" msgstr "Rafraîchir!" -#: ../template/default/tv.html:202 +#: ../template/default/tv.html:89 msgid "Size:" msgstr "Taille :" -#: ../template/default/tv.html:210 +#: ../template/default/tv.html:97 msgid "Open in separate window" msgstr "Ouvrir dans une nouvelle fenêtre" @@ -887,7 +887,7 @@ msgstr "Description :" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:17 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 -#: ../template/default/navigation.html:47 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:47 ../vdradmind.pl:4759 msgid "Recordings" msgstr "Enregistrements" @@ -1374,7 +1374,7 @@ msgstr "" "type=\"submit\" class=\"submit\" value=\"<<<<<\"/>.</p>" #: ../template/default/prog_timeline.html:75 -#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4121 +#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4118 msgid "now" msgstr "maintenant" @@ -1386,7 +1386,7 @@ msgstr "à" msgid "at:" msgstr "à :" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2788 +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2785 msgid "Playing Today" msgstr "Joué Aujourd'hui" @@ -2017,7 +2017,7 @@ msgstr "Stockés dans" msgid "No matches found!" msgstr "Aucune correspondance trouvée !" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4759 msgid "Playing Today?" msgstr "Aujourd'hui ?" @@ -2105,10 +2105,11 @@ msgstr "Avoir de l'Aide et Rapporter les Bugs" #: ../template/default/about.html:84 msgid "" "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.png\"/>." +"pages. You can access it by clicking <img src=\"bilder/help.png\" alt=\"\" /" +">." msgstr "" "Si vous avez besoin d'aide, merci de regarder en priorité sur l'aide en " -"ligne. Ici <img src=\"bilder/help.png\"/>." +"ligne. Ici <img src=\"bilder/help.png\" alt=\"\" />." #: ../template/default/about.html:85 msgid "" @@ -2242,52 +2243,52 @@ msgstr "" msgid "Error while sending command to VDR at %s" msgstr "Erreur en envoyant la commande à %s" -#: ../vdradmind.pl:2532 +#: ../vdradmind.pl:2528 msgid "Can't find EPG entry!" msgstr "" -#: ../vdradmind.pl:2788 +#: ../vdradmind.pl:2785 msgid "Playing Tomorrow" msgstr "Joué demain" -#: ../vdradmind.pl:2788 +#: ../vdradmind.pl:2785 #, fuzzy, perl-format msgid "Playing on the %s" msgstr "En cours sur la %d." -#: ../vdradmind.pl:4126 +#: ../vdradmind.pl:4123 msgid "next" msgstr "suivant" -#: ../vdradmind.pl:4145 +#: ../vdradmind.pl:4142 msgid "What's on after" msgstr "Que se passe-t-il ensuite" -#: ../vdradmind.pl:4145 +#: ../vdradmind.pl:4142 msgid "What's on at" msgstr "Que se passe-t-il à telle heure" -#: ../vdradmind.pl:4150 +#: ../vdradmind.pl:4147 msgid "Suitable matches for:" msgstr "Correspondances trouvées pour :" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4149 msgid "short view" msgstr "Court aperçu" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4149 msgid "long view" msgstr "Long aperçu" -#: ../vdradmind.pl:4209 +#: ../vdradmind.pl:4206 msgid "Schedule" msgstr "Programmateur" -#: ../vdradmind.pl:4762 +#: ../vdradmind.pl:4759 msgid "Timers" msgstr "Programmations" -#: ../vdradmind.pl:4830 +#: ../vdradmind.pl:4827 msgid "System default" msgstr "Par défaut" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-26 11:22+0200\n" +"POT-Creation-Date: 2006-06-30 14:22+0200\n" "PO-Revision-Date: 2006-06-25 12:49+0200\n" "Last-Translator: Roel <rl.koelewijn@home.nl>\n" "Language-Team: Nederlands <nl@li.org>\n" @@ -122,7 +122,7 @@ msgstr "Verzend indentificatie" msgid "Time" msgstr "Tijd " -#: ../template/default/timer_new.html:74 ../template/default/tv.html:192 +#: ../template/default/timer_new.html:74 ../template/default/tv.html:79 #: ../template/default/help_timer_new.html:35 msgid "off" msgstr "Uit " @@ -195,8 +195,8 @@ msgstr "Start tijd:" #: ../template/default/prog_list2.html:31 #: ../template/default/at_timer_new.html:88 #: ../template/default/at_timer_new.html:97 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 -#: ../vdradmind.pl:4150 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133 +#: ../vdradmind.pl:4147 msgid "o'clock" msgstr "Uur" @@ -384,7 +384,7 @@ msgstr "Verwijder alle geselecteerde timers?" #: ../template/default/prog_summary.html:7 #: ../template/default/navigation.html:29 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4762 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4759 msgid "What's On Now?" msgstr "Wat is er nu op?" @@ -395,14 +395,14 @@ msgid "What's on:" msgstr "Wat is er op:" #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133 msgid "at" msgstr "om" #: ../template/default/prog_summary.html:47 #: ../template/default/prog_list.html:6 ../template/default/prog_list2.html:53 #: ../template/default/navigation.html:38 -#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4762 +#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4759 msgid "Channels" msgstr "Kanalen" @@ -546,7 +546,7 @@ msgstr "Wachtwoord gast" #: ../template/default/config.html:151 ../template/default/help_config.html:30 #: ../template/default/help_config.html:78 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:35 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:35 ../vdradmind.pl:4759 msgid "Timeline" msgstr "Tijdlijn" @@ -827,34 +827,34 @@ msgstr "Ga!" msgid "Error!" msgstr "Fout!" -#: ../template/default/tv.html:5 +#: ../template/default/tv.html:5 ../template/default/tv.html:75 msgid "TV" msgstr "TV" -#: ../template/default/tv.html:190 +#: ../template/default/tv.html:77 msgid "Interval:" msgstr "Interval:" -#: ../template/default/tv.html:193 ../template/default/tv.html:194 -#: ../template/default/tv.html:195 ../template/default/tv.html:196 -#: ../template/default/tv.html:197 ../template/default/tv.html:198 -#: ../template/default/tv.html:199 +#: ../template/default/tv.html:80 ../template/default/tv.html:81 +#: ../template/default/tv.html:82 ../template/default/tv.html:83 +#: ../template/default/tv.html:84 ../template/default/tv.html:85 +#: ../template/default/tv.html:86 msgid "sec." msgstr "sec." -#: ../template/default/tv.html:201 ../template/default/tv.html:208 +#: ../template/default/tv.html:88 ../template/default/tv.html:95 msgid "G" msgstr "G" -#: ../template/default/tv.html:201 ../template/default/tv.html:208 +#: ../template/default/tv.html:88 ../template/default/tv.html:95 msgid "Grab the picture!" msgstr "Snapshot maken!" -#: ../template/default/tv.html:202 +#: ../template/default/tv.html:89 msgid "Size:" msgstr "Grootte:" -#: ../template/default/tv.html:210 +#: ../template/default/tv.html:97 msgid "Open in separate window" msgstr "In apart venster openen" @@ -893,7 +893,7 @@ msgstr "Omschrijving:" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:17 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 -#: ../template/default/navigation.html:47 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:47 ../vdradmind.pl:4759 msgid "Recordings" msgstr "Opnames" @@ -1367,7 +1367,7 @@ msgstr "" "\"submit\" value=\"<<<<<\"/>.</p>" #: ../template/default/prog_timeline.html:75 -#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4121 +#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4118 msgid "now" msgstr "nu" @@ -1379,7 +1379,7 @@ msgstr "naar " msgid "at:" msgstr "om:" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2788 +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2785 msgid "Playing Today" msgstr "Programma vandaag " @@ -1985,7 +1985,7 @@ msgstr "Opgeslagen in" msgid "No matches found!" msgstr "Geen overeenkomsten gevonden!" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4759 msgid "Playing Today?" msgstr "Speelt vandaag?" @@ -2072,11 +2072,12 @@ msgstr "Voor het verkrijgen van hulp en melden van bugs" #: ../template/default/about.html:84 msgid "" "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.png\"/>." +"pages. You can access it by clicking <img src=\"bilder/help.png\" alt=\"\" /" +">." msgstr "" "Als u hulp nodig heeft probeer dan eers de online hulp, u zult enige " -"pagina's vinden. U kunt dit bezoeken door op <img src=\"bilder/help.png\"/> " -"te klikken." +"pagina's vinden. U kunt dit bezoeken door op <img src=\"bilder/help.png\" " +"alt=\"\" /> te klikken." #: ../template/default/about.html:85 msgid "" @@ -2210,51 +2211,51 @@ msgstr "" msgid "Error while sending command to VDR at %s" msgstr "Fout tijdens verzenden van commando op %s" -#: ../vdradmind.pl:2532 +#: ../vdradmind.pl:2528 msgid "Can't find EPG entry!" msgstr "Kan geen EPG gegevens vinden!" -#: ../vdradmind.pl:2788 +#: ../vdradmind.pl:2785 msgid "Playing Tomorrow" msgstr "Speelt morgen" -#: ../vdradmind.pl:2788 +#: ../vdradmind.pl:2785 #, perl-format msgid "Playing on the %s" msgstr "Speelt op de %s" -#: ../vdradmind.pl:4126 +#: ../vdradmind.pl:4123 msgid "next" msgstr "volgende" -#: ../vdradmind.pl:4145 +#: ../vdradmind.pl:4142 msgid "What's on after" msgstr "Wat is er op na" -#: ../vdradmind.pl:4145 +#: ../vdradmind.pl:4142 msgid "What's on at" msgstr "Wat is er op om:" -#: ../vdradmind.pl:4150 +#: ../vdradmind.pl:4147 msgid "Suitable matches for:" msgstr "Bruikbare overeenkomsten voor:" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4149 msgid "short view" msgstr "beknopt tonen" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4149 msgid "long view" msgstr "uitgebreid tonen" -#: ../vdradmind.pl:4209 +#: ../vdradmind.pl:4206 msgid "Schedule" msgstr "Schema" -#: ../vdradmind.pl:4762 +#: ../vdradmind.pl:4759 msgid "Timers" msgstr "Timers" -#: ../vdradmind.pl:4830 +#: ../vdradmind.pl:4827 msgid "System default" msgstr "Systeem standaard" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-26 11:22+0200\n" +"POT-Creation-Date: 2006-06-30 14:22+0200\n" "PO-Revision-Date: 2006-06-26 10:53+0100\n" "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n" "Language-Team: Allrussian <LL.org>\n" @@ -129,7 +129,7 @@ msgstr "¸ÔÕÝâØäØÚÐâÞà ßÕàÕÔÐçØ" msgid "Time" msgstr "²àÕÜï" -#: ../template/default/timer_new.html:74 ../template/default/tv.html:192 +#: ../template/default/timer_new.html:74 ../template/default/tv.html:79 #: ../template/default/help_timer_new.html:35 msgid "off" msgstr "ÒëÚÛ." @@ -202,8 +202,8 @@ msgstr "½ÐçÐÛÞ:" #: ../template/default/prog_list2.html:31 #: ../template/default/at_timer_new.html:88 #: ../template/default/at_timer_new.html:97 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 -#: ../vdradmind.pl:4150 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133 +#: ../vdradmind.pl:4147 msgid "o'clock" msgstr "ÇÐáÞÒ" @@ -389,7 +389,7 @@ msgstr "ÃÔÐÛØâì ÒáÕ ÒëÑàÐÝÝëÕ °ÒâÞâÐÙÜÕàë?" #: ../template/default/prog_summary.html:7 #: ../template/default/navigation.html:29 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4762 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4759 msgid "What's On Now?" msgstr "ÇâÞ ØÔÕâ áÕÙçÐá?" @@ -400,14 +400,14 @@ msgid "What's on:" msgstr "ÇâÞ áÕÙçÐá:" #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133 msgid "at" msgstr "Ò" #: ../template/default/prog_summary.html:47 #: ../template/default/prog_list.html:6 ../template/default/prog_list2.html:53 #: ../template/default/navigation.html:38 -#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4762 +#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4759 msgid "Channels" msgstr "ÂÕÛÕÓØÔ" @@ -551,7 +551,7 @@ msgstr "¿ÐàÞÛì ÔÛï ÓÞáâï:" #: ../template/default/config.html:151 ../template/default/help_config.html:30 #: ../template/default/help_config.html:78 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:35 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:35 ../vdradmind.pl:4759 msgid "Timeline" msgstr "³àÐäØÚ ÒàÕÜÕÝØ" @@ -832,34 +832,34 @@ msgstr "ÁâÐàâÞÒÐâì!" msgid "Error!" msgstr "¾èØÑÚÐ!" -#: ../template/default/tv.html:5 +#: ../template/default/tv.html:5 ../template/default/tv.html:75 msgid "TV" msgstr "TV" -#: ../template/default/tv.html:190 +#: ../template/default/tv.html:77 msgid "Interval:" msgstr "¸ÝâÕàÒÐÛ:" -#: ../template/default/tv.html:193 ../template/default/tv.html:194 -#: ../template/default/tv.html:195 ../template/default/tv.html:196 -#: ../template/default/tv.html:197 ../template/default/tv.html:198 -#: ../template/default/tv.html:199 +#: ../template/default/tv.html:80 ../template/default/tv.html:81 +#: ../template/default/tv.html:82 ../template/default/tv.html:83 +#: ../template/default/tv.html:84 ../template/default/tv.html:85 +#: ../template/default/tv.html:86 msgid "sec." msgstr "áÕÚ." -#: ../template/default/tv.html:201 ../template/default/tv.html:208 +#: ../template/default/tv.html:88 ../template/default/tv.html:95 msgid "G" msgstr "G" -#: ../template/default/tv.html:201 ../template/default/tv.html:208 +#: ../template/default/tv.html:88 ../template/default/tv.html:95 msgid "Grab the picture!" msgstr "ÁÞ×ÔÐâì áÚàØÝèÞâ!" -#: ../template/default/tv.html:202 +#: ../template/default/tv.html:89 msgid "Size:" msgstr "ÀÐ×ÜÕà:" -#: ../template/default/tv.html:210 +#: ../template/default/tv.html:97 msgid "Open in separate window" msgstr "¾âÚàëâì Ò ÞâÔÕÛìÝÞÜ ÞÚÝÕ" @@ -898,7 +898,7 @@ msgstr "¾ßØáÐÝØÕ:" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:17 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 -#: ../template/default/navigation.html:47 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:47 ../vdradmind.pl:4759 msgid "Recordings" msgstr "·ÐßØáØ" @@ -1354,7 +1354,7 @@ msgstr "" ">>\"/>.ÃÔÐÛØâì ÚÐÝÐÛë Ø× íâÞÓÞ áßØáÚÐ ÜÞÖÝÞ ÒëÔÕÛØÒ " #: ../template/default/prog_timeline.html:75 -#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4121 +#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4118 msgid "now" msgstr "áÕÙçÐá" @@ -1366,7 +1366,7 @@ msgstr "ÔÞ" msgid "at:" msgstr "Ò:" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2788 +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2785 msgid "Playing Today" msgstr "ÇâÞ ÑãÔÕâ áÕÓÞÔÝï?" @@ -1961,7 +1961,7 @@ msgstr "ÁÞåàÐÝÕÝÝÞ Ò" msgid "No matches found!" msgstr "ÁÞÒßÐÔÕÝØÙ ÝÕ ÝÐÙÔÕÝÞ!" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4759 msgid "Playing Today?" msgstr "ÇâÞ ÑãÔÕâ áÕÓÞÔÝï?" @@ -2048,11 +2048,12 @@ msgstr "¿ÞÛãçØâì ßÞÜÞéì Ø áÞÞÑéØâì ÞÑ ÞèØÑÚÕ" #: ../template/default/about.html:84 msgid "" "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.png\"/>." +"pages. You can access it by clicking <img src=\"bilder/help.png\" alt=\"\" /" +">." msgstr "" "µáÛØ ²ÐÜ ÝãÖÝÐ ßÞÜÞéì ßÞ ÔÐÝÝÞÙ ßàÞÓàÐÜÜÕ, âÞ ÞÑàÐâØâÕáì ÒÝÐçÐÛÕ Ú " "ØÝâÕàÐÚâØÒÝÞÙ ßÞÜÞéØ, ÚÞâÞàÐï ÔÞáâãßÝÐ ÝÐ ÝÕÚÞâÞàëå áâàÐÝØæÐå. ²ë ÜÞÖÕâÕ " -"Òë×ëÒÐâì ÕÕ ÝÐÖØÜÐï ÝÐ <img src=\"bilder/help.png\"/>." +"Òë×ëÒÐâì ÕÕ ÝÐÖØÜÐï ÝÐ <img src=\"bilder/help.png\" alt=\"\" />." #: ../template/default/about.html:85 msgid "" @@ -2187,52 +2188,52 @@ msgstr "" msgid "Error while sending command to VDR at %s" msgstr "¾èØÑÚÐ ßàØ ÞâßàÐÒÛÕÝØØ ÚÞÜÐÝÔë Ú %s" -#: ../vdradmind.pl:2532 +#: ../vdradmind.pl:2528 msgid "Can't find EPG entry!" msgstr "½Õâ EPG ×ÐßØáÕÙ!" -#: ../vdradmind.pl:2788 +#: ../vdradmind.pl:2785 msgid "Playing Tomorrow" msgstr "¿àÞÓàÐÜÜÐ ÝÐ ×ÐÒâàÐ" -#: ../vdradmind.pl:2788 +#: ../vdradmind.pl:2785 #, perl-format msgid "Playing on the %s" msgstr "²ÞáßàÞØ×ÒÕáâØ %s." -#: ../vdradmind.pl:4126 +#: ../vdradmind.pl:4123 msgid "next" msgstr "áÛÕÔ." -#: ../vdradmind.pl:4145 +#: ../vdradmind.pl:4142 msgid "What's on after" msgstr "ÇâÞ ßÞâÞÜ" -#: ../vdradmind.pl:4145 +#: ../vdradmind.pl:4142 msgid "What's on at" msgstr "ÇâÞ Ò:" -#: ../vdradmind.pl:4150 +#: ../vdradmind.pl:4147 msgid "Suitable matches for:" msgstr "ÀÕ×ãÛìâÐâë ßÞØáÚÐ ÔÛï" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4149 msgid "short view" msgstr "áÞÚàÐéÕÝÝÐï ØÝäÞàÜÐæØï" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4149 msgid "long view" msgstr "ÀÐáèØàÕÝÝÐï ØÝäÞàÜÐæØï" -#: ../vdradmind.pl:4209 +#: ../vdradmind.pl:4206 msgid "Schedule" msgstr "ÀÐáßØáÐÝØÕ" -#: ../vdradmind.pl:4762 +#: ../vdradmind.pl:4759 msgid "Timers" msgstr "ÂÐÙÜÕàë" -#: ../vdradmind.pl:4830 +#: ../vdradmind.pl:4827 msgid "System default" msgstr "ÁØáâÕÜÝëÙ áâÐÝÔÐàâ" diff --git a/po/vdradmin.pot b/po/vdradmin.pot index 8802c9d..d19669d 100644 --- a/po/vdradmin.pot +++ b/po/vdradmin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-26 11:22+0200\n" +"POT-Creation-Date: 2006-06-30 14:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -120,7 +120,7 @@ msgstr "" msgid "Time" msgstr "" -#: ../template/default/timer_new.html:74 ../template/default/tv.html:192 +#: ../template/default/timer_new.html:74 ../template/default/tv.html:79 #: ../template/default/help_timer_new.html:35 msgid "off" msgstr "" @@ -193,8 +193,8 @@ msgstr "" #: ../template/default/prog_list2.html:31 #: ../template/default/at_timer_new.html:88 #: ../template/default/at_timer_new.html:97 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 -#: ../vdradmind.pl:4150 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133 +#: ../vdradmind.pl:4147 msgid "o'clock" msgstr "" @@ -376,7 +376,7 @@ msgstr "" #: ../template/default/prog_summary.html:7 #: ../template/default/navigation.html:29 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4762 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4759 msgid "What's On Now?" msgstr "" @@ -387,14 +387,14 @@ msgid "What's on:" msgstr "" #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4133 msgid "at" msgstr "" #: ../template/default/prog_summary.html:47 #: ../template/default/prog_list.html:6 ../template/default/prog_list2.html:53 #: ../template/default/navigation.html:38 -#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4762 +#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4759 msgid "Channels" msgstr "" @@ -538,7 +538,7 @@ msgstr "" #: ../template/default/config.html:151 ../template/default/help_config.html:30 #: ../template/default/help_config.html:78 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:35 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:35 ../vdradmind.pl:4759 msgid "Timeline" msgstr "" @@ -819,34 +819,34 @@ msgstr "" msgid "Error!" msgstr "" -#: ../template/default/tv.html:5 +#: ../template/default/tv.html:5 ../template/default/tv.html:75 msgid "TV" msgstr "" -#: ../template/default/tv.html:190 +#: ../template/default/tv.html:77 msgid "Interval:" msgstr "" -#: ../template/default/tv.html:193 ../template/default/tv.html:194 -#: ../template/default/tv.html:195 ../template/default/tv.html:196 -#: ../template/default/tv.html:197 ../template/default/tv.html:198 -#: ../template/default/tv.html:199 +#: ../template/default/tv.html:80 ../template/default/tv.html:81 +#: ../template/default/tv.html:82 ../template/default/tv.html:83 +#: ../template/default/tv.html:84 ../template/default/tv.html:85 +#: ../template/default/tv.html:86 msgid "sec." msgstr "" -#: ../template/default/tv.html:201 ../template/default/tv.html:208 +#: ../template/default/tv.html:88 ../template/default/tv.html:95 msgid "G" msgstr "" -#: ../template/default/tv.html:201 ../template/default/tv.html:208 +#: ../template/default/tv.html:88 ../template/default/tv.html:95 msgid "Grab the picture!" msgstr "" -#: ../template/default/tv.html:202 +#: ../template/default/tv.html:89 msgid "Size:" msgstr "" -#: ../template/default/tv.html:210 +#: ../template/default/tv.html:97 msgid "Open in separate window" msgstr "" @@ -885,7 +885,7 @@ msgstr "" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:17 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 -#: ../template/default/navigation.html:47 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:47 ../vdradmind.pl:4759 msgid "Recordings" msgstr "" @@ -1249,7 +1249,7 @@ msgid "" msgstr "" #: ../template/default/prog_timeline.html:75 -#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4121 +#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4118 msgid "now" msgstr "" @@ -1261,7 +1261,7 @@ msgstr "" msgid "at:" msgstr "" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2788 +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2785 msgid "Playing Today" msgstr "" @@ -1675,7 +1675,7 @@ msgstr "" msgid "No matches found!" msgstr "" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4762 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4759 msgid "Playing Today?" msgstr "" @@ -1762,7 +1762,8 @@ msgstr "" #: ../template/default/about.html:84 msgid "" "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.png\"/>." +"pages. You can access it by clicking <img src=\"bilder/help.png\" alt=\"\" /" +">." msgstr "" #: ../template/default/about.html:85 @@ -1888,51 +1889,51 @@ msgstr "" msgid "Error while sending command to VDR at %s" msgstr "" -#: ../vdradmind.pl:2532 +#: ../vdradmind.pl:2528 msgid "Can't find EPG entry!" msgstr "" -#: ../vdradmind.pl:2788 +#: ../vdradmind.pl:2785 msgid "Playing Tomorrow" msgstr "" -#: ../vdradmind.pl:2788 +#: ../vdradmind.pl:2785 #, perl-format msgid "Playing on the %s" msgstr "" -#: ../vdradmind.pl:4126 +#: ../vdradmind.pl:4123 msgid "next" msgstr "" -#: ../vdradmind.pl:4145 +#: ../vdradmind.pl:4142 msgid "What's on after" msgstr "" -#: ../vdradmind.pl:4145 +#: ../vdradmind.pl:4142 msgid "What's on at" msgstr "" -#: ../vdradmind.pl:4150 +#: ../vdradmind.pl:4147 msgid "Suitable matches for:" msgstr "" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4149 msgid "short view" msgstr "" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4149 msgid "long view" msgstr "" -#: ../vdradmind.pl:4209 +#: ../vdradmind.pl:4206 msgid "Schedule" msgstr "" -#: ../vdradmind.pl:4762 +#: ../vdradmind.pl:4759 msgid "Timers" msgstr "" -#: ../vdradmind.pl:4830 +#: ../vdradmind.pl:4827 msgid "System default" msgstr "" diff --git a/template/default/about.html b/template/default/about.html index 41b1468..52030cd 100644 --- a/template/default/about.html +++ b/template/default/about.html @@ -81,7 +81,7 @@ <tr class="row_even"> <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.png"/>. !%></li> + <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.png" alt="" />. !%></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: !%> "[ANNOUNCE] VDRAdmin-AM-<tmpl_var myversion>"</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> diff --git a/template/default/error.html b/template/default/error.html index 9b6624a..6739d37 100644 --- a/template/default/error.html +++ b/template/default/error.html @@ -13,7 +13,7 @@ <body id="error"> <div align="center"> - <img src="bilder/sauerei.gif" height="230" width="177" border="0"/> + <img src="bilder/sauerei.gif" height="230" width="177" border="0" alt="" /> <br/> <h2><tmpl_var name="error"></h2> </div> diff --git a/template/default/navigation.html b/template/default/navigation.html index bbcdc1b..3bf3754 100644 --- a/template/default/navigation.html +++ b/template/default/navigation.html @@ -22,7 +22,7 @@ <body id="navigation"> <div class="logo"> - <a href="./" target="_top"><tmpl_if linvdr><img src="bilder/logo_linvdr.gif" alt="" height="50px" width="150px" border="0" /><tmpl_else><img src="bilder/logo_other.png" alt="" height="50" width="150" border="0" /></tmpl_if></a> + <a href="./" target="_top"><tmpl_if linvdr><img src="bilder/logo_linvdr.gif" alt="" height="50" width="150" border="0" /><tmpl_else><img src="bilder/logo_other.png" alt="" height="50" width="150" border="0" /></tmpl_if></a> </div> <div class="nav_bar"> <div class="navi" id="prog_summary"> diff --git a/template/default/prog_detail.html b/template/default/prog_detail.html index 9b6879b..f78935a 100644 --- a/template/default/prog_detail.html +++ b/template/default/prog_detail.html @@ -34,7 +34,7 @@ </tmpl_if> <tmpl_if recurl> <span class="action record"> - <a href="javascript:window.close();opener.location.href='<tmpl_var recurl>'"><img src="bilder/rec_button.png" border="0" alt="<%! record !%>" onmouseover="window.status='<%! record !%>';return true" title="<%! record !%>" /></a> + <a href="javascript:void(opener.location.href='<tmpl_var recurl>');window.close()"><img src="bilder/rec_button.png" border="0" alt="<%! record !%>" onmouseover="window.status='<%! record !%>';return true" title="<%! record !%>" /></a> </span> </tmpl_if> <span class="action repeatings"> @@ -82,7 +82,7 @@ <tmpl_if epgimages> <div class="epg_images"> <tmpl_loop epgimages> - <img src="<tmpl_var image>"/> + <img src="<tmpl_var image>" alt=""/> </tmpl_loop> </div> </tmpl_if> diff --git a/template/default/prog_list.html b/template/default/prog_list.html index f81d1ad..d0f5774 100644 --- a/template/default/prog_list.html +++ b/template/default/prog_list.html @@ -45,7 +45,7 @@ <span class="channel_name"><tmpl_var progname></span> <span class="date_long"><tmpl_var longdate></span> </td> - <td class="col_navi"><tmpl_if prev_channel><a href="<tmpl_var prev_channel>"><img src="bilder/pfeile_nachlinks.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachlinks_soft.png" border="0" /></tmpl_if><tmpl_if next_channel><a href="<tmpl_var next_channel>"><img src="bilder/pfeile_nachrechts.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachrechts_soft.png" border="0" /></tmpl_if></td> + <td class="col_navi"><tmpl_if prev_channel><a href="<tmpl_var prev_channel>"><img src="bilder/pfeile_nachlinks.png" border="0" alt="" /></a><tmpl_else><img src="bilder/pfeile_nachlinks_soft.png" border="0" alt="" /></tmpl_if><tmpl_if next_channel><a href="<tmpl_var next_channel>"><img src="bilder/pfeile_nachrechts.png" border="0" alt="" /></a><tmpl_else><img src="bilder/pfeile_nachrechts_soft.png" border="0" alt="" /></tmpl_if></td> </tr> <tmpl_else> <tmpl_unless endd> diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html index bd7319d..cd6f87b 100644 --- a/template/default/prog_list2.html +++ b/template/default/prog_list2.html @@ -31,12 +31,12 @@ <%! o'clock !%> </td> <td class="col_navi"> - <tmpl_if prevdayurl><a href="<tmpl_var prevdayurl>"><img src="bilder/pfeile_nachlinks.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachlinks_soft.png" border="0" /></tmpl_if> + <tmpl_if prevdayurl><a href="<tmpl_var prevdayurl>"><img src="bilder/pfeile_nachlinks.png" border="0" alt="" /></a><tmpl_else><img src="bilder/pfeile_nachlinks_soft.png" border="0" alt="" /></tmpl_if> <select name="days" size="1" onchange="window.open(this.options[this.selectedIndex].value,'main')"> <tmpl_loop days> <option value="<tmpl_var id>" <tmpl_if sel>selected</tmpl_if>><tmpl_var name></option> </tmpl_loop> </select> - <tmpl_if nextdayurl><a href="<tmpl_var nextdayurl>"><img src="bilder/pfeile_nachrechts.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachrechts_soft.png" border="0" /></tmpl_if> + <tmpl_if nextdayurl><a href="<tmpl_var nextdayurl>"><img src="bilder/pfeile_nachrechts.png" border="0" alt="" /></a><tmpl_else><img src="bilder/pfeile_nachrechts_soft.png" border="0" alt="" /></tmpl_if> </td> </tr> </table> diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html index 56371c3..40c9782 100644 --- a/template/default/prog_summary.html +++ b/template/default/prog_summary.html @@ -49,8 +49,8 @@ <tmpl_if show_percent> <table border="0" cellspacing="0" cellpadding="0" class="percent"> <tr title="<tmpl_var elapsed_min>min / <tmpl_var length_min>min"> - <td class="elapsed" width="<tmpl_var percent>%"><img src="bilder/spacer.gif" width="1px" height="1px"/></td> - <td class="remaining"><img src="bilder/spacer.gif" width="1px" height="1px"/></td> + <td class="elapsed" width="<tmpl_var percent>%"><img src="bilder/spacer.gif" width="1" height="1" alt=""/></td> + <td class="remaining"><img src="bilder/spacer.gif" width="1" height="1" alt=""/></td> </tr> </table> </tmpl_if> diff --git a/template/default/prog_summary2.html b/template/default/prog_summary2.html index 5d94619..0a3d2c8 100644 --- a/template/default/prog_summary2.html +++ b/template/default/prog_summary2.html @@ -57,8 +57,8 @@ <?% IF broadcast.show_percent %?> <table border="0" cellspacing="0" cellpadding="0" class="percent" title="<?% broadcast.elapsed_min %?>min / <?% broadcast.length_min %?>min"> <tr> - <td class="elapsed" width="<?% broadcast.percent %?>%"><img src="bilder/spacer.gif" width="1px" height="1px"/></td> - <td class="remaining"><img src="bilder/spacer.gif" width="1px" height="1px"/></td> + <td class="elapsed" width="<?% broadcast.percent %?>%"><img src="bilder/spacer.gif" width="1" height="1" alt="" /></td> + <td class="remaining"><img src="bilder/spacer.gif" width="1" height="1" alt="" /></td> </tr> </table> <?% END %?> diff --git a/template/default/rc.html b/template/default/rc.html index ec03539..ff5d18e 100644 --- a/template/default/rc.html +++ b/template/default/rc.html @@ -19,7 +19,7 @@ </head> <body id="rc" onload="window.focus()"> - <table width="200" border="0" cellspacing="0" cellpadding="0" style="background-image: url(bilder/fern_back.jpg);"> + <table width="200" height="510" border="0" cellspacing="0" cellpadding="0" class="rc"> <tr> <td></td> <td><img src="bilder/spacer.gif" alt="" height="20" width="50" border="0" /></td> @@ -101,7 +101,7 @@ <tr> <td></td> <td><img src="bilder/spacer.gif" alt="" height="20" width="50" border="0" /></td> - <td><img src="bilder/spacer.gif" name="switchimage" width="1" height="1" /> </td> + <td><img src="bilder/spacer.gif" name="switchimage" width="1" height="1" alt="" /> </td> </tr> <tr> <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumeMinus');"><img src="bilder/fern_39.jpg" alt="" height="27" width="67" border="0" /></a></td> diff --git a/template/default/rec_list.html b/template/default/rec_list.html index 2235c76..cce508d 100644 --- a/template/default/rec_list.html +++ b/template/default/rec_list.html @@ -111,9 +111,9 @@ </td> <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"> <tmpl_if isfolder> - <a href="<tmpl_var infurl><tmpl_var cur_sorting>"><img align="middle" src="bilder/folder_video.png" border="0" /> <tmpl_var name></a> + <a href="<tmpl_var infurl><tmpl_var cur_sorting>"><img align="middle" src="bilder/folder_video.png" border="0" alt="" /> <tmpl_var name></a> <tmpl_else> - <a href="javascript:popup('<tmpl_var infurl>');"><img align="middle" src="bilder/aktion.png" border="0" /> <tmpl_var name></a> + <a href="javascript:popup('<tmpl_var infurl>');"><img align="middle" src="bilder/aktion.png" border="0" alt="" /> <tmpl_var name></a> </tmpl_if> </td> <td class="col_edit"> diff --git a/template/default/style.css b/template/default/style.css index 4dc51e9..79c2d64 100644 --- a/template/default/style.css +++ b/template/default/style.css @@ -114,6 +114,17 @@ label + input { font-size: 9px; display: inline; } +#tv #content { + vertical-align: top; + border-spacing: 10px; +} +#rc .rc, +#tv #sect_rc { + background-image: url("default/fern_back.jpg"); +} +#tv #sect_channels { + vertical-align: top; +} #rec_list .col_name { font-weight: bold; } @@ -317,7 +328,7 @@ body.help .heading { background-color: #6d96a9; } #prog_summary2 table.percent .remaining { - background-color: none; + background-color: transparent; } #prog_detail .heading .col_content * { @@ -710,7 +721,6 @@ select.channels { } /*TODO Farbe */ #navigation .navi:hover { - xbackground-color: #f0faff; background-color: #dee6ee; } #navigation .search { diff --git a/template/default/timeline.js b/template/default/timeline.js index 4cd9e29..a4a7750 100644 --- a/template/default/timeline.js +++ b/template/default/timeline.js @@ -78,13 +78,17 @@ function TimeLine(_req_sec, _now_url, _px_per_min, _end_min) {
this.table_w = this.innerWidth - 8;
}
- this.px_per_min = _px_per_min;
+// this.px_per_min = _px_per_min;
+
+ this.table_w10 = Div(this.table_w, 10);
+ my_min = this.table_w10 < 100 ? 100 : this.table_w10;
+ this.px_per_min = Div((this.table_w - my_min), _end_min);
- this.end_min = Div(this.table_w - this.name_w, this.px_per_min);
- if (this.end_min > _end_min)
- {
+// this.end_min = Div(this.table_w - this.name_w, this.px_per_min);
+// if (this.end_min > _end_min)
+// {
this.end_min = _end_min;
- }
+// }
this.end_min -= this.end_min % 30;
this.event_w = this.end_min * this.px_per_min;
this.name_w = this.table_w - this.event_w;
diff --git a/template/default/timer_list.html b/template/default/timer_list.html index 17b9fe1..d40af55 100644 --- a/template/default/timer_list.html +++ b/template/default/timer_list.html @@ -60,20 +60,20 @@ <tr class="heading"> <td><h2><tmpl_var title></h2></td> <td class="col_navi"> - <tmpl_if prevdayurl><a href="<tmpl_var prevdayurl>"><img src="bilder/pfeile_nachlinks.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachlinks_soft.png" border="0" /></tmpl_if> + <tmpl_if prevdayurl><a href="<tmpl_var prevdayurl>"><img src="bilder/pfeile_nachlinks.png" border="0" alt="" /></a><tmpl_else><img src="bilder/pfeile_nachlinks_soft.png" border="0" alt="" /></tmpl_if> <select name="vdr_id" class="submit" onchange="window.open('<tmpl_var url>?aktion=timer_list&sortby=<tmpl_var sortby>&desc=<tmpl_var cur_desc>&timer=' + this.options[this.selectedIndex].value,'main')"> <tmpl_loop day_loop> <option value="<tmpl_var sortfield>" <tmpl_if current>selected</tmpl_if>><tmpl_var day></option> </tmpl_loop> </select> - <tmpl_if nextdayurl><a href="<tmpl_var nextdayurl>"><img src="bilder/pfeile_nachrechts.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachrechts_soft.png" border="0" /></tmpl_if> + <tmpl_if nextdayurl><a href="<tmpl_var nextdayurl>"><img src="bilder/pfeile_nachrechts.png" border="0" alt="" /></a><tmpl_else><img src="bilder/pfeile_nachrechts_soft.png" border="0" alt="" /></tmpl_if> </td> </tr> <tr class="row_even"> <td colspan="2" align="center"> <table cellspacing="0" cellpadding="0" border="0"> <tr> - <td class="color1" height="20" width="100"><img src="bilder/spacer.gif" width="100" height="1" border="0" /><br /> </td> + <td class="color1" height="20" width="100"><img src="bilder/spacer.gif" width="100" height="1" border="0" alt="" /><br /> </td> <?% stunde=0; pos=0; @@ -82,7 +82,7 @@ ende=((stunde * 60 / faktor) +0.5 ) | format('%i'); %?> - <td class="<?% (stunde % 2) == 1 ? 'color2' : 'color1' %?>" align="center"><img src="bilder/spacer.gif" width="<?% ende-pos %?>" height="1" border="0" /><br /><?% stunde - 1 %?></td> + <td class="<?% (stunde % 2) == 1 ? 'color2' : 'color1' %?>" align="center"><img src="bilder/spacer.gif" width="<?% ende-pos %?>" height="1" border="0" alt="" /><br /><?% stunde - 1 %?></td> <?% pos=ende; END; @@ -100,13 +100,13 @@ %?> <table cellspacing="0" cellpadding="0" border="0"> <tr> - <td bgcolor="#000000" height="1" class="blackline"><img src="bilder/spacer.gif" width="<?% tablaenge + 100 %?>" height="1" border="0" /></td> + <td bgcolor="#000000" height="1" class="blackline"><img src="bilder/spacer.gif" width="<?% tablaenge + 100 %?>" height="1" border="0" alt="" /></td> </tr> </table> <table cellspacing="0" cellpadding="0" border="0"> <tr> - <td class="<?% (programm % 2) == 0 ? 'color2' : 'color1' %?>" height="20" width="100"><img src="bilder/spacer.gif" width="100" height="1" border="0" /><br /><a href="<?% timer.proglink %?>"><b><?% sender | truncate(11) %?></b></a></td> + <td class="<?% (programm % 2) == 0 ? 'color2' : 'color1' %?>" height="20" width="100"><img src="bilder/spacer.gif" width="100" height="1" border="0" alt="" /><br /><a href="<?% timer.proglink %?>"><b><?% sender | truncate(11) %?></b></a></td> <?% pos=0; @@ -139,19 +139,19 @@ IF start>pos; %?> - <td class="<?% (programm % 2) == 0 ? 'color2' : 'color1' %?>"><img src="bilder/spacer.gif" width="<?% start-pos %?>" height="1" border="0" /><br /></td> + <td class="<?% (programm % 2) == 0 ? 'color2' : 'color1' %?>"><img src="bilder/spacer.gif" width="<?% start-pos %?>" height="1" border="0" alt="" /><br /></td> <?% pos=start; END; IF ende - pos < 2; %?> - <td class="<?% td_class %?>"><span <?% IF config.TM_TT_TIMELINE %?>onMouseOver="tip('VDR-<?% sendung.id %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?>><img src="bilder/spacer.gif" width="<?% ende - pos %?>" height="20" border="0" /></span></td> + <td class="<?% td_class %?>"><span <?% IF config.TM_TT_TIMELINE %?>onMouseOver="tip('VDR-<?% sendung.id %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?>><img src="bilder/spacer.gif" width="<?% ende - pos %?>" height="20" border="0" alt="" /></span></td> <?% ELSE; %?> - <td class="<?% td_class %?>" id="prgtable"><span <?% IF config.TM_TT_TIMELINE %?>onMouseOver="tip('VDR-<?% sendung.id %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?>><img src="bilder/spacer.gif" width="<?% ende - pos - 2 %?>" height="20" border="0" /></span></td> + <td class="<?% td_class %?>" id="prgtable"><span <?% IF config.TM_TT_TIMELINE %?>onMouseOver="tip('VDR-<?% sendung.id %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?>><img src="bilder/spacer.gif" width="<?% ende - pos - 2 %?>" height="20" border="0" alt="" /></span></td> <?% END; @@ -160,7 +160,7 @@ END; IF pos<tablaenge; %?> - <td class="<?% (programm % 2) == 0 ? 'color2' : 'color1' %?>"><img src="bilder/spacer.gif" width="<?% tablaenge - pos %?>" height="1" border="0" /><br /></td> + <td class="<?% (programm % 2) == 0 ? 'color2' : 'color1' %?>"><img src="bilder/spacer.gif" width="<?% tablaenge - pos %?>" height="1" border="0" alt="" /><br /></td> <?% END; @@ -175,7 +175,7 @@ <table cellspacing="0" cellpadding="0" border="0"> <tr> - <td bgcolor="#000000" height="1" class="blackline"><img src="bilder/spacer.gif" width="<?% tablaenge + 100 %?>" height="1" border="0" /></td> + <td bgcolor="#000000" height="1" class="blackline"><img src="bilder/spacer.gif" width="<?% tablaenge + 100 %?>" height="1" border="0" alt="" /></td> </tr> </table> </td> @@ -311,7 +311,7 @@ </td> <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"> <div <?% IF config.TM_TT_LIST %?>onMouseOver="tip('VDR-<tmpl_var id>'); return true;" onMouseOut="untip(); return true;"<?% END %?>> - <tmpl_if recording><img align="middle" src="bilder/rec.gif" border="0" /> </tmpl_if> + <tmpl_if recording><img align="middle" src="bilder/rec.gif" border="0" alt="" /> </tmpl_if> <tmpl_if infurl> <a href="javascript:popup('<tmpl_var infurl>');"><tmpl_var title></a> <tmpl_else> diff --git a/template/default/tv.html b/template/default/tv.html index c7c4a23..ef21ed2 100644 --- a/template/default/tv.html +++ b/template/default/tv.html @@ -69,20 +69,47 @@ <body onLoad="window.focus();WebcamUpdate()" id="tv"> <form action="<tmpl_var url>" method="get" name="liveform"> - <table width="200" border="0" cellspacing="0" cellpadding="0" style="background-image: url(bilder/tv_bottom.gif);"> +<tmpl_unless tv_only> + <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> + <tr> + <td class="col_title"><h1><%! TV !%></h1></td> + <td class="col_other"> + <h5><%! Interval: !%></h5> + <select name="Seconds" class="submit" onChange="v_changeInterval(this.options[this.selectedIndex].value)"> + <option value="0"><%! off !%></option> + <option value="1" <tmpl_if expr="interval == 1">selected="selected"</tmpl_if>> 1 <%! sec. !%></option> + <option value="2" <tmpl_if expr="interval == 2">selected="selected"</tmpl_if>> 2 <%! sec. !%></option> + <option value="3" <tmpl_if expr="interval == 3">selected="selected"</tmpl_if>> 3 <%! sec. !%></option> + <option value="5" <tmpl_if expr="interval == 5">selected="selected"</tmpl_if>> 5 <%! sec. !%></option> + <option value="10" <tmpl_if expr="interval == 10">selected="selected"</tmpl_if>>10 <%! sec. !%></option> + <option value="30" <tmpl_if expr="interval == 30">selected="selected"</tmpl_if>>30 <%! sec. !%></option> + <option value="60" <tmpl_if expr="interval == 60">selected="selected"</tmpl_if>>60 <%! sec. !%></option> + </select> + <input type="button" class="submit" name="livebild" value='<%! G !%>' title="<%! Grab the picture! !%>" onClick="WebcamUpdate()" /> + <h5><%! Size: !%></h5> + <select name="Size" class="submit" onChange="v_changeSize(this.options[this.selectedIndex].value)"> + <option value="full" <tmpl_if expr="size eq 'full'">selected="selected"</tmpl_if>>1:1</option> + <option value="half" <tmpl_if expr="size eq 'half'">selected="selected"</tmpl_if>>1:2</option> + <option value="quarter" <tmpl_if expr="size eq 'quarter'">selected="selected"</tmpl_if>>1:4</option> + </select> + <input type="button" class="submit" name="livebild" value='<%! G !%>' title="<%! Grab the picture! !%>" onClick="WebcamUpdate()" /> + </td> + <td align="right"><tmpl_unless new_win>[<a class="submit" href="javascript:tv_open();"><%! Open in separate window !%></a>] </tmpl_unless></td> + </tr> + </table> +</tmpl_unless> + + <table border="0" cellspacing="0" cellpadding="0" id="content"> <tr> - <td align="center" valign="middle"><img name="Bild" src="<tmpl_var url>" border="1" hspace="2" vspace="2" /></td> - <td><img src="bilder/spacer.gif" name="switchimage" width="2" height="1" /></td> + <td id="sect_tv"> + <img name="Bild" src="<tmpl_var url>" border="1" hspace="2" vspace="2" class="tv" alt="" /> + <img src="bilder/spacer.gif" name="switchimage" width="2" height="1" alt="" /> + </td> <tmpl_unless tv_only> - <td valign="top"> + <td id="sect_rc"> <table width="200" border="0" cellspacing="0" cellpadding="0"> <tr> <td></td> - <td><img src="bilder/spacer.gif" alt="" height="20" width="50" border="0" /></td> - <td></td> - </tr> - <tr> - <td></td> <td></td> <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=power');"><img src="bilder/fern_03.jpg" alt="" height="27" width="68" border="0" /></a></td> </tr> @@ -164,15 +191,10 @@ <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=mute');"><img src="bilder/fern_mute.jpg" alt="" height="27" width="67" border="0" /></a></td> <td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumePlus');"><img src="bilder/fern_40.jpg" alt="" height="27" width="67" border="0" /></a></td> </tr> - <tr> - <td></td> - <td><img src="bilder/spacer.gif" alt="" height="20" width="50" border="0" /></td> - <td></td> - </tr> </table> </td> - <td align="center"> - <select name="channel" size="30" onchange="javascript:switch_channel('./vdradmin.pl?aktion=tv_switch&channel=' + encodeURIComponent(this.options[this.selectedIndex].value));"> + <td id="sect_channels"> + <select name="channel" size="32" onchange="javascript:switch_channel('./vdradmin.pl?aktion=tv_switch&channel=' + encodeURIComponent(this.options[this.selectedIndex].value));"> <tmpl_loop channels> <option value="<tmpl_var vdr_id>" <tmpl_if cur>selected</tmpl_if>><tmpl_var name></option> </tmpl_loop> @@ -180,39 +202,9 @@ <!-- <a class="submit" href="javascript:switch_by_select();">Switch</a>--> </td> </tmpl_unless> - </tr> <tmpl_unless tv_only> - <tr> - <td colspan="4"></td> - </tr> - <tr valign="middle"> - <td valign="middle" style="white-space: nowrap;"> - <h5><%! Interval: !%></h5> - <select name="Seconds" class="submit" onChange="v_changeInterval(this.options[this.selectedIndex].value)"> - <option value="0"><%! off !%></option> - <option value="1" <tmpl_if expr="interval == 1">selected="selected"</tmpl_if>> 1 <%! sec. !%></option> - <option value="2" <tmpl_if expr="interval == 2">selected="selected"</tmpl_if>> 2 <%! sec. !%></option> - <option value="3" <tmpl_if expr="interval == 3">selected="selected"</tmpl_if>> 3 <%! sec. !%></option> - <option value="5" <tmpl_if expr="interval == 5">selected="selected"</tmpl_if>> 5 <%! sec. !%></option> - <option value="10" <tmpl_if expr="interval == 10">selected="selected"</tmpl_if>>10 <%! sec. !%></option> - <option value="30" <tmpl_if expr="interval == 30">selected="selected"</tmpl_if>>30 <%! sec. !%></option> - <option value="60" <tmpl_if expr="interval == 60">selected="selected"</tmpl_if>>60 <%! sec. !%></option> - </select> - <input type="button" class="submit" name="livebild" value='<%! G !%>' title="<%! Grab the picture! !%>" onClick="WebcamUpdate()" /> - <h5><%! Size: !%></h5> - <select name="Size" class="submit" onChange="v_changeSize(this.options[this.selectedIndex].value)"> - <option value="full" <tmpl_if expr="size eq 'full'">selected="selected"</tmpl_if>>1:1</option> - <option value="half" <tmpl_if expr="size eq 'half'">selected="selected"</tmpl_if>>1:2</option> - <option value="quarter" <tmpl_if expr="size eq 'quarter'">selected="selected"</tmpl_if>>1:4</option> - </select> - <input type="button" class="submit" name="livebild" value='<%! G !%>' title="<%! Grab the picture! !%>" onClick="WebcamUpdate()" /> - </td> - <td colspan="3" align="right"><tmpl_unless new_win>[<a class="submit" href="javascript:tv_open();"><%! Open in separate window !%></a>] </tmpl_unless></td> - </tr> - <tr> - <td colspan="4"></td> - </tr> </tmpl_unless> + </tr> </table> </form> </body> diff --git a/user.css.example b/user.css.example index 77d07f5..7e212b2 100644 --- a/user.css.example +++ b/user.css.example @@ -7,6 +7,9 @@ #rc { display: none; } +#tv { + display: none; +} /* Disable action icons. diff --git a/vdradmind.pl b/vdradmind.pl index de6531b..0ca395d 100755 --- a/vdradmind.pl +++ b/vdradmind.pl @@ -28,7 +28,7 @@ require 5.004; -my $VERSION = "3.4.6beta4"; +my $VERSION = "3.4.6beta5"; my $BASENAME; my $EXENAME; @@ -2235,13 +2235,13 @@ sub ChannelHasEPG { sub Encode_Referer { if ($_[0]) { $_ = $_[0]; } else { $_ = $Referer; } - $_ =~ s/\~/\\\~/g; +# $_ =~ s/\~/\\\~/g; return (MIME::Base64::encode_base64($_)); } sub Decode_Referer { my $ref = MIME::Base64::decode_base64(shift); - $ref =~ s/\\\~/\~/g; +# $ref =~ s/\\\~/\~/g; return ($ref); } @@ -2475,12 +2475,12 @@ sub prog_detail { #if($_->{id} == $epg_id) { #XXX if ($_->{event_id} == $epg_id) { - $channel_name = CGI::escapeHTML($_->{channel_name}); - $title = CGI::escapeHTML($_->{title}); - $subtitle = CGI::escapeHTML($_->{subtitle}); + $channel_name = $_->{channel_name}; + $title = $_->{title}; + $subtitle = $_->{subtitle}; $start = $_->{start}; $stop = $_->{stop}; - $text = CGI::escapeHTML($_->{summary}); + $text = $_->{summary}; $vps = $_->{vps}; $video = $_->{video}; $audio = $_->{audio}; @@ -2497,11 +2497,9 @@ sub prog_detail { } } - my $displaytext = $text; - my $displaytitle = $title; - my $displaysubtitle = $subtitle; - my $find_title = $title; - my $find_subtitle = $subtitle; + my $displaytext = CGI::escapeHTML($text); + my $displaytitle = CGI::escapeHTML($title); + my $displaysubtitle = CGI::escapeHTML($subtitle); my $imdb_title = $title; if ($displaytext) { @@ -2516,8 +2514,6 @@ sub prog_detail { $displaysubtitle =~ s/\n/<br \/>\n/g; $displaysubtitle =~ s/\|/<br \/>\n/g; } - $find_title =~ s/^.*~\([^~]*\)/$1/ if($find_title); - $find_subtitle =~ s/^.*~\([^~]*\)/$1/ if($find_subtitle); $imdb_title =~ s/^.*\~\%*([^\~]*)$/$1/ if($imdb_title); # Do not use prog_detail as referer. @@ -2532,14 +2528,14 @@ sub prog_detail { title => $displaytitle ? $displaytitle : gettext("Can't find EPG entry!"), recurl => $recurl, switchurl => ($start && $stop && $start <= $now && $now <= $stop) ? sprintf("%s?aktion=prog_switch&channel=%s", $MyURL, $vdr_id) : undef, - channel_name => $channel_name, + channel_name => CGI::escapeHTML($channel_name), subtitle => $displaysubtitle, vps => ($vps && $start && $start != $vps) ? my_strftime("%H:%M", $vps) : undef, start => my_strftime("%H:%M", $start), stop => my_strftime("%H:%M", $stop), text => $displaytext ? $displaytext : undef, date => $title ? my_strftime("%A, %x", $start) : undef, - find_title => $find_title ? uri_escape("/^" . quotemeta($find_title) . "~" . ($find_subtitle ? quotemeta($find_subtitle) : "") . "~/i") : undef, + find_title => $title ? uri_escape("/^" . quotemeta($title) . "\~" . ($subtitle ? quotemeta($subtitle) : "") . "\~/i") : undef, imdburl => $title ? "http://akas.imdb.com/Tsearch?title=" . uri_escape($imdb_title) : undef, epgimages => \@epgimages, audio => $audio, @@ -2625,7 +2621,7 @@ sub prog_list { subtitle => CGI::escapeHTML($event->{subtitle}), recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself), infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself) : undef, - find_title => uri_escape("/^" . quotemeta($event->{title}) . "~" . ($event->{subtitle} ? quotemeta($event->{subtitle}) : "") . "~/i"), + find_title => uri_escape("/^" . quotemeta($event->{title}) . "\~" . ($event->{subtitle} ? quotemeta($event->{subtitle}) : "") . "\~/i"), imdburl => "http://akas.imdb.com/Tsearch?title=" . uri_escape($imdb_title), newd => 0, anchor => "id" . $event->{event_id} @@ -2758,7 +2754,7 @@ sub prog_list2 { subtitle => CGI::escapeHTML($event->{subtitle}), recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself), infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself) : undef, - find_title => uri_escape("/^" . quotemeta($event->{title}) . "~" . ($event->{subtitle} ? quotemeta($event->{subtitle}) : "") . "~/i"), + find_title => uri_escape("/^" . quotemeta($event->{title}) . "\~" . ($event->{subtitle} ? quotemeta($event->{subtitle}) : "") . "\~/i"), imdburl => "http://akas.imdb.com/Tsearch?title=" . uri_escape($imdb_title), newd => 0, anchor => "id" . $event->{event_id} @@ -2776,11 +2772,12 @@ sub prog_list2 { push(@days, { name => $hash_days{$_}, id => "$MyURL?aktion=prog_list2&day=" . $_, + sort => $_, sel => $_ == $day ? "1" : undef } ); } - @days = sort({ $a->{name} <=> $b->{name} } @days); + @days = sort({ $a->{sort} <=> $b->{sort} } @days); # my ($template) = TemplateNew("prog_list2.html"); @@ -4097,7 +4094,7 @@ sub prog_summary { stream_live_on => $running ? $CONFIG{ST_FUNC} && $CONFIG{ST_LIVE_ON} : undef, infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself) : undef, recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s&referer=%s", $MyURL, $event->{event_id}, $event->{vdr_id}, $myself), - find_title => uri_escape("/^" . quotemeta($event->{title}) . "~" . ($event->{subtitle} ? quotemeta($event->{subtitle}) : "") . "~/i"), + find_title => uri_escape("/^" . quotemeta($event->{title}) . "\~" . ($event->{subtitle} ? quotemeta($event->{subtitle}) : "") . "\~/i"), imdburl => "http://akas.imdb.com/Tsearch?title=" . uri_escape($imdb_title), anchor => "id" . $event->{event_id} } @@ -5179,7 +5176,7 @@ sub myconnect { my $line; $line = <$SOCKET>; if (!$VDRVERSION) { - $line =~ /^220.*VideoDiskRecorder (\d+)\.(\d+)\.(\d+);/; + $line =~ /^220.*VideoDiskRecorder (\d+)\.(\d+)\.(\d+).*;/; $VDRVERSION_HR = "$1.$2.$3"; $VDRVERSION = ($1 * 10000 + $2 * 100 + $3); } |