From d2a03a79176fce81ebe87b2263fa988df1eb547c Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Fri, 17 Apr 2009 00:02:58 +0200 Subject: Integrated a patch against LIVE 0.2.0 which adds channel numbers. The patch was contributed by John Germs, Chavonbravo from CaptiveWorks (see http://captiveworks.org/open-source/vdr-live/ ) --- CONTRIBUTORS | 7 ++-- i18n-generated.h | 102 ++++++++++++++++++++++++++-------------------------- pages/remote.ecpp | 28 ++++++++++++++- pages/schedule.ecpp | 9 ++++- pages/vlc.ecpp | 2 +- pages/whats_on.ecpp | 4 +-- po/ca_ES.po | 12 +++---- po/cs_CZ.po | 12 +++---- po/da_DK.po | 12 +++---- po/de_DE.po | 23 +++++++----- po/el_GR.po | 12 +++---- po/es_ES.po | 12 +++---- po/et_EE.po | 12 +++---- po/fi_FI.po | 23 +++++++----- po/fr_FR.po | 23 +++++++----- po/hr_HR.po | 12 +++---- po/hu_HU.po | 12 +++---- po/it_IT.po | 23 +++++++----- po/nl_NL.po | 15 ++++---- po/nn_NO.po | 12 +++---- po/pl_PL.po | 12 +++---- po/pt_PT.po | 12 +++---- po/ro_RO.po | 12 +++---- po/ru_RU.po | 12 +++---- po/sl_SI.po | 12 +++---- po/sv_SE.po | 12 +++---- po/tr_TR.po | 12 +++---- 27 files changed, 258 insertions(+), 193 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 9e1b234..5fe0f49 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -12,7 +12,7 @@ Rolf Ahrenberg vlc plugin for firefox. And a lot of usefull hints about the features of the vlc plugins, some of which still need to be added to LIVE. -Patrice Staudt +Patrice Staudt (in memoriam) for the french translations. Matthias Kortstiege @@ -21,4 +21,7 @@ Matthias Kortstiege Recomended is tntnet version 1.6.2 and higher. Diego Pierotto - for the italian translations. \ No newline at end of file + for the italian translations. + +John Germs, Chavonbravo from Captive Works (http://captiveworks.org) + for the addition of channel numbers on the live pages. diff --git a/i18n-generated.h b/i18n-generated.h index b6ee0e3..f24bcec 100644 --- a/i18n-generated.h +++ b/i18n-generated.h @@ -6941,15 +6941,15 @@ const tI18nPhrase Phrases[] = { "", #endif }, - { "Interval", - "Intervall", + { "Couldn't find channel or no channels available. Maybe you mistyped your request?", + "Konnte Kanal nicht finden oder keine Kanäle verfügbar. Ist die Anfrage korrekt?", "", - "Intervallo", + "Impossibile trovare canale o canali disponibili. Hai digitato correttamente la richiesta?", "", "", - "Intervalle", + "N'a pas pu trouver la chaîne. Votre requête est t'elle corrête? ", "", - "Päivitysväli", + "Kanavaa ei löydy. Kirjoititko varmasti oikein?", "", "", "", @@ -6976,15 +6976,15 @@ const tI18nPhrase Phrases[] = { "", #endif }, - { "Couldn't find channel or no channels available. Maybe you mistyped your request?", - "Konnte Kanal nicht finden oder keine Kanäle verfügbar. Ist die Anfrage korrekt?", - "", - "Impossibile trovare canale o canali disponibili. Hai digitato correttamente la richiesta?", + { "Snapshot interval", + "Bereich", "", + "intervallo", + "interval", "", - "N'a pas pu trouver la chaîne. Votre requête est t'elle corrête? ", + "intervalle", "", - "Kanavaa ei löydy. Kirjoititko varmasti oikein?", + "kyllä", "", "", "", @@ -7081,15 +7081,15 @@ const tI18nPhrase Phrases[] = { "", #endif }, - { "Show schedule of channel", - "Zeige Programm dieses Kanals", + { "Channel", + "Kanal", "", - "Mostra scheda programmi canale", + "Canale", "", "", - "Montrer le programme de la chaîne", + "Chaîne", "", - "Näytä kanavan ohjelmisto", + "Kanava", "", "", "", @@ -7322,41 +7322,6 @@ const tI18nPhrase Phrases[] = { #if VDRVERSNUM >= 10342 "", #endif -#if VDRVERSNUM >= 10502 - "", -#endif - }, - { "Channel", - "Kanal", - "", - "Canale", - "", - "", - "Chaîne", - "", - "Kanava", - "", - "", - "", - "", - "", - "", - "", -#if VDRVERSNUM >= 10302 - "", -#endif -#if VDRVERSNUM >= 10307 - "", -#endif -#if VDRVERSNUM >= 10313 - "", -#endif -#if VDRVERSNUM >= 10316 - "", -#endif -#if VDRVERSNUM >= 10342 - "", -#endif #if VDRVERSNUM >= 10502 "", #endif @@ -8932,6 +8897,41 @@ const tI18nPhrase Phrases[] = { #if VDRVERSNUM >= 10342 "", #endif +#if VDRVERSNUM >= 10502 + "", +#endif + }, + { " - ", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", +#if VDRVERSNUM >= 10302 + "", +#endif +#if VDRVERSNUM >= 10307 + "", +#endif +#if VDRVERSNUM >= 10313 + "", +#endif +#if VDRVERSNUM >= 10316 + "", +#endif +#if VDRVERSNUM >= 10342 + "", +#endif #if VDRVERSNUM >= 10502 "", #endif diff --git a/pages/remote.ecpp b/pages/remote.ecpp index 4805728..dd45cd0 100644 --- a/pages/remote.ecpp +++ b/pages/remote.ecpp @@ -2,6 +2,7 @@ #include #include #include +#include #include "grab.h" #include "setup.h" #include "tools.h" @@ -10,9 +11,15 @@ using namespace std; using namespace vdrlive; +<%args> + int channel = -1; + <%session scope="global"> bool logged_in(false); +<%request scope="page"> + cChannel* Channel; + <%include>page_init.eh <{ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); @@ -20,6 +27,25 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <%cpp> pageTitle = tr("Remote Control"); + ReadLock channelsLock( Channels ); + if ( !channelsLock ) + throw HtmlError( tr("Couldn't aquire access to channels, please try again later.") ); + + // cChannel* Channel; (see %request above) + if ( channel > 0 ) { + Channel = Channels.GetByNumber( channel ); + } + else { + if (cDevice::CurrentChannel()) { + Channel = Channels.GetByNumber(cDevice::CurrentChannel()); + } + else { + Channel = Channels.Get( Channels.GetNextNormal( -1 ) ); + } + } + if ( Channel == 0 ) + throw HtmlError( tr("Couldn't find channel or no channels available. Maybe you mistyped your request?") ); + <& pageelems.doc_type &> @@ -127,5 +153,5 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <%include>page_exit.eh <%def remote_actions> -<$ tr("Interval") $>: +<$ tr("Snapshot interval") $>:           <& pageelems.vlc_stream_channel channelId=(Channel->GetChannelID()) &> diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp index 544136b..8a77059 100644 --- a/pages/schedule.ecpp +++ b/pages/schedule.ecpp @@ -145,5 +145,12 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <%include>page_exit.eh <%def channel_selection> -
<& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "") onchange=("document.forms.channels.submit()") &> <& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(Channel->GetChannelID()) image="zap.png" alt="" &><& pageelems.vlc_stream_channel channelId=(Channel->GetChannelID()) &>
+
+ + + <& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "") onchange=("document.forms.channels.submit()") &> + <& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(Channel->GetChannelID()) image="zap.png" alt="" &> + <& pageelems.vlc_stream_channel channelId=(Channel->GetChannelID()) &> + +
diff --git a/pages/vlc.ecpp b/pages/vlc.ecpp index d1afd67..050f716 100644 --- a/pages/vlc.ecpp +++ b/pages/vlc.ecpp @@ -145,7 +145,7 @@ using namespace vdrlive; <%cpp> } -

<$ tr("VLC media URL") $>: <$ videourl $>

+

<$ tr("VLC media URL") $>: <$ videourl $>

diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index 316c03b..8232875 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -195,7 +195,7 @@ if (type == "now") {
- +
@@ -242,7 +242,7 @@ if (type == "now") { % }
- ">
><$ (epgEvent->Caption()) $>
+ ">
><$ chNumber $><$ tr(" - ") $><$ (epgEvent->Caption()) $>
% } diff --git a/po/ca_ES.po b/po/ca_ES.po index 35cbc87..3de8bcd 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -612,10 +612,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -624,7 +624,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -645,9 +645,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -784,6 +781,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 5d9fa35..b14492f 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -610,10 +610,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -622,7 +622,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -643,9 +643,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -782,6 +779,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/da_DK.po b/po/da_DK.po index 27f6ec1..c5801c1 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -610,10 +610,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -622,7 +622,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -643,9 +643,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -782,6 +779,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index eb5629e..f7a01c9 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -612,20 +612,21 @@ msgstr "Diese Aufnahme von der Festplatte l msgid "play this recording." msgstr "Diese Aufnahme abspielen." -msgid "Interval" -msgstr "Intervall" - msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "Konnte Kanal nicht finden oder keine Kanäle verfügbar. Ist die Anfrage korrekt?" +#, fuzzy +msgid "Snapshot interval" +msgstr "Bereich" + msgid "No schedules available for this channel" msgstr "Für diesen Kanal liegen keine EPG-Informationen vor" msgid "%A, %b %d %Y" msgstr "%A, %d.%m.%Y" -msgid "Show schedule of channel" -msgstr "Zeige Programm dieses Kanals" +msgid "Channel" +msgstr "Kanal" msgid "Search settings" msgstr "Einstellungen zur Suche" @@ -645,9 +646,6 @@ msgstr "keine Suchergebnisse" msgid "Expression" msgstr "Suchbegriff" -msgid "Channel" -msgstr "Kanal" - msgid "Starts between" msgstr "Beginnt zwischen" @@ -784,6 +782,9 @@ msgstr "Favoriten" msgid "View the schedule of this channel" msgstr "Zeige Programm dieses Kanals" +msgid " - " +msgstr "" + msgid "more" msgstr "mehr" @@ -808,5 +809,11 @@ msgstr "" msgid "No EPG information available" msgstr "Keine EPG Daten vorhanden" +#~ msgid "Interval" +#~ msgstr "Intervall" + +#~ msgid "Show schedule of channel" +#~ msgstr "Zeige Programm dieses Kanals" + #~ msgid "%a, %b %d" #~ msgstr "%a, %d.%m." diff --git a/po/el_GR.po b/po/el_GR.po index 47ad8fc..861792a 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -610,10 +610,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -622,7 +622,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -643,9 +643,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -782,6 +779,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index c27fb06..e18f423 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -610,10 +610,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -622,7 +622,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -643,9 +643,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -782,6 +779,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/et_EE.po b/po/et_EE.po index e32d205..fc30e56 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -610,10 +610,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -622,7 +622,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -643,9 +643,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -782,6 +779,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index 59e47a9..8cc81b1 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -611,20 +611,21 @@ msgstr "Poista tallenne kovalevylt msgid "play this recording." msgstr "Toista tallenne" -msgid "Interval" -msgstr "Päivitysväli" - msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "Kanavaa ei löydy. Kirjoititko varmasti oikein?" +#, fuzzy +msgid "Snapshot interval" +msgstr "kyllä" + msgid "No schedules available for this channel" msgstr "Tälle kanavalle ei ole saatavilla ohjelmistoa" msgid "%A, %b %d %Y" msgstr "%A, %d.%m.%Y" -msgid "Show schedule of channel" -msgstr "Näytä kanavan ohjelmisto" +msgid "Channel" +msgstr "Kanava" msgid "Search settings" msgstr "Hakuasetukset" @@ -644,9 +645,6 @@ msgstr "Ei hakutuloksia" msgid "Expression" msgstr "Hakutermi" -msgid "Channel" -msgstr "Kanava" - msgid "Starts between" msgstr "Alkaa välillä" @@ -785,6 +783,9 @@ msgstr "Suosikit" msgid "View the schedule of this channel" msgstr "Näytä ohjelmisto kanavalta" +msgid " - " +msgstr "" + msgid "more" msgstr "lisätietoja" @@ -809,6 +810,12 @@ msgstr "Interaktiivinen VDR-ymp msgid "No EPG information available" msgstr "" +#~ msgid "Interval" +#~ msgstr "Päivitysväli" + +#~ msgid "Show schedule of channel" +#~ msgstr "Näytä kanavan ohjelmisto" + #~ msgid "%a, %b %d" #~ msgstr "%a, %d.%m." diff --git a/po/fr_FR.po b/po/fr_FR.po index 3786e2f..b4e14d8 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -618,20 +618,21 @@ msgstr "" msgid "play this recording." msgstr "lire cette enregistrement." -msgid "Interval" -msgstr "Intervalle" - msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "N'a pas pu trouver la chaîne. Votre requête est t'elle corrête? " +#, fuzzy +msgid "Snapshot interval" +msgstr "intervalle" + msgid "No schedules available for this channel" msgstr "Aucune programmation disponible pour cette chaîne" msgid "%A, %b %d %Y" msgstr "%A, %d.%m.%Y" -msgid "Show schedule of channel" -msgstr "Montrer le programme de la chaîne" +msgid "Channel" +msgstr "Chaîne" msgid "Search settings" msgstr "Règlages de recherche" @@ -651,9 +652,6 @@ msgstr "pas de r msgid "Expression" msgstr "Expression de recherche" -msgid "Channel" -msgstr "Chaîne" - msgid "Starts between" msgstr "Départ entre" @@ -795,6 +793,9 @@ msgstr "Favoris" msgid "View the schedule of this channel" msgstr "Regarder le programme de cette chaîne" +msgid " - " +msgstr "" + msgid "more" msgstr "plus" @@ -819,6 +820,12 @@ msgstr "" msgid "No EPG information available" msgstr "" +#~ msgid "Interval" +#~ msgstr "Intervalle" + +#~ msgid "Show schedule of channel" +#~ msgstr "Montrer le programme de la chaîne" + #~ msgid "%a, %b %d" #~ msgstr "%a, %d.%m." diff --git a/po/hr_HR.po b/po/hr_HR.po index 7bfb204..5ed2647 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -611,10 +611,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -623,7 +623,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -644,9 +644,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -783,6 +780,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index 0291ddd..9d967d8 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -611,10 +611,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -623,7 +623,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -644,9 +644,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -783,6 +780,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index 191af01..c586d4b 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -614,20 +614,21 @@ msgstr "Elimina questa registrazione dal disco fisso!" msgid "play this recording." msgstr "Riproduci questa registrazione" -msgid "Interval" -msgstr "Intervallo" - msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "Impossibile trovare canale o canali disponibili. Hai digitato correttamente la richiesta?" +#, fuzzy +msgid "Snapshot interval" +msgstr "intervallo" + msgid "No schedules available for this channel" msgstr "Nessun programma disponibile per questo canale" msgid "%A, %b %d %Y" msgstr "%A, %b %d %Y" -msgid "Show schedule of channel" -msgstr "Mostra scheda programmi canale" +msgid "Channel" +msgstr "Canale" msgid "Search settings" msgstr "Impostazioni ricerca" @@ -647,9 +648,6 @@ msgstr "Nessun risultato ricerca" msgid "Expression" msgstr "Termine ricerca" -msgid "Channel" -msgstr "Canale" - msgid "Starts between" msgstr "Inizia tra" @@ -788,6 +786,9 @@ msgstr "Preferiti" msgid "View the schedule of this channel" msgstr "Visualizza scheda programmi del canale" +msgid " - " +msgstr "" + msgid "more" msgstr "altro" @@ -812,6 +813,12 @@ msgstr "Ambiente interattivo LIVE per VDR" msgid "No EPG information available" msgstr "" +#~ msgid "Interval" +#~ msgstr "Intervallo" + +#~ msgid "Show schedule of channel" +#~ msgstr "Mostra scheda programmi canale" + #~ msgid "%a, %b %d" #~ msgstr "%a, %b %d" diff --git a/po/nl_NL.po b/po/nl_NL.po index 1f42565..04a026c 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -617,19 +617,20 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" -msgstr "" - msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" +#, fuzzy +msgid "Snapshot interval" +msgstr "interval" + msgid "No schedules available for this channel" msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -650,9 +651,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -793,6 +791,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/nn_NO.po b/po/nn_NO.po index 7a561d2..eee5c2e 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -611,10 +611,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -623,7 +623,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -644,9 +644,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -783,6 +780,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index 4a34a30..82089e0 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -610,10 +610,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -622,7 +622,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -643,9 +643,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -782,6 +779,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/pt_PT.po b/po/pt_PT.po index 898505f..7ccecbf 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -610,10 +610,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -622,7 +622,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -643,9 +643,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -782,6 +779,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/ro_RO.po b/po/ro_RO.po index 9c45183..14b6944 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -611,10 +611,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -623,7 +623,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -644,9 +644,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -783,6 +780,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 7a25c51..8880de2 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -610,10 +610,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -622,7 +622,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -643,9 +643,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -782,6 +779,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/sl_SI.po b/po/sl_SI.po index c8fbdad..8f336cc 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -611,10 +611,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -623,7 +623,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -644,9 +644,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -783,6 +780,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index 65c146f..9ffd074 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -611,10 +611,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -623,7 +623,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -644,9 +644,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -783,6 +780,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" diff --git a/po/tr_TR.po b/po/tr_TR.po index 397b123..e327e08 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -611,10 +611,10 @@ msgstr "" msgid "play this recording." msgstr "" -msgid "Interval" +msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" msgstr "" -msgid "Couldn't find channel or no channels available. Maybe you mistyped your request?" +msgid "Snapshot interval" msgstr "" msgid "No schedules available for this channel" @@ -623,7 +623,7 @@ msgstr "" msgid "%A, %b %d %Y" msgstr "" -msgid "Show schedule of channel" +msgid "Channel" msgstr "" msgid "Search settings" @@ -644,9 +644,6 @@ msgstr "" msgid "Expression" msgstr "" -msgid "Channel" -msgstr "" - msgid "Starts between" msgstr "" @@ -783,6 +780,9 @@ msgstr "" msgid "View the schedule of this channel" msgstr "" +msgid " - " +msgstr "" + msgid "more" msgstr "" -- cgit v1.2.3 From 0144f655feb4dd867a17892dc97655b4f3e03bb7 Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Fri, 17 Apr 2009 00:05:58 +0200 Subject: Fixed spelling of CaptiveWorks in CONTRIBUTORS file. --- CONTRIBUTORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 5fe0f49..1f7def6 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -23,5 +23,5 @@ Matthias Kortstiege Diego Pierotto for the italian translations. -John Germs, Chavonbravo from Captive Works (http://captiveworks.org) +John Germs, Chavonbravo from CaptiveWorks (http://captiveworks.org) for the addition of channel numbers on the live pages. -- cgit v1.2.3 From 007c4fbed9c0705b3e846ea48f9738c502fbc279 Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Sun, 19 Apr 2009 22:42:44 +0200 Subject: Added a patch suggested by jowi24 from the bug tracker. See bug #511. --- livefeatures.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/livefeatures.cpp b/livefeatures.cpp index 5b34306..94aa4cc 100644 --- a/livefeatures.cpp +++ b/livefeatures.cpp @@ -9,7 +9,7 @@ SplitVersion::SplitVersion( string version ) : m_version( 0 ) { static const int factors[] = { 100000000, 1000000, 1000, 1 }; - + size_t pos = version.find('-'); if ( pos != string::npos ) { m_suffix = version.substr( pos + 1 ); @@ -24,8 +24,9 @@ SplitVersion::SplitVersion( string version ) bool SplitVersion::operator<( const SplitVersion& right ) const { if ( m_version == right.m_version ) { - if ( m_suffix.empty() ) return false; - if ( right.m_suffix.empty() ) return true; + if (right.m_suffix.empty()) { + return false; + } return m_suffix < right.m_suffix; } return m_version < right.m_version; -- cgit v1.2.3 From 46ed54bc095a899bc6fe93fe727e12e96392cc0e Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Sun, 19 Apr 2009 23:04:39 +0200 Subject: Calculate right length for TS recordings. This is a patch submitted by jowi24. Newer development versions of VDR create TS recordings. There was no support for such recordings in LIVE yet. length calculation with the new TS recordings introduced wit --- recman.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recman.cpp b/recman.cpp index bf7ca3f..8bfccab 100644 --- a/recman.cpp +++ b/recman.cpp @@ -242,6 +242,7 @@ namespace vdrlive { { long RecLength = 0; if (!m_recording->FileName()) return 0; +#if VDRVERSNUM < 10704 cString filename = cString::sprintf("%s%s", m_recording->FileName(), INDEXFILESUFFIX); if (*filename) { if (access(filename, R_OK) == 0) { @@ -257,6 +258,14 @@ namespace vdrlive { } } } +#else + // open index file for reading only + cIndexFile *index = new cIndexFile(m_recording->FileName(), false, m_recording->IsPesRecording()); + if (index && index->Ok()) { + RecLength = (int) (index->Last() / SecondsToFrames(60, m_recording->FramesPerSecond())); + } + delete index; +#endif return RecLength; } -- cgit v1.2.3 From 854fa820e345ed890e4a7a9a32b14add68fc642c Mon Sep 17 00:00:00 2001 From: Dieter Hametner Date: Thu, 27 Aug 2009 00:07:55 +0200 Subject: Fix for tntnet version number with 'pre' in the version string. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c47422f..62cf856 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ TMPDIR ?= /tmp APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) I18NTARG = $(shell if [ `echo $(APIVERSION) | tr [.] [0]` -ge "10507" ]; then echo "i18n"; fi) -TNTVERSION = $(shell tntnet-config --version | sed -e's/\.//g' | awk '/^..$$/ { print $$1."00"} /^...$$/ { print $$1."0"} /^....$$/ { print $$1 }') +TNTVERSION = $(shell tntnet-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."00"} /^...$$/ { print $$1."0"} /^....$$/ { print $$1 }') TNTVERS7 = $(shell ver=$(TNTVERSION); if [ $$ver -ge "1606" ]; then echo "yes"; fi) ### The name of the distribution archive: -- cgit v1.2.3