diff options
58 files changed, 447 insertions, 104 deletions
@@ -1,3 +1,118 @@ +2008-12-20 tag v3_6_4 + +2008-12-20 amair + + * HISTORY: + + Fixed typo. + +2008-12-19 amair + + * HISTORY, vdradmind.pl: + + Updated for release v3.6.4. + +2008-12-18 scop + + * vdradmind.pl: + + Debug log message fix. + +2008-12-18 scop + + * po/fi.po: + + Add some missing translations. + +2008-12-18 amair + + * tools/update-po: + + Added "--check-only" param to list the number of untranslated and fuzzy messages. + +2008-12-18 amair + + * po/de.po: + + Updated. + +2008-12-18 amair + + * po/cs.po, po/de.po, po/es.po, po/fi.po, po/fr.po, po/it.po, + po/nl.po, po/ru.po, po/vdradmin.pot: + + Added new messages. + +2008-12-17 amair + + * HISTORY, vdradmind.pl: + + - Added: Use ".update" in VDR's video directory to check if recordings cache needs to be refreshed. + - Added: CACHE_REC_ENABLED option in vdradmind.conf to enable (1) or disable (2) recordings caching. + +2008-12-16 amair + + * vdradmind.pl: + + - Display error message in configuration menu if config could not be saved. + - Display warning message in configuration menu if config file is not writable by current user. + +2008-12-16 amair + + * template/default/at_timer_list.html, + template/default/at_timer_new.html, template/default/config.html, + template/default/epgsearch_config.html, + template/default/epgsearch_list.html, + template/default/epgsearch_new.html, + template/default/prog_detail_form.html, + template/default/prog_list.html, + template/default/prog_list2.html, + template/default/prog_summary.html, + template/default/prog_summary2.html, + template/default/prog_timeline.html, + template/default/rec_edit.html, template/default/rec_list.html, + template/default/timer_list.html, + template/default/timer_new.html, template/default/tv.html, + template/default/vdr_cmds.html: + + Added block to show error messages. + +2008-12-16 amair + + * install.sh: + + Check for more required Perl modules. + +2008-12-16 amair + + * HISTORY, vdradmind.pl: + + Encode.pm now is optional and no recoding will happen if it's missing. + +2008-12-13 scop + + * po/fi.po: + + More Finnish translation updates/additions. + +2008-12-13 scop + + * vdradmind.pl: + + Fix setting process name (top-level "my $PROCNAME" was not available in BEGIN). + +2008-12-13 scop + + * template/default/about.html: + + Mention myself as a Finnish translator. + +2008-12-13 scop + + * HISTORY, po/fi.po: + + Finnish translation updates. + 2008-12-13 tag v3_6_3 2008-12-13 amair @@ -4,6 +4,12 @@ E-Mail: mail AT andreas DOT vdr-developer DOT org VDR-Portal: amair ----------------------------------------------------------- +2008-12-20: 3.6.4 +- Added: Use ".update" in VDR's video directory to check if recordings cache needs to be refreshed. +- Added: CACHE_REC_ENABLED option in vdradmind.conf to enable (1) or disable (0) recordings caching. +- Changed: Encode.pm now is optional and no recoding will happen if it's missing. +- Updated: Finnish translation (Ville Skyttä) + 2008-12-13: 3.6.3 - Updated: Spanish translation (Submitted by Rüdiger Jung). - Changed: Process name to "vdradmind" (Based on patch submitted by Ville Skyttä). @@ -75,8 +75,9 @@ function perlModules() { echo "" echo "*** Required ***" + checkPerlModule locale + checkPerlModule Env checkPerlModule Template - checkPerlModule Compress::Zlib checkPerlModule CGI checkPerlModule IO::Socket checkPerlModule Time::Local @@ -84,6 +85,7 @@ function perlModules() checkPerlModule File::Temp checkPerlModule URI::Escape + echo "" echo "You need Locale::gettext OR Locale::Messages" checkPerlModule Locale::gettext Locale::Messages @@ -95,6 +97,12 @@ function perlModules() checkPerlModule Authen::SASL echo "* Required for AutoTimer email notification and CRAM-MD5 authentication" checkPerlModule Digest::HMAC_MD5 + echo "* Required if VDR and VDRAdmin-AM use different character encoding" + checkPerlModule Encode + echo "* Required for IPv6 support" + checkPerlModule IO::Socket::INET6 + echo "* Required if you want to use gzip'ed HTTP responses" + checkPerlModule Compress::Zlib } function makeDir() diff --git a/locale/cs/LC_MESSAGES/vdradmin.mo b/locale/cs/LC_MESSAGES/vdradmin.mo Binary files differindex 29b9aa0..a657fda 100644 --- a/locale/cs/LC_MESSAGES/vdradmin.mo +++ b/locale/cs/LC_MESSAGES/vdradmin.mo diff --git a/locale/cs_CZ.utf8/LC_MESSAGES/vdradmin.mo b/locale/cs_CZ.utf8/LC_MESSAGES/vdradmin.mo Binary files differindex d315bd4..765ebc1 100644 --- a/locale/cs_CZ.utf8/LC_MESSAGES/vdradmin.mo +++ b/locale/cs_CZ.utf8/LC_MESSAGES/vdradmin.mo diff --git a/locale/de/LC_MESSAGES/vdradmin.mo b/locale/de/LC_MESSAGES/vdradmin.mo Binary files differindex 16f889f..4c539b0 100644 --- a/locale/de/LC_MESSAGES/vdradmin.mo +++ b/locale/de/LC_MESSAGES/vdradmin.mo diff --git a/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo b/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo Binary files differindex 103ed95..16663af 100644 --- a/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo +++ b/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo diff --git a/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo b/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo Binary files differindex 235fd92..b8201b6 100644 --- a/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo +++ b/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo diff --git a/locale/es/LC_MESSAGES/vdradmin.mo b/locale/es/LC_MESSAGES/vdradmin.mo Binary files differindex 56639e5..596652c 100644 --- a/locale/es/LC_MESSAGES/vdradmin.mo +++ b/locale/es/LC_MESSAGES/vdradmin.mo diff --git a/locale/es_ES.utf8/LC_MESSAGES/vdradmin.mo b/locale/es_ES.utf8/LC_MESSAGES/vdradmin.mo Binary files differindex 9660524..8859a45 100644 --- a/locale/es_ES.utf8/LC_MESSAGES/vdradmin.mo +++ b/locale/es_ES.utf8/LC_MESSAGES/vdradmin.mo diff --git a/locale/fi/LC_MESSAGES/vdradmin.mo b/locale/fi/LC_MESSAGES/vdradmin.mo Binary files differindex 84bc88d..3909ede 100644 --- a/locale/fi/LC_MESSAGES/vdradmin.mo +++ b/locale/fi/LC_MESSAGES/vdradmin.mo diff --git a/locale/fi_FI.utf8/LC_MESSAGES/vdradmin.mo b/locale/fi_FI.utf8/LC_MESSAGES/vdradmin.mo Binary files differindex 48b4efd..c2ab9db 100644 --- a/locale/fi_FI.utf8/LC_MESSAGES/vdradmin.mo +++ b/locale/fi_FI.utf8/LC_MESSAGES/vdradmin.mo diff --git a/locale/fr/LC_MESSAGES/vdradmin.mo b/locale/fr/LC_MESSAGES/vdradmin.mo Binary files differindex 326f1ce..a2c0a07 100644 --- a/locale/fr/LC_MESSAGES/vdradmin.mo +++ b/locale/fr/LC_MESSAGES/vdradmin.mo diff --git a/locale/fr_FR.utf8/LC_MESSAGES/vdradmin.mo b/locale/fr_FR.utf8/LC_MESSAGES/vdradmin.mo Binary files differindex a965c76..a775b1a 100644 --- a/locale/fr_FR.utf8/LC_MESSAGES/vdradmin.mo +++ b/locale/fr_FR.utf8/LC_MESSAGES/vdradmin.mo diff --git a/locale/it/LC_MESSAGES/vdradmin.mo b/locale/it/LC_MESSAGES/vdradmin.mo Binary files differindex ecbdff5..db1a119 100644 --- a/locale/it/LC_MESSAGES/vdradmin.mo +++ b/locale/it/LC_MESSAGES/vdradmin.mo diff --git a/locale/it_IT.utf8/LC_MESSAGES/vdradmin.mo b/locale/it_IT.utf8/LC_MESSAGES/vdradmin.mo Binary files differindex 1243d67..de41e76 100644 --- a/locale/it_IT.utf8/LC_MESSAGES/vdradmin.mo +++ b/locale/it_IT.utf8/LC_MESSAGES/vdradmin.mo diff --git a/locale/nl/LC_MESSAGES/vdradmin.mo b/locale/nl/LC_MESSAGES/vdradmin.mo Binary files differindex 72018e5..8dc68a3 100644 --- a/locale/nl/LC_MESSAGES/vdradmin.mo +++ b/locale/nl/LC_MESSAGES/vdradmin.mo diff --git a/locale/nl_NL.utf8/LC_MESSAGES/vdradmin.mo b/locale/nl_NL.utf8/LC_MESSAGES/vdradmin.mo Binary files differindex d0fd44c..2facef1 100644 --- a/locale/nl_NL.utf8/LC_MESSAGES/vdradmin.mo +++ b/locale/nl_NL.utf8/LC_MESSAGES/vdradmin.mo diff --git a/locale/ru/LC_MESSAGES/vdradmin.mo b/locale/ru/LC_MESSAGES/vdradmin.mo Binary files differindex dede908..84deccd 100644 --- a/locale/ru/LC_MESSAGES/vdradmin.mo +++ b/locale/ru/LC_MESSAGES/vdradmin.mo diff --git a/locale/ru_RU.utf8/LC_MESSAGES/vdradmin.mo b/locale/ru_RU.utf8/LC_MESSAGES/vdradmin.mo Binary files differindex 0f906f9..092b7a5 100644 --- a/locale/ru_RU.utf8/LC_MESSAGES/vdradmin.mo +++ b/locale/ru_RU.utf8/LC_MESSAGES/vdradmin.mo @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cs\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-02 07:48+0100\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" "PO-Revision-Date: 2006-09-23 13:14+0200\n" "Last-Translator: Karel Borkovec <her-ur@her-ur.org>\n" "Language-Team: <cs@li.org>\n" @@ -1527,6 +1527,14 @@ msgstr "detailnķ pųehled" msgid "Schedule" msgstr "Plįn" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "" + msgid "Timers" msgstr "Časovače" diff --git a/po/cs_CZ.utf8.po b/po/cs_CZ.utf8.po index c98e090..31c8e61 100644 --- a/po/cs_CZ.utf8.po +++ b/po/cs_CZ.utf8.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cs\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-02 07:48+0100\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" "PO-Revision-Date: 2006-09-23 13:14+0200\n" "Last-Translator: Karel Borkovec <her-ur@her-ur.org>\n" "Language-Team: <cs@li.org>\n" @@ -1527,6 +1527,14 @@ msgstr "detailnĆ pÅehled" msgid "Schedule" msgstr "PlĆ”n" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "" + msgid "Timers" msgstr "ÄasovaÄe" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.2+cvs\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-02 07:48+0100\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" "PO-Revision-Date: 2007-07-26 14:49+0100\n" "Last-Translator: Andreas Mair <mail@andreas.vdr-developer.org>\n" "Language-Team: Andreas Mair <mail@andreas.vdr-developer.org>\n" @@ -1428,6 +1428,14 @@ msgstr "Ausführliche Ansicht" msgid "Schedule" msgstr "Übersicht" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "Kann die Konfigurationsdatei %s nicht schreiben! Grund: %s" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "Die Konfigurationsdatei %s ist schreibgeschützt! Die Konfiguration wird nicht gesichert!" + msgid "Timers" msgstr "Timer" diff --git a/po/de_DE.utf8.po b/po/de_DE.utf8.po index b80dd5e..7b5df9a 100644 --- a/po/de_DE.utf8.po +++ b/po/de_DE.utf8.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.2+cvs\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-02 07:48+0100\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" "PO-Revision-Date: 2007-07-26 14:49+0100\n" "Last-Translator: Andreas Mair <mail@andreas.vdr-developer.org>\n" "Language-Team: Andreas Mair <mail@andreas.vdr-developer.org>\n" @@ -1428,6 +1428,14 @@ msgstr "AusfĆ¼hrliche Ansicht" msgid "Schedule" msgstr "Ćbersicht" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "Kann die Konfigurationsdatei %s nicht schreiben! Grund: %s" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "Die Konfigurationsdatei %s ist schreibgeschĆ¼tzt! Die Konfiguration wird nicht gesichert!" + msgid "Timers" msgstr "Timer" diff --git a/po/en_US.utf8.po b/po/en_US.utf8.po index c5c917d..46afe67 100644 --- a/po/en_US.utf8.po +++ b/po/en_US.utf8.po @@ -18,10 +18,10 @@ # msgid "" msgstr "" -"Project-Id-Version: VDRAdmin-AM 3.6.2+cvs\n" +"Project-Id-Version: VDRAdmin-AM 3.6.3\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-02 07:48+0100\n" -"PO-Revision-Date: 2008-12-02 07:48+0100\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" +"PO-Revision-Date: 2008-12-18 08:25+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -1440,6 +1440,14 @@ msgstr "long view" msgid "Schedule" msgstr "Schedule" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "Can't write configuration file %s! Reason: %s" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "Configuration file %s not writeable! Configuration won't be saved!" + msgid "Timers" msgstr "Timers" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.3\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-09-25 13:23+0200\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" "PO-Revision-Date: 2008-11-02 19:28+0100\n" "Last-Translator: r <r@g.c>\n" "Language-Team: rudiberto <r_jung@web.de>\n" @@ -562,7 +562,6 @@ msgstr "Ocultar resultados" msgid "Settings" msgstr "Propiedades" - msgid "Name:" msgstr "Nombre:" @@ -1541,6 +1540,14 @@ msgstr "Vista detallada" msgid "Schedule" msgstr "Vista general" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "" + msgid "Timers" msgstr "Programaciones" diff --git a/po/es_ES.utf8.po b/po/es_ES.utf8.po index 3f2955c..57013cd 100644 --- a/po/es_ES.utf8.po +++ b/po/es_ES.utf8.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.3\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-09-25 13:23+0200\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" "PO-Revision-Date: 2008-11-02 19:28+0100\n" "Last-Translator: r <r@g.c>\n" "Language-Team: rudiberto <r_jung@web.de>\n" @@ -562,7 +562,6 @@ msgstr "Ocultar resultados" msgid "Settings" msgstr "Propiedades" - msgid "Name:" msgstr "Nombre:" @@ -1541,6 +1540,14 @@ msgstr "Vista detallada" msgid "Schedule" msgstr "Vista general" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "" + msgid "Timers" msgstr "Programaciones" @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.2\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-02 07:48+0100\n" -"PO-Revision-Date: 2007-08-17 17:43+0300\n" -"Last-Translator: Ville Skyttä\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" +"PO-Revision-Date: 2008-12-18 18:20+0200\n" +"Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n" "Language-Team: Suomi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -421,9 +421,8 @@ msgstr "Löydettyäsi ohjelmistovirheen tarkista, ettei sitä ole jo raportoitu aie msgid "<p>Here you can edit an automatic timer's (AutoTimer) settings.</p><p>AutoTimer is a key feature of VDRAdmin-AM. An AutoTimer consists of one or more search terms and some other settings, that are looked for regularly in the Electronic Program Guide (EPG). On match AutoTimer adds a timer in VDR automatically for that broadcast. That's very comfortable for irregularly broadcasted series or movies you don't want to miss.</p>" msgstr "" -#, fuzzy msgid "Activate or deactivate this AutoTimer. Deactivated AutoTimers are still stored in the AutoTimer list so that they can be activated again, but they do not record anything meanwhile. Above that you can set this to \"oneshot\" so this AutoTimer only programs the (one!) next matching broadcast." -msgstr "Aktivoi tai deaktivoi tämä ajastin. Deaktivoidut ajastimet eivät tallenna mitään, mutta ne näytetään ajastinlistauksessa josta ne voidaan aktivoida uudelleen." +msgstr "Aktivoi tai deaktivoi tämä hakuajastin. Deaktivoidut hakuajastimet eivät tallenna mitään, mutta ne näytetään ajastinlistauksessa josta ne voidaan aktivoida uudelleen. Voit myös määrittää hakuajastimen toimimaan vain kerran, jolloin se ajastaa vain (yhden) seuraavan hakuun osuvan ohjelman tallennuksen." msgid "Choosing the right search items decides whether only the wanted broadcasts or broadcasts having similar names or even nothing gets recorded.<br />Case doesn't matter, \"X-Files\" matches anything \"x-files\" will match. You can set multiple search items by separating them with spaces. Only broadcasts will match if they contain <strong>all</strong> items.<br />You'd better only use letters and numbers for search items, as the EPG often miss colons, brackets and other characters.<br />Experts can also use regular expressions, but you have to get needed information from the VDRAdmin-AM sources (undocumented feature).<br /><br />You can exclude broadcasts so that they don't get recorded even if they would match an AutoTimer. Therefore you have to enter that titles into the file <i>vdradmind.bl</i>, one event a line. This file must be located in your VDRAdmin-AM's configuration folder. If this string is found either in the EPG's <u>title</u> or in <u>title~subtitle</u>, this event will not be programmed by AutoTimer. So you can disable complete episodes (for example when using \"Enterprise\" as Blacklist-string) or only one episode (when using \"Enterprise~Azati Prime\" as Blacklist-string)." msgstr "" @@ -437,22 +436,20 @@ msgstr "" msgid "The channel to look for matching broadcasts or \"all\" to search in all known or wanted channels. You can define the wanted channels for AutoTimer in \"Configuration\"." msgstr "" -#, fuzzy msgid "A broadcast must start after the time entered here to match. The first text field is for \"hour\", the second for \"minute\"." -msgstr "Aika jolloin ajastettu tallennus alkaa. Ensimmäiseen kenttään syötetään tunnit, jälkimmäiseen minuutit." +msgstr "Ohjelman pitää alkaa tähän syötetyn ajan jälkeen osuakseen hakuehtoon. Ensimmäiseen kenttään syötetään tunnit, jälkimmäiseen minuutit." -#, fuzzy msgid "A broadcast must end before the time entered here to match. The first text field is for \"hour\", the second for \"minute\"." -msgstr "Aika jolloin ajastettu tallennus alkaa. Ensimmäiseen kenttään syötetään tunnit, jälkimmäiseen minuutit." +msgstr "Ohjelman pitää loppua ennen tähän syötettyä aikaa osuakseen hakuehtoon. Ensimmäiseen kenttään syötetään tunnit, jälkimmäiseen minuutit." msgid "Set this option to \"yes\" if all timers programed by this AutoTimer should have individual start/stop margins and enter the values in the next two text boxes." msgstr "" msgid "The number of minutes VDRAdmin-AM subtracts from the broadcasts start time found in the EPG." -msgstr "" +msgstr "Minuuttimäärä jonka verran ennen ohjelmaoppaan tietojen ohjelman alkuaikaa VDRAdmin-AM asettaa tallennuksen alkamaan." msgid "The number of minutes VDRAdmin-AM adds to the broadcasts stop time found in the EPG." -msgstr "" +msgstr "Minuuttimäärä jonka verran ohjelmaoppaan tietojen ohjelman loppuajan jälkeen VDRAdmin-AM asettaa tallennuksen loppumaan." msgid "Check this box if you want VDRAdmin-AM to append the broadcast's EPG subtitle to the recording's file name." msgstr "" @@ -481,13 +478,11 @@ msgstr "Lisää uusi musta lista" msgid "Edit Blacklist" msgstr "Muokkaa mustaa listaa" -#, fuzzy msgid "Add New Template" -msgstr "Lisää uusi hakuajastin" +msgstr "Lisää uusi mallipohja" -#, fuzzy msgid "Edit Template" -msgstr "Pohja:" +msgstr "Muokkaa mallipohjaa" msgid "Add New Search" msgstr "Lisää uusi hakuajastin" @@ -507,9 +502,8 @@ msgstr "Piilota hakutulokset" msgid "Settings" msgstr "Asetukset" -#, fuzzy msgid "Name:" -msgstr "Nimi" +msgstr "Nimi:" msgid "Search Term:" msgstr "Hakutermi:" @@ -676,13 +670,11 @@ msgstr "Kanavanvaihdon asetukset" msgid "Switch ... Minutes Before Start:" msgstr "Vaihda ... minuuttia ennen alkua:" -#, fuzzy msgid "Delete template" -msgstr "Käytä mallipohjaa" +msgstr "Poista mallipohja" -#, fuzzy msgid "Delete this template?" -msgstr "Poistetaanko ajastin?" +msgstr "Poistetaanko mallipohja?" msgid "Save as template" msgstr "Tallenna mallipohjaksi" @@ -787,7 +779,7 @@ msgid "Skin:" msgstr "Ulkoasu:" msgid "The skin you want to use." -msgstr "" +msgstr "Haluamasi käyttöliittymän ulkoasu." msgid "Login Page:" msgstr "Aloitussivu:" @@ -805,7 +797,7 @@ msgid "Local net (no login required):" msgstr "Käyttäjätunnukseton osoiteavaruus:" msgid "Here you can specify an IP address or range that can login without providing login information. For example: \"192.168.0.0/24\" will include any IP starting with \"192.168.0\", \"192.168.0.123/32\" will only match \"192.168.0.123\"." -msgstr "" +msgstr "Tässä määritellystä IP-osoitteesta tai -avaruudesta sallitaan sisäänkirjautumiset ilman käyttäjätunnusta ja salasanaa. Esimerkiksi: \"192.168.0.0/24\" sallii mistä tahansa IP-osoitteesta joka alkaa \"192.168.0\", \"192.168.0.123/32\" sallii vain IP-osoitteesta \"192.168.0.123\"." msgid "Language:" msgstr "Kieli:" @@ -826,7 +818,7 @@ msgid "Number of DVB cards:" msgstr "DVB-korttien lukumäärä:" msgid "The number of DVB cards VDR can access. Depending on this value VDRAdmin-AM will calculate critical timers in the <span class=\"ref_menu\">Timer</span> menu." -msgstr "" +msgstr "VDR:n käyttämien DVB-korttien lukumäärä. VDRAdmin-AM käyttää tätä lukua laskiessaan ajastimien toteutumisen mahdollisuutta <span class=\"ref_menu\">Ajastimet</span>-näkymässä." msgid "Path to recordings:" msgstr "VDR-tallenteiden polku:" @@ -835,10 +827,10 @@ msgid "The path to VDR's recordings. It's used so that VDRAdmin-AM can locate th msgstr "" msgid "Path to configuration files:" -msgstr "Konfigurointitiedostojen polku:" +msgstr "Asetustiedostojen polku:" msgid "The path where VDR's configuration files are located. If this directory contains the file <span class=\"ref_file\">reccmds.conf</span> its content is shown in a selectbox in the <span class=\"ref_menu\">Recordings</span> menu." -msgstr "" +msgstr "Polku jossa VDR:n asetustiedostot sijaitsevat. Mikäli tämän polun osoittamassa hakemistossa on tiedosto <span class=\"ref_file\">reccmds.conf</span>, sen sisältämät komennot näytetään alasvetovalikossa <span class=\"ref_menu\">Tallenteet</span>-näkymässä." msgid "Path to EPG images:" msgstr "Ohjelmisto-oppaan kuvapolku:" @@ -880,7 +872,7 @@ msgid "Hours:" msgstr "Pituus tunteina:" msgid "The number of hours to show in the timeline." -msgstr "" +msgstr "Aikajanalla näytettävien tuntien lukumäärä." msgid "Times:" msgstr "Ajankohdat:" @@ -898,7 +890,7 @@ msgid "Active:" msgstr "Käytössä:" msgid "Activate or deactivate the AutoTimer function." -msgstr "" +msgstr "Aktivoi tai deaktivoi hakuajastintoiminto." msgid "Send email after programming timer:" msgstr "Lähetä sähköpostia ohjelmoidusta ajastimesta:" @@ -988,7 +980,7 @@ msgid "Suffix for live streaming:" msgstr "Live-kuvan suoratoiston tiedostopääte:" msgid "The suffix to use for live streaming. Defaults to \"m3u\"." -msgstr "" +msgstr "Live-kuvan suoratoiston tiedostopääte, oletus \"m3u\"." msgid "MIME type for recordings streaming:" msgstr "Tallenteiden suoratoiston MIME-tyyppi:" @@ -999,9 +991,8 @@ msgstr "" msgid "Suffix for recordings streaming:" msgstr "Tallenteiden suoratoiston tiedostopääte:" -#, fuzzy msgid "The suffix to use for recordings streaming. Defaults to \"m3u\"." -msgstr "Tallenteiden suoratoiston tiedostopääte:" +msgstr "Tallenteiden suoratoiston tiedostopääte, oletus \"m3u\"." msgid "<p>Here you can define two external searches that you can access in the EPG views. You simply have to find the required URL and where the search pattern has to be located. %TITLE% will be substituted by the broadcast's EPG title.</p>" msgstr "" @@ -1013,7 +1004,7 @@ msgid "Please change the hostname to your local needs!" msgstr "" msgid "<p>This section is for experts <strong>only</strong>, i.e. you know what you are doing!</p>" -msgstr "" +msgstr "<p>Tämä osio on <strong>vain</strong> asiantuntijoille jotka tietävät mitä ovat tekemässä!</p>" msgid "Update EPG data in background:" msgstr "Päivitä ohjelmaopasta taustalla:" @@ -1025,7 +1016,7 @@ msgid "Update EPG every:" msgstr "Ohjelmaoppaan päivitysväli:" msgid "The interval, the EPG data is refreshed from VDR and AutoTimer updates are performed (if AutoTimer feature is used)." -msgstr "" +msgstr "Aika jonka välein ohjelmaoppaan tiedot päivitetään VDR:stä ja hakuajastimien päivitykset tehdään (mikäli hakuajastintoiminto on käytössä)." msgid "<p>If you want to limit the number of channels used in some parts of VDRAdmin-AM, this is for you!</p><p>Use the radio buttons to activate or deactivate the wanted channels in the named menu.</p><p>To add channels to the list of wanted channels you have to select them in the left side selectbox and click <input type=\"submit\" class=\"submit\" value=\">>>>>\"/>. If you want to remove channels from the list of wanted channels you have to select them in the right side selectbox and click <input type=\"submit\" class=\"submit\" value=\"<<<<<\"/>.</p>" msgstr "" @@ -1208,7 +1199,7 @@ msgid "Duration" msgstr "Kesto" msgid "Template:" -msgstr "Pohja:" +msgstr "Mallipohja:" msgid "Also used for other EPG views!" msgstr "Käytetään myös muihin ohjelmaoppaan näkymiin!" @@ -1328,10 +1319,10 @@ msgid "Where are your recordings stored?" msgstr "Anna VDR-koneesi tallennehakemiston polku:" msgid "Where are your VDR's configuration files located?" -msgstr "Anna VDR-koneesi konfigurointihakemiston polku:" +msgstr "Anna VDR-koneesi asetustiedostojen hakemiston polku:" msgid "Config file written successfully." -msgstr "VDRAdmin-AM konfigurointitiedosto muodostettu." +msgstr "VDRAdmin-AM:n asetustiedosto muodostettu." #, perl-format msgid "%s %s started with pid %d." @@ -1436,6 +1427,14 @@ msgstr "pitkä näkymä" msgid "Schedule" msgstr "Ohjelmisto" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "Asetustiedoston %s kirjoittaminen ei onnistu: %s" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "Ei kirjoitusoikeutta asetustiedostoon %s, asetukset eivät tallennu!" + msgid "Timers" msgstr "Ajastimet" diff --git a/po/fi_FI.utf8.po b/po/fi_FI.utf8.po index ec9f95d..2d170cd 100644 --- a/po/fi_FI.utf8.po +++ b/po/fi_FI.utf8.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.2\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-02 07:48+0100\n" -"PO-Revision-Date: 2007-08-17 17:43+0300\n" -"Last-Translator: Ville SkyttƤ\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" +"PO-Revision-Date: 2008-12-18 18:20+0200\n" +"Last-Translator: Ville SkyttƤ <ville.skytta@iki.fi>\n" "Language-Team: Suomi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -421,9 +421,8 @@ msgstr "LƶydettyƤsi ohjelmistovirheen tarkista, ettei sitƤ ole jo raportoitu msgid "<p>Here you can edit an automatic timer's (AutoTimer) settings.</p><p>AutoTimer is a key feature of VDRAdmin-AM. An AutoTimer consists of one or more search terms and some other settings, that are looked for regularly in the Electronic Program Guide (EPG). On match AutoTimer adds a timer in VDR automatically for that broadcast. That's very comfortable for irregularly broadcasted series or movies you don't want to miss.</p>" msgstr "" -#, fuzzy msgid "Activate or deactivate this AutoTimer. Deactivated AutoTimers are still stored in the AutoTimer list so that they can be activated again, but they do not record anything meanwhile. Above that you can set this to \"oneshot\" so this AutoTimer only programs the (one!) next matching broadcast." -msgstr "Aktivoi tai deaktivoi tƤmƤ ajastin. Deaktivoidut ajastimet eivƤt tallenna mitƤƤn, mutta ne nƤytetƤƤn ajastinlistauksessa josta ne voidaan aktivoida uudelleen." +msgstr "Aktivoi tai deaktivoi tƤmƤ hakuajastin. Deaktivoidut hakuajastimet eivƤt tallenna mitƤƤn, mutta ne nƤytetƤƤn ajastinlistauksessa josta ne voidaan aktivoida uudelleen. Voit myƶs mƤƤrittƤƤ hakuajastimen toimimaan vain kerran, jolloin se ajastaa vain (yhden) seuraavan hakuun osuvan ohjelman tallennuksen." msgid "Choosing the right search items decides whether only the wanted broadcasts or broadcasts having similar names or even nothing gets recorded.<br />Case doesn't matter, \"X-Files\" matches anything \"x-files\" will match. You can set multiple search items by separating them with spaces. Only broadcasts will match if they contain <strong>all</strong> items.<br />You'd better only use letters and numbers for search items, as the EPG often miss colons, brackets and other characters.<br />Experts can also use regular expressions, but you have to get needed information from the VDRAdmin-AM sources (undocumented feature).<br /><br />You can exclude broadcasts so that they don't get recorded even if they would match an AutoTimer. Therefore you have to enter that titles into the file <i>vdradmind.bl</i>, one event a line. This file must be located in your VDRAdmin-AM's configuration folder. If this string is found either in the EPG's <u>title</u> or in <u>title~subtitle</u>, this event will not be programmed by AutoTimer. So you can disable complete episodes (for example when using \"Enterprise\" as Blacklist-string) or only one episode (when using \"Enterprise~Azati Prime\" as Blacklist-string)." msgstr "" @@ -437,22 +436,20 @@ msgstr "" msgid "The channel to look for matching broadcasts or \"all\" to search in all known or wanted channels. You can define the wanted channels for AutoTimer in \"Configuration\"." msgstr "" -#, fuzzy msgid "A broadcast must start after the time entered here to match. The first text field is for \"hour\", the second for \"minute\"." -msgstr "Aika jolloin ajastettu tallennus alkaa. EnsimmƤiseen kenttƤƤn syƶtetƤƤn tunnit, jƤlkimmƤiseen minuutit." +msgstr "Ohjelman pitƤƤ alkaa tƤhƤn syƶtetyn ajan jƤlkeen osuakseen hakuehtoon. EnsimmƤiseen kenttƤƤn syƶtetƤƤn tunnit, jƤlkimmƤiseen minuutit." -#, fuzzy msgid "A broadcast must end before the time entered here to match. The first text field is for \"hour\", the second for \"minute\"." -msgstr "Aika jolloin ajastettu tallennus alkaa. EnsimmƤiseen kenttƤƤn syƶtetƤƤn tunnit, jƤlkimmƤiseen minuutit." +msgstr "Ohjelman pitƤƤ loppua ennen tƤhƤn syƶtettyƤ aikaa osuakseen hakuehtoon. EnsimmƤiseen kenttƤƤn syƶtetƤƤn tunnit, jƤlkimmƤiseen minuutit." msgid "Set this option to \"yes\" if all timers programed by this AutoTimer should have individual start/stop margins and enter the values in the next two text boxes." msgstr "" msgid "The number of minutes VDRAdmin-AM subtracts from the broadcasts start time found in the EPG." -msgstr "" +msgstr "MinuuttimƤƤrƤ jonka verran ennen ohjelmaoppaan tietojen ohjelman alkuaikaa VDRAdmin-AM asettaa tallennuksen alkamaan." msgid "The number of minutes VDRAdmin-AM adds to the broadcasts stop time found in the EPG." -msgstr "" +msgstr "MinuuttimƤƤrƤ jonka verran ohjelmaoppaan tietojen ohjelman loppuajan jƤlkeen VDRAdmin-AM asettaa tallennuksen loppumaan." msgid "Check this box if you want VDRAdmin-AM to append the broadcast's EPG subtitle to the recording's file name." msgstr "" @@ -481,13 +478,11 @@ msgstr "LisƤƤ uusi musta lista" msgid "Edit Blacklist" msgstr "Muokkaa mustaa listaa" -#, fuzzy msgid "Add New Template" -msgstr "LisƤƤ uusi hakuajastin" +msgstr "LisƤƤ uusi mallipohja" -#, fuzzy msgid "Edit Template" -msgstr "Pohja:" +msgstr "Muokkaa mallipohjaa" msgid "Add New Search" msgstr "LisƤƤ uusi hakuajastin" @@ -507,9 +502,8 @@ msgstr "Piilota hakutulokset" msgid "Settings" msgstr "Asetukset" -#, fuzzy msgid "Name:" -msgstr "Nimi" +msgstr "Nimi:" msgid "Search Term:" msgstr "Hakutermi:" @@ -676,13 +670,11 @@ msgstr "Kanavanvaihdon asetukset" msgid "Switch ... Minutes Before Start:" msgstr "Vaihda ... minuuttia ennen alkua:" -#, fuzzy msgid "Delete template" -msgstr "KƤytƤ mallipohjaa" +msgstr "Poista mallipohja" -#, fuzzy msgid "Delete this template?" -msgstr "Poistetaanko ajastin?" +msgstr "Poistetaanko mallipohja?" msgid "Save as template" msgstr "Tallenna mallipohjaksi" @@ -787,7 +779,7 @@ msgid "Skin:" msgstr "Ulkoasu:" msgid "The skin you want to use." -msgstr "" +msgstr "Haluamasi kƤyttƶliittymƤn ulkoasu." msgid "Login Page:" msgstr "Aloitussivu:" @@ -805,7 +797,7 @@ msgid "Local net (no login required):" msgstr "KƤyttƤjƤtunnukseton osoiteavaruus:" msgid "Here you can specify an IP address or range that can login without providing login information. For example: \"192.168.0.0/24\" will include any IP starting with \"192.168.0\", \"192.168.0.123/32\" will only match \"192.168.0.123\"." -msgstr "" +msgstr "TƤssƤ mƤƤritellystƤ IP-osoitteesta tai -avaruudesta sallitaan sisƤƤnkirjautumiset ilman kƤyttƤjƤtunnusta ja salasanaa. Esimerkiksi: \"192.168.0.0/24\" sallii mistƤ tahansa IP-osoitteesta joka alkaa \"192.168.0\", \"192.168.0.123/32\" sallii vain IP-osoitteesta \"192.168.0.123\"." msgid "Language:" msgstr "Kieli:" @@ -826,7 +818,7 @@ msgid "Number of DVB cards:" msgstr "DVB-korttien lukumƤƤrƤ:" msgid "The number of DVB cards VDR can access. Depending on this value VDRAdmin-AM will calculate critical timers in the <span class=\"ref_menu\">Timer</span> menu." -msgstr "" +msgstr "VDR:n kƤyttƤmien DVB-korttien lukumƤƤrƤ. VDRAdmin-AM kƤyttƤƤ tƤtƤ lukua laskiessaan ajastimien toteutumisen mahdollisuutta <span class=\"ref_menu\">Ajastimet</span>-nƤkymƤssƤ." msgid "Path to recordings:" msgstr "VDR-tallenteiden polku:" @@ -835,10 +827,10 @@ msgid "The path to VDR's recordings. It's used so that VDRAdmin-AM can locate th msgstr "" msgid "Path to configuration files:" -msgstr "Konfigurointitiedostojen polku:" +msgstr "Asetustiedostojen polku:" msgid "The path where VDR's configuration files are located. If this directory contains the file <span class=\"ref_file\">reccmds.conf</span> its content is shown in a selectbox in the <span class=\"ref_menu\">Recordings</span> menu." -msgstr "" +msgstr "Polku jossa VDR:n asetustiedostot sijaitsevat. MikƤli tƤmƤn polun osoittamassa hakemistossa on tiedosto <span class=\"ref_file\">reccmds.conf</span>, sen sisƤltƤmƤt komennot nƤytetƤƤn alasvetovalikossa <span class=\"ref_menu\">Tallenteet</span>-nƤkymƤssƤ." msgid "Path to EPG images:" msgstr "Ohjelmisto-oppaan kuvapolku:" @@ -880,7 +872,7 @@ msgid "Hours:" msgstr "Pituus tunteina:" msgid "The number of hours to show in the timeline." -msgstr "" +msgstr "Aikajanalla nƤytettƤvien tuntien lukumƤƤrƤ." msgid "Times:" msgstr "Ajankohdat:" @@ -898,7 +890,7 @@ msgid "Active:" msgstr "KƤytƶssƤ:" msgid "Activate or deactivate the AutoTimer function." -msgstr "" +msgstr "Aktivoi tai deaktivoi hakuajastintoiminto." msgid "Send email after programming timer:" msgstr "LƤhetƤ sƤhkƶpostia ohjelmoidusta ajastimesta:" @@ -988,7 +980,7 @@ msgid "Suffix for live streaming:" msgstr "Live-kuvan suoratoiston tiedostopƤƤte:" msgid "The suffix to use for live streaming. Defaults to \"m3u\"." -msgstr "" +msgstr "Live-kuvan suoratoiston tiedostopƤƤte, oletus \"m3u\"." msgid "MIME type for recordings streaming:" msgstr "Tallenteiden suoratoiston MIME-tyyppi:" @@ -999,9 +991,8 @@ msgstr "" msgid "Suffix for recordings streaming:" msgstr "Tallenteiden suoratoiston tiedostopƤƤte:" -#, fuzzy msgid "The suffix to use for recordings streaming. Defaults to \"m3u\"." -msgstr "Tallenteiden suoratoiston tiedostopƤƤte:" +msgstr "Tallenteiden suoratoiston tiedostopƤƤte, oletus \"m3u\"." msgid "<p>Here you can define two external searches that you can access in the EPG views. You simply have to find the required URL and where the search pattern has to be located. %TITLE% will be substituted by the broadcast's EPG title.</p>" msgstr "" @@ -1013,7 +1004,7 @@ msgid "Please change the hostname to your local needs!" msgstr "" msgid "<p>This section is for experts <strong>only</strong>, i.e. you know what you are doing!</p>" -msgstr "" +msgstr "<p>TƤmƤ osio on <strong>vain</strong> asiantuntijoille jotka tietƤvƤt mitƤ ovat tekemƤssƤ!</p>" msgid "Update EPG data in background:" msgstr "PƤivitƤ ohjelmaopasta taustalla:" @@ -1025,7 +1016,7 @@ msgid "Update EPG every:" msgstr "Ohjelmaoppaan pƤivitysvƤli:" msgid "The interval, the EPG data is refreshed from VDR and AutoTimer updates are performed (if AutoTimer feature is used)." -msgstr "" +msgstr "Aika jonka vƤlein ohjelmaoppaan tiedot pƤivitetƤƤn VDR:stƤ ja hakuajastimien pƤivitykset tehdƤƤn (mikƤli hakuajastintoiminto on kƤytƶssƤ)." msgid "<p>If you want to limit the number of channels used in some parts of VDRAdmin-AM, this is for you!</p><p>Use the radio buttons to activate or deactivate the wanted channels in the named menu.</p><p>To add channels to the list of wanted channels you have to select them in the left side selectbox and click <input type=\"submit\" class=\"submit\" value=\">>>>>\"/>. If you want to remove channels from the list of wanted channels you have to select them in the right side selectbox and click <input type=\"submit\" class=\"submit\" value=\"<<<<<\"/>.</p>" msgstr "" @@ -1208,7 +1199,7 @@ msgid "Duration" msgstr "Kesto" msgid "Template:" -msgstr "Pohja:" +msgstr "Mallipohja:" msgid "Also used for other EPG views!" msgstr "KƤytetƤƤn myƶs muihin ohjelmaoppaan nƤkymiin!" @@ -1328,10 +1319,10 @@ msgid "Where are your recordings stored?" msgstr "Anna VDR-koneesi tallennehakemiston polku:" msgid "Where are your VDR's configuration files located?" -msgstr "Anna VDR-koneesi konfigurointihakemiston polku:" +msgstr "Anna VDR-koneesi asetustiedostojen hakemiston polku:" msgid "Config file written successfully." -msgstr "VDRAdmin-AM konfigurointitiedosto muodostettu." +msgstr "VDRAdmin-AM:n asetustiedosto muodostettu." #, perl-format msgid "%s %s started with pid %d." @@ -1436,6 +1427,14 @@ msgstr "pitkƤ nƤkymƤ" msgid "Schedule" msgstr "Ohjelmisto" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "Asetustiedoston %s kirjoittaminen ei onnistu: %s" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "Ei kirjoitusoikeutta asetustiedostoon %s, asetukset eivƤt tallennu!" + msgid "Timers" msgstr "Ajastimet" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.0\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-02 07:48+0100\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" "PO-Revision-Date: 2007-08-23 10:45+0100\n" "Last-Translator: Trois Six <trois.six@free.fr>\n" "Language-Team: Trois Six <trois.six@free.fr>\n" @@ -1448,6 +1448,14 @@ msgstr "Long aperēu" msgid "Schedule" msgstr "Programmateur" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "" + msgid "Timers" msgstr "Programmations" diff --git a/po/fr_FR.utf8.po b/po/fr_FR.utf8.po index d2445b9..3b676ad 100644 --- a/po/fr_FR.utf8.po +++ b/po/fr_FR.utf8.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.0\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-02 07:48+0100\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" "PO-Revision-Date: 2007-08-23 10:45+0100\n" "Last-Translator: Trois Six <trois.six@free.fr>\n" "Language-Team: Trois Six <trois.six@free.fr>\n" @@ -1448,6 +1448,14 @@ msgstr "Long aperƧu" msgid "Schedule" msgstr "Programmateur" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "" + msgid "Timers" msgstr "Programmations" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.3\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-03 08:28+0100\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" "PO-Revision-Date: 2008-12-03 00:49+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: Diego Pierotto <vdr-italian@tiscali.it>\n" @@ -1428,6 +1428,14 @@ msgstr "vista estesa" msgid "Schedule" msgstr "Programmi" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "" + msgid "Timers" msgstr "Timer" diff --git a/po/it_IT.utf8.po b/po/it_IT.utf8.po index a4c8be8..5b20cdc 100644 --- a/po/it_IT.utf8.po +++ b/po/it_IT.utf8.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.3\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-03 08:28+0100\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" "PO-Revision-Date: 2008-12-03 00:49+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: Diego Pierotto <vdr-italian@tiscali.it>\n" @@ -1428,6 +1428,14 @@ msgstr "vista estesa" msgid "Schedule" msgstr "Programmi" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "" + msgid "Timers" msgstr "Timer" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.3\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-02 07:48+0100\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" "PO-Revision-Date: 2008-12-01 19:49+0100\n" "Last-Translator: Roel Koelewijn <roel.koelewijn@gmail.com>\n" "Language-Team: Nederlands <nl@li.org>\n" @@ -1430,6 +1430,14 @@ msgstr "uitgebreid tonen" msgid "Schedule" msgstr "Schema" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "" + msgid "Timers" msgstr "Timers" diff --git a/po/nl_NL.utf8.po b/po/nl_NL.utf8.po index 7a531fa..3127616 100644 --- a/po/nl_NL.utf8.po +++ b/po/nl_NL.utf8.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.6.3\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-02 07:48+0100\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" "PO-Revision-Date: 2008-12-01 19:49+0100\n" "Last-Translator: Roel Koelewijn <roel.koelewijn@gmail.com>\n" "Language-Team: Nederlands <nl@li.org>\n" @@ -1430,6 +1430,14 @@ msgstr "uitgebreid tonen" msgid "Schedule" msgstr "Schema" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "" + msgid "Timers" msgstr "Timers" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-02 07:48+0100\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" "PO-Revision-Date: 2006-10-27 15:42+0100\n" "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n" "Language-Team: Allrussian <LL.org>\n" @@ -1471,6 +1471,14 @@ msgstr "ĄŠįčŲąÕŻŻŠļ ŲŻäŽąÜŠęŲļ" msgid "Schedule" msgstr "ĄŠįßŲįŠŻŲÕ" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "" + msgid "Timers" msgstr "ĀŠŁÜÕąė" diff --git a/po/ru_RU.utf8.po b/po/ru_RU.utf8.po index ac5fa14..37ebbff 100644 --- a/po/ru_RU.utf8.po +++ b/po/ru_RU.utf8.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-02 07:48+0100\n" +"POT-Creation-Date: 2008-12-18 08:25+0100\n" "PO-Revision-Date: 2006-10-27 15:42+0100\n" "Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n" "Language-Team: Allrussian <LL.org>\n" @@ -1471,6 +1471,14 @@ msgstr "Š Š°ŃŃŠøŃŠµŠ½Š½Š°Ń ŠøŠ½ŃŠ¾ŃŠ¼Š°ŃŠøŃ" msgid "Schedule" msgstr "Š Š°ŃŠæŠøŃŠ°Š½ŠøŠµ" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "" + msgid "Timers" msgstr "Š¢Š°Š¹Š¼ŠµŃŃ" diff --git a/po/vdradmin.pot b/po/vdradmin.pot index 2c570ec..9b2891a 100644 --- a/po/vdradmin.pot +++ b/po/vdradmin.pot @@ -19,9 +19,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: VDRAdmin-AM 3.6.2+cvs\n" +"Project-Id-Version: VDRAdmin-AM 3.6.3\n" "Report-Msgid-Bugs-To: Andreas Mair <andreas@vdr-developer.org>\n" -"POT-Creation-Date: 2008-12-02 07:48+0100\n" +"POT-Creation-Date: 2008-12-18 08:25+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" @@ -1440,6 +1440,14 @@ msgstr "" msgid "Schedule" msgstr "" +#, perl-format +msgid "Can't write configuration file %s! Reason: %s" +msgstr "" + +#, perl-format +msgid "Configuration file %s not writeable! Configuration won't be saved!" +msgstr "" + msgid "Timers" msgstr "" diff --git a/template/default/about.html b/template/default/about.html index 27af012..81c9faa 100644 --- a/template/default/about.html +++ b/template/default/about.html @@ -82,7 +82,7 @@ </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Finnish:') %?></h5></td> - <td class="col_value">Rolf Ahrenberg</td> + <td class="col_value">Rolf Ahrenberg, Ville Skyttä</td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('Dutch:') %?></h5></td> diff --git a/template/default/at_timer_list.html b/template/default/at_timer_list.html index 306ab74..b078fe6 100644 --- a/template/default/at_timer_list.html +++ b/template/default/at_timer_list.html @@ -47,6 +47,10 @@ </table> </form> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <div id="content"> <?% IF at_timer_loop.size() > 0 %?> <form action="<?% url %?>" method="get" name="FormName"> diff --git a/template/default/at_timer_new.html b/template/default/at_timer_new.html index 3d3eb77..6cddd68 100644 --- a/template/default/at_timer_new.html +++ b/template/default/at_timer_new.html @@ -26,6 +26,10 @@ </tr> </table> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <div id="content"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> <?% tr_class = "row_odd" %?> diff --git a/template/default/config.html b/template/default/config.html index f875f71..c40e4ba 100644 --- a/template/default/config.html +++ b/template/default/config.html @@ -25,6 +25,10 @@ </tr> </table> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <table border="0" cellspacing="0" cellpadding="0" class="group"> <tr class="heading"> <td colspan="2"><h2><?% gettext('General Settings') %?></h2></td> diff --git a/template/default/epgsearch_config.html b/template/default/epgsearch_config.html index c01d0ee..9f85c65 100644 --- a/template/default/epgsearch_config.html +++ b/template/default/epgsearch_config.html @@ -35,6 +35,10 @@ </table> </form> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <form action="<?% url %?>" method="get" name="FormName"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="list hilight"> <tr class="heading"> diff --git a/template/default/epgsearch_list.html b/template/default/epgsearch_list.html index 1f154c4..687fb1a 100644 --- a/template/default/epgsearch_list.html +++ b/template/default/epgsearch_list.html @@ -47,6 +47,10 @@ </table> </form> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <form action="<?% url %?>" method="get" name="FormName"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="list hilight"> <tr class="heading"> diff --git a/template/default/epgsearch_new.html b/template/default/epgsearch_new.html index 0349e5f..e8d55f3 100644 --- a/template/default/epgsearch_new.html +++ b/template/default/epgsearch_new.html @@ -201,6 +201,10 @@ </tr> </table> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <div id="content"> <script type="text/javascript" language="JavaScript1.2"> <!-- diff --git a/template/default/prog_detail_form.html b/template/default/prog_detail_form.html index 0a6f582..0e16a67 100644 --- a/template/default/prog_detail_form.html +++ b/template/default/prog_detail_form.html @@ -26,6 +26,10 @@ </tr> </table> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <div id="content"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> <?% tr_class = "row_odd" %?> diff --git a/template/default/prog_list.html b/template/default/prog_list.html index 3a235c8..2b29375 100644 --- a/template/default/prog_list.html +++ b/template/default/prog_list.html @@ -49,6 +49,10 @@ <input type="hidden" name="aktion" value="prog_list" /> </form> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <div id="content"> <?% IF loop.size() > 0 %?> <?% FOREACH bc = loop %?> diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html index 581b93c..d8ddf04 100644 --- a/template/default/prog_list2.html +++ b/template/default/prog_list2.html @@ -52,6 +52,10 @@ <input type="hidden" name="day" value="<?% day | html %?>" /> </form> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <div id="content"> <?% IF loop.size() > 0 %?> <?% FOREACH bc = loop %?> diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html index fd60031..f2160a8 100644 --- a/template/default/prog_summary.html +++ b/template/default/prog_summary.html @@ -45,6 +45,10 @@ </table> <input type="hidden" name="aktion" value="prog_summary" /> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <div id="content"> <?% IF rows.size() > 0 %?> <?% FOREACH row = rows %?> diff --git a/template/default/prog_summary2.html b/template/default/prog_summary2.html index 97e4824..90feefc 100644 --- a/template/default/prog_summary2.html +++ b/template/default/prog_summary2.html @@ -45,6 +45,10 @@ </table> <input type="hidden" name="aktion" value="prog_summary" /> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <?% IF rows.size > 0 %?> <table border="0" cellspacing="0" cellpadding="0" width="100%" class="list hilight" id="content"> <?% diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html index fa09d26..b2c87b7 100644 --- a/template/default/prog_timeline.html +++ b/template/default/prog_timeline.html @@ -187,6 +187,10 @@ </tr> </table> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <?% IF shows.size() > 0 %?> <script type="text/javascript" language="JavaScript1.2"> BuildContent(); diff --git a/template/default/rec_edit.html b/template/default/rec_edit.html index bb18671..eb9cb3d 100644 --- a/template/default/rec_edit.html +++ b/template/default/rec_edit.html @@ -21,6 +21,10 @@ </tr> </table> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group"> <tr class="row_odd"> <td class="col_label"><h5><?% gettext('Original Name of Recording:') %?></h5></td> diff --git a/template/default/rec_list.html b/template/default/rec_list.html index b987803..c61629a 100644 --- a/template/default/rec_list.html +++ b/template/default/rec_list.html @@ -35,6 +35,10 @@ <?% END %?> </div> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <div id="content"> <?% IF recloop.size() > 0 %?> <form action="<?% url %?>" method="get" name="FormName"> diff --git a/template/default/timer_list.html b/template/default/timer_list.html index c1d7638..e1b084d 100644 --- a/template/default/timer_list.html +++ b/template/default/timer_list.html @@ -54,6 +54,10 @@ </table> </form> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <div id="content"> <?% IF timers.size() > 0 %?> <form action="<?% url %?>" method="get" name="FormName1"> diff --git a/template/default/timer_new.html b/template/default/timer_new.html index 76646cb..0f0b318 100644 --- a/template/default/timer_new.html +++ b/template/default/timer_new.html @@ -63,6 +63,10 @@ </tr> </table> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group"> <?% tr_class = "row_odd" %?> <tr class="<?% tr_class %?>"> diff --git a/template/default/tv.html b/template/default/tv.html index 3a72379..429bb09 100644 --- a/template/default/tv.html +++ b/template/default/tv.html @@ -108,6 +108,10 @@ </table> <?% END %?> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <table border="0" cellspacing="0" cellpadding="0" id="content"> <tr> <td id="sect_tv" style="width:<?% IF size == 'full' %?>780<?% ELSE %?><?% IF size == 'half' %?>400<?% ELSE %?>210<?% END %?><?% END %?>px;" align="center"> diff --git a/template/default/vdr_cmds.html b/template/default/vdr_cmds.html index e47da84..22df862 100644 --- a/template/default/vdr_cmds.html +++ b/template/default/vdr_cmds.html @@ -23,6 +23,10 @@ </tr> </table> +<?% IF error_msg %?> + <div class="error"><?% error_msg %?></div> +<?% END %?> + <form action="<?% url %?>" method="get" name="FormName"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group"> <tr class="row_odd"> diff --git a/vdradmind.pl b/vdradmind.pl index 529c4c8..7a872e3 100755 --- a/vdradmind.pl +++ b/vdradmind.pl @@ -24,12 +24,14 @@ require 5.004; -my $VERSION = "3.6.3"; +use vars qw($PROCNAME); + +my $VERSION = "3.6.4"; my $BASENAME; my $EXENAME; -my $PROCNAME = "vdradmind"; BEGIN { + $PROCNAME = "vdradmind"; $0 =~ /(^.*\/)/; $EXENAME = $0; $BASENAME = $1; @@ -69,7 +71,9 @@ use MIME::Base64(); use File::Temp (); use Shell qw(ps locale); use URI::Escape; -use Encode; + +my $can_use_encode = 1; +$can_use_encode = undef unless (eval { require Encode }); my $InetSocketModule = 'IO::Socket::INET'; my $can_use_net_smtp = 1; @@ -127,6 +131,7 @@ $CONFIG{CACHE_TIMEOUT} = 60; $CONFIG{CACHE_LASTUPDATE} = 0; $CONFIG{CACHE_REC_TIMEOUT} = 60; $CONFIG{CACHE_REC_LASTUPDATE} = 0; +$CONFIG{CACHE_REC_ENABLED} = 1; $CONFIG{AUTO_SAVE_CONFIG} = 1; # @@ -4829,7 +4834,7 @@ sub findVideoFiles { my @files = `find $CONFIG{VIDEODIR}/ -follow -regex "$CONFIG{VIDEODIR}/$title\_*/\\(\_/\\)?....-$month-$day\\.$hour.$minute\\...\\...\\.rec/...\\.vdr" | sort -r`; foreach (@files) { chomp; - Log(LOG_DEBUG, "rec_stream: found ($_)\n"); + Log(LOG_DEBUG, "findVideoFiles: found ($_)\n"); $_ =~ s/$CONFIG{VIDEODIR}/$CONFIG{ST_VIDEODIR}/; $_ =~ s/\n//g; $data = $CONFIG{ST_URL} . "$_\n$data"; @@ -5693,7 +5698,14 @@ sub rec_list { sub ParseRecordings { my $parent = shift; - return if ((time() - $CONFIG{CACHE_REC_LASTUPDATE}) < ($CONFIG{CACHE_REC_TIMEOUT} * 60)); + if ($CONFIG{CACHE_REC_ENABLED} != 0) { + if (-e "$CONFIG{VIDEODIR}/.update") { + my $mtime = (stat(_))[9]; + return if ($mtime < $CONFIG{CACHE_REC_LASTUPDATE}); + } else { + return if ((time() - $CONFIG{CACHE_REC_LASTUPDATE}) < ($CONFIG{CACHE_REC_TIMEOUT} * 60)); + } + } undef @RECORDINGS; for my $recording (SendCMD("lstr")) { @@ -6129,6 +6141,8 @@ sub rec_cut { # configuration ############################################################################# sub config { + my $error_msg; + unless ($q->param("save") || $q->param("apply") || $q->param("submit")) { undef %CONFIG_TEMP; for my $key (keys(%CONFIG)) { @@ -6162,7 +6176,7 @@ sub config { } sub WriteConfig { - open(CONF, ">$CONFFILE") || print "Can't open $CONFFILE! ($!)\n"; + open(CONF, ">$CONFFILE") || return sprintf(gettext("Can't write configuration file %s! Reason: %s") . "<br />", $CONFFILE, "$!"); my $old_collate = setlocale(LC_COLLATE); setlocale(LC_COLLATE, "C"); for my $key (sort(keys(%CONFIG))) { @@ -6184,11 +6198,14 @@ sub config { } } elsif ($q->param("save")) { ApplyConfig(); - WriteConfig(); + $error_msg .= WriteConfig(); } elsif ($q->param("apply")) { ApplyConfig(); } + # vdradmind.conf writable? + $error_msg .= sprintf(gettext("Configuration file %s not writeable! Configuration won't be saved!") . "<br />", $CONFFILE) unless (-w $CONFFILE); + # my @LOGINPAGES_DESCRIPTION = (gettext("What's On Now?"), gettext("Playing Today?"), gettext("Timeline"), gettext("Channels"), gettext("Timers"), gettext("Recordings")); my (@loginpages); @@ -6271,7 +6288,8 @@ sub config { MY_LOCALES => \@my_locales, url => $MyURL, help_url => HelpURL("config"), - config => \%CONFIG_TEMP + config => \%CONFIG_TEMP, + error_msg => $error_msg }; return showTemplate("config.html", $vars); } @@ -6610,7 +6628,7 @@ sub myconnect { $VDRVERSION = ($1 * 10000 + $2 * 100 + $3); $line =~ /^220.*VideoDiskRecorder (\d+)\.(\d+)\.(\d+).*; .*; (.*)\r|$/; $VDR_ENCODING = $4; - $need_recode = ($VDR_ENCODING and $VDR_ENCODING ne $MY_ENCODING) ? 1 : 0; + $need_recode = ($can_use_encode and $VDR_ENCODING and $VDR_ENCODING ne $MY_ENCODING) ? 1 : 0; getSupportedFeatures($this); } } |