From 2a467206e570515caaf24279ca461464d39db7cb Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Sun, 22 Feb 2009 11:00:44 +0100 Subject: some fixes for the new 'announce and switch' property of search timers --- epgsearch.c | 2 +- po/ca_ES.po | 4 ++-- po/cs_CZ.po | 4 ++-- po/da_DK.po | 4 ++-- po/de_DE.po | 8 +++----- po/el_GR.po | 4 ++-- po/es_ES.po | 12 ++++++++---- po/et_EE.po | 4 ++-- po/fi_FI.po | 12 ++++++++---- po/fr_FR.po | 12 ++++++++---- po/hr_HR.po | 4 ++-- po/hu_HU.po | 4 ++-- po/it_IT.po | 12 ++++++++---- po/nl_NL.po | 12 ++++++++---- po/nn_NO.po | 4 ++-- po/pl_PL.po | 4 ++-- po/pt_PT.po | 4 ++-- po/ro_RO.po | 4 ++-- po/ru_RU.po | 4 ++-- po/sl_SI.po | 4 ++-- po/sv_SE.po | 4 ++-- po/tr_TR.po | 4 ++-- switchtimer_thread.c | 6 +++--- 23 files changed, 77 insertions(+), 59 deletions(-) diff --git a/epgsearch.c b/epgsearch.c index 1646454..d4d26da 100644 --- a/epgsearch.c +++ b/epgsearch.c @@ -69,7 +69,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch #include #endif -static const char VERSION[] = "0.9.25.beta9"; +static const char VERSION[] = "0.9.25.beta10"; static const char DESCRIPTION[] = trNOOP("search the EPG for repeats and more"); // globals diff --git a/po/ca_ES.po b/po/ca_ES.po index 4d1b512..f5e3732 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Jordi Vilà \n" "Language-Team: \n" @@ -1159,7 +1159,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index cbd8fa4..30ffadb 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Vladimír Bárta \n" "Language-Team: \n" @@ -1157,7 +1157,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/po/da_DK.po b/po/da_DK.po index 3bca8af..4289e89 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Mogens Elneff \n" "Language-Team: \n" @@ -1157,7 +1157,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/po/de_DE.po b/po/de_DE.po index 94d8766..5958fe9 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Klaus Schmidinger \n" "Language-Team: \n" @@ -1201,8 +1201,8 @@ msgid "Search timer update done!" msgstr "Suchtimer-Update durchgeführt!" #, c-format -msgid "%s starts: switch to?" -msgstr "%s startet: Umschalten?" +msgid "Switch to (%d) '%s'?" +msgstr "Umschalten zu (%d) '%s'?" msgid "Programming timer failed!" msgstr "Timer-Programmierung fehlschlagen!" @@ -1219,5 +1219,3 @@ msgstr "in %02ldh" msgid "in %02ldm" msgstr "in %02ldm" -#~ msgid "Ask for switching" -#~ msgstr "Umschalten erfragen?" diff --git a/po/el_GR.po b/po/el_GR.po index 8aae8c5..ddb251d 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Dimitrios Dimitrakos \n" "Language-Team: \n" @@ -1157,7 +1157,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/po/es_ES.po b/po/es_ES.po index 98bea28..80a7e25 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-11-18 20:09+0200\n" "Last-Translator: bittor from open7x0.org \n" "Language-Team: \n" @@ -1205,9 +1205,9 @@ msgstr " msgid "Search timer update done!" msgstr "¡Programación por búsqueda actualizada!" -#, fuzzy, c-format -msgid "%s starts: switch to?" -msgstr "¿Añadir a la lista de cambio?" +#, c-format +msgid "Switch to (%d) '%s'?" +msgstr "" msgid "Programming timer failed!" msgstr "¡La programación ha fallado!" @@ -1224,6 +1224,10 @@ msgstr "en %02ldh" msgid "in %02ldm" msgstr "en %02ldm" +#, fuzzy +#~ msgid "%s starts: switch to?" +#~ msgstr "¿Añadir a la lista de cambio?" + #, fuzzy #~ msgid "Ask for switching" #~ msgstr "¿Añadir a la lista de cambio?" diff --git a/po/et_EE.po b/po/et_EE.po index df2bfef..16ebbe9 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Arthur Konovalov \n" "Language-Team: \n" @@ -1157,7 +1157,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/po/fi_FI.po b/po/fi_FI.po index 3cd4a01..28555df 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Rolf Ahrenberg \n" "Language-Team: \n" @@ -1209,9 +1209,9 @@ msgstr "Löydettiin %d uutta lähetystä! Näytetäänkö?" msgid "Search timer update done!" msgstr "Hakuajastimet päivitetty!" -#, fuzzy, c-format -msgid "%s starts: switch to?" -msgstr "Lisätäänkö kanavanvaihtolistalle?" +#, c-format +msgid "Switch to (%d) '%s'?" +msgstr "" msgid "Programming timer failed!" msgstr "Ajastimen ohjelmointi epäonnistui!" @@ -1228,6 +1228,10 @@ msgstr "%02ldh" msgid "in %02ldm" msgstr "%02ldm" +#, fuzzy +#~ msgid "%s starts: switch to?" +#~ msgstr "Lisätäänkö kanavanvaihtolistalle?" + #, fuzzy #~ msgid "Ask for switching" #~ msgstr "Lisätäänkö kanavanvaihtolistalle?" diff --git a/po/fr_FR.po b/po/fr_FR.po index 455f0a3..c69c36b 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2008-04-30 08:36+0200\n" "Last-Translator: Patrice Staudt \n" "Language-Team: \n" @@ -1196,9 +1196,9 @@ msgstr "Afficher les %d nouvelles msgid "Search timer update done!" msgstr "La mise à jours de recherche est effectuée!" -#, fuzzy, c-format -msgid "%s starts: switch to?" -msgstr "Ajouter à la liste de changement de chaine?" +#, c-format +msgid "Switch to (%d) '%s'?" +msgstr "" msgid "Programming timer failed!" msgstr "La programmation a échoué" @@ -1215,6 +1215,10 @@ msgstr "en %02ldh" msgid "in %02ldm" msgstr "en %02ldm" +#, fuzzy +#~ msgid "%s starts: switch to?" +#~ msgstr "Ajouter à la liste de changement de chaine?" + #, fuzzy #~ msgid "Ask for switching" #~ msgstr "Ajouter à la liste de changement de chaine?" diff --git a/po/hr_HR.po b/po/hr_HR.po index d86e85d..e29a209 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Drazen Dupor \n" "Language-Team: \n" @@ -1158,7 +1158,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/po/hu_HU.po b/po/hu_HU.po index f1ab76d..82ac42f 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Istvan Koenigsberger , Guido Josten \n" "Language-Team: \n" @@ -1157,7 +1157,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/po/it_IT.po b/po/it_IT.po index ec17b0d..8f80e21 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2008-06-29 03:25+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: \n" @@ -1207,9 +1207,9 @@ msgstr "%d nuove emittenti trovate! Mostrarle?" msgid "Search timer update done!" msgstr "Aggiornamento timer ricerca completato!" -#, fuzzy, c-format -msgid "%s starts: switch to?" -msgstr "Aggiungere alla lista modifiche?" +#, c-format +msgid "Switch to (%d) '%s'?" +msgstr "" msgid "Programming timer failed!" msgstr "Programmazione timer fallito!" @@ -1226,6 +1226,10 @@ msgstr "in %02ldh" msgid "in %02ldm" msgstr "in %02ldm" +#, fuzzy +#~ msgid "%s starts: switch to?" +#~ msgstr "Aggiungere alla lista modifiche?" + #, fuzzy #~ msgid "Ask for switching" #~ msgstr "Aggiungere alla lista modifiche?" diff --git a/po/nl_NL.po b/po/nl_NL.po index 65e63a4..49d4327 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Maarten Wisse \n" "Language-Team: \n" @@ -1200,9 +1200,9 @@ msgstr "%d nieuwe uitzending(en) gevonden! Tonen?" msgid "Search timer update done!" msgstr "Verversen zoektimer gereed!" -#, fuzzy, c-format -msgid "%s starts: switch to?" -msgstr "Voeg toe aan schakellijst?" +#, c-format +msgid "Switch to (%d) '%s'?" +msgstr "" msgid "Programming timer failed!" msgstr "Programmeren timer mislukt!" @@ -1219,6 +1219,10 @@ msgstr "in %02ldh" msgid "in %02ldm" msgstr "in %02ldm" +#, fuzzy +#~ msgid "%s starts: switch to?" +#~ msgstr "Voeg toe aan schakellijst?" + #, fuzzy #~ msgid "Ask for switching" #~ msgstr "Voeg toe aan schakellijst?" diff --git a/po/nn_NO.po b/po/nn_NO.po index 3080e13..12475fd 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Truls Slevigen \n" "Language-Team: \n" @@ -1157,7 +1157,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/po/pl_PL.po b/po/pl_PL.po index 1aa6029..b5b39ac 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Michael Rakowski \n" "Language-Team: \n" @@ -1157,7 +1157,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/po/pt_PT.po b/po/pt_PT.po index 202537d..8d103eb 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Paulo Lopes \n" "Language-Team: \n" @@ -1156,7 +1156,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/po/ro_RO.po b/po/ro_RO.po index d6a9368..1edce05 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Lucian Muresan \n" "Language-Team: \n" @@ -1157,7 +1157,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/po/ru_RU.po b/po/ru_RU.po index 60a8f1d..9895fda 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Vyacheslav Dikonov \n" "Language-Team: \n" @@ -1156,7 +1156,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/po/sl_SI.po b/po/sl_SI.po index e7563a1..0f32e95 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Matjaz Thaler \n" "Language-Team: \n" @@ -1157,7 +1157,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/po/sv_SE.po b/po/sv_SE.po index 1e0f3ce..55d93c3 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Tomas Prybil \n" "Language-Team: \n" @@ -1157,7 +1157,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/po/tr_TR.po b/po/tr_TR.po index c5fa539..c863d2e 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: \n" -"POT-Creation-Date: 2009-01-29 18:55+0100\n" +"POT-Creation-Date: 2009-02-22 10:57+0100\n" "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Oktay Yolgeçen \n" "Language-Team: \n" @@ -1156,7 +1156,7 @@ msgid "Search timer update done!" msgstr "" #, c-format -msgid "%s starts: switch to?" +msgid "Switch to (%d) '%s'?" msgstr "" msgid "Programming timer failed!" diff --git a/switchtimer_thread.c b/switchtimer_thread.c index 88d4696..dda24e9 100644 --- a/switchtimer_thread.c +++ b/switchtimer_thread.c @@ -27,7 +27,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch #include #include -#define MSG_DELAY 5 +#define MSG_DELAY 7 #define SWITCHTIMER_WAIT 20 cSwitchTimerThread *cSwitchTimerThread::m_Instance = NULL; @@ -113,8 +113,8 @@ void cSwitchTimerThread::Action(void) if (doAsk) { - cString Message = cString::sprintf(tr("%s starts: switch to?"), event->Title()); - if(SendMsg(Message, true,7) == kOk) + cString Message = cString::sprintf(tr("Switch to (%d) '%s'?"), channel->Number(), event->Title()); + if(SendMsg(Message, true, MSG_DELAY) == kOk) { LogFile.Log(1,"switching to channel %d", channel->Number()); if (cDevice::CurrentChannel() != channel->Number()) -- cgit v1.2.3