diff options
| -rw-r--r-- | CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | i18n-generated.h | 35 | ||||
| -rw-r--r-- | pages/pageelems.ecpp | 27 | ||||
| -rw-r--r-- | pages/timerconflicts.ecpp | 2 | ||||
| -rw-r--r-- | pages/timers.ecpp | 2 | ||||
| -rw-r--r-- | po/ca_ES.po | 3 | ||||
| -rw-r--r-- | po/cs_CZ.po | 3 | ||||
| -rw-r--r-- | po/da_DK.po | 3 | ||||
| -rw-r--r-- | po/de_DE.po | 6 | ||||
| -rw-r--r-- | po/el_GR.po | 3 | ||||
| -rw-r--r-- | po/es_ES.po | 3 | ||||
| -rw-r--r-- | po/et_EE.po | 3 | ||||
| -rw-r--r-- | po/fi_FI.po | 6 | ||||
| -rw-r--r-- | po/fr_FR.po | 6 | ||||
| -rw-r--r-- | po/hr_HR.po | 3 | ||||
| -rw-r--r-- | po/hu_HU.po | 3 | ||||
| -rw-r--r-- | po/it_IT.po | 6 | ||||
| -rw-r--r-- | po/nl_NL.po | 3 | ||||
| -rw-r--r-- | po/nn_NO.po | 3 | ||||
| -rw-r--r-- | po/pl_PL.po | 3 | ||||
| -rw-r--r-- | po/pt_PT.po | 3 | ||||
| -rw-r--r-- | po/ro_RO.po | 3 | ||||
| -rw-r--r-- | po/ru_RU.po | 3 | ||||
| -rw-r--r-- | po/sl_SI.po | 3 | ||||
| -rw-r--r-- | po/sv_SE.po | 3 | ||||
| -rw-r--r-- | po/tr_TR.po | 3 |
26 files changed, 35 insertions, 108 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 845b7b8..7cbc079 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -18,4 +18,4 @@ Patrice Staudt Matthias Kortstiege for a patch that activates the SSL support in tntnet. LIVE can then be used over https too. This works only with tntnet versions above 1.6.0.6. - Recomended is tntnet version 1.6.3 and higher. + Recomended is tntnet version 1.6.2 and higher. diff --git a/i18n-generated.h b/i18n-generated.h index 23963bd..7fdf27d 100644 --- a/i18n-generated.h +++ b/i18n-generated.h @@ -5051,41 +5051,6 @@ const tI18nPhrase Phrases[] = { "", #endif }, - { "Edit this", - "Timer editieren", - "", - "Modifica timer", - "", - "", - "Changer cette programmation", - "", - "Muokkaa ajastinta", - "", - "", - "", - "", - "", - "", - "", -#if VDRVERSNUM >= 10302 - "", -#endif -#if VDRVERSNUM >= 10307 - "", -#endif -#if VDRVERSNUM >= 10313 - "", -#endif -#if VDRVERSNUM >= 10316 - "", -#endif -#if VDRVERSNUM >= 10342 - "", -#endif -#if VDRVERSNUM >= 10502 - "", -#endif - }, { "Record this", "Diese Sendung aufnehmen", "", diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index ab2b53b..e70d7fd 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -124,17 +124,30 @@ int update_status(1); const cTimer* timer = LiveTimerManager().GetTimer(eventid, channelid); if (timer) { </%cpp> - <a href="edit_timer.html?timerid=<$ LiveTimerManager().GetTimers().GetTimerId(*timer) $>"> - <img src="<$ LiveSetup().GetThemedLink("img", "record_timer.png") $>" alt="" <& tooltip.hint text=(tr("Edit this")) &> /> -<%cpp> } else { </%cpp> - <a href="edit_timer.html?epgid=<$ epgid $>"> - <img src="<$ LiveSetup().GetThemedLink("img", "record.png") $>" alt="" <& tooltip.hint text=(tr("Record this")) &> /> -<%cpp> } </%cpp> - </a> + <& pageelems.edit_timer timerId=(LiveTimerManager().GetTimers().GetTimerId(*timer)) imgName=("record_timer.png") &> +<%cpp> + } + else { +</%cpp> + <a href="edit_timer.html?epgid=<$ epgid $>"><img src="<$ LiveSetup().GetThemedLink("img", "record.png") $>" alt="" <& tooltip.hint text=(tr("Record this")) &> /></a> +<%cpp> + } +</%cpp> </%def> <# ---------------------------------------------------------------------- #> +<%def edit_timer> +<%args> + string timerId; + string imgName = "edit.png"; +</%args> + <a href="edit_timer.html?timerid=<$ SortedTimers::EncodeDomId(timerId) $>"><img src="<$ LiveSetup().GetThemedLink("img", imgName) $>" alt="" <& tooltip.hint text=(tr("Edit timer")) &> /></a> +</%def> + + +<# ---------------------------------------------------------------------- #> + <%def ajax_js> <%cpp> if (LiveSetup().GetUseAjax()) { diff --git a/pages/timerconflicts.ecpp b/pages/timerconflicts.ecpp index ed7e0b6..4e2c15c 100644 --- a/pages/timerconflicts.ecpp +++ b/pages/timerconflicts.ecpp @@ -112,7 +112,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); ><$ timer->File() $></a></div></td> <td class="action <? bottom ? "bottomrow" ?>"><a href="searchresults.html?searchplain=<$ StringEscapeAndBreak(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a></td> <td class="action <? bottom ? "bottomrow" ?>"><a href="timers.html?timerid=<$ SortedTimers::EncodeDomId(timers.GetTimerId(*timer)) $>&action=toggle"><img src="<$ LiveSetup().GetThemedLink("img", (timer->Flags() & tfActive) ? "active.png" : "inactive.png") $>" alt="" <& tooltip.hint text=(tr("Toggle timer active/inactive")) &>></img></a></td> - <td class="action <? bottom ? "bottomrow" ?>"><a href="edit_timer.html?timerid=<$ SortedTimers::EncodeDomId(timers.GetTimerId(*timer)) $>"><img src="<$ LiveSetup().GetThemedLink("img", "edit.png") $>" alt="" <& tooltip.hint text=(tr("Edit timer")) &>></img></a></td> + <td class="action <? bottom ? "bottomrow" ?>"><& pageelems.edit_timer timerId=(timers.GetTimerId(*timer)) &></td> <td class="action rightcol <? bottom ? "bottomrow" ?>"><a href="timers.html?timerid=<$ SortedTimers::EncodeDomId(timers.GetTimerId(*timer)) $>&action=delete"><img src="<$ LiveSetup().GetThemedLink("img", "del.png") $>" alt="" <& tooltip.hint text=(tr("Delete timer")) &>></img></a></td> </tr> % } diff --git a/pages/timers.ecpp b/pages/timers.ecpp index 3e6f56d..edea2a9 100644 --- a/pages/timers.ecpp +++ b/pages/timers.ecpp @@ -146,7 +146,7 @@ static const size_t maximumDescriptionLength = 300; ><$ timer->File() $></a></div> </td> <td class="action <? bottom ? "bottomrow" ?>"><a href="timers.html?timerid=<$ SortedTimers::EncodeDomId(timers.GetTimerId(*timer)) $>&action=toggle"><img src="<$ LiveSetup().GetThemedLink("img", (timer->Flags() & tfActive) ? "active.png" : "inactive.png") $>" alt="" <& tooltip.hint text=(tr("Toggle timer active/inactive")) &>></img></a></td> - <td class="action <? bottom ? "bottomrow" ?>"><a href="edit_timer.html?timerid=<$ SortedTimers::EncodeDomId(timers.GetTimerId(*timer)) $>"><img src="<$ LiveSetup().GetThemedLink("img", "edit.png") $>" alt="" <& tooltip.hint text=(tr("Edit timer")) &>></img></a></td> + <td class="action <? bottom ? "bottomrow" ?>"><& pageelems.edit_timer timerId=(timers.GetTimerId(*timer)) &></td> <td class="action rightcol <? bottom ? "bottomrow" ?>"><a href="timers.html?timerid=<$ SortedTimers::EncodeDomId(timers.GetTimerId(*timer)) $>&action=delete"><img src="<$ LiveSetup().GetThemedLink("img", "del.png") $>" alt="" <& tooltip.hint text=(tr("Delete timer")) &>></img></a></td> </tr> <%cpp> diff --git a/po/ca_ES.po b/po/ca_ES.po index 4cb0629..d3b70fe 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -449,9 +449,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index f96b853..6361b32 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -447,9 +447,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/da_DK.po b/po/da_DK.po index 927a7fe..9de1921 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -447,9 +447,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index 6286bd9..019ceb4 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -449,9 +449,6 @@ msgstr "Weitere Informationen in der Internet Movie Database." msgid "Stream this channel into browser." msgstr "Sendung im Browser anzeigen." -msgid "Edit this" -msgstr "Timer editieren" - msgid "Record this" msgstr "Diese Sendung aufnehmen" @@ -797,6 +794,9 @@ msgstr "Listenansicht" msgid "Live Interactive VDR Environment" msgstr "" +#~ msgid "Edit this" +#~ msgstr "Timer editieren" + #~ msgid "Timer conflicts detected! You should check the conflicting timers." #~ msgstr "Timer Konflikte entdeckt! Sie sollten die entsprechenden Timer prüfen." diff --git a/po/el_GR.po b/po/el_GR.po index ff7c2ff..a7aef92 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -447,9 +447,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index f943e39..edf0d2b 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -447,9 +447,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/et_EE.po b/po/et_EE.po index dba5db4..7600f47 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -447,9 +447,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index 4394a18..c10bfe9 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -447,9 +447,6 @@ msgstr "Hae IMDB:stä" msgid "Stream this channel into browser." msgstr "Aloita suoratoisto" -msgid "Edit this" -msgstr "Muokkaa ajastinta" - msgid "Record this" msgstr "Tallenna ohjelma" @@ -795,5 +792,8 @@ msgstr "Listanäkymä" msgid "Live Interactive VDR Environment" msgstr "Interaktiivinen VDR-ympäristö" +#~ msgid "Edit this" +#~ msgstr "Muokkaa ajastinta" + #~ msgid "channels" #~ msgstr "kanavat" diff --git a/po/fr_FR.po b/po/fr_FR.po index 57af341..64dd61d 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -453,9 +453,6 @@ msgstr "Trouver plus d'information du film dans la base de données film IMDB." msgid "Stream this channel into browser." msgstr "Diffusez cette chaîne vers le navigateur." -msgid "Edit this" -msgstr "Changer cette programmation" - msgid "Record this" msgstr "Enregistrer cette émission" @@ -806,6 +803,9 @@ msgstr "Vue en liste" msgid "Live Interactive VDR Environment" msgstr "" +#~ msgid "Edit this" +#~ msgstr "Changer cette programmation" + #, fuzzy #~ msgid "Start" #~ msgstr "Page de départ" diff --git a/po/hr_HR.po b/po/hr_HR.po index 756b50b..df3bbeb 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -448,9 +448,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index 47484cd..f585a1b 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -448,9 +448,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index b541e33..e5482ae 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -452,9 +452,6 @@ msgstr "Cerca ulteriori informazioni nel database internet (IMDB)" msgid "Stream this channel into browser." msgstr "Trasmetti questo canale nel browser." -msgid "Edit this" -msgstr "Modifica timer" - msgid "Record this" msgstr "Registra questa trasmissione" @@ -807,6 +804,9 @@ msgstr "Vedi come elenco" msgid "Live Interactive VDR Environment" msgstr "" +#~ msgid "Edit this" +#~ msgstr "Modifica timer" + #, fuzzy #~ msgid "Start" #~ msgstr "Pagina iniziale" diff --git a/po/nl_NL.po b/po/nl_NL.po index 5f024c4..efee92c 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -453,9 +453,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/nn_NO.po b/po/nn_NO.po index 04d72c9..1694672 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -448,9 +448,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index fc2ad73..0077e0a 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -447,9 +447,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/pt_PT.po b/po/pt_PT.po index 866ab47..fe10d8a 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -447,9 +447,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/ro_RO.po b/po/ro_RO.po index fb1c9ec..cebd789 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -448,9 +448,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 65853eb..d37fb94 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -447,9 +447,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/sl_SI.po b/po/sl_SI.po index 60ea0ad..c977def 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -448,9 +448,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index 2bb4b46..4da5ec7 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -448,9 +448,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" diff --git a/po/tr_TR.po b/po/tr_TR.po index db16a54..d04e20a 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -448,9 +448,6 @@ msgstr "" msgid "Stream this channel into browser." msgstr "" -msgid "Edit this" -msgstr "" - msgid "Record this" msgstr "" |