turned 'compare expression' in 'compare date' for easier handling in OSD

36 files changed, 350 insertions, 93 deletions

diff --git a/HISTORY b/HISTORY
index 9f262b0..f350113 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3,9 +3,8 @@ VDR Plugin 'epgsearch' Revision History
 
 2010-xx-xx; Version 0.9.25
 new:
-- avoid repeats with new 'compare expression' entry: compare two events by an arbitrary
-  expression. E.g: the epxression '%year%-%month%' will avoid all repeats within one month,
-  '%week%' will avoid the repeats within the week,...
+- avoid repeats with new 'compare date' entry: compare two events by their date to ignore 
+  repeats within the same day, week or month
 - global blacklists: blacklists for search timers can now be global to exclude 
   generally unwanted events (like on my double SD/HD channels). Default mode for search 
   timers is now 'only global', but can be  set to 'none' to ignore also global blacklists.
diff --git a/HISTORY.DE b/HISTORY.DE
index 96f3ecb..041ea19 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -3,9 +3,9 @@ VDR Plugin 'epgsearch' Revision History
 
 2010-xx-xx; Version 0.9.25
 neu:
-- Vermeide Wiederholungen mit dem neuen 'Vergleiche Ausdruck'-Eintrag: dabei werden 
-  2 Sendungen anhand eines beliebigen Ausdruck verglichen. Z.B. '%year%-%month%' vermeidet
-  Wiederholungen innerhalb eines Monats, '%week%' innerhalb einer Wochen,...
+- Vermeide Wiederholungen mit 'Vergleiche Zeitpunkt': dabei werden 
+  2 Sendungen anhand des Zeitpunkts der Ausstrahlung verglichen, um z.B. Wiederholungen 
+  innerhalb des gleichen Tages, der Woche oder des Monats zu ignorieren.
 - Globale Ausschlusslisten: Ausschlusslisten für Suchtimer können nun als global markiert 
   werden, um unerwünschte Sendungen generell auszuschliessen (wie z.B auf doppelten SD/HD-
   Kanälen). Vorbelegung für Suchtimer ist nun "nur globale", kann aber auch auf "keine" 
diff --git a/doc-src/de/epgsearch.1.txt b/doc-src/de/epgsearch.1.txt
index 8d35196..95f9bd8 100644
--- a/doc-src/de/epgsearch.1.txt
+++ b/doc-src/de/epgsearch.1.txt
@@ -362,14 +362,12 @@ wird er als gleich behandelt.
 
 Die notwendige �bereinstimmung zweier Beschreibung in %.
 
-=item - B<Vergl. Ausdruck>
+=item - B<Vergl. Zeitpunkt>
 
-Manchmal wird eine Sendung h�ufig innerhalb einer gewissen Zeitspanne (Woche, Monat,...)
+Manchmal wird eine Sendung h�ufig innerhalb einer gewissen Zeitspanne (Tag, Woche, Monat,...)
 wiederholt, die einzelnen Sendungen lassen sich aber anhand des EPG Inhalts nicht unterscheiden.
-Somit ist der Zeitpunkt also die einzige Information. Um damit zu vergelichen, kann man diesen
-Eintrag mit den entsprechenden Variablen f�llen. Z.B. Mit dem Ausdruck
-'%year%-%month%' werden die Wiederholungen innerhalb eines Monats dieses Jahres vermieden,
-'%year%-%week%' vermeidet die Wiederholungen innerhalb einer Woche des Jahres,...
+Somit ist der Zeitpunkt also die einzige Information. Um damit zu vergelichen, kann man hier
+die entsprechende Zeitspanne ausw�hlen, um die Wiederholungen zu ignorieren.
 
 =item - B<Vergl. Kategorien>
 
diff --git a/doc-src/en/epgsearch.1.txt b/doc-src/en/epgsearch.1.txt
index b6f5d38..4f601ed 100644
--- a/doc-src/en/epgsearch.1.txt
+++ b/doc-src/en/epgsearch.1.txt
@@ -358,14 +358,11 @@ compared. If this is similar at the value of the next option
 
 The needed minimum match of descriptions in percent. 
 
-=item - B<Compare expression:>
+=item - B<Compare date:>
 
-Sometimes an event is repeated many times within some period (week, month,...), but one 
+Sometimes an event is repeated many times within some period (day, week, month,...), but one 
 cannot distinguish the repeats based on the EPG contents. So the only information is its time. 
-To use this for comparison you can fill this entry with the corresponding variables. 
-E.g: the epxression 
-'%year%-%month%' will avoid all repeats within one month of the year,
-'%year%-%week%' will avoid the repeats within the week of the year,...
+To use this for comparison select the appropriate period.
 
 =item - B<Compare categories:>
 
diff --git a/doc-src/en/epgsearch.conf.5.txt b/doc-src/en/epgsearch.conf.5.txt
index 6d88638..71dac43 100644
--- a/doc-src/en/epgsearch.conf.5.txt
+++ b/doc-src/en/epgsearch.conf.5.txt
@@ -93,7 +93,8 @@ is B<':'>:
  51 - unmute sound if off when used as switch timer
  52 - percentage of match when comparing the summary of two events (with 'avoid repeats')
  53 - HEX representation of the content descriptors, each descriptor ID is represented with 2 chars
-
+ 54 - compare date when testing for a repeat? (0=no, 1=same day, 2=same week, 3=same month)
+ 
 A ':' in the search term or the directory entry will be translated in a
 '|'. If a '|' exists in the search term, e.g. when using regular
 expressions, it will be translated to "!^pipe^!" (I know it's ugly ;-))
diff --git a/epgsearchext.c b/epgsearchext.c
index a73a31b..08762c0 100644
--- a/epgsearchext.c
+++ b/epgsearchext.c
@@ -96,6 +96,7 @@ cSearchExt::cSearchExt(void)
    compareSubtitle = 1;
    compareSummary = 1;
    compareSummaryMatchInPercent = 90;
+   compareDate = 0;
    allowedRepeats = 0;
    catvaluesAvoidRepeat = 0;
    repeatsWithinDays = 0;
@@ -116,7 +117,6 @@ cSearchExt::cSearchExt(void)
    ignoreMissingEPGCats = 0;
    unmuteSoundOnSwitch = 0;
    skipRunningEvents = false;
-   *compareExpression = 0;
 }
 
 cSearchExt::~cSearchExt(void)
@@ -219,7 +219,7 @@ cSearchExt& cSearchExt::operator= (const cSearchExt &SearchExt)
    compareSubtitle = templ->compareSubtitle;
    compareSummary = templ->compareSummary;
    compareSummaryMatchInPercent = templ->compareSummaryMatchInPercent;
-   strcpy(compareExpression, templ->compareExpression);
+   compareDate = templ->compareDate;
    allowedRepeats = templ->allowedRepeats;
    catvaluesAvoidRepeat = templ->catvaluesAvoidRepeat;
    repeatsWithinDays = templ->repeatsWithinDays;
@@ -274,7 +274,6 @@ const char *cSearchExt::ToText()
    char* tmp_search = replaceSpecialChars(search);
    char* tmp_directory = replaceSpecialChars(directory);
    char* tmp_contentsFilter = replaceSpecialChars(contentsFilter.c_str());
-   char* tmp_compareExpression = replaceSpecialChars(compareExpression);
 
    if (useTime)
    {
@@ -352,7 +351,7 @@ const char *cSearchExt::ToText()
       }      
    }
 
-   msprintf(&buffer, "%d:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d:%d:%d:%s:%s:%d:%d:%d:%d:%s:%d:%d:%d:%d:%d:%d:%d:%s:%d:%d:%d:%d:%d:%ld:%d:%d:%d:%d:%d:%d:%s:%d:%d:%d:%d:%d:%d:%ld:%ld:%d:%d:%d:%s:%s",
+   msprintf(&buffer, "%d:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d:%d:%d:%s:%s:%d:%d:%d:%d:%s:%d:%d:%d:%d:%d:%d:%d:%s:%d:%d:%d:%d:%d:%ld:%d:%d:%d:%d:%d:%d:%s:%d:%d:%d:%d:%d:%d:%ld:%ld:%d:%d:%d:%s:%d",
             ID,
             tmp_search,
             useTime,
@@ -406,14 +405,13 @@ const char *cSearchExt::ToText()
 	    unmuteSoundOnSwitch,
 	    compareSummaryMatchInPercent,
 	    contentsFilter.c_str(),
-	    compareExpression);
+	    compareDate);
 
    if (tmp_search) free(tmp_search);
    if (tmp_directory) free(tmp_directory);
    if (tmp_catvalues) free(tmp_catvalues);
    if (tmp_blacklists) free(tmp_blacklists);
    if (tmp_contentsFilter) free(tmp_contentsFilter);
-   if (tmp_compareExpression) free(tmp_compareExpression);
 
    return buffer;
 }
@@ -620,7 +618,7 @@ bool cSearchExt::Parse(const char *s)
 	      contentsFilter = value;
 	      break;
 	    case 54:
-	      strcpy(compareExpression, value);
+	      compareDate = atoi(value);
 	      break;
 	    default:
 	      break;
@@ -634,15 +632,12 @@ bool cSearchExt::Parse(const char *s)
    strreplace(directory, '|', ':');
    strreplace(search, '|', ':');
    strreplace(contentsFilter, "|", ":");
-   strreplace(compareExpression, '|', ':');
 
    while(strstr(search, "!^pipe^!"))
       strreplace(search, "!^pipe^!", "|");
    while(strstr(directory, "!^pipe^!"))
       strreplace(directory, "!^pipe^!", "|");
    strreplace(contentsFilter, "!^pipe^!", "|");
-   while(strstr(compareExpression, "!^pipe^!"))
-      strreplace(compareExpression, "!^pipe^!", "|");
 
    if (disableSearchtimer && useAsSearchTimer)
    {
@@ -1205,7 +1200,7 @@ void cSearchExt::CheckRepeatTimers(cSearchResults* pResults)
          
          if (!pResultObjP->needsTimer) continue;
          
-         if (EventsMatch(pEvent, pEventP, compareTitle, compareSubtitle, compareSummary, compareExpression, catvaluesAvoidRepeat))
+         if (EventsMatch(pEvent, pEventP, compareTitle, compareSubtitle, compareSummary, compareDate, catvaluesAvoidRepeat))
          {
             if (!pFirstResultMatching) pFirstResultMatching = pResultObjP;
             plannedTimers++;
diff --git a/epgsearchext.h b/epgsearchext.h
index 9a61f5b..489deed 100644
--- a/epgsearchext.h
+++ b/epgsearchext.h
@@ -150,7 +150,7 @@ public:
   int      compareSubtitle;
   int      compareSummary;
   int      compareSummaryMatchInPercent;
-  char     compareExpression[MaxFileName];
+  int      compareDate;
   int      allowedRepeats;
   unsigned long catvaluesAvoidRepeat;
   int      repeatsWithinDays;
diff --git a/epgsearchtools.c b/epgsearchtools.c
index 7beaed6..b403656 100644
--- a/epgsearchtools.c
+++ b/epgsearchtools.c
@@ -806,7 +806,7 @@ void PrepareTimerFile(const cEvent* event, cTimer* timer)
    }
 }
 
-bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle, int compareSubtitle, bool compareSummary, const char* compareExpression, unsigned long catvaluesAvoidRepeat, int matchLimit)
+bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle, int compareSubtitle, bool compareSummary, int compareDate, unsigned long catvaluesAvoidRepeat, int matchLimit)
 {
    if (!event1 || !event2) return false;
    if (event1 == event2) return true;
@@ -834,6 +834,10 @@ bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle,
       std::transform(Subtitle1.begin(), Subtitle1.end(), Subtitle1.begin(), tolower);
       std::transform(Subtitle2.begin(), Subtitle2.end(), Subtitle2.begin(), tolower);
    }
+   string compareExpression = "";
+   if (compareDate == 1) compareExpression = "%date%";
+   if (compareDate == 2) compareExpression = "%year%-%week%";
+   if (compareDate == 3) compareExpression = "%year%-%month%";
 
    bool match = false;
    if ((!compareTitle || Title1 == Title2) &&
@@ -850,7 +854,7 @@ bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle,
          free(rawDescr2);
          if (!match) return false;
       }
-      if (compareExpression != NULL && strlen(compareExpression) > 0)
+      if (compareExpression.size() > 0)
       {
 	   cVarExpr varExpr(compareExpression); 
 	   string resEvent1 = varExpr.Evaluate(event1);
diff --git a/epgsearchtools.h b/epgsearchtools.h
index 6973995..9f3b48b 100644
--- a/epgsearchtools.h
+++ b/epgsearchtools.h
@@ -171,7 +171,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, int compareSubtitle, bool compareSummary, const char* compareExpression, unsigned long catvaluesAvoidRepeat, int matchLimit=90);
+bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle, int compareSubtitle, bool compareSummary, int compareDate, unsigned long catvaluesAvoidRepeat, int matchLimit=90);
 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 ebf4da9..57f40d3 100644
--- a/menu_searchedit.c
+++ b/menu_searchedit.c
@@ -94,6 +94,11 @@ cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Tem
    CompareSubtitleModes[0] = strdup(trVDR("no"));
    CompareSubtitleModes[1] = strdup(tr("if present"));
 
+   CompareDateModes[0] = strdup(trVDR("no"));
+   CompareDateModes[1] = strdup(tr("same day"));
+   CompareDateModes[2] = strdup(tr("same week"));
+   CompareDateModes[3] = strdup(tr("same month"));
+
 #if APIVERSNUM > 10710 
    // collect content string IDs
    std::set<std::string> contentStrings;
@@ -374,7 +379,7 @@ void cMenuEditSearchExt::Set()
 	   Add(new cMenuEditBoolItem(IndentMenuItem(tr("Compare summary"),2), &data.compareSummary, trVDR("no"), trVDR("yes")));
 	   if (data.compareSummary)
 	     Add(new cMenuEditIntItem(IndentMenuItem(tr("Min. match in %"),3), &data.compareSummaryMatchInPercent, 1, 100));
-	   Add(new cMenuEditStrItem(IndentMenuItem(tr("Compare expression")), data.compareExpression, sizeof(data.compareExpression), tr(AllowedChars)));
+	   Add(new cMenuEditStraItem(IndentMenuItem(tr("Compare date"),2), &data.compareDate, 4, CompareDateModes));
 	   // show 'Compare categories' only if we have them
 	   if (SearchExtCats.Count() > 0)
 	     {
@@ -444,6 +449,8 @@ cMenuEditSearchExt::~cMenuEditSearchExt()
       free(SearchActiveModes[i]);
    for(i=0; i<=1; i++)
       free(CompareSubtitleModes[i]);
+   for(i=0; i<=3; i++)
+      free(CompareDateModes[i]);
 }
 
 eOSState cMenuEditSearchExt::Help()
diff --git a/menu_searchedit.h b/menu_searchedit.h
index 3347a6d..43e6b8c 100644
--- a/menu_searchedit.h
+++ b/menu_searchedit.h
@@ -53,6 +53,7 @@ protected:
   char *DelModes[3];
   char *SearchActiveModes[3];
   char *CompareSubtitleModes[2];
+  char *CompareDateModes[4];
   std::vector<int> contentStringIDs;
   int useContentDescriptors;
   int *contentStringsFlags;
diff --git a/po/ca_ES.po b/po/ca_ES.po
index fc221ce..464c1bf 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Jordi Vil� <jvila@tinet.org>\n"
 "Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -974,6 +974,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1078,7 +1087,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 60017a0..825e64f 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+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: Czech <vdr@linuxtv.org>\n"
@@ -972,6 +972,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1076,7 +1085,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/po/da_DK.po b/po/da_DK.po
index 1c2fe60..bbcc431 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -972,6 +972,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1076,7 +1085,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/po/de_DE.po b/po/de_DE.po
index 8fc692c..ee88508 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: German <vdr@linuxtv.org>\n"
@@ -1013,6 +1013,15 @@ msgstr "Anzahl Tage"
 msgid "if present"
 msgstr "wenn vorhanden"
 
+msgid "same day"
+msgstr "gleicher Tag"
+
+msgid "same week"
+msgstr "gleiche Woche"
+
+msgid "same month"
+msgstr "gleicher Monat"
+
 msgid "Template name"
 msgstr "Vorlagenname"
 
@@ -1125,8 +1134,8 @@ msgstr "Vergleiche Beschreibung"
 msgid "Min. match in %"
 msgstr "Min. �bereinstimmung in %"
 
-msgid "Compare expression"
-msgstr "Vergleiche Ausdruck"
+msgid "Compare date"
+msgstr "Vergleiche Zeitpunkt"
 
 msgid "Compare categories"
 msgstr "Vergl. Kategorien"
@@ -1286,3 +1295,4 @@ msgstr "in %02ldh"
 #, c-format
 msgid "in %02ldm"
 msgstr "in %02ldm"
+
diff --git a/po/el_GR.po b/po/el_GR.po
index d53f2fd..2a337a9 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -972,6 +972,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1076,7 +1085,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/po/es_ES.po b/po/es_ES.po
index ffbf13e..de1c084 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+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: Spanish <vdr@linuxtv.org>\n"
@@ -1018,6 +1018,17 @@ msgstr "incluir d�as"
 msgid "if present"
 msgstr "si existe"
 
+#, fuzzy
+msgid "same day"
+msgstr "�ltimo d�a"
+
+#, fuzzy
+msgid "same week"
+msgstr "D�a de la semana"
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr "Nombre de la plantilla"
 
@@ -1134,8 +1145,8 @@ msgid "Min. match in %"
 msgstr "  Duraci�n m�n."
 
 #, fuzzy
-msgid "Compare expression"
-msgstr "expresi�n regular"
+msgid "Compare date"
+msgstr "Comparar t�tulo"
 
 msgid "Compare categories"
 msgstr "Comparar categor�as"
@@ -1295,3 +1306,7 @@ msgstr "en %02ldh"
 #, c-format
 msgid "in %02ldm"
 msgstr "en %02ldm"
+
+#, fuzzy
+#~ msgid "Compare expression"
+#~ msgstr "expresi�n regular"
diff --git a/po/et_EE.po b/po/et_EE.po
index 0cbdf0f..2563863 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -972,6 +972,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1076,7 +1085,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index bb484fe..5a2c70a 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: EPGSearch 0.9.25\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2011-01-04 21:07+0200\n"
 "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
 "Language-Team: Finnish <vdr@linuxtv.org>\n"
@@ -1017,6 +1017,17 @@ msgstr "päivien mukaan"
 msgid "if present"
 msgstr "jos olemassa"
 
+#, fuzzy
+msgid "same day"
+msgstr "Lopetuspäivä"
+
+#, fuzzy
+msgid "same week"
+msgstr "Viikonpäivä"
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr "Mallipohjan nimi"
 
@@ -1130,8 +1141,8 @@ msgid "Min. match in %"
 msgstr "Vaadittava yhdenmukaisuus [%]"
 
 #, fuzzy
-msgid "Compare expression"
-msgstr "säännöllinen lauseke"
+msgid "Compare date"
+msgstr "Vertaa nimeä"
 
 msgid "Compare categories"
 msgstr "Vertaa kategorioita"
@@ -1291,3 +1302,7 @@ msgstr "%02ldh"
 #, c-format
 msgid "in %02ldm"
 msgstr "%02ldm"
+
+#, fuzzy
+#~ msgid "Compare expression"
+#~ msgstr "säännöllinen lauseke"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 0a00948..e485e1a 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2008-04-30 08:36+0200\n"
 "Last-Translator: Patrice Staudt <patrice.staudt@laposte.net>\n"
 "Language-Team: French <vdr@linuxtv.org>\n"
@@ -1019,6 +1019,17 @@ msgstr "compter jours"
 msgid "if present"
 msgstr ""
 
+#, fuzzy
+msgid "same day"
+msgstr "Dernier jour"
+
+#, fuzzy
+msgid "same week"
+msgstr "Jours de la semaine"
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr "Nom du mod�le"
 
@@ -1128,8 +1139,8 @@ msgid "Min. match in %"
 msgstr "  Dur�e min."
 
 #, fuzzy
-msgid "Compare expression"
-msgstr "expression r�guliere"
+msgid "Compare date"
+msgstr "Comparer titres"
 
 msgid "Compare categories"
 msgstr "Comparer categories"
@@ -1291,3 +1302,7 @@ msgstr "en %02ldh"
 #, c-format
 msgid "in %02ldm"
 msgstr "en %02ldm"
+
+#, fuzzy
+#~ msgid "Compare expression"
+#~ msgstr "expression r�guliere"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index d74f696..022b807 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -973,6 +973,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1077,7 +1086,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 7936ff9..72b910e 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+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: Hungarian <vdr@linuxtv.org>\n"
@@ -973,6 +973,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1077,7 +1086,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/po/it_IT.po b/po/it_IT.po
index e39808b..f0ae779 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2010-03-29 01:42+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -1026,6 +1026,17 @@ msgstr "conteggia giorni"
 msgid "if present"
 msgstr "se presente"
 
+#, fuzzy
+msgid "same day"
+msgstr "Ultimo giorno"
+
+#, fuzzy
+msgid "same week"
+msgstr "Giorno settimana"
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr "Nome modello"
 
@@ -1142,8 +1153,8 @@ msgid "Min. match in %"
 msgstr "   Durata Minima"
 
 #, fuzzy
-msgid "Compare expression"
-msgstr "espressione regolare"
+msgid "Compare date"
+msgstr "Confronta titolo"
 
 msgid "Compare categories"
 msgstr "Confronta categorie"
@@ -1304,6 +1315,10 @@ msgstr "in %02ldh"
 msgid "in %02ldm"
 msgstr "in %02ldm"
 
+#, fuzzy
+#~ msgid "Compare expression"
+#~ msgstr "espressione regolare"
+
 #~ msgid "File"
 #~ msgstr "File"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index e2861e1..cdd20c6 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.10\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
 "Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -1021,6 +1021,17 @@ msgstr "skaičiuoti dienas"
 msgid "if present"
 msgstr "jei yra"
 
+#, fuzzy
+msgid "same day"
+msgstr "Paskutinė diena"
+
+#, fuzzy
+msgid "same week"
+msgstr "Savaitės diena"
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr "Šablono pavadinimas"
 
@@ -1137,8 +1148,8 @@ msgid "Min. match in %"
 msgstr "  Min. trukmė"
 
 #, fuzzy
-msgid "Compare expression"
-msgstr "reguliari išraiška"
+msgid "Compare date"
+msgstr "Palyginti pavadinimą"
 
 msgid "Compare categories"
 msgstr "Palyginti kategorijas"
@@ -1298,3 +1309,7 @@ msgstr "per %02ldh"
 #, c-format
 msgid "in %02ldm"
 msgstr "per %02ldm"
+
+#, fuzzy
+#~ msgid "Compare expression"
+#~ msgstr "reguliari išraiška"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 57c99c6..158cbfb 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+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: Dutch <vdr@linuxtv.org>\n"
@@ -1017,6 +1017,17 @@ msgstr "tel dagen"
 msgid "if present"
 msgstr ""
 
+#, fuzzy
+msgid "same day"
+msgstr "Eerste dag"
+
+#, fuzzy
+msgid "same week"
+msgstr "Dag van de week"
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr "Naam van sjabloon"
 
@@ -1132,8 +1143,8 @@ msgid "Min. match in %"
 msgstr "  Min. duur"
 
 #, fuzzy
-msgid "Compare expression"
-msgstr "reguliere uitdrukking"
+msgid "Compare date"
+msgstr "Vergelijk titel"
 
 msgid "Compare categories"
 msgstr "vergelijk categori�en"
@@ -1295,3 +1306,7 @@ msgstr "in %02ldh"
 #, c-format
 msgid "in %02ldm"
 msgstr "in %02ldm"
+
+#, fuzzy
+#~ msgid "Compare expression"
+#~ msgstr "reguliere uitdrukking"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 8e74467..140eef0 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -972,6 +972,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1076,7 +1085,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 315d33e..d0fbeea 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -972,6 +972,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1076,7 +1085,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 1e4a447..503b2f9 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -971,6 +971,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1075,7 +1084,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index ecfbf4c..3dd6115 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -972,6 +972,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1076,7 +1085,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index fa7bd36..f9e3cdd 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -971,6 +971,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1075,7 +1084,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 5c8e6f3..a9556d9 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: epgsearch\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2009-11-02 09:40+0100\n"
 "Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
 "Language-Team: Slovak <hrala.milan@gmail.com>\n"
@@ -1019,6 +1019,17 @@ msgstr "Po�et dn�"
 msgid "if present"
 msgstr ""
 
+#, fuzzy
+msgid "same day"
+msgstr "Posledn� de�"
+
+#, fuzzy
+msgid "same week"
+msgstr " De� v t��dni"
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr "Meno �ablony"
 
@@ -1136,8 +1147,8 @@ msgid "Min. match in %"
 msgstr " Min. doba"
 
 #, fuzzy
-msgid "Compare expression"
-msgstr "be�n� v�raz"
+msgid "Compare date"
+msgstr "porovna� tituly"
 
 msgid "Compare categories"
 msgstr "porovna� kateg�rie"
@@ -1300,6 +1311,10 @@ msgstr "v %02ldh"
 msgid "in %02ldm"
 msgstr "v %02ldm"
 
+#, fuzzy
+#~ msgid "Compare expression"
+#~ msgstr "be�n� v�raz"
+
 #~ msgid "File"
 #~ msgstr "S�bor"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index cf84b9a..6b75922 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -973,6 +973,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1077,7 +1086,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 4ae11c3..b707d0e 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -972,6 +972,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1076,7 +1085,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 6887b78..15efc63 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: 2011-06-12 10:15+0200\n"
+"POT-Creation-Date: 2011-06-13 14:06+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Oktay Yolge�en <oktay_73@yahoo.de>\n"
 "Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -971,6 +971,15 @@ msgstr ""
 msgid "if present"
 msgstr ""
 
+msgid "same day"
+msgstr ""
+
+msgid "same week"
+msgstr ""
+
+msgid "same month"
+msgstr ""
+
 msgid "Template name"
 msgstr ""
 
@@ -1075,7 +1084,7 @@ msgstr ""
 msgid "Min. match in %"
 msgstr ""
 
-msgid "Compare expression"
+msgid "Compare date"
 msgstr ""
 
 msgid "Compare categories"
diff --git a/recdone.c b/recdone.c
index f40a884..c4345d3 100644
--- a/recdone.c
+++ b/recdone.c
@@ -230,7 +230,7 @@ int cRecDone::ChannelNr()
 // -- cRecsDone -----------------------------------------------------------------
 int cRecsDone::GetCountRecordings(const cEvent* event, cSearchExt* search, cRecDone** first, int matchLimit)
 {
-  return GetCountRecordings(event, search->compareTitle, search->compareSubtitle, search->compareSummary, search->compareExpression, search->catvaluesAvoidRepeat, first, matchLimit);
+  return GetCountRecordings(event, search->compareTitle, search->compareSubtitle, search->compareSummary, search->compareDate, search->catvaluesAvoidRepeat, first, matchLimit);
 }
 
 bool CatValuesMatch(unsigned long catvaluesAvoidRepeat, const string& rDescr, const string& eDescr)
@@ -273,7 +273,7 @@ bool MatchesInExpression(const string& expression, const cRecDone* recDone, cons
   return resRecDone == resEvent;
 }
 
-int cRecsDone::GetCountRecordings(const cEvent* event, bool compareTitle, int compareSubtitle, bool compareSummary, const char* compareExpression, unsigned long catvaluesAvoidRepeat, cRecDone** first, int matchLimit)
+int cRecsDone::GetCountRecordings(const cEvent* event, bool compareTitle, int compareSubtitle, bool compareSummary, int compareDate, unsigned long catvaluesAvoidRepeat, cRecDone** first, int matchLimit)
 {
    if (first)
       *first = NULL;
@@ -307,6 +307,11 @@ int cRecsDone::GetCountRecordings(const cEvent* event, bool compareTitle, int co
       if (rawDescr) free(rawDescr);
    }
 
+   string compareExpression = "";
+   if (compareDate == 1) compareExpression = "%date%";
+   if (compareDate == 2) compareExpression = "%year%-%week%";
+   if (compareDate == 3) compareExpression = "%year%-%month%";
+
    cRecDone* firstrecDone = NULL;
    cRecDone* recDone = First();
    while (recDone) 
@@ -339,7 +344,7 @@ int cRecsDone::GetCountRecordings(const cEvent* event, bool compareTitle, int co
           (!compareSubtitle || (rSubtitle == eSubtitle && rSubtitle !="")) &&
           (!compareSummary || DescriptionMatches(eRawDescr.c_str(), rRawDescr.c_str(), matchLimit)) &&
 	  (catvaluesAvoidRepeat == 0 || CatValuesMatch(catvaluesAvoidRepeat, rDescr, eDescr)) &&
-	  (compareExpression == NULL || strlen(compareExpression) == 0 || MatchesInExpression(compareExpression, recDone, event)))
+	  (compareExpression.size() == 0 || MatchesInExpression(compareExpression, recDone, event)))
       {
 	if (!firstrecDone) firstrecDone = recDone;
 	else
diff --git a/recdone.h b/recdone.h
index 291a2d9..ea00ccb 100644
--- a/recdone.h
+++ b/recdone.h
@@ -69,7 +69,7 @@ class cRecsDone : public cList<cRecDone>, public cMutex {
 	}
     cRecsDone(void) {}
     int GetCountRecordings(const cEvent* event, cSearchExt* search, cRecDone** first = NULL, int matchLimit = 90);
-    int GetCountRecordings(const cEvent*, bool compareTitle, int compareSubtitle, bool compareSummary, const char* compareExpression, unsigned long, cRecDone** first = NULL, int matchLimit = 90);
+    int GetCountRecordings(const cEvent*, bool compareTitle, int compareSubtitle, bool compareSummary, int compareDate, unsigned long, cRecDone** first = NULL, int matchLimit = 90);
     int GetTotalCountRecordings(cSearchExt* search, cRecDone** first);
     void RemoveSearchID(int ID);
     bool Load(const char *FileName = NULL);