- don't force display of subtitles in favorites menu

22 files changed, 32 insertions, 85 deletions

diff --git a/menu_searchresults.c b/menu_searchresults.c
index ee4fcab..76fc2c9 100644
--- a/menu_searchresults.c
+++ b/menu_searchresults.c
@@ -101,7 +101,8 @@ bool cMenuSearchResultsItem::Update(bool Force)
       free(buffer);
       buffer = tmp;
 
-      if (!strcasestr(buffer, "%subtitle%")) // make sure, there is a subtitle
+      if (!strcasestr(buffer, "%subtitle%") && cTemplFile::GetTemplateByName("MenuFavorites") != menuTemplate) 
+	// make sure, there is a subtitle
          buffer = strreplacei(buffer, "%title%", "%title% ~ %subtitle%");
       if (episodeOnly)
          buffer = strreplacei(buffer, "%title%", "");
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 41891ee..ef70ea7 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -693,9 +693,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 8420197..0b2d37c 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -691,9 +691,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/da_DK.po b/po/da_DK.po
index 671d800..a6b07ec 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -691,9 +691,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index 1065553..6942d32 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -727,9 +727,6 @@ msgstr "Ausschlussliste anlegen"
 msgid "EPG Commands"
 msgstr "EPG Befehle"
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr "Läuft bereits!"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index 7f19462..7bfbd63 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -691,9 +691,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index f852344..4fcda0d 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -727,9 +727,6 @@ msgstr "Crear lista negra"
 msgid "EPG Commands"
 msgstr "Órdenes EPG"
 
-msgid "Can't switch channel!"
-msgstr "¡No se puede cambiar de canal!"
-
 msgid "Already running!"
 msgstr "¡Ya se está ejecutando!"
 
@@ -1194,6 +1191,9 @@ 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"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index ff9ab86..f2086d6 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -691,9 +691,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index ee0adec..b1e418e 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -731,9 +731,6 @@ msgstr "Lisää mustalle listalle"
 msgid "EPG Commands"
 msgstr "Komennot"
 
-msgid "Can't switch channel!"
-msgstr "Kanavan vaihtaminen ei mahdollista!"
-
 msgid "Already running!"
 msgstr "Nyt menossa!"
 
@@ -1198,6 +1195,9 @@ msgstr "%02ldh"
 msgid "in %02ldm"
 msgstr "%02ldm"
 
+#~ msgid "Can't switch channel!"
+#~ msgstr "Kanavan vaihtaminen ei mahdollista!"
+
 #~ msgid "Edit timer"
 #~ msgstr "Muokkaa ajastinta"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 0b8baa5..f3dde01 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -726,9 +726,6 @@ msgstr "Créer la liste d'exclusions"
 msgid "EPG Commands"
 msgstr "Commande EPG"
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr "Est déjà en cours"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 8c4bcbe..dec5d4d 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -692,9 +692,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 1044a68..8d5303a 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -691,9 +691,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 30d0c36..753db5f 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -729,9 +729,6 @@ msgstr "Crea lista esclusioni"
 msgid "EPG Commands"
 msgstr "Comandi EPG"
 
-msgid "Can't switch channel!"
-msgstr "Impossibile cambiare canale!"
-
 msgid "Already running!"
 msgstr "Già in esecuzione!"
 
@@ -1196,6 +1193,9 @@ msgstr "in %02ldh"
 msgid "in %02ldm"
 msgstr "in %02ldm"
 
+#~ msgid "Can't switch channel!"
+#~ msgstr "Impossibile cambiare canale!"
+
 #~ msgid "Edit timer"
 #~ msgstr "Modifica timer"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index a01537e..4bed52a 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -692,9 +692,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr "EPG kommando's"
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index f67dfba..3418d26 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -691,9 +691,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index bc5de17..f36cc22 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -690,9 +690,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 9149ee1..9056425 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -690,9 +690,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 1afb7dd..fef7d0d 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -691,9 +691,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 08d7b41..40a2d24 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -690,9 +690,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index b4b3b23..1df2b73 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -691,9 +691,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 5bc277f..a1595bc 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -691,9 +691,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 8456f5b..ec99194 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-07 10:18+0100\n"
+"POT-Creation-Date: 2008-01-08 13:18+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"
@@ -690,9 +690,6 @@ msgstr ""
 msgid "EPG Commands"
 msgstr ""
 
-msgid "Can't switch channel!"
-msgstr ""
-
 msgid "Already running!"
 msgstr ""