diff options
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | HISTORY.DE | 7 | ||||
| -rw-r--r-- | doc-src/de/epgsearch.1.txt | 9 | ||||
| -rw-r--r-- | doc-src/en/epgsearch.1.txt | 7 | ||||
| -rw-r--r-- | doc-src/en/epgsearch.conf.5.txt | 5 | ||||
| -rw-r--r-- | epgsearch.c | 2 | ||||
| -rw-r--r-- | epgsearchtools.c | 4 | ||||
| -rw-r--r-- | epgsearchtools.h | 2 | ||||
| -rw-r--r-- | menu_searchedit.c | 8 | ||||
| -rw-r--r-- | menu_searchedit.h | 1 | ||||
| -rw-r--r-- | po/ca_ES.po | 5 | ||||
| -rw-r--r-- | po/cs_CZ.po | 5 | ||||
| -rw-r--r-- | po/da_DK.po | 5 | ||||
| -rw-r--r-- | po/de_DE.po | 7 | ||||
| -rw-r--r-- | po/el_GR.po | 5 | ||||
| -rw-r--r-- | po/es_ES.po | 5 | ||||
| -rw-r--r-- | po/et_EE.po | 5 | ||||
| -rw-r--r-- | po/fi_FI.po | 5 | ||||
| -rw-r--r-- | po/fr_FR.po | 5 | ||||
| -rw-r--r-- | po/hr_HR.po | 5 | ||||
| -rw-r--r-- | po/hu_HU.po | 5 | ||||
| -rw-r--r-- | po/it_IT.po | 5 | ||||
| -rw-r--r-- | po/nl_NL.po | 5 | ||||
| -rw-r--r-- | po/nn_NO.po | 5 | ||||
| -rw-r--r-- | po/pl_PL.po | 5 | ||||
| -rw-r--r-- | po/pt_PT.po | 5 | ||||
| -rw-r--r-- | po/ro_RO.po | 5 | ||||
| -rw-r--r-- | po/ru_RU.po | 5 | ||||
| -rw-r--r-- | po/sl_SI.po | 5 | ||||
| -rw-r--r-- | po/sv_SE.po | 5 | ||||
| -rw-r--r-- | po/tr_TR.po | 5 | ||||
| -rw-r--r-- | recdone.c | 4 | ||||
| -rw-r--r-- | recdone.h | 2 |
33 files changed, 127 insertions, 36 deletions
@@ -19,6 +19,11 @@ new: miss one only because of a buggy EPG. - searchtimers: if a timers filename results in an empty string or contains "!^invalid^!" it will be skipped for programming now. +- Avoid repeats: 'Compare subtitle' has now a third value 'if present' besides 'no' + and 'yes'. With this setting epgsearch will classify two events only as equal if + their episode names match and are not empty. Caution: if your EPG data has no episode + names for different episodes don't use this option! 'yes' will then be the better + choice even if this results in double recordings. fixes: - fixed a crash when pressing 'Ok' in an empty timers done menu - fixed a crash when using the progressbar and events with 0 duration exist, thanks @@ -20,6 +20,13 @@ neu: wird verhindert, dass man eine Folge nur wegen eines fehlerhaften EPGs verpasst. - Suchtimer: Falls der Datei-Eintrag eines Timers leer ist oder "!^invalid^!" enthält, wird er für die Programmierung übersprungen. +- Wiederholung vermeiden: 'Vergleiche Untertitel' hat nun eine dritte Variante 'falls + vorhanden' neben 'nein' und 'ja'. Damit stuft epgsearch zwei Sendungen nur dann als + identisch ein, wenn die Episodennamen gleich sind und nicht leer. Vorsicht: Wenn die + EPG-Daten keine Untertitel für unterschiedliche Folgen enthalten, sollte diese Option + nicht verwendet werden. 'ja' ist in diesem Fall besser, selbst wenn dadurch doppelt + aufgezeichnet werden kann. + fixes: - Absturz beim Drücken von 'Ok' in leerem Menü erledigter Timer behoben - Absturz bei Verwendung des Fortschrittsbalkens in Verbindung mit Sendungen diff --git a/doc-src/de/epgsearch.1.txt b/doc-src/de/epgsearch.1.txt index 172a0b7..f7bac61 100644 --- a/doc-src/de/epgsearch.1.txt +++ b/doc-src/de/epgsearch.1.txt @@ -336,9 +336,12 @@ Titel verglichen werden soll. =item - B<Vergleiche Untertitel> Einstellung, ob beim Test, ob eine Sendung identisch ist, auch der -Untertitel verglichen werden soll. Hat eine Sendung keinen -Untertitel wird sie als abweichend gewertet und ist damit nicht -gleich einer anderen Sendung mit oder ohne Untertitel. +Untertitel verglichen werden soll. Neben 'nein' und 'ja' existiert noch +'falls vorhanden'. Damit stuft epgsearch zwei Sendungen nur dann als +identisch ein, wenn die Episodennamen gleich sind und nicht leer. Vorsicht: Wenn die +EPG-Daten keine Untertitel für unterschiedliche Folgen enthalten, sollte diese Option +nicht verwendet werden. 'ja' ist in diesem Fall besser, selbst wenn dadurch doppelt +aufgezeichnet werden kann. =item - B<Vergleiche Beschreibung> diff --git a/doc-src/en/epgsearch.1.txt b/doc-src/en/epgsearch.1.txt index 6278d4b..6d60076 100644 --- a/doc-src/en/epgsearch.1.txt +++ b/doc-src/en/epgsearch.1.txt @@ -331,8 +331,11 @@ compared. =item - B<Compare subtitle:> When comparing to events then specify here if the subtitle should be -compared. If there is no subtitle than this event is always -different to an event with/without a subtitle. +compared. Besides 'no' and 'yes' there is also the option 'if present'. +With this setting epgsearch will classify two events only as equal if +their episode names match and are not empty. Caution: if your EPG data has no episode +names for different episodes don't use this option! 'yes' will then be the better +choice even if this results in double recordings. =item - B<Compare description:> diff --git a/doc-src/en/epgsearch.conf.5.txt b/doc-src/en/epgsearch.conf.5.txt index cf1ca4f..09e34d3 100644 --- a/doc-src/en/epgsearch.conf.5.txt +++ b/doc-src/en/epgsearch.conf.5.txt @@ -63,7 +63,10 @@ is B<':'>: 29 - avoid repeats? 0/1 30 - allowed repeats 31 - compare title when testing for a repeat? 0/1 - 32 - compare subtitle when testing for a repeat? 0/1 + 32 - compare subtitle when testing for a repeat? 0/1/2 + 0 - no + 1 - yes + 2 - yes, if present 33 - compare description when testing for a repeat? 0/1 34 - compare extended EPG info when testing for a repeat? This entry is a bit field of the category IDs. diff --git a/epgsearch.c b/epgsearch.c index 0721523..e83578a 100644 --- a/epgsearch.c +++ b/epgsearch.c @@ -69,7 +69,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch #include <langinfo.h> #endif -static const char VERSION[] = "0.9.25.beta6"; +static const char VERSION[] = "0.9.25.beta7"; static const char DESCRIPTION[] = trNOOP("search the EPG for repeats and more"); // globals diff --git a/epgsearchtools.c b/epgsearchtools.c index 8ae1493..b03c765 100644 --- a/epgsearchtools.c +++ b/epgsearchtools.c @@ -800,7 +800,7 @@ void PrepareTimerFile(const cEvent* event, cTimer* timer) } } -bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle, bool compareSubtitle, bool compareSummary, unsigned long catvaluesAvoidRepeat) +bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle, int compareSubtitle, bool compareSummary, unsigned long catvaluesAvoidRepeat) { if (!event1 || !event2) return false; if (event1 == event2) return true; @@ -831,7 +831,7 @@ bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle, bool match = false; if ((!compareTitle || Title1 == Title2) && - (!compareSubtitle || (Subtitle1 == Subtitle2 && Subtitle1!=""))) + (!compareSubtitle || (Subtitle1 == Subtitle2 && (compareSubtitle==1 || Subtitle1!="")))) { const char* Descr1 = event1->Description(); const char* Descr2 = event2->Description(); diff --git a/epgsearchtools.h b/epgsearchtools.h index b6ced33..6f9d3ad 100644 --- a/epgsearchtools.h +++ b/epgsearchtools.h @@ -152,7 +152,7 @@ char* GetRawDescription(const char* descr); void PrepareTimerFile(const cEvent* event, cTimer* timer); int CompareEventTime(const void *p1, const void *p2); int CompareEventChannel(const void *p1, const void *p2); -bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle, bool compareSubtitle, bool compareSummary, unsigned long catvaluesAvoidRepeat); +bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle, int compareSubtitle, bool compareSummary, unsigned long catvaluesAvoidRepeat); int ChannelNrFromEvent(const cEvent* pEvent); void DelTimer(int index); char* FixSeparators(char* buffer, char sep); diff --git a/menu_searchedit.c b/menu_searchedit.c index 78d5385..e66429b 100644 --- a/menu_searchedit.c +++ b/menu_searchedit.c @@ -87,6 +87,10 @@ cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Tem SearchActiveModes[1] = strdup(trVDR("yes")); SearchActiveModes[2] = strdup(tr("user-defined")); + CompareSubtitleModes[0] = strdup(trVDR("no")); + CompareSubtitleModes[1] = strdup(trVDR("yes")); + CompareSubtitleModes[2] = strdup(tr("if present")); + if (!templateMode && New) { cSearchExt* SearchTempl = NULL; // copy the default settings, if we have a default template @@ -321,7 +325,7 @@ void cMenuEditSearchExt::Set() if (data.allowedRepeats > 0) Add(new cMenuEditIntItem(IndentMenuItem(IndentMenuItem(tr("Only repeats within ... days"))), &data.repeatsWithinDays, 0, 999)); Add(new cMenuEditBoolItem(IndentMenuItem(IndentMenuItem(tr("Compare title"))), &data.compareTitle, trVDR("no"), trVDR("yes"))); - Add(new cMenuEditBoolItem(IndentMenuItem(IndentMenuItem(tr("Compare subtitle"))), &data.compareSubtitle, trVDR("no"), trVDR("yes"))); + Add(new cMenuEditStraItem(IndentMenuItem(IndentMenuItem(tr("Compare subtitle"))), &data.compareSubtitle, 3, CompareSubtitleModes)); Add(new cMenuEditBoolItem(IndentMenuItem(IndentMenuItem(tr("Compare summary"))), &data.compareSummary, trVDR("no"), trVDR("yes"))); // show 'Compare categories' only if we have them if (SearchExtCats.Count() > 0) @@ -388,6 +392,8 @@ cMenuEditSearchExt::~cMenuEditSearchExt() free(DelModes[i]); for(i=0; i<=2; i++) free(SearchActiveModes[i]); + for(i=0; i<=2; i++) + free(CompareSubtitleModes[i]); } eOSState cMenuEditSearchExt::Help() diff --git a/menu_searchedit.h b/menu_searchedit.h index fdf2784..34505a1 100644 --- a/menu_searchedit.h +++ b/menu_searchedit.h @@ -52,6 +52,7 @@ protected: char *BlacklistModes[3]; char *DelModes[3]; char *SearchActiveModes[3]; + char *CompareSubtitleModes[3]; bool templateMode; std::vector<const char*> helpTexts; diff --git a/po/ca_ES.po b/po/ca_ES.po index 0ee99bc..c104491 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -924,6 +924,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 96e8162..35c6bf4 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -922,6 +922,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" diff --git a/po/da_DK.po b/po/da_DK.po index bd2fc8a..bcbdb2b 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -922,6 +922,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index c761e31..560306d 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -958,6 +958,9 @@ msgstr "Anzahl Aufnahmen" msgid "count days" msgstr "Anzahl Tage" +msgid "if present" +msgstr "wenn vorhanden" + msgid "Template name" msgstr "Vorlagenname" @@ -1002,7 +1005,7 @@ msgid "Help$Set this to 'Yes' if you like to search in the summary of an event." msgstr "Auf 'Ja' setzen, wenn die Suche in der Zusammenfassung einer Sendung stattfinden soll." msgid "Help$The summary of an event, can contain additional information like 'Genre', 'Category', 'Year',... called 'EPG categories' within EPGSearch. External EPG providers often deliver this information. This allows refining a search and other nice things, like searching for the 'tip of the day'. To use it set this to 'Yes'." -msgstr "Die Zusammenfassung einer Sendung kann Zusatz-Informationen wie 'Genre', 'Kategorie', 'Jahr', ... enthalten, welche in EPGSearch 'EPG-Kategorien' genannt werden. Externe EPG-Anbieter liefern diese Infomationen häufig mit aus. Damit läßt sich eine Suche verfeinern und auch andere Dinge, wie die Suche nach dem Tagestipp, sind möglich. Zur Verwendung auf 'Ja' setzen." +msgstr "Die Zusammenfassung einer Sendung kann Zusatz-Informationen wie 'Genre', 'Kategorie', 'Jahr', ... enthalten, welche in EPGSearch 'EPG-Kategorien' genannt werden. Externe EPG-Anbieter liefern diese Informationen häufig mit aus. Damit läßt sich eine Suche verfeinern und auch andere Dinge, wie die Suche nach dem Tagestipp, sind möglich. Zur Verwendung auf 'Ja' setzen." msgid "Help$The file epgsearchcats.conf specifies the search mode for this entry. One can search by text or by value. You can also edit a list of predefined values in this file that can be selected here." msgstr "In der Datei epgsearchcats.conf kann der Suchmodus für diesen Eintrag festgelegt werden. Man kann textuell oder numerisch suchen. Ausserdem kann in dieser Datei eine Liste vordefinierter Werte angegeben werden, die hier zur Auswahl stehen." diff --git a/po/el_GR.po b/po/el_GR.po index 8cb9a2a..17ab922 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -922,6 +922,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index bf6e2fe..f782d1d 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -958,6 +958,9 @@ msgstr "incluir grabaciones" msgid "count days" msgstr "incluir días" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "Nombre de la plantilla" diff --git a/po/et_EE.po b/po/et_EE.po index c8a49b3..3f7bf6f 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -922,6 +922,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index 1d2ec8c..9b35a1c 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -962,6 +962,9 @@ msgstr "lukumäärän mukaan" msgid "count days" msgstr "päivien mukaan" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "Mallipohjan nimi" diff --git a/po/fr_FR.po b/po/fr_FR.po index e51307b..ec8cc2c 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -957,6 +957,9 @@ msgstr "compter enregistrements" msgid "count days" msgstr "compter jours" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "Nom du modèle" diff --git a/po/hr_HR.po b/po/hr_HR.po index 05d7796..5b09118 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -923,6 +923,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index cd7109e..7cbe07d 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -922,6 +922,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index 09f0733..28a2f37 100644 --- 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\n" "PO-Revision-Date: 2008-06-29 03:25+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -960,6 +960,9 @@ msgstr "conteggia registrazioni" msgid "count days" msgstr "conteggia giorni" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "Nome modello" diff --git a/po/nl_NL.po b/po/nl_NL.po index 39db6fa..186e5bb 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -955,6 +955,9 @@ msgstr "tel opnames" msgid "count days" msgstr "tel dagen" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "Naam van sjabloon" diff --git a/po/nn_NO.po b/po/nn_NO.po index 32a8294..6b6255f 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -922,6 +922,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index 3dc7d5f..eec0a9e 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -921,6 +921,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" diff --git a/po/pt_PT.po b/po/pt_PT.po index cfd9d09..6c56f08 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -921,6 +921,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" diff --git a/po/ro_RO.po b/po/ro_RO.po index 1ccf8c1..f3ded08 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -922,6 +922,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 9787e5d..201679d 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -921,6 +921,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" diff --git a/po/sl_SI.po b/po/sl_SI.po index dd578b3..dee8031 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -922,6 +922,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index 59502ee..1469022 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -922,6 +922,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" diff --git a/po/tr_TR.po b/po/tr_TR.po index feee2ac..bd43010 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: 2008-09-20 14:00+0200\n" +"POT-Creation-Date: 2008-12-03 18:23+0100\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" @@ -921,6 +921,9 @@ msgstr "" msgid "count days" msgstr "" +msgid "if present" +msgstr "" + msgid "Template name" msgstr "" @@ -232,7 +232,7 @@ int cRecsDone::GetCountRecordings(const cEvent* event, cSearchExt* search, cRecD return GetCountRecordings(event, search->compareTitle, search->compareSubtitle, search->compareSummary, search->catvaluesAvoidRepeat, first); } -int cRecsDone::GetCountRecordings(const cEvent* event, bool compareTitle, bool compareSubtitle, bool compareSummary, unsigned long catvaluesAvoidRepeat, cRecDone** first) +int cRecsDone::GetCountRecordings(const cEvent* event, bool compareTitle, int compareSubtitle, bool compareSummary, unsigned long catvaluesAvoidRepeat, cRecDone** first) { if (first) *first = NULL; @@ -295,7 +295,7 @@ int cRecsDone::GetCountRecordings(const cEvent* event, bool compareTitle, bool c } if ((!compareTitle || rTitle == eTitle) && - (!compareSubtitle || (rSubtitle == eSubtitle && rSubtitle !="")) && + (!compareSubtitle || (rSubtitle == eSubtitle && (compareSubtitle==1 || rSubtitle !=""))) && (!compareSummary || DescriptionMatches(eRawDescr.c_str(), rRawDescr.c_str()))) { if (catvaluesAvoidRepeat != 0) // check categories @@ -69,7 +69,7 @@ class cRecsDone : public cList<cRecDone>, public cMutex { } cRecsDone(void) {} int GetCountRecordings(const cEvent* event, cSearchExt* search, cRecDone** first = NULL); - int GetCountRecordings(const cEvent*, bool compareTitle, bool compareSubtitle, bool compareSummary, unsigned long, cRecDone** first = NULL); + int GetCountRecordings(const cEvent*, bool compareTitle, int compareSubtitle, bool compareSummary, unsigned long, cRecDone** first = NULL); int GetTotalCountRecordings(cSearchExt* search, cRecDone** first); void RemoveSearchID(int ID); bool Load(const char *FileName = NULL); |