diff options
| -rw-r--r-- | ChangeLog | 57 | ||||
| -rw-r--r-- | HISTORY | 7 | ||||
| -rw-r--r-- | locale/cs/LC_MESSAGES/vdradmin.mo | bin | 30542 -> 30542 bytes | |||
| -rw-r--r-- | locale/de/LC_MESSAGES/vdradmin.mo | bin | 72365 -> 72366 bytes | |||
| -rw-r--r-- | locale/es/LC_MESSAGES/vdradmin.mo | bin | 66084 -> 66084 bytes | |||
| -rw-r--r-- | locale/fi/LC_MESSAGES/vdradmin.mo | bin | 31498 -> 33020 bytes | |||
| -rw-r--r-- | locale/fr/LC_MESSAGES/vdradmin.mo | bin | 61337 -> 74139 bytes | |||
| -rw-r--r-- | locale/it/LC_MESSAGES/vdradmin.mo | bin | 66381 -> 66381 bytes | |||
| -rw-r--r-- | locale/nl/LC_MESSAGES/vdradmin.mo | bin | 65793 -> 70537 bytes | |||
| -rw-r--r-- | locale/ru/LC_MESSAGES/vdradmin.mo | bin | 63392 -> 63392 bytes | |||
| -rw-r--r-- | po/cs.po | 32 | ||||
| -rw-r--r-- | po/de.po | 28 | ||||
| -rw-r--r-- | po/es.po | 32 | ||||
| -rw-r--r-- | po/fi.po | 99 | ||||
| -rw-r--r-- | po/fr.po | 383 | ||||
| -rw-r--r-- | po/it.po | 32 | ||||
| -rw-r--r-- | po/nl.po | 165 | ||||
| -rw-r--r-- | po/ru.po | 32 | ||||
| -rw-r--r-- | po/vdradmin.pot | 28 | ||||
| -rw-r--r-- | template/default/help_config.html | 2 | ||||
| -rwxr-xr-x | vdradmind.pl | 84 |
21 files changed, 488 insertions, 493 deletions
@@ -1,3 +1,60 @@ +2007-08-27 amair + + * HISTORY, vdradmind.pl: + + Updated for v3.6.0rc release. + +2007-08-27 amair + + * po/fi.po: + + Updated. + +2007-08-24 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: + + Updated. + +2007-08-24 amair + + * template/default/help_config.html: + + Fixed typo. + +2007-08-23 amair + + * po/fr.po: + + Updated. + +2007-08-21 amair + + * vdradmind.pl: + + Reworked configuration part: selected channels work again and settings are only applied if "save" or "apply" is pressed in config menu. + +2007-08-20 amair + + * vdradmind.pl: + + Fixed initialisation if CHANNEL_WANTED_<area> config options. + +2007-08-17 scop + + * po/fi.po: + + Finnish translation update. + +2007-08-17 tag v3_6_0beta + +2007-08-17 amair + + * make.sh: + + Delete all utf8 message files. + 2007-08-17 amair * HISTORY, vdradmind.pl, po/cs.po, po/de.po, po/es.po, po/fi.po, @@ -4,6 +4,13 @@ E-Mail: mail AT andreas DOT vdr-developer DOT org VDR-Portal: amair ----------------------------------------------------------- +2007-08-27: 3.6.0rc +- Updated: French translation (Submitted by Trois Six). +- Updated: Dutch translation (Submitted by Roel Koelewijn). +- Updated: French translation (Submitted by Ville Skyttä & Rolf Ahrenberg). +- Reworked: configuration part: selected channels work again and settings are only applied if "save" or "apply" is pressed in config menu. +- Fixed: initialisation if CHANNEL_WANTED_<area> config options. + 2007-08-17: 3.6.0beta - Added: export of channels in each channel group as m3u playlist in vdr_cmds. - Added: channel list to rc. diff --git a/locale/cs/LC_MESSAGES/vdradmin.mo b/locale/cs/LC_MESSAGES/vdradmin.mo Binary files differindex 092f2f2..ebb4b2e 100644 --- a/locale/cs/LC_MESSAGES/vdradmin.mo +++ b/locale/cs/LC_MESSAGES/vdradmin.mo diff --git a/locale/de/LC_MESSAGES/vdradmin.mo b/locale/de/LC_MESSAGES/vdradmin.mo Binary files differindex 3bef191..82baf46 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 5e06485..dba9f6d 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 98123bf..4aa197e 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 2e6e710..f7aac8e 100644 --- a/locale/fr/LC_MESSAGES/vdradmin.mo +++ b/locale/fr/LC_MESSAGES/vdradmin.mo diff --git a/locale/it/LC_MESSAGES/vdradmin.mo b/locale/it/LC_MESSAGES/vdradmin.mo Binary files differindex cdf1c8a..391edb2 100644 --- a/locale/it/LC_MESSAGES/vdradmin.mo +++ b/locale/it/LC_MESSAGES/vdradmin.mo diff --git a/locale/nl/LC_MESSAGES/vdradmin.mo b/locale/nl/LC_MESSAGES/vdradmin.mo Binary files differindex e02bbe4..08337fd 100644 --- a/locale/nl/LC_MESSAGES/vdradmin.mo +++ b/locale/nl/LC_MESSAGES/vdradmin.mo diff --git a/locale/ru/LC_MESSAGES/vdradmin.mo b/locale/ru/LC_MESSAGES/vdradmin.mo Binary files differindex cb161d7..b0b4e23 100644 --- a/locale/ru/LC_MESSAGES/vdradmin.mo +++ b/locale/ru/LC_MESSAGES/vdradmin.mo @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: cs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-17 10:26+0200\n" +"POT-Creation-Date: 2007-08-24 13:13+0200\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" @@ -262,7 +262,7 @@ msgstr "Více informací" #: ../template/default/prog_list2.html:62 #: ../template/default/navigation.html:38 ../template/default/prog_list.html:6 #: ../template/default/prog_summary.html:56 -#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5857 msgid "Channels" msgstr "Kanály" @@ -415,7 +415,7 @@ msgstr "®ádný èasovaè není definován!" #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 #: ../template/default/navigation.html:54 ../template/default/rec_list.html:6 -#: ../template/default/rec_list.html:17 ../vdradmind.pl:5852 +#: ../template/default/rec_list.html:17 ../vdradmind.pl:5857 msgid "Recordings" msgstr "Nahrávky" @@ -723,18 +723,18 @@ msgstr "Vysíláno" #: ../template/default/navigation.html:29 #: ../template/default/prog_summary.html:7 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5857 msgid "What's On Now?" msgstr "Co bì¾í nyní?" -#: ../template/default/navigation.html:32 ../vdradmind.pl:5852 +#: ../template/default/navigation.html:32 ../vdradmind.pl:5857 msgid "Playing Today?" msgstr "Co pobì¾í dnes?" #: ../template/default/navigation.html:35 #: ../template/default/prog_timeline.html:7 #: ../template/default/config.html:158 ../template/default/help_config.html:30 -#: ../template/default/help_config.html:80 ../vdradmind.pl:5852 +#: ../template/default/help_config.html:80 ../vdradmind.pl:5857 msgid "Timeline" msgstr "Èasová pøímka" @@ -2475,8 +2475,8 @@ msgstr "" 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 boadcast's EPG title.</" -"p>" +"has to be located. %TITLE% will be substituted by the broadcast's EPG title." +"</p>" msgstr "" #: ../template/default/help_config.html:166 @@ -2600,22 +2600,22 @@ msgstr "Zakázáno" msgid "You don't have permission to access this function!" msgstr "Nemáte práva pro vyu¾ití této funkce!" -#: ../vdradmind.pl:799 ../vdradmind.pl:6102 +#: ../vdradmind.pl:799 ../vdradmind.pl:6124 #, fuzzy msgid "All channels" msgstr "Kanály" -#: ../vdradmind.pl:802 ../vdradmind.pl:6103 +#: ../vdradmind.pl:802 ../vdradmind.pl:6125 #, fuzzy msgid "Selected channels" msgstr "Vybrat v¹e/Nic" -#: ../vdradmind.pl:806 ../vdradmind.pl:6104 +#: ../vdradmind.pl:806 ../vdradmind.pl:6126 #, fuzzy msgid "TV channels" msgstr "Kanály" -#: ../vdradmind.pl:810 ../vdradmind.pl:6105 +#: ../vdradmind.pl:810 ../vdradmind.pl:6127 #, fuzzy msgid "Radio channels" msgstr "Kanály" @@ -2726,18 +2726,14 @@ msgstr "detailní pøehled" msgid "Schedule" msgstr "Plán" -#: ../vdradmind.pl:5852 +#: ../vdradmind.pl:5857 msgid "Timers" msgstr "Èasovaèe" -#: ../vdradmind.pl:5894 +#: ../vdradmind.pl:5915 msgid "System default" msgstr "Defaultní nastavení" -#, fuzzy -#~ msgid "Channels Setup" -#~ msgstr "Kanály" - #~ msgid "" #~ "The number of minutes VDRAdmin-AM subtracts from the broadcasts start " #~ "time found in the EPG. This value is used for timers programmed by " @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-17 10:26+0200\n" +"POT-Creation-Date: 2007-08-24 13:13+0200\n" "PO-Revision-Date: 2007-07-26 14:49+0100\n" "Last-Translator: Andreas Mair <mail@andreas.vdr-developer.org>\n" "Language-Team: <LL.org>\n" @@ -257,7 +257,7 @@ msgstr "mehr Infos" #: ../template/default/prog_list2.html:62 #: ../template/default/navigation.html:38 ../template/default/prog_list.html:6 #: ../template/default/prog_summary.html:56 -#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5857 msgid "Channels" msgstr "Programmübersicht" @@ -409,7 +409,7 @@ msgstr "Es wurden noch keine Timer angelegt!" #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 #: ../template/default/navigation.html:54 ../template/default/rec_list.html:6 -#: ../template/default/rec_list.html:17 ../vdradmind.pl:5852 +#: ../template/default/rec_list.html:17 ../vdradmind.pl:5857 msgid "Recordings" msgstr "Aufnahmen" @@ -752,18 +752,18 @@ msgstr "Ausgestrahlt" #: ../template/default/navigation.html:29 #: ../template/default/prog_summary.html:7 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5857 msgid "What's On Now?" msgstr "Was läuft jetzt?" -#: ../template/default/navigation.html:32 ../vdradmind.pl:5852 +#: ../template/default/navigation.html:32 ../vdradmind.pl:5857 msgid "Playing Today?" msgstr "Was läuft heute?" #: ../template/default/navigation.html:35 #: ../template/default/prog_timeline.html:7 #: ../template/default/config.html:158 ../template/default/help_config.html:30 -#: ../template/default/help_config.html:80 ../vdradmind.pl:5852 +#: ../template/default/help_config.html:80 ../vdradmind.pl:5857 msgid "Timeline" msgstr "Zeitleiste" @@ -2647,8 +2647,8 @@ msgstr "Dateierweiterung für das Streamen von Aufnahmen. Vorgabe ist \"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 boadcast's EPG title.</" -"p>" +"has to be located. %TITLE% will be substituted by the broadcast's EPG title." +"</p>" msgstr "" "<p>Hier können Sie zwei externe Suchen angeben, die in den EPG-Ansichten " "zugreifbar sind. Dazu müssen Sie nur die erforderliche URL und die Position " @@ -2808,19 +2808,19 @@ msgstr "Verboten" msgid "You don't have permission to access this function!" msgstr "Sie haben nicht die Erlaubnis diese Funktion aufzurufen!" -#: ../vdradmind.pl:799 ../vdradmind.pl:6102 +#: ../vdradmind.pl:799 ../vdradmind.pl:6124 msgid "All channels" msgstr "Alle Kanäle" -#: ../vdradmind.pl:802 ../vdradmind.pl:6103 +#: ../vdradmind.pl:802 ../vdradmind.pl:6125 msgid "Selected channels" msgstr "Ausgewählte Kanäle" -#: ../vdradmind.pl:806 ../vdradmind.pl:6104 +#: ../vdradmind.pl:806 ../vdradmind.pl:6126 msgid "TV channels" msgstr "Fernsehkanäle" -#: ../vdradmind.pl:810 ../vdradmind.pl:6105 +#: ../vdradmind.pl:810 ../vdradmind.pl:6127 msgid "Radio channels" msgstr "Radiokanäle" @@ -2926,10 +2926,10 @@ msgstr "Ausführliche Ansicht" msgid "Schedule" msgstr "Übersicht" -#: ../vdradmind.pl:5852 +#: ../vdradmind.pl:5857 msgid "Timers" msgstr "Timer" -#: ../vdradmind.pl:5894 +#: ../vdradmind.pl:5915 msgid "System default" msgstr "Systemstandard" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-17 10:26+0200\n" +"POT-Creation-Date: 2007-08-24 13:13+0200\n" "PO-Revision-Date: 2007-01-26 20:05+0100\n" "Last-Translator: Rudibert <R_Jung@web.de>\n" "Language-Team: Rudi <LL.org>\n" @@ -261,7 +261,7 @@ msgstr "más información" #: ../template/default/prog_list2.html:62 #: ../template/default/navigation.html:38 ../template/default/prog_list.html:6 #: ../template/default/prog_summary.html:56 -#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5857 msgid "Channels" msgstr "EPG por emisoras" @@ -413,7 +413,7 @@ msgstr "No hay programaciones!" #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 #: ../template/default/navigation.html:54 ../template/default/rec_list.html:6 -#: ../template/default/rec_list.html:17 ../vdradmind.pl:5852 +#: ../template/default/rec_list.html:17 ../vdradmind.pl:5857 msgid "Recordings" msgstr "Grabaciones" @@ -765,18 +765,18 @@ msgstr "Difundido" #: ../template/default/navigation.html:29 #: ../template/default/prog_summary.html:7 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5857 msgid "What's On Now?" msgstr "Estrenos ahora" -#: ../template/default/navigation.html:32 ../vdradmind.pl:5852 +#: ../template/default/navigation.html:32 ../vdradmind.pl:5857 msgid "Playing Today?" msgstr "¿Estrenos hoy?" #: ../template/default/navigation.html:35 #: ../template/default/prog_timeline.html:7 #: ../template/default/config.html:158 ../template/default/help_config.html:30 -#: ../template/default/help_config.html:80 ../vdradmind.pl:5852 +#: ../template/default/help_config.html:80 ../vdradmind.pl:5857 msgid "Timeline" msgstr "Tabla de tiempo" @@ -2686,8 +2686,8 @@ msgstr "" 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 boadcast's EPG title.</" -"p>" +"has to be located. %TITLE% will be substituted by the broadcast's EPG title." +"</p>" msgstr "" #: ../template/default/help_config.html:166 @@ -2832,22 +2832,22 @@ msgstr "Prohibido" msgid "You don't have permission to access this function!" msgstr "¡No tienes permiso para ésta funcción!" -#: ../vdradmind.pl:799 ../vdradmind.pl:6102 +#: ../vdradmind.pl:799 ../vdradmind.pl:6124 #, fuzzy msgid "All channels" msgstr "EPG por emisoras" -#: ../vdradmind.pl:802 ../vdradmind.pl:6103 +#: ../vdradmind.pl:802 ../vdradmind.pl:6125 #, fuzzy msgid "Selected channels" msgstr "Seleccionar todas/ninguna" -#: ../vdradmind.pl:806 ../vdradmind.pl:6104 +#: ../vdradmind.pl:806 ../vdradmind.pl:6126 #, fuzzy msgid "TV channels" msgstr "EPG por emisoras" -#: ../vdradmind.pl:810 ../vdradmind.pl:6105 +#: ../vdradmind.pl:810 ../vdradmind.pl:6127 #, fuzzy msgid "Radio channels" msgstr "EPG por emisoras" @@ -2954,18 +2954,14 @@ msgstr "Vista detallada" msgid "Schedule" msgstr "Vista general" -#: ../vdradmind.pl:5852 +#: ../vdradmind.pl:5857 msgid "Timers" msgstr "Programaciones" -#: ../vdradmind.pl:5894 +#: ../vdradmind.pl:5915 msgid "System default" msgstr "Defecto del sistema" -#, fuzzy -#~ msgid "Channels Setup" -#~ msgstr "EPG por emisoras" - #~ msgid "" #~ "The number of minutes VDRAdmin-AM subtracts from the broadcasts start " #~ "time found in the EPG. This value is used for timers programmed by " @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-17 10:26+0200\n" -"PO-Revision-Date: 2006-12-09 18:20+0200\n" -"Last-Translator: Rofa\n" +"POT-Creation-Date: 2007-08-27 12:37+0200\n" +"PO-Revision-Date: 2007-08-17 17:43+0300\n" +"Last-Translator: Ville Skyttä\n" "Language-Team: Suomi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -249,7 +249,7 @@ msgstr "Lisätietoja" #: ../template/default/prog_list2.html:62 #: ../template/default/navigation.html:38 ../template/default/prog_list.html:6 #: ../template/default/prog_summary.html:56 -#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5857 msgid "Channels" msgstr "Kanavat" @@ -401,7 +401,7 @@ msgstr "Ajastimia ei määritelty!" #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 #: ../template/default/navigation.html:54 ../template/default/rec_list.html:6 -#: ../template/default/rec_list.html:17 ../vdradmind.pl:5852 +#: ../template/default/rec_list.html:17 ../vdradmind.pl:5857 msgid "Recordings" msgstr "Tallenteet" @@ -471,7 +471,6 @@ msgstr " " #: ../template/default/prog_list.html:31 #: ../template/default/prog_summary.html:24 #: ../template/default/prog_summary2.html:24 -#, fuzzy msgid "Channel group:" msgstr "Kanavaryhmä:" @@ -707,18 +706,18 @@ msgstr "Lähetysaika" #: ../template/default/navigation.html:29 #: ../template/default/prog_summary.html:7 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5857 msgid "What's On Now?" msgstr "Menossa nyt" -#: ../template/default/navigation.html:32 ../vdradmind.pl:5852 +#: ../template/default/navigation.html:32 ../vdradmind.pl:5857 msgid "Playing Today?" msgstr "Tänään" #: ../template/default/navigation.html:35 #: ../template/default/prog_timeline.html:7 #: ../template/default/config.html:158 ../template/default/help_config.html:30 -#: ../template/default/help_config.html:80 ../vdradmind.pl:5852 +#: ../template/default/help_config.html:80 ../vdradmind.pl:5857 msgid "Timeline" msgstr "Aikajana" @@ -828,29 +827,25 @@ msgstr "Muokkaa ajastinta" #: ../template/default/help_edit_epg.html:20 #: ../template/default/prog_detail_form.html:19 -#, fuzzy msgid "Edit EPG" -msgstr "Muokkaa" +msgstr "Muokkaa ohjelmatietoja" #: ../template/default/help_edit_epg.html:24 -#, fuzzy msgid "" "<p>Here you can edit the descriptive fields of an existing EPG entry.</p>" -msgstr "<p>Tässä näkymässä voit muokata ajastimen asetuksia.</p>" +msgstr "<p>Tässä näkymässä voit muokata ohjelmaoppaan tietoja.</p>" #: ../template/default/help_edit_epg.html:26 -#, fuzzy msgid "Channel (readonly)" -msgstr "Kanavaryhmä:" +msgstr "Kanava (kirjoitussuojattu)" #: ../template/default/help_edit_epg.html:27 msgid "This is the channel of the EPG entry. It cannot be changed." msgstr "" #: ../template/default/help_edit_epg.html:28 -#, fuzzy msgid "Time (readonly)" -msgstr "kirjoitussuojattu" +msgstr "Aika (kirjoitussuojattu)" #: ../template/default/help_edit_epg.html:29 msgid "This is the start and end time of the entry. It cannot be changed." @@ -875,9 +870,8 @@ msgid "" msgstr "" #: ../template/default/help_edit_epg.html:36 -#, fuzzy msgid "VPS (readonly)" -msgstr "kirjoitussuojattu" +msgstr "VPS (kirjoitussuojattu)" #: ../template/default/help_edit_epg.html:37 msgid "" @@ -886,18 +880,16 @@ msgid "" msgstr "" #: ../template/default/help_edit_epg.html:38 -#, fuzzy msgid "Video tracks (readonly)" -msgstr "Kuvaraidat:" +msgstr "Kuvaraidat (kirjoitussuojattu)" #: ../template/default/help_edit_epg.html:39 msgid "If available this field shows the video track(s). It cannot be changed." msgstr "" #: ../template/default/help_edit_epg.html:40 -#, fuzzy msgid "Audio tracks (readonly)" -msgstr "Ääniraidat:" +msgstr "Ääniraidat (kirjoitussuojattu)" #: ../template/default/help_edit_epg.html:41 msgid "If available this field shows the audio track(s). It cannot be changed." @@ -1099,14 +1091,12 @@ msgid "Time" msgstr "Aika" #: ../template/default/prog_detail_form.html:67 -#, fuzzy msgid "Video tracks" -msgstr "Kuvaraidat:" +msgstr "Kuvaraidat" #: ../template/default/prog_detail_form.html:74 -#, fuzzy msgid "Audio tracks" -msgstr "Ääniraidat:" +msgstr "Ääniraidat" #: ../template/default/vdr_cmds.html:6 ../template/default/vdr_cmds.html:17 msgid "VDR Commands" @@ -1114,7 +1104,7 @@ msgstr "Komennot" #: ../template/default/vdr_cmds.html:29 msgid "Export channels as playlist:" -msgstr "" +msgstr "Luo soittolista:" #: ../template/default/vdr_cmds.html:37 msgid "Number of lines to show:" @@ -1345,22 +1335,20 @@ msgstr "Kaistanleveys:" #: ../template/default/config.html:345 ../template/default/help_config.html:30 #: ../template/default/help_config.html:164 -#, fuzzy msgid "External Search" -msgstr "Muokkaa hakuajastinta" +msgstr "Ulkoinen haku" #: ../template/default/config.html:354 ../template/default/config.html:368 msgid "URL:" -msgstr "" +msgstr "URL:" #: ../template/default/config.html:357 ../template/default/config.html:371 -#, fuzzy msgid "Title:" -msgstr "Otsikko" +msgstr "Otsikko:" #: ../template/default/config.html:362 msgid "User-defined search:" -msgstr "" +msgstr "Käyttäjän määrittelemä haku:" #: ../template/default/config.html:379 ../template/default/help_config.html:30 #: ../template/default/help_config.html:178 @@ -1370,12 +1358,12 @@ msgstr "Ekspertti" #: ../template/default/config.html:382 #: ../template/default/help_config.html:181 msgid "Update EPG data in background:" -msgstr "" +msgstr "Päivitä ohjelmaopasta taustalla:" #: ../template/default/config.html:389 #: ../template/default/help_config.html:183 msgid "Update EPG every:" -msgstr "" +msgstr "Ohjelmaoppaan päivitysväli:" #: ../template/default/config.html:394 #: ../template/default/help_config.html:186 @@ -1400,7 +1388,7 @@ msgstr "Kanavavalinnat" #: ../template/default/config.html:419 #: ../template/default/help_config.html:202 msgid "Show channels without EPG information:" -msgstr "" +msgstr "Näytä ohjelmaoppaattomat kanavat:" #: ../template/default/config.html:427 msgid "In \"Timeline\"?" @@ -1885,7 +1873,6 @@ msgid "Italian:" msgstr "Italia:" #: ../template/default/about.html:73 -#, fuzzy msgid "Information" msgstr "Lisätietoja" @@ -1988,7 +1975,6 @@ msgid "search" msgstr "Etsi" #: ../template/default/prog_detail.html:44 -#, fuzzy msgid "edit" msgstr "Muokkaa" @@ -2394,8 +2380,8 @@ msgstr "" 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 boadcast's EPG title.</" -"p>" +"has to be located. %TITLE% will be substituted by the broadcast's EPG title." +"</p>" msgstr "" #: ../template/default/help_config.html:166 @@ -2517,25 +2503,21 @@ msgstr "Kielletty" msgid "You don't have permission to access this function!" msgstr "Puutteelliset käyttäjäoikeudet haluttuun toimintoon!" -#: ../vdradmind.pl:799 ../vdradmind.pl:6102 -#, fuzzy +#: ../vdradmind.pl:799 ../vdradmind.pl:6124 msgid "All channels" -msgstr "Kanavat" +msgstr "Kaikki kanavat" -#: ../vdradmind.pl:802 ../vdradmind.pl:6103 -#, fuzzy +#: ../vdradmind.pl:802 ../vdradmind.pl:6125 msgid "Selected channels" -msgstr "Valitse kaikki/ei yhtään" +msgstr "Valitut kanavat" -#: ../vdradmind.pl:806 ../vdradmind.pl:6104 -#, fuzzy +#: ../vdradmind.pl:806 ../vdradmind.pl:6126 msgid "TV channels" -msgstr "Kanavat" +msgstr "TV-kanavat" -#: ../vdradmind.pl:810 ../vdradmind.pl:6105 -#, fuzzy +#: ../vdradmind.pl:810 ../vdradmind.pl:6127 msgid "Radio channels" -msgstr "Kanavat" +msgstr "Radiokanavat" #: ../vdradmind.pl:1271 ../vdradmind.pl:2988 #, perl-format @@ -2639,17 +2621,10 @@ msgstr "pitkä näkymä" msgid "Schedule" msgstr "Ohjelmisto" -#: ../vdradmind.pl:5852 +#: ../vdradmind.pl:5857 msgid "Timers" msgstr "Ajastimet" -#: ../vdradmind.pl:5894 +#: ../vdradmind.pl:5915 msgid "System default" msgstr "Oletus" - -#, fuzzy -#~ msgid "Channels Setup" -#~ msgstr "Kanavat" - -#~ msgid "Timeout:" -#~ msgstr "Odotusaika:" @@ -2,9 +2,9 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-17 10:26+0200\n" -"PO-Revision-Date: 2006-05-21 00:34+0100\n" -"Last-Translator: NIVAL Michaël <mnival@club-internet.fr>\n" +"POT-Creation-Date: 2007-08-24 13:13+0200\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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -40,25 +40,21 @@ msgid "ISO-8859-1" msgstr "ISO-8859-1" #: ../template/default/epgsearch_list.html:6 -#, fuzzy msgid "EPG search" -msgstr "rechercher" +msgstr "recherche EPG" #: ../template/default/epgsearch_list.html:23 #: ../template/default/navigation.html:50 -#, fuzzy msgid "EPG Search" -msgstr "Rechercher" +msgstr "Recherche EPG" #: ../template/default/epgsearch_list.html:27 -#, fuzzy msgid "Use template" -msgstr "Gabarit :" +msgstr "Utiliser un modèle" #: ../template/default/epgsearch_list.html:34 -#, fuzzy msgid "New Search" -msgstr "Rechercher" +msgstr "Nouvelle Recherche" #: ../template/default/epgsearch_list.html:39 #: ../template/default/timer_list.html:50 @@ -79,9 +75,8 @@ msgid "Active" msgstr "Actif" #: ../template/default/epgsearch_list.html:62 -#, fuzzy msgid "Action" -msgstr "Actif" +msgstr "Action" #: ../template/default/epgsearch_list.html:73 #: ../template/default/epgsearch_list.html:75 @@ -94,7 +89,7 @@ msgstr "Chaîne" #: ../template/default/epgsearch_list.html:87 msgid "From" -msgstr "" +msgstr "De" #: ../template/default/epgsearch_list.html:89 #: ../template/default/timer_list.html:226 @@ -103,9 +98,8 @@ msgid "Start" msgstr "Début" #: ../template/default/epgsearch_list.html:101 -#, fuzzy msgid "To" -msgstr "Haut" +msgstr "A" #: ../template/default/epgsearch_list.html:103 #: ../template/default/timer_list.html:237 @@ -114,9 +108,8 @@ msgid "Stop" msgstr "Fin" #: ../template/default/epgsearch_list.html:115 -#, fuzzy msgid "Search pattern" -msgstr "Rechercher Modèles :" +msgstr "Rechercher un motif" #: ../template/default/epgsearch_list.html:125 #: ../template/default/timer_list.html:259 @@ -181,9 +174,8 @@ msgid "Edit" msgstr "Editer" #: ../template/default/epgsearch_list.html:171 -#, fuzzy msgid "Find" -msgstr "Vendredi" +msgstr "Rechercher" #: ../template/default/epgsearch_list.html:177 #: ../template/default/timer_list.html:315 @@ -200,7 +192,7 @@ msgstr "Supprimer" #: ../template/default/epgsearch_list.html:192 msgid "Show Favorites" -msgstr "" +msgstr "Montrer les Favoris" #: ../template/default/epgsearch_list.html:193 #: ../template/default/at_timer_list.html:168 @@ -208,24 +200,20 @@ msgid "Force Update" msgstr "Forcer Mise à jour" #: ../template/default/epgsearch_list.html:196 -#, fuzzy msgid "Delete Selected Searches" -msgstr "Supprimer Programmations Sélectionnées" +msgstr "Supprimer Recherches Sélectionnées" #: ../template/default/epgsearch_list.html:196 -#, fuzzy msgid "Delete all selected searches?" -msgstr "Supprimer Programmations Sélectionnées ?" +msgstr "Supprimer toutes les Recherches Sélectionnées ?" #: ../template/default/epgsearch_list.html:197 -#, fuzzy msgid "Execute Selected Searches" -msgstr "Supprimer Programmations Sélectionnées" +msgstr "Executer les Recherches Sélectionnées" #: ../template/default/epgsearch_list.html:221 -#, fuzzy msgid "Duration" -msgstr "Durée :" +msgstr "Durée" #: ../template/default/epgsearch_list.html:222 #: ../template/default/at_timer_new.html:58 @@ -258,7 +246,7 @@ msgstr "Plus d'Informations" #: ../template/default/prog_list2.html:62 #: ../template/default/navigation.html:38 ../template/default/prog_list.html:6 #: ../template/default/prog_summary.html:56 -#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5857 msgid "Channels" msgstr "Chaînes" @@ -274,9 +262,8 @@ msgstr "Enregistrer" #: ../template/default/epgsearch_list.html:270 #: ../template/default/at_timer_new.html:198 #: ../template/default/epgsearch_new.html:211 -#, fuzzy msgid "No matches found!" -msgstr "Non trouvé" +msgstr "Aucune correspondance trouvée !" #: ../template/default/error.html:6 msgid "Error!" @@ -405,14 +392,13 @@ msgid "Delete all selected timers?" msgstr "Supprimer Programmations Sélectionnées ?" #: ../template/default/timer_list.html:339 -#, fuzzy msgid "No timers defined!" -msgstr "Aucune correspondance trouvée !" +msgstr "Aucune Programmation définie !" #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 #: ../template/default/navigation.html:54 ../template/default/rec_list.html:6 -#: ../template/default/rec_list.html:17 ../vdradmind.pl:5852 +#: ../template/default/rec_list.html:17 ../vdradmind.pl:5857 msgid "Recordings" msgstr "Enregistrements" @@ -520,9 +506,8 @@ msgstr "Heure" #: ../template/default/prog_list.html:31 #: ../template/default/prog_summary.html:24 #: ../template/default/prog_summary2.html:24 -#, fuzzy msgid "Channel group:" -msgstr "Chaîne :" +msgstr "Groupe de la Chaîne :" #: ../template/default/prog_list2.html:65 #: ../template/default/prog_list.html:23 ../template/default/rec_list.html:120 @@ -549,9 +534,8 @@ msgstr "Rechercher d'autres moments de diffusion" #: ../template/default/prog_list.html:91 #: ../template/default/prog_summary.html:92 #: ../template/default/prog_summary2.html:109 -#, fuzzy msgid "No Information" -msgstr "Plus d'Informations" +msgstr "Pas d'Information" #: ../template/default/prog_list2.html:120 #: ../template/default/prog_timeline.html:201 @@ -559,9 +543,8 @@ msgstr "Plus d'Informations" #: ../template/default/prog_summary.html:142 #: ../template/default/prog_summary2.html:129 ../vdradmind.pl:3624 #: ../vdradmind.pl:3851 ../vdradmind.pl:5001 ../vdradmind.pl:5166 -#, fuzzy msgid "No EPG information available" -msgstr "Pas d'information" +msgstr "Pas d'information EPG disponible" #: ../template/default/at_timer_new.html:6 #: ../template/default/at_timer_new.html:19 @@ -685,7 +668,7 @@ msgstr "Fin de recherche :" #: ../template/default/at_timer_new.html:110 #: ../template/default/help_at_timer_new.html:44 msgid "Override Start/Stop Margins:" -msgstr "" +msgstr "Permettre de dépasser les Marges de Début/Fin :" #: ../template/default/at_timer_new.html:118 #: ../template/default/help_at_timer_new.html:46 @@ -758,18 +741,18 @@ msgstr "Diffusé" #: ../template/default/navigation.html:29 #: ../template/default/prog_summary.html:7 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5857 msgid "What's On Now?" msgstr "En ce Moment ?" -#: ../template/default/navigation.html:32 ../vdradmind.pl:5852 +#: ../template/default/navigation.html:32 ../vdradmind.pl:5857 msgid "Playing Today?" msgstr "Aujourd'hui ?" #: ../template/default/navigation.html:35 #: ../template/default/prog_timeline.html:7 #: ../template/default/config.html:158 ../template/default/help_config.html:30 -#: ../template/default/help_config.html:80 ../vdradmind.pl:5852 +#: ../template/default/help_config.html:80 ../vdradmind.pl:5857 msgid "Timeline" msgstr "Chronologie" @@ -792,9 +775,8 @@ msgid "Watch TV" msgstr "Regarder TV" #: ../template/default/navigation.html:63 -#, fuzzy msgid "Commands" -msgstr "Commandes :" +msgstr "Commandes" #: ../template/default/navigation.html:66 ../template/default/config.html:5 #: ../template/default/config.html:18 ../template/default/help_config.html:9 @@ -831,7 +813,7 @@ msgstr "à :" #: ../template/default/prog_timeline.html:195 msgid "You need JavaScript to use the timeline!" -msgstr "" +msgstr "Vous avez besoin de JavaScript pour utiliser la chronologie !" #: ../template/default/at_timer_list.html:38 msgid "New AutoTimer" @@ -842,9 +824,8 @@ msgid "Delete Selected AutoTimers" msgstr "Supprimer Auto-Programmations Sélectionnées" #: ../template/default/at_timer_list.html:178 -#, fuzzy msgid "No AutoTimers defined!" -msgstr "Vérification Auto-Programmation :" +msgstr "Aucune Auto-Programmation définie !" #: ../template/default/help_at_timer_list.html:25 msgid "" @@ -909,80 +890,87 @@ msgstr "Editer Programmation" #: ../template/default/help_edit_epg.html:20 #: ../template/default/prog_detail_form.html:19 -#, fuzzy msgid "Edit EPG" -msgstr "Editer" +msgstr "Editer EPG" #: ../template/default/help_edit_epg.html:24 -#, fuzzy msgid "" "<p>Here you can edit the descriptive fields of an existing EPG entry.</p>" -msgstr "<p>Ici vous pouvez modifier un programmation.</p>" +msgstr "" +"<p>Ici vous pouvez modifier les champs de description d'une entrée EPG.</p>" #: ../template/default/help_edit_epg.html:26 -#, fuzzy msgid "Channel (readonly)" -msgstr "Chaîne :" +msgstr "Chaîne (lecture seule)" #: ../template/default/help_edit_epg.html:27 msgid "This is the channel of the EPG entry. It cannot be changed." msgstr "" +"Ceci est la chaîne diffusant les données EPG. Elle ne peut être changée." #: ../template/default/help_edit_epg.html:28 -#, fuzzy msgid "Time (readonly)" -msgstr "lecture seule" +msgstr "Temps (lecture seule)" #: ../template/default/help_edit_epg.html:29 msgid "This is the start and end time of the entry. It cannot be changed." -msgstr "" +msgstr "Ceci est le début et la fin de cette entrée. Ceci ne peut être changé." #: ../template/default/help_edit_epg.html:31 msgid "" "Change this string to give this EPG Entry a new title. It must consist of " "only one line of text." msgstr "" +"Changez cette chaîne de caractères pour donner à l'entrée EPG un nouveau " +"titre. Il ne doit y avoir qu'une ligne de texte au maximum." #: ../template/default/help_edit_epg.html:33 msgid "" "Change this string to give this EPG Entry a new subtitle. It must consist of " "only one line of text." msgstr "" +"Changez cette chaîne de caractères pour donner à l'entrée EPG un nouveau " +"sous-titre. Il ne doit y avoir qu'une ligne de texte au maximum." #: ../template/default/help_edit_epg.html:35 msgid "" "Change the text in this field to edit the description of this entry. The " "text can consist of one or more lines." msgstr "" +"Changez le texte de ce champ pour éditer la description de cette entrée. Le " +"texte peut faire une ou plusieurs lignes." #: ../template/default/help_edit_epg.html:36 -#, fuzzy msgid "VPS (readonly)" -msgstr "lecture seule" +msgstr "VPS (lecture seule)" #: ../template/default/help_edit_epg.html:37 msgid "" "If available this field shows the vps time of the EPG entry. It cannot be " "changed." msgstr "" +"Si des temps VPN dans l'entrée EPG existe(nt), ce champ les montrera. Il ne " +"peut pas être modifié." #: ../template/default/help_edit_epg.html:38 -#, fuzzy msgid "Video tracks (readonly)" -msgstr "Piste vidéo :" +msgstr "Pistes vidéo (lecture seule)" #: ../template/default/help_edit_epg.html:39 msgid "If available this field shows the video track(s). It cannot be changed." msgstr "" +"Si des piste(s) vidéo existe(nt), ce champ les montrera. Il ne peut pas être " +"modifié." #: ../template/default/help_edit_epg.html:40 -#, fuzzy msgid "Audio tracks (readonly)" -msgstr "Piste audio :" +msgstr "Pistes audio (lecture seule)" #: ../template/default/help_edit_epg.html:41 msgid "If available this field shows the audio track(s). It cannot be changed." msgstr "" +"Si des piste(s) audio existe(nt), ce champ les montrera. Il ne peut pas être " +"modifié." #: ../template/default/help_at_timer_new.html:27 msgid "" @@ -1105,6 +1093,9 @@ msgid "" "have individual start/stop margins and enter the values in the next two text " "boxes." msgstr "" +"Sélectionnez cette option à \"oui\" si toutes les programmations programmées " +"par cette Auto-Programmation devraient avoir des marges de début/fin " +"individuelles et entrez les valeurs dans les deux prochains champs." #: ../template/default/help_at_timer_new.html:47 #: ../template/default/help_config.html:101 @@ -1113,6 +1104,8 @@ msgid "" "The number of minutes VDRAdmin-AM subtracts from the broadcasts start time " "found in the EPG." msgstr "" +"Le nombre de minutes que VDRAdmin-AM soustrait aux heures de début trouvées " +"dans les données EPG." #: ../template/default/help_at_timer_new.html:49 #: ../template/default/help_config.html:103 @@ -1121,6 +1114,8 @@ msgid "" "The number of minutes VDRAdmin-AM adds to the broadcasts stop time found in " "the EPG." msgstr "" +"Le nombre de minutes que VDRAdmin-AM ajoute aux heures de fin trouvées dans " +"les données EPG." #: ../template/default/help_at_timer_new.html:51 #: ../template/default/help_timer_new.html:54 @@ -1256,14 +1251,12 @@ msgid "Time" msgstr "Horaires" #: ../template/default/prog_detail_form.html:67 -#, fuzzy msgid "Video tracks" -msgstr "Piste vidéo :" +msgstr "Pistes vidéo" #: ../template/default/prog_detail_form.html:74 -#, fuzzy msgid "Audio tracks" -msgstr "Piste audio :" +msgstr "Pistes audio" #: ../template/default/vdr_cmds.html:6 ../template/default/vdr_cmds.html:17 msgid "VDR Commands" @@ -1271,7 +1264,7 @@ msgstr "Commandes VDR" #: ../template/default/vdr_cmds.html:29 msgid "Export channels as playlist:" -msgstr "" +msgstr "Exporter les chaînes en tant que playlist :" #: ../template/default/vdr_cmds.html:37 msgid "Number of lines to show:" @@ -1335,7 +1328,7 @@ msgstr "Langue :" #: ../template/default/config.html:97 ../template/default/help_config.html:44 msgid "Save settings on exit:" -msgstr "" +msgstr "Enregistrer les paramètres en quittant :" #: ../template/default/config.html:107 ../template/default/help_config.html:30 #: ../template/default/help_config.html:50 @@ -1393,7 +1386,7 @@ msgstr "Périodes :" #: ../template/default/config.html:166 msgid "Also used for other EPG views!" -msgstr "" +msgstr "Aussi utilisé pour d'autres vues EPG !" #: ../template/default/config.html:169 ../template/default/config.html:233 #: ../template/default/help_config.html:86 @@ -1502,22 +1495,20 @@ msgstr "Bande Passante Flux :" #: ../template/default/config.html:345 ../template/default/help_config.html:30 #: ../template/default/help_config.html:164 -#, fuzzy msgid "External Search" -msgstr "Rechercher" +msgstr "Recherche Extenre" #: ../template/default/config.html:354 ../template/default/config.html:368 msgid "URL:" -msgstr "" +msgstr "URL :" #: ../template/default/config.html:357 ../template/default/config.html:371 -#, fuzzy msgid "Title:" -msgstr "une fois" +msgstr "Titre :" #: ../template/default/config.html:362 msgid "User-defined search:" -msgstr "" +msgstr "Recherches définies par l'utilisateur :" #: ../template/default/config.html:379 ../template/default/help_config.html:30 #: ../template/default/help_config.html:178 @@ -1527,12 +1518,12 @@ msgstr "Expert" #: ../template/default/config.html:382 #: ../template/default/help_config.html:181 msgid "Update EPG data in background:" -msgstr "" +msgstr "Mettre à jour les données EPG en tâche de fond :" #: ../template/default/config.html:389 #: ../template/default/help_config.html:183 msgid "Update EPG every:" -msgstr "" +msgstr "Mettre à jour les données EPG toutes les :" #: ../template/default/config.html:394 #: ../template/default/help_config.html:186 @@ -1557,7 +1548,7 @@ msgstr "Sélections Chaînes" #: ../template/default/config.html:419 #: ../template/default/help_config.html:202 msgid "Show channels without EPG information:" -msgstr "" +msgstr "Voir les chaînes sans les informations EPG :" #: ../template/default/config.html:427 msgid "In \"Timeline\"?" @@ -1589,175 +1580,159 @@ msgstr "Appliquer" #: ../template/default/epgsearch_new.html:6 msgid "Define New Search" -msgstr "" +msgstr "Définir une Nouvelle Recherche" #: ../template/default/epgsearch_new.html:6 #: ../template/default/epgsearch_new.html:153 -#, fuzzy msgid "Edit Search" -msgstr "Rechercher" +msgstr "Editer la recherche" #: ../template/default/epgsearch_new.html:129 msgid "Small search pattern.\\nDo you really want to use it?" msgstr "" +"Le motif de recherche est trop petit.\\nVoulez-vous vraiment l'utiliser ?" #: ../template/default/epgsearch_new.html:136 msgid "" "You didn't select at least one of\\ntitle, subtitle or description.\\nDo you " "really want to use this search?" msgstr "" +"Vous n'avez ni sélectionné\\ntitre, ni sous-titre, ni description.\\nVoulez-" +"vous vraiment utiliser cette recherche ?" #: ../template/default/epgsearch_new.html:153 -#, fuzzy msgid "Add New Search" -msgstr "Ajouter Nouvelle Auto-Programmation" +msgstr "Ajouter une Nouvelle Recherche" #: ../template/default/epgsearch_new.html:167 msgid "Hide results" -msgstr "" +msgstr "Cacher les résultats" #: ../template/default/epgsearch_new.html:218 -#, fuzzy msgid "Settings" -msgstr "Paramètres Généraux" +msgstr "Paramètres" #: ../template/default/epgsearch_new.html:223 -#, fuzzy msgid "Search Term:" -msgstr "Rechercher dans :" +msgstr "Rechercher le Terme :" #: ../template/default/epgsearch_new.html:230 -#, fuzzy msgid "Search Mode:" -msgstr "Rechercher dans :" +msgstr "Mode de Recherche :" #: ../template/default/epgsearch_new.html:233 msgid "phrase" -msgstr "" +msgstr "phrase" #: ../template/default/epgsearch_new.html:234 msgid "all words" -msgstr "" +msgstr "tous les mots" #: ../template/default/epgsearch_new.html:235 msgid "at least one word" -msgstr "" +msgstr "au moins un mot" #: ../template/default/epgsearch_new.html:236 msgid "match exactly" -msgstr "" +msgstr "rechercher exactement" #: ../template/default/epgsearch_new.html:237 msgid "regular expression" -msgstr "" +msgstr "expression régulière" #: ../template/default/epgsearch_new.html:238 msgid "fuzzy" -msgstr "" +msgstr "fuzzy" #: ../template/default/epgsearch_new.html:241 msgid "Tolerance for \"fuzzy\":" -msgstr "" +msgstr "Tolérance pour \"fuzzy\":" #: ../template/default/epgsearch_new.html:248 msgid "Match Case:" -msgstr "" +msgstr "Respecter la Casse :" #: ../template/default/epgsearch_new.html:265 msgid "Use extended EPG info:" -msgstr "" +msgstr "Utiliser les informations EPG étendues :" #: ../template/default/epgsearch_new.html:300 -#, fuzzy msgid "Use Channel:" -msgstr "Chaîne :" +msgstr "Utiliser la Chaîne :" #: ../template/default/epgsearch_new.html:303 #: ../template/default/epgsearch_new.html:403 -#, fuzzy msgid "no" -msgstr "maintenant" +msgstr "non" #: ../template/default/epgsearch_new.html:304 -#, fuzzy msgid "interval" -msgstr "Intervalle :" +msgstr "intervalle" #: ../template/default/epgsearch_new.html:305 -#, fuzzy msgid "channel group" -msgstr "Chaîne" +msgstr "groupe de la chaîne" #: ../template/default/epgsearch_new.html:306 msgid "only FTA" -msgstr "" +msgstr "Seulement les chaînes \"en clair\"" #: ../template/default/epgsearch_new.html:309 -#, fuzzy msgid "Range:" -msgstr "Langue :" +msgstr "Intervalle :" #: ../template/default/epgsearch_new.html:323 -#, fuzzy msgid "Channel Group:" -msgstr "Chaîne :" +msgstr "Groupe de la Chaîne :" #: ../template/default/epgsearch_new.html:334 -#, fuzzy msgid "Use Time:" -msgstr "Identifiant :" +msgstr "Utiliser l'Heure :" #: ../template/default/epgsearch_new.html:340 -#, fuzzy msgid "Start After:" -msgstr "Début de recherche :" +msgstr "Démarrer après :" #: ../template/default/epgsearch_new.html:347 -#, fuzzy msgid "Start Before:" -msgstr "Début de recherche :" +msgstr "Démarrer avant :" #: ../template/default/epgsearch_new.html:359 -#, fuzzy msgid "Use Duration:" -msgstr "Durée :" +msgstr "Utiliser Durée :" #: ../template/default/epgsearch_new.html:365 -#, fuzzy msgid "Min. Duration:" -msgstr "Durée :" +msgstr "Durée Min. :" #: ../template/default/epgsearch_new.html:368 #: ../template/default/epgsearch_new.html:375 msgid "hh:mm" -msgstr "" +msgstr "hh:mm" #: ../template/default/epgsearch_new.html:372 -#, fuzzy msgid "Max. Duration:" -msgstr "Durée :" +msgstr "Durée Max. :" #: ../template/default/epgsearch_new.html:384 msgid "Use Day of Week:" -msgstr "" +msgstr "Utiliser un jour de la Semaine :" #: ../template/default/epgsearch_new.html:400 msgid "Use Blacklists:" -msgstr "" +msgstr "Utiliser des \"listes noires\" :" #: ../template/default/epgsearch_new.html:404 -#, fuzzy msgid "selection" -msgstr "Zapper" +msgstr "Sélectionner" #: ../template/default/epgsearch_new.html:419 msgid "Use in Favorites Menu:" -msgstr "" +msgstr "Utiliser dans le Menu des Favoris :" #: ../template/default/epgsearch_new.html:427 -#, fuzzy msgid "Use as Search Timer:" -msgstr "Rechercher dans :" +msgstr "Utiliser en tant que Recherche de Programmation :" #: ../template/default/epgsearch_new.html:432 #: ../template/default/prog_detail.html:37 ../vdradmind.pl:2479 @@ -1766,68 +1741,63 @@ msgstr "enregistrer" #: ../template/default/epgsearch_new.html:433 ../vdradmind.pl:2481 msgid "announce only" -msgstr "" +msgstr "Annoncer seulement" #: ../template/default/epgsearch_new.html:434 ../vdradmind.pl:2483 msgid "switch only" -msgstr "" +msgstr "zapper uniquement" #: ../template/default/epgsearch_new.html:444 msgid "Settings for action \"record\"" -msgstr "" +msgstr "Paramètres pour action \"enregistrement\"" #: ../template/default/epgsearch_new.html:447 -#, fuzzy msgid "Series Recording:" -msgstr "Nom Original d'Enregistrement :" +msgstr "Enregistrement des Séries :" #: ../template/default/epgsearch_new.html:459 -#, fuzzy msgid "Delete Recordings After ... Days:" -msgstr "Supprimer l'Enregistrement ?" +msgstr "Supprimer les Enregistrement Après ... Jours :" #: ../template/default/epgsearch_new.html:462 -#, fuzzy msgid "Keep ... Recordings:" -msgstr "Enregistrements" +msgstr "Garder ... Enregistrements :" #: ../template/default/epgsearch_new.html:467 -#, fuzzy msgid "Pause, when ... recordings exist:" -msgstr "Chemin des Enregistrements VDR :" +msgstr "Pause, quand ... Enregistrements existent :" #: ../template/default/epgsearch_new.html:473 msgid "Avoid Repeats:" -msgstr "" +msgstr "Eviter les répétitions :" #: ../template/default/epgsearch_new.html:479 msgid "Allowed Repeats:" -msgstr "" +msgstr "Autoriser les répétitions :" #: ../template/default/epgsearch_new.html:482 msgid "Only Repeats Within ... Days:" -msgstr "" +msgstr "Se répète uniquement dans ... Jours :" #: ../template/default/epgsearch_new.html:487 msgid "Compare:" -msgstr "" +msgstr "Comparer :" #: ../template/default/epgsearch_new.html:533 -#, fuzzy msgid "VPS:" -msgstr "VPS" +msgstr "VPS :" #: ../template/default/epgsearch_new.html:544 msgid "Settings for action \"switch only\"" -msgstr "" +msgstr "Paramètres pour action \"zapper uniquement\"" #: ../template/default/epgsearch_new.html:547 msgid "Switch ... Minutes Before Start:" -msgstr "" +msgstr "Zapper ... Minutes Avant le Début :" #: ../template/default/epgsearch_new.html:560 msgid "Save as template" -msgstr "" +msgstr "Enregistrer en tant que modèle" #: ../template/default/prog_list.html:44 msgid "Go!" @@ -1939,11 +1909,11 @@ msgstr "Nouveau" #: ../template/default/rec_list.html:110 msgid "Play" -msgstr "" +msgstr "Lire" #: ../template/default/rec_list.html:113 msgid "Cut" -msgstr "" +msgstr "Couper" #: ../template/default/rec_list.html:116 ../template/default/rec_edit.html:44 msgid "Rename" @@ -1970,9 +1940,8 @@ msgid "Delete all selected recordings?" msgstr "Supprimer Enregistrements Sélectionnés ?" #: ../template/default/rec_list.html:155 -#, fuzzy msgid "No recordings available" -msgstr "Pas d'aide disponible" +msgstr "Aucun enregistrement disponible" #: ../template/default/tv.html:5 ../template/default/tv.html:80 msgid "TV" @@ -2059,18 +2028,16 @@ msgid "Russian:" msgstr "Russe" #: ../template/default/about.html:62 -#, fuzzy msgid "Czech:" -msgstr "Français" +msgstr "Tchèque :" #: ../template/default/about.html:66 msgid "Italian:" -msgstr "" +msgstr "Italien :" #: ../template/default/about.html:73 -#, fuzzy msgid "Information" -msgstr "Informations" +msgstr "Information" #: ../template/default/about.html:76 msgid "VDRAdmin-AM version:" @@ -2082,25 +2049,31 @@ msgstr "Version de VDR :" #: ../template/default/about.html:84 msgid "Supported features in VDR:" -msgstr "" +msgstr "Options supportées par VDR :" #: ../template/default/about.html:91 msgid "" "EPGSearch (<a href=\"http://people.freenet.de/cwieninger/html/vdr-epg-search." "html\" target=\"_blank\">EPGSearch Plugin</a>)" msgstr "" +"Plugin de Recherche dans les données EPG (<a href=\"http://people.freenet.de/" +"cwieninger/html/vdr-epg-search.html\" target=\"_blank\">EPGSearch</a>)" #: ../template/default/about.html:97 msgid "" "LiveTV Streaming (<a href=\"http://www.vdr-wiki.de/wiki/index.php/Streamdev-" "plugin\" target=\"_blank\">Streamdev Plugin</a>)" msgstr "" +"Plugin de Streaming Live (<a href=\"http://www.vdr-wiki.de/wiki/index.php/" +"Streamdev-plugin\" target=\"_blank\">Streamdev</a>)" #: ../template/default/about.html:103 msgid "" "Rename Recordings (<a href=\"http://www.saunalahti.fi/~rahrenbe/vdr/patches/" "\" target=\"_blank\">Liemikuutio Patch</a>)" msgstr "" +"Renommer les Enregistrements (<a href=\"http://www.saunalahti.fi/~rahrenbe/" +"vdr/patches/\" target=\"_blank\">Patch Liemikuutio</a>)" #: ../template/default/about.html:110 msgid "Getting Help and Reporting Bugs" @@ -2166,9 +2139,8 @@ msgid "search" msgstr "rechercher" #: ../template/default/prog_detail.html:44 -#, fuzzy msgid "edit" -msgstr "Editer" +msgstr "éditer" #: ../template/default/prog_detail.html:66 msgid "Video tracks:" @@ -2443,6 +2415,10 @@ msgid "" "also save settings not available on the \"Configuration\" menu like interval " "and size in TV, sorting in the lists and current view in \"What's on now\"." msgstr "" +"Avec cette option, les paramètres seront sauvegardés si VDRAdmin-AM existe. " +"Cela enregistrera aussi les paramètres non disponibles dans le menu " +"\"Configuration\" comme l'intervalle et la taille sur la TV, tri des listes " +"et la vue courante dans \"En ce Moment\"." #: ../template/default/help_config.html:47 #: ../template/default/help_config.html:61 @@ -2679,13 +2655,17 @@ msgstr "" 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 boadcast's EPG title.</" -"p>" +"has to be located. %TITLE% will be substituted by the broadcast's EPG title." +"</p>" msgstr "" +"<p>Ici vous pouvez définir deux recherches externes auxquelles vous pouvez " +"accéder dans les vues EPG. You avez seulement à trouver l'URL et où le " +"paramètres de recherche doit être indiqué. %TITLE% sera substitué par titre " +"de la diffusion trouvé dans le titre dans les données EPG.</p>" #: ../template/default/help_config.html:166 msgid "Some examples:" -msgstr "" +msgstr "Quelques exemples :" #: ../template/default/help_config.html:179 msgid "" @@ -2701,15 +2681,19 @@ msgid "" "Else the EPG will be refreshed if the user accesses any EPG view at the web " "interface and the timeout set at \"Update EPG every\" has been reached." msgstr "" +"Si l'option est \"oui\" VDRAdmin-AM rafraichira périodiquement son cache " +"local EPG. Sinon l'EPG sera rafraichit si l'utilisateur accède à n'importe " +"quelle vue EPG dans l'interface web et que le timeout choisit dans \"Mise à " +"jour EPG tous les\" aura été atteint." #: ../template/default/help_config.html:184 -#, fuzzy msgid "" "The interval, the EPG data is refreshed from VDR and AutoTimer updates are " "performed (if AutoTimer feature is used)." msgstr "" "L'intervalle durant lequel les données du guide éléctronique des programmes " -"sont vérifiées pour mettre à jour les Auto-Programmations." +"sont vérifiées pour mettre à jour les Auto-Programmations (si les Auto-" +"Programmations sont activées)." #: ../template/default/help_config.html:187 msgid "" @@ -2767,6 +2751,9 @@ msgid "" "views. If you don't want them to be hidden you have to set this option to " "\"yes\"." msgstr "" +"De manière générale, les chaînes qui n'ont pas d'information EPG sont " +"cachées dans toutes les vues EPG. Si vous ne voulez pas les cacher, activez " +"(\"oui\") cette option." #: ../vdradmind.pl:360 msgid "What's your VDR hostname (e.g video.intra.net)?" @@ -2825,25 +2812,21 @@ msgstr "Interdit" msgid "You don't have permission to access this function!" msgstr "Vous n'avez pas la permission d'accéder à cette fonction !" -#: ../vdradmind.pl:799 ../vdradmind.pl:6102 -#, fuzzy +#: ../vdradmind.pl:799 ../vdradmind.pl:6124 msgid "All channels" -msgstr "Chaînes" +msgstr "Toutes les Chaînes" -#: ../vdradmind.pl:802 ../vdradmind.pl:6103 -#, fuzzy +#: ../vdradmind.pl:802 ../vdradmind.pl:6125 msgid "Selected channels" -msgstr "Selectionner tout/rien" +msgstr "Chaînes Sélectionnées" -#: ../vdradmind.pl:806 ../vdradmind.pl:6104 -#, fuzzy +#: ../vdradmind.pl:806 ../vdradmind.pl:6126 msgid "TV channels" -msgstr "Chaînes" +msgstr "Chaînes TV" -#: ../vdradmind.pl:810 ../vdradmind.pl:6105 -#, fuzzy +#: ../vdradmind.pl:810 ../vdradmind.pl:6127 msgid "Radio channels" -msgstr "Chaînes" +msgstr "Chaînes Radio" #: ../vdradmind.pl:1271 ../vdradmind.pl:2988 #, perl-format @@ -2857,30 +2840,27 @@ msgstr "L'URL \"%s\" n'a pas été trouvée sur le serveur !" #: ../vdradmind.pl:2136 msgid "Your favorites" -msgstr "" +msgstr "Vos favoris" #: ../vdradmind.pl:2136 -#, fuzzy msgid "Search results" -msgstr "Rechercher dans :" +msgstr "Résultats de la Recherche" #: ../vdradmind.pl:2276 -#, fuzzy msgid "Default" -msgstr "Supprimer" +msgstr "Par défaut" #: ../vdradmind.pl:2394 msgid "--- no timer ---" -msgstr "" +msgstr "--- pas de programmations ---" #: ../vdradmind.pl:2485 -#, fuzzy msgid "unknown" -msgstr "maintenant" +msgstr "inconnu" #: ../vdradmind.pl:2488 msgid "none" -msgstr "" +msgstr "aucun" #: ../vdradmind.pl:2989 #, perl-format @@ -2902,9 +2882,8 @@ msgid "Error while sending command to VDR at %s" msgstr "Erreur en envoyant la commande à %s" #: ../vdradmind.pl:3047 -#, fuzzy msgid "Internal error:" -msgstr "Intervalle :" +msgstr "Erreur Interne :" #: ../vdradmind.pl:3205 msgid "Lookup movie in the Internet-Movie-Database (IMDb)" @@ -2912,16 +2891,16 @@ msgstr "Plus de détails sur Internet" #: ../vdradmind.pl:3458 msgid "Can't find EPG entry!" -msgstr "" +msgstr "Aucune entrée EPG trouvée !" #: ../vdradmind.pl:3886 msgid "Playing Tomorrow" msgstr "Joué demain" #: ../vdradmind.pl:3886 -#, fuzzy, perl-format +#, perl-format msgid "Playing on the %s" -msgstr "En cours sur la %d." +msgstr "Lecture en cours sur la %s" #: ../vdradmind.pl:5193 msgid "next" @@ -2951,18 +2930,14 @@ msgstr "Long aperçu" msgid "Schedule" msgstr "Programmateur" -#: ../vdradmind.pl:5852 +#: ../vdradmind.pl:5857 msgid "Timers" msgstr "Programmations" -#: ../vdradmind.pl:5894 +#: ../vdradmind.pl:5915 msgid "System default" msgstr "Par défaut" -#, fuzzy -#~ msgid "Channels Setup" -#~ msgstr "Chaînes" - #~ msgid "" #~ "The number of minutes VDRAdmin-AM subtracts from the broadcasts start " #~ "time found in the EPG. This value is used for timers programmed by " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-17 10:26+0200\n" +"POT-Creation-Date: 2007-08-24 13:13+0200\n" "PO-Revision-Date: 2007-01-31 00:59+0100\n" "Last-Translator: Gringo <vdr-italian@tiscali.it>\n" "Language-Team: \n" @@ -250,7 +250,7 @@ msgstr "Altre informazioni" #: ../template/default/prog_list2.html:62 #: ../template/default/navigation.html:38 ../template/default/prog_list.html:6 #: ../template/default/prog_summary.html:56 -#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5857 msgid "Channels" msgstr "Canali" @@ -402,7 +402,7 @@ msgstr "Nessun timer definito!" #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 #: ../template/default/navigation.html:54 ../template/default/rec_list.html:6 -#: ../template/default/rec_list.html:17 ../vdradmind.pl:5852 +#: ../template/default/rec_list.html:17 ../vdradmind.pl:5857 msgid "Recordings" msgstr "Registrazioni" @@ -743,18 +743,18 @@ msgstr "Trasmesso" #: ../template/default/navigation.html:29 #: ../template/default/prog_summary.html:7 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5857 msgid "What's On Now?" msgstr "Cosa c'è adesso?" -#: ../template/default/navigation.html:32 ../vdradmind.pl:5852 +#: ../template/default/navigation.html:32 ../vdradmind.pl:5857 msgid "Playing Today?" msgstr "In esecuzione oggi?" #: ../template/default/navigation.html:35 #: ../template/default/prog_timeline.html:7 #: ../template/default/config.html:158 ../template/default/help_config.html:30 -#: ../template/default/help_config.html:80 ../vdradmind.pl:5852 +#: ../template/default/help_config.html:80 ../vdradmind.pl:5857 msgid "Timeline" msgstr "Linea temporale" @@ -2630,8 +2630,8 @@ msgstr "Suffisso da usare per registrare la trasmissione. Di default è\"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 boadcast's EPG title.</" -"p>" +"has to be located. %TITLE% will be substituted by the broadcast's EPG title." +"</p>" msgstr "" #: ../template/default/help_config.html:166 @@ -2775,22 +2775,22 @@ msgstr "Proibito" msgid "You don't have permission to access this function!" msgstr "Non hai i permessi per accedere a questa funzione!" -#: ../vdradmind.pl:799 ../vdradmind.pl:6102 +#: ../vdradmind.pl:799 ../vdradmind.pl:6124 #, fuzzy msgid "All channels" msgstr "Canali" -#: ../vdradmind.pl:802 ../vdradmind.pl:6103 +#: ../vdradmind.pl:802 ../vdradmind.pl:6125 #, fuzzy msgid "Selected channels" msgstr "Seleziona tutti/nessuno" -#: ../vdradmind.pl:806 ../vdradmind.pl:6104 +#: ../vdradmind.pl:806 ../vdradmind.pl:6126 #, fuzzy msgid "TV channels" msgstr "Canali" -#: ../vdradmind.pl:810 ../vdradmind.pl:6105 +#: ../vdradmind.pl:810 ../vdradmind.pl:6127 #, fuzzy msgid "Radio channels" msgstr "Canali" @@ -2897,18 +2897,14 @@ msgstr "vista estesa" msgid "Schedule" msgstr "Pianifica" -#: ../vdradmind.pl:5852 +#: ../vdradmind.pl:5857 msgid "Timers" msgstr "Timers" -#: ../vdradmind.pl:5894 +#: ../vdradmind.pl:5915 msgid "System default" msgstr "Default sistema" -#, fuzzy -#~ msgid "Channels Setup" -#~ msgstr "Canali" - #~ msgid "" #~ "The number of minutes VDRAdmin-AM subtracts from the broadcasts start " #~ "time found in the EPG. This value is used for timers programmed by " @@ -1,22 +1,21 @@ -# translation of nl.po to Nederlands -# translation of vdradmin-nl.po to Nederlands -# translation of vdradmin.po to Nederlands +# translation of nl.po to # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. -# Roel <rl.koelewijn@home.nl>, 2005, 2006, 2007. # +# Roel <rl.koelewijn@home.nl>, 2005, 2006, 2007. +# Roel Koelewijn <roel.koelewijn@gmail.com>, 2007. msgid "" msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-17 10:26+0200\n" -"PO-Revision-Date: 2007-01-26 18:10+0100\n" -"Last-Translator: Roel <rl.koelewijn@home.nl>\n" -"Language-Team: Nederlands <nl@li.org>\n" +"POT-Creation-Date: 2007-08-24 13:13+0200\n" +"PO-Revision-Date: 2007-08-23 20:28+0200\n" +"Last-Translator: Roel Koelewijn <roel.koelewijn@gmail.com>\n" +"Language-Team: <nl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.10\n" +"X-Generator: KBabel 1.11.4\n" #: ../template/default/epgsearch_list.html:5 ../template/default/error.html:5 #: ../template/default/timer_list.html:5 @@ -252,7 +251,7 @@ msgstr "Meer informatie" #: ../template/default/prog_list2.html:62 #: ../template/default/navigation.html:38 ../template/default/prog_list.html:6 #: ../template/default/prog_summary.html:56 -#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5857 msgid "Channels" msgstr "Kanalen" @@ -404,7 +403,7 @@ msgstr "Geen timers opgegeven!" #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 #: ../template/default/navigation.html:54 ../template/default/rec_list.html:6 -#: ../template/default/rec_list.html:17 ../vdradmind.pl:5852 +#: ../template/default/rec_list.html:17 ../vdradmind.pl:5857 msgid "Recordings" msgstr "Opnames" @@ -506,7 +505,6 @@ msgstr "Uur" #: ../template/default/prog_list.html:31 #: ../template/default/prog_summary.html:24 #: ../template/default/prog_summary2.html:24 -#, fuzzy msgid "Channel group:" msgstr "Kanaal groep:" @@ -742,18 +740,18 @@ msgstr "Uitgezonden" #: ../template/default/navigation.html:29 #: ../template/default/prog_summary.html:7 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5857 msgid "What's On Now?" msgstr "Wat is er nu op?" -#: ../template/default/navigation.html:32 ../vdradmind.pl:5852 +#: ../template/default/navigation.html:32 ../vdradmind.pl:5857 msgid "Playing Today?" msgstr "Speelt vandaag?" #: ../template/default/navigation.html:35 #: ../template/default/prog_timeline.html:7 #: ../template/default/config.html:158 ../template/default/help_config.html:30 -#: ../template/default/help_config.html:80 ../vdradmind.pl:5852 +#: ../template/default/help_config.html:80 ../vdradmind.pl:5857 msgid "Timeline" msgstr "Tijdlijn" @@ -887,80 +885,86 @@ msgstr "Timer bewerken" #: ../template/default/help_edit_epg.html:20 #: ../template/default/prog_detail_form.html:19 -#, fuzzy msgid "Edit EPG" -msgstr "Bewerken" +msgstr "Bewerk EPG" #: ../template/default/help_edit_epg.html:24 -#, fuzzy msgid "" "<p>Here you can edit the descriptive fields of an existing EPG entry.</p>" -msgstr "<p>Hier kunt u de timer instellingen bewerken.</p>" +msgstr "<p>Hier kunt u de omschrijving van een bestaande EPG bewerken.</p>" #: ../template/default/help_edit_epg.html:26 -#, fuzzy msgid "Channel (readonly)" -msgstr "Kanaal groep:" +msgstr "Kanaal (alleen lezen)" #: ../template/default/help_edit_epg.html:27 msgid "This is the channel of the EPG entry. It cannot be changed." -msgstr "" +msgstr "Dit is het kanaal van de EPG invoer. Dit akn niet veranderd worden." #: ../template/default/help_edit_epg.html:28 -#, fuzzy msgid "Time (readonly)" -msgstr "Alleen lezen" +msgstr "Tijd (alleen lezen)" #: ../template/default/help_edit_epg.html:29 msgid "This is the start and end time of the entry. It cannot be changed." msgstr "" +"Dit is de start en eindtijd van de invoer. Dit kan niet veranderd worden." #: ../template/default/help_edit_epg.html:31 msgid "" "Change this string to give this EPG Entry a new title. It must consist of " "only one line of text." msgstr "" +"Verander deze reeks om deze EPG invoer een nieuwe titel te geven.Het mag " +"alleen bestaan uit één regel tekst." #: ../template/default/help_edit_epg.html:33 msgid "" "Change this string to give this EPG Entry a new subtitle. It must consist of " "only one line of text." msgstr "" +"Verander deze reeks om deze EPG invoer een nieuwe subtitel te geven.Het mag " +"alleen bestaan uit één regel tekst." #: ../template/default/help_edit_epg.html:35 msgid "" "Change the text in this field to edit the description of this entry. The " "text can consist of one or more lines." msgstr "" +"Verander de tekst in dit veld om de omschrijving te veranderen van deze " +"invoer. De tekst mag bestaan uit één of meer regels,." #: ../template/default/help_edit_epg.html:36 -#, fuzzy msgid "VPS (readonly)" -msgstr "Alleen lezen" +msgstr "VPS (alleen lezen)" #: ../template/default/help_edit_epg.html:37 msgid "" "If available this field shows the vps time of the EPG entry. It cannot be " "changed." msgstr "" +"Als het beschikbaar is toont dit vel de vps tijd van de EPG invoer. Dit kan " +"niet veranderd worden." #: ../template/default/help_edit_epg.html:38 -#, fuzzy msgid "Video tracks (readonly)" -msgstr "Video tracks:" +msgstr "Video tracks (alleen lezen)" #: ../template/default/help_edit_epg.html:39 msgid "If available this field shows the video track(s). It cannot be changed." msgstr "" +"Indien beschikbaar toont dit veld de video spoor of sporen. Dit kan niet " +"verandert worden." #: ../template/default/help_edit_epg.html:40 -#, fuzzy msgid "Audio tracks (readonly)" -msgstr "Audio sporen:" +msgstr "Audio sporen (alleen lezen)" #: ../template/default/help_edit_epg.html:41 msgid "If available this field shows the audio track(s). It cannot be changed." msgstr "" +"Indien beschikbaar toont dit veld de audio sporen. Dit kan niet veranderd " +"worden." #: ../template/default/help_at_timer_new.html:27 msgid "" @@ -1231,14 +1235,12 @@ msgid "Time" msgstr "Tijd" #: ../template/default/prog_detail_form.html:67 -#, fuzzy msgid "Video tracks" -msgstr "Video tracks:" +msgstr "Video sporen:" #: ../template/default/prog_detail_form.html:74 -#, fuzzy msgid "Audio tracks" -msgstr "Audio sporen:" +msgstr "Audio sporen" #: ../template/default/vdr_cmds.html:6 ../template/default/vdr_cmds.html:17 msgid "VDR Commands" @@ -1246,7 +1248,7 @@ msgstr "VDR Commando's:" #: ../template/default/vdr_cmds.html:29 msgid "Export channels as playlist:" -msgstr "" +msgstr "Exporteeer de kanalen als afspeellijst" #: ../template/default/vdr_cmds.html:37 msgid "Number of lines to show:" @@ -1477,22 +1479,20 @@ msgstr "Bandbreedte van streams:" #: ../template/default/config.html:345 ../template/default/help_config.html:30 #: ../template/default/help_config.html:164 -#, fuzzy msgid "External Search" -msgstr "Bewerk zoeken" +msgstr "Extern zoeken" #: ../template/default/config.html:354 ../template/default/config.html:368 msgid "URL:" -msgstr "" +msgstr "URL:" #: ../template/default/config.html:357 ../template/default/config.html:371 -#, fuzzy msgid "Title:" -msgstr "Titel" +msgstr "Titel:" #: ../template/default/config.html:362 msgid "User-defined search:" -msgstr "" +msgstr "Gebruikers definieert zoeken" #: ../template/default/config.html:379 ../template/default/help_config.html:30 #: ../template/default/help_config.html:178 @@ -1502,12 +1502,12 @@ msgstr "Expert" #: ../template/default/config.html:382 #: ../template/default/help_config.html:181 msgid "Update EPG data in background:" -msgstr "" +msgstr "Bijwerken van EPG gegevens in de achtergrond:" #: ../template/default/config.html:389 #: ../template/default/help_config.html:183 msgid "Update EPG every:" -msgstr "" +msgstr "Werk EPG bij iedere:" #: ../template/default/config.html:394 #: ../template/default/help_config.html:186 @@ -1532,7 +1532,7 @@ msgstr "Kanaal selecties" #: ../template/default/config.html:419 #: ../template/default/help_config.html:202 msgid "Show channels without EPG information:" -msgstr "" +msgstr "Toon kanalen zonder EPG informatie:" #: ../template/default/config.html:427 msgid "In \"Timeline\"?" @@ -2019,7 +2019,6 @@ msgid "Italian:" msgstr "Italiaans:" #: ../template/default/about.html:73 -#, fuzzy msgid "Information" msgstr "Informatie" @@ -2125,7 +2124,6 @@ msgid "search" msgstr "zoeken" #: ../template/default/prog_detail.html:44 -#, fuzzy msgid "edit" msgstr "Bewerken" @@ -2625,13 +2623,17 @@ msgstr "De extensie voor opgenomen streaming. Standaard is \"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 boadcast's EPG title.</" -"p>" +"has to be located. %TITLE% will be substituted by the broadcast's EPG title." +"</p>" msgstr "" +"<p>Hier kunt u twee externe zoekopdrachten definieren die u kunt benaderen " +"in de EPG. U moet alleen de benodigde URL zien te vinden en waar het " +"zoekpatroon geplaatst moet worden . %TITLE% zal worden vervangen door " +"uitzendings EPG titel.</" #: ../template/default/help_config.html:166 msgid "Some examples:" -msgstr "" +msgstr "Enkele voorbeelden:" #: ../template/default/help_config.html:179 msgid "" @@ -2647,15 +2649,18 @@ msgid "" "Else the EPG will be refreshed if the user accesses any EPG view at the web " "interface and the timeout set at \"Update EPG every\" has been reached." msgstr "" +"Als het ingesteld staat op \"ja\" dan zal VDRAdmin-AM met intervallen zijn " +"lokale EPG cache verversen. Anders word de EPG pas ververst als de gebruiker " +"met een EPG bezoek op de web interface benadert en de timeout instelling " +"\"Ververs EPG iedere\" bereikt is" #: ../template/default/help_config.html:184 -#, fuzzy msgid "" "The interval, the EPG data is refreshed from VDR and AutoTimer updates are " "performed (if AutoTimer feature is used)." msgstr "" -"De interval dat de EPG data wordt gecontroleerd voor het verversen van de " -"auto timers." +"De interval dat EPG data wordt ververst van VDR en auto timer updates worden " +"uitgevoerd. (Als de auto timer functie word gebruikt)." #: ../template/default/help_config.html:187 msgid "" @@ -2714,6 +2719,8 @@ msgid "" "views. If you don't want them to be hidden you have to set this option to " "\"yes\"." msgstr "" +"Normaal gesproken worden kanalen verborgen die geen EPG informatie hebben. " +"Als u deze niet verborgen wilt hebben moet u deze optie op \"ja\" zetten." #: ../vdradmind.pl:360 msgid "What's your VDR hostname (e.g video.intra.net)?" @@ -2766,31 +2773,27 @@ msgstr "De gevraagde URl is niet gevonden op deze server!" #: ../vdradmind.pl:601 ../vdradmind.pl:1271 ../vdradmind.pl:2986 msgid "Forbidden" -msgstr "Verboden" +msgstr "Niet toegestaan" #: ../vdradmind.pl:601 ../vdradmind.pl:2987 msgid "You don't have permission to access this function!" msgstr "U heeft geen toestemming om deze functie te gebruiken!" -#: ../vdradmind.pl:799 ../vdradmind.pl:6102 -#, fuzzy +#: ../vdradmind.pl:799 ../vdradmind.pl:6124 msgid "All channels" -msgstr "Kanalen" +msgstr "alle kanalen" -#: ../vdradmind.pl:802 ../vdradmind.pl:6103 -#, fuzzy +#: ../vdradmind.pl:802 ../vdradmind.pl:6125 msgid "Selected channels" -msgstr "Selecteer alles/niets" +msgstr "Geselecteerde kanalen" -#: ../vdradmind.pl:806 ../vdradmind.pl:6104 -#, fuzzy +#: ../vdradmind.pl:806 ../vdradmind.pl:6126 msgid "TV channels" -msgstr "Kanalen" +msgstr "TV kanalen" -#: ../vdradmind.pl:810 ../vdradmind.pl:6105 -#, fuzzy +#: ../vdradmind.pl:810 ../vdradmind.pl:6127 msgid "Radio channels" -msgstr "Kanalen" +msgstr "Radio kanalen" #: ../vdradmind.pl:1271 ../vdradmind.pl:2988 #, perl-format @@ -2894,38 +2897,10 @@ msgstr "uitgebreid tonen" msgid "Schedule" msgstr "Schema" -#: ../vdradmind.pl:5852 +#: ../vdradmind.pl:5857 msgid "Timers" msgstr "Timers" -#: ../vdradmind.pl:5894 +#: ../vdradmind.pl:5915 msgid "System default" msgstr "Systeem standaard" - -#, fuzzy -#~ msgid "Channels Setup" -#~ msgstr "Kanalen" - -#~ msgid "" -#~ "The number of minutes VDRAdmin-AM 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 "" -#~ "Het aantal minuten dat VDRAdmin-AM eerder begint met opnemen dat de start " -#~ "tijd aangegeven door de EPG. Deze waarde word gebruikt voor timers " -#~ "geprogrammeerd door de autotimer en timers die handmatig geprogrammeerd " -#~ "worden door op \"opnemen\" in ieder EPG overzicht." - -#~ msgid "" -#~ "The number of minutes VDRAdmin-AM 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 "" -#~ "Het aantal minuten die VDRAdmin-AM toevoegd aan de opname tijd die " -#~ "gevonden is in EPG. Deze waarde word gebruikt voor timers geprogrammeerd " -#~ "door de autotimer en timers die handmatig geprogrammeerd worden door op " -#~ "\"opnemen\" in ieder EPG overzicht." - -#~ msgid "Timeout:" -#~ msgstr "Timeout:" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: VDRAdmin-AM-3.4.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-17 10:26+0200\n" +"POT-Creation-Date: 2007-08-24 13:13+0200\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" @@ -259,7 +259,7 @@ msgstr "´ÞßÞÛÝØâÕÛìÝÐï ØÝäÞàÜÐæØï" #: ../template/default/prog_list2.html:62 #: ../template/default/navigation.html:38 ../template/default/prog_list.html:6 #: ../template/default/prog_summary.html:56 -#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5857 msgid "Channels" msgstr "ÂÕÛÕÓØÔ" @@ -411,7 +411,7 @@ msgstr "½Õâ âÐÙÜÕàÞÒ!" #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 #: ../template/default/navigation.html:54 ../template/default/rec_list.html:6 -#: ../template/default/rec_list.html:17 ../vdradmind.pl:5852 +#: ../template/default/rec_list.html:17 ../vdradmind.pl:5857 msgid "Recordings" msgstr "·ÐßØáØ" @@ -751,18 +751,18 @@ msgstr "²ÕéïÛÞáì" #: ../template/default/navigation.html:29 #: ../template/default/prog_summary.html:7 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5857 msgid "What's On Now?" msgstr "ÇâÞ ØÔÕâ áÕÙçÐá?" -#: ../template/default/navigation.html:32 ../vdradmind.pl:5852 +#: ../template/default/navigation.html:32 ../vdradmind.pl:5857 msgid "Playing Today?" msgstr "ÇâÞ ÑãÔÕâ áÕÓÞÔÝï?" #: ../template/default/navigation.html:35 #: ../template/default/prog_timeline.html:7 #: ../template/default/config.html:158 ../template/default/help_config.html:30 -#: ../template/default/help_config.html:80 ../vdradmind.pl:5852 +#: ../template/default/help_config.html:80 ../vdradmind.pl:5857 msgid "Timeline" msgstr "³àÐäØÚ ÒàÕÜÕÝØ" @@ -2603,8 +2603,8 @@ msgstr "ÀÐáèØàÕÝØÕ äÐÙÛÐ âàÐÝáÛïæØØ ×ÐßØáÕÙ. ¿Þ ãÜÞÛçÐÝØî \"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 boadcast's EPG title.</" -"p>" +"has to be located. %TITLE% will be substituted by the broadcast's EPG title." +"</p>" msgstr "" #: ../template/default/help_config.html:166 @@ -2745,22 +2745,22 @@ msgstr "·ÐßàÕéÕÝÞ" msgid "You don't have permission to access this function!" msgstr "à ÒÐá ÝÕÔÞáâÐâÞçÝÞ ßàÐÒ ÔÛï Òë×ÞÒÐ íâÞÙ äãÝÚæØØ!" -#: ../vdradmind.pl:799 ../vdradmind.pl:6102 +#: ../vdradmind.pl:799 ../vdradmind.pl:6124 #, fuzzy msgid "All channels" msgstr "ÂÕÛÕÓØÔ" -#: ../vdradmind.pl:802 ../vdradmind.pl:6103 +#: ../vdradmind.pl:802 ../vdradmind.pl:6125 #, fuzzy msgid "Selected channels" msgstr "²ëÑàÐâì ÒáÕ ØÛØ ÝØçÕÓÞ" -#: ../vdradmind.pl:806 ../vdradmind.pl:6104 +#: ../vdradmind.pl:806 ../vdradmind.pl:6126 #, fuzzy msgid "TV channels" msgstr "ÂÕÛÕÓØÔ" -#: ../vdradmind.pl:810 ../vdradmind.pl:6105 +#: ../vdradmind.pl:810 ../vdradmind.pl:6127 #, fuzzy msgid "Radio channels" msgstr "ÂÕÛÕÓØÔ" @@ -2870,18 +2870,14 @@ msgstr "ÀÐáèØàÕÝÝÐï ØÝäÞàÜÐæØï" msgid "Schedule" msgstr "ÀÐáßØáÐÝØÕ" -#: ../vdradmind.pl:5852 +#: ../vdradmind.pl:5857 msgid "Timers" msgstr "ÂÐÙÜÕàë" -#: ../vdradmind.pl:5894 +#: ../vdradmind.pl:5915 msgid "System default" msgstr "ÁØáâÕÜÝëÙ áâÐÝÔÐàâ" -#, fuzzy -#~ msgid "Channels Setup" -#~ msgstr "ÂÕÛÕÓØÔ" - #~ msgid "" #~ "The number of minutes VDRAdmin-AM subtracts from the broadcasts start " #~ "time found in the EPG. This value is used for timers programmed by " diff --git a/po/vdradmin.pot b/po/vdradmin.pot index d7d2ebf..1e9cdec 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: 2007-08-17 10:26+0200\n" +"POT-Creation-Date: 2007-08-24 13:13+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -250,7 +250,7 @@ msgstr "" #: ../template/default/prog_list2.html:62 #: ../template/default/navigation.html:38 ../template/default/prog_list.html:6 #: ../template/default/prog_summary.html:56 -#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:93 ../vdradmind.pl:5857 msgid "Channels" msgstr "" @@ -402,7 +402,7 @@ msgstr "" #: ../template/default/help_rec_list.html:6 #: ../template/default/help_rec_list.html:17 #: ../template/default/navigation.html:54 ../template/default/rec_list.html:6 -#: ../template/default/rec_list.html:17 ../vdradmind.pl:5852 +#: ../template/default/rec_list.html:17 ../vdradmind.pl:5857 msgid "Recordings" msgstr "" @@ -707,18 +707,18 @@ msgstr "" #: ../template/default/navigation.html:29 #: ../template/default/prog_summary.html:7 -#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5852 +#: ../template/default/prog_summary2.html:7 ../vdradmind.pl:5857 msgid "What's On Now?" msgstr "" -#: ../template/default/navigation.html:32 ../vdradmind.pl:5852 +#: ../template/default/navigation.html:32 ../vdradmind.pl:5857 msgid "Playing Today?" msgstr "" #: ../template/default/navigation.html:35 #: ../template/default/prog_timeline.html:7 #: ../template/default/config.html:158 ../template/default/help_config.html:30 -#: ../template/default/help_config.html:80 ../vdradmind.pl:5852 +#: ../template/default/help_config.html:80 ../vdradmind.pl:5857 msgid "Timeline" msgstr "" @@ -2302,8 +2302,8 @@ msgstr "" 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 boadcast's EPG title.</" -"p>" +"has to be located. %TITLE% will be substituted by the broadcast's EPG title." +"</p>" msgstr "" #: ../template/default/help_config.html:166 @@ -2425,19 +2425,19 @@ msgstr "" msgid "You don't have permission to access this function!" msgstr "" -#: ../vdradmind.pl:799 ../vdradmind.pl:6102 +#: ../vdradmind.pl:799 ../vdradmind.pl:6124 msgid "All channels" msgstr "" -#: ../vdradmind.pl:802 ../vdradmind.pl:6103 +#: ../vdradmind.pl:802 ../vdradmind.pl:6125 msgid "Selected channels" msgstr "" -#: ../vdradmind.pl:806 ../vdradmind.pl:6104 +#: ../vdradmind.pl:806 ../vdradmind.pl:6126 msgid "TV channels" msgstr "" -#: ../vdradmind.pl:810 ../vdradmind.pl:6105 +#: ../vdradmind.pl:810 ../vdradmind.pl:6127 msgid "Radio channels" msgstr "" @@ -2541,10 +2541,10 @@ msgstr "" msgid "Schedule" msgstr "" -#: ../vdradmind.pl:5852 +#: ../vdradmind.pl:5857 msgid "Timers" msgstr "" -#: ../vdradmind.pl:5894 +#: ../vdradmind.pl:5915 msgid "System default" msgstr "" diff --git a/template/default/help_config.html b/template/default/help_config.html index c56e5a7..d0e3531 100644 --- a/template/default/help_config.html +++ b/template/default/help_config.html @@ -162,7 +162,7 @@ </div> <div class="group"><a id="ext_search" name="ext_search"></a><h3><?% gettext('External Search') %?></h3> - <?% gettext('<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 boadcast\'s EPG title.</p>') %?> + <?% gettext('<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>') %?> <?% gettext('Some examples:') %?> <dl> <dt>Internet Movie Database (IMDb): (<a href="http://www.imdb.com/">http://www.imdb.com/</a>)</dt> diff --git a/vdradmind.pl b/vdradmind.pl index e13fe8c..f245066 100755 --- a/vdradmind.pl +++ b/vdradmind.pl @@ -26,7 +26,7 @@ require 5.004; -my $VERSION = "3.6.0beta"; +my $VERSION = "3.6.0rc"; my $BASENAME; my $EXENAME; @@ -115,7 +115,7 @@ sub LOG_CHECKTIMER () { 32 } sub LOG_FATALERROR () { 64 } sub LOG_DEBUG () { 32768 } -my %CONFIG; +my (%CONFIG, %CONFIG_TEMP); $CONFIG{LOGLEVEL} = 81; # 32799 $CONFIG{LOGGING} = 0; $CONFIG{LOGFILE} = "vdradmind.log"; @@ -207,12 +207,12 @@ $CONFIG{MAIL_AUTH_PASS} = ""; # $CONFIG{CHANNELS_WANTED} = ""; -$CONFIG{CHANNELS_WANTED_AUTOTIMER} = ""; -$CONFIG{CHANNELS_WANTED_PRG} = ""; -$CONFIG{CHANNELS_WANTED_PRG2} = ""; -$CONFIG{CHANNELS_WANTED_TIMELINE} = ""; -$CONFIG{CHANNELS_WANTED_SUMMARY} = ""; -$CONFIG{CHANNELS_WANTED_WATCHTV} = ""; +$CONFIG{CHANNELS_WANTED_AUTOTIMER} = 0; +$CONFIG{CHANNELS_WANTED_PRG} = 0; +$CONFIG{CHANNELS_WANTED_PRG2} = 0; +$CONFIG{CHANNELS_WANTED_TIMELINE} = 0; +$CONFIG{CHANNELS_WANTED_SUMMARY} = 0; +$CONFIG{CHANNELS_WANTED_WATCHTV} = 0; $CONFIG{CHANNELS_WITHOUT_EPG} = 0; # @@ -5793,24 +5793,33 @@ sub rec_cut { # configuration ############################################################################# sub config { - sub ApplyConfig { - my $old_lang = $CONFIG{LANG}; - my $old_epgprune = $CONFIG{EPG_PRUNE}; - my $old_epgdirect = $CONFIG{EPG_DIRECT}; - my $old_epgfile = $CONFIG{EPG_FILENAME}; - my $old_vdrconfdir = $CONFIG{VDRCONFDIR}; + unless ($q->param("save") || $q->param("apply") || $q->param("submit")) { + undef %CONFIG_TEMP; + for my $key (keys(%CONFIG)) { + $CONFIG_TEMP{$key} = $CONFIG{$key}; + } + } + sub ApplyConfig { for ($q->param) { if (/[A-Z]+/) { - $CONFIG{$_} = $q->param($_); + $CONFIG_TEMP{$_} = $q->param($_); } } + my $need_trans_reload = 1 if ($CONFIG_TEMP{LANG} ne $CONFIG{LANG}); + my $need_vdrconf_reload = 1 if ($CONFIG_TEMP{VDRCONFDIR} ne $CONFIG{VDRCONFDIR}); + my $need_update = 1 if ($CONFIG_TEMP{EPG_PRUNE} != $CONFIG{EPG_PRUNE} + || $CONFIG_TEMP{CHANNELS_WANTED} ne $CONFIG{CHANNELS_WANTED}); + for my $key (keys(%CONFIG_TEMP)) { + $CONFIG{$key} = $CONFIG_TEMP{$key}; + } + ValidConfig(); - 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}); - if ($old_vdrconfdir ne $CONFIG{VDRCONFDIR}) { + LoadTranslation() if ($need_trans_reload); + UptoDate(1) if ($need_update); + if ($need_vdrconf_reload) { @reccmds = loadCommandsConf("$CONFIG{VDRCONFDIR}/reccmds.conf"); @vdrcmds = loadCommandsConf("$CONFIG{VDRCONFDIR}/commands.conf"); } @@ -5830,16 +5839,12 @@ sub config { if ($q->param("submit")) { if ($q->param("submit") eq ">>>>>") { for my $vdr_id ($q->param("all_channels")) { - $CONFIG{CHANNELS_WANTED} = csvAdd($CONFIG{CHANNELS_WANTED}, $vdr_id); + $CONFIG_TEMP{CHANNELS_WANTED} = csvAdd($CONFIG_TEMP{CHANNELS_WANTED}, $vdr_id); } - ApplyConfig(); - WriteConfig(); } elsif ($q->param("submit") eq "<<<<<") { for my $vdr_id ($q->param("selected_channels")) { - $CONFIG{CHANNELS_WANTED} = csvRemove($CONFIG{CHANNELS_WANTED}, $vdr_id); + $CONFIG_TEMP{CHANNELS_WANTED} = csvRemove($CONFIG_TEMP{CHANNELS_WANTED}, $vdr_id); } - ApplyConfig(); - WriteConfig(); } } elsif ($q->param("save")) { ApplyConfig(); @@ -5856,7 +5861,7 @@ sub config { push(@loginpages, { id => $i, name => $LOGINPAGES_DESCRIPTION[$i], - current => ($CONFIG{LOGINPAGE} == $i) ? 1 : 0 + current => ($CONFIG_TEMP{LOGINPAGE} == $i) ? 1 : 0 } ); $i++; @@ -5872,18 +5877,34 @@ sub config { if (!$found) { push(@template, { name => $dir, - aktemplate => ($CONFIG{TEMPLATE} eq $dir) ? 1 : 0, + aktemplate => ($CONFIG_TEMP{TEMPLATE} eq $dir) ? 1 : 0, } ); } } + my @selected_channels; + for my $channel (@{$CHAN{$CHAN_FULL}->{channels}}) { + my $found = 0; + for (split(",", $CONFIG_TEMP{CHANNELS_WANTED})) { + if ($_ eq $channel->{vdr_id}) { + $found = 1; + } + } + next unless $found; + push(@selected_channels, + { name => $channel->{name}, + vdr_id => $channel->{vdr_id} + } + ); + } + my @skinlist; - foreach my $file (glob(sprintf("%s/%s/*", $TEMPLATEDIR, $CONFIG{TEMPLATE}))) { + foreach my $file (glob(sprintf("%s/%s/*", $TEMPLATEDIR, $CONFIG_TEMP{TEMPLATE}))) { my $name = (split('\/', $file))[-1]; push(@skinlist, { name => $name, - sel => ($CONFIG{SKIN} eq $name ? 1 : 0) + sel => ($CONFIG_TEMP{SKIN} eq $name ? 1 : 0) } ) if (-d $file); @@ -5897,7 +5918,7 @@ sub config { push(@my_locales, { id => $loc, name => $loc, - cur => ($loc eq $CONFIG{LANG} ? 1 : 0) + cur => ($loc eq $CONFIG_TEMP{LANG} ? 1 : 0) } ) if ($loc =~ $SUPPORTED_LOCALE_PREFIXES); @@ -5906,12 +5927,13 @@ sub config { my $vars = { TEMPLATELIST => \@template, ALL_CHANNELS => \@{$CHAN{$CHAN_FULL}->{channels}}, - SELECTED_CHANNELS => \@{$CHAN{$CHAN_WANTED}->{channels}}, + SELECTED_CHANNELS => \@selected_channels, LOGINPAGES => \@loginpages, SKINLIST => \@skinlist, MY_LOCALES => \@my_locales, url => $MyURL, - help_url => HelpURL("config") + help_url => HelpURL("config"), + config => \%CONFIG_TEMP }; return showTemplate("config.html", $vars); } |