diff options
author | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2011-09-05 23:32:52 +0200 |
---|---|---|
committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2011-09-05 23:32:52 +0200 |
commit | c627b7432d23db7ebe090e7a4027c0267c19434e (patch) | |
tree | 48d9b44ae1565928c05c67797c7c74c0906c79a1 | |
parent | c54f41fc59899a0f59b45bc500e99a080a12e2ac (diff) | |
download | vdr-plugin-live-c627b7432d23db7ebe090e7a4027c0267c19434e.tar.gz vdr-plugin-live-c627b7432d23db7ebe090e7a4027c0267c19434e.tar.bz2 |
Support for native recording length since VDR 1.7.21:
Applying a patch provided by ROFA:
As the new vdr-1.7.21 provides native interface for recording lenght,
there's no need to keep the "Show duration in 'Recordings'" setting
anymore - less the options the better. If users want to speed up the
recordings page, they must just upgrade to vdr-1.7.21+.
-rw-r--r-- | i18n-generated.h | 45 | ||||
-rw-r--r-- | pages/recordings.ecpp | 4 | ||||
-rw-r--r-- | pages/setup.ecpp | 9 | ||||
-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 | 15 | ||||
-rw-r--r-- | po/el_GR.po | 7 | ||||
-rw-r--r-- | po/es_ES.po | 15 | ||||
-rw-r--r-- | po/et_EE.po | 7 | ||||
-rw-r--r-- | po/fi_FI.po | 15 | ||||
-rw-r--r-- | po/fr_FR.po | 7 | ||||
-rw-r--r-- | po/hr_HR.po | 7 | ||||
-rw-r--r-- | po/hu_HU.po | 7 | ||||
-rw-r--r-- | po/it_IT.po | 15 | ||||
-rw-r--r-- | po/lt_LT.po | 7 | ||||
-rw-r--r-- | po/nl_NL.po | 7 | ||||
-rw-r--r-- | po/nn_NO.po | 7 | ||||
-rw-r--r-- | po/pl_PL.po | 10 | ||||
-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/sk_SK.po | 15 | ||||
-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-- | recman.cpp | 4 | ||||
-rw-r--r-- | setup.cpp | 3 | ||||
-rw-r--r-- | setup.h | 3 | ||||
-rw-r--r-- | tools.cpp | 6 | ||||
-rw-r--r-- | tools.h | 2 |
31 files changed, 98 insertions, 182 deletions
diff --git a/i18n-generated.h b/i18n-generated.h index d802ce3..92e7870 100644 --- a/i18n-generated.h +++ b/i18n-generated.h @@ -8096,17 +8096,17 @@ const tI18nPhrase Phrases[] = { "", #endif }, - { "(%d')", - "%d'", + { "(%d:%02d)", + "", + "", + "", + "", "", - "(%d')", "", "", "", "", - "%d'", "", - "(%d')", "", "", "", @@ -9146,41 +9146,6 @@ const tI18nPhrase Phrases[] = { "", #endif }, - { "Show duration in 'Recordings'", - "Aufnahmedauer bei 'Aufnamen' anzeigen", - "", - "Mostra durata in 'Registrazioni'", - "", - "", - "", - "", - "Näytä kestoajat 'Tallenteet'-sivulla", - "Pokazuj czas trwania nagrañ", - "Duración del programa en 'Grabaciones'", - "", - "", - "", - "", - "", -#if VDRVERSNUM >= 10302 - "", -#endif -#if VDRVERSNUM >= 10307 - "", -#endif -#if VDRVERSNUM >= 10313 - "", -#endif -#if VDRVERSNUM >= 10316 - "", -#endif -#if VDRVERSNUM >= 10342 - "", -#endif -#if VDRVERSNUM >= 10502 - "", -#endif - }, { "Use ajax technology", "Verwende AJAX Technologie", "", diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index fd23b63..ebd57e0 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -236,8 +236,8 @@ for (recIter = recItems.begin(); recIter != recItems.end(); ++recIter) { // xgettext:no-c-format string day(FormatDateTime(tr("%a,"), recItem->StartTime())); string dayLen(lexical_cast<string, int>(day.length() - 1) + ".25em;"); - // TRANSLATORS: recording duration format - string duration(LiveSetup().GetShowRecDuration() ? FormatDuration(tr("(%d')"), recItem->Duration()) : ""); + // TRANSLATORS: recording duration format HH:MM + string duration(recItem->Duration() < 0 ? "" : FormatDuration(tr("(%d:%02d)"), recItem->Duration() / 60, recItem->Duration() % 60)); string shortDescr(recItem->RecInfo()->ShortText() ? recItem->RecInfo()->ShortText() : ""); string description(recItem->RecInfo()->Description() ? recItem->RecInfo()->Description() : ""); string hint(tr("Click to view details.")); diff --git a/pages/setup.ecpp b/pages/setup.ecpp index 02576ff..edb88a7 100644 --- a/pages/setup.ecpp +++ b/pages/setup.ecpp @@ -21,7 +21,6 @@ using namespace std; string startscreen; string theme; string localnetmask; - string showRecDuration; string showLogo; string useAjax; string showInfoBox; @@ -65,7 +64,6 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP)) LiveSetup().SetScheduleDuration(scheduleDuration); LiveSetup().SetStartScreen(startscreen); LiveSetup().SetTheme(theme); - LiveSetup().SetShowRecDuration(!showRecDuration.empty()); LiveSetup().SetShowLogo(!showLogo.empty()); LiveSetup().SetUseAjax(!useAjax.empty()); if (LiveSetup().GetUseAjax()) { @@ -96,7 +94,6 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP)) startscreen = LiveSetup().GetStartScreen(); theme = LiveSetup().GetTheme(); localnetmask = LiveSetup().GetLocalNetMask(); - showRecDuration = LiveSetup().GetShowRecDuration() ? "1" : ""; showLogo = LiveSetup().GetShowLogo() ? "1" : ""; useAjax = LiveSetup().GetUseAjax() ? "1" : ""; showInfoBox = LiveSetup().GetShowInfoBox() ? "1" : ""; @@ -183,12 +180,6 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP)) </td> </tr> <tr> - <td class="label leftcol"><div class="withmargin"><$ tr("Show duration in 'Recordings'") $>:</div></td> - <td class="rightcol"> - <input type="checkbox" name="showRecDuration" id="showRecDuration" value="1" <%cpp> CHECKIF(!showRecDuration.empty()); </%cpp>/> - </td> - </tr> - <tr> <td class="label leftcol"><div class="withmargin"><$ tr("Use ajax technology") $>:</div></td> <td class="rightcol"> <input type="checkbox" name="useAjax" id="useAjax" value="1" <%cpp> CHECKIF(!useAjax.empty()); </%cpp> onclick="changeduseajax(this)"/> diff --git a/po/ca_ES.po b/po/ca_ES.po index c8bacf4..7d7cacd 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -713,9 +713,9 @@ msgstr "" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -805,9 +805,6 @@ msgstr "" msgid "Show live logo image" msgstr "" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 08392c6..6211b5a 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -721,9 +721,9 @@ msgstr "Smazat automatické nahrávánÃ?" msgid "%a," msgstr "%a, %x" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -814,9 +814,6 @@ msgstr "Lokálnà sÃÅ¥ (bez pÅ™ilášenÃ)" msgid "Show live logo image" msgstr "Zobrazit logo" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "PoužÃvat dynamické stránky (ajax)" diff --git a/po/da_DK.po b/po/da_DK.po index ef5113a..7c66235 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -711,9 +711,9 @@ msgstr "" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -803,9 +803,6 @@ msgstr "" msgid "Show live logo image" msgstr "" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index 34be520..214dff2 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -714,10 +714,10 @@ msgstr "Löschen" msgid "%a," msgstr "%a," -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" -msgstr "%d'" +msgid "(%d:%02d)" +msgstr "" msgid "Sort by name" msgstr "Sortiere nach Name" @@ -806,9 +806,6 @@ msgstr "Lokales Netz (keine Anmeldung notwendig)" msgid "Show live logo image" msgstr "Zeige das Live Logo" -msgid "Show duration in 'Recordings'" -msgstr "Aufnahmedauer bei 'Aufnamen' anzeigen" - msgid "Use ajax technology" msgstr "Verwende AJAX Technologie" @@ -947,3 +944,9 @@ msgstr "" msgid "No EPG information available" msgstr "Keine EPG Daten vorhanden" + +#~ msgid "(%d')" +#~ msgstr "%d'" + +#~ msgid "Show duration in 'Recordings'" +#~ msgstr "Aufnahmedauer bei 'Aufnamen' anzeigen" diff --git a/po/el_GR.po b/po/el_GR.po index 836f598..022541f 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -711,9 +711,9 @@ msgstr "" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -803,9 +803,6 @@ msgstr "" msgid "Show live logo image" msgstr "" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 4617503..b0917b5 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -711,10 +711,10 @@ msgstr "Borrar selección" msgid "%a," msgstr "%a," -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" -msgstr "(%d')" +msgid "(%d:%02d)" +msgstr "" msgid "Sort by name" msgstr "Ordenar por nombre" @@ -803,9 +803,6 @@ msgstr "Red local (sin autentificación requerida)" msgid "Show live logo image" msgstr "Muestra la imagen del logo Live" -msgid "Show duration in 'Recordings'" -msgstr "Duración del programa en 'Grabaciones'" - msgid "Use ajax technology" msgstr "Usar tecnología ajax" @@ -944,3 +941,9 @@ msgstr "Entorno interactivo de Live VDR" msgid "No EPG information available" msgstr "No hay información disponible de la EPG" + +#~ msgid "(%d')" +#~ msgstr "(%d')" + +#~ msgid "Show duration in 'Recordings'" +#~ msgstr "Duración del programa en 'Grabaciones'" diff --git a/po/et_EE.po b/po/et_EE.po index 7484a88..2f34cc5 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -711,9 +711,9 @@ msgstr "" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -803,9 +803,6 @@ msgstr "" msgid "Show live logo image" msgstr "" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index 6c06723..e67cded 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -711,10 +711,10 @@ msgstr "Poista valitut" msgid "%a," msgstr "%a" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" -msgstr "%d'" +msgid "(%d:%02d)" +msgstr "" msgid "Sort by name" msgstr "Järjestä nimen mukaan" @@ -803,9 +803,6 @@ msgstr "Paikallinen verkko (ei autentikointia)" msgid "Show live logo image" msgstr "Näytä Live-logo" -msgid "Show duration in 'Recordings'" -msgstr "Näytä kestoajat 'Tallenteet'-sivulla" - msgid "Use ajax technology" msgstr "Käytä AJAX-tekniikkaa" @@ -945,5 +942,11 @@ msgstr "Interaktiivinen VDR-ympäristö" msgid "No EPG information available" msgstr "Ohjelmatietoja ei saatavilla" +#~ msgid "(%d')" +#~ msgstr "%d'" + +#~ msgid "Show duration in 'Recordings'" +#~ msgstr "Näytä kestoajat 'Tallenteet'-sivulla" + #~ msgid "Subtitle" #~ msgstr "Lyhyt kuvaus" diff --git a/po/fr_FR.po b/po/fr_FR.po index ea2c2ba..173a3f7 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -733,9 +733,9 @@ msgstr "" msgid "%a," msgstr "%a," -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -826,9 +826,6 @@ msgstr "Réseau local (non requis)" msgid "Show live logo image" msgstr "Afficher l'image du logo de live" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "Utilisez la technologie Ajax" diff --git a/po/hr_HR.po b/po/hr_HR.po index 6177fb3..8fcca3b 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -712,9 +712,9 @@ msgstr "" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -804,9 +804,6 @@ msgstr "" msgid "Show live logo image" msgstr "" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index 911d55f..8f1eded 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -712,9 +712,9 @@ msgstr "" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -804,9 +804,6 @@ msgstr "" msgid "Show live logo image" msgstr "" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index 0a3c964..86e76a5 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -717,10 +717,10 @@ msgstr "Elimina selezionati" msgid "%a," msgstr "%a," -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" -msgstr "(%d')" +msgid "(%d:%02d)" +msgstr "" msgid "Sort by name" msgstr "Ordina per nome" @@ -809,9 +809,6 @@ msgstr "Rete locale (nessun accesso richiesto)" msgid "Show live logo image" msgstr "Mostra logo immagine Live" -msgid "Show duration in 'Recordings'" -msgstr "Mostra durata in 'Registrazioni'" - msgid "Use ajax technology" msgstr "Utilizza tecnologia Ajax" @@ -951,6 +948,12 @@ msgstr "Ambiente interattivo LIVE per VDR" msgid "No EPG information available" msgstr "Nessuna informazione EPG disponibile" +#~ msgid "(%d')" +#~ msgstr "(%d')" + +#~ msgid "Show duration in 'Recordings'" +#~ msgstr "Mostra durata in 'Registrazioni'" + #, fuzzy #~ msgid "Subtitle" #~ msgstr "Titolo" diff --git a/po/lt_LT.po b/po/lt_LT.po index 65b20c8..7e07e15 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -713,9 +713,9 @@ msgstr "" msgid "%a," msgstr "%a," -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -805,9 +805,6 @@ msgstr "Vietinis tinklas (nereikalingas prisijungimas)" msgid "Show live logo image" msgstr "Rodyti live įskiepo logotipÄ…" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "Naudoti AJAX" diff --git a/po/nl_NL.po b/po/nl_NL.po index d3b20ff..808fa67 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -728,9 +728,9 @@ msgstr "" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -821,9 +821,6 @@ msgstr "" msgid "Show live logo image" msgstr "" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "" diff --git a/po/nn_NO.po b/po/nn_NO.po index 556c007..3c59633 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -712,9 +712,9 @@ msgstr "" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -804,9 +804,6 @@ msgstr "" msgid "Show live logo image" msgstr "" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index 95c396c..8abd004 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -711,9 +711,9 @@ msgstr "Usuñ zaznaczone" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -803,9 +803,6 @@ msgstr "Sieæ lokalna (logowanie nie wymagane)" msgid "Show live logo image" msgstr "Pokazuj logo VDR-Live" -msgid "Show duration in 'Recordings'" -msgstr "Pokazuj czas trwania nagrañ" - msgid "Use ajax technology" msgstr "U¿ywaj technologii ajax" @@ -944,3 +941,6 @@ msgstr "" msgid "No EPG information available" msgstr "Brak informacji EPG" + +#~ msgid "Show duration in 'Recordings'" +#~ msgstr "Pokazuj czas trwania nagrañ" diff --git a/po/pt_PT.po b/po/pt_PT.po index 250819f..6241542 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -711,9 +711,9 @@ msgstr "" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -803,9 +803,6 @@ msgstr "" msgid "Show live logo image" msgstr "" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "" diff --git a/po/ro_RO.po b/po/ro_RO.po index 6d76313..1da81c9 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -712,9 +712,9 @@ msgstr "" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -804,9 +804,6 @@ msgstr "" msgid "Show live logo image" msgstr "" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 6171085..9543848 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -711,9 +711,9 @@ msgstr "" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -803,9 +803,6 @@ msgstr "" msgid "Show live logo image" msgstr "" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "" diff --git a/po/sk_SK.po b/po/sk_SK.po index 12a0258..2f3c314 100644 --- a/po/sk_SK.po +++ b/po/sk_SK.po @@ -712,10 +712,10 @@ msgstr "Vymaza» vybrané" msgid "%a," msgstr "%a," -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" -msgstr "(%d')" +msgid "(%d:%02d)" +msgstr "" msgid "Sort by name" msgstr "Zotriedi» podla mena" @@ -804,9 +804,6 @@ msgstr "Miestna sie» (nevy¾aduje prihlásenie)" msgid "Show live logo image" msgstr "Zobrazi» obrázok live loga" -msgid "Show duration in 'Recordings'" -msgstr "Zobrazi» då¾ku v 'Nahrávkach'" - msgid "Use ajax technology" msgstr "Pou¾i» ajax technológiu" @@ -945,3 +942,9 @@ msgstr "®ivé interaktívne VDR prostredie" msgid "No EPG information available" msgstr "EPG informácie sú nedostupné" + +#~ msgid "(%d')" +#~ msgstr "(%d')" + +#~ msgid "Show duration in 'Recordings'" +#~ msgstr "Zobrazi» då¾ku v 'Nahrávkach'" diff --git a/po/sl_SI.po b/po/sl_SI.po index e2bfec2..b85ab0f 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -712,9 +712,9 @@ msgstr "" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -804,9 +804,6 @@ msgstr "" msgid "Show live logo image" msgstr "" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index 4c3458e..e7ed734 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -712,9 +712,9 @@ msgstr "" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -804,9 +804,6 @@ msgstr "" msgid "Show live logo image" msgstr "" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "" diff --git a/po/tr_TR.po b/po/tr_TR.po index 4c9dc59..1a3600d 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -712,9 +712,9 @@ msgstr "" msgid "%a," msgstr "" -#. TRANSLATORS: recording duration format +#. TRANSLATORS: recording duration format HH:MM #, c-format -msgid "(%d')" +msgid "(%d:%02d)" msgstr "" msgid "Sort by name" @@ -804,9 +804,6 @@ msgstr "" msgid "Show live logo image" msgstr "" -msgid "Show duration in 'Recordings'" -msgstr "" - msgid "Use ajax technology" msgstr "" @@ -406,13 +406,15 @@ namespace vdrlive { } } } -#else +#elseif VDRVERSNUM < 10721 // 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; +#else + return m_recording->LengthInSeconds() / 60; #endif if (RecLength == 0) { cString lengthFile = cString::sprintf("%s%s", m_recording->FileName(), LENGTHFILESUFFIX); @@ -42,7 +42,6 @@ Setup::Setup(): m_lastwhatsonlistmode("detail"), m_lastsortingmode("nameasc"), m_tntnetloglevel("WARN"), - m_showRecDuration(0), m_showLogo(1), m_useAjax(1), m_showInfoBox(1), @@ -131,7 +130,6 @@ bool Setup::ParseSetupEntry( char const* name, char const* value ) else if ( strcmp( name, "LocalNetMask" ) == 0 ) { m_localnetmask = value; } else if ( strcmp( name, "LastWhatsOnListMode" ) == 0 ) { m_lastwhatsonlistmode = value; } else if ( strcmp( name, "LastSortingMode" ) == 0 ) { m_lastsortingmode = value; } - else if ( strcmp( name, "ShowRecDuration" ) == 0 ) { m_showRecDuration = atoi(value); } else if ( strcmp( name, "ShowLogo" ) == 0 ) { m_showLogo = atoi(value); } else if ( strcmp( name, "UseAjax" ) == 0 ) { m_useAjax = atoi(value); } else if ( strcmp( name, "ShowInfoBox" ) == 0 ) { m_showInfoBox = atoi(value); } @@ -316,7 +314,6 @@ bool Setup::SaveSetup() liveplugin->SetupStore("Theme", m_theme.c_str()); liveplugin->SetupStore("LastWhatsOnListMode", m_lastwhatsonlistmode.c_str()); liveplugin->SetupStore("LastSortingMode", m_lastsortingmode.c_str()); - liveplugin->SetupStore("ShowRecDuration", m_showRecDuration); liveplugin->SetupStore("ShowLogo", m_showLogo); liveplugin->SetupStore("UseAjax", m_useAjax); liveplugin->SetupStore("ShowInfoBox", m_showInfoBox); @@ -55,7 +55,6 @@ class Setup std::string const GetLastWhatsOnListMode() const { return m_lastwhatsonlistmode; } std::string const GetLastSortingMode() const { return m_lastsortingmode; } std::string const GetTntnetLogLevel() const { return m_tntnetloglevel; } - bool GetShowRecDuration() const { return m_showRecDuration != 0; } bool GetShowLogo() const { return m_showLogo != 0; } bool GetUseAjax() const { return m_useAjax != 0; } bool GetShowInfoBox() const { return m_showInfoBox != 0; } @@ -80,7 +79,6 @@ class Setup void SetIsLocalNet(bool islocalnet) { m_islocalnet = islocalnet; } void SetLastWhatsOnListMode(std::string const & mode) { m_lastwhatsonlistmode = mode; SaveSetup(); } void SetLastSortingMode(std::string const & mode) { m_lastsortingmode = mode; SaveSetup(); } - void SetShowRecDuration(bool show) { m_showRecDuration = show ? 1 : 0; } void SetShowLogo(bool show) { m_showLogo = show ? 1 : 0; } void SetUseAjax(bool use) { m_useAjax = use ? 1 : 0; } void SetShowInfoBox(bool show) { m_showInfoBox = show ? 1 : 0; } @@ -136,7 +134,6 @@ class Setup std::string m_lastwhatsonlistmode; std::string m_lastsortingmode; std::string m_tntnetloglevel; - int m_showRecDuration; int m_showLogo; int m_useAjax; int m_showInfoBox; @@ -51,12 +51,12 @@ istream& operator>>( istream& is, tChannelID& ret ) namespace vdrlive { - string FormatDuration( char const* format, int duration ) + string FormatDuration( char const* format, int hours, int minutes ) { char result[ 32 ]; - if ( snprintf(result, sizeof(result), format, duration) < 0 ) { + if ( snprintf(result, sizeof(result), format, hours, minutes) < 0 ) { ostringstream builder; - builder << "cannot represent duration " << duration << " as requested"; + builder << "cannot represent duration " << hours << ":" << minutes << " as requested"; throw runtime_error( builder.str() ); } return result; @@ -24,7 +24,7 @@ std::ostream& operator<<( std::ostream& os, tChannelID const& id ) namespace vdrlive { - std::string FormatDuration( char const* format, int duration ); + std::string FormatDuration( char const* format, int hours, int minutes ); std::string FormatDateTime( char const* format, time_t time ); |