diff options
| author | Andreas Mair <amair.sob@googlemail.com> | 2005-11-04 13:34:42 +0100 |
|---|---|---|
| committer | Andreas Mair <amair.sob@googlemail.com> | 2005-11-04 13:34:42 +0100 |
| commit | a21372e5196c7a69ec68296d0377b8516b2bbbf1 (patch) | |
| tree | aeb3410b48bf706198869e08e9c85a40b8a2c7d1 | |
| parent | e1f97fae0ca169df8c293d5d090b58da072fabc5 (diff) | |
| download | vdradmin-am-a21372e5196c7a69ec68296d0377b8516b2bbbf1.tar.gz vdradmin-am-a21372e5196c7a69ec68296d0377b8516b2bbbf1.tar.bz2 | |
2005-11-04: 0.97-am3.4.2rc3v0.97-am3.4.2rc3
- Set "LANGUAGE" environment variable to "" on startup, so it causes no problems with language setting in VDRAdmin.
- Added caching of listing of recordings. Can be adjusted by "CACHE_REC_TIMEOUT=number of minutes" in vdradmind.conf. Defaults to "60", "0" disables caching.
- Remember sorting when toggling in timer or autotimer list.
- New configuration option for Timers: don't add summary.
- Email notification for AutoTimer can be set in configuration menu.
- Optimized AutoTimer matching a little bit.
- Reworked detection of another VDRAdmin process if pid file exists.
- No more config settings that require a VDRAdmin restart.
- Find "sendEmail" program in $PATH.
| -rw-r--r-- | FAQ | 11 | ||||
| -rw-r--r-- | HISTORY | 11 | ||||
| -rwxr-xr-x | install.sh | 8 | ||||
| -rw-r--r-- | locale/de/LC_MESSAGES/vdradmin.mo | bin | 54679 -> 56305 bytes | |||
| -rw-r--r-- | locale/es/LC_MESSAGES/vdradmin.mo | bin | 46075 -> 46075 bytes | |||
| -rw-r--r-- | locale/fi/LC_MESSAGES/vdradmin.mo | bin | 12045 -> 12045 bytes | |||
| -rw-r--r-- | locale/fr/LC_MESSAGES/vdradmin.mo | bin | 40194 -> 40194 bytes | |||
| -rw-r--r-- | po/de.po | 374 | ||||
| -rw-r--r-- | po/es.po | 375 | ||||
| -rw-r--r-- | po/fi.po | 375 | ||||
| -rw-r--r-- | po/fr.po | 375 | ||||
| -rw-r--r-- | po/vdradmin.pot | 372 | ||||
| -rw-r--r-- | template/default/at_timer_new.html | 2 | ||||
| -rw-r--r-- | template/default/config.html | 36 | ||||
| -rw-r--r-- | template/default/help_config.html | 10 | ||||
| -rw-r--r-- | template/default/timer_list.html | 4 | ||||
| -rwxr-xr-x | vdradmind.pl | 426 |
17 files changed, 1397 insertions, 982 deletions
@@ -0,0 +1,11 @@ +Q: Setting the language for VDRAdmin does not work. What can I do? +A: There are some things to check: + - Check if "perl -V:d_setlocale" prints "d_setlocale='define';". + If it doesn't contact your Linux distributor. + - Run: echo -e "LANGUAGE=$LANGUAGE\nLANG=$LANG\nLC_ALL=$LC_ALL" + If LANGUAGE *must* be empty so that you can set the language + in VDRAdmin's configuration menu. If it's not empty VDRAdmin + will *always* use that language if it supports it or English if + it doesn't support it. + LANG and/or LC_ALL are used if you set the language to "System + default" in VDRAdmin. @@ -4,6 +4,17 @@ E-Mail: mail AT andreas DOT vdr-developer DOT org VDR-Portal: amair ----------------------------------------------------------- +2005-11-04: 0.97-am3.4.2rc3 +- Set "LANGUAGE" environment variable to "" on startup, so it causes no problems with language setting in VDRAdmin. +- Added caching of listing of recordings. Can be adjusted by "CACHE_REC_TIMEOUT=number of minutes" in vdradmind.conf. Defaults to "60", "0" disables caching. +- Remember sorting when toggling in timer or autotimer list. +- New configuration option for Timers: don't add summary. +- Email notification for AutoTimer can be set in configuration menu. +- Optimized AutoTimer matching a little bit. +- Reworked detection of another VDRAdmin process if pid file exists. +- No more config settings that require a VDRAdmin restart. +- Find "sendEmail" program in $PATH. + 2005-10-24: 0.97-am3.4.2rc2 - For VDR >=1.3.24 use VDR's timer flags for finding timers that are currently recording. - Fixed sendmail notification for AutoTimer. @@ -90,6 +90,7 @@ function makeDir() { [ -z "$1" ] && return 1 local DIR=$1 + local MUST_CREATE=${2:-0} if [ ! -e "$DIR" ]; then mkdir -p "$DIR" if [ $? -ne 0 ]; then @@ -102,6 +103,9 @@ function makeDir() echo "$DIR exists but is no directory!" echo "Aborting..." return 1 + elif [ -d $DIR -a $MUST_CREATE = 1 ]; then + echo "$DIR exists. Please remove it before calling install.sh!" + echo "Aborting..." fi return 0 @@ -115,8 +119,8 @@ function doInstall() perlModules - makeDir $LIBDIR && cp -r template lib $LIBDIR || exit 1 - makeDir $DOCDIR && cp -r contrib COPYING CREDITS HISTORY INSTALL README $DOCDIR || exit 1 + makeDir $LIBDIR 1 && cp -r template lib $LIBDIR || exit 1 + makeDir $DOCDIR && cp -r contrib COPYING CREDITS HISTORY INSTALL README* REQUIREMENTS FAQ $DOCDIR || exit 1 makeDir $MANDIR && cp vdradmind.pl.1 $MANDIR || exit 1 makeDir $ETCDIR || exit 1 diff --git a/locale/de/LC_MESSAGES/vdradmin.mo b/locale/de/LC_MESSAGES/vdradmin.mo Binary files differindex 9cfc231..6df1c87 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 20375c1..6df3449 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 a26568b..c0d5dd9 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 e00e4f8..7c5e56e 100644 --- a/locale/fr/LC_MESSAGES/vdradmin.mo +++ b/locale/fr/LC_MESSAGES/vdradmin.mo @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-0.97-AM3.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-20 14:08+0200\n" +"POT-Creation-Date: 2005-11-04 13:15+0100\n" "PO-Revision-Date: 2005-09-23 12:49+0100\n" "Last-Translator: Andreas Mair <mail@andreas.vdr-developer.org>\n" "Language-Team: <LL.org>\n" @@ -73,14 +73,15 @@ msgstr "Timer aktiv:" #: ../template/default/timer_new.html:75 #: ../template/default/at_timer_list.html:133 -#: ../template/default/config.html:182 ../template/default/config.html:233 -#: ../template/default/config.html:262 ../template/default/config.html:303 -#: ../template/default/config.html:354 ../template/default/config.html:363 -#: ../template/default/config.html:391 ../template/default/config.html:406 -#: ../template/default/config.html:454 ../template/default/config.html:469 -#: ../template/default/config.html:500 ../template/default/config.html:509 -#: ../template/default/config.html:518 ../template/default/config.html:527 -#: ../template/default/config.html:536 ../template/default/config.html:545 +#: ../template/default/config.html:186 ../template/default/config.html:237 +#: ../template/default/config.html:266 ../template/default/config.html:307 +#: ../template/default/config.html:334 ../template/default/config.html:385 +#: ../template/default/config.html:394 ../template/default/config.html:403 +#: ../template/default/config.html:431 ../template/default/config.html:446 +#: ../template/default/config.html:494 ../template/default/config.html:509 +#: ../template/default/config.html:540 ../template/default/config.html:549 +#: ../template/default/config.html:558 ../template/default/config.html:567 +#: ../template/default/config.html:576 ../template/default/config.html:585 #: ../template/default/timer_list.html:322 #: ../template/default/at_timer_new.html:48 #: ../template/default/at_timer_new.html:52 @@ -90,14 +91,15 @@ msgstr "Ja" #: ../template/default/timer_new.html:76 #: ../template/default/at_timer_list.html:135 -#: ../template/default/config.html:183 ../template/default/config.html:234 -#: ../template/default/config.html:263 ../template/default/config.html:304 -#: ../template/default/config.html:355 ../template/default/config.html:364 -#: ../template/default/config.html:392 ../template/default/config.html:407 -#: ../template/default/config.html:455 ../template/default/config.html:470 -#: ../template/default/config.html:501 ../template/default/config.html:510 -#: ../template/default/config.html:519 ../template/default/config.html:528 -#: ../template/default/config.html:537 ../template/default/config.html:546 +#: ../template/default/config.html:187 ../template/default/config.html:238 +#: ../template/default/config.html:267 ../template/default/config.html:308 +#: ../template/default/config.html:335 ../template/default/config.html:386 +#: ../template/default/config.html:395 ../template/default/config.html:404 +#: ../template/default/config.html:432 ../template/default/config.html:447 +#: ../template/default/config.html:495 ../template/default/config.html:510 +#: ../template/default/config.html:541 ../template/default/config.html:550 +#: ../template/default/config.html:559 ../template/default/config.html:568 +#: ../template/default/config.html:577 ../template/default/config.html:586 #: ../template/default/timer_list.html:323 #: ../template/default/at_timer_new.html:49 #: ../template/default/at_timer_new.html:53 @@ -196,10 +198,10 @@ msgstr "Endzeit:" #: ../template/default/timer_new.html:144 #: ../template/default/at_timer_list.html:24 -#: ../template/default/config.html:275 ../template/default/config.html:328 +#: ../template/default/config.html:279 ../template/default/config.html:359 #: ../template/default/timer_list.html:27 #: ../template/default/help_config.html:104 -#: ../template/default/help_config.html:116 +#: ../template/default/help_config.html:124 #: ../template/default/help_timer_new.html:61 #: ../template/default/help_at_timer_new.html:52 #: ../template/default/at_timer_new.html:128 @@ -208,10 +210,10 @@ msgstr "Priorität:" #: ../template/default/timer_new.html:150 #: ../template/default/at_timer_list.html:24 -#: ../template/default/config.html:281 ../template/default/config.html:334 +#: ../template/default/config.html:285 ../template/default/config.html:365 #: ../template/default/timer_list.html:27 #: ../template/default/help_config.html:106 -#: ../template/default/help_config.html:118 +#: ../template/default/help_config.html:126 #: ../template/default/help_timer_new.html:63 #: ../template/default/help_at_timer_new.html:54 #: ../template/default/at_timer_new.html:136 @@ -228,7 +230,7 @@ msgstr "Titel der Aufnahme:" msgid "Summary:" msgstr "Zusammenfassung:" -#: ../template/default/timer_new.html:174 ../template/default/config.html:583 +#: ../template/default/timer_new.html:174 ../template/default/config.html:623 #: ../template/default/at_timer_new.html:176 msgid "Save" msgstr "Speichern" @@ -273,7 +275,7 @@ msgstr "" #: ../template/default/at_timer_list.html:6 #: ../template/default/at_timer_list.html:36 -#: ../template/default/config.html:250 ../template/default/help_config.html:38 +#: ../template/default/config.html:254 ../template/default/help_config.html:38 #: ../template/default/help_config.html:98 #: ../template/default/help_at_timer_list.html:6 #: ../template/default/help_at_timer_list.html:22 @@ -348,7 +350,7 @@ msgstr "Ausgewählte Timer wirklich löschen?" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../template/i18n.pl:2 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4283 msgid "What's On Now?" msgstr "Was läuft jetzt?" @@ -425,196 +427,221 @@ msgstr "Lokales Netz (kein Login notwendig):" msgid "Language:" msgstr "Sprache:" -#: ../template/default/config.html:116 ../template/default/help_config.html:38 +#: ../template/default/config.html:120 ../template/default/help_config.html:38 #: ../template/default/help_config.html:56 msgid "VDR" msgstr "VDR" -#: ../template/default/config.html:126 ../template/default/help_config.html:58 +#: ../template/default/config.html:130 ../template/default/help_config.html:58 msgid "Number of DVB cards:" msgstr "Anzahl der DVB-Karten:" -#: ../template/default/config.html:132 ../template/default/help_config.html:60 +#: ../template/default/config.html:136 ../template/default/help_config.html:60 msgid "Path to recordings:" msgstr "Pfad der Aufnahmen:" -#: ../template/default/config.html:138 ../template/default/help_config.html:62 +#: ../template/default/config.html:142 ../template/default/help_config.html:62 msgid "Path to configuration files:" msgstr "Pfad zu den Konfigurationsdateien:" -#: ../template/default/config.html:144 ../template/default/help_config.html:64 +#: ../template/default/config.html:148 ../template/default/help_config.html:64 msgid "Path to EPG images:" msgstr "Pfad zu den EPG-Bildern:" -#: ../template/default/config.html:158 ../template/default/help_config.html:38 +#: ../template/default/config.html:162 ../template/default/help_config.html:38 #: ../template/default/help_config.html:70 msgid "Identification" msgstr "Identifikation" -#: ../template/default/config.html:168 ../template/default/help_config.html:72 +#: ../template/default/config.html:172 ../template/default/help_config.html:72 msgid "Username:" msgstr "Benutzername:" -#: ../template/default/config.html:174 ../template/default/help_config.html:74 +#: ../template/default/config.html:178 ../template/default/help_config.html:74 msgid "Password:" msgstr "Passwort:" -#: ../template/default/config.html:180 ../template/default/help_config.html:76 +#: ../template/default/config.html:184 ../template/default/help_config.html:76 msgid "Guest Account:" msgstr "Gast-Zugang:" -#: ../template/default/config.html:189 ../template/default/help_config.html:78 +#: ../template/default/config.html:193 ../template/default/help_config.html:78 msgid "Guest Username:" msgstr "Gast Benutzername:" -#: ../template/default/config.html:195 ../template/default/help_config.html:80 +#: ../template/default/config.html:199 ../template/default/help_config.html:80 msgid "Guest Password:" msgstr "Gast Passwort:" -#: ../template/default/config.html:209 ../template/default/help_config.html:38 +#: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../template/i18n.pl:4 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4285 msgid "Timeline" msgstr "Zeitleiste" -#: ../template/default/config.html:219 ../template/default/help_config.html:88 +#: ../template/default/config.html:223 ../template/default/help_config.html:88 msgid "Hours:" msgstr "Stunden:" -#: ../template/default/config.html:225 ../template/default/help_config.html:90 +#: ../template/default/config.html:229 ../template/default/help_config.html:90 msgid "Times:" msgstr "Zeiten:" -#: ../template/default/config.html:231 ../template/default/config.html:301 +#: ../template/default/config.html:235 ../template/default/config.html:332 #: ../template/default/help_config.html:92 -#: ../template/default/help_config.html:108 +#: ../template/default/help_config.html:116 msgid "Tooltips:" msgstr "Tooltips:" -#: ../template/default/config.html:260 +#: ../template/default/config.html:264 #: ../template/default/help_config.html:100 msgid "Active:" msgstr "Aktiv:" -#: ../template/default/config.html:269 +#: ../template/default/config.html:273 #: ../template/default/help_config.html:102 msgid "Timeout:" msgstr "Timeout:" -#: ../template/default/config.html:270 ../template/default/config.html:341 -#: ../template/default/config.html:347 +#: ../template/default/config.html:274 ../template/default/config.html:372 +#: ../template/default/config.html:378 msgid "minutes" msgstr "Minuten" -#: ../template/default/config.html:288 ../template/default/config.html:340 -#: ../template/default/help_config.html:120 +#: ../template/default/config.html:292 ../template/default/config.html:371 +#: ../template/default/help_config.html:128 msgid "Time Margin at Start:" msgstr "Zeitpuffer Anfang:" -#: ../template/default/config.html:294 ../template/default/config.html:346 -#: ../template/default/help_config.html:122 +#: ../template/default/config.html:298 ../template/default/config.html:377 +#: ../template/default/help_config.html:130 msgid "Time Margin at Stop:" msgstr "Zeitpuffer Ende:" -#: ../template/default/config.html:318 ../template/default/timer_list.html:6 +#: ../template/default/config.html:305 +#: ../template/default/help_config.html:108 +msgid "Send email after programming timer:" +msgstr "Nach programmiertem Timer E-Mail verschicken:" + +#: ../template/default/config.html:314 +#: ../template/default/help_config.html:110 +msgid "Send email as:" +msgstr "E-Mail verschicken als:" + +#: ../template/default/config.html:320 +#: ../template/default/help_config.html:112 +msgid "Send email to:" +msgstr "E-Mail schicken an:" + +#: ../template/default/config.html:326 +#: ../template/default/help_config.html:114 +msgid "Mail server:" +msgstr "Mail-Server:" + +#: ../template/default/config.html:349 ../template/default/timer_list.html:6 #: ../template/default/timer_list.html:44 #: ../template/default/help_config.html:38 -#: ../template/default/help_config.html:114 +#: ../template/default/help_config.html:122 #: ../template/default/help_timer_list.html:6 #: ../template/default/help_timer_list.html:22 #: ../template/default/navigation.html:46 msgid "Timer" msgstr "Timer" -#: ../template/default/config.html:352 -#: ../template/default/help_config.html:124 +#: ../template/default/config.html:383 +#: ../template/default/help_config.html:132 msgid "Tooltips in timeline:" msgstr "Tooltips in der Zeitleiste:" -#: ../template/default/config.html:361 -#: ../template/default/help_config.html:126 +#: ../template/default/config.html:392 +#: ../template/default/help_config.html:134 msgid "Tooltips in list:" msgstr "Tooltips in der Liste:" -#: ../template/default/config.html:379 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:132 +#: ../template/default/config.html:401 +#: ../template/default/help_config.html:136 +msgid "Add summary to new timers:" +msgstr "Beschreibung aus dem EPG für neue Timer verwenden:" + +#: ../template/default/config.html:419 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:142 msgid "Streaming" msgstr "Streaming" -#: ../template/default/config.html:389 -#: ../template/default/help_config.html:134 +#: ../template/default/config.html:429 +#: ../template/default/help_config.html:144 msgid "Live Streaming:" msgstr "LiveTV streamen:" -#: ../template/default/config.html:398 -#: ../template/default/help_config.html:136 +#: ../template/default/config.html:438 +#: ../template/default/help_config.html:146 msgid "HTTP Port of Streamdev (also possible 3000/ts):" msgstr "HTTP-Port von Streamdev (auch möglich 3000/ts):" -#: ../template/default/config.html:404 -#: ../template/default/help_config.html:138 +#: ../template/default/config.html:444 +#: ../template/default/help_config.html:148 msgid "Recordings Streaming:" msgstr "Aufnahmen streamen:" -#: ../template/default/config.html:413 -#: ../template/default/help_config.html:140 +#: ../template/default/config.html:453 +#: ../template/default/help_config.html:150 msgid "Path to VDR Recordings on your workstation:" msgstr "Pfad zu den VDR-Aufnahmen auf Ihrem PC:" -#: ../template/default/config.html:420 +#: ../template/default/config.html:460 msgid "Bandwidth of Streams:" msgstr "Bandbreite des Streams:" -#: ../template/default/config.html:442 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:146 +#: ../template/default/config.html:482 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:156 msgid "Expert" msgstr "Expertenmodus" -#: ../template/default/config.html:452 -#: ../template/default/help_config.html:149 +#: ../template/default/config.html:492 +#: ../template/default/help_config.html:159 msgid "Read EPG directly using epg.data:" msgstr "EPG direkt aus der epg.data lesen:" -#: ../template/default/config.html:461 -#: ../template/default/help_config.html:151 +#: ../template/default/config.html:501 +#: ../template/default/help_config.html:161 msgid "epg.data filename:" msgstr "Dateiname der epg.data:" -#: ../template/default/config.html:467 -#: ../template/default/help_config.html:153 +#: ../template/default/config.html:507 +#: ../template/default/help_config.html:163 msgid "VFAT:" msgstr "VFAT:" -#: ../template/default/config.html:488 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:159 +#: ../template/default/config.html:528 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:169 msgid "Channel Selections" msgstr "Selektive Senderauswahl" -#: ../template/default/config.html:498 +#: ../template/default/config.html:538 msgid "In \"Timeline\"?" msgstr "In der \"Zeitleiste\"?" -#: ../template/default/config.html:507 +#: ../template/default/config.html:547 msgid "In \"Channels\"?" msgstr "In der \"Programmübersicht\"?" -#: ../template/default/config.html:516 +#: ../template/default/config.html:556 msgid "In \"Playing Today\"?" msgstr "Bei \"Was läuft heute\"?" -#: ../template/default/config.html:525 +#: ../template/default/config.html:565 msgid "In \"What's On Now\"?" msgstr "Bei \"Was läuft jetzt\"?" -#: ../template/default/config.html:534 +#: ../template/default/config.html:574 msgid "In \"AutoTimer\"?" msgstr "Bei \"AutoTimer\"?" -#: ../template/default/config.html:543 +#: ../template/default/config.html:583 msgid "In \"Watch TV\"?" msgstr "In \"Fernseher\"?" -#: ../template/default/config.html:584 +#: ../template/default/config.html:624 msgid "Apply" msgstr "Anwenden" @@ -645,26 +672,26 @@ msgstr "Neuer Timer" msgid "Date" msgstr "Datum" -#: ../template/default/timer_list.html:307 +#: ../template/default/timer_list.html:306 +msgid "Edit timer status?" +msgstr "Timerstatus ändern?" + +#: ../template/default/timer_list.html:308 msgid "This timer is inactive!" msgstr "Diese Aufnahme ist deaktiviert!" -#: ../template/default/timer_list.html:310 +#: ../template/default/timer_list.html:311 msgid "This timer is impossible!" msgstr "Diese Aufnahme ist nicht möglich!" -#: ../template/default/timer_list.html:313 +#: ../template/default/timer_list.html:314 msgid "No more timers on other transponders possible!" msgstr "Keine weiteren Aufnahmen auf anderen Transpondern mehr möglich!" -#: ../template/default/timer_list.html:316 +#: ../template/default/timer_list.html:317 msgid "Timer OK." msgstr "Diese Aufnahme ist möglich." -#: ../template/default/timer_list.html:321 -msgid "Edit timer status?" -msgstr "Timerstatus ändern?" - #: ../template/default/timer_list.html:324 msgid "VPS" msgstr "VPS" @@ -678,7 +705,7 @@ msgid "Delete Selected Timers" msgstr "Ausgewählte Timer löschen" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../template/i18n.pl:5 +#: ../vdradmind.pl:4286 msgid "Channels" msgstr "Programmübersicht" @@ -744,7 +771,7 @@ msgstr "Film in der Internet-Movie-Database (IMDb) suchen" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../template/i18n.pl:7 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4288 msgid "Recordings" msgstr "Aufnahmen" @@ -850,11 +877,11 @@ msgstr "Hier stellen Sie die Lokalisierung ein, die VDRAdmin verwenden soll." #: ../template/default/help_config.html:67 #: ../template/default/help_config.html:83 #: ../template/default/help_config.html:95 -#: ../template/default/help_config.html:111 -#: ../template/default/help_config.html:129 -#: ../template/default/help_config.html:143 -#: ../template/default/help_config.html:156 -#: ../template/default/help_config.html:163 +#: ../template/default/help_config.html:119 +#: ../template/default/help_config.html:139 +#: ../template/default/help_config.html:153 +#: ../template/default/help_config.html:166 +#: ../template/default/help_config.html:173 msgid "Top" msgstr "nach oben" @@ -938,7 +965,7 @@ msgstr "" "strong>, die in der Auswahlliste am Seitenanfang angezeigt wird." #: ../template/default/help_config.html:93 -#: ../template/default/help_config.html:109 +#: ../template/default/help_config.html:117 msgid "Here you can (de-)activate the tooltips." msgstr "Hier können Sie die Tooltips ein- oder ausschalten." @@ -953,7 +980,7 @@ msgstr "" "AutoTimern gesucht wird." #: ../template/default/help_config.html:105 -#: ../template/default/help_config.html:117 +#: ../template/default/help_config.html:125 #: ../template/default/help_timer_new.html:62 #: ../template/default/help_at_timer_new.html:53 msgid "" @@ -989,7 +1016,7 @@ msgstr "" "Timer mit der niedrigsten Priorität um die Aufnahme zu starten." #: ../template/default/help_config.html:107 -#: ../template/default/help_config.html:119 +#: ../template/default/help_config.html:127 #: ../template/default/help_timer_new.html:64 #: ../template/default/help_at_timer_new.html:55 msgid "" @@ -1011,7 +1038,28 @@ msgstr "" "Anzahl von Tagen seit der <strong>Startzeit</strong> abgelaufen ist und " "Plattenplatz für eine neue Aufnahme benötigt wird." -#: ../template/default/help_config.html:121 +#: ../template/default/help_config.html:109 +msgid "" +"VDRAdmin will send an email whenever an event matches an AutoTimer and a " +"timer has been programmed if you enable this feature. This requires that you " +"have the sendEmail programm (which you will find <a target=\"_new\" href=" +"\"http://caspian.dotconf.net/menu/Software/SendEmail/\">here</a>) located in " +"PATH." +msgstr "Wenn Sie diese Funktion aktivieren, dann schickt Ihnen VDRAdmin immer wenn ein AutoTimer eine passende Sendung findet eine E-Mail. Dafür muss sich das Programm sendEmail (das Sie <a target=\"_new\" href=\"http://caspian.dotconf.net/menu/Software/SendEmail/\">hier</a> herunterladen können) im aktuellen Suchpfad befinden." + +#: ../template/default/help_config.html:111 +msgid "Here you set the sending domain of the generated email." +msgstr "Hier geben Sie die Absende-Domäne der erzeugten E-Mail an." + +#: ../template/default/help_config.html:113 +msgid "The email address the email is sent to." +msgstr "Die E-Mail-Adresse an die die E-Mail geschickt werden soll." + +#: ../template/default/help_config.html:115 +msgid "The outgoing mail server." +msgstr "Der Server für ausgehende E-Mails." + +#: ../template/default/help_config.html:129 msgid "" "The number of minutes VDRAdmin subtracts from the broadcasts start time " "found in the EPG. This value is used for timers programmed by AutoTimer and " @@ -1022,7 +1070,7 @@ msgstr "" "manuell durch Klicken von \"Aufnehmen\" in einer beliebigen EPG-Ansicht " "programmiert werden." -#: ../template/default/help_config.html:123 +#: ../template/default/help_config.html:131 msgid "" "The number of minutes VDRAdmin adds to the broadcasts stop time found in the " "EPG. This value is used for timers programmed by AutoTimer and timers " @@ -1033,15 +1081,21 @@ msgstr "" "manuell durch Klicken von \"Aufnehmen\" in einer beliebigen EPG-Ansicht " "programmiert werden." -#: ../template/default/help_config.html:125 +#: ../template/default/help_config.html:133 msgid "Here you can (de-)activate the tooltips in the timeline." msgstr "Hier können Sie die Tooltips in der Zeitleiste ein- oder ausschalten." -#: ../template/default/help_config.html:127 +#: ../template/default/help_config.html:135 msgid "Here you can (de-)activate the tooltips in the list." msgstr "Hier können Sie die Tooltips in der Liste ein- oder ausschalten." -#: ../template/default/help_config.html:135 +#: ../template/default/help_config.html:137 +msgid "" +"If you don't want VDRAdmin to add the summary taken from EPG to new timers " +"you can switch it off here." +msgstr "Wenn Sie nicht wollen, dass VDRAdmin die Beschreibung einer Sendung aus dem EPG für neue Timer setzt, dann können Sie dies hiermit unterbinden." + +#: ../template/default/help_config.html:145 msgid "" "Enable or disable live streaming using the <a href=\"http://www.magoa.net/" "linux/\">streamdev plugin</a>. You also have to set the correct <span class=" @@ -1052,7 +1106,7 @@ msgstr "" "muss noch der <span class=\"ref_label\">HTTP-Port von Streamdev</span> " "korrekt gesetzt sein." -#: ../template/default/help_config.html:137 +#: ../template/default/help_config.html:147 msgid "" "Here you have to set the port number your VDR's streamdev server listens for " "connections. Additionally you can also provide the stream type you like to " @@ -1061,7 +1115,7 @@ msgstr "" "Hier geben Sie die Portnummer des Streamdev-Servers im VDR an. Sie können " "auch den zu verwendenden Streamtyp angeben." -#: ../template/default/help_config.html:139 +#: ../template/default/help_config.html:149 msgid "" "Enable or disable streaming of recordings.<br />Well actually this is no " "real \"streaming\", but you have to setup your workstation so that it can " @@ -1079,7 +1133,7 @@ msgstr "" "diese dann zum Browser. Wenn nun der Browser und das Medienabspielprogramm " "korrekt konfiguriert sind wird die Aufnahme am PC abgespielt." -#: ../template/default/help_config.html:141 +#: ../template/default/help_config.html:151 msgid "" "This is the path where your workstation can access VDR's recordings. This " "depends on your VDR and workstation setup, for example \"\\\\vdr\\videos\" " @@ -1090,7 +1144,7 @@ msgstr "" "\\videos\" oder \"V:\\\" (unter Windows) oder \"/mnt/videos\" (unter Linux) " "sein." -#: ../template/default/help_config.html:147 +#: ../template/default/help_config.html:157 msgid "" "<p>This section is for experts <strong>only</strong>, i.e. you know what you " "are doing!</p>" @@ -1098,7 +1152,7 @@ msgstr "" "<p>Dieser Bereich ist <strong>nur</strong> für Experten, d.h. Sie wissen was " "Sie tun!</p>" -#: ../template/default/help_config.html:150 +#: ../template/default/help_config.html:160 msgid "" "Accessing VDR's EPG through VDR's SVDRPort seems to block VDR for some time. " "If this option is activated VDRAdmin will read the <span class=\"ref_file" @@ -1109,7 +1163,7 @@ msgstr "" "<span class=\"ref_file\">epg.data</span>, so dass der VDR nicht blockiert " "wird." -#: ../template/default/help_config.html:152 +#: ../template/default/help_config.html:162 msgid "" "If you've enabled the option above you need to tell VDRAdmin where the <span " "class=\"ref_file\">epg.data</span> file is located." @@ -1118,7 +1172,7 @@ msgstr "" "Dateinamen inklusive komplettem Pfad zur Datei <span class=\"ref_file\">epg." "data</span> bekannt geben." -#: ../template/default/help_config.html:154 +#: ../template/default/help_config.html:164 msgid "" "If you have compiled VDR with the VFAT define you have to enable this " "option. If this option is set to the wrong value, you may have problems with " @@ -1129,7 +1183,7 @@ msgstr "" "mit bestimmten Aufnahmen haben, wenn Sie diese Streamen oder einen <span " "class=\"ref_file\">reccmd.conf</span> Befehl darauf ausführen lassen wollen." -#: ../template/default/help_config.html:160 +#: ../template/default/help_config.html:170 msgid "" "<p>If you want to limit the number of channels used in some parts of " "VDRAdmin, this is for you!</p><p>Use the radio buttons to activate or " @@ -1160,7 +1214,7 @@ msgid "to" msgstr "bis" #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2472 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2489 msgid "Playing Today" msgstr "Was läuft heute?" @@ -1774,114 +1828,114 @@ msgstr "Fernseher" msgid "Search" msgstr "Suchen" -#: ../vdradmind.pl:274 +#: ../vdradmind.pl:280 msgid "What's your VDR hostname (e.g video.intra.net)?" msgstr "Wie lautet der Hostname des VDR (z.B. video.intra.net)?" -#: ../vdradmind.pl:275 +#: ../vdradmind.pl:281 msgid "On which port does VDR listen to SVDRP queries?" msgstr "Auf welchem Port hört der VDR auf SVDRP-Anfragen?" -#: ../vdradmind.pl:276 +#: ../vdradmind.pl:282 msgid "On which address should VDRAdmin listen (0.0.0.0 for any)?" msgstr "" "An welcher Adresse soll VDRAdmin auf Verbindungen warten (0.0.0.0 für alle)?" -#: ../vdradmind.pl:277 +#: ../vdradmind.pl:283 msgid "On which port should VDRAdmin listen?" msgstr "Auf welchem Port soll VDRAdmin hören?" -#: ../vdradmind.pl:278 +#: ../vdradmind.pl:284 msgid "Username?" msgstr "Benutzername?" -#: ../vdradmind.pl:279 +#: ../vdradmind.pl:285 msgid "Password?" msgstr "Passwort?" -#: ../vdradmind.pl:280 +#: ../vdradmind.pl:286 msgid "Where are your recordings stored?" msgstr "Wo befinden sich die Aufnahmen?" -#: ../vdradmind.pl:281 +#: ../vdradmind.pl:287 msgid "Where are your VDR's configuration files located?" msgstr "Wo befinden sich die Konfigurationsdateien des VDR?" -#: ../vdradmind.pl:287 +#: ../vdradmind.pl:293 msgid "Config file written successfully." msgstr "Konfigurationsdatei wurde erfolgreich geschrieben." -#: ../vdradmind.pl:336 +#: ../vdradmind.pl:346 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s wurde mit der Prozeß-ID %d gestartet." -#: ../vdradmind.pl:2472 -msgid "Playing Tomorrow" -msgstr "Was läuft morgen" - -#: ../vdradmind.pl:2472 -#, perl-format -msgid "Playing on the %d." -msgstr "Was läuft am %d." - -#: ../vdradmind.pl:4284 -msgid "System default" -msgstr "Systemstandard" - -#: ../template/i18n.pl:3 -msgid "Playing Today?" -msgstr "Was läuft heute?" - -#: ../template/i18n.pl:6 -msgid "Timers" -msgstr "Timer" - -#: ../template/i18n.pl:11 +#: ../vdradmind.pl:401 ../vdradmind.pl:990 ../vdradmind.pl:1798 msgid "Not found" msgstr "Nicht gefunden" -#: ../template/i18n.pl:12 +#: ../vdradmind.pl:401 ../vdradmind.pl:1799 msgid "The requested URL was not found on this server!" msgstr "Die angeforderte URL konnte auf dem Server nicht gefunden werden!" -#: ../template/i18n.pl:13 -#, perl-format -msgid "The URL \"%s\" was not found on this server!" -msgstr "Die URL \"%s\" wurde auf dem Server nicht gefunden!" - -#: ../template/i18n.pl:14 +#: ../vdradmind.pl:466 ../vdradmind.pl:986 ../vdradmind.pl:1801 msgid "Forbidden" msgstr "Verboten" -#: ../template/i18n.pl:15 +#: ../vdradmind.pl:466 ../vdradmind.pl:1802 msgid "You don't have permission to access this function!" msgstr "Sie haben nicht die Erlaubnis diese Funktion aufzurufen!" -#: ../template/i18n.pl:16 +#: ../vdradmind.pl:986 ../vdradmind.pl:1803 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Zugriff auf Datei \"%s\" verweigert!" -#: ../template/i18n.pl:17 +#: ../vdradmind.pl:990 ../vdradmind.pl:1800 +#, perl-format +msgid "The URL \"%s\" was not found on this server!" +msgstr "Die URL \"%s\" wurde auf dem Server nicht gefunden!" + +#: ../vdradmind.pl:1804 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Kann Datei \"%s\" nicht öffnen!" -#: ../template/i18n.pl:18 +#: ../vdradmind.pl:1805 #, perl-format msgid "Can't connect to VDR at %s!" msgstr "Konnte Verbindung zu %s nicht aufbauen!" -#: ../template/i18n.pl:19 +#: ../vdradmind.pl:1806 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Fehler beim Senden eines Kommandos zu %s" -#: ../template/i18n.pl:23 +#: ../vdradmind.pl:2489 +msgid "Playing Tomorrow" +msgstr "Was läuft morgen" + +#: ../vdradmind.pl:2489 +#, perl-format +msgid "Playing on the %d." +msgstr "Was läuft am %d." + +#: ../vdradmind.pl:3805 msgid "Schedule" msgstr "Ãœbersicht" +#: ../vdradmind.pl:4284 +msgid "Playing Today?" +msgstr "Was läuft heute?" + +#: ../vdradmind.pl:4287 +msgid "Timers" +msgstr "Timer" + +#: ../vdradmind.pl:4350 +msgid "System default" +msgstr "Systemstandard" + #~ msgid "Switch" #~ msgstr "Umschalten" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-0.97-AM3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-20 14:08+0200\n" +"POT-Creation-Date: 2005-11-04 13:15+0100\n" "PO-Revision-Date: 2005-10-05 19:12+0100\n" "Last-Translator: rudy <r_jung@web.de>\n" "Language-Team: Rudi <LL.org>\n" @@ -76,14 +76,15 @@ msgstr "Programación activada:" #: ../template/default/timer_new.html:75 #: ../template/default/at_timer_list.html:133 -#: ../template/default/config.html:182 ../template/default/config.html:233 -#: ../template/default/config.html:262 ../template/default/config.html:303 -#: ../template/default/config.html:354 ../template/default/config.html:363 -#: ../template/default/config.html:391 ../template/default/config.html:406 -#: ../template/default/config.html:454 ../template/default/config.html:469 -#: ../template/default/config.html:500 ../template/default/config.html:509 -#: ../template/default/config.html:518 ../template/default/config.html:527 -#: ../template/default/config.html:536 ../template/default/config.html:545 +#: ../template/default/config.html:186 ../template/default/config.html:237 +#: ../template/default/config.html:266 ../template/default/config.html:307 +#: ../template/default/config.html:334 ../template/default/config.html:385 +#: ../template/default/config.html:394 ../template/default/config.html:403 +#: ../template/default/config.html:431 ../template/default/config.html:446 +#: ../template/default/config.html:494 ../template/default/config.html:509 +#: ../template/default/config.html:540 ../template/default/config.html:549 +#: ../template/default/config.html:558 ../template/default/config.html:567 +#: ../template/default/config.html:576 ../template/default/config.html:585 #: ../template/default/timer_list.html:322 #: ../template/default/at_timer_new.html:48 #: ../template/default/at_timer_new.html:52 @@ -93,14 +94,15 @@ msgstr "Sí" #: ../template/default/timer_new.html:76 #: ../template/default/at_timer_list.html:135 -#: ../template/default/config.html:183 ../template/default/config.html:234 -#: ../template/default/config.html:263 ../template/default/config.html:304 -#: ../template/default/config.html:355 ../template/default/config.html:364 -#: ../template/default/config.html:392 ../template/default/config.html:407 -#: ../template/default/config.html:455 ../template/default/config.html:470 -#: ../template/default/config.html:501 ../template/default/config.html:510 -#: ../template/default/config.html:519 ../template/default/config.html:528 -#: ../template/default/config.html:537 ../template/default/config.html:546 +#: ../template/default/config.html:187 ../template/default/config.html:238 +#: ../template/default/config.html:267 ../template/default/config.html:308 +#: ../template/default/config.html:335 ../template/default/config.html:386 +#: ../template/default/config.html:395 ../template/default/config.html:404 +#: ../template/default/config.html:432 ../template/default/config.html:447 +#: ../template/default/config.html:495 ../template/default/config.html:510 +#: ../template/default/config.html:541 ../template/default/config.html:550 +#: ../template/default/config.html:559 ../template/default/config.html:568 +#: ../template/default/config.html:577 ../template/default/config.html:586 #: ../template/default/timer_list.html:323 #: ../template/default/at_timer_new.html:49 #: ../template/default/at_timer_new.html:53 @@ -199,10 +201,10 @@ msgstr "Fin:" #: ../template/default/timer_new.html:144 #: ../template/default/at_timer_list.html:24 -#: ../template/default/config.html:275 ../template/default/config.html:328 +#: ../template/default/config.html:279 ../template/default/config.html:359 #: ../template/default/timer_list.html:27 #: ../template/default/help_config.html:104 -#: ../template/default/help_config.html:116 +#: ../template/default/help_config.html:124 #: ../template/default/help_timer_new.html:61 #: ../template/default/help_at_timer_new.html:52 #: ../template/default/at_timer_new.html:128 @@ -211,10 +213,10 @@ msgstr "Prioridad:" #: ../template/default/timer_new.html:150 #: ../template/default/at_timer_list.html:24 -#: ../template/default/config.html:281 ../template/default/config.html:334 +#: ../template/default/config.html:285 ../template/default/config.html:365 #: ../template/default/timer_list.html:27 #: ../template/default/help_config.html:106 -#: ../template/default/help_config.html:118 +#: ../template/default/help_config.html:126 #: ../template/default/help_timer_new.html:63 #: ../template/default/help_at_timer_new.html:54 #: ../template/default/at_timer_new.html:136 @@ -231,7 +233,7 @@ msgstr "Título de la grabación:" msgid "Summary:" msgstr "Resumen:" -#: ../template/default/timer_new.html:174 ../template/default/config.html:583 +#: ../template/default/timer_new.html:174 ../template/default/config.html:623 #: ../template/default/at_timer_new.html:176 msgid "Save" msgstr "Guardar" @@ -277,7 +279,7 @@ msgstr "" #: ../template/default/at_timer_list.html:6 #: ../template/default/at_timer_list.html:36 -#: ../template/default/config.html:250 ../template/default/help_config.html:38 +#: ../template/default/config.html:254 ../template/default/help_config.html:38 #: ../template/default/help_config.html:98 #: ../template/default/help_at_timer_list.html:6 #: ../template/default/help_at_timer_list.html:22 @@ -352,7 +354,7 @@ msgstr "¿Estas seguro de que deseas borrar las programaciones elegidas?" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../template/i18n.pl:2 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4283 msgid "What's On Now?" msgstr "Estrenos ahora" @@ -429,198 +431,224 @@ msgstr "Red local (no requiere contraseña)" msgid "Language:" msgstr "" -#: ../template/default/config.html:116 ../template/default/help_config.html:38 +#: ../template/default/config.html:120 ../template/default/help_config.html:38 #: ../template/default/help_config.html:56 msgid "VDR" msgstr "VDR" -#: ../template/default/config.html:126 ../template/default/help_config.html:58 +#: ../template/default/config.html:130 ../template/default/help_config.html:58 msgid "Number of DVB cards:" msgstr "Cantidad de tarjetas-DVB:" -#: ../template/default/config.html:132 ../template/default/help_config.html:60 +#: ../template/default/config.html:136 ../template/default/help_config.html:60 msgid "Path to recordings:" msgstr "Ruta de las grabaciones:" -#: ../template/default/config.html:138 ../template/default/help_config.html:62 +#: ../template/default/config.html:142 ../template/default/help_config.html:62 msgid "Path to configuration files:" msgstr "La ruta de los ficheros de configuración:" -#: ../template/default/config.html:144 ../template/default/help_config.html:64 +#: ../template/default/config.html:148 ../template/default/help_config.html:64 msgid "Path to EPG images:" msgstr "Ruta de las las imagenes de EPG:" -#: ../template/default/config.html:158 ../template/default/help_config.html:38 +#: ../template/default/config.html:162 ../template/default/help_config.html:38 #: ../template/default/help_config.html:70 msgid "Identification" msgstr "Identificaciones" -#: ../template/default/config.html:168 ../template/default/help_config.html:72 +#: ../template/default/config.html:172 ../template/default/help_config.html:72 msgid "Username:" msgstr "Nombre del usuario:" -#: ../template/default/config.html:174 ../template/default/help_config.html:74 +#: ../template/default/config.html:178 ../template/default/help_config.html:74 msgid "Password:" msgstr "Contraseña:" -#: ../template/default/config.html:180 ../template/default/help_config.html:76 +#: ../template/default/config.html:184 ../template/default/help_config.html:76 msgid "Guest Account:" msgstr "Acceso como invitado:" -#: ../template/default/config.html:189 ../template/default/help_config.html:78 +#: ../template/default/config.html:193 ../template/default/help_config.html:78 msgid "Guest Username:" msgstr "Nombre como invitado:" -#: ../template/default/config.html:195 ../template/default/help_config.html:80 +#: ../template/default/config.html:199 ../template/default/help_config.html:80 msgid "Guest Password:" msgstr "Contraseña como invitado:" -#: ../template/default/config.html:209 ../template/default/help_config.html:38 +#: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../template/i18n.pl:4 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4285 msgid "Timeline" msgstr "Tabla de tiempo" -#: ../template/default/config.html:219 ../template/default/help_config.html:88 +#: ../template/default/config.html:223 ../template/default/help_config.html:88 msgid "Hours:" msgstr "Rango de hora/s:" -#: ../template/default/config.html:225 ../template/default/help_config.html:90 +#: ../template/default/config.html:229 ../template/default/help_config.html:90 msgid "Times:" msgstr "Horas:" -#: ../template/default/config.html:231 ../template/default/config.html:301 +#: ../template/default/config.html:235 ../template/default/config.html:332 #: ../template/default/help_config.html:92 -#: ../template/default/help_config.html:108 +#: ../template/default/help_config.html:116 msgid "Tooltips:" msgstr "" -#: ../template/default/config.html:260 +#: ../template/default/config.html:264 #: ../template/default/help_config.html:100 msgid "Active:" msgstr "Activada:" -#: ../template/default/config.html:269 +#: ../template/default/config.html:273 #: ../template/default/help_config.html:102 msgid "Timeout:" msgstr "Actualización cada:" -#: ../template/default/config.html:270 ../template/default/config.html:341 -#: ../template/default/config.html:347 +#: ../template/default/config.html:274 ../template/default/config.html:372 +#: ../template/default/config.html:378 msgid "minutes" msgstr "minutos" -#: ../template/default/config.html:288 ../template/default/config.html:340 -#: ../template/default/help_config.html:120 +#: ../template/default/config.html:292 ../template/default/config.html:371 +#: ../template/default/help_config.html:128 msgid "Time Margin at Start:" msgstr "Más tiempo al principio:" -#: ../template/default/config.html:294 ../template/default/config.html:346 -#: ../template/default/help_config.html:122 +#: ../template/default/config.html:298 ../template/default/config.html:377 +#: ../template/default/help_config.html:130 msgid "Time Margin at Stop:" msgstr "Más tiempo al final:" -#: ../template/default/config.html:318 ../template/default/timer_list.html:6 +#: ../template/default/config.html:305 +#: ../template/default/help_config.html:108 +#, fuzzy +msgid "Send email after programming timer:" +msgstr "Recordar programaciones:" + +#: ../template/default/config.html:314 +#: ../template/default/help_config.html:110 +msgid "Send email as:" +msgstr "" + +#: ../template/default/config.html:320 +#: ../template/default/help_config.html:112 +msgid "Send email to:" +msgstr "" + +#: ../template/default/config.html:326 +#: ../template/default/help_config.html:114 +msgid "Mail server:" +msgstr "" + +#: ../template/default/config.html:349 ../template/default/timer_list.html:6 #: ../template/default/timer_list.html:44 #: ../template/default/help_config.html:38 -#: ../template/default/help_config.html:114 +#: ../template/default/help_config.html:122 #: ../template/default/help_timer_list.html:6 #: ../template/default/help_timer_list.html:22 #: ../template/default/navigation.html:46 msgid "Timer" msgstr "Programaciones" -#: ../template/default/config.html:352 -#: ../template/default/help_config.html:124 +#: ../template/default/config.html:383 +#: ../template/default/help_config.html:132 msgid "Tooltips in timeline:" msgstr "" -#: ../template/default/config.html:361 -#: ../template/default/help_config.html:126 +#: ../template/default/config.html:392 +#: ../template/default/help_config.html:134 msgid "Tooltips in list:" msgstr "" -#: ../template/default/config.html:379 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:132 +#: ../template/default/config.html:401 +#: ../template/default/help_config.html:136 +msgid "Add summary to new timers:" +msgstr "" + +#: ../template/default/config.html:419 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:142 msgid "Streaming" msgstr "Flujo" -#: ../template/default/config.html:389 -#: ../template/default/help_config.html:134 +#: ../template/default/config.html:429 +#: ../template/default/help_config.html:144 msgid "Live Streaming:" msgstr "Flujo en vivo:" -#: ../template/default/config.html:398 -#: ../template/default/help_config.html:136 +#: ../template/default/config.html:438 +#: ../template/default/help_config.html:146 msgid "HTTP Port of Streamdev (also possible 3000/ts):" msgstr "Puerto-HTTP para el flujo (3000/ts también posible):" -#: ../template/default/config.html:404 -#: ../template/default/help_config.html:138 +#: ../template/default/config.html:444 +#: ../template/default/help_config.html:148 msgid "Recordings Streaming:" msgstr "Flujo de grabaciones:" -#: ../template/default/config.html:413 -#: ../template/default/help_config.html:140 +#: ../template/default/config.html:453 +#: ../template/default/help_config.html:150 msgid "Path to VDR Recordings on your workstation:" msgstr "La ruta de las grabaciones de VDR en tu ordenador" -#: ../template/default/config.html:420 +#: ../template/default/config.html:460 msgid "Bandwidth of Streams:" msgstr "Ancho de banda del flujo:" -#: ../template/default/config.html:442 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:146 +#: ../template/default/config.html:482 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:156 msgid "Expert" msgstr "Experto" -#: ../template/default/config.html:452 -#: ../template/default/help_config.html:149 +#: ../template/default/config.html:492 +#: ../template/default/help_config.html:159 msgid "Read EPG directly using epg.data:" msgstr "Utiliza el fichero \"epg.data\" para leer EPG:" -#: ../template/default/config.html:461 -#: ../template/default/help_config.html:151 +#: ../template/default/config.html:501 +#: ../template/default/help_config.html:161 msgid "epg.data filename:" msgstr "nombre del fichero \"epg.data\":" # msgstr "¿Usar en \"Estrenos ahora\"?" -#: ../template/default/config.html:467 -#: ../template/default/help_config.html:153 +#: ../template/default/config.html:507 +#: ../template/default/help_config.html:163 msgid "VFAT:" msgstr "VFAT:" -#: ../template/default/config.html:488 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:159 +#: ../template/default/config.html:528 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:169 msgid "Channel Selections" msgstr "Emisoras preferidas" -#: ../template/default/config.html:498 +#: ../template/default/config.html:538 msgid "In \"Timeline\"?" msgstr "¿Usar en \"Tabla de tiempo\"?" -#: ../template/default/config.html:507 +#: ../template/default/config.html:547 msgid "In \"Channels\"?" msgstr "¿En \"Emisoras\"?" -#: ../template/default/config.html:516 +#: ../template/default/config.html:556 msgid "In \"Playing Today\"?" msgstr "¿En \"Estrenos hoy\"?" -#: ../template/default/config.html:525 +#: ../template/default/config.html:565 msgid "In \"What's On Now\"?" msgstr "¿Usar en \"Estrenos ahora\"?" -#: ../template/default/config.html:534 +#: ../template/default/config.html:574 msgid "In \"AutoTimer\"?" msgstr "¿Usar en \"Autoprogramaciones\"?" -#: ../template/default/config.html:543 +#: ../template/default/config.html:583 #, fuzzy msgid "In \"Watch TV\"?" msgstr "Televisión" -#: ../template/default/config.html:584 +#: ../template/default/config.html:624 msgid "Apply" msgstr "Establecer" @@ -651,26 +679,26 @@ msgstr "Añadir programación" msgid "Date" msgstr "Fecha" -#: ../template/default/timer_list.html:307 +#: ../template/default/timer_list.html:306 +msgid "Edit timer status?" +msgstr "¿Cambiar estado de la programación?" + +#: ../template/default/timer_list.html:308 msgid "This timer is inactive!" msgstr "¡Esta programación está desactivada!" -#: ../template/default/timer_list.html:310 +#: ../template/default/timer_list.html:311 msgid "This timer is impossible!" msgstr "¡Esta programación es imposible!" -#: ../template/default/timer_list.html:313 +#: ../template/default/timer_list.html:314 msgid "No more timers on other transponders possible!" msgstr "¡No se puede añadir más programaciones!" -#: ../template/default/timer_list.html:316 +#: ../template/default/timer_list.html:317 msgid "Timer OK." msgstr "Esta programación es valida." -#: ../template/default/timer_list.html:321 -msgid "Edit timer status?" -msgstr "¿Cambiar estado de la programación?" - #: ../template/default/timer_list.html:324 msgid "VPS" msgstr "VPS" @@ -684,7 +712,7 @@ msgid "Delete Selected Timers" msgstr "Borrar programaciones elegidas" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../template/i18n.pl:5 +#: ../vdradmind.pl:4286 msgid "Channels" msgstr "EPG por emisoras" @@ -750,7 +778,7 @@ msgstr "Buscar la película en la base de datos de películas en Internet (IMDb)" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../template/i18n.pl:7 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4288 msgid "Recordings" msgstr "Grabaciones" @@ -863,11 +891,11 @@ msgstr "" #: ../template/default/help_config.html:67 #: ../template/default/help_config.html:83 #: ../template/default/help_config.html:95 -#: ../template/default/help_config.html:111 -#: ../template/default/help_config.html:129 -#: ../template/default/help_config.html:143 -#: ../template/default/help_config.html:156 -#: ../template/default/help_config.html:163 +#: ../template/default/help_config.html:119 +#: ../template/default/help_config.html:139 +#: ../template/default/help_config.html:153 +#: ../template/default/help_config.html:166 +#: ../template/default/help_config.html:173 msgid "Top" msgstr "Al principio" @@ -948,7 +976,7 @@ msgstr "" "aparece en la lista de selección al principio de la página." #: ../template/default/help_config.html:93 -#: ../template/default/help_config.html:109 +#: ../template/default/help_config.html:117 msgid "Here you can (de-)activate the tooltips." msgstr "" @@ -963,7 +991,7 @@ msgstr "" "autoprogramaciones." #: ../template/default/help_config.html:105 -#: ../template/default/help_config.html:117 +#: ../template/default/help_config.html:125 #: ../template/default/help_timer_new.html:62 #: ../template/default/help_at_timer_new.html:53 msgid "" @@ -999,7 +1027,7 @@ msgstr "" "grabación." #: ../template/default/help_config.html:107 -#: ../template/default/help_config.html:119 +#: ../template/default/help_config.html:127 #: ../template/default/help_timer_new.html:64 #: ../template/default/help_at_timer_new.html:55 msgid "" @@ -1021,7 +1049,28 @@ msgstr "" "grabación nueva, cuando se han pasado los dias ajustados y garantizados " "desde su <strong>dia de grabación</strong>." -#: ../template/default/help_config.html:121 +#: ../template/default/help_config.html:109 +msgid "" +"VDRAdmin will send an email whenever an event matches an AutoTimer and a " +"timer has been programmed if you enable this feature. This requires that you " +"have the sendEmail programm (which you will find <a target=\"_new\" href=" +"\"http://caspian.dotconf.net/menu/Software/SendEmail/\">here</a>) located in " +"PATH." +msgstr "" + +#: ../template/default/help_config.html:111 +msgid "Here you set the sending domain of the generated email." +msgstr "" + +#: ../template/default/help_config.html:113 +msgid "The email address the email is sent to." +msgstr "" + +#: ../template/default/help_config.html:115 +msgid "The outgoing mail server." +msgstr "" + +#: ../template/default/help_config.html:129 msgid "" "The number of minutes VDRAdmin subtracts from the broadcasts start time " "found in the EPG. This value is used for timers programmed by AutoTimer and " @@ -1032,7 +1081,7 @@ msgstr "" "programaciones programadas de Autoprogramaciones como aquellas programadas " "haciendo clic en \"Grabar\" en cualquier vista de EPG." -#: ../template/default/help_config.html:123 +#: ../template/default/help_config.html:131 msgid "" "The number of minutes VDRAdmin adds to the broadcasts stop time found in the " "EPG. This value is used for timers programmed by AutoTimer and timers " @@ -1043,15 +1092,21 @@ msgstr "" "para programaciones programadas de Autoprogramaciones como aquellas " "programadas haciendo clic en \"Grabar\" en cualquier vista de EPG." -#: ../template/default/help_config.html:125 +#: ../template/default/help_config.html:133 msgid "Here you can (de-)activate the tooltips in the timeline." msgstr "" -#: ../template/default/help_config.html:127 +#: ../template/default/help_config.html:135 msgid "Here you can (de-)activate the tooltips in the list." msgstr "" -#: ../template/default/help_config.html:135 +#: ../template/default/help_config.html:137 +msgid "" +"If you don't want VDRAdmin to add the summary taken from EPG to new timers " +"you can switch it off here." +msgstr "" + +#: ../template/default/help_config.html:145 msgid "" "Enable or disable live streaming using the <a href=\"http://www.magoa.net/" "linux/\">streamdev plugin</a>. You also have to set the correct <span class=" @@ -1062,7 +1117,7 @@ msgstr "" "correctamente el <span class=\"ref_label\">puerto HTTP para flujo</span> más " "abajo." -#: ../template/default/help_config.html:137 +#: ../template/default/help_config.html:147 msgid "" "Here you have to set the port number your VDR's streamdev server listens for " "connections. Additionally you can also provide the stream type you like to " @@ -1071,7 +1126,7 @@ msgstr "" "Aquí se ajusta el numero del puerto del servidor del streamdev de VDR. " "Además puedes elegir el tipo del flujo." -#: ../template/default/help_config.html:139 +#: ../template/default/help_config.html:149 msgid "" "Enable or disable streaming of recordings.<br />Well actually this is no " "real \"streaming\", but you have to setup your workstation so that it can " @@ -1089,7 +1144,7 @@ msgstr "" "navegador y reproductor multimedia, verás las grabaciones en la pantalla del " "ordenador." -#: ../template/default/help_config.html:141 +#: ../template/default/help_config.html:151 msgid "" "This is the path where your workstation can access VDR's recordings. This " "depends on your VDR and workstation setup, for example \"\\\\vdr\\videos\" " @@ -1099,7 +1154,7 @@ msgstr "" "Depende de la configuración de los dos, p.e. \"\\\\vdr\\videos\" o \"V:\\" "\" (en Windows) o \"/mnt/videos\" (en Linux)." -#: ../template/default/help_config.html:147 +#: ../template/default/help_config.html:157 msgid "" "<p>This section is for experts <strong>only</strong>, i.e. you know what you " "are doing!</p>" @@ -1107,7 +1162,7 @@ msgstr "" "<p>Esta sección es <strong>sólo</strong> para expertos, ¡es bastante " "importante saber que haces!</p>" -#: ../template/default/help_config.html:150 +#: ../template/default/help_config.html:160 msgid "" "Accessing VDR's EPG through VDR's SVDRPort seems to block VDR for some time. " "If this option is activated VDRAdmin will read the <span class=\"ref_file" @@ -1118,7 +1173,7 @@ msgstr "" "fichero <span class=\"ref_file\">epg.data</span> directamente, evitando así " "un bloqueo de VDR. " -#: ../template/default/help_config.html:152 +#: ../template/default/help_config.html:162 msgid "" "If you've enabled the option above you need to tell VDRAdmin where the <span " "class=\"ref_file\">epg.data</span> file is located." @@ -1126,7 +1181,7 @@ msgstr "" "Si la opción de arriba está habilitada, hace falta verificar la ubicación " "del fichero de <span class=\"ref_file\">epg.data</span> de VDRAdmin." -#: ../template/default/help_config.html:154 +#: ../template/default/help_config.html:164 msgid "" "If you have compiled VDR with the VFAT define you have to enable this " "option. If this option is set to the wrong value, you may have problems with " @@ -1136,7 +1191,7 @@ msgstr "" "opción. Si no está activada, puede causar problemas con flujos sobre red o " "ejecutando un orden del fichero <span class=\"ref_file\">reccmd.conf</span>." -#: ../template/default/help_config.html:160 +#: ../template/default/help_config.html:170 msgid "" "<p>If you want to limit the number of channels used in some parts of " "VDRAdmin, this is for you!</p><p>Use the radio buttons to activate or " @@ -1166,7 +1221,7 @@ msgid "to" msgstr "hasta" #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2472 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2489 msgid "Playing Today" msgstr "Estrenos hoy" @@ -1812,113 +1867,113 @@ msgstr "Televisión" msgid "Search" msgstr "Buscar" -#: ../vdradmind.pl:274 +#: ../vdradmind.pl:280 msgid "What's your VDR hostname (e.g video.intra.net)?" msgstr "¿Cuál es el nombre del sitio del VDR (p.e. video.intra.net)?" -#: ../vdradmind.pl:275 +#: ../vdradmind.pl:281 msgid "On which port does VDR listen to SVDRP queries?" msgstr "¿Cuál puerto esta vigilando VDR para requeridas de SVDRP?" -#: ../vdradmind.pl:276 +#: ../vdradmind.pl:282 msgid "On which address should VDRAdmin listen (0.0.0.0 for any)?" msgstr "¿En qué dirección debe VDRAdmin escuchar (0.0.0.0 para todas)?" -#: ../vdradmind.pl:277 +#: ../vdradmind.pl:283 msgid "On which port should VDRAdmin listen?" msgstr "¿Qué puerto debe VDRAdmin esperar órdenes?" -#: ../vdradmind.pl:278 +#: ../vdradmind.pl:284 msgid "Username?" msgstr "¿Nombre del usuario?" -#: ../vdradmind.pl:279 +#: ../vdradmind.pl:285 msgid "Password?" msgstr "¿Contraseña?" -#: ../vdradmind.pl:280 +#: ../vdradmind.pl:286 msgid "Where are your recordings stored?" msgstr "Introduce la ruta de las grabaciones:" -#: ../vdradmind.pl:281 +#: ../vdradmind.pl:287 msgid "Where are your VDR's configuration files located?" msgstr "Introduce la ruta de los archivos de configuración:" -#: ../vdradmind.pl:287 +#: ../vdradmind.pl:293 msgid "Config file written successfully." msgstr "¡Los archivos de configuración han creado!" -#: ../vdradmind.pl:336 +#: ../vdradmind.pl:346 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s se ha iniciado con pid %d." -#: ../vdradmind.pl:2472 -msgid "Playing Tomorrow" -msgstr "Estrenos mañana" - -#: ../vdradmind.pl:2472 -#, perl-format -msgid "Playing on the %d." -msgstr "Estrenos en %d" - -#: ../vdradmind.pl:4284 -msgid "System default" -msgstr "" - -#: ../template/i18n.pl:3 -msgid "Playing Today?" -msgstr "¿Estrenos hoy?" - -#: ../template/i18n.pl:6 -msgid "Timers" -msgstr "Programaciones" - -#: ../template/i18n.pl:11 +#: ../vdradmind.pl:401 ../vdradmind.pl:990 ../vdradmind.pl:1798 msgid "Not found" msgstr "No encontrado" -#: ../template/i18n.pl:12 +#: ../vdradmind.pl:401 ../vdradmind.pl:1799 msgid "The requested URL was not found on this server!" msgstr "¡No encontrado la URL requerida, en el servidor!" -#: ../template/i18n.pl:13 -#, perl-format -msgid "The URL \"%s\" was not found on this server!" -msgstr "¡No encontrado la URL %s en el servidor!" - -#: ../template/i18n.pl:14 +#: ../vdradmind.pl:466 ../vdradmind.pl:986 ../vdradmind.pl:1801 msgid "Forbidden" msgstr "Prohibido" -#: ../template/i18n.pl:15 +#: ../vdradmind.pl:466 ../vdradmind.pl:1802 msgid "You don't have permission to access this function!" msgstr "¡No tienes permiso para ésta funcción!" -#: ../template/i18n.pl:16 +#: ../vdradmind.pl:986 ../vdradmind.pl:1803 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "¡Acceso al archivo \"%s\" negado!" -#: ../template/i18n.pl:17 +#: ../vdradmind.pl:990 ../vdradmind.pl:1800 +#, perl-format +msgid "The URL \"%s\" was not found on this server!" +msgstr "¡No encontrado la URL %s en el servidor!" + +#: ../vdradmind.pl:1804 #, perl-format msgid "Can't open file \"%s\"!" msgstr "¡No se pudo abrir el archivo \"%s\" !" -#: ../template/i18n.pl:18 +#: ../vdradmind.pl:1805 #, perl-format msgid "Can't connect to VDR at %s!" msgstr "¡No se pudo estabilizar la conexión a %s!" -#: ../template/i18n.pl:19 +#: ../vdradmind.pl:1806 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Error mientras mandó el orden a %s " -#: ../template/i18n.pl:23 +#: ../vdradmind.pl:2489 +msgid "Playing Tomorrow" +msgstr "Estrenos mañana" + +#: ../vdradmind.pl:2489 +#, perl-format +msgid "Playing on the %d." +msgstr "Estrenos en %d" + +#: ../vdradmind.pl:3805 msgid "Schedule" msgstr "Vista general" +#: ../vdradmind.pl:4284 +msgid "Playing Today?" +msgstr "¿Estrenos hoy?" + +#: ../vdradmind.pl:4287 +msgid "Timers" +msgstr "Programaciones" + +#: ../vdradmind.pl:4350 +msgid "System default" +msgstr "" + #~ msgid "Gets active after restarting VDRAdmin" #~ msgstr "Se va a ser visible despúes de reiniciar VDRAdmin" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-0.97-AM3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-20 14:08+0200\n" +"POT-Creation-Date: 2005-11-04 13:15+0100\n" "PO-Revision-Date: 2005-06-17 12:36+0200\n" "Last-Translator: Rofa\n" "Language-Team: Suomi\n" @@ -65,14 +65,15 @@ msgstr "Aktiivinen:" #: ../template/default/timer_new.html:75 #: ../template/default/at_timer_list.html:133 -#: ../template/default/config.html:182 ../template/default/config.html:233 -#: ../template/default/config.html:262 ../template/default/config.html:303 -#: ../template/default/config.html:354 ../template/default/config.html:363 -#: ../template/default/config.html:391 ../template/default/config.html:406 -#: ../template/default/config.html:454 ../template/default/config.html:469 -#: ../template/default/config.html:500 ../template/default/config.html:509 -#: ../template/default/config.html:518 ../template/default/config.html:527 -#: ../template/default/config.html:536 ../template/default/config.html:545 +#: ../template/default/config.html:186 ../template/default/config.html:237 +#: ../template/default/config.html:266 ../template/default/config.html:307 +#: ../template/default/config.html:334 ../template/default/config.html:385 +#: ../template/default/config.html:394 ../template/default/config.html:403 +#: ../template/default/config.html:431 ../template/default/config.html:446 +#: ../template/default/config.html:494 ../template/default/config.html:509 +#: ../template/default/config.html:540 ../template/default/config.html:549 +#: ../template/default/config.html:558 ../template/default/config.html:567 +#: ../template/default/config.html:576 ../template/default/config.html:585 #: ../template/default/timer_list.html:322 #: ../template/default/at_timer_new.html:48 #: ../template/default/at_timer_new.html:52 @@ -82,14 +83,15 @@ msgstr "Kyllä" #: ../template/default/timer_new.html:76 #: ../template/default/at_timer_list.html:135 -#: ../template/default/config.html:183 ../template/default/config.html:234 -#: ../template/default/config.html:263 ../template/default/config.html:304 -#: ../template/default/config.html:355 ../template/default/config.html:364 -#: ../template/default/config.html:392 ../template/default/config.html:407 -#: ../template/default/config.html:455 ../template/default/config.html:470 -#: ../template/default/config.html:501 ../template/default/config.html:510 -#: ../template/default/config.html:519 ../template/default/config.html:528 -#: ../template/default/config.html:537 ../template/default/config.html:546 +#: ../template/default/config.html:187 ../template/default/config.html:238 +#: ../template/default/config.html:267 ../template/default/config.html:308 +#: ../template/default/config.html:335 ../template/default/config.html:386 +#: ../template/default/config.html:395 ../template/default/config.html:404 +#: ../template/default/config.html:432 ../template/default/config.html:447 +#: ../template/default/config.html:495 ../template/default/config.html:510 +#: ../template/default/config.html:541 ../template/default/config.html:550 +#: ../template/default/config.html:559 ../template/default/config.html:568 +#: ../template/default/config.html:577 ../template/default/config.html:586 #: ../template/default/timer_list.html:323 #: ../template/default/at_timer_new.html:49 #: ../template/default/at_timer_new.html:53 @@ -188,10 +190,10 @@ msgstr "Lopetusaika:" #: ../template/default/timer_new.html:144 #: ../template/default/at_timer_list.html:24 -#: ../template/default/config.html:275 ../template/default/config.html:328 +#: ../template/default/config.html:279 ../template/default/config.html:359 #: ../template/default/timer_list.html:27 #: ../template/default/help_config.html:104 -#: ../template/default/help_config.html:116 +#: ../template/default/help_config.html:124 #: ../template/default/help_timer_new.html:61 #: ../template/default/help_at_timer_new.html:52 #: ../template/default/at_timer_new.html:128 @@ -200,10 +202,10 @@ msgstr "Prioriteetti:" #: ../template/default/timer_new.html:150 #: ../template/default/at_timer_list.html:24 -#: ../template/default/config.html:281 ../template/default/config.html:334 +#: ../template/default/config.html:285 ../template/default/config.html:365 #: ../template/default/timer_list.html:27 #: ../template/default/help_config.html:106 -#: ../template/default/help_config.html:118 +#: ../template/default/help_config.html:126 #: ../template/default/help_timer_new.html:63 #: ../template/default/help_at_timer_new.html:54 #: ../template/default/at_timer_new.html:136 @@ -220,7 +222,7 @@ msgstr "Tallenteen nimi:" msgid "Summary:" msgstr "Tallenteen kuvaus:" -#: ../template/default/timer_new.html:174 ../template/default/config.html:583 +#: ../template/default/timer_new.html:174 ../template/default/config.html:623 #: ../template/default/at_timer_new.html:176 msgid "Save" msgstr "Tallenna" @@ -262,7 +264,7 @@ msgstr "" #: ../template/default/at_timer_list.html:6 #: ../template/default/at_timer_list.html:36 -#: ../template/default/config.html:250 ../template/default/help_config.html:38 +#: ../template/default/config.html:254 ../template/default/help_config.html:38 #: ../template/default/help_config.html:98 #: ../template/default/help_at_timer_list.html:6 #: ../template/default/help_at_timer_list.html:22 @@ -337,7 +339,7 @@ msgstr "Poistetaanko valitut ajastimet?" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../template/i18n.pl:2 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4283 msgid "What's On Now?" msgstr "Menossa nyt" @@ -414,196 +416,222 @@ msgstr "Käyttäjätunnukseton osoiteavaruus:" msgid "Language:" msgstr "Kieli:" -#: ../template/default/config.html:116 ../template/default/help_config.html:38 +#: ../template/default/config.html:120 ../template/default/help_config.html:38 #: ../template/default/help_config.html:56 msgid "VDR" msgstr "VDR" -#: ../template/default/config.html:126 ../template/default/help_config.html:58 +#: ../template/default/config.html:130 ../template/default/help_config.html:58 msgid "Number of DVB cards:" msgstr "DVB-korttien lukumäärä:" -#: ../template/default/config.html:132 ../template/default/help_config.html:60 +#: ../template/default/config.html:136 ../template/default/help_config.html:60 msgid "Path to recordings:" msgstr "VDR-tallenteiden polku:" -#: ../template/default/config.html:138 ../template/default/help_config.html:62 +#: ../template/default/config.html:142 ../template/default/help_config.html:62 msgid "Path to configuration files:" msgstr "Konfigurointitiedostojen polku:" -#: ../template/default/config.html:144 ../template/default/help_config.html:64 +#: ../template/default/config.html:148 ../template/default/help_config.html:64 msgid "Path to EPG images:" msgstr "Ohjelmisto-oppaan kuvapolku:" -#: ../template/default/config.html:158 ../template/default/help_config.html:38 +#: ../template/default/config.html:162 ../template/default/help_config.html:38 #: ../template/default/help_config.html:70 msgid "Identification" msgstr "Käyttäjätunnistus" -#: ../template/default/config.html:168 ../template/default/help_config.html:72 +#: ../template/default/config.html:172 ../template/default/help_config.html:72 msgid "Username:" msgstr "Käyttäjätunnus:" -#: ../template/default/config.html:174 ../template/default/help_config.html:74 +#: ../template/default/config.html:178 ../template/default/help_config.html:74 msgid "Password:" msgstr "Salasana:" -#: ../template/default/config.html:180 ../template/default/help_config.html:76 +#: ../template/default/config.html:184 ../template/default/help_config.html:76 msgid "Guest Account:" msgstr "Sallitaanko vierailija:" -#: ../template/default/config.html:189 ../template/default/help_config.html:78 +#: ../template/default/config.html:193 ../template/default/help_config.html:78 msgid "Guest Username:" msgstr "Vierailijan käyttäjätunnus:" -#: ../template/default/config.html:195 ../template/default/help_config.html:80 +#: ../template/default/config.html:199 ../template/default/help_config.html:80 msgid "Guest Password:" msgstr "Vierailijan salasana:" -#: ../template/default/config.html:209 ../template/default/help_config.html:38 +#: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../template/i18n.pl:4 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4285 msgid "Timeline" msgstr "Aikajana" -#: ../template/default/config.html:219 ../template/default/help_config.html:88 +#: ../template/default/config.html:223 ../template/default/help_config.html:88 msgid "Hours:" msgstr "Pituus tunteina:" -#: ../template/default/config.html:225 ../template/default/help_config.html:90 +#: ../template/default/config.html:229 ../template/default/help_config.html:90 msgid "Times:" msgstr "Ajankohdat:" -#: ../template/default/config.html:231 ../template/default/config.html:301 +#: ../template/default/config.html:235 ../template/default/config.html:332 #: ../template/default/help_config.html:92 -#: ../template/default/help_config.html:108 +#: ../template/default/help_config.html:116 msgid "Tooltips:" msgstr "Lisätietolaatikot:" -#: ../template/default/config.html:260 +#: ../template/default/config.html:264 #: ../template/default/help_config.html:100 msgid "Active:" msgstr "Käytössä:" -#: ../template/default/config.html:269 +#: ../template/default/config.html:273 #: ../template/default/help_config.html:102 msgid "Timeout:" msgstr "Odotusaika:" -#: ../template/default/config.html:270 ../template/default/config.html:341 -#: ../template/default/config.html:347 +#: ../template/default/config.html:274 ../template/default/config.html:372 +#: ../template/default/config.html:378 msgid "minutes" msgstr "minuuttia" -#: ../template/default/config.html:288 ../template/default/config.html:340 -#: ../template/default/help_config.html:120 +#: ../template/default/config.html:292 ../template/default/config.html:371 +#: ../template/default/help_config.html:128 msgid "Time Margin at Start:" msgstr "Aloitusmarginaali:" -#: ../template/default/config.html:294 ../template/default/config.html:346 -#: ../template/default/help_config.html:122 +#: ../template/default/config.html:298 ../template/default/config.html:377 +#: ../template/default/help_config.html:130 msgid "Time Margin at Stop:" msgstr "Lopetusmarginaali:" -#: ../template/default/config.html:318 ../template/default/timer_list.html:6 +#: ../template/default/config.html:305 +#: ../template/default/help_config.html:108 +#, fuzzy +msgid "Send email after programming timer:" +msgstr "Muista ohjelmoidut ajastimet:" + +#: ../template/default/config.html:314 +#: ../template/default/help_config.html:110 +msgid "Send email as:" +msgstr "" + +#: ../template/default/config.html:320 +#: ../template/default/help_config.html:112 +msgid "Send email to:" +msgstr "" + +#: ../template/default/config.html:326 +#: ../template/default/help_config.html:114 +msgid "Mail server:" +msgstr "" + +#: ../template/default/config.html:349 ../template/default/timer_list.html:6 #: ../template/default/timer_list.html:44 #: ../template/default/help_config.html:38 -#: ../template/default/help_config.html:114 +#: ../template/default/help_config.html:122 #: ../template/default/help_timer_list.html:6 #: ../template/default/help_timer_list.html:22 #: ../template/default/navigation.html:46 msgid "Timer" msgstr "Ajastimet" -#: ../template/default/config.html:352 -#: ../template/default/help_config.html:124 +#: ../template/default/config.html:383 +#: ../template/default/help_config.html:132 msgid "Tooltips in timeline:" msgstr "Lisätietolaatikot \"Aikajana\"-sivulla:" -#: ../template/default/config.html:361 -#: ../template/default/help_config.html:126 +#: ../template/default/config.html:392 +#: ../template/default/help_config.html:134 msgid "Tooltips in list:" msgstr "Lisätietolaatikot \"Ajastimet\"-sivulla:" -#: ../template/default/config.html:379 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:132 +#: ../template/default/config.html:401 +#: ../template/default/help_config.html:136 +msgid "Add summary to new timers:" +msgstr "" + +#: ../template/default/config.html:419 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:142 msgid "Streaming" msgstr "Suoratoisto" -#: ../template/default/config.html:389 -#: ../template/default/help_config.html:134 +#: ../template/default/config.html:429 +#: ../template/default/help_config.html:144 msgid "Live Streaming:" msgstr "Live-kuvan suoratoisto:" -#: ../template/default/config.html:398 -#: ../template/default/help_config.html:136 +#: ../template/default/config.html:438 +#: ../template/default/help_config.html:146 msgid "HTTP Port of Streamdev (also possible 3000/ts):" msgstr "Streamdev-laajennoksen HTTP-portti (esim. 3000/ts):" -#: ../template/default/config.html:404 -#: ../template/default/help_config.html:138 +#: ../template/default/config.html:444 +#: ../template/default/help_config.html:148 msgid "Recordings Streaming:" msgstr "Tallenteiden suoratoisto:" -#: ../template/default/config.html:413 -#: ../template/default/help_config.html:140 +#: ../template/default/config.html:453 +#: ../template/default/help_config.html:150 msgid "Path to VDR Recordings on your workstation:" msgstr "VDR-tallenteiden polku työasemallasi:" -#: ../template/default/config.html:420 +#: ../template/default/config.html:460 msgid "Bandwidth of Streams:" msgstr "Kaistanleveys:" -#: ../template/default/config.html:442 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:146 +#: ../template/default/config.html:482 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:156 msgid "Expert" msgstr "Guru-käyttäjä" -#: ../template/default/config.html:452 -#: ../template/default/help_config.html:149 +#: ../template/default/config.html:492 +#: ../template/default/help_config.html:159 msgid "Read EPG directly using epg.data:" msgstr "Lue ohjelmatiedot suoraan tiedostosta:" -#: ../template/default/config.html:461 -#: ../template/default/help_config.html:151 +#: ../template/default/config.html:501 +#: ../template/default/help_config.html:161 msgid "epg.data filename:" msgstr "Tiedosto ohjelmatiedoille:" -#: ../template/default/config.html:467 -#: ../template/default/help_config.html:153 +#: ../template/default/config.html:507 +#: ../template/default/help_config.html:163 msgid "VFAT:" msgstr "VFAT-tuki:" -#: ../template/default/config.html:488 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:159 +#: ../template/default/config.html:528 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:169 msgid "Channel Selections" msgstr "Kanavavalinnat" -#: ../template/default/config.html:498 +#: ../template/default/config.html:538 msgid "In \"Timeline\"?" msgstr "Käytä kanavavalintoja \"Aikajana\"-sivulla" -#: ../template/default/config.html:507 +#: ../template/default/config.html:547 msgid "In \"Channels\"?" msgstr "Käytä kanavavalintoja \"Kanavat\"-sivulla" -#: ../template/default/config.html:516 +#: ../template/default/config.html:556 msgid "In \"Playing Today\"?" msgstr "Käytä kanavavalintoja \"Ohjelmisto tänään\"-sivulla" -#: ../template/default/config.html:525 +#: ../template/default/config.html:565 msgid "In \"What's On Now\"?" msgstr "Käytä kanavavalintoja \"Menossa nyt\"-sivulla" -#: ../template/default/config.html:534 +#: ../template/default/config.html:574 msgid "In \"AutoTimer\"?" msgstr "Käytä kanavavalintoja \"Hakuajastimet\"-sivulla" -#: ../template/default/config.html:543 +#: ../template/default/config.html:583 msgid "In \"Watch TV\"?" msgstr "Käytä kanavavalintoja \"Katso TV:tä\"-sivulla" -#: ../template/default/config.html:584 +#: ../template/default/config.html:624 msgid "Apply" msgstr "Käytä" @@ -634,26 +662,26 @@ msgstr "Uusi ajastin" msgid "Date" msgstr "Päivämäärä" -#: ../template/default/timer_list.html:307 +#: ../template/default/timer_list.html:306 +msgid "Edit timer status?" +msgstr "Muokataanko ajastinta?" + +#: ../template/default/timer_list.html:308 msgid "This timer is inactive!" msgstr "Ajastin ei ole aktiivinen!" -#: ../template/default/timer_list.html:310 +#: ../template/default/timer_list.html:311 msgid "This timer is impossible!" msgstr "Ajastin ei ole mahdollinen!" -#: ../template/default/timer_list.html:313 +#: ../template/default/timer_list.html:314 msgid "No more timers on other transponders possible!" msgstr "Maksimimäärä ajastimia käytössä!" -#: ../template/default/timer_list.html:316 +#: ../template/default/timer_list.html:317 msgid "Timer OK." msgstr "Ajastin kunnossa." -#: ../template/default/timer_list.html:321 -msgid "Edit timer status?" -msgstr "Muokataanko ajastinta?" - #: ../template/default/timer_list.html:324 msgid "VPS" msgstr "VPS" @@ -667,7 +695,7 @@ msgid "Delete Selected Timers" msgstr "Poista valitut ajastimet" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../template/i18n.pl:5 +#: ../vdradmind.pl:4286 msgid "Channels" msgstr "Kanavat" @@ -733,7 +761,7 @@ msgstr "etsi IMDB:stä" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../template/i18n.pl:7 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4288 msgid "Recordings" msgstr "Tallenteet" @@ -824,11 +852,11 @@ msgstr "" #: ../template/default/help_config.html:67 #: ../template/default/help_config.html:83 #: ../template/default/help_config.html:95 -#: ../template/default/help_config.html:111 -#: ../template/default/help_config.html:129 -#: ../template/default/help_config.html:143 -#: ../template/default/help_config.html:156 -#: ../template/default/help_config.html:163 +#: ../template/default/help_config.html:119 +#: ../template/default/help_config.html:139 +#: ../template/default/help_config.html:153 +#: ../template/default/help_config.html:166 +#: ../template/default/help_config.html:173 msgid "Top" msgstr "Alkuun" @@ -894,7 +922,7 @@ msgid "" msgstr "" #: ../template/default/help_config.html:93 -#: ../template/default/help_config.html:109 +#: ../template/default/help_config.html:117 msgid "Here you can (de-)activate the tooltips." msgstr "" @@ -907,7 +935,7 @@ msgid "The interval, the the EPG data is checked for updating the AutoTimers." msgstr "" #: ../template/default/help_config.html:105 -#: ../template/default/help_config.html:117 +#: ../template/default/help_config.html:125 #: ../template/default/help_timer_new.html:62 #: ../template/default/help_at_timer_new.html:53 msgid "" @@ -928,7 +956,7 @@ msgid "" msgstr "" #: ../template/default/help_config.html:107 -#: ../template/default/help_config.html:119 +#: ../template/default/help_config.html:127 #: ../template/default/help_timer_new.html:64 #: ../template/default/help_at_timer_new.html:55 msgid "" @@ -942,43 +970,70 @@ msgid "" "recording has passed by." msgstr "" -#: ../template/default/help_config.html:121 +#: ../template/default/help_config.html:109 +msgid "" +"VDRAdmin will send an email whenever an event matches an AutoTimer and a " +"timer has been programmed if you enable this feature. This requires that you " +"have the sendEmail programm (which you will find <a target=\"_new\" href=" +"\"http://caspian.dotconf.net/menu/Software/SendEmail/\">here</a>) located in " +"PATH." +msgstr "" + +#: ../template/default/help_config.html:111 +msgid "Here you set the sending domain of the generated email." +msgstr "" + +#: ../template/default/help_config.html:113 +msgid "The email address the email is sent to." +msgstr "" + +#: ../template/default/help_config.html:115 +msgid "The outgoing mail server." +msgstr "" + +#: ../template/default/help_config.html:129 msgid "" "The number of minutes VDRAdmin subtracts from the broadcasts start time " "found in the EPG. This value is used for timers programmed by AutoTimer and " "timers manually programmed when pressing \"Record\" in any EPG view." msgstr "" -#: ../template/default/help_config.html:123 +#: ../template/default/help_config.html:131 msgid "" "The number of minutes VDRAdmin adds to the broadcasts stop time found in the " "EPG. This value is used for timers programmed by AutoTimer and timers " "manually programmed when pressing \"Record\" in any EPG view." msgstr "" -#: ../template/default/help_config.html:125 +#: ../template/default/help_config.html:133 msgid "Here you can (de-)activate the tooltips in the timeline." msgstr "" -#: ../template/default/help_config.html:127 +#: ../template/default/help_config.html:135 msgid "Here you can (de-)activate the tooltips in the list." msgstr "" -#: ../template/default/help_config.html:135 +#: ../template/default/help_config.html:137 +msgid "" +"If you don't want VDRAdmin to add the summary taken from EPG to new timers " +"you can switch it off here." +msgstr "" + +#: ../template/default/help_config.html:145 msgid "" "Enable or disable live streaming using the <a href=\"http://www.magoa.net/" "linux/\">streamdev plugin</a>. You also have to set the correct <span class=" "\"ref_label\">HTTP Port for Streamdev</span> below." msgstr "" -#: ../template/default/help_config.html:137 +#: ../template/default/help_config.html:147 msgid "" "Here you have to set the port number your VDR's streamdev server listens for " "connections. Additionally you can also provide the stream type you like to " "use." msgstr "" -#: ../template/default/help_config.html:139 +#: ../template/default/help_config.html:149 msgid "" "Enable or disable streaming of recordings.<br />Well actually this is no " "real \"streaming\", but you have to setup your workstation so that it can " @@ -989,40 +1044,40 @@ msgid "" "display." msgstr "" -#: ../template/default/help_config.html:141 +#: ../template/default/help_config.html:151 msgid "" "This is the path where your workstation can access VDR's recordings. This " "depends on your VDR and workstation setup, for example \"\\\\vdr\\videos\" " "or \"V:\\\" (on Windows) or \"/mnt/videos\" (on Linux)." msgstr "" -#: ../template/default/help_config.html:147 +#: ../template/default/help_config.html:157 msgid "" "<p>This section is for experts <strong>only</strong>, i.e. you know what you " "are doing!</p>" msgstr "" -#: ../template/default/help_config.html:150 +#: ../template/default/help_config.html:160 msgid "" "Accessing VDR's EPG through VDR's SVDRPort seems to block VDR for some time. " "If this option is activated VDRAdmin will read the <span class=\"ref_file" "\">epg.data</span> file directly so that VDR doesn't get blocked." msgstr "" -#: ../template/default/help_config.html:152 +#: ../template/default/help_config.html:162 msgid "" "If you've enabled the option above you need to tell VDRAdmin where the <span " "class=\"ref_file\">epg.data</span> file is located." msgstr "" -#: ../template/default/help_config.html:154 +#: ../template/default/help_config.html:164 msgid "" "If you have compiled VDR with the VFAT define you have to enable this " "option. If this option is set to the wrong value, you may have problems with " "certain recordings if you want to stream them or run reccmds on them." msgstr "" -#: ../template/default/help_config.html:160 +#: ../template/default/help_config.html:170 msgid "" "<p>If you want to limit the number of channels used in some parts of " "VDRAdmin, this is for you!</p><p>Use the radio buttons to activate or " @@ -1043,7 +1098,7 @@ msgid "to" msgstr "-" #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2472 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2489 msgid "Playing Today" msgstr "Ohjelmisto tänään" @@ -1453,112 +1508,112 @@ msgstr "Katso TV:tä" msgid "Search" msgstr "Etsi" -#: ../vdradmind.pl:274 +#: ../vdradmind.pl:280 msgid "What's your VDR hostname (e.g video.intra.net)?" msgstr "Anna VDR-koneesi nimi (esim. video.intra.net):" -#: ../vdradmind.pl:275 +#: ../vdradmind.pl:281 msgid "On which port does VDR listen to SVDRP queries?" msgstr "Anna VDR-koneesi käyttämä SVDRP-portti:" -#: ../vdradmind.pl:276 +#: ../vdradmind.pl:282 msgid "On which address should VDRAdmin listen (0.0.0.0 for any)?" msgstr "Anna VDRAdminin käyttämä osoiteavaruus (0.0.0.0 ei rajoituksia):" -#: ../vdradmind.pl:277 +#: ../vdradmind.pl:283 msgid "On which port should VDRAdmin listen?" msgstr "Anna VDRAdminin käyttämä portti:" -#: ../vdradmind.pl:278 +#: ../vdradmind.pl:284 msgid "Username?" msgstr "Anna käyttäjätunnus VDRAdminia varten:" -#: ../vdradmind.pl:279 +#: ../vdradmind.pl:285 msgid "Password?" msgstr "Anna salasana VDRAdminia varten:" -#: ../vdradmind.pl:280 +#: ../vdradmind.pl:286 msgid "Where are your recordings stored?" msgstr "Anna VDR-koneesi tallennehakemiston polku:" -#: ../vdradmind.pl:281 +#: ../vdradmind.pl:287 msgid "Where are your VDR's configuration files located?" msgstr "Anna VDR-koneesi konfigurointihakemiston polku:" -#: ../vdradmind.pl:287 +#: ../vdradmind.pl:293 msgid "Config file written successfully." msgstr "VDRAdminin konfigurointitiedosto muodostettu." -#: ../vdradmind.pl:336 +#: ../vdradmind.pl:346 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmind.pl %s käynnistetty prosessitunnisteella %d." -#: ../vdradmind.pl:2472 -msgid "Playing Tomorrow" -msgstr "Ohjelmisto huomenna" - -#: ../vdradmind.pl:2472 -#, perl-format -msgid "Playing on the %d." -msgstr "Ohjelmisto %d. päivä" - -#: ../vdradmind.pl:4284 -msgid "System default" -msgstr "Oletus" - -#: ../template/i18n.pl:3 -msgid "Playing Today?" -msgstr "Tänään" - -#: ../template/i18n.pl:6 -msgid "Timers" -msgstr "Ajastimet" - -#: ../template/i18n.pl:11 +#: ../vdradmind.pl:401 ../vdradmind.pl:990 ../vdradmind.pl:1798 msgid "Not found" msgstr "Ei löydy" -#: ../template/i18n.pl:12 +#: ../vdradmind.pl:401 ../vdradmind.pl:1799 msgid "The requested URL was not found on this server!" msgstr "Pyydettyä URL:ia ei löydy palvelimelta!" -#: ../template/i18n.pl:13 -#, perl-format -msgid "The URL \"%s\" was not found on this server!" -msgstr "URL:ia \"%s\" ei löydy palvelimelta!" - -#: ../template/i18n.pl:14 +#: ../vdradmind.pl:466 ../vdradmind.pl:986 ../vdradmind.pl:1801 msgid "Forbidden" msgstr "Kielletty" -#: ../template/i18n.pl:15 +#: ../vdradmind.pl:466 ../vdradmind.pl:1802 msgid "You don't have permission to access this function!" msgstr "Puutteelliset käyttäjäoikeudet haluttuun toimintoon!" -#: ../template/i18n.pl:16 +#: ../vdradmind.pl:986 ../vdradmind.pl:1803 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Pääsy tiedostoon \"%s\" evätty!" -#: ../template/i18n.pl:17 +#: ../vdradmind.pl:990 ../vdradmind.pl:1800 +#, perl-format +msgid "The URL \"%s\" was not found on this server!" +msgstr "URL:ia \"%s\" ei löydy palvelimelta!" + +#: ../vdradmind.pl:1804 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Tiedoston \"%s\" avaus ei onnistu!" -#: ../template/i18n.pl:18 +#: ../vdradmind.pl:1805 #, perl-format msgid "Can't connect to VDR at %s!" msgstr "VDR:ään ei saada yhteyttä (%s)" -#: ../template/i18n.pl:19 +#: ../vdradmind.pl:1806 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Komennon lähetys VDR:lle epäonnistui (%s)" -#: ../template/i18n.pl:23 +#: ../vdradmind.pl:2489 +msgid "Playing Tomorrow" +msgstr "Ohjelmisto huomenna" + +#: ../vdradmind.pl:2489 +#, perl-format +msgid "Playing on the %d." +msgstr "Ohjelmisto %d. päivä" + +#: ../vdradmind.pl:3805 msgid "Schedule" msgstr "Ohjelmisto" +#: ../vdradmind.pl:4284 +msgid "Playing Today?" +msgstr "Tänään" + +#: ../vdradmind.pl:4287 +msgid "Timers" +msgstr "Ajastimet" + +#: ../vdradmind.pl:4350 +msgid "System default" +msgstr "Oletus" + #~ msgid "Gets active after restarting VDRAdmin" #~ msgstr "Aktivoituu VDRAdminin uudelleen käynnistyksellä" @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-0.97-AM3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-20 14:08+0200\n" +"POT-Creation-Date: 2005-11-04 13:15+0100\n" "PO-Revision-Date: 2005-10-04 14:02+0100\n" "Last-Translator: Trois Six <trois.six@free.fr>\n" "Language-Team: <fr@li.org>\n" @@ -79,14 +79,15 @@ msgstr "Programmation Active :" #: ../template/default/timer_new.html:75 #: ../template/default/at_timer_list.html:133 -#: ../template/default/config.html:182 ../template/default/config.html:233 -#: ../template/default/config.html:262 ../template/default/config.html:303 -#: ../template/default/config.html:354 ../template/default/config.html:363 -#: ../template/default/config.html:391 ../template/default/config.html:406 -#: ../template/default/config.html:454 ../template/default/config.html:469 -#: ../template/default/config.html:500 ../template/default/config.html:509 -#: ../template/default/config.html:518 ../template/default/config.html:527 -#: ../template/default/config.html:536 ../template/default/config.html:545 +#: ../template/default/config.html:186 ../template/default/config.html:237 +#: ../template/default/config.html:266 ../template/default/config.html:307 +#: ../template/default/config.html:334 ../template/default/config.html:385 +#: ../template/default/config.html:394 ../template/default/config.html:403 +#: ../template/default/config.html:431 ../template/default/config.html:446 +#: ../template/default/config.html:494 ../template/default/config.html:509 +#: ../template/default/config.html:540 ../template/default/config.html:549 +#: ../template/default/config.html:558 ../template/default/config.html:567 +#: ../template/default/config.html:576 ../template/default/config.html:585 #: ../template/default/timer_list.html:322 #: ../template/default/at_timer_new.html:48 #: ../template/default/at_timer_new.html:52 @@ -96,14 +97,15 @@ msgstr "Oui" #: ../template/default/timer_new.html:76 #: ../template/default/at_timer_list.html:135 -#: ../template/default/config.html:183 ../template/default/config.html:234 -#: ../template/default/config.html:263 ../template/default/config.html:304 -#: ../template/default/config.html:355 ../template/default/config.html:364 -#: ../template/default/config.html:392 ../template/default/config.html:407 -#: ../template/default/config.html:455 ../template/default/config.html:470 -#: ../template/default/config.html:501 ../template/default/config.html:510 -#: ../template/default/config.html:519 ../template/default/config.html:528 -#: ../template/default/config.html:537 ../template/default/config.html:546 +#: ../template/default/config.html:187 ../template/default/config.html:238 +#: ../template/default/config.html:267 ../template/default/config.html:308 +#: ../template/default/config.html:335 ../template/default/config.html:386 +#: ../template/default/config.html:395 ../template/default/config.html:404 +#: ../template/default/config.html:432 ../template/default/config.html:447 +#: ../template/default/config.html:495 ../template/default/config.html:510 +#: ../template/default/config.html:541 ../template/default/config.html:550 +#: ../template/default/config.html:559 ../template/default/config.html:568 +#: ../template/default/config.html:577 ../template/default/config.html:586 #: ../template/default/timer_list.html:323 #: ../template/default/at_timer_new.html:49 #: ../template/default/at_timer_new.html:53 @@ -202,10 +204,10 @@ msgstr "Heure De Fin :" #: ../template/default/timer_new.html:144 #: ../template/default/at_timer_list.html:24 -#: ../template/default/config.html:275 ../template/default/config.html:328 +#: ../template/default/config.html:279 ../template/default/config.html:359 #: ../template/default/timer_list.html:27 #: ../template/default/help_config.html:104 -#: ../template/default/help_config.html:116 +#: ../template/default/help_config.html:124 #: ../template/default/help_timer_new.html:61 #: ../template/default/help_at_timer_new.html:52 #: ../template/default/at_timer_new.html:128 @@ -214,10 +216,10 @@ msgstr "Priorité :" #: ../template/default/timer_new.html:150 #: ../template/default/at_timer_list.html:24 -#: ../template/default/config.html:281 ../template/default/config.html:334 +#: ../template/default/config.html:285 ../template/default/config.html:365 #: ../template/default/timer_list.html:27 #: ../template/default/help_config.html:106 -#: ../template/default/help_config.html:118 +#: ../template/default/help_config.html:126 #: ../template/default/help_timer_new.html:63 #: ../template/default/help_at_timer_new.html:54 #: ../template/default/at_timer_new.html:136 @@ -234,7 +236,7 @@ msgstr "Titre d'Enregistrement :" msgid "Summary:" msgstr "Sommaire :" -#: ../template/default/timer_new.html:174 ../template/default/config.html:583 +#: ../template/default/timer_new.html:174 ../template/default/config.html:623 #: ../template/default/at_timer_new.html:176 msgid "Save" msgstr "Enregistrer" @@ -278,7 +280,7 @@ msgstr "" #: ../template/default/at_timer_list.html:6 #: ../template/default/at_timer_list.html:36 -#: ../template/default/config.html:250 ../template/default/help_config.html:38 +#: ../template/default/config.html:254 ../template/default/help_config.html:38 #: ../template/default/help_config.html:98 #: ../template/default/help_at_timer_list.html:6 #: ../template/default/help_at_timer_list.html:22 @@ -353,7 +355,7 @@ msgstr "Supprimer Programmations Sélectionnées ?" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../template/i18n.pl:2 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4283 msgid "What's On Now?" msgstr "En ce Moment ?" @@ -430,197 +432,223 @@ msgstr "Réseau local (login non nécessaire) :" msgid "Language:" msgstr "" -#: ../template/default/config.html:116 ../template/default/help_config.html:38 +#: ../template/default/config.html:120 ../template/default/help_config.html:38 #: ../template/default/help_config.html:56 msgid "VDR" msgstr "VDR" -#: ../template/default/config.html:126 ../template/default/help_config.html:58 +#: ../template/default/config.html:130 ../template/default/help_config.html:58 msgid "Number of DVB cards:" msgstr "Nbre de Cartes DVB :" -#: ../template/default/config.html:132 ../template/default/help_config.html:60 +#: ../template/default/config.html:136 ../template/default/help_config.html:60 msgid "Path to recordings:" msgstr "Chemin des Enregistrements VDR :" -#: ../template/default/config.html:138 ../template/default/help_config.html:62 +#: ../template/default/config.html:142 ../template/default/help_config.html:62 msgid "Path to configuration files:" msgstr "Chemin vers les fichiers de configuration :" -#: ../template/default/config.html:144 ../template/default/help_config.html:64 +#: ../template/default/config.html:148 ../template/default/help_config.html:64 msgid "Path to EPG images:" msgstr "Chemin vers les images EPG :" -#: ../template/default/config.html:158 ../template/default/help_config.html:38 +#: ../template/default/config.html:162 ../template/default/help_config.html:38 #: ../template/default/help_config.html:70 msgid "Identification" msgstr "Identification" -#: ../template/default/config.html:168 ../template/default/help_config.html:72 +#: ../template/default/config.html:172 ../template/default/help_config.html:72 msgid "Username:" msgstr "Identifiant :" -#: ../template/default/config.html:174 ../template/default/help_config.html:74 +#: ../template/default/config.html:178 ../template/default/help_config.html:74 msgid "Password:" msgstr "Mot de Passe :" -#: ../template/default/config.html:180 ../template/default/help_config.html:76 +#: ../template/default/config.html:184 ../template/default/help_config.html:76 msgid "Guest Account:" msgstr "Compte d'Invité :" -#: ../template/default/config.html:189 ../template/default/help_config.html:78 +#: ../template/default/config.html:193 ../template/default/help_config.html:78 msgid "Guest Username:" msgstr "Identifiant Invité :" -#: ../template/default/config.html:195 ../template/default/help_config.html:80 +#: ../template/default/config.html:199 ../template/default/help_config.html:80 msgid "Guest Password:" msgstr "Mot de Passe Invité :" -#: ../template/default/config.html:209 ../template/default/help_config.html:38 +#: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../template/i18n.pl:4 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4285 msgid "Timeline" msgstr "Chronologie" -#: ../template/default/config.html:219 ../template/default/help_config.html:88 +#: ../template/default/config.html:223 ../template/default/help_config.html:88 msgid "Hours:" msgstr "Heures :" -#: ../template/default/config.html:225 ../template/default/help_config.html:90 +#: ../template/default/config.html:229 ../template/default/help_config.html:90 msgid "Times:" msgstr "Périodes :" -#: ../template/default/config.html:231 ../template/default/config.html:301 +#: ../template/default/config.html:235 ../template/default/config.html:332 #: ../template/default/help_config.html:92 -#: ../template/default/help_config.html:108 +#: ../template/default/help_config.html:116 msgid "Tooltips:" msgstr "" -#: ../template/default/config.html:260 +#: ../template/default/config.html:264 #: ../template/default/help_config.html:100 msgid "Active:" msgstr "Active :" -#: ../template/default/config.html:269 +#: ../template/default/config.html:273 #: ../template/default/help_config.html:102 msgid "Timeout:" msgstr "Timeout :" -#: ../template/default/config.html:270 ../template/default/config.html:341 -#: ../template/default/config.html:347 +#: ../template/default/config.html:274 ../template/default/config.html:372 +#: ../template/default/config.html:378 msgid "minutes" msgstr "minutes" -#: ../template/default/config.html:288 ../template/default/config.html:340 -#: ../template/default/help_config.html:120 +#: ../template/default/config.html:292 ../template/default/config.html:371 +#: ../template/default/help_config.html:128 msgid "Time Margin at Start:" msgstr "Marge avant :" -#: ../template/default/config.html:294 ../template/default/config.html:346 -#: ../template/default/help_config.html:122 +#: ../template/default/config.html:298 ../template/default/config.html:377 +#: ../template/default/help_config.html:130 msgid "Time Margin at Stop:" msgstr "Marge après :" -#: ../template/default/config.html:318 ../template/default/timer_list.html:6 +#: ../template/default/config.html:305 +#: ../template/default/help_config.html:108 +#, fuzzy +msgid "Send email after programming timer:" +msgstr "Se souvenir des programmations :" + +#: ../template/default/config.html:314 +#: ../template/default/help_config.html:110 +msgid "Send email as:" +msgstr "" + +#: ../template/default/config.html:320 +#: ../template/default/help_config.html:112 +msgid "Send email to:" +msgstr "" + +#: ../template/default/config.html:326 +#: ../template/default/help_config.html:114 +msgid "Mail server:" +msgstr "" + +#: ../template/default/config.html:349 ../template/default/timer_list.html:6 #: ../template/default/timer_list.html:44 #: ../template/default/help_config.html:38 -#: ../template/default/help_config.html:114 +#: ../template/default/help_config.html:122 #: ../template/default/help_timer_list.html:6 #: ../template/default/help_timer_list.html:22 #: ../template/default/navigation.html:46 msgid "Timer" msgstr "Programmation" -#: ../template/default/config.html:352 -#: ../template/default/help_config.html:124 +#: ../template/default/config.html:383 +#: ../template/default/help_config.html:132 msgid "Tooltips in timeline:" msgstr "" -#: ../template/default/config.html:361 -#: ../template/default/help_config.html:126 +#: ../template/default/config.html:392 +#: ../template/default/help_config.html:134 msgid "Tooltips in list:" msgstr "" -#: ../template/default/config.html:379 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:132 +#: ../template/default/config.html:401 +#: ../template/default/help_config.html:136 +msgid "Add summary to new timers:" +msgstr "" + +#: ../template/default/config.html:419 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:142 msgid "Streaming" msgstr "Emission de Flux" -#: ../template/default/config.html:389 -#: ../template/default/help_config.html:134 +#: ../template/default/config.html:429 +#: ../template/default/help_config.html:144 msgid "Live Streaming:" msgstr "Emission de Flux en direct:" -#: ../template/default/config.html:398 -#: ../template/default/help_config.html:136 +#: ../template/default/config.html:438 +#: ../template/default/help_config.html:146 msgid "HTTP Port of Streamdev (also possible 3000/ts):" msgstr "Port HTTP Streamdev (aussi possible 3000/ts) :" -#: ../template/default/config.html:404 -#: ../template/default/help_config.html:138 +#: ../template/default/config.html:444 +#: ../template/default/help_config.html:148 msgid "Recordings Streaming:" msgstr "Emission d'Enregistrements" -#: ../template/default/config.html:413 -#: ../template/default/help_config.html:140 +#: ../template/default/config.html:453 +#: ../template/default/help_config.html:150 msgid "Path to VDR Recordings on your workstation:" msgstr "Chemin vers les Enregistrements VDR sur votre poste de travail :" -#: ../template/default/config.html:420 +#: ../template/default/config.html:460 msgid "Bandwidth of Streams:" msgstr "Bande Passante Flux :" -#: ../template/default/config.html:442 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:146 +#: ../template/default/config.html:482 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:156 msgid "Expert" msgstr "Expert" -#: ../template/default/config.html:452 -#: ../template/default/help_config.html:149 +#: ../template/default/config.html:492 +#: ../template/default/help_config.html:159 msgid "Read EPG directly using epg.data:" msgstr "Lire l'EPG en utilisant directement epg.data :" -#: ../template/default/config.html:461 -#: ../template/default/help_config.html:151 +#: ../template/default/config.html:501 +#: ../template/default/help_config.html:161 msgid "epg.data filename:" msgstr "Nom du fichier epg.data :" -#: ../template/default/config.html:467 -#: ../template/default/help_config.html:153 +#: ../template/default/config.html:507 +#: ../template/default/help_config.html:163 msgid "VFAT:" msgstr "VFAT:" -#: ../template/default/config.html:488 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:159 +#: ../template/default/config.html:528 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:169 msgid "Channel Selections" msgstr "Sélections Chaînes" -#: ../template/default/config.html:498 +#: ../template/default/config.html:538 msgid "In \"Timeline\"?" msgstr "Dans \"Chronologie\" ?" -#: ../template/default/config.html:507 +#: ../template/default/config.html:547 msgid "In \"Channels\"?" msgstr "Dans \"Chaînes\" ?" -#: ../template/default/config.html:516 +#: ../template/default/config.html:556 msgid "In \"Playing Today\"?" msgstr "Dans \"Joué Aujourd'hui\" ?" -#: ../template/default/config.html:525 +#: ../template/default/config.html:565 msgid "In \"What's On Now\"?" msgstr "Dans \"En ce Moment\" ?" -#: ../template/default/config.html:534 +#: ../template/default/config.html:574 msgid "In \"AutoTimer\"?" msgstr "Dans \"Auto-Programmations\" ?" -#: ../template/default/config.html:543 +#: ../template/default/config.html:583 #, fuzzy msgid "In \"Watch TV\"?" msgstr "Regarder TV" -#: ../template/default/config.html:584 +#: ../template/default/config.html:624 msgid "Apply" msgstr "Appliquer" @@ -651,26 +679,26 @@ msgstr "Nouvelle Programmation" msgid "Date" msgstr "Date" -#: ../template/default/timer_list.html:307 +#: ../template/default/timer_list.html:306 +msgid "Edit timer status?" +msgstr "Changer Statut Programmation ?" + +#: ../template/default/timer_list.html:308 msgid "This timer is inactive!" msgstr "Cette Programmation est inactive !" -#: ../template/default/timer_list.html:310 +#: ../template/default/timer_list.html:311 msgid "This timer is impossible!" msgstr "Cette Programmation est impossible !" -#: ../template/default/timer_list.html:313 +#: ../template/default/timer_list.html:314 msgid "No more timers on other transponders possible!" msgstr "Pas plus de Programmations possibles !" -#: ../template/default/timer_list.html:316 +#: ../template/default/timer_list.html:317 msgid "Timer OK." msgstr "Programmation OK." -#: ../template/default/timer_list.html:321 -msgid "Edit timer status?" -msgstr "Changer Statut Programmation ?" - #: ../template/default/timer_list.html:324 msgid "VPS" msgstr "VPS" @@ -684,7 +712,7 @@ msgid "Delete Selected Timers" msgstr "Supprimer Programmations Sélectionnées" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../template/i18n.pl:5 +#: ../vdradmind.pl:4286 msgid "Channels" msgstr "Chaînes" @@ -750,7 +778,7 @@ msgstr "Plus de details sur Internet" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../template/i18n.pl:7 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4288 msgid "Recordings" msgstr "Enregistrements" @@ -863,11 +891,11 @@ msgstr "" #: ../template/default/help_config.html:67 #: ../template/default/help_config.html:83 #: ../template/default/help_config.html:95 -#: ../template/default/help_config.html:111 -#: ../template/default/help_config.html:129 -#: ../template/default/help_config.html:143 -#: ../template/default/help_config.html:156 -#: ../template/default/help_config.html:163 +#: ../template/default/help_config.html:119 +#: ../template/default/help_config.html:139 +#: ../template/default/help_config.html:153 +#: ../template/default/help_config.html:166 +#: ../template/default/help_config.html:173 msgid "Top" msgstr "Haut" @@ -952,7 +980,7 @@ msgstr "" "strong> qui apparaissent dans la boites de sélection placée en haut." #: ../template/default/help_config.html:93 -#: ../template/default/help_config.html:109 +#: ../template/default/help_config.html:117 msgid "Here you can (de-)activate the tooltips." msgstr "" @@ -967,7 +995,7 @@ msgstr "" "sont vérifiées pour mettre à jour les Auto-Programmations." #: ../template/default/help_config.html:105 -#: ../template/default/help_config.html:117 +#: ../template/default/help_config.html:125 #: ../template/default/help_timer_new.html:62 #: ../template/default/help_at_timer_new.html:53 msgid "" @@ -1004,7 +1032,7 @@ msgstr "" "plus faible pour démarrer l'enregistrement." #: ../template/default/help_config.html:107 -#: ../template/default/help_config.html:119 +#: ../template/default/help_config.html:127 #: ../template/default/help_timer_new.html:64 #: ../template/default/help_at_timer_new.html:55 msgid "" @@ -1027,7 +1055,28 @@ msgstr "" "enregistrement, jusqu'à ce que le nombre de jour donné depuis la date de " "<strong>démarrage</strong> de l'enregistrement soit dépassé." -#: ../template/default/help_config.html:121 +#: ../template/default/help_config.html:109 +msgid "" +"VDRAdmin will send an email whenever an event matches an AutoTimer and a " +"timer has been programmed if you enable this feature. This requires that you " +"have the sendEmail programm (which you will find <a target=\"_new\" href=" +"\"http://caspian.dotconf.net/menu/Software/SendEmail/\">here</a>) located in " +"PATH." +msgstr "" + +#: ../template/default/help_config.html:111 +msgid "Here you set the sending domain of the generated email." +msgstr "" + +#: ../template/default/help_config.html:113 +msgid "The email address the email is sent to." +msgstr "" + +#: ../template/default/help_config.html:115 +msgid "The outgoing mail server." +msgstr "" + +#: ../template/default/help_config.html:129 msgid "" "The number of minutes VDRAdmin subtracts from the broadcasts start time " "found in the EPG. This value is used for timers programmed by AutoTimer and " @@ -1039,7 +1088,7 @@ msgstr "" "une pression sur \"Enregistrement\" sur tout affichage d'un guide " "électronique des programmes." -#: ../template/default/help_config.html:123 +#: ../template/default/help_config.html:131 msgid "" "The number of minutes VDRAdmin adds to the broadcasts stop time found in the " "EPG. This value is used for timers programmed by AutoTimer and timers " @@ -1052,15 +1101,21 @@ msgstr "" "une pression sur \"Enregistrement\" sur tout affichage d'un guide " "électronique des programmes." -#: ../template/default/help_config.html:125 +#: ../template/default/help_config.html:133 msgid "Here you can (de-)activate the tooltips in the timeline." msgstr "" -#: ../template/default/help_config.html:127 +#: ../template/default/help_config.html:135 msgid "Here you can (de-)activate the tooltips in the list." msgstr "" -#: ../template/default/help_config.html:135 +#: ../template/default/help_config.html:137 +msgid "" +"If you don't want VDRAdmin to add the summary taken from EPG to new timers " +"you can switch it off here." +msgstr "" + +#: ../template/default/help_config.html:145 msgid "" "Enable or disable live streaming using the <a href=\"http://www.magoa.net/" "linux/\">streamdev plugin</a>. You also have to set the correct <span class=" @@ -1071,7 +1126,7 @@ msgstr "" "réglage correct du <span class=\"ref_label\">Port HTTP pour Streamdev</span> " "ci-dessous." -#: ../template/default/help_config.html:137 +#: ../template/default/help_config.html:147 msgid "" "Here you have to set the port number your VDR's streamdev server listens for " "connections. Additionally you can also provide the stream type you like to " @@ -1081,7 +1136,7 @@ msgstr "" "VDR sera à l'écoute pour toute connection. Additionellement vous pouvez " "aussi fournir le type de flux que vous désirez utiliser." -#: ../template/default/help_config.html:139 +#: ../template/default/help_config.html:149 msgid "" "Enable or disable streaming of recordings.<br />Well actually this is no " "real \"streaming\", but you have to setup your workstation so that it can " @@ -1100,7 +1155,7 @@ msgstr "" "configurés corectement, vous pourrez voir les enregistrements sur votre " "station." -#: ../template/default/help_config.html:141 +#: ../template/default/help_config.html:151 msgid "" "This is the path where your workstation can access VDR's recordings. This " "depends on your VDR and workstation setup, for example \"\\\\vdr\\videos\" " @@ -1110,7 +1165,7 @@ msgstr "" "Cela dépend des réglages de votre VDR et de votre station, par exemple \"\\" "\\vdr\\videos\" ou \"V:\\\" (sur Windows) ou \"/mnt/videos\" (sur Linux)." -#: ../template/default/help_config.html:147 +#: ../template/default/help_config.html:157 msgid "" "<p>This section is for experts <strong>only</strong>, i.e. you know what you " "are doing!</p>" @@ -1118,7 +1173,7 @@ msgstr "" "<p>Cette section est pour les experts <strong>seulement</strong>. Vous devez " "savoir ce que vous faites!</p>" -#: ../template/default/help_config.html:150 +#: ../template/default/help_config.html:160 msgid "" "Accessing VDR's EPG through VDR's SVDRPort seems to block VDR for some time. " "If this option is activated VDRAdmin will read the <span class=\"ref_file" @@ -1128,7 +1183,7 @@ msgstr "" "temps. Si cette option est activée, VDRAdmin lira le fichier <span class=" "\"ref_file\">epg.data</span> directement, et donc VDR ne sera pas bloqué." -#: ../template/default/help_config.html:152 +#: ../template/default/help_config.html:162 msgid "" "If you've enabled the option above you need to tell VDRAdmin where the <span " "class=\"ref_file\">epg.data</span> file is located." @@ -1136,7 +1191,7 @@ msgstr "" "Si vous activez cette option ci-dessus, vous avez besoin de dire à VDRAdmin " "où est situé le fichier <span class=\"ref_file\">epg.data</span>." -#: ../template/default/help_config.html:154 +#: ../template/default/help_config.html:164 msgid "" "If you have compiled VDR with the VFAT define you have to enable this " "option. If this option is set to the wrong value, you may have problems with " @@ -1147,7 +1202,7 @@ msgstr "" "avoir des problèmes avec certains enregistrements si vous voulez les envoyer " "en flux ou lancer des runcmds sur ceux-xi." -#: ../template/default/help_config.html:160 +#: ../template/default/help_config.html:170 msgid "" "<p>If you want to limit the number of channels used in some parts of " "VDRAdmin, this is for you!</p><p>Use the radio buttons to activate or " @@ -1177,7 +1232,7 @@ msgid "to" msgstr "à " #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2472 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2489 msgid "Playing Today" msgstr "Joué Aujourd'hui" @@ -1799,113 +1854,113 @@ msgstr "Regarder TV" msgid "Search" msgstr "Rechercher" -#: ../vdradmind.pl:274 +#: ../vdradmind.pl:280 msgid "What's your VDR hostname (e.g video.intra.net)?" msgstr "Quel est votre Nom d'Hôte (ex video.intra.net) ?" -#: ../vdradmind.pl:275 +#: ../vdradmind.pl:281 msgid "On which port does VDR listen to SVDRP queries?" msgstr "Sur quel port VDR écoute les requêtes SVDRP ?" -#: ../vdradmind.pl:276 +#: ../vdradmind.pl:282 msgid "On which address should VDRAdmin listen (0.0.0.0 for any)?" msgstr "Sur quel adresse VDRAdmin doit-il écouter (0.0.0.0 pour toutes) ?" -#: ../vdradmind.pl:277 +#: ../vdradmind.pl:283 msgid "On which port should VDRAdmin listen?" msgstr "Sur quel port VDRAdmin doit-il écouter ?" -#: ../vdradmind.pl:278 +#: ../vdradmind.pl:284 msgid "Username?" msgstr "Identifiant ?" -#: ../vdradmind.pl:279 +#: ../vdradmind.pl:285 msgid "Password?" msgstr "Mot de Passe ?" -#: ../vdradmind.pl:280 +#: ../vdradmind.pl:286 msgid "Where are your recordings stored?" msgstr "Où vos enregistrements sont-ils stockés ?" -#: ../vdradmind.pl:281 +#: ../vdradmind.pl:287 msgid "Where are your VDR's configuration files located?" msgstr "Où sont vos fichiers de configuration de VDR ?" -#: ../vdradmind.pl:287 +#: ../vdradmind.pl:293 msgid "Config file written successfully." msgstr "Fichier de configuration écrit avec succès." -#: ../vdradmind.pl:336 +#: ../vdradmind.pl:346 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "vdradmin.pl %s a démarré avec le pid %d." -#: ../vdradmind.pl:2472 -msgid "Playing Tomorrow" -msgstr "Joué demain" - -#: ../vdradmind.pl:2472 -#, perl-format -msgid "Playing on the %d." -msgstr "En cours sur la %d." - -#: ../vdradmind.pl:4284 -msgid "System default" -msgstr "" - -#: ../template/i18n.pl:3 -msgid "Playing Today?" -msgstr "Aujourd'hui ?" - -#: ../template/i18n.pl:6 -msgid "Timers" -msgstr "Programmations" - -#: ../template/i18n.pl:11 +#: ../vdradmind.pl:401 ../vdradmind.pl:990 ../vdradmind.pl:1798 msgid "Not found" msgstr "Non trouvé" -#: ../template/i18n.pl:12 +#: ../vdradmind.pl:401 ../vdradmind.pl:1799 msgid "The requested URL was not found on this server!" msgstr "L'URL demandée n'a pas été trouvée sur le serveur !" -#: ../template/i18n.pl:13 -#, 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 !" - -#: ../template/i18n.pl:14 +#: ../vdradmind.pl:466 ../vdradmind.pl:986 ../vdradmind.pl:1801 msgid "Forbidden" msgstr "Interdit" -#: ../template/i18n.pl:15 +#: ../vdradmind.pl:466 ../vdradmind.pl:1802 msgid "You don't have permission to access this function!" msgstr "Vous n'avez pas la permission d'accéder à cette fonction !" -#: ../template/i18n.pl:16 +#: ../vdradmind.pl:986 ../vdradmind.pl:1803 #, perl-format msgid "Access to file \"%s\" denied!" msgstr "Accès au fichier \"%s\" interdit !" -#: ../template/i18n.pl:17 +#: ../vdradmind.pl:990 ../vdradmind.pl:1800 +#, 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:1804 #, perl-format msgid "Can't open file \"%s\"!" msgstr "Ne peut pas ouvrir le fichier \"%s\" !" -#: ../template/i18n.pl:18 +#: ../vdradmind.pl:1805 #, perl-format msgid "Can't connect to VDR at %s!" msgstr "Ne peut se connecter à %s !" -#: ../template/i18n.pl:19 +#: ../vdradmind.pl:1806 #, perl-format msgid "Error while sending command to VDR at %s" msgstr "Erreur en envoyant la commande à %s" -#: ../template/i18n.pl:23 +#: ../vdradmind.pl:2489 +msgid "Playing Tomorrow" +msgstr "Joué demain" + +#: ../vdradmind.pl:2489 +#, perl-format +msgid "Playing on the %d." +msgstr "En cours sur la %d." + +#: ../vdradmind.pl:3805 msgid "Schedule" msgstr "Programmateur" +#: ../vdradmind.pl:4284 +msgid "Playing Today?" +msgstr "Aujourd'hui ?" + +#: ../vdradmind.pl:4287 +msgid "Timers" +msgstr "Programmations" + +#: ../vdradmind.pl:4350 +msgid "System default" +msgstr "" + #~ msgid "Gets active after restarting VDRAdmin" #~ msgstr "Etre actif après le redémarrage de VDRAdmin" diff --git a/po/vdradmin.pot b/po/vdradmin.pot index a9f4937..536b0a5 100644 --- a/po/vdradmin.pot +++ b/po/vdradmin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-10-20 14:08+0200\n" +"POT-Creation-Date: 2005-11-04 13:15+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -66,14 +66,15 @@ msgstr "" #: ../template/default/timer_new.html:75 #: ../template/default/at_timer_list.html:133 -#: ../template/default/config.html:182 ../template/default/config.html:233 -#: ../template/default/config.html:262 ../template/default/config.html:303 -#: ../template/default/config.html:354 ../template/default/config.html:363 -#: ../template/default/config.html:391 ../template/default/config.html:406 -#: ../template/default/config.html:454 ../template/default/config.html:469 -#: ../template/default/config.html:500 ../template/default/config.html:509 -#: ../template/default/config.html:518 ../template/default/config.html:527 -#: ../template/default/config.html:536 ../template/default/config.html:545 +#: ../template/default/config.html:186 ../template/default/config.html:237 +#: ../template/default/config.html:266 ../template/default/config.html:307 +#: ../template/default/config.html:334 ../template/default/config.html:385 +#: ../template/default/config.html:394 ../template/default/config.html:403 +#: ../template/default/config.html:431 ../template/default/config.html:446 +#: ../template/default/config.html:494 ../template/default/config.html:509 +#: ../template/default/config.html:540 ../template/default/config.html:549 +#: ../template/default/config.html:558 ../template/default/config.html:567 +#: ../template/default/config.html:576 ../template/default/config.html:585 #: ../template/default/timer_list.html:322 #: ../template/default/at_timer_new.html:48 #: ../template/default/at_timer_new.html:52 @@ -83,14 +84,15 @@ msgstr "" #: ../template/default/timer_new.html:76 #: ../template/default/at_timer_list.html:135 -#: ../template/default/config.html:183 ../template/default/config.html:234 -#: ../template/default/config.html:263 ../template/default/config.html:304 -#: ../template/default/config.html:355 ../template/default/config.html:364 -#: ../template/default/config.html:392 ../template/default/config.html:407 -#: ../template/default/config.html:455 ../template/default/config.html:470 -#: ../template/default/config.html:501 ../template/default/config.html:510 -#: ../template/default/config.html:519 ../template/default/config.html:528 -#: ../template/default/config.html:537 ../template/default/config.html:546 +#: ../template/default/config.html:187 ../template/default/config.html:238 +#: ../template/default/config.html:267 ../template/default/config.html:308 +#: ../template/default/config.html:335 ../template/default/config.html:386 +#: ../template/default/config.html:395 ../template/default/config.html:404 +#: ../template/default/config.html:432 ../template/default/config.html:447 +#: ../template/default/config.html:495 ../template/default/config.html:510 +#: ../template/default/config.html:541 ../template/default/config.html:550 +#: ../template/default/config.html:559 ../template/default/config.html:568 +#: ../template/default/config.html:577 ../template/default/config.html:586 #: ../template/default/timer_list.html:323 #: ../template/default/at_timer_new.html:49 #: ../template/default/at_timer_new.html:53 @@ -189,10 +191,10 @@ msgstr "" #: ../template/default/timer_new.html:144 #: ../template/default/at_timer_list.html:24 -#: ../template/default/config.html:275 ../template/default/config.html:328 +#: ../template/default/config.html:279 ../template/default/config.html:359 #: ../template/default/timer_list.html:27 #: ../template/default/help_config.html:104 -#: ../template/default/help_config.html:116 +#: ../template/default/help_config.html:124 #: ../template/default/help_timer_new.html:61 #: ../template/default/help_at_timer_new.html:52 #: ../template/default/at_timer_new.html:128 @@ -201,10 +203,10 @@ msgstr "" #: ../template/default/timer_new.html:150 #: ../template/default/at_timer_list.html:24 -#: ../template/default/config.html:281 ../template/default/config.html:334 +#: ../template/default/config.html:285 ../template/default/config.html:365 #: ../template/default/timer_list.html:27 #: ../template/default/help_config.html:106 -#: ../template/default/help_config.html:118 +#: ../template/default/help_config.html:126 #: ../template/default/help_timer_new.html:63 #: ../template/default/help_at_timer_new.html:54 #: ../template/default/at_timer_new.html:136 @@ -221,7 +223,7 @@ msgstr "" msgid "Summary:" msgstr "" -#: ../template/default/timer_new.html:174 ../template/default/config.html:583 +#: ../template/default/timer_new.html:174 ../template/default/config.html:623 #: ../template/default/at_timer_new.html:176 msgid "Save" msgstr "" @@ -259,7 +261,7 @@ msgstr "" #: ../template/default/at_timer_list.html:6 #: ../template/default/at_timer_list.html:36 -#: ../template/default/config.html:250 ../template/default/help_config.html:38 +#: ../template/default/config.html:254 ../template/default/help_config.html:38 #: ../template/default/help_config.html:98 #: ../template/default/help_at_timer_list.html:6 #: ../template/default/help_at_timer_list.html:22 @@ -334,7 +336,7 @@ msgstr "" #: ../template/default/prog_summary.html:7 #: ../template/default/prog_timeline.html:7 -#: ../template/default/navigation.html:30 ../template/i18n.pl:2 +#: ../template/default/navigation.html:30 ../vdradmind.pl:4283 msgid "What's On Now?" msgstr "" @@ -411,196 +413,221 @@ msgstr "" msgid "Language:" msgstr "" -#: ../template/default/config.html:116 ../template/default/help_config.html:38 +#: ../template/default/config.html:120 ../template/default/help_config.html:38 #: ../template/default/help_config.html:56 msgid "VDR" msgstr "" -#: ../template/default/config.html:126 ../template/default/help_config.html:58 +#: ../template/default/config.html:130 ../template/default/help_config.html:58 msgid "Number of DVB cards:" msgstr "" -#: ../template/default/config.html:132 ../template/default/help_config.html:60 +#: ../template/default/config.html:136 ../template/default/help_config.html:60 msgid "Path to recordings:" msgstr "" -#: ../template/default/config.html:138 ../template/default/help_config.html:62 +#: ../template/default/config.html:142 ../template/default/help_config.html:62 msgid "Path to configuration files:" msgstr "" -#: ../template/default/config.html:144 ../template/default/help_config.html:64 +#: ../template/default/config.html:148 ../template/default/help_config.html:64 msgid "Path to EPG images:" msgstr "" -#: ../template/default/config.html:158 ../template/default/help_config.html:38 +#: ../template/default/config.html:162 ../template/default/help_config.html:38 #: ../template/default/help_config.html:70 msgid "Identification" msgstr "" -#: ../template/default/config.html:168 ../template/default/help_config.html:72 +#: ../template/default/config.html:172 ../template/default/help_config.html:72 msgid "Username:" msgstr "" -#: ../template/default/config.html:174 ../template/default/help_config.html:74 +#: ../template/default/config.html:178 ../template/default/help_config.html:74 msgid "Password:" msgstr "" -#: ../template/default/config.html:180 ../template/default/help_config.html:76 +#: ../template/default/config.html:184 ../template/default/help_config.html:76 msgid "Guest Account:" msgstr "" -#: ../template/default/config.html:189 ../template/default/help_config.html:78 +#: ../template/default/config.html:193 ../template/default/help_config.html:78 msgid "Guest Username:" msgstr "" -#: ../template/default/config.html:195 ../template/default/help_config.html:80 +#: ../template/default/config.html:199 ../template/default/help_config.html:80 msgid "Guest Password:" msgstr "" -#: ../template/default/config.html:209 ../template/default/help_config.html:38 +#: ../template/default/config.html:213 ../template/default/help_config.html:38 #: ../template/default/help_config.html:86 -#: ../template/default/navigation.html:38 ../template/i18n.pl:4 +#: ../template/default/navigation.html:38 ../vdradmind.pl:4285 msgid "Timeline" msgstr "" -#: ../template/default/config.html:219 ../template/default/help_config.html:88 +#: ../template/default/config.html:223 ../template/default/help_config.html:88 msgid "Hours:" msgstr "" -#: ../template/default/config.html:225 ../template/default/help_config.html:90 +#: ../template/default/config.html:229 ../template/default/help_config.html:90 msgid "Times:" msgstr "" -#: ../template/default/config.html:231 ../template/default/config.html:301 +#: ../template/default/config.html:235 ../template/default/config.html:332 #: ../template/default/help_config.html:92 -#: ../template/default/help_config.html:108 +#: ../template/default/help_config.html:116 msgid "Tooltips:" msgstr "" -#: ../template/default/config.html:260 +#: ../template/default/config.html:264 #: ../template/default/help_config.html:100 msgid "Active:" msgstr "" -#: ../template/default/config.html:269 +#: ../template/default/config.html:273 #: ../template/default/help_config.html:102 msgid "Timeout:" msgstr "" -#: ../template/default/config.html:270 ../template/default/config.html:341 -#: ../template/default/config.html:347 +#: ../template/default/config.html:274 ../template/default/config.html:372 +#: ../template/default/config.html:378 msgid "minutes" msgstr "" -#: ../template/default/config.html:288 ../template/default/config.html:340 -#: ../template/default/help_config.html:120 +#: ../template/default/config.html:292 ../template/default/config.html:371 +#: ../template/default/help_config.html:128 msgid "Time Margin at Start:" msgstr "" -#: ../template/default/config.html:294 ../template/default/config.html:346 -#: ../template/default/help_config.html:122 +#: ../template/default/config.html:298 ../template/default/config.html:377 +#: ../template/default/help_config.html:130 msgid "Time Margin at Stop:" msgstr "" -#: ../template/default/config.html:318 ../template/default/timer_list.html:6 +#: ../template/default/config.html:305 +#: ../template/default/help_config.html:108 +msgid "Send email after programming timer:" +msgstr "" + +#: ../template/default/config.html:314 +#: ../template/default/help_config.html:110 +msgid "Send email as:" +msgstr "" + +#: ../template/default/config.html:320 +#: ../template/default/help_config.html:112 +msgid "Send email to:" +msgstr "" + +#: ../template/default/config.html:326 +#: ../template/default/help_config.html:114 +msgid "Mail server:" +msgstr "" + +#: ../template/default/config.html:349 ../template/default/timer_list.html:6 #: ../template/default/timer_list.html:44 #: ../template/default/help_config.html:38 -#: ../template/default/help_config.html:114 +#: ../template/default/help_config.html:122 #: ../template/default/help_timer_list.html:6 #: ../template/default/help_timer_list.html:22 #: ../template/default/navigation.html:46 msgid "Timer" msgstr "" -#: ../template/default/config.html:352 -#: ../template/default/help_config.html:124 +#: ../template/default/config.html:383 +#: ../template/default/help_config.html:132 msgid "Tooltips in timeline:" msgstr "" -#: ../template/default/config.html:361 -#: ../template/default/help_config.html:126 +#: ../template/default/config.html:392 +#: ../template/default/help_config.html:134 msgid "Tooltips in list:" msgstr "" -#: ../template/default/config.html:379 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:132 +#: ../template/default/config.html:401 +#: ../template/default/help_config.html:136 +msgid "Add summary to new timers:" +msgstr "" + +#: ../template/default/config.html:419 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:142 msgid "Streaming" msgstr "" -#: ../template/default/config.html:389 -#: ../template/default/help_config.html:134 +#: ../template/default/config.html:429 +#: ../template/default/help_config.html:144 msgid "Live Streaming:" msgstr "" -#: ../template/default/config.html:398 -#: ../template/default/help_config.html:136 +#: ../template/default/config.html:438 +#: ../template/default/help_config.html:146 msgid "HTTP Port of Streamdev (also possible 3000/ts):" msgstr "" -#: ../template/default/config.html:404 -#: ../template/default/help_config.html:138 +#: ../template/default/config.html:444 +#: ../template/default/help_config.html:148 msgid "Recordings Streaming:" msgstr "" -#: ../template/default/config.html:413 -#: ../template/default/help_config.html:140 +#: ../template/default/config.html:453 +#: ../template/default/help_config.html:150 msgid "Path to VDR Recordings on your workstation:" msgstr "" -#: ../template/default/config.html:420 +#: ../template/default/config.html:460 msgid "Bandwidth of Streams:" msgstr "" -#: ../template/default/config.html:442 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:146 +#: ../template/default/config.html:482 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:156 msgid "Expert" msgstr "" -#: ../template/default/config.html:452 -#: ../template/default/help_config.html:149 +#: ../template/default/config.html:492 +#: ../template/default/help_config.html:159 msgid "Read EPG directly using epg.data:" msgstr "" -#: ../template/default/config.html:461 -#: ../template/default/help_config.html:151 +#: ../template/default/config.html:501 +#: ../template/default/help_config.html:161 msgid "epg.data filename:" msgstr "" -#: ../template/default/config.html:467 -#: ../template/default/help_config.html:153 +#: ../template/default/config.html:507 +#: ../template/default/help_config.html:163 msgid "VFAT:" msgstr "" -#: ../template/default/config.html:488 ../template/default/help_config.html:38 -#: ../template/default/help_config.html:159 +#: ../template/default/config.html:528 ../template/default/help_config.html:38 +#: ../template/default/help_config.html:169 msgid "Channel Selections" msgstr "" -#: ../template/default/config.html:498 +#: ../template/default/config.html:538 msgid "In \"Timeline\"?" msgstr "" -#: ../template/default/config.html:507 +#: ../template/default/config.html:547 msgid "In \"Channels\"?" msgstr "" -#: ../template/default/config.html:516 +#: ../template/default/config.html:556 msgid "In \"Playing Today\"?" msgstr "" -#: ../template/default/config.html:525 +#: ../template/default/config.html:565 msgid "In \"What's On Now\"?" msgstr "" -#: ../template/default/config.html:534 +#: ../template/default/config.html:574 msgid "In \"AutoTimer\"?" msgstr "" -#: ../template/default/config.html:543 +#: ../template/default/config.html:583 msgid "In \"Watch TV\"?" msgstr "" -#: ../template/default/config.html:584 +#: ../template/default/config.html:624 msgid "Apply" msgstr "" @@ -631,26 +658,26 @@ msgstr "" msgid "Date" msgstr "" -#: ../template/default/timer_list.html:307 +#: ../template/default/timer_list.html:306 +msgid "Edit timer status?" +msgstr "" + +#: ../template/default/timer_list.html:308 msgid "This timer is inactive!" msgstr "" -#: ../template/default/timer_list.html:310 +#: ../template/default/timer_list.html:311 msgid "This timer is impossible!" msgstr "" -#: ../template/default/timer_list.html:313 +#: ../template/default/timer_list.html:314 msgid "No more timers on other transponders possible!" msgstr "" -#: ../template/default/timer_list.html:316 +#: ../template/default/timer_list.html:317 msgid "Timer OK." msgstr "" -#: ../template/default/timer_list.html:321 -msgid "Edit timer status?" -msgstr "" - #: ../template/default/timer_list.html:324 msgid "VPS" msgstr "" @@ -664,7 +691,7 @@ msgid "Delete Selected Timers" msgstr "" #: ../template/default/prog_list.html:6 ../template/default/navigation.html:42 -#: ../template/i18n.pl:5 +#: ../vdradmind.pl:4286 msgid "Channels" msgstr "" @@ -730,7 +757,7 @@ msgstr "" #: ../template/default/rec_list.html:6 ../template/default/rec_list.html:18 #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:18 -#: ../template/default/navigation.html:54 ../template/i18n.pl:7 +#: ../template/default/navigation.html:54 ../vdradmind.pl:4288 msgid "Recordings" msgstr "" @@ -821,11 +848,11 @@ msgstr "" #: ../template/default/help_config.html:67 #: ../template/default/help_config.html:83 #: ../template/default/help_config.html:95 -#: ../template/default/help_config.html:111 -#: ../template/default/help_config.html:129 -#: ../template/default/help_config.html:143 -#: ../template/default/help_config.html:156 -#: ../template/default/help_config.html:163 +#: ../template/default/help_config.html:119 +#: ../template/default/help_config.html:139 +#: ../template/default/help_config.html:153 +#: ../template/default/help_config.html:166 +#: ../template/default/help_config.html:173 msgid "Top" msgstr "" @@ -891,7 +918,7 @@ msgid "" msgstr "" #: ../template/default/help_config.html:93 -#: ../template/default/help_config.html:109 +#: ../template/default/help_config.html:117 msgid "Here you can (de-)activate the tooltips." msgstr "" @@ -904,7 +931,7 @@ msgid "The interval, the the EPG data is checked for updating the AutoTimers." msgstr "" #: ../template/default/help_config.html:105 -#: ../template/default/help_config.html:117 +#: ../template/default/help_config.html:125 #: ../template/default/help_timer_new.html:62 #: ../template/default/help_at_timer_new.html:53 msgid "" @@ -925,7 +952,7 @@ msgid "" msgstr "" #: ../template/default/help_config.html:107 -#: ../template/default/help_config.html:119 +#: ../template/default/help_config.html:127 #: ../template/default/help_timer_new.html:64 #: ../template/default/help_at_timer_new.html:55 msgid "" @@ -939,43 +966,70 @@ msgid "" "recording has passed by." msgstr "" -#: ../template/default/help_config.html:121 +#: ../template/default/help_config.html:109 +msgid "" +"VDRAdmin will send an email whenever an event matches an AutoTimer and a " +"timer has been programmed if you enable this feature. This requires that you " +"have the sendEmail programm (which you will find <a target=\"_new\" href=" +"\"http://caspian.dotconf.net/menu/Software/SendEmail/\">here</a>) located in " +"PATH." +msgstr "" + +#: ../template/default/help_config.html:111 +msgid "Here you set the sending domain of the generated email." +msgstr "" + +#: ../template/default/help_config.html:113 +msgid "The email address the email is sent to." +msgstr "" + +#: ../template/default/help_config.html:115 +msgid "The outgoing mail server." +msgstr "" + +#: ../template/default/help_config.html:129 msgid "" "The number of minutes VDRAdmin subtracts from the broadcasts start time " "found in the EPG. This value is used for timers programmed by AutoTimer and " "timers manually programmed when pressing \"Record\" in any EPG view." msgstr "" -#: ../template/default/help_config.html:123 +#: ../template/default/help_config.html:131 msgid "" "The number of minutes VDRAdmin adds to the broadcasts stop time found in the " "EPG. This value is used for timers programmed by AutoTimer and timers " "manually programmed when pressing \"Record\" in any EPG view." msgstr "" -#: ../template/default/help_config.html:125 +#: ../template/default/help_config.html:133 msgid "Here you can (de-)activate the tooltips in the timeline." msgstr "" -#: ../template/default/help_config.html:127 +#: ../template/default/help_config.html:135 msgid "Here you can (de-)activate the tooltips in the list." msgstr "" -#: ../template/default/help_config.html:135 +#: ../template/default/help_config.html:137 +msgid "" +"If you don't want VDRAdmin to add the summary taken from EPG to new timers " +"you can switch it off here." +msgstr "" + +#: ../template/default/help_config.html:145 msgid "" "Enable or disable live streaming using the <a href=\"http://www.magoa.net/" "linux/\">streamdev plugin</a>. You also have to set the correct <span class=" "\"ref_label\">HTTP Port for Streamdev</span> below." msgstr "" -#: ../template/default/help_config.html:137 +#: ../template/default/help_config.html:147 msgid "" "Here you have to set the port number your VDR's streamdev server listens for " "connections. Additionally you can also provide the stream type you like to " "use." msgstr "" -#: ../template/default/help_config.html:139 +#: ../template/default/help_config.html:149 msgid "" "Enable or disable streaming of recordings.<br />Well actually this is no " "real \"streaming\", but you have to setup your workstation so that it can " @@ -986,40 +1040,40 @@ msgid "" "display." msgstr "" -#: ../template/default/help_config.html:141 +#: ../template/default/help_config.html:151 msgid "" "This is the path where your workstation can access VDR's recordings. This " "depends on your VDR and workstation setup, for example \"\\\\vdr\\videos\" " "or \"V:\\\" (on Windows) or \"/mnt/videos\" (on Linux)." msgstr "" -#: ../template/default/help_config.html:147 +#: ../template/default/help_config.html:157 msgid "" "<p>This section is for experts <strong>only</strong>, i.e. you know what you " "are doing!</p>" msgstr "" -#: ../template/default/help_config.html:150 +#: ../template/default/help_config.html:160 msgid "" "Accessing VDR's EPG through VDR's SVDRPort seems to block VDR for some time. " "If this option is activated VDRAdmin will read the <span class=\"ref_file" "\">epg.data</span> file directly so that VDR doesn't get blocked." msgstr "" -#: ../template/default/help_config.html:152 +#: ../template/default/help_config.html:162 msgid "" "If you've enabled the option above you need to tell VDRAdmin where the <span " "class=\"ref_file\">epg.data</span> file is located." msgstr "" -#: ../template/default/help_config.html:154 +#: ../template/default/help_config.html:164 msgid "" "If you have compiled VDR with the VFAT define you have to enable this " "option. If this option is set to the wrong value, you may have problems with " "certain recordings if you want to stream them or run reccmds on them." msgstr "" -#: ../template/default/help_config.html:160 +#: ../template/default/help_config.html:170 msgid "" "<p>If you want to limit the number of channels used in some parts of " "VDRAdmin, this is for you!</p><p>Use the radio buttons to activate or " @@ -1040,7 +1094,7 @@ msgid "to" msgstr "" #: ../template/default/prog_list2.html:6 -#: ../template/default/navigation.html:34 ../vdradmind.pl:2472 +#: ../template/default/navigation.html:34 ../vdradmind.pl:2489 msgid "Playing Today" msgstr "" @@ -1450,109 +1504,109 @@ msgstr "" msgid "Search" msgstr "" -#: ../vdradmind.pl:274 +#: ../vdradmind.pl:280 msgid "What's your VDR hostname (e.g video.intra.net)?" msgstr "" -#: ../vdradmind.pl:275 +#: ../vdradmind.pl:281 msgid "On which port does VDR listen to SVDRP queries?" msgstr "" -#: ../vdradmind.pl:276 +#: ../vdradmind.pl:282 msgid "On which address should VDRAdmin listen (0.0.0.0 for any)?" msgstr "" -#: ../vdradmind.pl:277 +#: ../vdradmind.pl:283 msgid "On which port should VDRAdmin listen?" msgstr "" -#: ../vdradmind.pl:278 +#: ../vdradmind.pl:284 msgid "Username?" msgstr "" -#: ../vdradmind.pl:279 +#: ../vdradmind.pl:285 msgid "Password?" msgstr "" -#: ../vdradmind.pl:280 +#: ../vdradmind.pl:286 msgid "Where are your recordings stored?" msgstr "" -#: ../vdradmind.pl:281 +#: ../vdradmind.pl:287 msgid "Where are your VDR's configuration files located?" msgstr "" -#: ../vdradmind.pl:287 +#: ../vdradmind.pl:293 msgid "Config file written successfully." msgstr "" -#: ../vdradmind.pl:336 +#: ../vdradmind.pl:346 #, perl-format msgid "vdradmind.pl %s started with pid %d." msgstr "" -#: ../vdradmind.pl:2472 -msgid "Playing Tomorrow" +#: ../vdradmind.pl:401 ../vdradmind.pl:990 ../vdradmind.pl:1798 +msgid "Not found" msgstr "" -#: ../vdradmind.pl:2472 -#, perl-format -msgid "Playing on the %d." +#: ../vdradmind.pl:401 ../vdradmind.pl:1799 +msgid "The requested URL was not found on this server!" msgstr "" -#: ../vdradmind.pl:4284 -msgid "System default" +#: ../vdradmind.pl:466 ../vdradmind.pl:986 ../vdradmind.pl:1801 +msgid "Forbidden" msgstr "" -#: ../template/i18n.pl:3 -msgid "Playing Today?" +#: ../vdradmind.pl:466 ../vdradmind.pl:1802 +msgid "You don't have permission to access this function!" msgstr "" -#: ../template/i18n.pl:6 -msgid "Timers" +#: ../vdradmind.pl:986 ../vdradmind.pl:1803 +#, perl-format +msgid "Access to file \"%s\" denied!" msgstr "" -#: ../template/i18n.pl:11 -msgid "Not found" +#: ../vdradmind.pl:990 ../vdradmind.pl:1800 +#, perl-format +msgid "The URL \"%s\" was not found on this server!" msgstr "" -#: ../template/i18n.pl:12 -msgid "The requested URL was not found on this server!" +#: ../vdradmind.pl:1804 +#, perl-format +msgid "Can't open file \"%s\"!" msgstr "" -#: ../template/i18n.pl:13 +#: ../vdradmind.pl:1805 #, perl-format -msgid "The URL \"%s\" was not found on this server!" +msgid "Can't connect to VDR at %s!" msgstr "" -#: ../template/i18n.pl:14 -msgid "Forbidden" +#: ../vdradmind.pl:1806 +#, perl-format +msgid "Error while sending command to VDR at %s" msgstr "" -#: ../template/i18n.pl:15 -msgid "You don't have permission to access this function!" +#: ../vdradmind.pl:2489 +msgid "Playing Tomorrow" msgstr "" -#: ../template/i18n.pl:16 +#: ../vdradmind.pl:2489 #, perl-format -msgid "Access to file \"%s\" denied!" +msgid "Playing on the %d." msgstr "" -#: ../template/i18n.pl:17 -#, perl-format -msgid "Can't open file \"%s\"!" +#: ../vdradmind.pl:3805 +msgid "Schedule" msgstr "" -#: ../template/i18n.pl:18 -#, perl-format -msgid "Can't connect to VDR at %s!" +#: ../vdradmind.pl:4284 +msgid "Playing Today?" msgstr "" -#: ../template/i18n.pl:19 -#, perl-format -msgid "Error while sending command to VDR at %s" +#: ../vdradmind.pl:4287 +msgid "Timers" msgstr "" -#: ../template/i18n.pl:23 -msgid "Schedule" +#: ../vdradmind.pl:4350 +msgid "System default" msgstr "" diff --git a/template/default/at_timer_new.html b/template/default/at_timer_new.html index 263d592..db2a7af 100644 --- a/template/default/at_timer_new.html +++ b/template/default/at_timer_new.html @@ -198,7 +198,7 @@ <td class="col_left"></td> <td><tmpl_var otitle></td> <td><tmpl_var subtitle></td> - <td><tmpl_var weekday>, <tmpl_var start> - <tmpl_var stop> (<tmpl_var channel>)</td> + <td><tmpl_var date>, <tmpl_var start> - <tmpl_var stop> (<tmpl_var channel>)</td> <td><tmpl_var title></td> <td class="col_right"></td> </tr> diff --git a/template/default/config.html b/template/default/config.html index 7bfd04d..f6d88b4 100644 --- a/template/default/config.html +++ b/template/default/config.html @@ -302,6 +302,33 @@ --> <tr class="row_even"> <td class="col_left"></td> + <td class="col_label"><h5><%! Send email after programming timer: !%></h5></td> + <td class="col_value"> + <input type="radio" name="AT_SENDMAIL" value="1" id="at_sendmail_yes" <tmpl_if at_sendmail>checked</tmpl_if> /><label for="at_sendmail_yes"><%! Yes !%></label> + <input type="radio" name="AT_SENDMAIL" value="0" id="at_sendmail_no" <tmpl_unless at_sendmail>checked</tmpl_unless> /><label for="at_sendmail_no"><%! No !%></label> + </td> + <td class="col_right"></td> + </tr> + <tr class="row_odd"> + <td class="col_left"></td> + <td class="col_label"><h5><%! Send email as: !%></h5></td> + <td class="col_value">autotimer@<input type="text" name="MAIL_FROMDOMAIN" value="<tmpl_var MAIL_FROMDOMAIN>" size="20" maxlength="100" /></td> + <td class="col_right"></td> + </tr> + <tr class="row_even"> + <td class="col_left"></td> + <td class="col_label"><h5><%! Send email to: !%></h5></td> + <td class="col_value"><input type="text" name="MAIL_TO" value="<tmpl_var MAIL_TO>" size="20" maxlength="100" /></td> + <td class="col_right"></td> + </tr> + <tr class="row_odd"> + <td class="col_left"></td> + <td class="col_label"><h5><%! Mail server: !%></h5></td> + <td class="col_value"><input type="text" name="MAIL_SERVER" value="<tmpl_var MAIL_SERVER>" size="20" maxlength="100" /></td> + <td class="col_right"></td> + </tr> + <tr class="row_even"> + <td class="col_left"></td> <td class="col_label"><h5><%! Tooltips: !%></h5></td> <td class="col_value"> <input type="radio" name="AT_TOOLTIP" value="1" id="at_tooltip_yes" <tmpl_if at_tooltip>checked</tmpl_if> /><label for="at_tooltip_yes"><%! Yes !%></label> @@ -369,6 +396,15 @@ </td> <td class="col_right"></td> </tr> + <tr class="row_odd"> + <td class="col_left"></td> + <td class="col_label"><h5><%! Add summary to new timers: !%></h5></td> + <td class="col_value"> + <input type="radio" name="TM_ADD_SUMMARY" value="1" id="tm_add_summary_yes" <tmpl_if tm_add_summary>checked</tmpl_if> /><label for="tm_add_summary_yes"><%! Yes !%></label> + <input type="radio" name="TM_ADD_SUMMARY" value="0" id="tm_add_summary_no" <tmpl_unless tm_add_summary>checked</tmpl_unless> /><label for="tm_add_summary_no"><%! No !%></label> + </td> + <td class="col_right"></td> + </tr> <tr class="footer"> <td class="col_left"></td> <td colspan="2"></td> diff --git a/template/default/help_config.html b/template/default/help_config.html index 8d54fdc..2768d6c 100644 --- a/template/default/help_config.html +++ b/template/default/help_config.html @@ -105,6 +105,14 @@ <dd><%! An integer in the range <strong>0...99</strong>, defining the <strong>priority</strong> of this timer and of recordings created by this timer. <strong>0</strong> represents the lowest value, <strong>99</strong> the highest. The priority is used to decide which timer shall be started in case there are two or more timers with the exact same <strong>start</strong> time. The first timer in the list with the highest priority will be used.<br /><br />This value is also stored with the recording and is later used to decide which recording to remove from disk in order to free space for a new recording. If the disk runs full and a new recording needs more space, an existing recording with the lowest priority (and which has exceeded its guaranteed <strong>lifetime</strong>) will be removed.<br /><br />If all available DVB cards are currently occupied, a timer with a higher priority will interrupt the timer with the lowest priority in order to start recording. !%></dd> <dt><%! Lifetime: !%></dt> <dd><%! The <strong>guaranteed</strong> lifetime (in days) of a recording created by this timer. <strong>0</strong> means that this recording may be automatically deleted at any time by a new recording with higher priority. <strong>99</strong> means that this recording will never be automatically deleted. Any number in the range <strong>1...98</strong> means that this recording may not be automatically deleted in favour of a new recording, until the given number of days since the <strong>start</strong> time of the recording has passed by. !%></dd> + <dt><%! Send email after programming timer: !%></dt> + <dd><%! VDRAdmin will send an email whenever an event matches an AutoTimer and a timer has been programmed if you enable this feature. This requires that you have the sendEmail programm (which you will find <a target="_new" href="http://caspian.dotconf.net/menu/Software/SendEmail/">here</a>) located in PATH. !%></dd> + <dt><%! Send email as: !%></dt> + <dd><%! Here you set the sending domain of the generated email. !%></dd> + <dt><%! Send email to: !%></dt> + <dd><%! The email address the email is sent to. !%></dd> + <dt><%! Mail server: !%></dt> + <dd><%! The outgoing mail server. !%></dd> <dt><%! Tooltips: !%></dt> <dd><%! Here you can (de-)activate the tooltips. !%></dd> </dl> @@ -125,6 +133,8 @@ <dd><%! Here you can (de-)activate the tooltips in the timeline. !%></dd> <dt><%! Tooltips in list: !%></dt> <dd><%! Here you can (de-)activate the tooltips in the list. !%></dd> + <dt><%! Add summary to new timers: !%></dt> + <dd><%! If you don't want VDRAdmin to add the summary taken from EPG to new timers you can switch it off here. !%></dd> </dl> <div class="top_link">[<a href="#top"><%! Top !%></a>]</div> </div> diff --git a/template/default/timer_list.html b/template/default/timer_list.html index 09a7880..e2cea26 100644 --- a/template/default/timer_list.html +++ b/template/default/timer_list.html @@ -108,7 +108,7 @@ %?> <table cellspacing="0" cellpadding="0" border="0"> <tr> - <td bgcolor="#00000" height="1" class="blackline"><img src="bilder/spacer.gif" width="<?% tablaenge + 100 %?>" height="1" border="0" /></td> + <td bgcolor="#000000" height="1" class="blackline"><img src="bilder/spacer.gif" width="<?% tablaenge + 100 %?>" height="1" border="0" /></td> </tr> </table> @@ -159,7 +159,7 @@ <?% ELSE; %?> - <td class="<?% td_class %?>" id="prgtable"><span <?% IF config.TM_TT_TIMELINE %?>onMouseOver="tip('VDR-<?% sendung.id %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?><img src="bilder/spacer.gif" width="<?% ende - pos - 2 %?>" height="20" border="0" /></span></td> + <td class="<?% td_class %?>" id="prgtable"><span <?% IF config.TM_TT_TIMELINE %?>onMouseOver="tip('VDR-<?% sendung.id %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?>><img src="bilder/spacer.gif" width="<?% ende - pos - 2 %?>" height="20" border="0" /></span></td> <?% END; diff --git a/vdradmind.pl b/vdradmind.pl index b569b67..65dc789 100755 --- a/vdradmind.pl +++ b/vdradmind.pl @@ -26,6 +26,8 @@ # VDRAdmin-AM 2005 by Andreas Mair <mail@andreas.vdr-developer.org> # +require 5.004; + my $BASENAME; my $EXENAME; BEGIN { @@ -49,6 +51,8 @@ $localemod->import(qw(gettext bindtextdomain textdomain)); require File::Temp; +use locale; +use Env qw(@PATH LANGUAGE); use CGI qw(:no_debug); use IO::Socket; use HTML::Template::Expr(); @@ -60,6 +64,10 @@ use File::Temp (); use Shell qw(ps locale); use URI::Escape; +# Some users have problems if the LANGUAGE env variable is set +# so it's cleared here. +$LANGUAGE=""; + $SIG{CHLD} = sub { wait }; use strict; @@ -82,12 +90,14 @@ sub LOG_FATALERROR () { 64 }; sub LOG_DEBUG () { 32768 }; my %CONFIG; -$CONFIG{LOGLEVEL} = 81; # 32799 -$CONFIG{LOGGING} = 0; -$CONFIG{LOGFILE} = "vdradmind.log"; -$CONFIG{MOD_GZIP} = 0; -$CONFIG{CACHE_TIMEOUT} = 60; -$CONFIG{CACHE_LASTUPDATE} = 0; +$CONFIG{LOGLEVEL} = 81; # 32799 +$CONFIG{LOGGING} = 0; +$CONFIG{LOGFILE} = "vdradmind.log"; +$CONFIG{MOD_GZIP} = 0; +$CONFIG{CACHE_TIMEOUT} = 60; +$CONFIG{CACHE_LASTUPDATE} = 0; +$CONFIG{CACHE_REC_TIMEOUT} = 60; +$CONFIG{CACHE_REC_LASTUPDATE} = 0; # $CONFIG{VDR_HOST} = "localhost"; $CONFIG{VDR_PORT} = 2001; @@ -129,6 +139,7 @@ $CONFIG{TM_MARGIN_BEGIN} = 10; $CONFIG{TM_MARGIN_END} = 10; $CONFIG{TM_TT_TIMELINE} = 1; $CONFIG{TM_TT_LIST} = 1; +$CONFIG{TM_ADD_SUMMARY} = 0; # $CONFIG{ST_FUNC} = 1; $CONFIG{ST_REC_ON} = 0; @@ -144,7 +155,7 @@ $CONFIG{NO_EVENTID} = 0; $CONFIG{NO_EVENTID_ON} = ""; # $CONFIG{AT_SENDMAIL} = 0; # set to 1 and set all the "MAIL_" things if you want email notification on new autotimers. -$CONFIG{MAIL_PROG} = "./sendEmail"; +$CONFIG{MAIL_PROG} = "/usr/bin/sendEmail"; $CONFIG{MAIL_FROMDOMAIN} = "fromaddress.tld"; $CONFIG{MAIL_TO} = "your\@email.address"; $CONFIG{MAIL_SERVER} = "your.email.server"; @@ -159,7 +170,7 @@ $CONFIG{CHANNELS_WANTED_WATCHTV} = ""; # $CONFIG{PROG_SUMMARY_COLS} = 3; -my $VERSION = "0.97-am3.4.2rc2"; +my $VERSION = "0.97-am3.4.2rc3"; my $SERVERVERSION = "vdradmind/$VERSION"; my $LINVDR = isLinVDR(); my $VDRVERSION = 0; @@ -217,7 +228,7 @@ my $Xtemplate = Template->new($Xconfig); my $USE_SHELL_GZIP = false; # set on false to use the gzip library my($DEBUG) = 0; -my(%EPG, @CHAN, $q, $ACCEPT_GZIP, $SVDRP, $HOST, $low_time); +my(%EPG, @CHAN, $q, $ACCEPT_GZIP, $SVDRP, $HOST, $low_time, @RECORDINGS); my(%mimehash) = ( html => "text/html", png => "image/png", @@ -230,7 +241,6 @@ my(%mimehash) = ( ); my @LOGINPAGES = qw(prog_summary prog_list2 prog_timeline prog_list timer_list rec_list); - $SIG{INT} = \&Shutdown; $SIG{TERM} = \&Shutdown; $SIG{HUP} = \&HupSignal; @@ -309,6 +319,7 @@ for(my $i = 0; $i < scalar(@ARGV); $i++) { ReadConfig(); LoadTranslation(); +findSendEmail(); if($CONFIG{MOD_GZIP}) { # lib gzipping @@ -318,8 +329,11 @@ if($CONFIG{MOD_GZIP}) { if(-e "$PIDFILE") { my $pid = getPID($PIDFILE); print("There's already a copy of this program running! (pid: $pid)\n"); - $_ = ps("ax"); - if (/\n($pid) [!\n]*( |\/)$EXENAME/) { #TODO + my $found; + foreach (ps("ax")) { + $found = 1 if(/$pid\s.*(\s|\/)$EXENAME.*/); + } + if ($found) { print("If you feel this is an error, remove $PIDFILE!\n"); exit(1); } @@ -334,7 +348,7 @@ if($DAEMON) { exit(0); } } -printf("\nThis release includes a new skin named \"default\". You can set it in \"Configuration\" menu...\n\n"); +print("\nThis release includes a new skin named \"default\". You can set it in \"Configuration\" menu...\n\n"); $SIG{__DIE__} = \&Shutdown; my @reccmds; @@ -380,7 +394,8 @@ while(true) { my $raw_request = $Request[0]; $ACCEPT_GZIP = 0; - if($raw_request =~ /^GET (\/[\w\.\/-\:]*)([\?[\w=&\.\+\%-\:\!\@]*]*)[\#\d ]+HTTP\/1.\d$/) { +# print("REQUEST: $raw_request\n"); + if($raw_request =~ /^GET (\/[\w\.\/-\:]*)([\?[\w=&\.\+\%-\:\!\@\~]*]*)[\#\d ]+HTTP\/1.\d$/) { ($Request, $Query) = ($1, $2 ? substr($2, 1, length($2)) : undef); } else { Error("404", gettext("Not found"), gettext("The requested URL was not found on this server!")); @@ -432,10 +447,10 @@ while(true) { my $aktion; my $real_aktion = $q->param("aktion"); if ($real_aktion eq "at_timer_aktion") { + $aktion = "at_timer_save"; $aktion = "at_timer_delete" if ($q->param("at_delete")); $aktion = "force_update" if ($q->param("at_force")); $aktion = "at_timer_test" if ($q->param("test")); - $aktion = "at_timer_save" if ($q->param("save")); } my @ALLOWED_FUNCTIONS; @@ -881,8 +896,7 @@ sub header { PrintToClient("HTTP/1.0 $status$status_text", CRLF); PrintToClient("Date: ", headerTime(), CRLF); if(!$caching || $ContentType =~ /text\/html/) { -# PrintToClient("Expires: Mon, 26 Jul 1997 05:00:00 GMT", CRLF); -# PrintToClient("Cache-Control: max-age=0", CRLF); + PrintToClient("Cache-Control: max-age=0", CRLF); PrintToClient("Cache-Control: private", CRLF); PrintToClient("Pragma: no-cache", CRLF); PrintToClient("Expires: Thu, 01 Jan 1970 00:00:00 GMT", CRLF); @@ -910,7 +924,7 @@ sub headerForward { return(302, 0); } -sub headerNoAuth { #TODO +sub headerNoAuth { #TODO? my $template = TemplateNew("noauth.html"); my $vars; my $data; @@ -968,11 +982,11 @@ sub SendFile { if(!$mimehash{$2}) { die("can't find mime-type \'$2\'\n"); } return(header("200", $mimehash{$2}, $buf, 1)); } else { - printf("File not found: $File\n"); + print("File not found: $File\n"); Error("403", gettext("Forbidden"), sprintf(gettext("Access to file \"%s\" denied!"), $File)); } } else { - printf("File not found: $File\n"); + print("File not found: $File\n"); Error("404", gettext("Not found"), sprintf(gettext("The URL \"%s\" was not found on this server!"), $File)); } } @@ -1165,7 +1179,7 @@ sub AutoTimer { for my $at (@at) { next if(!$at->{active} && !$dry_run); next if(($at->{channel}) && ($at->{channel} != $event->{vdr_id})); -#printf("AT: " . $at->{channel} . " - " . $at->{pattern} . " --- " . $event->{vdr_id} . " - " . $event->{title} . "\n"); +#print("AT: " . $at->{channel} . " - " . $at->{pattern} . " --- " . $event->{vdr_id} . " - " . $event->{title} . "\n"); my $SearchStr; if($at->{section} & 1) { @@ -1226,8 +1240,9 @@ sub AutoTimer { next if(!$fp); } - #TODO: speed this up and don't always call my_strftime. - Log(LOG_DEBUG, sprintf("Auto Timer: Comparing pattern \"%s\" (%s - %s) with event \"%s\" (%s - %s)", $at->{pattern}, $at->{start}, $at->{stop}, $event->{title}, my_strftime("%H%M", $event->{start}), my_strftime("%H%M", $event->{stop}))); + my $event_start = my_strftime("%H%M", $event->{start}); + my $event_stop = my_strftime("%H%M", $event->{stop}); + Log(LOG_DEBUG, sprintf("Auto Timer: Comparing pattern \"%s\" (%s - %s) with event \"%s\" (%s - %s)", $at->{pattern}, $at->{start}, $at->{stop}, $event->{title}, $event_start, $event_stop)); # Do we have a time slot? if($at->{start}) { # We have a start time and possibly a stop time for the auto timer # Do we have Midnight between AT start and stop time? @@ -1235,27 +1250,27 @@ sub AutoTimer { # The AT includes Midnight Log(LOG_DEBUG, "922: AT includes Midnight"); # Do we have Midnight between Event start and stop? - if(my_strftime("%H%M", $event->{stop}) < my_strftime("%H%M", $event->{start})) { + if($event_stop < $event_start) { # The event includes Midnight Log(LOG_DEBUG, "926: Event includes Midnight"); - if(my_strftime("%H%M", $event->{start}) < $at->{start}) { + if($event_start < $at->{start}) { Log(LOG_DEBUG, "924: Event starts before AT start"); next; } - if(my_strftime("%H%M", $event->{stop}) > $at->{stop}) { + if($event_stop > $at->{stop}) { Log(LOG_DEBUG, "932: Event ends after AT stop"); next; } } else { # Normal event not spreading over Midnight Log(LOG_DEBUG, "937: Event does not include Midnight"); - if(my_strftime("%H%M", $event->{start}) < $at->{start}) { - if(my_strftime("%H%M", $event->{start}) > $at->{stop}) { + if($event_start < $at->{start}) { + if($event_start > $at->{stop}) { # The event starts before AT start and after AT stop Log(LOG_DEBUG, "941: Event starts before AT start and after AT stop"); next; } - if(my_strftime("%H%M", $event->{stop}) > $at->{stop}) { + if($event_stop > $at->{stop}) { # The event ends after AT stop Log(LOG_DEBUG, "946: Event ends after AT stop"); next; @@ -1266,7 +1281,7 @@ sub AutoTimer { # Normal auto timer, not spreading over midnight Log(LOG_DEBUG, "953: AT does not include Midnight"); # Is the event spreading over midnight? - if(my_strftime("%H%M", $event->{stop}) < my_strftime("%H%M", $event->{start})) { + if($event_stop < $event_start) { # Event spreads midnight if($at->{stop}) { # We have a AT stop time defined before midnight -- no match @@ -1276,12 +1291,12 @@ sub AutoTimer { } else { # We have a normal event, nothing special # Event must not start before AT start - if(my_strftime("%H%M", $event->{start}) < $at->{start}) { + if($event_start < $at->{start}) { Log(LOG_DEBUG, "963: Event starts before AT start"); next; } # Event must not end after AT stop - if(($at->{stop}) && (my_strftime("%H%M", $event->{stop}) > $at->{stop})) { + if(($at->{stop}) && ($event_stop > $at->{stop})) { Log(LOG_DEBUG, "968: Event ends after AT stop"); next; } @@ -1290,7 +1305,7 @@ sub AutoTimer { } else { # We have no AT start time if($at->{stop}) { - if(my_strftime("%H%M", $event->{stop}) > $at->{stop}) { + if($event_stop > $at->{stop}) { Log(LOG_DEBUG, "977: Only AT stop time, Event stops after AT stop"); next; } @@ -1298,8 +1313,7 @@ sub AutoTimer { } # Check if we should schedule any timers on this weekday - my %weekdays_map = (1=>'wday_mon', 2=>'wday_tue', 3=>'wday_wed', 4=>'wday_thu', - 5=>'wday_fri', 6=>'wday_sat', 7=>'wday_sun'); + my %weekdays_map = (1=>'wday_mon', 2=>'wday_tue', 3=>'wday_wed', 4=>'wday_thu', 5=>'wday_fri', 6=>'wday_sat', 7=>'wday_sun'); unless ($at->{weekdays}->{$weekdays_map{my_strftime ("%u",$event->{start})}}) { Log(LOG_DEBUG, "Event not valid for this weekday"); next; @@ -1363,7 +1377,7 @@ sub AutoTimer { if ($dry_run) { # printf("AT found: (%s) (%s) (%s) (%s) (%s) (%s)\n", $event->{title}, $title, $event->{subtitle}, $directory, $event->{start}, $event->{stop}); - push(@at_matches, { otitle => $event->{title}, title => $title, subtitle => $event->{subtitle}, directory => $directory, start => strftime("%H:%M", localtime($event->{start})), stop => strftime("%H:%M", localtime($event->{stop})), weekday => my_strftime("%A",$event->{start}), channel => GetChannelDescByNumber($event->{vdr_id})}); + push(@at_matches, { otitle => $event->{title}, title => $title, subtitle => $event->{subtitle}, directory => $directory, start => $event_start, stop => $event_stop, date => my_strftime("%A, %x",$event->{start}), channel => GetChannelDescByNumber($event->{vdr_id})}); } else { Log(LOG_AT, sprintf("AutoTimer: Programming Timer \"%s\" (Event-ID %s, %s - %s)", $title, $event->{event_id}, strftime("%Y%m%d-%H%M", localtime($event->{start})), strftime("%Y%m%d-%H%M", localtime($event->{stop})))); @@ -1422,7 +1436,7 @@ sub AT_ProgTimer { # we will only programm new timers, CheckTimers is responsible for # updating existing timers if (!$found) { - if ($CONFIG{AT_SENDMAIL} == 1) { + if ($CONFIG{AT_SENDMAIL} == 1 && -x $CONFIG{MAIL_PROG}) { my $mail = ""; my $sum = ""; my $strt = ""; @@ -1455,7 +1469,7 @@ sub AT_ProgTimer { $prio, $lft, $title, - $summary + $CONFIG{TM_ADD_SUMMARY} ? $summary : "" ); } } @@ -2528,8 +2542,8 @@ sub timer_list { } $timer->{delurl} = $MyURL . "?aktion=timer_delete&timer_id=" . $timer->{id}, $timer->{modurl} = $MyURL . "?aktion=timer_new_form&timer_id=" . $timer->{id}, - $timer->{toggleurl} = sprintf("%s?aktion=timer_toggle&active=%s&id=%s", $MyURL, ($timer->{active} & 1) ? 0 : 1, $timer->{id}), - $timer->{dor} = my_strftime("%a %d.%m", $timer->{startsse}); #TODO + $timer->{toggleurl} = sprintf("%s?aktion=timer_toggle&active=%s&id=%s&sortby=%s&desc=%s", $MyURL, ($timer->{active} & 1) ? 0 : 1, $timer->{id}, $sortby, $desc), + $timer->{dor} = my_strftime("%a %d.%m", $timer->{startsse}); #TODO: localize date $timer->{title} = CGI::escapeHTML($timer->{title}); $TagAnfang=my_mktime(0,0,my_strftime("%d", $timer->{start}),my_strftime("%m", $timer->{start}),my_strftime("%Y", $timer->{start})); @@ -2774,9 +2788,11 @@ sub timer_toggle { UptoDate(); my $active = $q->param("active"); my $id = $q->param("id"); + my $sortby = $q->param("sortby"); + my $desc = $q->param("desc"); # XXX check return SendCMD(sprintf("modt %s %s", $id, $active ? "on" : "off")); - return(headerForward(RedirectToReferer("$MyURL?aktion=timer_list"))); + return(headerForward(RedirectToReferer("$MyURL?aktion=timer_list&sortby=$sortby&desc=$desc"))); } sub timer_new_form { @@ -2795,7 +2811,7 @@ sub timer_new_form { $this_event->{stop} = $this->{stop} + ($CONFIG{TM_MARGIN_END} * 60); $this_event->{dor} = $this->{dor}; $this_event->{title} = $this->{title}; - $this_event->{summary}= $this->{summary}; + $this_event->{summary}= $CONFIG{TM_ADD_SUMMARY} ? $this->{summary} : ""; $this_event->{vdr_id} = $this->{vdr_id}; } elsif($timer_id) { # edit existing timer $this_event = ParseTimer(0, $timer_id); @@ -3049,9 +3065,11 @@ sub rec_stream { $title=$newtitle; $title =~ s/ /_/g; $title =~ s/~/\//g; - printf("REC: find $CONFIG{VIDEODIR}/ -regex \"$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec/...\\.vdr\"\n"); + print("REC: find $CONFIG{VIDEODIR}/ -regex \"$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec/...\\.vdr\"\n"); @files= `find $CONFIG{VIDEODIR}/ -regex "$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec/...\\.vdr" | sort -r`; foreach (@files) { + chomp; + print("FOUND: ($_)\n"); $_ =~ s/$CONFIG{VIDEODIR}/$CONFIG{ST_VIDEODIR}/; $_ =~ s/\n//g; $data= $CONFIG{ST_URL}."$_\n$data"; @@ -3121,7 +3139,7 @@ sub at_timer_list { $_->{sortbypattern} = 1 if($sortby eq "pattern"); $_->{sortbystart} = 1 if($sortby eq "start"); $_->{sortbystop} = 1 if($sortby eq "stop"); - $_->{toggleurl} = sprintf("%s?aktion=at_timer_toggle&active=%s&id=%s", $MyURL, ($_->{active} & 1) ? 0 : 1, $_->{id}), + $_->{toggleurl} = sprintf("%s?aktion=at_timer_toggle&active=%s&id=%s&sortby=%s&desc=%s", $MyURL, ($_->{active} & 1) ? 0 : 1, $_->{id}, $sortby, $desc), push(@at, $_); } my @timer = sort({ lc($a->{pattern}) cmp lc($b->{pattern}) } @at); @@ -3191,6 +3209,8 @@ sub at_timer_toggle { UptoDate(); my $active = $q->param("active"); my $id = $q->param("id"); + my $sortby = $q->param("sortby"); + my $desc = $q->param("desc"); my(@at, $z); @@ -3203,7 +3223,7 @@ sub at_timer_toggle { } AT_Write(@at); - return(headerForward(RedirectToReferer("$MyURL?aktion=at_timer_list"))); + return(headerForward(RedirectToReferer("$MyURL?aktion=at_timer_list&sortby=$sortby&desc=$desc"))); } sub at_timer_edit { @@ -3695,7 +3715,7 @@ sub prog_summary { vdr_id => $event->{vdr_id}, proglink => sprintf("%s?aktion=prog_list&vdr_id=%s", $MyURL, $event->{vdr_id}), switchurl => sprintf("%s?aktion=prog_switch&channel=%s", $MyURL, $event->{vdr_id}), - streamurl => sprintf("%s?aktion=live_stream&channel=%s", $MyURL, $event->{vdr_id}), + streamurl => sprintf("%s?aktion=live_stream&channel=%s", $MyStreamURL, $event->{vdr_id}), stream_live_on => $CONFIG{ST_FUNC} && $CONFIG{ST_LIVE_ON}, infurl => $event->{summary} ? sprintf("%s?aktion=prog_detail&epg_id=%s&vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}) : undef, recurl => sprintf("%s?aktion=timer_new_form&epg_id=%s&vdr_id=%s", $MyURL, $event->{event_id}, $event->{vdr_id}), @@ -3743,10 +3763,8 @@ sub prog_summary { # recordings ############################################################################# sub rec_list { - my(@all_recordings, @recordings); + my @recordings; - # - #my $ffserver = `ps -ef | grep ffserver | wc -l`; my $desc; if(!defined($q->param("desc"))) { $desc = 1; @@ -3756,20 +3774,119 @@ sub rec_list { my $sortby = $q->param("sortby"); ($sortby = "name") if(!$sortby); my $parent = $q->param("parent"); + my $parent2; if(!$parent) { $parent = 0; + } else { + $parent = uri_escape($parent); + } + + ParseRecordings($parent, $sortby); + + # create path array + my @path; my $fuse = 0; + my $rparent = $parent; +# printf("PATH: (%s)\n", $parent); + while($rparent) { + for my $recording (@RECORDINGS) { + if($recording->{recording_id} eq $rparent) { + push(@path, { + name => $recording->{name}, + url => ($recording->{recording_id} ne $parent) ? sprintf("%s?aktion=rec_list&parent=%s", $MyURL, $recording->{recording_id}) : "" + }); + $rparent = $recording->{parent}; + last; + } + } + $fuse++; + last if($fuse > 100); + } + push(@path, { + name => gettext("Schedule"), + url => ($parent ne 0) ? sprintf("%s?aktion=rec_list&parent=%s", $MyURL, 0) : "" + }); + @path = reverse(@path); + + # filter + if(defined($parent)) { + for my $recording (@RECORDINGS) { + if($recording->{parent} eq $parent) { + push(@recordings, $recording); + } + } + } else { + @recordings = @RECORDINGS; + } + + # + if($sortby eq "time") { + if(!$desc) { + @recordings = sort({ $b->{time} <=> $a->{time} } @recordings); + } else { + @recordings = sort({ $a->{time} <=> $b->{time} } @recordings); + } + } elsif($sortby eq "name") { + if(!$desc) { + @recordings = sort({ lc($b->{name}) cmp lc($a->{name}) } @recordings); + } else { + @recordings = sort({ lc($a->{name}) cmp lc($b->{name}) } @recordings); + } + } elsif($sortby eq "date") { + if(!$desc) { + @recordings = sort({ $a->{sse} <=> $b->{sse} } @recordings); + } else { + @recordings = sort({ $b->{sse} <=> $a->{sse} } @recordings); + } } - $parent = uri_escape($parent); + $desc ? ($desc = 0) : ($desc = 1); + # + my($total, $minutes_total, $free, $minutes_free, $percent) = VideoDiskFree(); + + my $template = TemplateNew("rec_list.html"); + my $vars = { + usercss => $UserCSS, + recloop => \@recordings, + sortbydateurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=date&desc=$desc&parent=$parent", + sortbytimeurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=time&desc=$desc&parent=$parent", + sortbynameurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=name&desc=$desc&parent=$parent", + sortbydate => ($sortby eq "date") ? 1 : 0, + sortbytime => ($sortby eq "time") ? 1 : 0, + sortbyname => ($sortby eq "name") ? 1 : 0, + desc => $desc, + disk_total => $total, + disk_free => $free, + disk_percent => $percent, + minutes_free => $minutes_free, + minutes_total => $minutes_total, + path => \@path, + url => $MyURL, + help_url => HelpURL("rec_list"), + reccmds => \@reccmds, + stream_rec_on => $CONFIG{ST_FUNC} && $CONFIG{ST_REC_ON} + }; + $template->param($vars); + my $output; + my $out = $template->output; + $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); + return(header("200", "text/html", $output)); +} + +sub ParseRecordings { + my $parent = shift; + my $sortby = shift; + + return if((time() - $CONFIG{CACHE_REC_LASTUPDATE}) < ($CONFIG{CACHE_REC_TIMEOUT} * 60)); + + undef @RECORDINGS; for my $recording (SendCMD("lstr")) { chomp($recording); next if(length($recording) == 0); - if($recording =~ /^No recordings available/) { - last; - } + last if($recording =~ /^No recordings available/); + my($new); my($id, $date, $time, $name) = split(/ +/, $recording, 4); -# move this to "sub ParseRecordings" +# TODO: support different listing formats of patched VDR 1.2.6 # my($id, $temp) = split(/ /, $recording, 2); # my($date, $time, $name); # print("R: $temp\n"); @@ -3796,52 +3913,70 @@ sub rec_list { } # - my(@tmp, @tmp2, $serie, $episode, $parent, $dirname, $dirname1); - if($name =~ /~/) { - @tmp2 = split(" ", $name, 2); - if(scalar(@tmp2) > 1) { - if(ord(substr($tmp2[0], length($tmp2[0])-1, 1)) == 180) { - @tmp = split("~", $tmp2[1]); - $name = "$tmp2[0] $tmp[scalar(@tmp) - 1]"; - } else { - @tmp = split("~", $name); - $name = $tmp[scalar(@tmp) - 1]; - } - } else { - @tmp = split("~", $name); - $name = $tmp[scalar(@tmp) - 1]; - } -# $dirname = $tmp[scalar(@tmp) - 2]; -# $parent = crypt($dirname, salt($dirname)); - $dirname = "@tmp[0, scalar(@tmp) - 2]"; -# printf("DIR: ($dirname) (@tmp)\n"); - $parent = uri_escape(MIME::Base64::encode_base64($dirname)); + my(@tmp, @tmp2, $serie, $episode, $parent); + @tmp = split("~", $name); + @tmp2 = @tmp; +# if($name =~ /~/) { +# @tmp2 = split(" ", $name, 2); +# if(scalar(@tmp2) > 1) { +# if(ord(substr($tmp2[0], length($tmp2[0])-1, 1)) == 180) { +# @tmp = split("~", $tmp2[1]); +# $name = "$tmp2[0] $tmp[scalar(@tmp) - 1]"; +# } else { +# @tmp = split("~", $name); +# $name = $tmp[scalar(@tmp) - 1]; +# } +# } else { +# @tmp = split("~", $name); +# $name = $tmp[scalar(@tmp) - 1]; +# } +# $parent = uri_escape(join("~",@tmp[0, scalar(@tmp) - 2])); +# } + $name = pop(@tmp); + if (@tmp) { + $parent = uri_escape(join("~", @tmp)); + } else { + $parent = 0; } - $parent = 0 if(!$parent); +# printf("PARENT: (%s) (%s) (%s)\n", scalar(@tmp), $parent, $name); # create subfolders - for(my $i = 0; $i < scalar(@tmp) - 1; $i++) { -# my $recording_id = crypt($tmp[$i], salt($tmp[$i])); - my $recording_id = uri_escape(MIME::Base64::encode_base64("@tmp[0, $i]")); + pop(@tmp2); # don't want the recording's name + while (@tmp2) { + my $recording_id = uri_escape(join("~",@tmp2)); + my $recording_name = pop(@tmp2); my $parent; - if($i != 0) { -# $parent = crypt($tmp[$i - 1], salt($tmp[$i - 1])); - $parent = uri_escape(MIME::Base64::encode_base64("@tmp[0, $i - 1]")); + if (@tmp2) { + $parent = uri_escape(join("~",@tmp2)); } else { $parent = 0; } +# printf("SUB: (%s) (%s) (%s)\n", $recording_name, $recording_id, $parent); +# } +# for(my $i = 0; $i < scalar(@tmp) - 1; $i++) { +# my $recording_id; +# my $recording_name = $tmp[$i]; +# my $parent; +# printf("REC: (%s) (%s) (%s)\n", $i, join("~",@tmp[0, $i]), join("~",@tmp[0, $i - 1])); +# $recording_id = uri_escape(join("~",@tmp[0, $i])); +# $parent; +# if($i != 0) { +# $parent = uri_escape(join("~",@tmp[0, $i - 1])); +# } else { +# $parent = 0; +# } my $found = 0; - for my $recording (@all_recordings) { + for my $recording (@RECORDINGS) { next if(!$recording->{isfolder}); if($recording->{recording_id} eq $recording_id && $recording->{parent} eq $parent) { -# printf("RECLIST %s: (%s) (%s) (%s) (%s)\n",$recording->{name}, $recording->{recording_id}, $recording_id, $recording->{parent}, $parent); $found = 1; } } if(!$found) { - push(@all_recordings, { - name => CGI::escapeHTML($tmp[$i]), +# printf("RECLIST %s: (%s) (%s)\n",$recording_name, $recording_id, $parent); + push(@RECORDINGS, { + name => CGI::escapeHTML($recording_name), recording_id => $recording_id, parent => $parent, isfolder => 1, @@ -3867,7 +4002,7 @@ sub rec_list { $yearofrecording = my_strftime("%Y"); } # endif - push(@all_recordings, { + push(@RECORDINGS, { sse => timelocal(undef, substr($time, 3, 2), substr($time, 0, 2), substr($date, 0, 2), (substr($date, 3, 2)- 1), $yearofrecording), date => $date, time => $time, @@ -3889,9 +4024,9 @@ sub rec_list { } # XXX doesn't count subsub-folders - for(@all_recordings) { + for(@RECORDINGS) { if($_->{parent} eq $parent && $_->{isfolder}) { - for my $recording (@all_recordings) { + for my $recording (@RECORDINGS) { if($recording->{parent} eq $_->{recording_id}) { $_->{date}++; $_->{time}++ if($recording->{new}); @@ -3900,92 +4035,7 @@ sub rec_list { } } - # create path array - my @path; my $fuse = 0; - my $rparent = $parent; - while($rparent) { - for my $recording (@all_recordings) { - if($recording->{recording_id} eq $rparent) { - push(@path, { - name => CGI::escapeHTML($recording->{name}), - url => ($recording->{recording_id} ne $parent) ? sprintf("%s?aktion=rec_list&parent=%s", $MyURL, $recording->{recording_id}) : "" - }); - $rparent = $recording->{parent}; - last; - } - } - $fuse++; - last if($fuse > 100); - } - push(@path, { - name => gettext("Schedule"), - url => ($parent ne 0) ? sprintf("%s?aktion=rec_list&parent=%s", $MyURL, 0) : "" - }); - @path = reverse(@path); - - # filter - if(defined($parent)) { - for my $recording (@all_recordings) { - if($recording->{parent} eq $parent) { - push(@recordings, $recording); - } - } - } else { - @recordings = @all_recordings; - } - - # - if($sortby eq "time") { - if(!$desc) { - @recordings = sort({ $b->{time} <=> $a->{time} } @recordings); - } else { - @recordings = sort({ $a->{time} <=> $b->{time} } @recordings); - } - } elsif($sortby eq "name") { - if(!$desc) { - @recordings = sort({ lc($b->{name}) cmp lc($a->{name}) } @recordings); - } else { - @recordings = sort({ lc($a->{name}) cmp lc($b->{name}) } @recordings); - } - } elsif($sortby eq "date") { - if(!$desc) { - @recordings = sort({ $a->{sse} <=> $b->{sse} } @recordings); - } else { - @recordings = sort({ $b->{sse} <=> $a->{sse} } @recordings); - } - } - $desc ? ($desc = 0) : ($desc = 1); - - # - my($total, $minutes_total, $free, $minutes_free, $percent) = VideoDiskFree(); - - my $template = TemplateNew("rec_list.html"); - my $vars = { - usercss => $UserCSS, - recloop => \@recordings, - sortbydateurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=date&desc=$desc&parent=$parent", - sortbytimeurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=time&desc=$desc&parent=$parent", - sortbynameurl => "$MyURL?aktion=rec_list&parent=$parent&sortby=name&desc=$desc&parent=$parent", - sortbydate => ($sortby eq "date") ? 1 : 0, - sortbytime => ($sortby eq "time") ? 1 : 0, - sortbyname => ($sortby eq "name") ? 1 : 0, - desc => $desc, - disk_total => $total, - disk_free => $free, - disk_percent => $percent, - minutes_free => $minutes_free, - minutes_total => $minutes_total, - path => \@path, - url => $MyURL, - help_url => HelpURL("rec_list"), - reccmds => \@reccmds, - stream_rec_on => $CONFIG{ST_FUNC} && $CONFIG{ST_REC_ON} - }; - $template->param($vars); - my $output; - my $out = $template->output; - $Xtemplate->process(\$out, $vars, \$output) || return(header("500", "text/html", $Xtemplate->error())); - return(header("200", "text/html", $output)); + $CONFIG{CACHE_REC_LASTUPDATE} = time(); } sub getRecInfo { @@ -4144,8 +4194,11 @@ sub recRunCmd { $title =~ s/ /_/g; $title =~ s/~/\//g; $folder = `find $CONFIG{VIDEODIR}/ -regex "$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec"`; + print("CMD: find $CONFIG{VIDEODIR}/ -regex \"$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec\"\n"); if ($folder) { + chomp($folder); + print("FOUND: $folder\n"); `$cmd $folder`; } } @@ -4188,6 +4241,7 @@ sub config { my $old_epgprune = $CONFIG{EPG_PRUNE}; my $old_epgdirect = $CONFIG{EPG_DIRECT}; my $old_epgfile = $CONFIG{EPG_FILENAME}; + my $old_vdrconfdir = $CONFIG{VDRCONFDIR}; for($q->param) { if(/[A-Z]+/) { @@ -4197,6 +4251,7 @@ sub config { LoadTranslation() if($old_lang ne $CONFIG{LANG}); UptoDate(1) if($old_epgprune != $CONFIG{EPG_PRUNE} || $old_epgdirect != $CONFIG{EPG_DIRECT} || $old_epgfile ne $CONFIG{EPG_FILENAME}); + loadRecCmds() if($old_vdrconfdir ne $CONFIG{VDRCONFDIR}); } sub WriteConfig { @@ -4367,11 +4422,11 @@ sub tv_show { ($found = 1) if($n eq $chan->{vdr_id}); } next if(!$found); - if($chan->{vdr_id}) { - $chan->{cur} = ($chan->{vdr_id} == $cur_channel_id) ? 1 : 0; - } - push(@chans, $chan); } + if($chan->{vdr_id}) { + $chan->{cur} = ($chan->{vdr_id} == $cur_channel_id) ? 1 : 0; + } + push(@chans, $chan); } my $template = TemplateNew("tv.html"); @@ -4468,6 +4523,7 @@ sub isLinVDR { } sub loadRecCmds { + undef @reccmds; my $id = 0; if(-e "$CONFIG{VDRCONFDIR}/reccmds.conf" and my $text = open(FH, "$CONFIG{VDRCONFDIR}/reccmds.conf")) { while(<FH>) { @@ -4484,6 +4540,20 @@ sub loadRecCmds { } } +sub findSendEmail { + return if($CONFIG{AT_SENDMAIL} != "1"); + return if(-x $CONFIG{MAIL_PROG}); + foreach my $path (@PATH) { + if(-x $path . "/sendEmail") { + $CONFIG{MAIL_PROG} = $path . "/sendEmail"; + WriteConfig(); + print("Found & using $CONFIG{MAIL_PROG}\n"); + last; + } + } + print("ERROR: Didn't find the sendEmail program!\n") if(! -x $CONFIG{MAIL_PROG}); +} + ############################################################################# # Authentication ############################################################################# |