From a0759ebfa6f30c26139907e01b905a0aa22c34ec Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Sun, 17 Feb 2008 12:54:58 +0100 Subject: moved timer conflicts from main menu to timers menu --- pages/menu.ecpp | 1 - pages/timers.ecpp | 5 +++++ po/ca_ES.po | 6 +++--- po/cs_CZ.po | 6 +++--- po/da_DK.po | 6 +++--- po/de_DE.po | 7 +++---- po/el_GR.po | 6 +++--- po/es_ES.po | 6 +++--- po/et_EE.po | 6 +++--- po/fi_FI.po | 8 ++++---- po/fr_FR.po | 8 ++++---- po/hr_HR.po | 6 +++--- po/hu_HU.po | 6 +++--- po/it_IT.po | 8 ++++---- po/nl_NL.po | 8 ++++---- po/nn_NO.po | 6 +++--- po/pl_PL.po | 6 +++--- po/pt_PT.po | 6 +++--- po/ro_RO.po | 6 +++--- po/ru_RU.po | 6 +++--- po/sl_SI.po | 6 +++--- po/sv_SE.po | 6 +++--- po/tr_TR.po | 6 +++--- 23 files changed, 72 insertions(+), 69 deletions(-) diff --git a/pages/menu.ecpp b/pages/menu.ecpp index a8eba86..e9b5faf 100644 --- a/pages/menu.ecpp +++ b/pages/menu.ecpp @@ -39,7 +39,6 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); % if ( LiveFeatures< features::epgsearch >().Recent() ) { | ><$ tr("Search") $> | ><$ tr("Searchtimers") $> - | ><$ tr("Timer conflicts") $> % } | ><$ tr("Recordings") $> | ><$ tr("Remote Control") $> diff --git a/pages/timers.ecpp b/pages/timers.ecpp index 581e51c..bc57b66 100644 --- a/pages/timers.ecpp +++ b/pages/timers.ecpp @@ -6,6 +6,7 @@ #include "setup.h" #include "i18n.h" #include "epg_events.h" +#include "livefeatures.h" using namespace std; using namespace vdrlive; @@ -152,4 +153,8 @@ static const size_t maximumDescriptionLength = 300; <%def timer_actions> <$ tr("New timer") $> +% if ( LiveFeatures< features::epgsearch >().Recent() ) { +| +<$ tr("Timer conflicts") $> +% } diff --git a/po/ca_ES.po b/po/ca_ES.po index 656f8f6..8098b7e 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -416,9 +416,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -689,6 +686,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 970af1b..743c2e7 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -414,9 +414,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -687,6 +684,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/da_DK.po b/po/da_DK.po index f8198a5..d59304a 100644 --- a/po/da_DK.po +++ b/po/da_DK.po @@ -414,9 +414,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -687,6 +684,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/de_DE.po b/po/de_DE.po index 8023dda..e6ef178 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -416,9 +416,6 @@ msgstr "Suchen" msgid "Searchtimers" msgstr "Suchtimer" -msgid "Timer conflicts" -msgstr "Timer-Konflikte" - msgid "Recordings" msgstr "Aufnahmen" @@ -689,6 +686,9 @@ msgstr "Startseite" msgid "Theme" msgstr "Thema" +msgid "Timer conflicts" +msgstr "Timer-Konflikte" + msgid "Timer has a conflict." msgstr "Timer hat einen Konflikt." @@ -766,4 +766,3 @@ msgstr "Ausf msgid "List view" msgstr "Listenansicht" - diff --git a/po/el_GR.po b/po/el_GR.po index 52fdc0e..050db7f 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -414,9 +414,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -687,6 +684,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index eb97533..2753cee 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -414,9 +414,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -687,6 +684,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/et_EE.po b/po/et_EE.po index f722a6e..c1c100a 100644 --- a/po/et_EE.po +++ b/po/et_EE.po @@ -414,9 +414,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -687,6 +684,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/fi_FI.po b/po/fi_FI.po index 091b1ad..8b2c006 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -414,10 +414,6 @@ msgstr "Etsi" msgid "Searchtimers" msgstr "Hakuajastimet" -#, fuzzy -msgid "Timer conflicts" -msgstr "Aktiivinen ajastin" - msgid "Recordings" msgstr "Tallenteet" @@ -690,6 +686,10 @@ msgstr "Aloitussivu" msgid "Theme" msgstr "Ulkoasu" +#, fuzzy +msgid "Timer conflicts" +msgstr "Aktiivinen ajastin" + #, fuzzy msgid "Timer has a conflict." msgstr "Aktiivinen ajastin" diff --git a/po/fr_FR.po b/po/fr_FR.po index 80520cc..f2058dd 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -417,10 +417,6 @@ msgstr "Recherche" msgid "Searchtimers" msgstr "Recherche de programmation" -#, fuzzy -msgid "Timer conflicts" -msgstr "Programmation est active." - msgid "Recordings" msgstr "Enregistrements" @@ -691,6 +687,10 @@ msgstr "Page de d msgid "Theme" msgstr "Thème" +#, fuzzy +msgid "Timer conflicts" +msgstr "Programmation est active." + #, fuzzy msgid "Timer has a conflict." msgstr "Programmation est active." diff --git a/po/hr_HR.po b/po/hr_HR.po index b872c5a..1ad6c68 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -415,9 +415,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -688,6 +685,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/hu_HU.po b/po/hu_HU.po index 23c320c..9b7306d 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -415,9 +415,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -688,6 +685,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index e621ff4..4b4c0ef 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -416,10 +416,6 @@ msgstr "Cerca" msgid "Searchtimers" msgstr "Cerca timer" -#, fuzzy -msgid "Timer conflicts" -msgstr "Timer attivo." - msgid "Recordings" msgstr "Registrazioni" @@ -692,6 +688,10 @@ msgstr "Pagina iniziale" msgid "Theme" msgstr "Tema" +#, fuzzy +msgid "Timer conflicts" +msgstr "Timer attivo." + #, fuzzy msgid "Timer has a conflict." msgstr "Timer attivo." diff --git a/po/nl_NL.po b/po/nl_NL.po index c2baccc..c2209bf 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -417,10 +417,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -#, fuzzy -msgid "Timer conflicts" -msgstr "Serie's opnemen" - msgid "Recordings" msgstr "" @@ -692,6 +688,10 @@ msgstr "" msgid "Theme" msgstr "" +#, fuzzy +msgid "Timer conflicts" +msgstr "Serie's opnemen" + #, fuzzy msgid "Timer has a conflict." msgstr "Serie's opnemen" diff --git a/po/nn_NO.po b/po/nn_NO.po index 35f301e..86df8ba 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -415,9 +415,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -688,6 +685,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index 591dc8b..f32e41d 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -414,9 +414,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -687,6 +684,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/pt_PT.po b/po/pt_PT.po index afea87e..b9de18e 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -414,9 +414,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -687,6 +684,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/ro_RO.po b/po/ro_RO.po index 93f8edc..7d924c8 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -415,9 +415,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -688,6 +685,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 88c2715..883ff4d 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -414,9 +414,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -687,6 +684,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/sl_SI.po b/po/sl_SI.po index 639d6f5..cd68470 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -415,9 +415,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -688,6 +685,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/sv_SE.po b/po/sv_SE.po index ce37c91..d8e4869 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -415,9 +415,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -688,6 +685,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" diff --git a/po/tr_TR.po b/po/tr_TR.po index 9435747..4d537ad 100644 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -415,9 +415,6 @@ msgstr "" msgid "Searchtimers" msgstr "" -msgid "Timer conflicts" -msgstr "" - msgid "Recordings" msgstr "" @@ -688,6 +685,9 @@ msgstr "" msgid "Theme" msgstr "" +msgid "Timer conflicts" +msgstr "" + msgid "Timer has a conflict." msgstr "" -- cgit v1.2.3