Clarified "avoid repeats".

Forced subtitle-comparison is named "yes" again. New option "allow empty"

32 files changed, 106 insertions, 61 deletions

diff --git a/HISTORY b/HISTORY
index de6ad56..a4fe0c2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,20 @@
 VDR Plugin 'epgsearch' Revision History
 ---------------------------------------
 
+2021-04-12
+new:
+- Improved handling of remote timers
+- Replace auto_ptr with unique_ptr for c++11 (kfb77@vdr-portal.de)
+- Delay threads after pluginstart 10 secs (configurable)
+- Changed fgets to allow compiling with clang
+- Clarified "avoid repeats". Forced subtitle-comparison is named "yes" again
+  New option "allow empty"
+fixes:
+- Fixed several lock sequence errors
+- Fix utf-8 encoding in docs and manpages (kfb77 and seahawk1986@vdr-portal.de)
+- Fixed possible format overflow
+- Fixed displaying NAME in generated manpages thanks to etobi
+
 2018-04-16; Version 2.4.0
 new:
 - Create man pages only once. by jasminj@vdr-portal.de
diff --git a/doc-src/de/epgsearch.1.txt b/doc-src/de/epgsearch.1.txt
index cb8f443..ed078dd 100644
--- a/doc-src/de/epgsearch.1.txt
+++ b/doc-src/de/epgsearch.1.txt
@@ -346,8 +346,10 @@ Titel verglichen werden soll.
 =item - B<Vergleiche Untertitel>
 
 Einstellung, ob beim Test, ob eine Sendung identisch ist, auch der
-Untertitel verglichen werden soll. Bei 'falls vorhanden' stuft epgsearch zwei Sendungen nur dann als
+Untertitel verglichen werden soll. Bei 'ja' stuft epgsearch zwei Sendungen nur dann als
 identisch ein, wenn die Episodennamen gleich sind und nicht leer.
+Bei 'erlaube leere' können auch Sendungen identisch sein, wenn beide Unterttitel leer
+sind. Im Normalfall sollte dann auf "nein" gestellt werden.
 
 =item - B<Vergleiche Beschreibung>
 
diff --git a/doc-src/de/epgsearch.conf.5.txt b/doc-src/de/epgsearch.conf.5.txt
index 151ab91..3e4604a 100644
--- a/doc-src/de/epgsearch.conf.5.txt
+++ b/doc-src/de/epgsearch.conf.5.txt
@@ -69,6 +69,9 @@ Folgende Felder sind möglich:
  30 - erlaubte Anzahl Wiederholungen
  31 - Vergleiche Titel bei Prüfung auf Wiederholung? 0/1
  32 - Vergleiche Untertitel bei Prüfung auf Wiederholung? 0/1
+      0 - Nein
+      1 - Ja
+      2 - Ja oder beide leer
  33 - Vergleiche Beschreibung bei Prüfung auf Wiederholung? 0/1
  34 - Vergleiche erweitertes EPG bei Prüfung auf Wiederholung?
       Dieser Eintrag ist ein Bitfeld von Kategorie IDs.
diff --git a/doc-src/en/epgsearch.1.txt b/doc-src/en/epgsearch.1.txt
index 065dd09..702cfce 100644
--- a/doc-src/en/epgsearch.1.txt
+++ b/doc-src/en/epgsearch.1.txt
@@ -339,8 +339,10 @@ compared.
 =item - B<Compare subtitle:>
 
 When comparing to events then specify here if the subtitle should be
-compared. With 'if present' epgsearch will classify two events only as equal if
+compared. With 'yes' epgsearch will classify two events only as equal if
 their episode names match and are not empty.
+With 'allow empty' two events may be equal if both subtitles are empty.
+Normally you would choose "no" in this case.
 
 =item - B<Compare description:>
 
diff --git a/doc-src/en/epgsearch.conf.5.txt b/doc-src/en/epgsearch.conf.5.txt
index cb07f6b..69e4c1d 100644
--- a/doc-src/en/epgsearch.conf.5.txt
+++ b/doc-src/en/epgsearch.conf.5.txt
@@ -70,7 +70,7 @@ is B<':'>:
  32 - compare subtitle when testing for a repeat? 0/1/2
       0 - no
       1 - yes
-      2 - yes, if present
+      2 - yes or both empty
  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/epgsearchtools.c b/epgsearchtools.c
index 7890eb4..e011e0c 100644
--- a/epgsearchtools.c
+++ b/epgsearchtools.c
@@ -616,7 +616,11 @@ bool EventsMatch(const cEvent* event1, const cEvent* event2, bool compareTitle,
 
     bool match = false;
     if ((!compareTitle || Title1 == Title2) &&
-        (!compareSubtitle || (Subtitle1 == Subtitle2 && Subtitle1 != ""))) {
+        // try if we don't compare Title or Title is equal
+        (!compareSubtitle ||
+            (Subtitle1 == Subtitle2 && (compareSubtitle==2 || Subtitle1 != "")))) {
+        // try if we don't compare Subtitle or Subtitle is equal
+        // and not empty in case compareSubtitle is set to "yes"
         const char* Descr1    = event1->Description();
         const char* Descr2    = event2->Description();
         if (compareSummary) {
diff --git a/menu_searchedit.c b/menu_searchedit.c
index 7f4d6bf..b70c5bd 100644
--- a/menu_searchedit.c
+++ b/menu_searchedit.c
@@ -94,7 +94,8 @@ cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Tem
     SearchActiveModes[2] = strdup(tr("user-defined"));
 
     CompareSubtitleModes[0] = strdup(trVDR("no"));
-    CompareSubtitleModes[1] = strdup(tr("if present"));
+    CompareSubtitleModes[1] = strdup(trVDR("yes"));
+    CompareSubtitleModes[2] = strdup(tr("allow empty"));
 
     CompareDateModes[0] = strdup(trVDR("no"));
     CompareDateModes[1] = strdup(tr("same day"));
@@ -336,7 +337,7 @@ void cMenuEditSearchExt::Set()
                 if (data.allowedRepeats > 0)
                     Add(new cMenuEditIntItem(IndentMenuItem(tr("Only repeats within ... days"), 2), &data.repeatsWithinDays, 0, 999));
                 Add(new cMenuEditBoolItem(IndentMenuItem(tr("Compare title"), 2), &data.compareTitle, trVDR("no"), trVDR("yes")));
-                Add(new cMenuEditStraItem(IndentMenuItem(tr("Compare subtitle"), 2), &data.compareSubtitle, 2, CompareSubtitleModes));
+                Add(new cMenuEditStraItem(IndentMenuItem(tr("Compare subtitle"), 3), &data.compareSubtitle, 3, CompareSubtitleModes));
                 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));
@@ -405,7 +406,7 @@ cMenuEditSearchExt::~cMenuEditSearchExt()
         free(DelModes[i]);
     for (i = 0; i <= 2; i++)
         free(SearchActiveModes[i]);
-    for (i = 0; i <= 1; i++)
+    for (i = 0; i <= 2; i++)
         free(CompareSubtitleModes[i]);
     for (i = 0; i <= 3; i++)
         free(CompareDateModes[i]);
diff --git a/menu_searchedit.h b/menu_searchedit.h
index 21ed188..e408560 100644
--- a/menu_searchedit.h
+++ b/menu_searchedit.h
@@ -53,7 +53,7 @@ protected:
     char *BlacklistModes[4];
     char *DelModes[3];
     char *SearchActiveModes[3];
-    char *CompareSubtitleModes[2];
+    char *CompareSubtitleModes[3];
     char *CompareDateModes[4];
     std::vector<int> contentStringIDs;
     int useContentDescriptors;
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 2df8339..413a9c9 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -995,7 +995,7 @@ msgstr ""
 msgid "count days"
 msgstr ""
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 msgid "same day"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index a6d2793..cd64375 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.21\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+0200\n"
 "PO-Revision-Date: 2011-10-31 20:21+0200\n"
 "Last-Translator: Radek Stastny <dedkus@gmail.com>\n"
 "Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -992,8 +992,8 @@ msgstr "počítat nahrávky"
 msgid "count days"
 msgstr "počítat dny"
 
-msgid "if present"
-msgstr "pokud existuje"
+msgid "allow empty"
+msgstr ""
 
 msgid "same day"
 msgstr "stejný den"
@@ -1258,6 +1258,9 @@ msgstr "Přepnout na (%d) '%s'?"
 msgid "Programming timer failed!"
 msgstr "Nastavení nahrávání selhalo!"
 
+#~ msgid "if present"
+#~ msgstr "pokud existuje"
+
 #~ msgid "in %02ldd"
 #~ msgstr "%02ldd"
 
diff --git a/po/da_DK.po b/po/da_DK.po
index b12d0db..9306cc0 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -993,7 +993,7 @@ msgstr ""
 msgid "count days"
 msgstr ""
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 msgid "same day"
diff --git a/po/de_DE.po b/po/de_DE.po
index aa3d0cc..9f16b65 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 13:50+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"
@@ -1030,8 +1030,8 @@ msgstr "Anzahl Aufnahmen"
 msgid "count days"
 msgstr "Anzahl Tage"
 
-msgid "if present"
-msgstr "wenn vorhanden"
+msgid "allow empty"
+msgstr "erlaube leere"
 
 msgid "same day"
 msgstr "gleicher Tag"
@@ -1304,6 +1304,9 @@ msgstr "Umschalten zu (%d) '%s'?"
 msgid "Programming timer failed!"
 msgstr "Timer-Programmierung fehlschlagen!"
 
+#~ msgid "if present"
+#~ msgstr "wenn vorhanden"
+
 #~ msgid "Help$This value delays starting the initial searchtimer update thread for the given range of seconds"
 #~ msgstr "Dieser Wert verzögert das erste Starten des Suchtimerthreads um die angegebenen Sekunden"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 9a2a603..726df65 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -993,7 +993,7 @@ msgstr ""
 msgid "count days"
 msgstr ""
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 msgid "same day"
diff --git a/po/es_ES.po b/po/es_ES.po
index e7ac2fe..54b3a9d 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -1036,8 +1036,8 @@ msgstr "incluir grabaciones"
 msgid "count days"
 msgstr "incluir días"
 
-msgid "if present"
-msgstr "si existe"
+msgid "allow empty"
+msgstr ""
 
 #, fuzzy
 msgid "same day"
@@ -1316,6 +1316,9 @@ msgstr "¿Cambiar a (%d) '%s'?"
 msgid "Programming timer failed!"
 msgstr "¡La programación ha fallado!"
 
+#~ msgid "if present"
+#~ msgstr "si existe"
+
 #~ msgid "in %02ldd"
 #~ msgstr "en %02ldd"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 941325b..807ca0c 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -993,7 +993,7 @@ msgstr ""
 msgid "count days"
 msgstr ""
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 msgid "same day"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 8054916..17455b0 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -1034,8 +1034,8 @@ msgstr "lukumäärän mukaan"
 msgid "count days"
 msgstr "päivien mukaan"
 
-msgid "if present"
-msgstr "jos olemassa"
+msgid "allow empty"
+msgstr ""
 
 msgid "same day"
 msgstr "sama päivä"
@@ -1308,6 +1308,9 @@ msgstr "Vaihdetaanko kanavalle (%d) '%s'?"
 msgid "Programming timer failed!"
 msgstr "Ajastimen ohjelmointi epäonnistui!"
 
+#~ msgid "if present"
+#~ msgstr "jos olemassa"
+
 #~ msgid "in %02ldd"
 #~ msgstr "%02ldd"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index e9903ff..745711e 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -1037,7 +1037,7 @@ msgstr "compter enregistrements"
 msgid "count days"
 msgstr "compter jours"
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 #, fuzzy
diff --git a/po/hr_HR.po b/po/hr_HR.po
index ab6c3dd..994930c 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -994,7 +994,7 @@ msgstr ""
 msgid "count days"
 msgstr ""
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 msgid "same day"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index d375017..20ad0f6 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -992,7 +992,7 @@ msgstr ""
 msgid "count days"
 msgstr ""
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 msgid "same day"
diff --git a/po/it_IT.po b/po/it_IT.po
index 46f1f8c..4c28ce7 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+0200\n"
 "PO-Revision-Date: 2011-07-17 17:46+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -1037,8 +1037,8 @@ msgstr "conteggia registrazioni"
 msgid "count days"
 msgstr "conteggia giorni"
 
-msgid "if present"
-msgstr "se presente"
+msgid "allow empty"
+msgstr ""
 
 msgid "same day"
 msgstr "stesso giorno"
@@ -1311,6 +1311,9 @@ msgstr "Cambiare a (%d) '%s'?"
 msgid "Programming timer failed!"
 msgstr "Programmazione timer fallito!"
 
+#~ msgid "if present"
+#~ msgstr "se presente"
+
 #~ msgid "in %02ldd"
 #~ msgstr "in %02ldd"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index a34a5a7..e516c11 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -1039,8 +1039,8 @@ msgstr "skaičiuoti įrašus"
 msgid "count days"
 msgstr "skaičiuoti dienas"
 
-msgid "if present"
-msgstr "jei yra"
+msgid "allow empty"
+msgstr ""
 
 #, fuzzy
 msgid "same day"
@@ -1319,6 +1319,9 @@ msgstr "Pereiti į (%d) '%s'?"
 msgid "Programming timer failed!"
 msgstr "Nustatyti laikmačio nepavyko!"
 
+#~ msgid "if present"
+#~ msgstr "jei yra"
+
 #~ msgid "in %02ldd"
 #~ msgstr "per %02ldd"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index c125d4e..ec9c5ea 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -1036,7 +1036,7 @@ msgstr "tel opnames"
 msgid "count days"
 msgstr "tel dagen"
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 #, fuzzy
diff --git a/po/nn_NO.po b/po/nn_NO.po
index e5fa4f6..0453a93 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -992,7 +992,7 @@ msgstr ""
 msgid "count days"
 msgstr ""
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 msgid "same day"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index feee9c6..f235af2 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -992,7 +992,7 @@ msgstr ""
 msgid "count days"
 msgstr ""
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 msgid "same day"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 8068160..76bdbcf 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -991,7 +991,7 @@ msgstr ""
 msgid "count days"
 msgstr ""
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 msgid "same day"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index ddb48e1..5cd666d 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -992,7 +992,7 @@ msgstr ""
 msgid "count days"
 msgstr ""
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 msgid "same day"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index d40faf7..54ec417 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -991,7 +991,7 @@ msgstr ""
 msgid "count days"
 msgstr ""
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 msgid "same day"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index df6172b..ed20270 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -1037,7 +1037,7 @@ msgstr "Počet nahrávok"
 msgid "count days"
 msgstr "Počet dní"
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 #, fuzzy
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 447b65a..2e365ab 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -993,7 +993,7 @@ msgstr ""
 msgid "count days"
 msgstr ""
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 msgid "same day"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index ffd608e..498a171 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -993,7 +993,7 @@ msgstr ""
 msgid "count days"
 msgstr ""
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 msgid "same day"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index cc7b40c..cb4d29b 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: <see README>\n"
-"POT-Creation-Date: 2021-01-25 18:04+0100\n"
+"POT-Creation-Date: 2021-04-12 14:45+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"
@@ -991,7 +991,7 @@ msgstr ""
 msgid "count days"
 msgstr ""
 
-msgid "if present"
+msgid "allow empty"
 msgstr ""
 
 msgid "same day"
diff --git a/recdone.c b/recdone.c
index d200df3..53780cd 100644
--- a/recdone.c
+++ b/recdone.c
@@ -341,7 +341,8 @@ int cRecsDone::GetCountRecordings(const cEvent* event, bool compareTitle, int co
         }
 
         if ((!compareTitle || rTitle == eTitle) &&
-            (!compareSubtitle || (rSubtitle == eSubtitle && rSubtitle != "")) &&
+            (!compareSubtitle || (rSubtitle == eSubtitle &&
+                (compareSubtitle==2 || rSubtitle != ""))) &&
             (!compareSummary || DescriptionMatches(eRawDescr.c_str(), rRawDescr.c_str(), matchLimit)) &&
             (catvaluesAvoidRepeat == 0 || CatValuesMatch(catvaluesAvoidRepeat, rDescr, eDescr)) &&
             (compareExpression.size() == 0 || MatchesInExpression(compareExpression, recDone, event))) {