global blacklists

36 files changed, 222 insertions, 38 deletions

diff --git a/HISTORY b/HISTORY
index 4999ff1..8ff9525 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3,6 +3,9 @@ VDR Plugin 'epgsearch' Revision History
 
 2010-xx-xx; Version 0.9.25
 new:
+- global blacklists: blacklists for search timers can now be global to exclude 
+  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.
 - new setup variable epgsearch.ConflCheckCmd (no gui for this, so edit setup.conf!), that 
   allows executing a command for each timer causing a conflict, see the MANUAL for details.
 - vdr-1.7.15 has changed the SVDRP default port to 6419, please update this in epgsearch's 
diff --git a/HISTORY.DE b/HISTORY.DE
index ee66471..e791d34 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -3,6 +3,10 @@ VDR Plugin 'epgsearch' Revision History
 
 2010-xx-xx; Version 0.9.25
 neu:
+- 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" 
+  gesetzt werden, um auch globale Ausschlusslisten zu ignorieren.
 - neue Setup-Option epgsearch.ConflCheckCmd (keine GUI dazu, also nur per setup.conf zu 
   setzen!), mit der man je Konflikt-Timer einen Befehl ausführen kann, mehr dazu im MANUAL.
 - vdr-1.7.15 benutzt einen anderen SVDRP Standard-Port (6419), bitte im Setupmenü von 
diff --git a/blacklist.c b/blacklist.c
index 87946c0..484b464 100644
--- a/blacklist.c
+++ b/blacklist.c
@@ -61,6 +61,7 @@ cBlacklist::cBlacklist(void)
     useDayOfWeek = false;
     DayOfWeek = 0;
     buffer = NULL;
+    isGlobal = 0;
 
     useExtEPGInfo = false;
     catvalues = (char**) malloc(SearchExtCats.Count() * sizeof(char*));
@@ -133,6 +134,7 @@ void cBlacklist::CopyFromTemplate(const cSearchExt* templ)
   useDayOfWeek = templ->useDayOfWeek;
   DayOfWeek = templ->DayOfWeek;
   useExtEPGInfo = templ->useExtEPGInfo;
+  isGlobal = 0;
 
   cSearchExtCat *SearchExtCat = SearchExtCats.First();
   int index = 0;
@@ -233,7 +235,7 @@ const char *cBlacklist::ToText(void)
       }
   }
 
-  msprintf(&buffer, "%d:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d:%d:%d:%s:%s:%d:%d:%d:%s:%d:%d",
+  msprintf(&buffer, "%d:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d:%d:%d:%s:%s:%d:%d:%d:%s:%d:%d:%d",
 	   ID,
 	   tmp_search,
 	   useTime,
@@ -254,7 +256,8 @@ const char *cBlacklist::ToText(void)
 	   useExtEPGInfo,
 	   useExtEPGInfo?tmp_catvalues:"",
 	   fuzzyTolerance,
-	   ignoreMissingEPGCats);
+	   ignoreMissingEPGCats,
+	   isGlobal);
 
 
   if (tmp_chanSel)
@@ -385,6 +388,8 @@ bool cBlacklist::Parse(const char *s)
 		break;
             case 21: ignoreMissingEPGCats = atoi(value);
          	break;
+            case 22: isGlobal = atoi(value);
+         	break;
 	    default:
 	        break;
         } //switch
diff --git a/blacklist.h b/blacklist.h
index 7981fbf..dafd317 100644
--- a/blacklist.h
+++ b/blacklist.h
@@ -57,6 +57,7 @@ public:
   int      ignoreMissingEPGCats;
   char**   catvalues;
   int      fuzzyTolerance;
+  int      isGlobal;
   static char *buffer;
 public:
   cBlacklist(void);
diff --git a/doc-src/de/epgsearch.1.txt b/doc-src/de/epgsearch.1.txt
index 4d465ee..ca5bebb 100644
--- a/doc-src/de/epgsearch.1.txt
+++ b/doc-src/de/epgsearch.1.txt
@@ -250,7 +250,8 @@ Son, Mon, ..., Sam, benutzerdefiniert
 
 =item - B<Verwende Ausschlusslisten:>
 
-Hier können eine oder mehrere oder alle Ausschlusslisten selektiert werden.
+Ausschlusslisten können benutzt werden, um unerwünschte Sendungen auszuschließen.
+Hier können nur globale, eine oder mehrere oder alle Ausschlusslisten selektiert werden.
 Falls ein Suchergebnis auch in einer der gewählten Ausschlusslisten
 erscheint, wird es verworfen.
 
@@ -684,7 +685,14 @@ verwendet werden können.
 =item - B<Ausschlusslisten:>
 
 Hier können Ausschlusslisten verwalten werden. Diese können innerhalb einer
-Suche verwendet werden um unerwünschte Sendungen zu vermeiden.
+Suche verwendet werden um unerwünschte Sendungen zu vermeiden. 
+Eine Ausschlussliste kann auch als global gekennzeichnet werden. Da die 
+Standardeinstellung beim Suchtimer für die Option 'Ausschlusslisten verw.' 
+auf 'nur globale' steht, kann man somit einfach unerwünschte Sendungen von 
+allen Suchtimern ausschließen. Ausnahme: Falls beim Suchtimer die Option 
+'Ausschlusslisten verw.: keine' gewählt ist, hat eine globale Ausschlussliste 
+keine Auswirkung. Ebenso werden globale Ausschlusslisten bei der Suche nach 
+Wiederholungen über das OSD ignoriert.
 
 =item - B<Kanalgruppen:>
 
diff --git a/doc-src/en/epgsearch.1.txt b/doc-src/en/epgsearch.1.txt
index f18c163..04e6c2b 100644
--- a/doc-src/en/epgsearch.1.txt
+++ b/doc-src/en/epgsearch.1.txt
@@ -251,8 +251,9 @@ You'll find the user-defined selection in the list after Friday.
 
 =item - B<Use blacklists:>
 
-You can select one or more or all blacklists here. If any search result
-is also contained in one of the selected blacklists it will be skipped.
+Blacklists are a way to exclude unwanted events. Select only global, one, more
+or all blacklists here. If any search result is also contained in one of 
+the selected blacklists it will be skipped.
 
 =item - B<Use in favorites menu:>
 
@@ -667,6 +668,11 @@ search.
 
 Here you can manage blacklists which can be used to suppress unwanted events
 within a search.
+A blacklist can also be marked as global. Since the default setting of a search timer 
+for 'use blacklists' is 'only global', this is a simple way to exclude unwanted events
+form all search timers, except: If the search timer has the option 'use blacklists: none'
+no blacklists are taken into account. Also the search for repeats within the OSD ignores
+any blacklists.
 
 =item - B<Channel groups:>
 
diff --git a/epgsearchext.c b/epgsearchext.c
index 3f160a7..d1422b8 100644
--- a/epgsearchext.c
+++ b/epgsearchext.c
@@ -103,7 +103,7 @@ cSearchExt::cSearchExt(void)
    recordingsKeep = 0;
    switchMinsBefore = 1;
    pauseOnNrRecordings = 0;
-   blacklistMode = blacklistsNo; // no blacklists
+   blacklistMode = blacklistsOnlyGlobal; // no blacklists
    blacklists.Clear();
    fuzzyTolerance = 1;
    useInFavorites = 0;
@@ -1104,10 +1104,20 @@ cSearchResults* cSearchExt::Run(int PayTVMode, bool inspectTimerMargin, int eval
 
 cSearchResults* cSearchExt::GetBlacklistEvents(int MarginStop)
 {
-   if (blacklistMode == blacklistsNo) return NULL;
+   if (blacklistMode == blacklistsNone) return NULL;
 
    cMutexLock BlacklistLock(&Blacklists);
    cSearchResults* blacklistEvents = NULL; 
+   if (blacklistMode == blacklistsOnlyGlobal)
+   {
+      cBlacklist* tmpblacklist = Blacklists.First();
+      while(tmpblacklist)
+      {
+	if (tmpblacklist->isGlobal)
+	    blacklistEvents = tmpblacklist->Run(blacklistEvents, MarginStop);
+	tmpblacklist = Blacklists.Next(tmpblacklist);
+      }
+   }
    if (blacklistMode == blacklistsAll)
    {
       cBlacklist* tmpblacklist = Blacklists.First();
diff --git a/epgsearchext.h b/epgsearchext.h
index 4dce484..4677b07 100644
--- a/epgsearchext.h
+++ b/epgsearchext.h
@@ -41,9 +41,10 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 
 typedef enum
 {
-    blacklistsNo = 0,
+    blacklistsOnlyGlobal = 0,
     blacklistsSelection,
-    blacklistsAll
+    blacklistsAll,
+    blacklistsNone
 } blacklistModes;
 
 typedef enum
diff --git a/menu_blacklistedit.c b/menu_blacklistedit.c
index c01b13f..68dca0e 100644
--- a/menu_blacklistedit.c
+++ b/menu_blacklistedit.c
@@ -215,6 +215,8 @@ void cMenuBlacklistEdit::Set()
 	}	
 	Add(new cMenuEditStraItem(IndentMenuItem(tr("Day of week")), &data.DayOfWeek, 8, DaysOfWeek));
     }
+    Add(new cMenuEditBoolItem( tr("Use global"), &data.isGlobal, trVDR("no"), trVDR("yes")));
+
     SetCurrent(Get(current));
 }
 
diff --git a/menu_blacklists.c b/menu_blacklists.c
index 9683fb0..ddc0cde 100644
--- a/menu_blacklists.c
+++ b/menu_blacklists.c
@@ -54,6 +54,10 @@ void cMenuBlacklistsItem::Set(void)
 {
   ostringstream line;
 
+  if (blacklist->isGlobal != 0)
+    line << setiosflags(ios::left) << "G";
+  line << "\t";
+
   if (blacklist->search && strlen(blacklist->search) > 0)
     line << setiosflags(ios::left) << string(blacklist->search);
   else
@@ -93,7 +97,7 @@ int cMenuBlacklistsItem::Compare(const cListObject &ListObject) const
 
 // --- cMenuBlacklists ----------------------------------------------------------
 cMenuBlacklists::cMenuBlacklists()
-:cOsdMenu(tr("Blacklists"), 20, 11, 6, 5)
+:cOsdMenu(tr("Blacklists"), 3, 20, 11, 6, 5)
 {
     cMutexLock BlacklistLock(&Blacklists);
     cBlacklist *Blacklist = Blacklists.First();
diff --git a/menu_searchedit.c b/menu_searchedit.c
index ecc707f..f415e51 100644
--- a/menu_searchedit.c
+++ b/menu_searchedit.c
@@ -78,9 +78,10 @@ cMenuEditSearchExt::cMenuEditSearchExt(cSearchExt *SearchExt, bool New, bool Tem
    SearchTimerModes[3] = strdup(tr("Announce and switch"));
    SearchTimerModes[4] = strdup(tr("Announce by mail"));
 
-   BlacklistModes[0] = strdup(trVDR("no"));
+   BlacklistModes[0] = strdup(tr("only globals"));
    BlacklistModes[1] = strdup(tr("Selection"));
    BlacklistModes[2] = strdup(tr("all"));
+   BlacklistModes[3] = strdup(trVDR("none"));
 
    DelModes[0] = strdup(trVDR("no"));
    DelModes[1] = strdup(tr("count recordings"));
@@ -329,7 +330,7 @@ void cMenuEditSearchExt::Set()
       }	
       Add(new cMenuEditStraItem(IndentMenuItem(tr("Day of week")),     &data.DayOfWeek, 8, DaysOfWeek));
    }
-   Add(new cMenuEditStraItem(tr("Use blacklists"), &data.blacklistMode, 3, BlacklistModes));
+   Add(new cMenuEditStraItem(tr("Use blacklists"), &data.blacklistMode, 4, BlacklistModes));
 
    if (EPGSearchConfig.showFavoritesMenu)
       Add(new cMenuEditBoolItem( tr("Use in favorites menu"), &data.useInFavorites, trVDR("no"), trVDR("yes")));
@@ -434,7 +435,7 @@ cMenuEditSearchExt::~cMenuEditSearchExt()
       free(UseChannelSel[i]);
    for(i=0; i<=2; i++)
       free(SearchTimerModes[i]);
-   for(i=0; i<=2; i++)
+   for(i=0; i<=3; i++)
       free(BlacklistModes[i]);
    for(i=0; i<=2; i++)
       free(DelModes[i]);
diff --git a/menu_searchedit.h b/menu_searchedit.h
index cb11672..3347a6d 100644
--- a/menu_searchedit.h
+++ b/menu_searchedit.h
@@ -49,7 +49,7 @@ protected:
   char *DaysOfWeek[8];
   char *UseChannelSel[4];
   char *SearchTimerModes[5];
-  char *BlacklistModes[3];
+  char *BlacklistModes[4];
   char *DelModes[3];
   char *SearchActiveModes[3];
   char *CompareSubtitleModes[2];
diff --git a/menu_searchresults.c b/menu_searchresults.c
index 9f3a5c4..b26e6cd 100644
--- a/menu_searchresults.c
+++ b/menu_searchresults.c
@@ -690,6 +690,7 @@ cMenuSearchResultsForQuery::cMenuSearchResultsForQuery(const char *query, bool I
       searchExt->useTitle = 1;
       searchExt->useSubtitle = 0;
       searchExt->useDescription = 0;
+      searchExt->blacklistMode = blacklistsNone;
       BuildList();
    }
 }
diff --git a/po/ca_ES.po b/po/ca_ES.po
index f2f0153..6363ef3 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -710,6 +710,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -953,6 +956,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index f8e93a0..cb1bf47 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -708,6 +708,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -951,6 +954,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
diff --git a/po/da_DK.po b/po/da_DK.po
index b4c1a33..ad49b34 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -708,6 +708,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -951,6 +954,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 00495d8..902d437 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -748,6 +748,9 @@ msgstr "Verw. Wochentag"
 msgid "Day of week"
 msgstr "Wochentag"
 
+msgid "Use global"
+msgstr "Global verwenden"
+
 msgid "Button$Templates"
 msgstr "Vorlagen"
 
@@ -991,6 +994,9 @@ msgstr "Ankündigen und Umschalten"
 msgid "Announce by mail"
 msgstr "per Mail ankündigen"
 
+msgid "only globals"
+msgstr "nur globale"
+
 msgid "Selection"
 msgstr "Auswahl"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 1196953..2c391c5 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -708,6 +708,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -951,6 +954,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 945e0a1..fe13ef2 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -751,6 +751,9 @@ msgstr "Usar día de la semana"
 msgid "Day of week"
 msgstr "Día de la semana"
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr "Plantillas"
 
@@ -996,6 +999,9 @@ msgstr "Avisar y cambiar"
 msgid "Announce by mail"
 msgstr "Sólo avisar"
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr "selección"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index ee2e0c1..5259744 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -708,6 +708,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -951,6 +954,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 0f649c8..3097725 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -752,6 +752,9 @@ msgstr "Käytä viikonpäivää"
 msgid "Day of week"
 msgstr "Viikonpäivä"
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr "Mallipohjat"
 
@@ -995,6 +998,9 @@ msgstr "muistutus ja kanavanvaihto"
 msgid "Announce by mail"
 msgstr "muistutus sähköpostitse"
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr "valittu"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index bad58ae..6cfcff3 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -751,6 +751,9 @@ msgstr "Utiliser les jours de la semaine"
 msgid "Day of week"
 msgstr "Jours de la semaine"
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr "Modéles"
 
@@ -997,6 +1000,9 @@ msgstr "Annoncer seulement début d'une programme"
 msgid "Announce by mail"
 msgstr "Annoncer seulement début d'une programme"
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr "Selection"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index f64cec3..3922824 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -709,6 +709,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -952,6 +955,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 2df84b5..7ce420a 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -708,6 +708,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -951,6 +954,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index cc449ec..6079bd3 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -761,6 +761,9 @@ msgstr "Utilizza giorno settimana"
 msgid "Day of week"
 msgstr "Giorno settimana"
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr "Modelli"
 
@@ -1004,6 +1007,9 @@ msgstr "Annuncia e cambia"
 msgid "Announce by mail"
 msgstr "Annuncia tramite email"
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr "Selezione"
 
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 2dfa94d..d1b4d0c 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -756,6 +756,9 @@ msgstr "Naudoti savaitÄ—s dienÄ…"
 msgid "Day of week"
 msgstr "SavaitÄ—s diena"
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr "Å ablonai"
 
@@ -999,6 +1002,9 @@ msgstr "PerspÄ—ti ir perjungti"
 msgid "Announce by mail"
 msgstr "PerspÄ—ti per emailÄ…"
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr "Pasirinkimas"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 5b0b4b0..7d8c0ba 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -749,6 +749,9 @@ msgstr "Gebruik dag van de week"
 msgid "Day of week"
 msgstr "Dag van de week"
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr "Sjablonen"
 
@@ -995,6 +998,9 @@ msgstr "Alleen aankondigen (geen timer)"
 msgid "Announce by mail"
 msgstr "Alleen aankondigen (geen timer)"
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr "Selectie"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index fb5917f..23b51c1 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -708,6 +708,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -951,6 +954,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 9c17efd..7c19bb3 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -708,6 +708,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -951,6 +954,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 502237d..bdf8a4e 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -707,6 +707,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -950,6 +953,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index f690645..3cc11ec 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -708,6 +708,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -951,6 +954,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 4de17b9..2f501d7 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -707,6 +707,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -950,6 +953,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 2668dbc..4fcf93e 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -751,6 +751,9 @@ msgstr " Pou¾i deò v tý¾dni"
 msgid "Day of week"
 msgstr " Deò v tý¾dni"
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr "©ablony"
 
@@ -997,6 +1000,9 @@ msgstr "Iba oznámi»"
 msgid "Announce by mail"
 msgstr "Iba oznámi»"
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr "Vybrané"
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 1d36a8a..25f0dbd 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -708,6 +708,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -951,6 +954,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index eae2489..5b763b7 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -708,6 +708,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -951,6 +954,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index ceebdb2..7bf0fb6 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-01-08 12:15+0100\n"
+"POT-Creation-Date: 2011-05-30 19:07+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"
@@ -707,6 +707,9 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+msgid "Use global"
+msgstr ""
+
 msgid "Button$Templates"
 msgstr ""
 
@@ -950,6 +953,9 @@ msgstr ""
 msgid "Announce by mail"
 msgstr ""
 
+msgid "only globals"
+msgstr ""
+
 msgid "Selection"
 msgstr ""