From 63fd411e80e5b32cae20fa665052f29f757b51b3 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 28 Feb 2023 21:02:25 +0100 Subject: [PATCH] yWeb: addition to 551e2697d28caf5743e8f94b3d892902f251b1af Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/aaccc756af111c33b24a3f857f453f46aa59c092 Author: vanhofen Date: 2023-02-28 (Tue, 28 Feb 2023) Origin message was: ------------------ - yWeb: addition to 551e2697d28caf5743e8f94b3d892902f251b1af ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/y-web/Makefile.am | 2 +- data/y-web/Y_Settings_Menue.yhtm | 4 ++-- ..._Settings_Plugincontrol.yhtm => Y_Settings_Plugins.yhtm} | 6 +++--- data/y-web/Y_Version.txt | 2 +- data/y-web/languages/Deutsch | 4 ++-- data/y-web/languages/English | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) rename data/y-web/{Y_Settings_Plugincontrol.yhtm => Y_Settings_Plugins.yhtm} (97%) diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am index 8eaff8f2f..5a259f7b3 100644 --- a/data/y-web/Makefile.am +++ b/data/y-web/Makefile.am @@ -56,7 +56,7 @@ install_DATA = extensions.txt \ Y_Settings_neutrino_forms.yhtm \ Y_Settings_nhttpd.yhtm \ Y_Settings_personalize.yhtm \ - Y_Settings_Plugincontrol.yhtm \ + Y_Settings_Plugins.yhtm \ Y_Settings_Plugins_hide.yhtm \ Y_Settings_umount_list.yhtm \ Y_Settings_video_audio.yhtm \ diff --git a/data/y-web/Y_Settings_Menue.yhtm b/data/y-web/Y_Settings_Menue.yhtm index 2440f0b15..1c6c83704 100644 --- a/data/y-web/Y_Settings_Menue.yhtm +++ b/data/y-web/Y_Settings_Menue.yhtm @@ -145,8 +145,8 @@ function init(){
  • - {=var-set:m_link_href=Y_Settings_Plugincontrol.yhtm=} - {=var-set:m_link_text={=L:set.plugincontrol=}=} + {=var-set:m_link_href=Y_Settings_Plugins.yhtm=} + {=var-set:m_link_text={=L:set.plugins=}=} {=include-block:Y_Blocks.txt;management_link=}
  • diff --git a/data/y-web/Y_Settings_Plugincontrol.yhtm b/data/y-web/Y_Settings_Plugins.yhtm similarity index 97% rename from data/y-web/Y_Settings_Plugincontrol.yhtm rename to data/y-web/Y_Settings_Plugins.yhtm index 8741b216e..846513ad4 100644 --- a/data/y-web/Y_Settings_Plugincontrol.yhtm +++ b/data/y-web/Y_Settings_Plugins.yhtm @@ -8,15 +8,15 @@ {=include-block:Y_Blocks.txt;head_close=} -{=var-set:wait_text={=L:set.plugincontrol.title=}
    =}{=include-block:Y_Blocks.txt;snip_wait=} +{=var-set:wait_text={=L:set.plugins.title=}
    =}{=include-block:Y_Blocks.txt;snip_wait=}
    - {=var-set:menu={=L:set.plugincontrol=}=}{=include-block:Y_Blocks.txt;work_menu=} + {=var-set:menu={=L:set.plugins=}=}{=include-block:Y_Blocks.txt;work_menu=}
    - + diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt index a852a4e3a..81ad01c1f 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=3.0.45 +version=3.0.46 date=28.02.2023 info=NI-Neutrino-Webinterface diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch index d46e797b1..2027ec964 100644 --- a/data/y-web/languages/Deutsch +++ b/data/y-web/languages/Deutsch @@ -341,8 +341,8 @@ set.settings.warning=Sichern & Wiederherstellen ist nur bei einem gleichen I set.xmltv.header=XMLTV Einstellungen # ===== Settings Plugins -set.plugincontrol=Plugin-Steuerung -set.plugincontrol.title=Plugins und Services verwalten +set.plugins=Plugin-Steuerung +set.plugins.title=Plugins und Services verwalten set.plugintools.fcm-addr=Telefonbuch bearbeiten set.plugintools.pat-rules=Regeln bearbeiten diff --git a/data/y-web/languages/English b/data/y-web/languages/English index 9b5d83f5d..9b326934e 100644 --- a/data/y-web/languages/English +++ b/data/y-web/languages/English @@ -341,8 +341,8 @@ set.settings.warning=Backup & Restore is only useful for the same image with the set.xmltv.header=XMLTV Settings # ===== Settings Plugins -set.plugincontrol=Plugincontrol -set.plugincontrol.title=Manage plugins and services +set.plugins=Plugincontrol +set.plugins.title=Manage plugins and services set.plugintools.fcm-addr=Edit Phonebook set.plugintools.pat-rules=Edit Rules
    {=L:set.plugincontrol.title=}{=L:set.plugins.title=}