- spanish translation update for 'only'-plugins

- favorites menu before 'what's on next'
- jump to corresponding broadcast in schedule after shifting in the other menus

32 files changed, 149 insertions, 82 deletions

diff --git a/HISTORY b/HISTORY
index 34d0f77..48a15c3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -23,6 +23,8 @@ new:
 - updated the timercmd-patch for vdr-1.5.12 (patches/timercmd-0.1_1.5.12.diff)
 - added patches/README.patches to describe the existing patches
 - support for new info key behaviour in vdr-1.5.13
+- the favorites menu can now also be displayed after 'Overview - Now' via setup, 
+  suggested by Bittor Corl
 fixes: 
 - shifting the time display: the start time now only gets displayed in 
   'Overview - Now' instead of a progressbar, if there's not already a start time 
diff --git a/HISTORY.DE b/HISTORY.DE
index 84edaa4..905db9b 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -28,6 +28,8 @@ neu:
 - Update des timercmd-patches für vdr-1.5.12 (patches/timercmd-0.1_1.5.12.diff)
 - Neue Datei patches/README.patches für eine Beschreibung der vorhandenen Patches
 - Unterstützung für das neue Info-Key-Verhalten in vdr-1.5.13
+- Das Favoriten-Menü kann jetzt auch per Setup nach 'Übersicht - Jetzt' angezeigt 
+  werden, vorgeschlagen von Bittor Corl
 fixes:
 - Shiften der Uhrzeit: die Startzeit wird jetzt nur noch dann anstelle des 
   Fortschrittsbalken angezeigt, wenn in der Menüvorlage nicht bereits eine
diff --git a/conflictcheckonly.c b/conflictcheckonly.c
index 25a9e1d..bc93b24 100644
--- a/conflictcheckonly.c
+++ b/conflictcheckonly.c
@@ -49,7 +49,7 @@ const tI18nPhrase PhrasesLocal[] = {
    "",				// TODO 
    "Suoratoiminto EPGSearch-laajennoksen ajastimien tarkistukselle",
    "",				// TODO Polski
-   "",				// TODO Español
+   "Acceso directo al menú de conflictos EPGSearch",			// Español
    "",				// TODO ÅëëçíéêÜ (Greek)
    "",				// TODO Svenska
    "",				// TODO Romaneste
@@ -72,7 +72,7 @@ const tI18nPhrase PhrasesLocal[] = {
    "",				// TODO
    "Ajastimien päällekkäisyydet",
    "",				// TODO
-   "",				// TODO
+   "Conflictos de programación",
    "",				// TODO
    "",				// TODO
    "",				// TODO
@@ -95,7 +95,7 @@ const tI18nPhrase PhrasesLocal[] = {
    "",				// TODO
    "seuraava",
    "",				// TODO
-   "",				// TODO
+   "siguiente",
    "",				// TODO
    "",				// TODO
    "",				// TODO
@@ -118,7 +118,7 @@ const tI18nPhrase PhrasesLocal[] = {
    "",				// TODO
    "Näytä päällekkäisyydet päävalikossa",
    "",				// TODO
-   "",				// TODO
+   "Mostrar conflictos en menú principal",
    "",				// TODO
    "",				// TODO
    "",				// TODO
diff --git a/epgsearch.c b/epgsearch.c
index 07bf541..96e4e3c 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -64,7 +64,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include "menu_quicksearch.h"
 #include "menu_announcelist.h"
 
-static const char VERSION[]        = "0.9.24.beta16";
+static const char VERSION[]        = "0.9.24.beta17";
 static const char DESCRIPTION[]    =  trNOOP("search the EPG for repeats and more");
 
 // globals
diff --git a/epgsearchcfg.c b/epgsearchcfg.c
index 8ed31e2..a3c8653 100644
--- a/epgsearchcfg.c
+++ b/epgsearchcfg.c
@@ -105,6 +105,19 @@ int cShowMode::Compare(const cListObject &ListObject) const
 	if (mode == showFavorites && p->mode != showFavorites) return 1;
 	if (p->mode == showFavorites && mode != showFavorites) return -1;
     }
+    if (EPGSearchConfig.showFavoritesMenu == 3)
+    {
+	if (mode == showFavorites)
+	{
+	    if (p->mode < showNext) return 1;
+	    else return -1;
+	}
+	if (p->mode == showFavorites)
+	{
+	    if (mode < showNext) return -1;
+	    else return 1;
+	}
+    }
     if (mode > showNext && p->mode > showNext)
 	return seekTime - p->seekTime;
     else
diff --git a/epgsearchonly.c b/epgsearchonly.c
index 3cdee90..f5a5468 100644
--- a/epgsearchonly.c
+++ b/epgsearchonly.c
@@ -49,7 +49,7 @@ const tI18nPhrase PhrasesLocal[] = {
    "",				// TODO 
    "Suoratoiminto EPGSearch-laajennoksen haulle",
    "",				// TODO Polski
-   "",				// TODO Español
+   "Acceso directo al menú de búsqueda EPGSearch",	// Español
    "",				// TODO ÅëëçíéêÜ (Greek)
    "",				// TODO Svenska
    "",				// TODO Romaneste
@@ -72,7 +72,7 @@ const tI18nPhrase PhrasesLocal[] = {
    "",				// TODO
    "Etsi ohjelmaoppaasta",
    "",				// TODO
-   "",				// TODO
+   "Buscar",
    "",				// TODO
    "",				// TODO
    "",				// TODO
@@ -95,7 +95,7 @@ const tI18nPhrase PhrasesLocal[] = {
    "",				// TODO 
    "EpgSearch-laajennoksen hakutoiminto päävalikossa",
    "",				// TODO Polski
-   "",				// TODO Español
+   "Buscar EPG en menú principal",
    "",				// TODO ÅëëçíéêÜ (Greek)
    "",				// TODO Svenska
    "",				// TODO Romaneste
diff --git a/epgsearchsetup.c b/epgsearchsetup.c
index 2c355c5..e01a469 100644
--- a/epgsearchsetup.c
+++ b/epgsearchsetup.c
@@ -42,7 +42,7 @@ const char *BlueKeyMode[2];
 const char *ProgressbarMode[3];
 const char *StartMenuMode[2];
 const char *AddSubtitleMode[3];
-const char *FavoritesMenuMode[3];
+const char *FavoritesMenuMode[4];
 const char *MailMethod[2];
 
 const char *cMenuSetupMailNotification::HostNameChars    = " abcdefghijklmnopqrstuvwxyz0123456789-._~:";
@@ -123,6 +123,7 @@ cMenuEPGSearchSetup::cMenuEPGSearchSetup(void)
     FavoritesMenuMode[0] = trVDR("no");
     FavoritesMenuMode[1] = tr("before user-def. times");
     FavoritesMenuMode[2] = tr("after user-def. times");
+    FavoritesMenuMode[3] = tr("before 'next'");
 
     MailMethod[0] = "sendmail";
     MailMethod[1] = "sendEmail.pl";
@@ -438,7 +439,7 @@ void cMenuSetupEPGMenus::Set()
     Add(new cMenuEditBoolItem(  tr("Toggle Green/Yellow"), &data->toggleGreenYellow,       trVDR("no"),      trVDR("yes")));
     AddHelp(tr("Help$Specify if green and yellow shall also be switched when pressing '0'."));
 
-    Add(new cMenuEditStraItem(  tr("Show favorites menu"), &data->showFavoritesMenu, 3, FavoritesMenuMode));
+    Add(new cMenuEditStraItem(  tr("Show favorites menu"), &data->showFavoritesMenu, 4, FavoritesMenuMode));
     AddHelp(tr("Help$A favorites menu can display a list of your favorite broadcasts. Enable this if you want an additional menu besides 'Now' and 'Next'\nAny search can be used as a favorite. You only have to set the option 'Use in favorites menu' when editing a search."));
     if (data->showFavoritesMenu)
     {
diff --git a/menu_main.c b/menu_main.c
index 9b38f38..2cc5c54 100644
--- a/menu_main.c
+++ b/menu_main.c
@@ -100,10 +100,10 @@ void cMenuSearchMain::PrepareSchedule(cChannel *Channel)
 	{
 	    const cEvent *PresentEvent = Schedule->GetPresentEvent();
 	    time_t now = time(NULL);
-	    if (shiftTime == 0)
-		now -= Setup.EPGLinger * 60;
-	    else
-		now += shiftTime * 60;
+	    now -= Setup.EPGLinger * 60;
+	    if (shiftTime != 0)
+	      PresentEvent = Schedule->GetEventAround(time(NULL) + shiftTime * 60);
+
 	    time_t lastEventDate = Schedule->Events()->First()->StartTime();
 
 	    //	        timeb tstart;
@@ -141,7 +141,7 @@ void cMenuSearchMain::PrepareSchedule(cChannel *Channel)
     if (shiftTime)
     {
 	char *buffer = NULL;
-	asprintf(&buffer, "%s (%s%dh %dm)", Channel->Name(), shiftTime>0?"+":"", shiftTime/60, shiftTime%60);
+	asprintf(&buffer, "%s (%s%dh %dm)", Channel->Name(), shiftTime>0?"+":"", shiftTime/60, abs(shiftTime)%60);
 	SetTitle(buffer);
 	free(buffer);
     }
@@ -504,11 +504,19 @@ eOSState cMenuSearchMain::ProcessKey(eKeys Key)
       InWhatsOnMenu = false;
       InFavoritesMenu = false;
       if (ch) {
-	  PrepareSchedule(ch);
-	  if (ch->Number() != cDevice::CurrentChannel()) {
-	      otherChannel = ch->Number();
+       	if (cMenuWhatsOnSearch::shiftTime)
+	  {
+	    time_t diff = cMenuWhatsOnSearch::seekTime - time(NULL);
+	    shiftTime = (diff + (diff>0?30:-30)) / 60 ;
 	  }
-	  Display();
+	else
+	  shiftTime = 0;
+ 
+	PrepareSchedule(ch);
+	if (ch->Number() != cDevice::CurrentChannel()) {
+	  otherChannel = ch->Number();
+	}
+	Display();
       }
       else if ((HadSubMenu || gl_TimerProgged) && Update())
       {
diff --git a/menu_whatson.c b/menu_whatson.c
index 4430b67..a36bd6b 100644
--- a/menu_whatson.c
+++ b/menu_whatson.c
@@ -206,6 +206,8 @@ showMode cMenuWhatsOnSearch::currentShowMode = showNow;
 cChannel *cMenuWhatsOnSearch::scheduleChannel = NULL;
 extern const char *ShowModes[];
 cList<cShowMode> cMenuWhatsOnSearch::showModes;
+time_t cMenuWhatsOnSearch::seekTime = 0;
+int cMenuWhatsOnSearch::shiftTime = 0;
 
 cMenuWhatsOnSearch::cMenuWhatsOnSearch(const cSchedules *Schedules, int CurrentChannelNr)
    :cOsdMenu("", GetTab(1), GetTab(2), GetTab(3), GetTab(4), GetTab(5))
@@ -264,29 +266,29 @@ void cMenuWhatsOnSearch::LoadSchedules()
    Clear();
    eventObjects.Clear();
    
-   time_t SeekTime;
+   //   time_t SeekTime;
    char* szTitle = NULL;
    cShowMode* mode = GetShowMode(currentShowMode);
 
    if (shiftTime != 0)
    {
       if (currentShowMode == showNow || currentShowMode == showNext)
-         SeekTime = time(NULL);
+         seekTime = time(NULL);
       else
       {
          if (mode)
-            SeekTime = GetTimeT(mode->GetTime());
-         if (SeekTime < time(NULL)) SeekTime += HOURS2SECS(24);	
+            seekTime = GetTimeT(mode->GetTime());
+         if (seekTime < time(NULL)) seekTime += HOURS2SECS(24);	
       }
-      SeekTime += shiftTime*60;
+      seekTime += shiftTime*60;
 	
       struct tm tm_r;
       time_t now = time(NULL);
 
-      tm tm_seek = *localtime_r(&SeekTime, &tm_r);
+      tm tm_seek = *localtime_r(&seekTime, &tm_r);
       tm tm_now = *localtime_r(&now, &tm_r);
       if (tm_seek.tm_mday != tm_now.tm_mday)
-         asprintf(&szTitle, "%s - %s", tr("Overview"), DAYDATETIME(SeekTime));
+         asprintf(&szTitle, "%s - %s", tr("Overview"), DAYDATETIME(seekTime));
       else
          asprintf(&szTitle, "%s - %02d:%02d", tr("Overview"), tm_seek.tm_hour, tm_seek.tm_min);
    }
@@ -294,11 +296,11 @@ void cMenuWhatsOnSearch::LoadSchedules()
    {
       if (mode)
       {
-         SeekTime = GetTimeT(mode->GetTime());
-         if (SeekTime < time(NULL) && currentShowMode != showNow && currentShowMode != showNext)
+         seekTime = GetTimeT(mode->GetTime());
+         if (seekTime < time(NULL) && currentShowMode != showNow && currentShowMode != showNext)
          {
-            SeekTime += HOURS2SECS(24);	
-            asprintf(&szTitle, "%s - %s (%s)", tr("Overview"), mode->GetDescription(), *WeekDayName(SeekTime));    
+            seekTime += HOURS2SECS(24);	
+            asprintf(&szTitle, "%s - %s (%s)", tr("Overview"), mode->GetDescription(), *WeekDayName(seekTime));    
          }
          else
             asprintf(&szTitle, "%s - %s", tr("Overview"), mode->GetDescription());    
@@ -332,7 +334,7 @@ void cMenuWhatsOnSearch::LoadSchedules()
          if (Schedule) 
          {		
             if (shiftTime != 0)
-               Event = Schedule->GetEventAround(SeekTime);
+               Event = Schedule->GetEventAround(seekTime);
             else
             {
                switch(currentShowMode)
@@ -348,7 +350,7 @@ void cMenuWhatsOnSearch::LoadSchedules()
                   case showUserMode2:
                   case showUserMode3:
                   case showUserMode4:
-                     Event = Schedule->GetEventAround(SeekTime);
+                     Event = Schedule->GetEventAround(seekTime);
                      break;
                }
             }
diff --git a/menu_whatson.h b/menu_whatson.h
index ada70a3..cae5632 100644
--- a/menu_whatson.h
+++ b/menu_whatson.h
@@ -56,7 +56,8 @@ private:
   static cChannel *scheduleChannel;
   static cList<cShowMode> showModes;
   static showMode currentShowMode;
-  int shiftTime;
+  static int shiftTime;
+  static time_t seekTime;
   time_t GetTimeT(int iTime);
   static showMode GetNextMode();
   cMenuWhatsOnSearch(const cSchedules *Schedules, int CurrentChannelNr);
diff --git a/po/ca_ES.po b/po/ca_ES.po
index ef70ea7..7ab2932 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -115,6 +115,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 0b2d37c..b287213 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -113,6 +113,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/po/da_DK.po b/po/da_DK.po
index a6b07ec..7c26977 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -113,6 +113,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 6942d32..c0989de 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:35+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"
@@ -112,6 +112,9 @@ msgstr "vor ben.-def. Zeiten"
 msgid "after user-def. times"
 msgstr "nach ben.-def. Zeiten"
 
+msgid "before 'next'"
+msgstr "vor 'Nächste'"
+
 msgid "General"
 msgstr "Allgemein"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 7bfbd63..ef92ecc 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -113,6 +113,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 4fcda0d..b235e27 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -112,6 +112,9 @@ msgstr "antes hora-def."
 msgid "after user-def. times"
 msgstr "después hora-def."
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr "General"
 
@@ -1191,11 +1194,3 @@ msgstr "en %02ldh"
 msgid "in %02ldm"
 msgstr "en %02ldm"
 
-#~ msgid "Can't switch channel!"
-#~ msgstr "¡No se puede cambiar de canal!"
-
-#~ msgid "Edit timer"
-#~ msgstr "Editar programación"
-
-#~ msgid "Delete timer?"
-#~ msgstr "¿Borrar programación?"
diff --git a/po/et_EE.po b/po/et_EE.po
index f2086d6..7818b86 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -113,6 +113,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index b1e418e..f4aad3a 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -115,6 +115,9 @@ msgstr "ennen ajankohtia"
 msgid "after user-def. times"
 msgstr "ajankohtien jälkeen"
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr "Yleiset"
 
@@ -1195,11 +1198,3 @@ msgstr "%02ldh"
 msgid "in %02ldm"
 msgstr "%02ldm"
 
-#~ msgid "Can't switch channel!"
-#~ msgstr "Kanavan vaihtaminen ei mahdollista!"
-
-#~ msgid "Edit timer"
-#~ msgstr "Muokkaa ajastinta"
-
-#~ msgid "Delete timer?"
-#~ msgstr "Poistetaanko ajastin?"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index f3dde01..3966fb6 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+0100\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -115,6 +115,9 @@ msgstr "avant le temp utilisateur"
 msgid "after user-def. times"
 msgstr "après le temp utilisateur"
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr "Général"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index dec5d4d..b1693fd 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -114,6 +114,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 8d5303a..7270705 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -113,6 +113,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 753db5f..8b40695 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+0100\n"
 "PO-Revision-Date: 2007-12-30 04:09+0100\n"
 "Last-Translator: Gringo <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -114,6 +114,9 @@ msgstr "prima orari def. da utente"
 msgid "after user-def. times"
 msgstr "dopo orari def. da utente"
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr "Generale"
 
@@ -1193,11 +1196,3 @@ msgstr "in %02ldh"
 msgid "in %02ldm"
 msgstr "in %02ldm"
 
-#~ msgid "Can't switch channel!"
-#~ msgstr "Impossibile cambiare canale!"
-
-#~ msgid "Edit timer"
-#~ msgstr "Modifica timer"
-
-#~ msgid "Delete timer?"
-#~ msgstr "Cancellare timer?"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 91ed0ec..deb9519 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-01-16 19:02+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -114,6 +114,9 @@ msgstr "vóór gebruiker-gedef. tijden"
 msgid "after user-def. times"
 msgstr "ná gebruiker-gedef. tijden"
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr "Algemeen"
 
@@ -1185,4 +1188,3 @@ msgstr "in %02ldh"
 #, c-format
 msgid "in %02ldm"
 msgstr "in %02ldm"
-
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 3418d26..bbe1fa6 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -113,6 +113,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index f36cc22..0209067 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -112,6 +112,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 9056425..77e8fee 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -112,6 +112,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index fef7d0d..99a137c 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -113,6 +113,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 40a2d24..3bce87c 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -112,6 +112,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 1df2b73..1f9e5d5 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -113,6 +113,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index a1595bc..83d227b 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -113,6 +113,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index ec99194..aad759e 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-01-08 13:18+0100\n"
+"POT-Creation-Date: 2008-01-17 13:36+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"
@@ -112,6 +112,9 @@ msgstr ""
 msgid "after user-def. times"
 msgstr ""
 
+msgid "before 'next'"
+msgstr ""
+
 msgid "General"
 msgstr ""
 
diff --git a/quickepgsearch.c b/quickepgsearch.c
index 963d1f8..143da19 100644
--- a/quickepgsearch.c
+++ b/quickepgsearch.c
@@ -47,7 +47,7 @@ const tI18nPhrase PhrasesLocal[] =
         "",// TODO 
         "Pikahaku ohjelmaoppaalle",// suomi
         "",// TODO Polski
-        "",// TODO Español
+        "Búsqueda rápida de emisiones",// Español
         "",// TODO ÅëëçíéêÜ (Greek)
         "",// TODO Svenska
         "",// TODO Romaneste
@@ -70,7 +70,7 @@ const tI18nPhrase PhrasesLocal[] =
         "",// TODO
         "Pikahaku",
         "",// TODO
-        "",// TODO
+        "Búsqueda rápida",
         "",// TODO
         "",// TODO
         "",// TODO
@@ -93,7 +93,7 @@ const tI18nPhrase PhrasesLocal[] =
         "",// TODO
         "Näytä valinta päävalikossa",
         "",// TODO
-        "",// TODO
+        "Mostrar en menú principal",
         "",// TODO
         "",// TODO
         "",// TODO