diff options
| -rw-r--r-- | HISTORY | 6 | ||||
| -rw-r--r-- | HISTORY.DE | 4 | ||||
| -rw-r--r-- | conf/epgsearchupdmail-html.templ | 58 | ||||
| -rw-r--r-- | conf/epgsearchupdmail.templ | 39 | ||||
| -rw-r--r-- | doc-src/en/epgsearch.4.txt | 34 | ||||
| -rw-r--r-- | doc-src/en/epgsearch.conf.5.txt | 2 | ||||
| -rw-r--r-- | epgsearchext.c | 6 | ||||
| -rw-r--r-- | epgsearchext.h | 5 | ||||
| -rw-r--r-- | mail.c | 57 | ||||
| -rw-r--r-- | mail.h | 19 | ||||
| -rw-r--r-- | menu_searchedit.c | 5 | ||||
| -rw-r--r-- | menu_searchedit.h | 2 | ||||
| -rw-r--r-- | po/ca_ES.po | 13 | ||||
| -rw-r--r-- | po/cs_CZ.po | 13 | ||||
| -rw-r--r-- | po/da_DK.po | 13 | ||||
| -rw-r--r-- | po/de_DE.po | 15 | ||||
| -rw-r--r-- | po/el_GR.po | 13 | ||||
| -rw-r--r-- | po/es_ES.po | 17 | ||||
| -rw-r--r-- | po/et_EE.po | 13 | ||||
| -rw-r--r-- | po/fi_FI.po | 16 | ||||
| -rw-r--r-- | po/fr_FR.po | 16 | ||||
| -rw-r--r-- | po/hr_HR.po | 13 | ||||
| -rw-r--r-- | po/hu_HU.po | 13 | ||||
| -rwxr-xr-x | po/it_IT.po | 15 | ||||
| -rw-r--r-- | po/nl_NL.po | 16 | ||||
| -rw-r--r-- | po/nn_NO.po | 13 | ||||
| -rw-r--r-- | po/pl_PL.po | 13 | ||||
| -rw-r--r-- | po/pt_PT.po | 13 | ||||
| -rw-r--r-- | po/ro_RO.po | 13 | ||||
| -rw-r--r-- | po/ru_RU.po | 13 | ||||
| -rw-r--r-- | po/sl_SI.po | 13 | ||||
| -rw-r--r-- | po/sv_SE.po | 13 | ||||
| -rw-r--r-- | po/tr_TR.po | 13 | ||||
| -rw-r--r-- | searchtimer_thread.c | 21 |
34 files changed, 466 insertions, 82 deletions
@@ -13,9 +13,13 @@ new: http://projects.vdr-developer.org/git/?p=vdr-plugin-epgsearch.git many thanks to the maintainers of projects.vdr-developer.org, especially Tobias Grimm -- Search timers now have a new action "Announce and switching". This announces the +- Search timers now have a new action "Announce and switch". This announces the event via OSD right before it starts and lets you switch to its channel with 'Ok'. Switch timers now have the same option. +- in addition to the announcements via OSD new events can now also be reported by mail. + To do so, there's a new search timer action "Announce by mail". You also have to update + your mail template file epgsearchupdmail.templ (s. the updated sample in the conf directory + and/or read the MANUAL '13. Email notification'). - new internal variables: * %day%, %month% and %year% which return the numeric day, month and year (with century) of an event @@ -15,6 +15,10 @@ neu: - Suchtimer haben nun eine neue Aktion "Ankündigen und Umschalten". Damit wird eine Sendung via OSD kurz vor ihrem Start angekündigt. Mit 'Ok' kann zum entsprechenden Kanal gewechselt werden. Umschalttimer haben die gleiche Option erhalten. +- Zusätzlich zur Ankündigung per OSD können neue Sendungen nun auch per Mail bekannt- + gegeben werden. Dazu gibt es eine neue Suchtimeraktion "Per Mail ankündigen". Man muss + ausserdem das Mail-Templatefile epgsearchupdmail.templ anpassen (s. Beispiel im conf- + Verzeichnis bzw. MANUAL '13. Email notification'). - neue interne Variablen: * %day%, %month% und %year% liefern den numerische Tag, das Monat und das Jahr (mit Jahrhundert) einer Sendung diff --git a/conf/epgsearchupdmail-html.templ b/conf/epgsearchupdmail-html.templ index 65ac3f9..1562c68 100644 --- a/conf/epgsearchupdmail-html.templ +++ b/conf/epgsearchupdmail-html.templ @@ -7,16 +7,22 @@ # - "subject" to be used as mail subject # - "mailbody" the body of the mail: # put %update.newtimers% in the place where the list of new timers should -# appear. The same for %update.modtimers% and %update.deltimers% for the -# list of changed or deleted timers. -# - "timer" the description of one timer. This section is used to display one -# timer within a timer list, e.g. in %update.newtimers% +# appear. The same for %update.modtimers%, %update.deltimers% and +# %update.newevents& for the list of changed or deleted timers and event +# announcements. +# - "timer" the description of one timer and "event" with the description of +# one event. This section is used to display one timer within a timer list, +# e.g. in %update.newtimers%. The same for "event". # -# close each section with the corresponding end tag! +# All sections are optional, e.g. if you don't use event announcements you +# can drop "%update.newevents%" in the mailbody and the "event" section. But +# of course you should have at least a mailbody ;-) +# +# close each section with the correspondig end tag! # Please have a look at the MANUAL for the available variables. ######################################################################### # -# Version: 0.3 Date: 24.09.2006 +# Version: 0.4 Date: 20.09.2009 # # Author: Mike Constabel <vejoun @ vdrportal> # Christian Wieninger <winni @ vdrportal> @@ -26,7 +32,7 @@ ######################################################################### # here's the mail's subject definition (no CR!) ######################################################################### -<subject>[epgsearch] update info: %update.countnewtimers% new / %update.countmodtimers% modified / %update.countdeltimers% deleted timers</subject> +<subject>[epgsearch] update info: %update.countnewtimers% new / %update.countmodtimers% modified / %update.countdeltimers% deleted timers / %update.countnewevents% new events /</subject> ######################################################################### @@ -82,6 +88,18 @@ th.timer { font-weight: normal; } +/* design of each event table inside the main tables */ +table.event { + width: 100%; + } +table.event, tr.event { + border-style: none; + } +th.event { + background-color: #ffb3a4; + font-weight: normal; + } + /* space between the timer tables */ p.smallspace { line-height: 20px; @@ -107,6 +125,7 @@ a.rightspace { <tr><td><a href="#new">new timers:</a></td><td>%update.countnewtimers%</td></tr> <tr><td><a href="#mod">modified timers:</a></td><td>%update.countmodtimers%</td></tr> <tr><td><a href="#del">deleted timers:</a></td><td>%update.countdeltimers%</td></tr> +<tr><td><a href="#events">new events to report:</a></td><td>%update.countnewevents%</td></tr> </table> <p class="bigspace"></p> @@ -132,6 +151,13 @@ a.rightspace { <p class="bigspace"></p> +<table class="main"> +<tr><th colspan="2"><a href="#info" class="rightspace">Top</a> <a name="events"></a>New events to report</th></tr> +<tr><td>%update.newevents%</td></tr> +</table> + +<p class="bigspace"></p> + <p>Have fun!</p> </body> </html></mailbody> @@ -156,3 +182,21 @@ a.rightspace { </table> <p class="smallspace"></p> </timer> + +############################################################################## +# here's the event definition, which is used to display information about +# an event in the announcement list. You can use any variables that refer +# to an event. You can also use 'user defined' variables from +# epgsearchuservars.conf. +############################################################################## +<event> +<table class="event"> +<tr class="event"><th class="timer">Title:</th><th class="timer">%title%</th></tr> +<tr class="event"><td>Subtitle:</td><td>%subtitle%</td></tr> +<tr class="event"><td>Start/End:</td><td>%time_w% %date% %time%-%timeend%</td></tr> +<tr class="event"><td>Channel:</td><td>%chlng% (%chnr%)</td></tr> +<tr class="timer"><td>Search:</td><td>%search% (%searchid%)</td></tr> +<tr class="timer"><td valign="top">Summary:</td><td>%htmlsummary%</td></tr> +</table> +<p class="smallspace"></p> +</event> diff --git a/conf/epgsearchupdmail.templ b/conf/epgsearchupdmail.templ index 8d186fc..5d547e9 100644 --- a/conf/epgsearchupdmail.templ +++ b/conf/epgsearchupdmail.templ @@ -1,15 +1,22 @@ ######################################################################### # This is a sample template for email notifications about timer changes +# and/or events announcements # (NOTE: This is a sample for a text mail, but you could use HTML as well) # # There are 3 sections that have to be defined: # - "subject" to be used as mail subject # - "mailbody" the body of the mail: # put %update.newtimers% in the place where the list of new timers should -# appear. The same for %update.modtimers% and %update.deltimers% for the -# list of changed or deleted timers. -# - "timer" the description of one timer. This section is used to display one -# timer within a timer list, e.g. in %update.newtimers% +# appear. The same for %update.modtimers%, %update.deltimers% and +# %update.newevents& for the list of changed or deleted timers and event +# announcements. +# - "timer" the description of one timer and "event" with the description of +# one event. This section is used to display one timer within a timer list, +# e.g. in %update.newtimers%. The same for "event". +# +# All sections are optional, e.g. if you don't use event announcements you +# can drop "%update.newevents%" in the mailbody and the "event" section. But +# of course you should have at least a mailbody ;-) # # close each section with the correspondig end tag! # Please have a look at the MANUAL for the available variables. @@ -19,7 +26,7 @@ ######################################################################### # here's the mail's subject definition (no CR!) ######################################################################### -<subject>[epgsearch] update info: %update.countnewtimers% new / %update.countmodtimers% modified / %update.countdeltimers% deleted timers</subject> +<subject>[epgsearch] update info: %update.countnewtimers% new / %update.countmodtimers% modified / %update.countdeltimers% deleted timers / %update.countnewevents% new events</subject> ######################################################################### @@ -32,6 +39,7 @@ new timers: %update.countnewtimers% modified timers: %update.countmodtimers% deleted timers: %update.countdeltimers% + new events: %update.countnewevents% the following timers have been added: ---------------------------------------------------------------------- @@ -45,6 +53,10 @@ the following timers have been deleted: ---------------------------------------------------------------------- %update.deltimers% +the following events where found: +---------------------------------------------------------------------- +%update.newevents% + Have fun!</mailbody> ############################################################################## @@ -67,3 +79,20 @@ Summary: %summary% ---------------------------------------------------------------------- </timer> + +############################################################################## +# here's the event definition, which is used to display information about +# an event within the list of event announcements. You can use any variables +# that refer to an event. You can also use 'user defined' variables from +# epgsearchuservars.conf. +############################################################################## +<event> + Title: %title% ~ %subtitle% + Start/End: %time_w% %date% %time%-%timeend% + Channel: %chlng% (%chnr%) + Search: %search% (%searchid%) + +Summary: +%summary% +---------------------------------------------------------------------- +</event> diff --git a/doc-src/en/epgsearch.4.txt b/doc-src/en/epgsearch.4.txt index e70b396..758dbc2 100644 --- a/doc-src/en/epgsearch.4.txt +++ b/doc-src/en/epgsearch.4.txt @@ -771,13 +771,18 @@ mail you have to define the following sections: - "subject" to be used as mail subject - "mailbody" the body of the mail: - put '%update.newtimers%' in the place where the list of new timers should - appear. The same for %update.modtimers% and %update.deltimers% for the - list of changed or deleted timers. - - "timer" the description of one timer. This section is used to display one - timer within a timer list, e.g. in %update.newtimers% - -each section is enclosed in a pseudo XML tag. + put %update.newtimers% in the place where the list of new timers should + appear. The same for %update.modtimers%, %update.deltimers% and + %update.newevents& for the list of changed or deleted timers and event + announcements. + - "timer" the description of one timer and "event" with the description of + one event. This section is used to display one timer within a timer list, + e.g. in %update.newtimers%. The same for "event". + +All sections are optional, e.g. if you don't use event announcements you +can drop "%update.newevents%" in the mailbody and the "event" section. But +of course you should have at least a mailbody ;-) +Each section is enclosed in a pseudo XML tag. The following variables can be used in the section <mailbody>: @@ -794,6 +799,12 @@ The following variables can be used in the section <mailbody>: within the timer section will be substituted to an empty string.) - %update.countdeltimers% - the number of deleted timers + - %update.newevents% - will be replaced with the list of events to + announce. These events are the search result of + search timers with the action "announce by mail". + The events are displayed as defined in the section + '<event>' + - %update.countnewevents% - the number of new events - %colon% - the sign ':' - %datenow% - current date in format TT.MM.YY - %dateshnow% - current date in format TT.MM. @@ -815,6 +826,15 @@ The following variables can be used in the section <timer>: - any extended EPG variable as defined in epgsearchcats.conf - any user variable (as in '12. User defined variables') +The following variables can be used in the section <event>: + + - any event variable (as in '10. Customizing the EPG menus') + - %search% - the name of the search timer that triggered + this event + - %searchid% - the ID of the corresponding search timer + - any extended EPG variable as defined in epgsearchcats.conf + - any user variable (as in '12. User defined variables') + For a conflict notification mail the following sections exist: - "subject" to be used as mail subject diff --git a/doc-src/en/epgsearch.conf.5.txt b/doc-src/en/epgsearch.conf.5.txt index 265bc24..17040cc 100644 --- a/doc-src/en/epgsearch.conf.5.txt +++ b/doc-src/en/epgsearch.conf.5.txt @@ -53,6 +53,8 @@ is B<':'>: 0 = create a timer 1 = announce only via OSD (no timer) 2 = switch only (no timer) + 3 = announce via OSD and switch (no timer) + 4 = announce via mail 27 - use extended EPG info? 0/1 28 - extended EPG info values. This entry has the following format (delimiter is '|' for each category, '#' separates id and value): diff --git a/epgsearchext.c b/epgsearchext.c index 37be75a..5362545 100644 --- a/epgsearchext.c +++ b/epgsearchext.c @@ -1114,16 +1114,16 @@ void cSearchExt::CheckRepeatTimers(cSearchResults* pResults) return; LogFile.Log(2,"analysing repeats for search timer '%s'...", search); - if (action == searchTimerActionAnnounceOnly) + if (action != searchTimerActionRecord) { - LogFile.Log(3,"search timer set to 'announce only', so skip all"); + LogFile.Log(3,"search timer not set to 'record', so skip all"); return; } cSearchResult* pResultObj = NULL; for (pResultObj = pResults->First(); pResultObj; pResultObj = pResults->Next(pResultObj)) { - if (action == searchTimerActionAnnounceOnly) // only announce if there is no timer for the event + if (action != searchTimerActionRecord) // only announce if there is no timer for the event { pResultObj->needsTimer = false; continue; diff --git a/epgsearchext.h b/epgsearchext.h index b0927d1..e4d7fc6 100644 --- a/epgsearchext.h +++ b/epgsearchext.h @@ -48,9 +48,10 @@ typedef enum typedef enum { searchTimerActionRecord=0, - searchTimerActionAnnounceOnly, + searchTimerActionAnnounceViaOSD, searchTimerActionSwitchOnly, - searchTimerActionAnnounceAndSwitch + searchTimerActionAnnounceAndSwitch, + searchTimerActionAnnounceViaMail } searchTimerAction; class cSearchExt; @@ -30,6 +30,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch #include "log.h" #include "epgsearchtools.h" #include "uservars.h" +#include "noannounce.h" #ifndef SENDMAIL #define SENDMAIL "/usr/sbin/sendmail" @@ -122,6 +123,24 @@ bool cMailDelTimerNotification::operator< (const cMailDelTimerNotification &N) c return (start < N.start); } +// ---------------------- +// cMailAnnounceEventNotification +string cMailAnnounceEventNotification::Format(const string& templ) const +{ + const cEvent* pEvent = GetEvent(); + if (!pEvent) return ""; + + string result = templ; + cVarExpr varExprEvent(result); + result = varExprEvent.Evaluate(pEvent); + + result = ReplaceAll(result, "%searchid%", NumToString(searchextID)); + cSearchExt* search = SearchExts.GetSearchFromID(searchextID); + if (search) + result = ReplaceAll(result, "%search%", search->search); + return result; +} + // ------------- // cMailNotifier cMailNotifier::cMailNotifier(string Subject, string Body) @@ -307,11 +326,18 @@ void cMailUpdateNotifier::AddRemoveTimerNotification(cTimer* t, const cEvent* e) delTimers.insert(N); } +void cMailUpdateNotifier::AddAnnounceEventNotification(tEventID EventID, tChannelID ChannelID, int SearchExtID) +{ + cMailAnnounceEventNotification N(EventID, ChannelID, SearchExtID); + announceEvents.insert(N); +} + void cMailUpdateNotifier::SendUpdateNotifications() { if (newTimers.size() == 0 && modTimers.size() == 0 && - delTimers.size() == 0) + delTimers.size() == 0 && + announceEvents.size() == 0) return; // extract single templates @@ -323,6 +349,7 @@ void cMailUpdateNotifier::SendUpdateNotifications() string templSubject = GetTemplValue(mailTemplate, "subject"); string templBody = GetTemplValue(mailTemplate, "mailbody"); string templTimer = GetTemplValue(mailTemplate, "timer"); + string templEvent = GetTemplValue(mailTemplate, "event"); // create the timer list for new timers string newtimers; @@ -357,31 +384,59 @@ void cMailUpdateNotifier::SendUpdateNotifications() if (message != "") deltimers += message; } + // create the list of events to announce + string announceevents; + if (announceEvents.size() == 0) + announceevents = tr("No new events to announce."); + std::set<cMailAnnounceEventNotification>::iterator itae; + for (itae = announceEvents.begin(); itae != announceEvents.end(); itae++) + { + string message = (*itae).Format(templEvent); + if (message != "") announceevents += message; + } + // evaluate variables cVarExpr varExprSubj(templSubject); subject = varExprSubj.Evaluate(); subject = ReplaceAll(subject, "%update.countnewtimers%", NumToString((long)newTimers.size())); subject = ReplaceAll(subject, "%update.countmodtimers%", NumToString((long)modTimers.size())); subject = ReplaceAll(subject, "%update.countdeltimers%", NumToString((long)delTimers.size())); + subject = ReplaceAll(subject, "%update.countnewevents%", NumToString((long)announceEvents.size())); newtimers = ReplaceAll(newtimers, "%update.countnewtimers%", NumToString((long)newTimers.size())); modtimers = ReplaceAll(modtimers, "%update.countmodtimers%", NumToString((long)modTimers.size())); deltimers = ReplaceAll(deltimers, "%update.countdeltimers%", NumToString((long)delTimers.size())); + announceevents = ReplaceAll(announceevents, "%update.countnewevents%", NumToString((long)announceEvents.size())); cVarExpr varExprBody(templBody); body = varExprBody.Evaluate(); body = ReplaceAll(body, "%update.countnewtimers%", NumToString((long)newTimers.size())); body = ReplaceAll(body, "%update.countmodtimers%", NumToString((long)modTimers.size())); body = ReplaceAll(body, "%update.countdeltimers%", NumToString((long)delTimers.size())); + body = ReplaceAll(body, "%update.countnewevents%", NumToString((long)announceEvents.size())); body = ReplaceAll(body, "%update.newtimers%", newtimers); body = ReplaceAll(body, "%update.modtimers%", modtimers); body = ReplaceAll(body, "%update.deltimers%", deltimers); + body = ReplaceAll(body, "%update.newevents%", announceevents); SendMail(); newTimers.clear(); modTimers.clear(); delTimers.clear(); + // Add announced events to the "no announce" list + for (itae = announceEvents.begin(); itae != announceEvents.end(); itae++) + { + cNoAnnounce* noAnnounce = new cNoAnnounce(itae->GetEvent()); + NoAnnounces.Add(noAnnounce); + } + if (announceEvents.size() > 0) + { + NoAnnounces.ClearOutdated(); + NoAnnounces.Save(); + } + + announceEvents.clear(); } // --------------------- @@ -59,17 +59,19 @@ class cMailNotifier class cMailTimerNotification { + friend class cMailUpdateNotifier; tEventID eventID; tChannelID channelID; uint timerMod; - const cEvent* GetEvent() const; + protected: + virtual const cEvent* GetEvent() const; public: cMailTimerNotification(tEventID EventID, tChannelID ChannelID, uint TimerMod = tmNoChange) : eventID(EventID), channelID(ChannelID), timerMod(TimerMod) {} - bool operator< (const cMailTimerNotification &N) const; - string Format(const string& templ) const; + virtual bool operator< (const cMailTimerNotification &N) const; + virtual string Format(const string& templ) const; }; class cMailDelTimerNotification @@ -83,11 +85,21 @@ class cMailDelTimerNotification bool operator< (const cMailDelTimerNotification &N) const; }; +class cMailAnnounceEventNotification : public cMailTimerNotification +{ + int searchextID; + public: + cMailAnnounceEventNotification(tEventID EventID, tChannelID ChannelID, int SearchExtID) + : cMailTimerNotification(EventID, ChannelID), searchextID(SearchExtID) {} + string Format(const string& templ) const; +}; + class cMailUpdateNotifier : public cMailNotifier { set<cMailTimerNotification> newTimers; set<cMailTimerNotification> modTimers; set<cMailDelTimerNotification> delTimers; + set<cMailAnnounceEventNotification> announceEvents; string mailTemplate; public: @@ -95,6 +107,7 @@ class cMailUpdateNotifier : public cMailNotifier void AddNewTimerNotification(tEventID EventID, tChannelID ChannelID); void AddModTimerNotification(tEventID EventID, tChannelID ChannelID, uint timerMod = tmNoChange); void AddRemoveTimerNotification(cTimer* t, const cEvent* e = NULL); + void AddAnnounceEventNotification(tEventID EventID, tChannelID ChannelID, int SearchExtID); void SendUpdateNotifications(); }; diff --git a/menu_searchedit.c b/menu_searchedit.c index 84b0e22..b120a27 100644 --- a/menu_searchedit.c +++ b/menu_searchedit.c @@ -72,9 +72,10 @@ cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Tem UseChannelSel[3] = strdup(tr("only FTA")); SearchTimerModes[0] = strdup(tr("Record")); - SearchTimerModes[1] = strdup(tr("Announce only")); + SearchTimerModes[1] = strdup(tr("Announce by OSD")); SearchTimerModes[2] = strdup(tr("Switch only")); SearchTimerModes[3] = strdup(tr("Announce and switch")); + SearchTimerModes[4] = strdup(tr("Announce by mail")); BlacklistModes[0] = strdup(trVDR("no")); BlacklistModes[1] = strdup(tr("Selection")); @@ -305,7 +306,7 @@ void cMenuEditSearchExt::Set() Add(new cMenuEditStraItem( tr("Use as search timer"), &data.useAsSearchTimer, 3, SearchActiveModes)); if (data.useAsSearchTimer) { - Add(new cMenuEditStraItem(IndentMenuItem(tr("Action")), &data.action, 4, SearchTimerModes)); + Add(new cMenuEditStraItem(IndentMenuItem(tr("Action")), &data.action, 5, SearchTimerModes)); if (data.action == searchTimerActionSwitchOnly) { Add(new cMenuEditIntItem(IndentMenuItem(tr("Switch ... minutes before start")), &data.switchMinsBefore, 0, 99)); diff --git a/menu_searchedit.h b/menu_searchedit.h index 0bba2e5..a43c877 100644 --- a/menu_searchedit.h +++ b/menu_searchedit.h @@ -48,7 +48,7 @@ protected: char *SearchModes[6]; char *DaysOfWeek[8]; char *UseChannelSel[4]; - char *SearchTimerModes[4]; + char *SearchTimerModes[5]; char *BlacklistModes[3]; char *DelModes[3]; char *SearchActiveModes[3]; diff --git a/po/ca_ES.po b/po/ca_ES.po index 8264e3b..5ad62ab 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Jordi Vilà <jvila@tinet.org>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -539,6 +539,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -903,7 +906,7 @@ msgstr "" msgid "Record" msgstr "Gravar" -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -912,6 +915,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1112,6 +1118,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index a646658..df2bfd2 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -537,6 +537,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -901,7 +904,7 @@ msgstr "" msgid "Record" msgstr "Nahrát" -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -910,6 +913,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1110,6 +1116,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/po/da_DK.po b/po/da_DK.po index 6511608..cea587a 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -537,6 +537,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -901,7 +904,7 @@ msgstr "" msgid "Record" msgstr "Optag" -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -910,6 +913,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1110,6 +1116,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index c5bdd24..d62e300 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -573,6 +573,9 @@ msgstr "Es wurden keine Timer geändert." msgid "No timers were deleted." msgstr "Es wurden keine Timer gelöscht." +msgid "No new events to announce." +msgstr "Keine neuen Sendungen anzukündigen." + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -937,8 +940,8 @@ msgstr "Suche editieren" msgid "Record" msgstr "Aufnehmen" -msgid "Announce only" -msgstr "Nur ankündigen" +msgid "Announce by OSD" +msgstr "per OSD ankündigen" msgid "Switch only" msgstr "Nur umschalten" @@ -946,6 +949,9 @@ msgstr "Nur umschalten" msgid "Announce and switch" msgstr "Ankündigen und Umschalten" +msgid "Announce by mail" +msgstr "per Mail ankündigen" + msgid "Selection" msgstr "Auswahl" @@ -1154,6 +1160,9 @@ msgstr "Eintrag editieren" msgid "Switch" msgstr "Nur umschalten" +msgid "Announce only" +msgstr "Nur ankündigen" + msgid "Announce ... minutes before start" msgstr "Ankündigen ... Minuten vor Start" diff --git a/po/el_GR.po b/po/el_GR.po index 9c65f1b..cd994b7 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -537,6 +537,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -901,7 +904,7 @@ msgstr "" msgid "Record" msgstr "ÅããñáöÞ" -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -910,6 +913,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1110,6 +1116,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 8b91643..d19f881 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-11-18 20:09+0200\n" "Last-Translator: bittor from open7x0.org <bittor7x0 _at_ gmail.com>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -573,6 +573,9 @@ msgstr "No se modificaron programaciones." msgid "No timers were deleted." msgstr "No se borraron programaciones." +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "¡Esta versión de EPGSearch no soporta este servicio!" @@ -937,7 +940,8 @@ msgstr "Editar búsqueda" msgid "Record" msgstr "Grabar" -msgid "Announce only" +#, fuzzy +msgid "Announce by OSD" msgstr "Sólo avisar" msgid "Switch only" @@ -946,6 +950,10 @@ msgstr "Cambiar de canal" msgid "Announce and switch" msgstr "Avisar y cambiar" +#, fuzzy +msgid "Announce by mail" +msgstr "Sólo avisar" + msgid "Selection" msgstr "selección" @@ -1154,6 +1162,9 @@ msgstr "Editar entrada" msgid "Switch" msgstr "Cambiar" +msgid "Announce only" +msgstr "Sólo avisar" + msgid "Announce ... minutes before start" msgstr "Avisar ... minutos antes del inicio" @@ -1212,5 +1223,3 @@ msgstr "en %02ldh" #, c-format msgid "in %02ldm" msgstr "en %02ldm" - - diff --git a/po/et_EE.po b/po/et_EE.po index 42781ea..3712379 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -537,6 +537,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -901,7 +904,7 @@ msgstr "" msgid "Record" msgstr "Salvesta" -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -910,6 +913,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1110,6 +1116,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index 4c7e21e..ee8c08e 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2009-07-19 23:22+0200\n" "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -577,6 +577,9 @@ msgstr "Yhtään ajastinta ei muokattu." msgid "No timers were deleted." msgstr "Yhtään ajastinta ei poistettu." +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "EPGSearch-laajennos ei tarjoa vaadittavaa palvelua!" @@ -941,7 +944,8 @@ msgstr "Muokkaa hakua" msgid "Record" msgstr "Tallenna" -msgid "Announce only" +#, fuzzy +msgid "Announce by OSD" msgstr "muistutus" msgid "Switch only" @@ -950,6 +954,10 @@ msgstr "kanavanvaihto" msgid "Announce and switch" msgstr "muistutus ja kanavanvaihto" +#, fuzzy +msgid "Announce by mail" +msgstr "muistutus" + msgid "Selection" msgstr "valittu" @@ -1158,6 +1166,9 @@ msgstr "Muokkaa valintaa" msgid "Switch" msgstr "kanavanvaihto" +msgid "Announce only" +msgstr "muistutus" + msgid "Announce ... minutes before start" msgstr "Muistuta ... minuuttia ennen alkua" @@ -1216,4 +1227,3 @@ msgstr "%02ldh" #, c-format msgid "in %02ldm" msgstr "%02ldm" - diff --git a/po/fr_FR.po b/po/fr_FR.po index 35b65d1..85578c6 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2008-04-30 08:36+0200\n" "Last-Translator: Patrice Staudt <patrice.staudt@laposte.net>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -573,6 +573,9 @@ msgstr "La programmation n'a pas été changée." msgid "No timers were deleted." msgstr "Aucune programmation n'a été effacée." +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "Cette version de EPGSearch ne supporte pas ce service!" @@ -937,7 +940,8 @@ msgstr "Edition recherche" msgid "Record" msgstr "Enregistre" -msgid "Announce only" +#, fuzzy +msgid "Announce by OSD" msgstr "Annoncer seulement début d'une programme" msgid "Switch only" @@ -947,6 +951,10 @@ msgstr "Seulement changer de chaine" msgid "Announce and switch" msgstr "Annoncer seulement début d'une programme" +#, fuzzy +msgid "Announce by mail" +msgstr "Annoncer seulement début d'une programme" + msgid "Selection" msgstr "Selection" @@ -1149,6 +1157,9 @@ msgstr "Editer l'entrée" msgid "Switch" msgstr "Seulement changer de chaine" +msgid "Announce only" +msgstr "Annoncer seulement début d'une programme" + #, fuzzy msgid "Announce ... minutes before start" msgstr "Changer ... minutes avant le début" @@ -1208,4 +1219,3 @@ msgstr "en %02ldh" #, c-format msgid "in %02ldm" msgstr "en %02ldm" - diff --git a/po/hr_HR.po b/po/hr_HR.po index e5be7b0..75de88a 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -538,6 +538,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -902,7 +905,7 @@ msgstr "" msgid "Record" msgstr "Snimi" -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -911,6 +914,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1111,6 +1117,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index 0ee4077..814c300 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -537,6 +537,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -901,7 +904,7 @@ msgstr "" msgid "Record" msgstr "Felvenni" -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -910,6 +913,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1110,6 +1116,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index 686e635..5f2db3e 100755 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-07-17 13:15+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2009-07-15 23:30+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -579,6 +579,9 @@ msgstr "Nessun timer modificato." msgid "No timers were deleted." msgstr "Nessun timer eliminato." +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "Questa versione di EPGSearch non supporta questo servizio!" @@ -943,7 +946,8 @@ msgstr "Modifica ricerca" msgid "Record" msgstr "Registra" -msgid "Announce only" +#, fuzzy +msgid "Announce by OSD" msgstr "Solo annuncio" msgid "Switch only" @@ -953,6 +957,10 @@ msgstr "Cambia soltanto" msgid "Announce and switch" msgstr "Solo annuncio" +#, fuzzy +msgid "Announce by mail" +msgstr "Solo annuncio" + msgid "Selection" msgstr "Selezione" @@ -1163,6 +1171,9 @@ msgstr "Modifica valore" msgid "Switch" msgstr "Cambia soltanto" +msgid "Announce only" +msgstr "Solo annuncio" + #, fuzzy msgid "Announce ... minutes before start" msgstr "Cambia ... minuti prima dell'avvio" diff --git a/po/nl_NL.po b/po/nl_NL.po index 68205f8..6156cc4 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -571,6 +571,9 @@ msgstr "Er zijn geen timers aangepast" msgid "No timers were deleted." msgstr "Er zijn geen timers gewist" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "Deze versie van EPGSearch ondersteunt deze mogelijkheid niet!" @@ -935,7 +938,8 @@ msgstr "Bewerk zoekcriteria" msgid "Record" msgstr "Opnemen" -msgid "Announce only" +#, fuzzy +msgid "Announce by OSD" msgstr "Alleen aankondigen (geen timer)" msgid "Switch only" @@ -945,6 +949,10 @@ msgstr "Alleen schakelen" msgid "Announce and switch" msgstr "Alleen aankondigen (geen timer)" +#, fuzzy +msgid "Announce by mail" +msgstr "Alleen aankondigen (geen timer)" + msgid "Selection" msgstr "Selectie" @@ -1153,6 +1161,9 @@ msgstr "Wijzig invoer" msgid "Switch" msgstr "Alleen schakelen" +msgid "Announce only" +msgstr "Alleen aankondigen (geen timer)" + #, fuzzy msgid "Announce ... minutes before start" msgstr "Schakel ... minuten voor start" @@ -1212,4 +1223,3 @@ msgstr "in %02ldh" #, c-format msgid "in %02ldm" msgstr "in %02ldm" - diff --git a/po/nn_NO.po b/po/nn_NO.po index 08cd814..1c749a5 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Truls Slevigen <truls@slevigen.no>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -537,6 +537,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -901,7 +904,7 @@ msgstr "" msgid "Record" msgstr "Ta opp" -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -910,6 +913,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1110,6 +1116,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index e027851..c481132 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Michael Rakowski <mrak@gmx.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -537,6 +537,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -901,7 +904,7 @@ msgstr "" msgid "Record" msgstr "Nagraj" -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -910,6 +913,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1110,6 +1116,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/po/pt_PT.po b/po/pt_PT.po index 0419ceb..c8c4036 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -536,6 +536,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -900,7 +903,7 @@ msgstr "" msgid "Record" msgstr "Gravar" -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -909,6 +912,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1109,6 +1115,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/po/ro_RO.po b/po/ro_RO.po index 0544ff5..15a4480 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -537,6 +537,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -901,7 +904,7 @@ msgstr "" msgid "Record" msgstr "Înregistr." -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -910,6 +913,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1110,6 +1116,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 576106a..d4d75cd 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -536,6 +536,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -900,7 +903,7 @@ msgstr "" msgid "Record" msgstr "·ÐßØáì" -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -909,6 +912,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1109,6 +1115,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/po/sl_SI.po b/po/sl_SI.po index 0a117c5..5d5befb 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -537,6 +537,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -901,7 +904,7 @@ msgstr "" msgid "Record" msgstr "Posnemi" -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -910,6 +913,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1110,6 +1116,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index 154751d..ce0f3ab 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Tomas Prybil <tomas@prybil.se>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -537,6 +537,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -901,7 +904,7 @@ msgstr "" msgid "Record" msgstr "Inspelning" -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -910,6 +913,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1110,6 +1116,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/po/tr_TR.po b/po/tr_TR.po index 7f53eca..af9d38e 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" -"POT-Creation-Date: 2009-04-09 19:51+0200\n" +"POT-Creation-Date: 2009-09-20 09:51+0200\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -536,6 +536,9 @@ msgstr "" msgid "No timers were deleted." msgstr "" +msgid "No new events to announce." +msgstr "" + msgid "This version of EPGSearch does not support this service!" msgstr "" @@ -900,7 +903,7 @@ msgstr "" msgid "Record" msgstr "" -msgid "Announce only" +msgid "Announce by OSD" msgstr "" msgid "Switch only" @@ -909,6 +912,9 @@ msgstr "" msgid "Announce and switch" msgstr "" +msgid "Announce by mail" +msgstr "" + msgid "Selection" msgstr "" @@ -1109,6 +1115,9 @@ msgstr "" msgid "Switch" msgstr "" +msgid "Announce only" +msgstr "" + msgid "Announce ... minutes before start" msgstr "" diff --git a/searchtimer_thread.c b/searchtimer_thread.c index 2dbc7df..46a2e35 100644 --- a/searchtimer_thread.c +++ b/searchtimer_thread.c @@ -403,7 +403,7 @@ void cSearchTimerThread::Action(void) } } - if (searchExt->action == searchTimerActionAnnounceOnly) + if (searchExt->action == searchTimerActionAnnounceViaOSD) { if (t || // timer already exists or NoAnnounces.InList(pEvent) || // announcement not wanted anymore or @@ -424,7 +424,24 @@ void cSearchTimerThread::Action(void) continue; } - if (searchExt->action == searchTimerActionSwitchOnly || searchExt->action == searchTimerActionAnnounceAndSwitch) // add to switch list + if (searchExt->action == searchTimerActionAnnounceViaMail) + { + if (t || // timer already exists or + NoAnnounces.InList(pEvent) || + pEvent->StartTime() < time(NULL)) // already started? + { + if (Summary) free(Summary); + delete timer; + continue; + } + mailNotifier.AddAnnounceEventNotification(pEvent->EventID(), pEvent->ChannelID(), searchExt->ID); + + if (Summary) free(Summary); + delete timer; + continue; + } + if (searchExt->action == searchTimerActionSwitchOnly || + searchExt->action == searchTimerActionAnnounceAndSwitch) // add to switch list { time_t now = time(NULL); if (now < pEvent->StartTime()) |