diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am index a21155337..4cc06751a 100644 --- a/data/y-web/Makefile.am +++ b/data/y-web/Makefile.am @@ -22,6 +22,7 @@ install_DATA = extensions.txt \ Y_Boxcontrol_Channellist.yhtm \ Y_Boxcontrol_Menue.yhtm \ Y_Boxcontrol_Messages.yhtm \ + Y_Boxcontrol_PZapit.yhtm \ Y_Dist.css \ Y_Dyn_Pages.yhtm \ Y_EPG.js \ @@ -86,8 +87,7 @@ install_DATA += Y_NI_Camd-control.yhtm \ Y_NI_NetFS-control.yhtm \ Y_NI_NetFS-edit.yhtm \ Y_NI_NetFS-init.yhtm \ - Y_NI_Plugin-control.yhtm \ - Y_NI_PZapit-control.yhtm + Y_NI_Plugin-control.yhtm install-data-hook: @# Badass hack, I know. If anyone knows a better way -- please send patch! diff --git a/data/y-web/Y_Boxcontrol_Menue.yhtm b/data/y-web/Y_Boxcontrol_Menue.yhtm index 2cb9e5821..f94db426b 100644 --- a/data/y-web/Y_Boxcontrol_Menue.yhtm +++ b/data/y-web/Y_Boxcontrol_Menue.yhtm @@ -187,7 +187,7 @@ function init() { {=L:live.timer=}
  • - {=L:ni.pzapit-control=} + {=L:bc.pzapit=}
  • diff --git a/data/y-web/Y_NI_PZapit-control.yhtm b/data/y-web/Y_Boxcontrol_PZapit.yhtm similarity index 82% rename from data/y-web/Y_NI_PZapit-control.yhtm rename to data/y-web/Y_Boxcontrol_PZapit.yhtm index fd55cafa3..ab22d2d0a 100644 --- a/data/y-web/Y_NI_PZapit-control.yhtm +++ b/data/y-web/Y_Boxcontrol_PZapit.yhtm @@ -4,14 +4,14 @@
    - {=var-set:menu={=L:ni.pzapit-control.title=}=}{=include-block:Y_Blocks.txt;work_menu=} + {=var-set:menu={=L:bc.pzapit.title=}=}{=include-block:Y_Blocks.txt;work_menu=}
    - - + + - - + +
    {=L:ni.pzapit-control.resolution=}{=L:ni.pzapit-control.43mode=}{=L:bc.pzapit.resolution=}{=L:bc.pzapit.43mode=}
    @@ -26,8 +26,8 @@
    {=L:ni.pzapit-control.channellists=}{=L:ni.pzapit-control.tuner=}{=L:bc.pzapit.channellists=}{=L:bc.pzapit.tuner=}
    diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt index 1a497f6c6..0ab6ca2f1 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=3.0.42 -date=21.02.2023 +version=3.0.43 +date=23.02.2023 info=NI-Neutrino-Webinterface diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch index c040154c1..364835c59 100644 --- a/data/y-web/languages/Deutsch +++ b/data/y-web/languages/Deutsch @@ -129,6 +129,14 @@ bc.screenshot.checkenable=OSD und/oder TV muss aktiviert sein! bc.screenshot.checkpip=F%FCr PiP muss TV aktiviert sein! bc.screenshot.reload_desc=Reload-Intervall in Sekunden +# ===== Boxcontrol - PZapit +bc.pzapit=PZapit +bc.pzapit.title=PZapit-Steuerung +bc.pzapit.resolution=Auflösung +bc.pzapit.43mode=4:3 Anzeigeverhalten +bc.pzapit.channellists=Kanallisten +bc.pzapit.tuner=Tuner + # ===== Boxcontrol - Others bc.channels=Sender @@ -522,13 +530,6 @@ ni.camd-tools.oscamversion=Allgemeine Informationen ni.camd-tools.ncamversion=Allgemeine Informationen ni.camd-tools.doscamversion=Allgemeine Informationen -ni.pzapit-control=PZapit -ni.pzapit-control.title=PZapit-Steuerung -ni.pzapit-control.resolution=Auflösung -ni.pzapit-control.43mode=4:3 Anzeigeverhalten -ni.pzapit-control.channellists=Kanallisten -ni.pzapit-control.tuner=Tuner - ni.plugin-control=Plugins ni.plugin-control.title=Plugin-Steuerung ni.plugin-control.manage=Plugins und Services verwalten diff --git a/data/y-web/languages/English b/data/y-web/languages/English index e0925a3bf..ae9f2120e 100644 --- a/data/y-web/languages/English +++ b/data/y-web/languages/English @@ -129,6 +129,14 @@ bc.screenshot.checkenable=OSD and/or TV must be enabled! bc.screenshot.checkpip=PiP requires TV enabled! bc.screenshot.reload_desc=Reload interval in seconds +# ===== Boxcontrol - PZapit +bc.pzapit=PZapit +bc.pzapit.title=PZapit-Control +bc.pzapit.resolution=Resolution +bc.pzapit.43mode=4:3 mode +bc.pzapit.channellists=Channellists +bc.pzapit.tuner=Tuner + # ===== Boxcontrol - Others bc.channels=Channels @@ -522,13 +530,6 @@ ni.camd-tools.oscamversion=Common Informations ni.camd-tools.ncamversion=Common Informations ni.camd-tools.doscamversion=Common Informations -ni.pzapit-control=PZapit -ni.pzapit-control.title=PZapit-Control -ni.pzapit-control.resolution=Resolution -ni.pzapit-control.43mode=4:3 mode -ni.pzapit-control.channellists=Channellists -ni.pzapit-control.tuner=Tuner - ni.plugin-control=Plugins ni.plugin-control.title=Plugin-Control ni.plugin-control.manage=Customize Plugins and Services