diff options
| -rw-r--r-- | epgsearch.c | 2 | ||||
| -rw-r--r-- | menu_myedittimer.c | 6 | ||||
| -rw-r--r-- | po/ca_ES.po | 7 | ||||
| -rw-r--r-- | po/cs_CZ.po | 7 | ||||
| -rw-r--r-- | po/da_DK.po | 7 | ||||
| -rw-r--r-- | po/de_DE.po | 7 | ||||
| -rw-r--r-- | po/el_GR.po | 7 | ||||
| -rw-r--r-- | po/es_ES.po | 13 | ||||
| -rw-r--r-- | po/et_EE.po | 7 | ||||
| -rw-r--r-- | po/fi_FI.po | 13 | ||||
| -rw-r--r-- | po/fr_FR.po | 13 | ||||
| -rw-r--r-- | po/hr_HR.po | 7 | ||||
| -rw-r--r-- | po/hu_HU.po | 7 | ||||
| -rw-r--r-- | po/it_IT.po | 13 | ||||
| -rw-r--r-- | po/nl_NL.po | 13 | ||||
| -rw-r--r-- | po/nn_NO.po | 7 | ||||
| -rw-r--r-- | po/pl_PL.po | 7 | ||||
| -rw-r--r-- | po/pt_PT.po | 7 | ||||
| -rw-r--r-- | po/ro_RO.po | 7 | ||||
| -rw-r--r-- | po/ru_RU.po | 7 | ||||
| -rw-r--r-- | po/sl_SI.po | 7 | ||||
| -rw-r--r-- | po/sv_SE.po | 7 | ||||
| -rw-r--r-- | po/tr_TR.po | 7 | ||||
| -rw-r--r-- | searchtimer_thread.c | 1 |
24 files changed, 119 insertions, 67 deletions
diff --git a/epgsearch.c b/epgsearch.c index 9258a92..3afa1c1 100644 --- a/epgsearch.c +++ b/epgsearch.c @@ -66,7 +66,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch #include "menu_announcelist.h" #include "confdloader.h" -static const char VERSION[] = "0.9.25.beta12"; +static const char VERSION[] = "0.9.25.beta13"; static const char DESCRIPTION[] = trNOOP("search the EPG for repeats and more"); // globals diff --git a/menu_myedittimer.c b/menu_myedittimer.c index 6cacff2..0d1b8e8 100644 --- a/menu_myedittimer.c +++ b/menu_myedittimer.c @@ -197,9 +197,9 @@ cMenuMyEditTimer::~cMenuMyEditTimer() void cMenuMyEditTimer::HandleSubtitle() { const char* ItemText = Get(Current())->Text(); - if (strstr(ItemText, tr("File")) != ItemText) + if (strstr(ItemText, trVDR("File")) != ItemText) return; - if (InEditMode(ItemText, tr("File"), file)) + if (InEditMode(ItemText, trVDR("File"), file)) return; if (!event || (event && !event->ShortText())) @@ -305,7 +305,7 @@ eOSState cMenuMyEditTimer::ProcessKey(eKeys Key) } if ((Key == kYellow) && ((iOnDirectoryItem && !InEditMode(ItemText, tr("Directory"), directory)) || - (iOnFileItem && !InEditMode(ItemText, tr("File"), file)))) + (iOnFileItem && !InEditMode(ItemText, trVDR("File"), file)))) { if (iOnDirectoryItem) strcpy(directory, ""); diff --git a/po/ca_ES.po b/po/ca_ES.po index 0569d66..cd41cd0 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -9,7 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/ca_ES.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/ca_ES.po "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Jordi Vilà <jvila@tinet.org>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -780,9 +784,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index efc57b3..5cf6494 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/cs_CZ.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/cs_CZ.po "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" @@ -778,9 +782,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/po/da_DK.po b/po/da_DK.po index 956da7f..9382216 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/da_DK.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/da_DK.po "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -778,9 +782,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index f2f03ab..cba93dd 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/de_DE.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/de_DE.po "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -814,9 +818,6 @@ msgstr "Überwachung" msgid "recording with device" msgstr "Aufnahme mit Gerät" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "Mit Untertitel" diff --git a/po/el_GR.po b/po/el_GR.po index 0ee8831..63f7900 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/el_GR.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/el_GR.po "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -778,9 +782,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 66a6a3e..d0dc486 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/es_ES.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/es_ES.po "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" @@ -815,9 +819,6 @@ msgstr "Comprobación" msgid "recording with device" msgstr "grabación con dispositivo" -msgid "File" -msgstr "Archivo" - msgid "Button$With subtitle" msgstr "Con subtítulo" @@ -1221,6 +1222,12 @@ msgstr "en %02ldh" msgid "in %02ldm" msgstr "en %02ldm" +<<<<<<< HEAD:po/es_ES.po +#~ msgid "File" +#~ msgstr "Archivo" + +======= +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/es_ES.po #~ msgid "Day" #~ msgstr "Día" diff --git a/po/et_EE.po b/po/et_EE.po index bf3111a..c08fc02 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/et_EE.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/et_EE.po "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -778,9 +782,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index 29395a7..19093b8 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -10,7 +10,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/fi_FI.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/fi_FI.po "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" @@ -818,9 +822,6 @@ msgstr "Valvontatapa" msgid "recording with device" msgstr "Tallennetaan laitteella" -msgid "File" -msgstr "Tiedosto" - msgid "Button$With subtitle" msgstr "Kuvaus" @@ -1220,5 +1221,11 @@ msgstr "%02ldh" msgid "in %02ldm" msgstr "%02ldm" +<<<<<<< HEAD:po/fi_FI.po +#~ msgid "File" +#~ msgstr "Tiedosto" + +======= +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/fi_FI.po #~ msgid "Day" #~ msgstr "Päivä" diff --git a/po/fr_FR.po b/po/fr_FR.po index 5909c0c..fa3d514 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -10,7 +10,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/fr_FR.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/fr_FR.po "PO-Revision-Date: 2008-04-30 08:36+0200\n" "Last-Translator: Patrice Staudt <patrice.staudt@laposte.net>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -814,9 +818,6 @@ msgstr "surveiller" msgid "recording with device" msgstr "Enregistrement avec appareil" -msgid "File" -msgstr "Fichier" - msgid "Button$With subtitle" msgstr "Avec les sous-titres" @@ -1212,6 +1213,12 @@ msgstr "en %02ldh" msgid "in %02ldm" msgstr "en %02ldm" +<<<<<<< HEAD:po/fr_FR.po +#~ msgid "File" +#~ msgstr "Fichier" + +======= +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/fr_FR.po #~ msgid "Day" #~ msgstr "Jour" diff --git a/po/hr_HR.po b/po/hr_HR.po index 7b8ba0a..5dcddca 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -8,7 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/hr_HR.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/hr_HR.po "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" @@ -779,9 +783,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index be96ca9..1df2167 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -8,7 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/hu_HU.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/hu_HU.po "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" @@ -778,9 +782,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index fd5b790..91edc77 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -9,7 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/it_IT.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/it_IT.po "PO-Revision-Date: 2008-06-29 03:25+0100\n" "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -817,9 +821,6 @@ msgstr "Verifica timer" msgid "recording with device" msgstr "registra con scheda" -msgid "File" -msgstr "File" - msgid "Button$With subtitle" msgstr "Con sottotitoli" @@ -1223,6 +1224,12 @@ msgstr "in %02ldh" msgid "in %02ldm" msgstr "in %02ldm" +<<<<<<< HEAD:po/it_IT.po +#~ msgid "File" +#~ msgstr "File" + +======= +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/it_IT.po #~ msgid "Day" #~ msgstr "Giorno" diff --git a/po/nl_NL.po b/po/nl_NL.po index 7689491..d2dd02a 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -9,7 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/nl_NL.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/nl_NL.po "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" @@ -812,9 +816,6 @@ msgstr "Timercontrole" msgid "recording with device" msgstr "neemt op met kaart" -msgid "File" -msgstr "Bestand" - msgid "Button$With subtitle" msgstr "Met ondertitel" @@ -1216,6 +1217,12 @@ msgstr "in %02ldh" msgid "in %02ldm" msgstr "in %02ldm" +<<<<<<< HEAD:po/nl_NL.po +#~ msgid "File" +#~ msgstr "Bestand" + +======= +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/nl_NL.po #~ msgid "Day" #~ msgstr "Dag" diff --git a/po/nn_NO.po b/po/nn_NO.po index 6c4c684..dce9409 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -8,7 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/nn_NO.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/nn_NO.po "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Truls Slevigen <truls@slevigen.no>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -778,9 +782,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index b5d4f77..2c0d4c4 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/pl_PL.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/pl_PL.po "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Michael Rakowski <mrak@gmx.de>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -778,9 +782,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/po/pt_PT.po b/po/pt_PT.po index 7ea83a6..cbc3b73 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/pt_PT.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/pt_PT.po "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -777,9 +781,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/po/ro_RO.po b/po/ro_RO.po index 6a15366..846f733 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -8,7 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/ro_RO.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/ro_RO.po "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" @@ -778,9 +782,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 4ba218d..a4aa872 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/ru_RU.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/ru_RU.po "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -777,9 +781,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/po/sl_SI.po b/po/sl_SI.po index 5424f0b..f1f38f6 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -8,7 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/sl_SI.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/sl_SI.po "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" @@ -778,9 +782,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index 2184f05..75a43ca 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -8,7 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/sv_SE.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/sv_SE.po "PO-Revision-Date: 2007-08-14 20:21+0200\n" "Last-Translator: Tomas Prybil <tomas@prybil.se>\n" "Language-Team: <vdr@linuxtv.org>\n" @@ -778,9 +782,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/po/tr_TR.po b/po/tr_TR.po index be7de18..a5d994f 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -7,7 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n" +<<<<<<< HEAD:po/tr_TR.po +"POT-Creation-Date: 2009-04-09 19:51+0200\n" +======= "POT-Creation-Date: 2009-04-06 23:03+0200\n" +>>>>>>> 47f9a76b9e8c6611c218f24361b5afcac4ab3052:po/tr_TR.po "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" @@ -777,9 +781,6 @@ msgstr "" msgid "recording with device" msgstr "" -msgid "File" -msgstr "" - msgid "Button$With subtitle" msgstr "" diff --git a/searchtimer_thread.c b/searchtimer_thread.c index af89714..dfd3432 100644 --- a/searchtimer_thread.c +++ b/searchtimer_thread.c @@ -215,6 +215,7 @@ void cSearchTimerThread::Action(void) if (updateForced & UPDS_WITH_EPGSCAN) { LogFile.Log(1,"starting EPG scan before search timer update"); + EITScanner.ForceScan(); do { Wait.Wait(1000); |