diff options
| author | Andreas Mair <amair.sob@googlemail.com> | 2006-06-26 12:48:24 +0200 |
|---|---|---|
| committer | Andreas Mair <amair.sob@googlemail.com> | 2006-06-26 12:48:24 +0200 |
| commit | f823ff4bdab5bea277c34d8804de946d7c7961e1 (patch) | |
| tree | 785da7c329d45fd4464511e2f13be055cee4a91e | |
| parent | fea04122f6f8b7e4f4ca4c59dc43be6567290d03 (diff) | |
| download | vdradmin-am-f823ff4bdab5bea277c34d8804de946d7c7961e1.tar.gz vdradmin-am-f823ff4bdab5bea277c34d8804de946d7c7961e1.tar.bz2 | |
2006-06-26: 3.4.6beta4v3.4.6beta4
- Changed: CSS a little bit.
- Rewrote: prog_timeline to make it more dynamic (needs JavaScript) (Submitted by Torsten Herz).
- Changed: displaying of audio/video tracks in prog_details (Fixes weird EPG display behaviour).
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | locale/de/LC_MESSAGES/vdradmin.mo | bin | 62163 -> 62163 bytes | |||
| -rw-r--r-- | locale/es/LC_MESSAGES/vdradmin.mo | bin | 60024 -> 60024 bytes | |||
| -rw-r--r-- | locale/fi/LC_MESSAGES/vdradmin.mo | bin | 17266 -> 17602 bytes | |||
| -rw-r--r-- | locale/fr/LC_MESSAGES/vdradmin.mo | bin | 62990 -> 62990 bytes | |||
| -rw-r--r-- | locale/nl/LC_MESSAGES/vdradmin.mo | bin | 59675 -> 60019 bytes | |||
| -rw-r--r-- | locale/ru/LC_MESSAGES/vdradmin.mo | bin | 57076 -> 58340 bytes | |||
| -rw-r--r-- | po/de.po | 106 | ||||
| -rw-r--r-- | po/es.po | 106 | ||||
| -rw-r--r-- | po/fi.po | 120 | ||||
| -rw-r--r-- | po/fr.po | 110 | ||||
| -rw-r--r-- | po/nl.po | 124 | ||||
| -rw-r--r-- | po/ru.po | 163 | ||||
| -rw-r--r-- | po/vdradmin.pot | 104 | ||||
| -rw-r--r-- | template/default/default/style.css | 715 | ||||
| -rw-r--r-- | template/default/prog_detail.html | 14 | ||||
| -rw-r--r-- | template/default/prog_timeline.html | 311 | ||||
| -rw-r--r--[l---------] | template/default/style.css | 732 | ||||
| -rw-r--r-- | template/default/timeline.js | 359 | ||||
| -rwxr-xr-x | vdradmind.pl | 75 |
20 files changed, 1659 insertions, 1385 deletions
@@ -4,6 +4,11 @@ E-Mail: mail AT andreas DOT vdr-developer DOT org VDR-Portal: amair ----------------------------------------------------------- +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). +- Changed: displaying of audio/video tracks in prog_details (Fixes weird EPG display behaviour). + 2006-06-23: 3.4.6beta3 - Fixed: Crash in prog_detail if invalid EPG-ID (Bug #0000077, Reported by Reiner Buehl). - Fixed: Bug #0000034 (Reported by The Unknown). diff --git a/locale/de/LC_MESSAGES/vdradmin.mo b/locale/de/LC_MESSAGES/vdradmin.mo Binary files differindex 8ee1e69..49f0032 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 d7700bd..895a7c6 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 c4d8dbb..7b59dac 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 65d7f72..0c82b88 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 7a4a034..0c6d929 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 330b9bd..a76a48c 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-23 11:47+0200\n" +"POT-Creation-Date: 2006-06-26 11: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" @@ -42,7 +42,7 @@ msgstr "" #: ../template/default/at_timer_new.html:5 #: ../template/default/navigation.html:4 ../template/default/about.html:5 #: ../template/default/vdr_cmds.html:5 -#: ../template/default/prog_summary2.html:6 ../vdradmind.pl:2077 +#: ../template/default/prog_summary2.html:6 ../vdradmind.pl:2060 msgid "ISO-8859-1" msgstr "ISO-8859-1" @@ -145,36 +145,43 @@ msgid "Day Of Recording:" msgstr "Tag der Aufnahme:" #: ../template/default/timer_new.html:92 +#: ../template/default/prog_timeline.html:79 #: ../template/default/at_timer_new.html:62 msgid "Monday" msgstr "Montag" #: ../template/default/timer_new.html:93 +#: ../template/default/prog_timeline.html:80 #: ../template/default/at_timer_new.html:63 msgid "Tuesday" msgstr "Dienstag" #: ../template/default/timer_new.html:94 +#: ../template/default/prog_timeline.html:81 #: ../template/default/at_timer_new.html:64 msgid "Wednesday" msgstr "Mittwoch" #: ../template/default/timer_new.html:95 +#: ../template/default/prog_timeline.html:82 #: ../template/default/at_timer_new.html:65 msgid "Thursday" msgstr "Donnerstag" #: ../template/default/timer_new.html:96 +#: ../template/default/prog_timeline.html:83 #: ../template/default/at_timer_new.html:66 msgid "Friday" msgstr "Freitag" #: ../template/default/timer_new.html:97 +#: ../template/default/prog_timeline.html:84 #: ../template/default/at_timer_new.html:67 msgid "Saturday" msgstr "Samstag" #: ../template/default/timer_new.html:98 +#: ../template/default/prog_timeline.html:78 #: ../template/default/at_timer_new.html:68 msgid "Sunday" msgstr "Sonntag" @@ -187,14 +194,14 @@ msgstr "Startzeit:" #: ../template/default/timer_new.html:107 #: ../template/default/timer_new.html:119 #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_timeline.html:125 -#: ../template/default/prog_timeline.html:140 -#: ../template/default/prog_timeline.html:152 +#: ../template/default/prog_timeline.html:76 +#: ../template/default/prog_timeline.html:187 +#: ../template/default/prog_timeline.html:202 #: ../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:4162 -#: ../vdradmind.pl:4176 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 +#: ../vdradmind.pl:4150 msgid "o'clock" msgstr "Uhr" @@ -383,25 +390,25 @@ msgstr "Ausgewählte Timer wirklich löschen?" #: ../template/default/prog_summary.html:7 #: ../template/default/navigation.html:29 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4793 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4762 msgid "What's On Now?" msgstr "Was läuft jetzt?" #: ../template/default/prog_summary.html:27 -#: ../template/default/prog_timeline.html:128 +#: ../template/default/prog_timeline.html:190 #: ../template/default/prog_summary2.html:27 msgid "What's on:" msgstr "Was läuft:" #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4162 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 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:4793 +#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4762 msgid "Channels" msgstr "Programmübersicht" @@ -490,8 +497,8 @@ msgstr "Anzahl der zu verwendenden Kanäle:" msgid "Local net (no login required):" msgstr "Lokales Netz (kein Login notwendig):" -#: ../template/default/config.html:83 ../template/default/prog_detail.html:60 -#: ../template/default/prog_detail.html:68 +#: ../template/default/config.html:83 ../template/default/prog_detail.html:62 +#: ../template/default/prog_detail.html:73 #: ../template/default/help_config.html:42 msgid "Language:" msgstr "Sprache:" @@ -545,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:4793 +#: ../template/default/navigation.html:35 ../vdradmind.pl:4762 msgid "Timeline" msgstr "Zeitleiste" @@ -745,12 +752,12 @@ msgid "Apply" msgstr "Anwenden" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:112 +#: ../template/default/prog_timeline.html:131 msgid "Duration:" msgstr "Dauer:" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:112 +#: ../template/default/prog_timeline.html:132 msgid "min" msgstr "min" @@ -877,22 +884,22 @@ msgstr "Wiederholungen" msgid "Video tracks:" msgstr "Videospuren:" -#: ../template/default/prog_detail.html:60 +#: ../template/default/prog_detail.html:62 msgid "Format:" msgstr "Format:" -#: ../template/default/prog_detail.html:66 +#: ../template/default/prog_detail.html:69 msgid "Audio tracks:" msgstr "Audiospuren:" -#: ../template/default/prog_detail.html:70 +#: ../template/default/prog_detail.html:75 msgid "Description:" 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:4793 +#: ../template/default/navigation.html:47 ../vdradmind.pl:4762 msgid "Recordings" msgstr "Aufnahmen" @@ -1375,19 +1382,20 @@ msgstr "" "<input type=\"submit\" class=\"submit\" value=\"<<<<<\"/> " "angeklickt werden.</p>" -#: ../template/default/prog_timeline.html:132 ../vdradmind.pl:4147 +#: ../template/default/prog_timeline.html:75 +#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4121 msgid "now" msgstr "jetzt" -#: ../template/default/prog_timeline.html:138 -msgid "at:" -msgstr "um:" - -#: ../template/default/prog_timeline.html:152 +#: ../template/default/prog_timeline.html:77 msgid "to" msgstr "bis" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2811 +#: ../template/default/prog_timeline.html:200 +msgid "at:" +msgstr "um:" + +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2788 msgid "Playing Today" msgstr "Was läuft heute" @@ -2009,7 +2017,7 @@ msgstr "Abgelegt in" msgid "No matches found!" msgstr "Nicht gefunden" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4793 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4762 msgid "Playing Today?" msgstr "Was läuft heute?" @@ -2192,38 +2200,38 @@ msgstr "Konfigurationsdatei wurde erfolgreich geschrieben." msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s wurde mit der Prozeß-ID %d gestartet." -#: ../vdradmind.pl:455 ../vdradmind.pl:1085 ../vdradmind.pl:2065 +#: ../vdradmind.pl:455 ../vdradmind.pl:1068 ../vdradmind.pl:2048 msgid "Not found" msgstr "Nicht gefunden" -#: ../vdradmind.pl:455 ../vdradmind.pl:2066 +#: ../vdradmind.pl:455 ../vdradmind.pl:2049 msgid "The requested URL was not found on this server!" msgstr "Die angeforderte URL konnte auf dem Server nicht gefunden werden!" -#: ../vdradmind.pl:525 ../vdradmind.pl:1081 ../vdradmind.pl:2068 +#: ../vdradmind.pl:525 ../vdradmind.pl:1064 ../vdradmind.pl:2051 msgid "Forbidden" msgstr "Verboten" -#: ../vdradmind.pl:525 ../vdradmind.pl:2069 +#: ../vdradmind.pl:525 ../vdradmind.pl:2052 msgid "You don't have permission to access this function!" msgstr "Sie haben nicht die Erlaubnis diese Funktion aufzurufen!" -#: ../vdradmind.pl:1081 ../vdradmind.pl:2070 +#: ../vdradmind.pl:1064 ../vdradmind.pl:2053 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Zugriff auf Datei \"%s\" verweigert!" -#: ../vdradmind.pl:1085 ../vdradmind.pl:2067 +#: ../vdradmind.pl:1068 ../vdradmind.pl:2050 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "Die URL \"%s\" wurde auf dem Server nicht gefunden!" -#: ../vdradmind.pl:2071 +#: ../vdradmind.pl:2054 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Kann Datei \"%s\" nicht öffnen!" -#: ../vdradmind.pl:2072 +#: ../vdradmind.pl:2055 #, perl-format msgid "" "Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and " @@ -2232,57 +2240,57 @@ msgstr "" "Konnte Verbindung zu %s:%s nicht aufbauen!<br /><br />Bitte überprüfen Sie, " "dass VDR läuft und dass seine svdrphosts.conf richtig konfiguriert ist." -#: ../vdradmind.pl:2073 +#: ../vdradmind.pl:2056 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Fehler beim Senden eines Kommandos zu %s" -#: ../vdradmind.pl:2551 +#: ../vdradmind.pl:2532 msgid "Can't find EPG entry!" msgstr "EPG-Eintrag wurde nicht gefunden!" -#: ../vdradmind.pl:2811 +#: ../vdradmind.pl:2788 msgid "Playing Tomorrow" msgstr "Was läuft morgen" -#: ../vdradmind.pl:2811 +#: ../vdradmind.pl:2788 #, perl-format msgid "Playing on the %s" msgstr "Was läuft am %s" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4126 msgid "next" msgstr "als nächstes" -#: ../vdradmind.pl:4171 +#: ../vdradmind.pl:4145 msgid "What's on after" msgstr "Was läuft nach" -#: ../vdradmind.pl:4171 +#: ../vdradmind.pl:4145 msgid "What's on at" msgstr "Was läuft um" -#: ../vdradmind.pl:4176 +#: ../vdradmind.pl:4150 msgid "Suitable matches for:" msgstr "Suchergebnis für" -#: ../vdradmind.pl:4178 +#: ../vdradmind.pl:4152 msgid "short view" msgstr "Listenansicht" -#: ../vdradmind.pl:4178 +#: ../vdradmind.pl:4152 msgid "long view" msgstr "Ausführliche Ansicht" -#: ../vdradmind.pl:4235 +#: ../vdradmind.pl:4209 msgid "Schedule" msgstr "Übersicht" -#: ../vdradmind.pl:4793 +#: ../vdradmind.pl:4762 msgid "Timers" msgstr "Timer" -#: ../vdradmind.pl:4861 +#: ../vdradmind.pl:4830 msgid "System default" msgstr "Systemstandard" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-23 11:47+0200\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" "Language-Team: Rudi <LL.org>\n" @@ -46,7 +46,7 @@ msgstr "" #: ../template/default/at_timer_new.html:5 #: ../template/default/navigation.html:4 ../template/default/about.html:5 #: ../template/default/vdr_cmds.html:5 -#: ../template/default/prog_summary2.html:6 ../vdradmind.pl:2077 +#: ../template/default/prog_summary2.html:6 ../vdradmind.pl:2060 msgid "ISO-8859-1" msgstr "ISO-8859-1" @@ -149,36 +149,43 @@ msgid "Day Of Recording:" msgstr "Día de la grabación:" #: ../template/default/timer_new.html:92 +#: ../template/default/prog_timeline.html:79 #: ../template/default/at_timer_new.html:62 msgid "Monday" msgstr "Lunes" #: ../template/default/timer_new.html:93 +#: ../template/default/prog_timeline.html:80 #: ../template/default/at_timer_new.html:63 msgid "Tuesday" msgstr "Martes" #: ../template/default/timer_new.html:94 +#: ../template/default/prog_timeline.html:81 #: ../template/default/at_timer_new.html:64 msgid "Wednesday" msgstr "Miércoles" #: ../template/default/timer_new.html:95 +#: ../template/default/prog_timeline.html:82 #: ../template/default/at_timer_new.html:65 msgid "Thursday" msgstr "Jueves" #: ../template/default/timer_new.html:96 +#: ../template/default/prog_timeline.html:83 #: ../template/default/at_timer_new.html:66 msgid "Friday" msgstr "Viernes" #: ../template/default/timer_new.html:97 +#: ../template/default/prog_timeline.html:84 #: ../template/default/at_timer_new.html:67 msgid "Saturday" msgstr "Sábado" #: ../template/default/timer_new.html:98 +#: ../template/default/prog_timeline.html:78 #: ../template/default/at_timer_new.html:68 msgid "Sunday" msgstr "Domingo" @@ -191,14 +198,14 @@ msgstr "Comienzo:" #: ../template/default/timer_new.html:107 #: ../template/default/timer_new.html:119 #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_timeline.html:125 -#: ../template/default/prog_timeline.html:140 -#: ../template/default/prog_timeline.html:152 +#: ../template/default/prog_timeline.html:76 +#: ../template/default/prog_timeline.html:187 +#: ../template/default/prog_timeline.html:202 #: ../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:4162 -#: ../vdradmind.pl:4176 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 +#: ../vdradmind.pl:4150 msgid "o'clock" msgstr "h." @@ -388,25 +395,25 @@ msgstr "¿Estas seguro de que deseas borrar las programaciones elegidas?" #: ../template/default/prog_summary.html:7 #: ../template/default/navigation.html:29 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4793 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4762 msgid "What's On Now?" msgstr "Estrenos ahora" #: ../template/default/prog_summary.html:27 -#: ../template/default/prog_timeline.html:128 +#: ../template/default/prog_timeline.html:190 #: ../template/default/prog_summary2.html:27 msgid "What's on:" msgstr "Se puede ver:" #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4162 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 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:4793 +#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4762 msgid "Channels" msgstr "EPG por emisoras" @@ -495,8 +502,8 @@ msgstr "Cantidad de emisoras en uso:" msgid "Local net (no login required):" msgstr "Red local (no requiere contraseña)" -#: ../template/default/config.html:83 ../template/default/prog_detail.html:60 -#: ../template/default/prog_detail.html:68 +#: ../template/default/config.html:83 ../template/default/prog_detail.html:62 +#: ../template/default/prog_detail.html:73 #: ../template/default/help_config.html:42 msgid "Language:" msgstr "Idioma:" @@ -550,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:4793 +#: ../template/default/navigation.html:35 ../vdradmind.pl:4762 msgid "Timeline" msgstr "Tabla de tiempo" @@ -751,12 +758,12 @@ msgid "Apply" msgstr "Establecer" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:112 +#: ../template/default/prog_timeline.html:131 msgid "Duration:" msgstr "Duración:" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:112 +#: ../template/default/prog_timeline.html:132 msgid "min" msgstr "min" @@ -883,22 +890,22 @@ msgstr "repeticiones" msgid "Video tracks:" msgstr "Pista de video:" -#: ../template/default/prog_detail.html:60 +#: ../template/default/prog_detail.html:62 msgid "Format:" msgstr "Formato:" -#: ../template/default/prog_detail.html:66 +#: ../template/default/prog_detail.html:69 msgid "Audio tracks:" msgstr "Pista de audio:" -#: ../template/default/prog_detail.html:70 +#: ../template/default/prog_detail.html:75 msgid "Description:" 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:4793 +#: ../template/default/navigation.html:47 ../vdradmind.pl:4762 msgid "Recordings" msgstr "Grabaciones" @@ -1375,19 +1382,20 @@ msgstr "" "\"submit\" class=\"submit\" value=\">>>>>\"/>. Para desmarcar " "emisoras funcciona viceversa.</p>" -#: ../template/default/prog_timeline.html:132 ../vdradmind.pl:4147 +#: ../template/default/prog_timeline.html:75 +#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4121 msgid "now" msgstr "ahora" -#: ../template/default/prog_timeline.html:138 -msgid "at:" -msgstr " a la/s:" - -#: ../template/default/prog_timeline.html:152 +#: ../template/default/prog_timeline.html:77 msgid "to" msgstr "hasta" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2811 +#: ../template/default/prog_timeline.html:200 +msgid "at:" +msgstr " a la/s:" + +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2788 msgid "Playing Today" msgstr "Estrenos hoy" @@ -2038,7 +2046,7 @@ msgstr "Guardado en" msgid "No matches found!" msgstr "Nada igual encontrado!" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4793 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4762 msgid "Playing Today?" msgstr "¿Estrenos hoy?" @@ -2220,38 +2228,38 @@ msgstr "¡Los archivos de configuración han creado!" msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s se ha iniciado con pid %d." -#: ../vdradmind.pl:455 ../vdradmind.pl:1085 ../vdradmind.pl:2065 +#: ../vdradmind.pl:455 ../vdradmind.pl:1068 ../vdradmind.pl:2048 msgid "Not found" msgstr "No encontrado" -#: ../vdradmind.pl:455 ../vdradmind.pl:2066 +#: ../vdradmind.pl:455 ../vdradmind.pl:2049 msgid "The requested URL was not found on this server!" msgstr "¡No encontrado la URL requerida, en el servidor!" -#: ../vdradmind.pl:525 ../vdradmind.pl:1081 ../vdradmind.pl:2068 +#: ../vdradmind.pl:525 ../vdradmind.pl:1064 ../vdradmind.pl:2051 msgid "Forbidden" msgstr "Prohibido" -#: ../vdradmind.pl:525 ../vdradmind.pl:2069 +#: ../vdradmind.pl:525 ../vdradmind.pl:2052 msgid "You don't have permission to access this function!" msgstr "¡No tienes permiso para ésta funcción!" -#: ../vdradmind.pl:1081 ../vdradmind.pl:2070 +#: ../vdradmind.pl:1064 ../vdradmind.pl:2053 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "¡Acceso al archivo \"%s\" negado!" -#: ../vdradmind.pl:1085 ../vdradmind.pl:2067 +#: ../vdradmind.pl:1068 ../vdradmind.pl:2050 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "¡No encontrado la URL %s en el servidor!" -#: ../vdradmind.pl:2071 +#: ../vdradmind.pl:2054 #, perl-format msgid "Can't open file \"%s\"!" msgstr "¡No se pudo abrir el archivo \"%s\" !" -#: ../vdradmind.pl:2072 +#: ../vdradmind.pl:2055 #, perl-format msgid "" "Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and " @@ -2260,57 +2268,57 @@ msgstr "" "No se puede conectar a VDR a %s:%s<br /><br />Compruebe si VDR está en " "marcha y su svdrhosts.conf bien configurado." -#: ../vdradmind.pl:2073 +#: ../vdradmind.pl:2056 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Error mientras mandó el orden a %s " -#: ../vdradmind.pl:2551 +#: ../vdradmind.pl:2532 msgid "Can't find EPG entry!" msgstr "" -#: ../vdradmind.pl:2811 +#: ../vdradmind.pl:2788 msgid "Playing Tomorrow" msgstr "Estrenos mañana" -#: ../vdradmind.pl:2811 +#: ../vdradmind.pl:2788 #, fuzzy, perl-format msgid "Playing on the %s" msgstr "Estrenos en %d" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4126 msgid "next" msgstr "próximo" -#: ../vdradmind.pl:4171 +#: ../vdradmind.pl:4145 msgid "What's on after" msgstr "Se puede ver después:" -#: ../vdradmind.pl:4171 +#: ../vdradmind.pl:4145 msgid "What's on at" msgstr "Se puede ver a la/s:" -#: ../vdradmind.pl:4176 +#: ../vdradmind.pl:4150 msgid "Suitable matches for:" msgstr "Emparejamientos convenientes para:" -#: ../vdradmind.pl:4178 +#: ../vdradmind.pl:4152 msgid "short view" msgstr "Vista rapida" -#: ../vdradmind.pl:4178 +#: ../vdradmind.pl:4152 msgid "long view" msgstr "Vista detallada" -#: ../vdradmind.pl:4235 +#: ../vdradmind.pl:4209 msgid "Schedule" msgstr "Vista general" -#: ../vdradmind.pl:4793 +#: ../vdradmind.pl:4762 msgid "Timers" msgstr "Programaciones" -#: ../vdradmind.pl:4861 +#: ../vdradmind.pl:4830 msgid "System default" msgstr "Defecto del sistema" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-23 11:47+0200\n" +"POT-Creation-Date: 2006-06-26 11:22+0200\n" "PO-Revision-Date: 2006-01-18 12:36+0200\n" "Last-Translator: Rofa\n" "Language-Team: Suomi\n" @@ -34,7 +34,7 @@ msgstr "" #: ../template/default/at_timer_new.html:5 #: ../template/default/navigation.html:4 ../template/default/about.html:5 #: ../template/default/vdr_cmds.html:5 -#: ../template/default/prog_summary2.html:6 ../vdradmind.pl:2077 +#: ../template/default/prog_summary2.html:6 ../vdradmind.pl:2060 msgid "ISO-8859-1" msgstr "ISO-8859-1" @@ -137,36 +137,43 @@ msgid "Day Of Recording:" msgstr "Päivä:" #: ../template/default/timer_new.html:92 +#: ../template/default/prog_timeline.html:79 #: ../template/default/at_timer_new.html:62 msgid "Monday" msgstr "Maanantai" #: ../template/default/timer_new.html:93 +#: ../template/default/prog_timeline.html:80 #: ../template/default/at_timer_new.html:63 msgid "Tuesday" msgstr "Tiistai" #: ../template/default/timer_new.html:94 +#: ../template/default/prog_timeline.html:81 #: ../template/default/at_timer_new.html:64 msgid "Wednesday" msgstr "Keskiviikko" #: ../template/default/timer_new.html:95 +#: ../template/default/prog_timeline.html:82 #: ../template/default/at_timer_new.html:65 msgid "Thursday" msgstr "Torstai" #: ../template/default/timer_new.html:96 +#: ../template/default/prog_timeline.html:83 #: ../template/default/at_timer_new.html:66 msgid "Friday" msgstr "Perjantai" #: ../template/default/timer_new.html:97 +#: ../template/default/prog_timeline.html:84 #: ../template/default/at_timer_new.html:67 msgid "Saturday" msgstr "Lauantai" #: ../template/default/timer_new.html:98 +#: ../template/default/prog_timeline.html:78 #: ../template/default/at_timer_new.html:68 msgid "Sunday" msgstr "Sunnuntai" @@ -179,14 +186,14 @@ msgstr "Aloitusaika:" #: ../template/default/timer_new.html:107 #: ../template/default/timer_new.html:119 #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_timeline.html:125 -#: ../template/default/prog_timeline.html:140 -#: ../template/default/prog_timeline.html:152 +#: ../template/default/prog_timeline.html:76 +#: ../template/default/prog_timeline.html:187 +#: ../template/default/prog_timeline.html:202 #: ../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:4162 -#: ../vdradmind.pl:4176 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 +#: ../vdradmind.pl:4150 msgid "o'clock" msgstr " " @@ -355,7 +362,7 @@ msgstr "Poistetaanko ajastin?" #: ../template/default/timer_list.html:326 #: ../template/default/rec_list.html:126 msgid "Delete" -msgstr "Ooista" +msgstr "Poista" #: ../template/default/at_timer_list.html:166 msgid "Force Update" @@ -372,25 +379,25 @@ msgstr "Poistetaanko valitut ajastimet?" #: ../template/default/prog_summary.html:7 #: ../template/default/navigation.html:29 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4793 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4762 msgid "What's On Now?" msgstr "Menossa nyt" #: ../template/default/prog_summary.html:27 -#: ../template/default/prog_timeline.html:128 +#: ../template/default/prog_timeline.html:190 #: ../template/default/prog_summary2.html:27 msgid "What's on:" msgstr "Menossa" #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4162 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 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:4793 +#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4762 msgid "Channels" msgstr "Kanavat" @@ -479,8 +486,8 @@ msgstr "Kanavien lukumäärä:" msgid "Local net (no login required):" msgstr "Käyttäjätunnukseton osoiteavaruus:" -#: ../template/default/config.html:83 ../template/default/prog_detail.html:60 -#: ../template/default/prog_detail.html:68 +#: ../template/default/config.html:83 ../template/default/prog_detail.html:62 +#: ../template/default/prog_detail.html:73 #: ../template/default/help_config.html:42 msgid "Language:" msgstr "Kieli:" @@ -534,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:4793 +#: ../template/default/navigation.html:35 ../vdradmind.pl:4762 msgid "Timeline" msgstr "Aikajana" @@ -548,7 +555,7 @@ msgstr "Ajankohdat:" #: ../template/default/config.html:159 msgid "Also used for other EPG views!" -msgstr "" +msgstr "Käytetään myös muihin ohjelmaoppaan näkymiin!" #: ../template/default/config.html:162 ../template/default/config.html:231 #: ../template/default/help_config.html:84 @@ -734,12 +741,12 @@ msgid "Apply" msgstr "Käytä" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:112 +#: ../template/default/prog_timeline.html:131 msgid "Duration:" msgstr "Kesto:" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:112 +#: ../template/default/prog_timeline.html:132 msgid "min" msgstr "min" @@ -866,22 +873,22 @@ msgstr "Etsi" msgid "Video tracks:" msgstr "Kuvaraidat:" -#: ../template/default/prog_detail.html:60 +#: ../template/default/prog_detail.html:62 msgid "Format:" msgstr "Kuvasuhde:" -#: ../template/default/prog_detail.html:66 +#: ../template/default/prog_detail.html:69 msgid "Audio tracks:" msgstr "Ääniraidat:" -#: ../template/default/prog_detail.html:70 +#: ../template/default/prog_detail.html:75 msgid "Description:" 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:4793 +#: ../template/default/navigation.html:47 ../vdradmind.pl:4762 msgid "Recordings" msgstr "Tallenteet" @@ -1248,19 +1255,20 @@ msgid "" "<input type=\"submit\" class=\"submit\" value=\"<<<<<\"/>.</p>" msgstr "" -#: ../template/default/prog_timeline.html:132 ../vdradmind.pl:4147 +#: ../template/default/prog_timeline.html:75 +#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4121 msgid "now" msgstr "nyt" -#: ../template/default/prog_timeline.html:138 -msgid "at:" -msgstr "kello:" - -#: ../template/default/prog_timeline.html:152 +#: ../template/default/prog_timeline.html:77 msgid "to" msgstr "-" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2811 +#: ../template/default/prog_timeline.html:200 +msgid "at:" +msgstr "kello:" + +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2788 msgid "Playing Today" msgstr "Ohjelmisto tänään" @@ -1656,7 +1664,7 @@ msgstr "Kaikki" #: ../template/default/at_timer_new.html:101 msgid "Override Start/Stop Margins:" -msgstr "" +msgstr "Käytä yksilöllisiä aloitus- ja lopetusmarginaaleja" #: ../template/default/at_timer_new.html:155 msgid "Test" @@ -1674,7 +1682,7 @@ msgstr "Tallennehakemisto" msgid "No matches found!" msgstr "Ei löytynyt yhtään hakutulosta!" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4793 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4762 msgid "Playing Today?" msgstr "Tänään" @@ -1683,9 +1691,8 @@ msgid "Watch TV" msgstr "Katso TV:tä" #: ../template/default/navigation.html:56 -#, fuzzy msgid "Commands" -msgstr "Komennot:" +msgstr "Komennot" #: ../template/default/navigation.html:62 ../template/default/about.html:6 msgid "About" @@ -1852,38 +1859,38 @@ msgstr "VDRAdmin-AM konfigurointitiedosto muodostettu." msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s käynnistetty prosessitunnisteella %d." -#: ../vdradmind.pl:455 ../vdradmind.pl:1085 ../vdradmind.pl:2065 +#: ../vdradmind.pl:455 ../vdradmind.pl:1068 ../vdradmind.pl:2048 msgid "Not found" msgstr "Ei löydy" -#: ../vdradmind.pl:455 ../vdradmind.pl:2066 +#: ../vdradmind.pl:455 ../vdradmind.pl:2049 msgid "The requested URL was not found on this server!" msgstr "Pyydettyä URL:ia ei löydy palvelimelta!" -#: ../vdradmind.pl:525 ../vdradmind.pl:1081 ../vdradmind.pl:2068 +#: ../vdradmind.pl:525 ../vdradmind.pl:1064 ../vdradmind.pl:2051 msgid "Forbidden" msgstr "Kielletty" -#: ../vdradmind.pl:525 ../vdradmind.pl:2069 +#: ../vdradmind.pl:525 ../vdradmind.pl:2052 msgid "You don't have permission to access this function!" msgstr "Puutteelliset käyttäjäoikeudet haluttuun toimintoon!" -#: ../vdradmind.pl:1081 ../vdradmind.pl:2070 +#: ../vdradmind.pl:1064 ../vdradmind.pl:2053 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Pääsy tiedostoon \"%s\" evätty!" -#: ../vdradmind.pl:1085 ../vdradmind.pl:2067 +#: ../vdradmind.pl:1068 ../vdradmind.pl:2050 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "URL:ia \"%s\" ei löydy palvelimelta!" -#: ../vdradmind.pl:2071 +#: ../vdradmind.pl:2054 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Tiedoston \"%s\" avaus ei onnistu!" -#: ../vdradmind.pl:2072 +#: ../vdradmind.pl:2055 #, perl-format msgid "" "Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and " @@ -1892,59 +1899,56 @@ msgstr "" "Yhteydenotto VDR:ään (%s:%s) epäonnistui!<br /><br />Varmista VDR:n " "päälläolo ja svdrphosts.conf-tiedoston oikeellisuus." -#: ../vdradmind.pl:2073 +#: ../vdradmind.pl:2056 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Komennon lähetys VDR:lle epäonnistui (%s)" -#: ../vdradmind.pl:2551 +#: ../vdradmind.pl:2532 msgid "Can't find EPG entry!" -msgstr "" +msgstr "Ohjelman tietoja ei löydy ohjelmaoppaasta!" -#: ../vdradmind.pl:2811 +#: ../vdradmind.pl:2788 msgid "Playing Tomorrow" msgstr "Ohjelmisto huomenna" -#: ../vdradmind.pl:2811 +#: ../vdradmind.pl:2788 #, fuzzy, perl-format msgid "Playing on the %s" msgstr "Ohjelmisto %d. päivä" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4126 msgid "next" msgstr "seuraavaksi" -#: ../vdradmind.pl:4171 +#: ../vdradmind.pl:4145 msgid "What's on after" msgstr "Menossa seuraavaksi" -#: ../vdradmind.pl:4171 +#: ../vdradmind.pl:4145 msgid "What's on at" msgstr "Menossa" -#: ../vdradmind.pl:4176 +#: ../vdradmind.pl:4150 msgid "Suitable matches for:" msgstr "Hakutulokset termille:" -#: ../vdradmind.pl:4178 +#: ../vdradmind.pl:4152 msgid "short view" msgstr "lyhyt näkymä" -#: ../vdradmind.pl:4178 +#: ../vdradmind.pl:4152 msgid "long view" msgstr "pitkä näkymä" -#: ../vdradmind.pl:4235 +#: ../vdradmind.pl:4209 msgid "Schedule" msgstr "Ohjelmisto" -#: ../vdradmind.pl:4793 +#: ../vdradmind.pl:4762 msgid "Timers" msgstr "Ajastimet" -#: ../vdradmind.pl:4861 +#: ../vdradmind.pl:4830 msgid "System default" msgstr "Oletus" - -#~ msgid "Timeline:" -#~ msgstr "Aikajana:" @@ -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-23 11:47+0200\n" +"POT-Creation-Date: 2006-06-26 11: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" @@ -31,7 +31,7 @@ msgstr "" #: ../template/default/at_timer_new.html:5 #: ../template/default/navigation.html:4 ../template/default/about.html:5 #: ../template/default/vdr_cmds.html:5 -#: ../template/default/prog_summary2.html:6 ../vdradmind.pl:2077 +#: ../template/default/prog_summary2.html:6 ../vdradmind.pl:2060 msgid "ISO-8859-1" msgstr "ISO-8859-1" @@ -134,36 +134,43 @@ msgid "Day Of Recording:" msgstr "Jour d'Enregistrement :" #: ../template/default/timer_new.html:92 +#: ../template/default/prog_timeline.html:79 #: ../template/default/at_timer_new.html:62 msgid "Monday" msgstr "Lundi" #: ../template/default/timer_new.html:93 +#: ../template/default/prog_timeline.html:80 #: ../template/default/at_timer_new.html:63 msgid "Tuesday" msgstr "Mardi" #: ../template/default/timer_new.html:94 +#: ../template/default/prog_timeline.html:81 #: ../template/default/at_timer_new.html:64 msgid "Wednesday" msgstr "Mercredi" #: ../template/default/timer_new.html:95 +#: ../template/default/prog_timeline.html:82 #: ../template/default/at_timer_new.html:65 msgid "Thursday" msgstr "Jeudi" #: ../template/default/timer_new.html:96 +#: ../template/default/prog_timeline.html:83 #: ../template/default/at_timer_new.html:66 msgid "Friday" msgstr "Vendredi" #: ../template/default/timer_new.html:97 +#: ../template/default/prog_timeline.html:84 #: ../template/default/at_timer_new.html:67 msgid "Saturday" msgstr "Samedi" #: ../template/default/timer_new.html:98 +#: ../template/default/prog_timeline.html:78 #: ../template/default/at_timer_new.html:68 msgid "Sunday" msgstr "Dimanche" @@ -176,14 +183,14 @@ msgstr "Heure De Début :" #: ../template/default/timer_new.html:107 #: ../template/default/timer_new.html:119 #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_timeline.html:125 -#: ../template/default/prog_timeline.html:140 -#: ../template/default/prog_timeline.html:152 +#: ../template/default/prog_timeline.html:76 +#: ../template/default/prog_timeline.html:187 +#: ../template/default/prog_timeline.html:202 #: ../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:4162 -#: ../vdradmind.pl:4176 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 +#: ../vdradmind.pl:4150 msgid "o'clock" msgstr "Heure" @@ -371,25 +378,25 @@ msgstr "Supprimer Programmations Sélectionnées ?" #: ../template/default/prog_summary.html:7 #: ../template/default/navigation.html:29 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4793 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4762 msgid "What's On Now?" msgstr "En ce Moment ?" #: ../template/default/prog_summary.html:27 -#: ../template/default/prog_timeline.html:128 +#: ../template/default/prog_timeline.html:190 #: ../template/default/prog_summary2.html:27 msgid "What's on:" msgstr "En ce moment :" #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4162 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 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:4793 +#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4762 msgid "Channels" msgstr "Chaînes" @@ -478,8 +485,8 @@ msgstr "Nombre de chaînes à utiliser :" msgid "Local net (no login required):" msgstr "Réseau local (login non nécessaire) :" -#: ../template/default/config.html:83 ../template/default/prog_detail.html:60 -#: ../template/default/prog_detail.html:68 +#: ../template/default/config.html:83 ../template/default/prog_detail.html:62 +#: ../template/default/prog_detail.html:73 #: ../template/default/help_config.html:42 msgid "Language:" msgstr "Langue :" @@ -533,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:4793 +#: ../template/default/navigation.html:35 ../vdradmind.pl:4762 msgid "Timeline" msgstr "Chronologie" @@ -733,12 +740,12 @@ msgid "Apply" msgstr "Appliquer" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:112 +#: ../template/default/prog_timeline.html:131 msgid "Duration:" msgstr "Durée :" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:112 +#: ../template/default/prog_timeline.html:132 msgid "min" msgstr "min" @@ -865,22 +872,22 @@ msgstr "rechercher" msgid "Video tracks:" msgstr "Piste vidéo :" -#: ../template/default/prog_detail.html:60 +#: ../template/default/prog_detail.html:62 msgid "Format:" msgstr "Format" -#: ../template/default/prog_detail.html:66 +#: ../template/default/prog_detail.html:69 msgid "Audio tracks:" msgstr "Piste audio :" -#: ../template/default/prog_detail.html:70 +#: ../template/default/prog_detail.html:75 msgid "Description:" 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:4793 +#: ../template/default/navigation.html:47 ../vdradmind.pl:4762 msgid "Recordings" msgstr "Enregistrements" @@ -1366,19 +1373,20 @@ msgstr "" "les sélectionner dans la liste de sélection de droite et cliquez sur <input " "type=\"submit\" class=\"submit\" value=\"<<<<<\"/>.</p>" -#: ../template/default/prog_timeline.html:132 ../vdradmind.pl:4147 +#: ../template/default/prog_timeline.html:75 +#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4121 msgid "now" msgstr "maintenant" -#: ../template/default/prog_timeline.html:138 -msgid "at:" -msgstr "à :" - -#: ../template/default/prog_timeline.html:152 +#: ../template/default/prog_timeline.html:77 msgid "to" msgstr "à" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2811 +#: ../template/default/prog_timeline.html:200 +msgid "at:" +msgstr "à :" + +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2788 msgid "Playing Today" msgstr "Joué Aujourd'hui" @@ -2009,7 +2017,7 @@ msgstr "Stockés dans" msgid "No matches found!" msgstr "Aucune correspondance trouvée !" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4793 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4762 msgid "Playing Today?" msgstr "Aujourd'hui ?" @@ -2189,38 +2197,38 @@ msgstr "Fichier de configuration écrit avec succès." msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmin.pl %s a démarré avec le pid %d." -#: ../vdradmind.pl:455 ../vdradmind.pl:1085 ../vdradmind.pl:2065 +#: ../vdradmind.pl:455 ../vdradmind.pl:1068 ../vdradmind.pl:2048 msgid "Not found" msgstr "Non trouvé" -#: ../vdradmind.pl:455 ../vdradmind.pl:2066 +#: ../vdradmind.pl:455 ../vdradmind.pl:2049 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:525 ../vdradmind.pl:1081 ../vdradmind.pl:2068 +#: ../vdradmind.pl:525 ../vdradmind.pl:1064 ../vdradmind.pl:2051 msgid "Forbidden" msgstr "Interdit" -#: ../vdradmind.pl:525 ../vdradmind.pl:2069 +#: ../vdradmind.pl:525 ../vdradmind.pl:2052 msgid "You don't have permission to access this function!" msgstr "Vous n'avez pas la permission d'accéder à cette fonction !" -#: ../vdradmind.pl:1081 ../vdradmind.pl:2070 +#: ../vdradmind.pl:1064 ../vdradmind.pl:2053 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Accès au fichier \"%s\" interdit !" -#: ../vdradmind.pl:1085 ../vdradmind.pl:2067 +#: ../vdradmind.pl:1068 ../vdradmind.pl:2050 #, 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:2071 +#: ../vdradmind.pl:2054 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Ne peut pas ouvrir le fichier \"%s\" !" -#: ../vdradmind.pl:2072 +#: ../vdradmind.pl:2055 #, perl-format msgid "" "Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and " @@ -2229,67 +2237,63 @@ msgstr "" "Connexion impossible vers VDR %s:%s<br /><br />Merci de vérifier que VDR est " "lancé et que le fichier svdrphosts.conf est configuré correctement." -#: ../vdradmind.pl:2073 +#: ../vdradmind.pl:2056 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Erreur en envoyant la commande à %s" -#: ../vdradmind.pl:2551 +#: ../vdradmind.pl:2532 msgid "Can't find EPG entry!" msgstr "" -#: ../vdradmind.pl:2811 +#: ../vdradmind.pl:2788 msgid "Playing Tomorrow" msgstr "Joué demain" -#: ../vdradmind.pl:2811 +#: ../vdradmind.pl:2788 #, fuzzy, perl-format msgid "Playing on the %s" msgstr "En cours sur la %d." -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4126 msgid "next" msgstr "suivant" -#: ../vdradmind.pl:4171 +#: ../vdradmind.pl:4145 msgid "What's on after" msgstr "Que se passe-t-il ensuite" -#: ../vdradmind.pl:4171 +#: ../vdradmind.pl:4145 msgid "What's on at" msgstr "Que se passe-t-il à telle heure" -#: ../vdradmind.pl:4176 +#: ../vdradmind.pl:4150 msgid "Suitable matches for:" msgstr "Correspondances trouvées pour :" -#: ../vdradmind.pl:4178 +#: ../vdradmind.pl:4152 msgid "short view" msgstr "Court aperçu" -#: ../vdradmind.pl:4178 +#: ../vdradmind.pl:4152 msgid "long view" msgstr "Long aperçu" -#: ../vdradmind.pl:4235 +#: ../vdradmind.pl:4209 msgid "Schedule" msgstr "Programmateur" -#: ../vdradmind.pl:4793 +#: ../vdradmind.pl:4762 msgid "Timers" msgstr "Programmations" -#: ../vdradmind.pl:4861 +#: ../vdradmind.pl:4830 msgid "System default" msgstr "Par défaut" #~ msgid "Timeline:" #~ msgstr "Chronologie :" -#, fuzzy -#~ msgid "Playing Today2" -#~ msgstr "Joué Aujourd'hui" - #~ msgid "charset=ISO-8859-1" #~ msgstr "charset=ISO-8859-1" @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-23 11:47+0200\n" -"PO-Revision-Date: 2006-05-24 19:00+0200\n" +"POT-Creation-Date: 2006-06-26 11: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" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgstr "" #: ../template/default/at_timer_new.html:5 #: ../template/default/navigation.html:4 ../template/default/about.html:5 #: ../template/default/vdr_cmds.html:5 -#: ../template/default/prog_summary2.html:6 ../vdradmind.pl:2077 +#: ../template/default/prog_summary2.html:6 ../vdradmind.pl:2060 msgid "ISO-8859-1" msgstr "ISO-8859-1" @@ -140,36 +140,43 @@ msgid "Day Of Recording:" msgstr "Dag van opname" #: ../template/default/timer_new.html:92 +#: ../template/default/prog_timeline.html:79 #: ../template/default/at_timer_new.html:62 msgid "Monday" msgstr "Maandag" #: ../template/default/timer_new.html:93 +#: ../template/default/prog_timeline.html:80 #: ../template/default/at_timer_new.html:63 msgid "Tuesday" msgstr "Dinsdag" #: ../template/default/timer_new.html:94 +#: ../template/default/prog_timeline.html:81 #: ../template/default/at_timer_new.html:64 msgid "Wednesday" msgstr "Woensdag" #: ../template/default/timer_new.html:95 +#: ../template/default/prog_timeline.html:82 #: ../template/default/at_timer_new.html:65 msgid "Thursday" msgstr "Donderdag" #: ../template/default/timer_new.html:96 +#: ../template/default/prog_timeline.html:83 #: ../template/default/at_timer_new.html:66 msgid "Friday" msgstr "Vrijdag" #: ../template/default/timer_new.html:97 +#: ../template/default/prog_timeline.html:84 #: ../template/default/at_timer_new.html:67 msgid "Saturday" msgstr "Zaterdag" #: ../template/default/timer_new.html:98 +#: ../template/default/prog_timeline.html:78 #: ../template/default/at_timer_new.html:68 msgid "Sunday" msgstr "Zondag" @@ -182,14 +189,14 @@ msgstr "Start tijd:" #: ../template/default/timer_new.html:107 #: ../template/default/timer_new.html:119 #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_timeline.html:125 -#: ../template/default/prog_timeline.html:140 -#: ../template/default/prog_timeline.html:152 +#: ../template/default/prog_timeline.html:76 +#: ../template/default/prog_timeline.html:187 +#: ../template/default/prog_timeline.html:202 #: ../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:4162 -#: ../vdradmind.pl:4176 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 +#: ../vdradmind.pl:4150 msgid "o'clock" msgstr "Uur" @@ -377,25 +384,25 @@ msgstr "Verwijder alle geselecteerde timers?" #: ../template/default/prog_summary.html:7 #: ../template/default/navigation.html:29 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4793 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4762 msgid "What's On Now?" msgstr "Wat is er nu op?" #: ../template/default/prog_summary.html:27 -#: ../template/default/prog_timeline.html:128 +#: ../template/default/prog_timeline.html:190 #: ../template/default/prog_summary2.html:27 msgid "What's on:" msgstr "Wat is er op:" #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4162 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 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:4793 +#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4762 msgid "Channels" msgstr "Kanalen" @@ -484,8 +491,8 @@ msgstr "Aantal te tonen kanalen:" msgid "Local net (no login required):" msgstr "Lokaal netwerk (geen login benodigd):" -#: ../template/default/config.html:83 ../template/default/prog_detail.html:60 -#: ../template/default/prog_detail.html:68 +#: ../template/default/config.html:83 ../template/default/prog_detail.html:62 +#: ../template/default/prog_detail.html:73 #: ../template/default/help_config.html:42 msgid "Language:" msgstr "Taal:" @@ -539,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:4793 +#: ../template/default/navigation.html:35 ../vdradmind.pl:4762 msgid "Timeline" msgstr "Tijdlijn" @@ -553,7 +560,7 @@ msgstr "Tijden:" #: ../template/default/config.html:159 msgid "Also used for other EPG views!" -msgstr "" +msgstr "Word ook gebruikt voor andere EPG" #: ../template/default/config.html:162 ../template/default/config.html:231 #: ../template/default/help_config.html:84 @@ -739,12 +746,12 @@ msgid "Apply" msgstr "Toepassen" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:112 +#: ../template/default/prog_timeline.html:131 msgid "Duration:" msgstr "Duur:" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:112 +#: ../template/default/prog_timeline.html:132 msgid "min" msgstr "min" @@ -871,22 +878,22 @@ msgstr "zoeken" msgid "Video tracks:" msgstr "Video tracks:" -#: ../template/default/prog_detail.html:60 +#: ../template/default/prog_detail.html:62 msgid "Format:" msgstr "Formaat:" -#: ../template/default/prog_detail.html:66 +#: ../template/default/prog_detail.html:69 msgid "Audio tracks:" msgstr "Audio sporen:" -#: ../template/default/prog_detail.html:70 +#: ../template/default/prog_detail.html:75 msgid "Description:" 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:4793 +#: ../template/default/navigation.html:47 ../vdradmind.pl:4762 msgid "Recordings" msgstr "Opnames" @@ -1359,19 +1366,20 @@ msgstr "" "deze lijst de te verwijderen kanalen en klik op<input type=\"submit\" class=" "\"submit\" value=\"<<<<<\"/>.</p>" -#: ../template/default/prog_timeline.html:132 ../vdradmind.pl:4147 +#: ../template/default/prog_timeline.html:75 +#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4121 msgid "now" msgstr "nu" -#: ../template/default/prog_timeline.html:138 -msgid "at:" -msgstr "om:" - -#: ../template/default/prog_timeline.html:152 +#: ../template/default/prog_timeline.html:77 msgid "to" msgstr "naar " -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2811 +#: ../template/default/prog_timeline.html:200 +msgid "at:" +msgstr "om:" + +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2788 msgid "Playing Today" msgstr "Programma vandaag " @@ -1959,7 +1967,7 @@ msgstr "Alle" #: ../template/default/at_timer_new.html:101 msgid "Override Start/Stop Margins:" -msgstr "" +msgstr "Start/stop marges overschrijden" #: ../template/default/at_timer_new.html:155 msgid "Test" @@ -1977,7 +1985,7 @@ msgstr "Opgeslagen in" msgid "No matches found!" msgstr "Geen overeenkomsten gevonden!" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4793 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4762 msgid "Playing Today?" msgstr "Speelt vandaag?" @@ -1986,9 +1994,8 @@ msgid "Watch TV" msgstr "TV bekijken" #: ../template/default/navigation.html:56 -#, fuzzy msgid "Commands" -msgstr "Commando's:" +msgstr "Commando's" #: ../template/default/navigation.html:62 ../template/default/about.html:6 msgid "About" @@ -2158,38 +2165,38 @@ msgstr "Configuratie bestanden succesvol weggeschreven." msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s gestart met pid %d." -#: ../vdradmind.pl:455 ../vdradmind.pl:1085 ../vdradmind.pl:2065 +#: ../vdradmind.pl:455 ../vdradmind.pl:1068 ../vdradmind.pl:2048 msgid "Not found" msgstr "Niet gevonden" -#: ../vdradmind.pl:455 ../vdradmind.pl:2066 +#: ../vdradmind.pl:455 ../vdradmind.pl:2049 msgid "The requested URL was not found on this server!" msgstr "De gevraagde URl is niet gevonden op deze server!" -#: ../vdradmind.pl:525 ../vdradmind.pl:1081 ../vdradmind.pl:2068 +#: ../vdradmind.pl:525 ../vdradmind.pl:1064 ../vdradmind.pl:2051 msgid "Forbidden" msgstr "Verboden" -#: ../vdradmind.pl:525 ../vdradmind.pl:2069 +#: ../vdradmind.pl:525 ../vdradmind.pl:2052 msgid "You don't have permission to access this function!" msgstr "U heeft geen toestemming om deze functie te gebruiken!" -#: ../vdradmind.pl:1081 ../vdradmind.pl:2070 +#: ../vdradmind.pl:1064 ../vdradmind.pl:2053 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Toegang tot bestand \"%s\" geweigerd!" -#: ../vdradmind.pl:1085 ../vdradmind.pl:2067 +#: ../vdradmind.pl:1068 ../vdradmind.pl:2050 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "De URl \"%s\" is niet gevonden op deze server!" -#: ../vdradmind.pl:2071 +#: ../vdradmind.pl:2054 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Kan bestand \"%s\" niet openen!" -#: ../vdradmind.pl:2072 +#: ../vdradmind.pl:2055 #, perl-format msgid "" "Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and " @@ -2198,59 +2205,56 @@ msgstr "" "Kan geen verbinding maken met VDR at %s:%s<br /><br /> Controleer of VDR " "draait en of VDR's svdrphosts.conf op de juiste manier is geconfigureerd." -#: ../vdradmind.pl:2073 +#: ../vdradmind.pl:2056 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Fout tijdens verzenden van commando op %s" -#: ../vdradmind.pl:2551 +#: ../vdradmind.pl:2532 msgid "Can't find EPG entry!" -msgstr "" +msgstr "Kan geen EPG gegevens vinden!" -#: ../vdradmind.pl:2811 +#: ../vdradmind.pl:2788 msgid "Playing Tomorrow" msgstr "Speelt morgen" -#: ../vdradmind.pl:2811 -#, fuzzy, perl-format +#: ../vdradmind.pl:2788 +#, perl-format msgid "Playing on the %s" -msgstr "Speelt op de %d." +msgstr "Speelt op de %s" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4126 msgid "next" msgstr "volgende" -#: ../vdradmind.pl:4171 +#: ../vdradmind.pl:4145 msgid "What's on after" msgstr "Wat is er op na" -#: ../vdradmind.pl:4171 +#: ../vdradmind.pl:4145 msgid "What's on at" msgstr "Wat is er op om:" -#: ../vdradmind.pl:4176 +#: ../vdradmind.pl:4150 msgid "Suitable matches for:" msgstr "Bruikbare overeenkomsten voor:" -#: ../vdradmind.pl:4178 +#: ../vdradmind.pl:4152 msgid "short view" msgstr "beknopt tonen" -#: ../vdradmind.pl:4178 +#: ../vdradmind.pl:4152 msgid "long view" msgstr "uitgebreid tonen" -#: ../vdradmind.pl:4235 +#: ../vdradmind.pl:4209 msgid "Schedule" msgstr "Schema" -#: ../vdradmind.pl:4793 +#: ../vdradmind.pl:4762 msgid "Timers" msgstr "Timers" -#: ../vdradmind.pl:4861 +#: ../vdradmind.pl:4830 msgid "System default" msgstr "Systeem standaard" - -#~ msgid "Timeline:" -#~ msgstr "Tijdlijn: " @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-06-23 11:47+0200\n" -"PO-Revision-Date: 2006-04-26 13:53+0100\n" +"POT-Creation-Date: 2006-06-26 11: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" "MIME-Version: 1.0\n" @@ -44,7 +44,7 @@ msgstr "" #: ../template/default/at_timer_new.html:5 #: ../template/default/navigation.html:4 ../template/default/about.html:5 #: ../template/default/vdr_cmds.html:5 -#: ../template/default/prog_summary2.html:6 ../vdradmind.pl:2077 +#: ../template/default/prog_summary2.html:6 ../vdradmind.pl:2060 msgid "ISO-8859-1" msgstr "ISO-8859-5" @@ -147,36 +147,43 @@ msgid "Day Of Recording:" msgstr "´ÕÝì ×ÐßØáØ:" #: ../template/default/timer_new.html:92 +#: ../template/default/prog_timeline.html:79 #: ../template/default/at_timer_new.html:62 msgid "Monday" msgstr "¿ÞÝÕÔÕÛìÝØÚ" #: ../template/default/timer_new.html:93 +#: ../template/default/prog_timeline.html:80 #: ../template/default/at_timer_new.html:63 msgid "Tuesday" msgstr "²âÞàÝØÚ" #: ../template/default/timer_new.html:94 +#: ../template/default/prog_timeline.html:81 #: ../template/default/at_timer_new.html:64 msgid "Wednesday" msgstr "ÁàÕÔÐ" #: ../template/default/timer_new.html:95 +#: ../template/default/prog_timeline.html:82 #: ../template/default/at_timer_new.html:65 msgid "Thursday" msgstr "ÇÕâÒÕàÓ" #: ../template/default/timer_new.html:96 +#: ../template/default/prog_timeline.html:83 #: ../template/default/at_timer_new.html:66 msgid "Friday" msgstr "¿ïâÝØæÐ" #: ../template/default/timer_new.html:97 +#: ../template/default/prog_timeline.html:84 #: ../template/default/at_timer_new.html:67 msgid "Saturday" msgstr "ÁãÑÑÞâÐ" #: ../template/default/timer_new.html:98 +#: ../template/default/prog_timeline.html:78 #: ../template/default/at_timer_new.html:68 msgid "Sunday" msgstr "²ÞáÚàÕáÕÝØÕ" @@ -189,14 +196,14 @@ msgstr "½ÐçÐÛÞ:" #: ../template/default/timer_new.html:107 #: ../template/default/timer_new.html:119 #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_timeline.html:125 -#: ../template/default/prog_timeline.html:140 -#: ../template/default/prog_timeline.html:152 +#: ../template/default/prog_timeline.html:76 +#: ../template/default/prog_timeline.html:187 +#: ../template/default/prog_timeline.html:202 #: ../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:4162 -#: ../vdradmind.pl:4176 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 +#: ../vdradmind.pl:4150 msgid "o'clock" msgstr "ÇÐáÞÒ" @@ -382,26 +389,25 @@ msgstr "ÃÔÐÛØâì ÒáÕ ÒëÑàÐÝÝëÕ °ÒâÞâÐÙÜÕàë?" #: ../template/default/prog_summary.html:7 #: ../template/default/navigation.html:29 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4793 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4762 msgid "What's On Now?" msgstr "ÇâÞ ØÔÕâ áÕÙçÐá?" #: ../template/default/prog_summary.html:27 -#: ../template/default/prog_timeline.html:128 +#: ../template/default/prog_timeline.html:190 #: ../template/default/prog_summary2.html:27 msgid "What's on:" msgstr "ÇâÞ áÕÙçÐá:" #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4162 -#, fuzzy +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 msgid "at" -msgstr "Ò:" +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:4793 +#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4762 msgid "Channels" msgstr "ÂÕÛÕÓØÔ" @@ -440,9 +446,8 @@ msgstr "´ÞßÞÛÝØâÕÛìÝÐï ØÝäÞàÜÐæØï" #: ../template/default/prog_list.html:77 #: ../template/default/prog_list2.html:90 #: ../template/default/prog_summary2.html:98 -#, fuzzy msgid "No Information" -msgstr "´ÞßÞÛÝØâÕÛìÝÐï ØÝäÞàÜÐæØï" +msgstr "½Õâ ØÝäÞàÜÐæØØ" #: ../template/default/prog_summary.html:87 #: ../template/default/prog_list.html:79 @@ -491,8 +496,8 @@ msgstr "ºÞÛØçÕáâÒÞ ØáßÞÛì×ãÕÜëå ÚÐÝÐÛÞÒ:" msgid "Local net (no login required):" msgstr "»ÞÚÐÛìÝÐï áÕâì (ÒåÞÔ ÑÕ× ÐÒâÞàØ×ÐæØØ):" -#: ../template/default/config.html:83 ../template/default/prog_detail.html:60 -#: ../template/default/prog_detail.html:68 +#: ../template/default/config.html:83 ../template/default/prog_detail.html:62 +#: ../template/default/prog_detail.html:73 #: ../template/default/help_config.html:42 msgid "Language:" msgstr "Ï×ëÚ:" @@ -546,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:4793 +#: ../template/default/navigation.html:35 ../vdradmind.pl:4762 msgid "Timeline" msgstr "³àÐäØÚ ÒàÕÜÕÝØ" @@ -560,7 +565,7 @@ msgstr "²àÕÜï:" #: ../template/default/config.html:159 msgid "Also used for other EPG views!" -msgstr "" +msgstr "ÂÐÚÖÕ ØáßÞÛì×ÞÒÐâì ÔÛï ÔàãÓØå EPG" #: ../template/default/config.html:162 ../template/default/config.html:231 #: ../template/default/help_config.html:84 @@ -746,12 +751,12 @@ msgid "Apply" msgstr "¿àØÜÕÝØâì" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:112 +#: ../template/default/prog_timeline.html:131 msgid "Duration:" msgstr "¿àÞÔÞÛÖØâÕÛìÝÞáâì:" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:112 +#: ../template/default/prog_timeline.html:132 msgid "min" msgstr "ÜØÝ" @@ -876,26 +881,24 @@ msgstr "¿ÞÒâÞàÕÝØï" #: ../template/default/prog_detail.html:58 msgid "Video tracks:" -msgstr "" +msgstr "²ØÔÕÞ ÔÞàÞÖÚØ" -#: ../template/default/prog_detail.html:60 -#, fuzzy +#: ../template/default/prog_detail.html:62 msgid "Format:" -msgstr "Ò:" +msgstr "ÄÞàÜÐâ:" -#: ../template/default/prog_detail.html:66 +#: ../template/default/prog_detail.html:69 msgid "Audio tracks:" -msgstr "" +msgstr "°ãÔØÞ ÔÞàÞÖÚØ" -#: ../template/default/prog_detail.html:70 -#, fuzzy +#: ../template/default/prog_detail.html:75 msgid "Description:" -msgstr "¾ßØáÐÝØÕ" +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:4793 +#: ../template/default/navigation.html:47 ../vdradmind.pl:4762 msgid "Recordings" msgstr "·ÐßØáØ" @@ -1167,9 +1170,8 @@ msgstr "" "âÐÙÜÕà" #: ../template/default/help_config.html:103 -#, fuzzy msgid "Here you set the sending email address of the generated email." -msgstr "·ÔÕáì ²ë ãáâÐÝÐÒÛØÒÐÕâÕ áÕàÒÕà ÔÛï ÞâßàÐÒÚØ ßÞçâë" +msgstr "·ÔÕáì ²ë ãáâÐÝÐÒÛØÒÐÕâÕ E-mail ÐÔàÕáá ÔÛï áÓÕÝÕàØàÞÒÐÝÝëå E-mail" #: ../template/default/help_config.html:105 msgid "The email address the email is sent to." @@ -1351,25 +1353,26 @@ msgstr "" "ÝÐÖÐâì ÝÐ ÚÝÞßÚã <input type=\"submit\" class=\"submit\" value=\">>>" ">>\"/>.ÃÔÐÛØâì ÚÐÝÐÛë Ø× íâÞÓÞ áßØáÚÐ ÜÞÖÝÞ ÒëÔÕÛØÒ " -#: ../template/default/prog_timeline.html:132 ../vdradmind.pl:4147 +#: ../template/default/prog_timeline.html:75 +#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4121 msgid "now" msgstr "áÕÙçÐá" -#: ../template/default/prog_timeline.html:138 -msgid "at:" -msgstr "Ò:" - -#: ../template/default/prog_timeline.html:152 +#: ../template/default/prog_timeline.html:77 msgid "to" msgstr "ÔÞ" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2811 +#: ../template/default/prog_timeline.html:200 +msgid "at:" +msgstr "Ò:" + +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2788 msgid "Playing Today" msgstr "ÇâÞ ÑãÔÕâ áÕÓÞÔÝï?" #: ../template/default/prog_list2.html:29 msgid "starting at" -msgstr "" +msgstr "½ÐçÐâì Ò" #: ../template/default/rec_edit.html:6 ../template/default/rec_edit.html:19 msgid "Rename Recording" @@ -1940,7 +1943,7 @@ msgstr "ÒáÕ" #: ../template/default/at_timer_new.html:101 msgid "Override Start/Stop Margins:" -msgstr "" +msgstr "¿ÕàÕßØáëÒÐâì áâÐàâ/áâÞß " #: ../template/default/at_timer_new.html:155 msgid "Test" @@ -1958,7 +1961,7 @@ msgstr "ÁÞåàÐÝÕÝÝÞ Ò" msgid "No matches found!" msgstr "ÁÞÒßÐÔÕÝØÙ ÝÕ ÝÐÙÔÕÝÞ!" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4793 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4762 msgid "Playing Today?" msgstr "ÇâÞ ÑãÔÕâ áÕÓÞÔÝï?" @@ -1967,9 +1970,8 @@ msgid "Watch TV" msgstr "ÂÕÛÕÒØ×Þà" #: ../template/default/navigation.html:56 -#, fuzzy msgid "Commands" -msgstr "ºÞÜÐÝÔë:" +msgstr "ºÞÜÐÝÔë" #: ../template/default/navigation.html:62 ../template/default/about.html:6 msgid "About" @@ -2025,7 +2027,7 @@ msgstr "¸áßÐÝáÚØÙ:" #: ../template/default/about.html:58 msgid "Russian:" -msgstr "" +msgstr "ÀãááÚØÙ" #: ../template/default/about.html:65 msgid "Informations" @@ -2140,108 +2142,103 @@ msgstr "ÄÐÙÛ ÚÞÝäØÓãàÐæØØ ãáßÕèÝÞ ×ÐßØáÐÝ." msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s ÑëÛ ×ÐßãéÕÝ á PID-ÞÜ %d." -#: ../vdradmind.pl:455 ../vdradmind.pl:1085 ../vdradmind.pl:2065 +#: ../vdradmind.pl:455 ../vdradmind.pl:1068 ../vdradmind.pl:2048 msgid "Not found" msgstr "½Õ ÝÐÙÔÕÝÞ" -#: ../vdradmind.pl:455 ../vdradmind.pl:2066 +#: ../vdradmind.pl:455 ../vdradmind.pl:2049 msgid "The requested URL was not found on this server!" msgstr "·ÐâàÕÑÞÒÐÝÝëÙ URL ÝÕ ÑëÛ ÝÐÙÔÕÝ ÝÐ íâÞÜ áÕàÒÕàÕ!" -#: ../vdradmind.pl:525 ../vdradmind.pl:1081 ../vdradmind.pl:2068 +#: ../vdradmind.pl:525 ../vdradmind.pl:1064 ../vdradmind.pl:2051 msgid "Forbidden" msgstr "·ÐßàÕéÕÝÞ" -#: ../vdradmind.pl:525 ../vdradmind.pl:2069 +#: ../vdradmind.pl:525 ../vdradmind.pl:2052 msgid "You don't have permission to access this function!" msgstr "à ÒÐá ÝÕÔÞáâÐâÞçÝÞ ßàÐÒ ÔÛï Òë×ÞÒÐ íâÞÙ äãÝÚæØØ!" -#: ../vdradmind.pl:1081 ../vdradmind.pl:2070 +#: ../vdradmind.pl:1064 ../vdradmind.pl:2053 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "² ÔÞáâãßÕ Ú äÐÙÛã \"%s\" ÞâÚÐ×ÐÝÝÞ!" -#: ../vdradmind.pl:1085 ../vdradmind.pl:2067 +#: ../vdradmind.pl:1068 ../vdradmind.pl:2050 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "URL \"%s\" ÝÕ ÑëÛ ÝÐÙÔÕÝ ÝÐ íâÞÜ áÕàÒÕàÕ!" -#: ../vdradmind.pl:2071 +#: ../vdradmind.pl:2054 #, perl-format msgid "Can't open file \"%s\"!" msgstr "½Õ ÜÞÖÕâ ÞâÚàëâì äÐÙÛ \"%s\"!" -#: ../vdradmind.pl:2072 +#: ../vdradmind.pl:2055 #, perl-format msgid "" "Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and " "if VDR's svdrphosts.conf is configured correctly." msgstr "" +"½Õ ÜÞÓã áÞÕÔØÝØâìáï á VDR %s:%s<br /><br />¿àÞÚÞÝâàÞÛØàãÙâÕ VDR Ø " +"svdrphosts.conf" -#: ../vdradmind.pl:2073 +#: ../vdradmind.pl:2056 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "¾èØÑÚÐ ßàØ ÞâßàÐÒÛÕÝØØ ÚÞÜÐÝÔë Ú %s" -#: ../vdradmind.pl:2551 +#: ../vdradmind.pl:2532 msgid "Can't find EPG entry!" -msgstr "" +msgstr "½Õâ EPG ×ÐßØáÕÙ!" -#: ../vdradmind.pl:2811 +#: ../vdradmind.pl:2788 msgid "Playing Tomorrow" msgstr "¿àÞÓàÐÜÜÐ ÝÐ ×ÐÒâàÐ" -#: ../vdradmind.pl:2811 -#, fuzzy, perl-format +#: ../vdradmind.pl:2788 +#, perl-format msgid "Playing on the %s" -msgstr "ÇâÞ ÑãÔÕâ %d." +msgstr "²ÞáßàÞØ×ÒÕáâØ %s." -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4126 msgid "next" -msgstr "" +msgstr "áÛÕÔ." -#: ../vdradmind.pl:4171 -#, fuzzy +#: ../vdradmind.pl:4145 msgid "What's on after" -msgstr "ÇâÞ áÕÙçÐá:" +msgstr "ÇâÞ ßÞâÞÜ" -#: ../vdradmind.pl:4171 -#, fuzzy +#: ../vdradmind.pl:4145 msgid "What's on at" -msgstr "ÇâÞ áÕÙçÐá:" +msgstr "ÇâÞ Ò:" -#: ../vdradmind.pl:4176 +#: ../vdradmind.pl:4150 msgid "Suitable matches for:" msgstr "ÀÕ×ãÛìâÐâë ßÞØáÚÐ ÔÛï" -#: ../vdradmind.pl:4178 +#: ../vdradmind.pl:4152 msgid "short view" -msgstr "" +msgstr "áÞÚàÐéÕÝÝÐï ØÝäÞàÜÐæØï" -#: ../vdradmind.pl:4178 -#, fuzzy +#: ../vdradmind.pl:4152 msgid "long view" -msgstr "ßÕàÕÚÛîçØâì" +msgstr "ÀÐáèØàÕÝÝÐï ØÝäÞàÜÐæØï" -#: ../vdradmind.pl:4235 +#: ../vdradmind.pl:4209 msgid "Schedule" msgstr "ÀÐáßØáÐÝØÕ" -#: ../vdradmind.pl:4793 +#: ../vdradmind.pl:4762 msgid "Timers" msgstr "ÂÐÙÜÕàë" -#: ../vdradmind.pl:4861 +#: ../vdradmind.pl:4830 msgid "System default" msgstr "ÁØáâÕÜÝëÙ áâÐÝÔÐàâ" #~ msgid "Timeline:" #~ msgstr "³àÐäØÚ ÒàÕÜÕÝØ:" -#, fuzzy -#~ msgid "Playing Today2" -#~ msgstr "ÇâÞ ÑãÔÕâ áÕÓÞÔÝï?" - #~ msgid "charset=ISO-8859-1" #~ msgstr "charset=ISO-8859-5" diff --git a/po/vdradmin.pot b/po/vdradmin.pot index 99ba411..8802c9d 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-23 11:47+0200\n" +"POT-Creation-Date: 2006-06-26 11: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" @@ -35,7 +35,7 @@ msgstr "" #: ../template/default/at_timer_new.html:5 #: ../template/default/navigation.html:4 ../template/default/about.html:5 #: ../template/default/vdr_cmds.html:5 -#: ../template/default/prog_summary2.html:6 ../vdradmind.pl:2077 +#: ../template/default/prog_summary2.html:6 ../vdradmind.pl:2060 msgid "ISO-8859-1" msgstr "" @@ -138,36 +138,43 @@ msgid "Day Of Recording:" msgstr "" #: ../template/default/timer_new.html:92 +#: ../template/default/prog_timeline.html:79 #: ../template/default/at_timer_new.html:62 msgid "Monday" msgstr "" #: ../template/default/timer_new.html:93 +#: ../template/default/prog_timeline.html:80 #: ../template/default/at_timer_new.html:63 msgid "Tuesday" msgstr "" #: ../template/default/timer_new.html:94 +#: ../template/default/prog_timeline.html:81 #: ../template/default/at_timer_new.html:64 msgid "Wednesday" msgstr "" #: ../template/default/timer_new.html:95 +#: ../template/default/prog_timeline.html:82 #: ../template/default/at_timer_new.html:65 msgid "Thursday" msgstr "" #: ../template/default/timer_new.html:96 +#: ../template/default/prog_timeline.html:83 #: ../template/default/at_timer_new.html:66 msgid "Friday" msgstr "" #: ../template/default/timer_new.html:97 +#: ../template/default/prog_timeline.html:84 #: ../template/default/at_timer_new.html:67 msgid "Saturday" msgstr "" #: ../template/default/timer_new.html:98 +#: ../template/default/prog_timeline.html:78 #: ../template/default/at_timer_new.html:68 msgid "Sunday" msgstr "" @@ -180,14 +187,14 @@ msgstr "" #: ../template/default/timer_new.html:107 #: ../template/default/timer_new.html:119 #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_timeline.html:125 -#: ../template/default/prog_timeline.html:140 -#: ../template/default/prog_timeline.html:152 +#: ../template/default/prog_timeline.html:76 +#: ../template/default/prog_timeline.html:187 +#: ../template/default/prog_timeline.html:202 #: ../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:4162 -#: ../vdradmind.pl:4176 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 +#: ../vdradmind.pl:4150 msgid "o'clock" msgstr "" @@ -369,25 +376,25 @@ msgstr "" #: ../template/default/prog_summary.html:7 #: ../template/default/navigation.html:29 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4793 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:4762 msgid "What's On Now?" msgstr "" #: ../template/default/prog_summary.html:27 -#: ../template/default/prog_timeline.html:128 +#: ../template/default/prog_timeline.html:190 #: ../template/default/prog_summary2.html:27 msgid "What's on:" msgstr "" #: ../template/default/prog_summary.html:33 -#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4162 +#: ../template/default/prog_summary2.html:33 ../vdradmind.pl:4136 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:4793 +#: ../template/default/prog_summary2.html:84 ../vdradmind.pl:4762 msgid "Channels" msgstr "" @@ -476,8 +483,8 @@ msgstr "" msgid "Local net (no login required):" msgstr "" -#: ../template/default/config.html:83 ../template/default/prog_detail.html:60 -#: ../template/default/prog_detail.html:68 +#: ../template/default/config.html:83 ../template/default/prog_detail.html:62 +#: ../template/default/prog_detail.html:73 #: ../template/default/help_config.html:42 msgid "Language:" msgstr "" @@ -531,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:4793 +#: ../template/default/navigation.html:35 ../vdradmind.pl:4762 msgid "Timeline" msgstr "" @@ -731,12 +738,12 @@ msgid "Apply" msgstr "" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:112 +#: ../template/default/prog_timeline.html:131 msgid "Duration:" msgstr "" #: ../template/default/timer_list.html:27 -#: ../template/default/prog_timeline.html:112 +#: ../template/default/prog_timeline.html:132 msgid "min" msgstr "" @@ -863,22 +870,22 @@ msgstr "" msgid "Video tracks:" msgstr "" -#: ../template/default/prog_detail.html:60 +#: ../template/default/prog_detail.html:62 msgid "Format:" msgstr "" -#: ../template/default/prog_detail.html:66 +#: ../template/default/prog_detail.html:69 msgid "Audio tracks:" msgstr "" -#: ../template/default/prog_detail.html:70 +#: ../template/default/prog_detail.html:75 msgid "Description:" 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:4793 +#: ../template/default/navigation.html:47 ../vdradmind.pl:4762 msgid "Recordings" msgstr "" @@ -1241,19 +1248,20 @@ msgid "" "<input type=\"submit\" class=\"submit\" value=\"<<<<<\"/>.</p>" msgstr "" -#: ../template/default/prog_timeline.html:132 ../vdradmind.pl:4147 +#: ../template/default/prog_timeline.html:75 +#: ../template/default/prog_timeline.html:194 ../vdradmind.pl:4121 msgid "now" msgstr "" -#: ../template/default/prog_timeline.html:138 -msgid "at:" +#: ../template/default/prog_timeline.html:77 +msgid "to" msgstr "" -#: ../template/default/prog_timeline.html:152 -msgid "to" +#: ../template/default/prog_timeline.html:200 +msgid "at:" msgstr "" -#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2811 +#: ../template/default/prog_list2.html:6 ../vdradmind.pl:2788 msgid "Playing Today" msgstr "" @@ -1667,7 +1675,7 @@ msgstr "" msgid "No matches found!" msgstr "" -#: ../template/default/navigation.html:32 ../vdradmind.pl:4793 +#: ../template/default/navigation.html:32 ../vdradmind.pl:4762 msgid "Playing Today?" msgstr "" @@ -1837,94 +1845,94 @@ msgstr "" msgid "vdradmind.pl %s started with pid %d." msgstr "" -#: ../vdradmind.pl:455 ../vdradmind.pl:1085 ../vdradmind.pl:2065 +#: ../vdradmind.pl:455 ../vdradmind.pl:1068 ../vdradmind.pl:2048 msgid "Not found" msgstr "" -#: ../vdradmind.pl:455 ../vdradmind.pl:2066 +#: ../vdradmind.pl:455 ../vdradmind.pl:2049 msgid "The requested URL was not found on this server!" msgstr "" -#: ../vdradmind.pl:525 ../vdradmind.pl:1081 ../vdradmind.pl:2068 +#: ../vdradmind.pl:525 ../vdradmind.pl:1064 ../vdradmind.pl:2051 msgid "Forbidden" msgstr "" -#: ../vdradmind.pl:525 ../vdradmind.pl:2069 +#: ../vdradmind.pl:525 ../vdradmind.pl:2052 msgid "You don't have permission to access this function!" msgstr "" -#: ../vdradmind.pl:1081 ../vdradmind.pl:2070 +#: ../vdradmind.pl:1064 ../vdradmind.pl:2053 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "" -#: ../vdradmind.pl:1085 ../vdradmind.pl:2067 +#: ../vdradmind.pl:1068 ../vdradmind.pl:2050 #, perl-format msgid "The URL \"%s\" was not found on this server!" msgstr "" -#: ../vdradmind.pl:2071 +#: ../vdradmind.pl:2054 #, perl-format msgid "Can't open file \"%s\"!" msgstr "" -#: ../vdradmind.pl:2072 +#: ../vdradmind.pl:2055 #, perl-format msgid "" "Can't connect to VDR at %s:%s<br /><br />Please check if VDR is running and " "if VDR's svdrphosts.conf is configured correctly." msgstr "" -#: ../vdradmind.pl:2073 +#: ../vdradmind.pl:2056 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "" -#: ../vdradmind.pl:2551 +#: ../vdradmind.pl:2532 msgid "Can't find EPG entry!" msgstr "" -#: ../vdradmind.pl:2811 +#: ../vdradmind.pl:2788 msgid "Playing Tomorrow" msgstr "" -#: ../vdradmind.pl:2811 +#: ../vdradmind.pl:2788 #, perl-format msgid "Playing on the %s" msgstr "" -#: ../vdradmind.pl:4152 +#: ../vdradmind.pl:4126 msgid "next" msgstr "" -#: ../vdradmind.pl:4171 +#: ../vdradmind.pl:4145 msgid "What's on after" msgstr "" -#: ../vdradmind.pl:4171 +#: ../vdradmind.pl:4145 msgid "What's on at" msgstr "" -#: ../vdradmind.pl:4176 +#: ../vdradmind.pl:4150 msgid "Suitable matches for:" msgstr "" -#: ../vdradmind.pl:4178 +#: ../vdradmind.pl:4152 msgid "short view" msgstr "" -#: ../vdradmind.pl:4178 +#: ../vdradmind.pl:4152 msgid "long view" msgstr "" -#: ../vdradmind.pl:4235 +#: ../vdradmind.pl:4209 msgid "Schedule" msgstr "" -#: ../vdradmind.pl:4793 +#: ../vdradmind.pl:4762 msgid "Timers" msgstr "" -#: ../vdradmind.pl:4861 +#: ../vdradmind.pl:4830 msgid "System default" msgstr "" diff --git a/template/default/default/style.css b/template/default/default/style.css deleted file mode 100644 index 2d41ac6..0000000 --- a/template/default/default/style.css +++ /dev/null @@ -1,715 +0,0 @@ -* { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; -} - -#rc, -#tv { - margin: 0px; -} - -body { - background-color: #ffffff; - margin: 3px; - padding: 0; -} - -form { - margin: 0px; - padding: 0; -} - -td, -div { - color: black; - font-weight: normal; - font-size: 11px; -} - -input { - color: black; - font-weight: normal; - font-size: 11px; -} - -textarea { - color: black; - font-weight: normal; - font-size: 11px; -} - -select { - color: black; - font-weight: normal; - font-size: 11px; -} -/* -.submit { - height: 20px; -}*/ - -h1 { - margin-right: 5px; - margin-left: 5px; - font-size: 13px; - font-weight: bold; - color: black; - display: inline; -} -h2 { - margin: 0px; - font-size: 11px; - font-weight: bold; - color: black; - display: inline; -} -h3, -.epg_title { - margin: 0px; - font-size: 11px; - font-weight: bold; - color: black; -} -#prog_list .epg_title a { - margin: 0; - padding: 0; -} -.col_label h5 { - margin: 1px 5px; - font-size: 11px; - font-weight: normal; - color: black; - text-align: right; -} -h6 { - margin: 1px 5px; - font-size: 10px; - font-weight: normal; - color: black; - text-align: right; -} - -label { - cursor: default; -} - -a, -a:visited, -a:active, -a:hover { - color: black; - text-decoration: none; -} - -label + input { - margin-left: 1em; -} - -#tv input, -#tv select, -#tv h5 { - font-weight: normal; - font-size: 9px; - display: inline; -} -#rec_list .col_name { - font-weight: bold; -} - -#error h2 { - font-size: 11px; - color: red; -} - -body.help .heading { - display: table-row; -} - -.row_odd -.row_even, -.heading { - height: 17px; -} -.heading td { - background-color: #6d96a9; - xbackground-color: #2089e6; /*TODO*/ - height: 17px; -} -.heading h2, -.heading .channel_name, -.heading a { - padding-left: 3px; - padding-right: 3px; - font-weight: bold; - color: white; - margin-top: 0px; - white-space: normal; -} - -.row_even td { - background-color: #ffffff; -} -.row_odd td { - background-color: #dee6ee; -} - -.col_label, -.col_value, -.col_active, -.col_channel, -.col_start, -.col_stop, -.col_date, -.col_time { - padding-left: 3px; - padding-right: 3px; - white-space: nowrap; -} - -.row_odd, -.row_even { - height: 25px; -} - -.col_channels { - text-align: right; - padding: 10px; - width: 40%; -} - -.col_wanted_channels { - text-align: left; - padding: 10px; - width: 40%; -} - -.col_navi { - text-align: right; - vertical-align: middle; - white-space: nowrap; - height: 17px; -} - -.list, -.group { - border: 1px solid #6d96a9; -} -.group td { - padding: 2px; -} - -#prog_summary .action, -#prog_detail .action { - display: block; - margin: 5px 0 0 0; -} -.action { - margin: 0; - padding 0; - text-align: center; - width: 20px; -} - -/* Summary */ -#prog_summary .group { - margin: 0 3px 3px 0; - display: inline; - float: left; -} -#prog_summary .heading td.col_content { - height: 17px; - width: 246px; - color: white; - background-color: #6d96a9; - white-space: nowrap; - overflow: hidden; -} -#prog_summary .row_even td.col_content { - width: 246px; - height: 200px; - background-color: #dee6ee; - vertical-align: top; -} -#prog_summary table.content td.col_buttons { - height: 200px; -} -#prog_summary .col_epg { - vertical-align: top; -} -#prog_summary .date_long { - text-align: right; - margin-top: 3px; - float: left; -} -#prog_summary .time_duration { - text-align: right; - margin-top: 3px; -} -#prog_summary .epg_title { - margin-top: 1em; - width: 216px; - overflow: hidden; - white-space: nowrap; -} -#prog_summary .epg_subtitle { - width: 216px; - overflow: hidden; - white-space: nowrap; -} -#prog_summary .epg_summary { - margin-top: 1em; - margin-bottom: 3px; - width: 210px; - height: 120px; - overflow: auto; - white-space: normal; -} -#prog_summary .heading a { - font-weight: bold; - color: white; - padding: 2px 2px; -} - -#prog_summary2 .newday { - height: 17px; - background-color: #6d96a9; -} -#prog_summary2 .newday td { - padding-left: 3px; - font-weight: bold; - color: white; -} -#prog_summary2 .epg_title, -#prog_summary2 .channel_name { - display: block; -} -#prog_summary2 .epg_subtitle { - font-size: 11px; - font-weight: normal; - color: black; - display: block; -} -#prog_summary2 .col_buttons { - width: 120px; - text-align: right; - padding-right: 3px; - white-space: nowrap; -} -#prog_summary2 table.percent { - height: 8px; - width: 80px; - border: 1px solid #6d96a9; -} -#prog_summary2 table.percent .elapsed { - background-color: #6d96a9; -} -#prog_summary2 table.percent .remaining { - background-color: none; -} - -#prog_detail .heading .col_content * { - color: white; - font-weight: bold; -} -#prog_detail .channel_name { - white-space: nowrap; -} -#prog_detail .date_long { - margin-left: 2em; - white-space: nowrap; -} -#prog_detail .time_vps, -#prog_detail .time_duration { - margin-left: 2em; - white-space: nowrap; -} -#prog_detail .epg_title { - display: block; -} -#prog_detail .epg_subtitle { - font-size: 11px; - font-weight: normal; - color: black; - display: block; -} -#prog_detail .epg_summary { - margin: 2em 0; - display: block; -} -#prog_detail .epg_video h4, -#prog_detail .epg_audio h4 { - margin: 0; - font-size: 10px; - font-weight: bold; -} -#prog_detail .epg_video h5, -#prog_detail .epg_audio h5 { - margin-left: 1em; - display: inline; - font-size: 10px; - font-weight: normal; - font-style: italic; -} -#prog_detail .col_epg { - padding: 1em; -} -#prog_summary .row_even td.col_content, -#prog_detail .row_even td.col_content { - padding: 0; -} -#prog_summary table.content td.col_buttons, -#prog_detail table.content td.col_buttons { - padding-top: 1em; - vertical-align: top; - width: 20px; - text-align: center; - background-color: #dee6ee; - border-right: 1px solid #6d96a9; -} - -#prog_list .heading td span, -#prog_list .heading td { - vertical-align: bottom; -} -#prog_list .date_long { - color: white; - font-weight: bold; - padding: 0 2em; -} -#prog_list .col_buttons { - width: 40px; - text-align: right; - padding-right: 3px; - white-space: nowrap; -} - -.col_duration { - padding-left: 3px; - padding-right: 3px; - width: 100px; - vertical-align: top; -} - -.col_name, -#content .col_title * { - padding-left: 3px; - padding-right: 3px; - min-width: 50px; - white-space: normal; -} -.col_info, -.col_record { - width: 16px; - text-align: center; -} -.col_active { - width: 90px; -} -.col_channel { - width: 120px; -} -.col_start, -.col_stop, -.col_date, -.col_time { - width: 76px; - text-align: right; -} -.col_edit, -.col_delete, -.col_stream, -.col_checkbox { - text-align: center; - width: 16px; - max-width: 16px; -} - -#heading { - height: 29px; - border: 1px solid #6d96a9; -} -#heading tr { - vertical-align: middle; - background-color: #dee6ee; -} -#heading td { - vertical-align: middle; - padding: 0px 10px; -} -#heading .col_other { - text-align: right; -} -#heading .col_other table { - display: inline; -} -#heading .col_help { - text-align: center; - width: 45px; -} - -#prog_timeline #content { - position: absolute; - top: 32px + 0.6em; - left: 3px; -} -#prog_timeline .prgtable { - border-color: #c4cdd7; -} -#prog_timeline .timertable { - background: red; - border-color: #ffcdd7; -} -#prog_timeline #timeline { - background: red; -} -#prog_timeline .color_current { - background-color: #e6ffe9; -} -#prog_timeline .color_broadcast { - background-color: #f7fffa; -} -#prog_timeline .color_timer { - background-color: #ffeee9; -} -#prog_timeline .col_spacer { - background-color: #e0e0e0; -} -#rec_list #path { - margin: 1em 10px 0px 10px; -} -#rec_edit .col_value { - white-space: normal; -} - -#timer_list .list { - margin-top: 0.6em; -} -#timer_list .blackline { - background-color: black; -} -#timer_list .color_ok { - background-color: #00a317; -} -#timer_list .color_conflict { - background-color: #a11917; -} -#timer_list .color_collision { - background-color: #ffde62; -} -#timer_list .color_inactive { - background-color: #858585; -} -#timer_list #prgtable { - border-left-color: #000000; - border-right-color: #000000; -} -#prog_timeline .row_even table td.color1, -#timer_list .row_even table td.color1 { - background-color: #ffffff; -} -#prog_timeline .row_even table td.color2, -#timer_list .row_even table td.color2 { - background-color: #dee6ee; -} -#prog_timeline table.timestable td.color1 { - background-color: #ffffff; -} -#prog_timeline table.timestable td.color2 { - background-color: #dee6ee; -} -#vdr_cmds pre { - margin: 0px; - padding: 0px; -} - -#content { - margin-top: 0.6em; -} -#buttons { - border: 1px solid #6d96a9; - padding: 3px; - margin-top: 1em; - margin-bottom: 1em; - background-color: #dee6ee; - text-align: right; -} - -#config .heading { - background-color: #dee6ee; - border: none; -} -#config .heading a { - color: black; - font-weight: normal; -} -#config .group { - margin-top: 0.5em; - width: 100%; -} -#config .col_label { - width: 50%; -} -.tabs td { - padding: 0; - margin: 0; - background-color: transparent; - border-bottom: 2px solid #6d96a9; -} -.tab_selected a { - color: white; - margin: 1px 3px; -} -.tab_unselected a { - color: black; - margin: 1px 3px; -} -.tab_selected { - border-right: 1px solid #6d96a9; - background-color: #6d96a9; - color: white; - font-weight: bold; -} -.tab_unselected { - border-right: 1px solid #6d96a9; - background-color: white; - color: black; -} -#about .col_label { - width: 20%; -} -#about .col_label h5 { - white-space: nowrap; -} - -select.channels { - min-width: 100px; -} - -/* Tooltips */ -.tt_border { - border: 2px solid white; -} -.tt_table { - width: 250px; - border: 2px solid #6d96a9; - background-color: #dee6ee; -} -.tt_table th { - background-color: #6d96a9; - font-weight: bold; - color: white; - padding-left: 2px; - padding-right: 2px; -} -.tt_table td { - color: black; - padding-left: 5px; - padding-right: 5px; -} - -/* Help */ -#help dt { - margin-top: 0.6em; - font-weight: bold; - font-style: italic; -} -#help dd dl dt { - margin-top: 0.3em; - font-weight: normal; - font-style: italic; -} -#help dl { - padding: 5px; -} -#help h3 { - font-weight: bold; - font-style: italic; - letter-spacing: 0.5em; - background-color: #6d96a9; - color: white; - padding: 2px 5px; -} -#help h4 { - text-decoration: underline; - font-style: normal; -} -#help strong { - font-weight: bold; -} -#help .ref_menu { - font-style: italic; -} -#help .ref_file { - text-decoration: underline; -} -#help .ref_label { - font-style: italic; -} -#help .links { - padding: 5px; - background-color: #dee6ee; - text-align: justify; -} -#help .links a { - white-space: nowrap; -} -#help a , -#help a:visited, -#help a:active { - color: blue; -} -#help .group { - margin-top: 0.6em; - border: 1px solid #6d96a9; - white-space: normal; -} -#help .group p { - padding: 5px; -} -#help .top_link { - text-align: right; - font-size: 0.8em; - background-color: #dee6ee; - padding: 1px 5px; - margin: 0px; -} - -/* Navigation */ -#navigation { - margin: 0px 3px; -} -#navigation .nav_bar { - border: 1px solid #6d96a9; - padding: 1em 0px; -} -#navigation .logo { - padding-top: 1em; - padding-bottom: 2em; - width: 150px; -} -#navigation .navi { - font-size: 12px; - padding-top: 6px; - padding-bottom: 6px; - text-align: center; -} -/*TODO Farbe */ -#navigation .navi:hover { - xbackground-color: #f0faff; - background-color: #dee6ee; -} -#navigation .search { - padding-top: 6px; - font-size: 12px; - text-align: center; -} -#navigation a, -#navigation a:visited, -#navigation a:active { - color: #6d96a9; - font-weight: bold; - text-decoration: none; - border: 0px; -} -#navigation input { - width: 140px; -} diff --git a/template/default/prog_detail.html b/template/default/prog_detail.html index 8e3d6c4..9b6879b 100644 --- a/template/default/prog_detail.html +++ b/template/default/prog_detail.html @@ -53,24 +53,30 @@ <div class="epg_subtitle"><tmpl_var subtitle></div> </tmpl_if> <div class="epg_summary"><tmpl_var text></div> - <tmpl_if has_video> + <tmpl_if video> <div class="epg_video"> <h4><%! Video tracks: !%></h4> - <tmpl_loop video> + <tmpl_var video> + <!-- + <tmpl_loop videox> <h5><%! Language: !%></h5> <tmpl_var lang> <h5><%! Format: !%></h5> <tmpl_var format><br /> </tmpl_loop> + --> </div> </tmpl_if> - <tmpl_if has_audio> + <tmpl_if audio> <div class="epg_audio"> <h4><%! Audio tracks: !%></h4> - <tmpl_loop audio> + <tmpl_var audio> + <!-- + <tmpl_loop audiox> <h5><%! Language: !%></h5> <tmpl_var lang> <tmpl_if descr> <h5><%! Description: !%></h5> <tmpl_var descr> </tmpl_if> <br /> </tmpl_loop> + --> </div> </tmpl_if> <tmpl_if epgimages> diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html index c040918..406fe0d 100644 --- a/template/default/prog_timeline.html +++ b/template/default/prog_timeline.html @@ -15,13 +15,8 @@ USE date;
show_hours = config.ZEITRAHMEN || 1; # Zeitrahmen der angezeigt werden soll in Stunden
times = config.TIMES.split(',\s*');
+ px_per_min = 3; # Make it configurable?
- # first_sec is the start time of the 24 hours interval in seconds since 1970
- # last_sec is the end time of the 24 hours interval in seconds since 1970
- first_sec = date.now + 1799 - show_hours * 3600
- first_sec = first_sec - first_sec % 1800;
- last_sec = first_sec + 86400;
-
# now_sec is the requested browser time in seconds since 1970
# start_sec is the start time of the table in seconds since 1970
# end_sec is the end time of the table in seconds since 1970
@@ -32,23 +27,9 @@ end_min = 60 * show_hours;
end_sec = start_sec + (end_min * 60);
- name_w = 100;
- min5_h = 10;
-
- # Calculate suitable width for events dependent on the time interval
- # 1 hour = 60min: 300px -> 5px/min
- # 2 hours=120min: 600px -> 5px/min
- # 3 hours=180min: 720px -> 4px/min
- # 4 hours=240min: 720px -> 3px/min
- # 5 hours=300min: 600px -> 2px/min
- # 6 hours=360min: 720px -> 2px/min
- event_w = show_hours * 300;
- IF event_w > 720; event_w = 720; END;
- px_per_min = (event_w / end_min) | format('%i');
- event_w = end_min * px_per_min;
-%?>
-<!-- TimeLine: start_sec="<?% date.format(start_sec, '%H:%M:%S') %?>" now="<?% date.format(date.now, '%H:%M:%S') %?>" end_sec="<?% date.format(end_sec, '%H:%M:%S') %?>" -->
+<!-- TimeLine: start_sec="<?% date.format(start_sec, '%H:%M') %?>" request="<?% date.format(date.now, '%H:%M') %?>" end_sec="<?% date.format(end_sec, '%H:%M') %?>" -->
<style type="text/css">
table.prgname {
border-width:1px;
@@ -83,8 +64,78 @@ #bigtable { position:absolute; top:0; left: 0; z-index: 1; }
</style>
- <script type="text/javascript" language="JavaScript">
- function Go(x) {
+ <script type="text/javascript" language="JavaScript1.2">
+ var show_tooltips = <?% config.TL_TOOLTIP ? "true" : "false" %?>;
+ </script>
+<?% IF config.TL_TOOLTIP %?>
+ <script type="text/javascript" language="JavaScript1.2" src="infobox.js"></script>
+<?% END %?>
+ <script type="text/javascript" language="JavaScript1.2" src="timeline.js"></script>
+ <script type="text/javascript" language="JavaScript1.2">
+ var trans = new Translation("<%! now !%>",
+ "<%! o'clock !%>",
+ "<%! to !%>",
+ "<%! Sunday !%>",
+ "<%! Monday !%>",
+ "<%! Tuesday !%>",
+ "<%! Wednesday !%>",
+ "<%! Thursday !%>",
+ "<%! Friday !%>",
+ "<%! Saturday !%>");
+
+ function GetWindowW()
+ {
+ if (window.innerWidth)
+ {
+ return window.innerWidth;
+ }
+ else if (document.body && document.body.offsetWidth)
+ {
+ return document.body.offsetWidth;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+
+ function GetWindowH()
+ {
+ if (window.innerHeight)
+ {
+ return window.innerHeight;
+ }
+ else if (document.body && document.body.offsetHeight)
+ {
+ return document.body.offsetHeight;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+
+ function Redraw()
+ {
+ if (redraw_w != GetWindowW() || redraw_h != GetWindowH())
+ {
+ Go('<?% nowurl %?>&time=<?% date.format(now_sec, '%H:%M') %?>');
+ }
+ }
+
+ function AddEvent(counter, vdr_id, epg_id, start_sec, stop_sec, title, timer, summary)
+ {
+ var e = new EPGEvent(epg_id, start_sec, stop_sec, title, timer, summary);
+<?% IF config.TL_TOOLTIP %?>
+ maketip("VDR-" + vdr_id + "-" + counter, title,
+ "<%! Duration: !%> " + e.start_str + " - " + e.stop_str
+ + " (" + Div(stop_sec - start_sec, 60) + " <%! min !%>)");
+<?% END %?>
+ return e;
+ }
+
+ function Go(x)
+ {
if(x =="nothing") {
document.forms[0].reset();
document.forms[0].elements[0].blur();
@@ -95,28 +146,39 @@ }
}
</script>
-<?% IF config.TL_TOOLTIP %?>
- <script type="text/javascript" language="JavaScript1.2" src="infobox.js"></script>
-<?% END %?>
</head>
<body id="prog_timeline">
<?% IF config.TL_TOOLTIP %?>
<div id="infodiv" style="position:absolute; visibility:hidden; z-index:20; top:0px; left:0px;"></div>
- <script language="JavaScript" type="text/javascript">
- <?%
+<?% END %?>
+ <script type="text/javascript" language="JavaScript">
+ window.onresize = Redraw;
+ redraw_w = GetWindowW();
+ redraw_h = GetWindowH();
+
+ var channels = new Array();
+ var events;
+<?%
+ index = 0;
FOREACH name = shows2.keys.nsort;
counter = 0;
+%?>
+ events = new Array();
+<?%
FOREACH show = shows2.${name};
- %?>
- maketip("VDR-<?% show.vdr_id %?>-<?% counter %?>", "<?% show.title %?>", "<%! Duration: !%> <?% date.format(show.start, '%H:%M') %?> - <?% date.format(show.stop, '%H:%M') %?> (<?% (show.stop - show.start) / 60 %?> <%! min !%>)" );
- <?%
+%?>
+ events[<?% counter %?>] = AddEvent(<?% counter %?>, <?% show.vdr_id %?>, <?% show.anchor %?>, <?% show.start %?>, <?% show.stop %?>, "<?% show.title %?>", <?% show.timer %?>, <?% show.summary ? 1 : 0 %?>);
+<?%
counter = counter + 1;
END;
+%?>
+ channels[<?% index %?>] = new ChannelInfo(<?% show.vdr_id %?>, "<?% shows.${name}.first.progname %?>", "<?% shows.${name}.first.proglink %?>", events);
+<?%
+ index = index + 1;
END;
- %?>
+%?>
</script>
-<?% END %?>
<form action="<?% nowurl %?>" method="get" name="FormName">
<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
@@ -143,185 +205,10 @@ </tr>
</table>
-
- <div id="content">
-<!-- TimeLine Table TOP -->
- <table width="<?% event_w + name_w %?>" border="0" cellspacing="0" cellpadding="0" class="bigtable list">
- <tr class="heading">
- <td colspan="3">
- <h2><?% date.format(start_sec, '%A, %H:%M') %?> <%! o'clock !%> <%! to !%> <?% date.format(end_sec, '%H:%M') %?> <%! o'clock !%></h2>
- <br/>
- </td>
- <td class="col_navi">
-<?% IF start_sec < first_sec + 1800 %?>
- <img src="bilder/pfeile_nachlinks_soft.png" border="0" />
-<?%
- ELSE;
- diff_sec = start_sec - end_min * 60;
- IF (diff_sec < first_sec);
- diff_sec = first_sec;
- END;
-%?>
- <a href="<?% nowurl %?>&time=<?% date.format(diff_sec, '%H:%M') %?>">
- <img src="bilder/pfeile_nachlinks.png" border="0" />
- </a>
-<?% END %?>
-<?% IF end_sec > last_sec - 1800 %?>
- <img src="bilder/pfeile_nachrechts_soft.png" border="0" />
-<?%
- ELSE;
- diff_sec = end_sec;
- IF (diff_sec > last_sec - end_min * 60 - 1800);
- diff_sec = last_sec - end_min * 60;
- END;
-%?>
- <a href="<?% nowurl %?>&time=<?% date.format(diff_sec, '%H:%M') %?>">
- <img src="bilder/pfeile_nachrechts.png" border="0" />
- </a>
-<?% END %?>
- </td>
- </tr>
- <tr id="row_timeline" class="row_even">
- <td colspan="4">
- <table border="0" cellpadding="0" cellspacing="0" width="<?% name_w + event_w %?>" class="timestable">
- <tr>
- <td><img src="bilder/spacer.gif" width="<?% name_w %?>" height="1" border="0" /></td>
-<?% minute = 0 %?>
-<?% WHILE minute < end_min %?>
- <td colspan="6" class="<?% minute % 60 ? 'color1' : 'color2' %?>">
- <img src="bilder/spacer.gif" width="<?% px_per_min * 30 %?>" height="1" border="0" /><br />
- <?% zeit = start_sec + (minute * 60) %?>
- <span class="date_time"><?% date.format(zeit, '%H:%M') %?></span>
- </td>
- <?% minute = minute + 30 %?>
-<?% END %?>
- </tr>
- <tr>
- <td><img src="bilder/spacer.gif" width="<?% name_w %?>" height="1" border="0" /></td>
-<?% minute = 0 %?>
-<?% WHILE minute < end_min %?>
- <td width="<?% px_per_min * 5 %?>" height="<?% min5_h %?>" class="<?% minute % 10 ? 'color1' : 'color2' %?>">
- <img src="bilder/spacer.gif" width="<?% px_per_min * 5 %?>" height="1" border="0" /><br />
- </td>
- <?% minute = minute + 5 %?>
-<?% END %?>
- </tr>
- </table>
-
- <table border="0" cellpadding="0" cellspacing="0" width="<?% name_w + event_w %?>" class="prgname">
-<?% b = 0;
- FOREACH name = shows.keys.nsort;
- b = b + 1 %?>
- <tr>
-<!-- Channel: "<?% shows.${name}.first.progname %?>" -->
- <td width="<?% name_w %?>" class="prgname <?% b % 2 ? 'color2' : 'color1' %?>">
- <img src="bilder/spacer.gif" width="<?% name_w %?>" height="1" border="0" /><br />
- <nobr><a href="<?% shows.${name}.first.proglink %?>" class="channel_name"><?% shows.${name}.first.progname %?></a></nobr>
- </td>
-<!-- Events -->
- <td class="<?% b % 2 ? 'color2' : 'color1' %?>">
- <nobr>
-<?%
- counter = 0;
- old_stop_minute = 0;
- FOREACH show = shows.${name};
- start_minute = (show.start - start_sec) / 60 | format('%i');
- stop_minute = (show.stop - start_sec) / 60 | format('%i');
- IF (start_minute >= end_min); BREAK; END;
-%?>
- <!-- <?% show.vdr_id %?>-<?% counter %?>: <?% date.format(show.start, '%H:%M:%S') %?>..<?% date.format(show.stop, '%H:%M:%S') %?> "<?% show.title %?>" -->
- <!-- ---- old_stop =<?% old_stop_minute %?> end_min =<?% end_min %?> -->
- <!-- ---- start =<?% start_minute %?> stop =<?% stop_minute %?> -->
-<?%
- IF start_minute < 0; start_minute = 0; END;
- IF stop_minute > end_min; stop_minute = end_min; END;
-
- px_w = (stop_minute - start_minute) * px_per_min;
-
- IF show.timer;
- td_class = "color_timer";
- ELSE;
- td_class = date.now >= show.start && date.now < show.stop ? "color_current" : "color_broadcast";
- END;
-%?> <!-- ---- start =<?% start_minute %?> stop =<?% stop_minute %?> -->
-<?%
- IF (start_minute >= old_stop_minute);
- IF (start_minute > old_stop_minute + 1);
- diff = (start_minute - old_stop_minute) * px_per_min;
-%?> <!-- ---- Time gap detected: fill in space -->
- <table border="0" align="left" cellpadding="0" cellspacing="0" width="<?% diff %?>" class="prgtable">
- <tr>
- <td width="1" class="color_spacer">
- <img src="bilder/spacer.gif" width="1" height="1" border="0" /><br/>
- <nobr>
- <img src="bilder/spacer.gif" width="1" height="8" border="0" />
- </nobr>
- </td>
- </tr>
- </table>
-<?% END
-%?> <!-- ---- Show event title: "<?% show.title %?>" -->
- <table border="0" align="left" cellpadding="0" cellspacing="0" width="<?% px_w %?>" class="<?% show.timer ? "timertable" : "prgtable" %?>">
- <tr>
- <td width="1" class="<?% td_class %?>" <?% IF config.TL_TOOLTIP %?>onMouseOver="tip('VDR-<?% show.vdr_id %?>-<?% counter %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?>>
- <img src="bilder/spacer.gif" width="1" height="1" border="0" /><br />
- <nobr>
- <?% IF show.summary %?>
- <a href="javascript:popup('./vdradmin.pl?aktion=prog_detail&epg_id=<?% show.anchor %?>&vdr_id=<?% show.vdr_id %?>');">
- <?% show.title %?>
- </a>
- <?% ELSE %?>
- <?% show.title %?>
- <?% END %?>
- </nobr>
- </td>
- </tr>
- </table>
-<?%
- old_stop_minute = stop_minute;
- ELSE
-%?> <!-- ---- Overlapped by previous event: ignored -->
-<?%
- END;
- counter = counter + 1;
- END %?>
- </nobr>
- </td>
- </tr>
-<?% END %?>
- </table>
- </td>
-
- </tr>
- </table>
-<!-- TimeLine Table BOTTOM -->
-
-<?% IF (date.now >= start_sec) && (date.now < end_sec) %?>
- <?% diff = ((date.now - start_sec) / 60) | format('%i') %?>
- <script type="text/javascript" language="JavaScript">
- var tab = document.getElementById("row_timeline");
- if (tab)
- {
- var y = tab.offsetTop;
- var h = tab.offsetHeight;
- var style = "position:absolute; "
- + "top:" + y + "px; "
- + "left:<?% name_w + (px_per_min * diff) + 1 %?>px; "
- + "width:1px; "
- + "height:" + h + "px; "
- + "z-index:2; ";
- if (document.all)
- {
- style = style + "filter:Alpha(opacity=50); ";
- }
-
- document.write('<span id="timeline" style="' + style + '">');
- document.write(' <img src="bilder/spacer.gif" width="1" height="1" border="0" />');
- document.write('</span>');
- }
- </script>
-<?% END %?>
- </div>
+ <script type="text/javascript" language="JavaScript1.2">
+ var tl = new TimeLine(<?% now_sec %?>, "<?% nowurl %?>", <?% px_per_min %?>, <?% end_min %?>);
+ BuildContent();
+ </script>
</form>
</body>
</html>
diff --git a/template/default/style.css b/template/default/style.css index 7da68a3..4dc51e9 120000..100644 --- a/template/default/style.css +++ b/template/default/style.css @@ -1 +1,731 @@ -default/style.css
\ No newline at end of file +* { + font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; +} + +#rc, +#tv { + margin: 0px; +} + +body { + background-color: #ffffff; + margin: 3px; + padding: 0; +} + +form { + margin: 0px; + padding: 0; +} + +td, +div { + color: black; + font-weight: normal; + font-size: 11px; +} + +input { + color: black; + font-weight: normal; + font-size: 11px; +} + +textarea { + color: black; + font-weight: normal; + font-size: 11px; +} + +select { + color: black; + font-weight: normal; + font-size: 11px; +} +img { + border: 0; +} +/* +.submit { + height: 20px; +}*/ + +h1 { + margin-right: 5px; + margin-left: 5px; + font-size: 13px; + font-weight: bold; + color: black; + display: inline; +} +h2 { + margin: 0px; + font-size: 11px; + font-weight: bold; + color: black; + display: inline; +} +h3, +.epg_title { + margin: 0px; + font-size: 11px; + font-weight: bold; + color: black; +} +#prog_list .epg_title a { + margin: 0; + padding: 0; +} +.col_label h5 { + margin: 1px 5px; + font-size: 11px; + font-weight: normal; + color: black; + text-align: right; +} +h6 { + margin: 1px 5px; + font-size: 10px; + font-weight: normal; + color: black; + text-align: right; +} + +label { + cursor: default; +} + +a, +a:visited, +a:active, +a:hover { + color: black; + text-decoration: none; +} + +label + input { + margin-left: 1em; +} + +#tv input, +#tv select, +#tv h5 { + font-weight: normal; + font-size: 9px; + display: inline; +} +#rec_list .col_name { + font-weight: bold; +} + +#error h2 { + font-size: 11px; + color: red; +} + +body.help .heading { + display: table-row; +} + +.row_odd +.row_even, +.heading { + height: 17px; +} +.heading td { + background-color: #6d96a9; + height: 17px; +} +.heading h2, +.heading .channel_name, +.heading a { + padding-left: 3px; + padding-right: 3px; + font-weight: bold; + color: white; + margin-top: 0px; + white-space: normal; +} + +.row_even td { + background-color: #ffffff; +} +.row_odd td { + background-color: #dee6ee; +} + +.col_label, +.col_value, +.col_active, +.col_channel, +.col_start, +.col_stop, +.col_date, +.col_time { + padding-left: 3px; + padding-right: 3px; + white-space: nowrap; +} + +.row_odd, +.row_even { + height: 25px; +} + +.col_channels { + text-align: right; + padding: 10px; + width: 40%; +} + +.col_wanted_channels { + text-align: left; + padding: 10px; + width: 40%; +} + +.col_navi img, +.col_navi a { + padding: 0; + margin: 0; +} +.col_navi { + text-align: right; + vertical-align: middle; + white-space: nowrap; + height: 17px; +} + +.list, +.group { + border: 1px solid #6d96a9; +} +.group td { + padding: 2px; +} + +#prog_summary .action, +#prog_detail .action { + display: block; + margin: 5px 0 0 0; +} +.action a, +.action img, +.heading img, +.heading .action { + margin: 0; + padding: 0; +} +.action { + margin: 0; + padding: 0; + text-align: center; + width: 20px; +} + +/* Summary */ +#prog_summary .group { + margin: 0 3px 3px 0; + display: inline; + float: left; +} +#prog_summary .heading td.col_content { + height: 17px; + width: 246px; + color: white; + background-color: #6d96a9; + white-space: nowrap; + overflow: hidden; +} +#prog_summary .row_even td.col_content { + width: 246px; + height: 200px; + background-color: #dee6ee; + vertical-align: top; +} +#prog_summary table.content td.col_buttons { + height: 200px; +} +#prog_summary .col_epg { + vertical-align: top; +} +#prog_summary .date_long { + text-align: right; + margin-top: 3px; + float: left; +} +#prog_summary .time_duration { + text-align: right; + margin-top: 3px; +} +#prog_summary .epg_title { + margin-top: 1em; + width: 216px; + overflow: hidden; + white-space: nowrap; +} +#prog_summary .epg_subtitle { + width: 216px; + overflow: hidden; + white-space: nowrap; +} +#prog_summary .epg_summary { + margin-top: 1em; + margin-bottom: 3px; + width: 210px; + height: 120px; + overflow: auto; + white-space: normal; +} +#prog_summary .heading a { + font-weight: bold; + color: white; + padding: 2px 2px; +} + +#prog_summary2 .newday { + height: 17px; + background-color: #6d96a9; +} +#prog_summary2 .newday td { + padding-left: 3px; + font-weight: bold; + color: white; +} +#prog_summary2 .epg_title, +#prog_summary2 .channel_name { + display: block; +} +#prog_summary2 .epg_subtitle { + font-size: 11px; + font-weight: normal; + color: black; + display: block; +} +#prog_summary2 .col_buttons { + width: 120px; + text-align: right; + padding-right: 3px; + white-space: nowrap; +} +#prog_summary2 table.percent { + height: 8px; + width: 80px; + border: 1px solid #6d96a9; +} +#prog_summary2 table.percent .elapsed { + background-color: #6d96a9; +} +#prog_summary2 table.percent .remaining { + background-color: none; +} + +#prog_detail .heading .col_content * { + color: white; + font-weight: bold; +} +#prog_detail .channel_name { + white-space: nowrap; +} +#prog_detail .date_long { + margin-left: 2em; + white-space: nowrap; +} +#prog_detail .time_vps, +#prog_detail .time_duration { + margin-left: 2em; + white-space: nowrap; +} +#prog_detail .epg_title { + display: block; +} +#prog_detail .epg_subtitle { + font-size: 11px; + font-weight: normal; + color: black; + display: block; +} +#prog_detail .epg_summary { + margin: 2em 0; + display: block; +} +#prog_detail .epg_video h4, +#prog_detail .epg_audio h4 { + margin: 0; + font-size: 10px; + font-weight: bold; + display: inline; +} +#prog_detail .epg_video h5, +#prog_detail .epg_audio h5 { + margin-left: 1em; + display: inline; + font-size: 10px; + font-weight: normal; + font-style: italic; +} +#prog_detail .col_epg { + padding: 1em; +} +#prog_summary .row_even td.col_content, +#prog_detail .row_even td.col_content { + padding: 0; +} +#prog_summary table.content td.col_buttons, +#prog_detail table.content td.col_buttons { + padding-top: 1em; + vertical-align: top; + width: 20px; + text-align: center; + background-color: #dee6ee; + border-right: 1px solid #6d96a9; +} + +.heading, +#prog_list .heading td span, +#prog_list .heading td { + vertical-align: middle; +} +#prog_list .date_long { + color: white; + font-weight: bold; + padding: 0 2em; +} +#prog_list .col_buttons { + width: 120px; + text-align: right; + padding-right: 3px; + white-space: nowrap; +} + +.col_duration { + padding-left: 3px; + padding-right: 3px; + width: 100px; + vertical-align: top; +} + +.col_name, +#content .col_title * { + padding-left: 3px; + padding-right: 3px; + min-width: 50px; + white-space: normal; +} +.col_info, +.col_record { + width: 16px; + text-align: center; +} +.col_active { + width: 90px; +} +.col_channel { + width: 120px; +} +.col_start, +.col_stop, +.col_date, +.col_time { + width: 76px; + text-align: right; +} +.col_edit, +.col_delete, +.col_stream, +.col_checkbox { + text-align: center; + width: 16px; + max-width: 16px; +} + +#heading { + height: 29px; + border: 1px solid #6d96a9; +} +#heading tr { + vertical-align: middle; + background-color: #dee6ee; +} +#heading td { + vertical-align: middle; + padding: 0px 10px; +} +#heading .col_other { + text-align: right; +} +#heading .col_other table { + display: inline; +} +#heading .col_help { + text-align: center; + width: 45px; +} + +#prog_timeline #content { + position: absolute; + top: 32px; + left: 3px; +} +#prog_timeline .prgtable { + border-color: #c4cdd7; +} +#prog_timeline .timertable { + background: red; + border-color: #ffcdd7; +} +#prog_timeline #timeline { + background: red; +} +#prog_timeline .color_current { + background-color: #e6ffe9; +} +#prog_timeline .color_broadcast { + background-color: #f7fffa; +} +#prog_timeline .color_timer { + background-color: #ffeee9; +} +#prog_timeline .color_spacer { + background-color: #e0e0e0; +} +#rec_list #path { + margin: 1em 10px 0px 10px; +} +#rec_edit .col_value { + white-space: normal; +} + +#timer_list .list { + margin-top: 0.6em; +} +#timer_list .blackline { + background-color: black; +} +#timer_list .color_ok { + background-color: #00a317; +} +#timer_list .color_conflict { + background-color: #a11917; +} +#timer_list .color_collision { + background-color: #ffde62; +} +#timer_list .color_inactive { + background-color: #858585; +} +#timer_list #prgtable { + border-left-color: #000000; + border-right-color: #000000; +} +#prog_timeline .row_even table td.color1, +#timer_list .row_even table td.color1 { + background-color: #ffffff; +} +#prog_timeline .row_even table td.color2, +#timer_list .row_even table td.color2 { + background-color: #dee6ee; +} +#prog_timeline table.timestable td.color1 { + background-color: #ffffff; +} +#prog_timeline table.timestable td.color2 { + background-color: #dee6ee; +} +#vdr_cmds pre { + margin: 0px; + padding: 0px; +} + +#content { + margin-top: 0.6em; +} +#buttons { + border: 1px solid #6d96a9; + padding: 3px; + margin-top: 1em; + margin-bottom: 1em; + background-color: #dee6ee; + text-align: right; +} + +#config .heading { + background-color: #dee6ee; + border: none; +} +#config .heading a { + color: black; + font-weight: normal; +} +#config .group { + margin-top: 0.5em; + width: 100%; +} +#config .col_label { + width: 50%; +} +.tabs td { + padding: 0; + margin: 0; + background-color: transparent; + border-bottom: 2px solid #6d96a9; +} +.tab_selected a { + color: white; + margin: 1px 3px; +} +.tab_unselected a { + color: black; + margin: 1px 3px; +} +.tab_selected { + border-right: 1px solid #6d96a9; + background-color: #6d96a9; + color: white; + font-weight: bold; +} +.tab_unselected { + border-right: 1px solid #6d96a9; + background-color: white; + color: black; +} +#about .col_label { + width: 20%; +} +#about .col_label h5 { + white-space: nowrap; +} + +select.channels { + min-width: 100px; +} + +/* Tooltips */ +.tt_border { + border: 2px solid white; +} +.tt_table { + width: 250px; + border: 2px solid #6d96a9; + background-color: #dee6ee; +} +.tt_table th { + background-color: #6d96a9; + font-weight: bold; + color: white; + padding-left: 2px; + padding-right: 2px; +} +.tt_table td { + color: black; + padding-left: 5px; + padding-right: 5px; +} + +/* Help */ +#help dt { + margin-top: 0.6em; + font-weight: bold; + font-style: italic; +} +#help dd dl dt { + margin-top: 0.3em; + font-weight: normal; + font-style: italic; +} +#help dl { + padding: 5px; +} +#help h3 { + font-weight: bold; + font-style: italic; + letter-spacing: 0.5em; + background-color: #6d96a9; + color: white; + padding: 2px 5px; +} +#help h4 { + text-decoration: underline; + font-style: normal; +} +#help strong { + font-weight: bold; +} +#help .ref_menu { + font-style: italic; +} +#help .ref_file { + text-decoration: underline; +} +#help .ref_label { + font-style: italic; +} +#help .links { + padding: 5px; + background-color: #dee6ee; + text-align: justify; +} +#help .links a { + white-space: nowrap; +} +#help a , +#help a:visited, +#help a:active { + color: blue; +} +#help .group { + margin-top: 0.6em; + border: 1px solid #6d96a9; + white-space: normal; +} +#help .group p { + padding: 5px; +} +#help .top_link { + text-align: right; + font-size: 0.8em; + background-color: #dee6ee; + padding: 1px 5px; + margin: 0px; +} + +/* Navigation */ +#navigation { + margin: 0px 3px; +} +#navigation .nav_bar { + border: 1px solid #6d96a9; + padding: 1em 0px; +} +#navigation .logo { + padding-top: 1em; + padding-bottom: 2em; + width: 150px; +} +#navigation .navi { + font-size: 12px; + padding-top: 6px; + padding-bottom: 6px; + text-align: center; +} +/*TODO Farbe */ +#navigation .navi:hover { + xbackground-color: #f0faff; + background-color: #dee6ee; +} +#navigation .search { + padding-top: 6px; + font-size: 12px; + text-align: center; +} +#navigation a, +#navigation a:visited, +#navigation a:active { + color: #6d96a9; + font-weight: bold; + text-decoration: none; + border: 0px; +} +#navigation input { + width: 140px; +} diff --git a/template/default/timeline.js b/template/default/timeline.js new file mode 100644 index 0000000..4cd9e29 --- /dev/null +++ b/template/default/timeline.js @@ -0,0 +1,359 @@ +/*##########################################################################*/
+/* Utility functions */
+/*##########################################################################*/
+function W(s)
+{
+ document.write(s);
+}
+
+function Div(x, y)
+{
+ return (x - x % y) / y;
+}
+
+function Translation(_now, _o_clock, _to,
+ _sunday, _monday, _tuesday, _wednesday,
+ _thursday, _friday, _saturday)
+{
+ this.now = _now;
+ this.o_clock = _o_clock;
+ this.to = _to;
+ this.week_day = new Array(_sunday, _monday, _tuesday, _wednesday,
+ _thursday, _friday, _saturday);
+}
+
+function ChannelInfo(vdr_id, name, url, events)
+{
+ this.vdr_id = vdr_id;
+ this.name = name;
+ this.url = url;
+ this.events = events;
+}
+
+function EPGEvent(epg_id, start_sec, stop_sec, title, timer, summary)
+{
+ this.epg_id = epg_id;
+ this.start_sec = start_sec;
+ this.stop_sec = stop_sec;
+ this.start_str = format_date('%H:%M', start_sec);
+ this.stop_str = format_date('%H:%M', stop_sec);
+ this.title = title;
+ this.timer = timer;
+ this.summary = summary;
+}
+
+function format_date(fmt, time)
+{
+ var date = new Date(time * 1000);
+ switch (fmt)
+ {
+ case "%H:%M":
+ {
+ var h = '0' + date.getHours();
+ var m = '0' + date.getMinutes();
+ return h.substr(h.length-2, 2) + ':' + m.substr(m.length-2, 2);
+ }
+ case "%A, %H:%M":
+ {
+ var d = trans.week_day[date.getDay()];
+ var h = '0' + date.getHours();
+ var m = '0' + date.getMinutes();
+ return d + ", " + h.substr(h.length-2, 2) + ':' + m.substr(m.length-2, 2);
+ }
+ }
+ return "[WRONG_FMT:" + fmt + "]";
+}
+
+function TimeLine(_req_sec, _now_url, _px_per_min, _end_min)
+{
+ this.now_url = _now_url;
+
+ this.name_w = 100;
+ var tab = document.getElementById("heading");
+ if (tab)
+ {
+ this.table_w = tab.clientWidth;
+ }
+ else
+ {
+ this.table_w = this.innerWidth - 8;
+ }
+ this.px_per_min = _px_per_min;
+
+ this.end_min = Div(this.table_w - this.name_w, this.px_per_min);
+ if (this.end_min > _end_min)
+ {
+ this.end_min = _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;
+ this.min5_h = 10;
+
+ var d = new Date();
+ this.now_sec = Div(d.getTime(), 1000);
+
+ this.req_sec = _req_sec;
+ this.start_sec = _req_sec - _req_sec % 1800;
+ this.end_sec = this.start_sec + this.end_min * 60;
+
+ this.first_sec = this.now_sec + 1799 - this.end_min * 60;
+ this.first_sec -= this.first_sec % 1800;
+ this.last_sec = this.first_sec + 86400;
+}
+
+
+/*##########################################################################*/
+/* Build the HTML code */
+/*##########################################################################*/
+function BuildContent()
+{
+ W('<div id="content">');
+
+ W('<table width="' + tl.table_w + '" border="0" cellspacing="0" cellpadding="0" class="bigtable list">');
+ BuildHeader();
+ BuildTable();
+ W('</table>');
+
+ DrawTimeLine();
+ W('</div>');
+}
+
+function BuildHeader()
+{
+ W('<tr class="heading">');
+ W('<td id="header_title" colspan="3">');
+ W('<h2>');
+ W(format_date('%A, %H:%M', tl.start_sec) + ' ' + trans.o_clock
+ + ' ' + trans.to + ' '
+ + format_date('%H:%M', tl.end_sec) + ' ' + trans.o_clock);
+ W('</h2>');
+ W('<br/>');
+ W('</td>');
+ W('<td id="header_navi" class="col_navi">');
+ if (tl.start_sec < tl.first_sec + 1800)
+ {
+ W('<img src="bilder/pfeile_nachlinks_soft.png" border="0" />');
+ }
+ else
+ {
+ var diff_sec = tl.start_sec - tl.end_min * 60;
+ if (diff_sec < tl.first_sec)
+ {
+ diff_sec = tl.first_sec;
+ }
+ W('<a href="' + tl.now_url + '&time=' + format_date('%H:%M', diff_sec) + '">');
+ W('<img src="bilder/pfeile_nachlinks.png" border="0" />');
+ W('</a>');
+ }
+ if (tl.end_sec > tl.last_sec - 1800)
+ {
+ W('<img src="bilder/pfeile_nachrechts_soft.png" border="0" />');
+ }
+ else
+ {
+ var diff_sec = tl.end_sec;
+ if (diff_sec > tl.last_sec - tl.end_min * 60 - 1800)
+ {
+ diff_sec = tl.last_sec - tl.end_min * 60;
+ }
+ W('<a href="' + tl.now_url + '&time=' + format_date('%H:%M', diff_sec) + '">');
+ W('<img src="bilder/pfeile_nachrechts.png" border="0" />');
+ W('</a>');
+ }
+ W('</td>');
+ W('</tr>');
+}
+
+function BuildTable()
+{
+ W('<tr id="row_timeline" class="row_even">');
+ W('<td colspan="4">');
+ BuildTimeScale();
+ BuildProgTable();
+ W('</td>');
+ W('</tr>');
+}
+
+function BuildTimeScale()
+{
+ W('<table width="' + tl.table_w + '" border="0" cellspacing="0" cellpadding="0" class="timestable">');
+ W('<tr>');
+ W('<td><img src="bilder/spacer.gif" width="' + tl.name_w + '" height="1" border="0" /></td>');
+ for (var min = 0; min < tl.end_min; min += 30)
+ {
+ var c = min % 60 ? 'color1' : 'color2';
+ var w = tl.px_per_min * (tl.end_min - min < 30) ? tl.end_min - min : 30;
+ var t = tl.start_sec + min * 60;
+ W('<td colspan="6" class="' + c + '">');
+ W('<img src="bilder/spacer.gif" width="' + w + '" height="1" border="0" /><br/>');
+ W('<span class="date_time">' + format_date('%H:%M', t) + '</span>');
+ W('</td>');
+ }
+ W('</tr>');
+ W('<tr>');
+ W('<td><img src="bilder/spacer.gif" width="' + tl.name_w + '" height="1" border="0" /></td>');
+ for (var min = 0; min < tl.end_min; min += 5)
+ {
+ var c = min % 10 ? 'color1' : 'color2';
+ var w = tl.px_per_min * 5;
+ W('<td width="' + tl.px_per_min + '" height="' + tl.min5_h + '" class="' + c + '">');
+ W('<img src="bilder/spacer.gif" width="' + w + '" height="1" border="0" /><br/>');
+ W('</td>');
+ }
+ W('</tr>');
+ W('</table>');
+}
+
+function BuildProgTable()
+{
+ W('<table border="0" cellpadding="0" cellspacing="0" width="' + tl.table_w + '" class="prgname">');
+ for (var i = 0; i < channels.length; i++)
+ {
+ var c = "prgname " + (i % 2 ? "color1" : "color2");
+ BuildChannel(channels[i], c);
+ }
+ W('</table>');
+}
+
+function BuildChannel(channel, td_class)
+{
+ W('<tr>');
+ /* Channel name */
+ W('<td width="' + tl.name_w + '" class="' + td_class + '">');
+ W('<img src="bilder/spacer.gif" width="' + tl.name_w + '" height="1" border="0"/><br/>');
+ W('<nobr>');
+ W('<a href="' + channel.url + '" class="channel_name">');
+ W(channel.name);
+ W('</a>');
+ W('</nobr>');
+ W('</td>');
+
+ /* Events */
+ W('<td class="' + td_class + '">');
+ W('<nobr>');
+ var old_stop_min = 0;
+ for (var i = 0; i < channel.events.length; i++)
+ {
+ var event = channel.events[i];
+
+ /* Calculate event start and stop time in minutes from table begin. */
+ var start_min = Div(event.start_sec - tl.start_sec, 60);
+ var stop_min = Div(event.stop_sec - tl.start_sec, 60);
+ if (start_min >= tl.end_min) break;
+
+ /* Adjust times to regard end of last event and end of table. */
+ td_class = "";
+ if (start_min < old_stop_min)
+ {
+ start_min = old_stop_min;
+ if (start_min > 0)
+ {
+ td_class = "color_spacer"; /* overlapped event */
+ }
+ }
+ if (stop_min > tl.end_min) stop_min = tl.end_min;
+
+ /* Ignore completely overlapped events. */
+ if (start_min >= stop_min) continue;
+
+ if (!td_class)
+ {
+ if (event.timer)
+ {
+ td_class = "color_timer";
+ }
+ else if ((event.start_sec <= tl.now_sec) && (tl.now_sec < event.stop_sec))
+ {
+ td_class = "color_current";
+ }
+ else
+ {
+ td_class = "color_broadcast";
+ }
+ }
+
+ if (start_min > old_stop_min + 1)
+ {
+ BuildSpacer((start_min - old_stop_min) * tl.px_per_min);
+ }
+
+ var px_w = (stop_min - start_min) * tl.px_per_min;
+ BuildEvent(channel.vdr_id, i, event, td_class, px_w);
+ old_stop_min = stop_min;
+ }
+ W('</nobr>');
+ W('</td>');
+ W('</tr>');
+}
+
+function BuildSpacer(width)
+{
+ W('<table border="0" align="left" cellpadding="0" cellspacing="0" width="' + width + '" class="prgtable">');
+ W('<tr>');
+ W('<td width="1" class="color_spacer">');
+ W('<img src="bilder/spacer.gif" width="1" height="1" border="0"/><br/>');
+ W('<nobr>');
+ W('<img src="bilder/spacer.gif" width="1" height="8" border="0"/>');
+ W('</nobr>');
+ W('</td>');
+ W('</tr>');
+ W('</table>');
+}
+
+function BuildEvent(vdr_id, counter, event, td_class, px_w)
+{
+ var table_class = event.timer ? "timertable" : "prgtable";
+ W('<table border="0" align="left" cellpadding="0" cellspacing="0" width="' + px_w + '" class="' + table_class + '">');
+ W('<tr>');
+ W('<td width="1" class="' + td_class + '" ');
+ if (show_tooltips)
+ {
+ W('onMouseOver="tip(' + "'VDR-" + vdr_id + "-" + counter + "'); " + 'return true;" ');
+ W('onMouseOut="untip(); return true;" ');
+ }
+ W('>');
+ W('<img src="bilder/spacer.gif" width="1" height="1" border="0" /><br />');
+ W('<nobr>');
+ var anchor_start = "";
+ var anchor_end = "";
+ if (event.summary)
+ {
+ anchor_start = '<a href="javascript:popup('
+ + "'./vdradmin.pl?aktion=prog_detail&epg_id="
+ + event.epg_id + "&vdr_id=" + vdr_id + "');" + '">';
+ anchor_end = '</a>';
+ }
+ W(anchor_start);
+ W(event.title);
+ W(anchor_end);
+ W('</nobr>');
+ W('</td>');
+ W('</tr>');
+ W('</table>');
+}
+
+function DrawTimeLine()
+{
+ var tab = document.getElementById("row_timeline");
+ if (tab && (tl.start_sec <= tl.now_sec) && (tl.now_sec < tl.end_sec))
+ {
+ var x = tl.name_w + tl.px_per_min * Div(tl.now_sec - tl.start_sec, 60) + 1;
+ var y = tab.offsetTop;
+ var h = tab.offsetHeight;
+ var style = "position:absolute; "
+ + "top:" + y + "px; "
+ + "left:" + x + "px; "
+ + "width:1px; "
+ + "height:" + h + "px; "
+ + "z-index:2; ";
+ if (document.all)
+ {
+ style = style + "filter:Alpha(opacity=50); ";
+ }
+
+ W('<span id="timeline" style="' + style + '">');
+ W(' <img src="bilder/spacer.gif" width="1" height="1" border="0" />');
+ W('</span>');
+ }
+}
diff --git a/vdradmind.pl b/vdradmind.pl index 557ac46..de6531b 100755 --- a/vdradmind.pl +++ b/vdradmind.pl @@ -28,7 +28,7 @@ require 5.004; -my $VERSION = "3.4.6beta3"; +my $VERSION = "3.4.6beta4"; my $BASENAME; my $EXENAME; @@ -803,7 +803,7 @@ sub EPG_buildTree { while ($_ = $SVDRP->readoneline) { if (/^E/) { my ($garbish, $event_id, $time, $duration) = split(/[ \t]+/); #TODO: table-id, version - my ($title, $subtitle, $summary, $vps, @video, @audio, $has_video, $has_audio); + my ($title, $subtitle, $summary, $vps, $video, $audio); while ($_ = $SVDRP->readoneline) { # if(/^T (.*)/) { $title = $1; $title =~ s/\|/<br \/>/sig } # if(/^S (.*)/) { $subtitle = $1; $subtitle =~ s/\|/<br \/>/sig } @@ -813,35 +813,18 @@ sub EPG_buildTree { if (/^D (.*)/) { $summary = $1; } if(/^X 1 [^ ]* (.*)/) { my ($lang, $format) = split(" ", $1, 2); - $has_video = 1; - push(@video, - { lang => $lang, - format => $format - } - ); + $video .= ", " if($video); + $video .= $format; + $video .= " (" . $lang . ")"; } if(/^X 2 [^ ]* (.*)/) { my ($lang, $descr) = split(" ", $1, 2); - $has_audio = 1; - push(@audio, - { lang => $lang, - descr => $descr - } - ); + $audio .= ", " if ($audio); + $audio .= ($descr ? $descr . " (" . $lang . ")" : $lang); } if (/^V (.*)/) { $vps = $1; } if (/^e/) { -# push(@video, -# { lang => "DE", -# format => "TEST" -# } -# ); -# push(@audio, -# { lang => "EN", -# descr => "TEST" -# } -# ); # $low_time = $time if ($time < $low_time); push(@events, @@ -853,11 +836,11 @@ sub EPG_buildTree { subtitle => $subtitle, summary => $summary, vps => $vps, - video => @video, - audio => @audio, id => $id, vdr_id => $vdr_id, - event_id => $event_id + event_id => $event_id, + video => $video, + audio => $audio, } ); $id++; @@ -2485,7 +2468,7 @@ sub prog_detail { my $vdr_id = $q->param("vdr_id"); my $epg_id = $q->param("epg_id"); - my ($channel_name, $title, $subtitle, $vps, $video, $audio, $has_video, $has_audio, $start, $stop, $text, @epgimages); + my ($channel_name, $title, $subtitle, $vps, $video, $audio, $start, $stop, $text, @epgimages); if ($vdr_id && $epg_id) { for (@{ $EPG{$vdr_id} }) { @@ -2500,9 +2483,7 @@ sub prog_detail { $text = CGI::escapeHTML($_->{summary}); $vps = $_->{vps}; $video = $_->{video}; - $has_video = $_->{has_video}; $audio = $_->{audio}; - $has_audio = $_->{has_audio}; # find epgimages if ($CONFIG{EPGIMAGES} && -d $CONFIG{EPGIMAGES}) { @@ -2554,20 +2535,16 @@ sub prog_detail { channel_name => $channel_name, subtitle => $displaysubtitle, vps => ($vps && $start && $start != $vps) ? my_strftime("%H:%M", $vps) : undef, -# audio => $audio, - has_audio => $has_audio, -# video => $video, - has_video => $has_video, 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, imdburl => $title ? "http://akas.imdb.com/Tsearch?title=" . uri_escape($imdb_title) : undef, - epgimages => \@epgimages + epgimages => \@epgimages, + audio => $audio, + video => $video, }; - $vars += {video => $video} if ($has_video); - $vars += {audio => $audio} if ($has_audio); $template->param($vars); my $output; my $out = $template->output; @@ -3469,7 +3446,6 @@ sub at_timer_list { $q->param("desc") ? ($desc = 1) : ($desc = 0); } my $sortby = $q->param("sortby"); - print("SORT: $sortby\n"); ($sortby = "pattern") if (!$sortby); # @@ -3895,13 +3871,11 @@ sub getStartTime { my $time = shift; my $day = shift; my $border = shift; - print("TIME: ($time) ($day) ($border)\n"); if ($time) { my ($hour, $minute) = getSplittedTime($time); $border = time() if (!$border); $time = timelocal(0, 0, 0, my_strftime("%d", $border), (my_strftime("%m", $border) - 1), my_strftime("%Y", $border)) + $hour * 3600 + $minute * 60; $time += 86400 if ($time < $border); - print("TIME2: ($time) ($day) ($border)\n"); return $time; } else { return time(); @@ -4509,7 +4483,7 @@ sub getRecInfo { my $vars; if ($VDRVERSION >= 10325) { $SVDRP->command("lstr $id"); - my ($channel_id, $subtitle, $text, @video, @audio); + my ($channel_id, $subtitle, $text, $video, $audio); while ($_ = $SVDRP->readoneline) { #if(/^C (.*)/) { $channel_id = $1; } #if(/^E (.*)/) { $epg = $1; } @@ -4518,19 +4492,14 @@ sub getRecInfo { if (/^D (.*)/) { $text = $1; } if(/^X 1 [^ ]* (.*)/) { my ($lang, $format) = split(" ", $1, 2); - push(@video, - { lang => $lang, - format => $format - } - ); + $video .= ", " if($video); + $video .= $format; + $video .= " (" . $lang . ")"; } if(/^X 2 [^ ]* (.*)/) { my ($lang, $descr) = split(" ", $1, 2); - push(@audio, - { lang => $lang, - descr => $descr - } - ); + $audio .= ", " if ($audio); + $audio .= ($descr ? $descr. " (" . $lang . ")" : $lang); } #if(/^V (.*)/) { $vps = $1; } } @@ -4558,8 +4527,8 @@ sub getRecInfo { subtitle => $displaysubtitle ? $displaysubtitle : undef, imdburl => "http://akas.imdb.com/Tsearch?title=" . uri_escape($imdb_title), id => $id, - video => \@video, - audio => \@audio, + video => $video, + audio => $audio, referer => $ref ? $ref : undef }; } else { |