diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am index 5ac57ed7b..a21155337 100644 --- a/data/y-web/Makefile.am +++ b/data/y-web/Makefile.am @@ -9,7 +9,8 @@ install_DATA = extensions.txt \ favicon.ico \ index.html \ robots.txt \ - Y_About.yhtm \ + Y_About_Image.yhtm \ + Y_About_yWeb.yhtm \ Y_Baselib.js \ Y_Blank.yhtm \ Y_Blocks.txt \ @@ -78,8 +79,7 @@ install_DATA = extensions.txt \ Y_yWeb.js # NI-yWeb -install_DATA += Y_NI_About.yhtm \ - Y_NI_Camd-control.yhtm \ +install_DATA += Y_NI_Camd-control.yhtm \ Y_NI_Infoicons-control.yhtm \ Y_NI_m3uConInfo.yhtm \ Y_NI_m3uConvert.yhtm \ diff --git a/data/y-web/Y_NI_About.yhtm b/data/y-web/Y_About_Image.yhtm similarity index 95% rename from data/y-web/Y_NI_About.yhtm rename to data/y-web/Y_About_Image.yhtm index 15bda9f13..5e3dfd03b 100644 --- a/data/y-web/Y_NI_About.yhtm +++ b/data/y-web/Y_About_Image.yhtm @@ -90,7 +90,7 @@ function get_update_txt() { //show_waitbox(true); loadSyncURL("/control/exec?Y_NI_Tools&get_update_txt"); - window.document.location.href="/Y_NI_About.yhtm?ani=false"; + window.document.location.href="/Y_About_Image.yhtm?ani=false"; } jQuery(document).ready(function(){ @@ -112,7 +112,7 @@ jQuery(document).ready(function(){
- {=var-set:menu={=L:info.about=} NI-Image=}{=include-block:Y_Blocks.txt;work_menu=} + {=var-set:menu={=L:info.about_image=}=}{=include-block:Y_Blocks.txt;work_menu=}
@@ -142,7 +142,7 @@ jQuery(document).ready(function(){
{=ini-get:/.version;imagename=}
- +

@@ -152,10 +152,10 @@ jQuery(document).ready(function(){ 		{=if-file-exists:/tmp/update.txt~ - {=L:ni.about.image_upd_no=} - {=L:ni.about.image_upd_yes=} + {=L:info.about.image_upd_no=} + {=L:info.about.image_upd_yes=}
- +

diff --git a/data/y-web/Y_About.yhtm b/data/y-web/Y_About_yWeb.yhtm similarity index 94% rename from data/y-web/Y_About.yhtm rename to data/y-web/Y_About_yWeb.yhtm index 7c230c343..774a7c91c 100644 --- a/data/y-web/Y_About.yhtm +++ b/data/y-web/Y_About_yWeb.yhtm @@ -6,7 +6,7 @@
- {=var-set:menu={=L:info.about=}=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu={=L:info.about_yweb=}=}{=include-block:Y_Blocks.txt;work_menu=}
diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt index df5d83bc3..99a197b42 100644 --- a/data/y-web/Y_Blocks.txt +++ b/data/y-web/Y_Blocks.txt @@ -484,7 +484,7 @@ end-block~frame_ext # ------- Lay-Frame Info-Menu start-block~frame_info {=var-set:sec_menu=Y_Info_Menue.yhtm=} -{=var-set:work=Y_NI_About.yhtm=} +{=var-set:work=Y_About_Image.yhtm=} {=include-block:Y_Blocks.txt;frame_secondary=} end-block~frame_info diff --git a/data/y-web/Y_Info_Menue.yhtm b/data/y-web/Y_Info_Menue.yhtm index 014704071..4b03d1008 100644 --- a/data/y-web/Y_Info_Menue.yhtm +++ b/data/y-web/Y_Info_Menue.yhtm @@ -17,10 +17,10 @@ function init(){
  • - {=L:info.about=} NI-Image + {=L:info.about_image=}
  • - {=L:info.about=} yWeb + {=L:info.about_yweb=}
  • {=L:info.help=} diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch index 95b00d8c6..c040154c1 100644 --- a/data/y-web/languages/Deutsch +++ b/data/y-web/languages/Deutsch @@ -424,7 +424,12 @@ live.timer-sync.status=Status # ===== INFO info.help=Hilfe -info.about=Über +info.about_yweb=Über yWeb +info.about_image=Über NI-Image +info.about.your_image=Dein NI-Image +info.about.actual_image=Aktuelles NI-Image +info.about.image_upd_no=Kein Update verfügbar +info.about.image_upd_yes=Update verfügbar info.check_for_updates=Auf Updates prüfen info.your_version=Deine Version info.actual_version=Aktuelle Version @@ -498,11 +503,6 @@ ni.configure=Konfigurieren ni.dblclick=Doppelklick erforderlich ni.infopage=NI Infoseite -ni.about.your_image=Dein NI-Image -ni.about.actual_image=Aktuelles NI-Image -ni.about.image_upd_no=Kein Update verfügbar -ni.about.image_upd_yes=Update verfügbar - ni.camd-control=Softcams ni.camd-control.title=Softcam-Steuerung diff --git a/data/y-web/languages/English b/data/y-web/languages/English index 1d22fa320..e0925a3bf 100644 --- a/data/y-web/languages/English +++ b/data/y-web/languages/English @@ -424,7 +424,12 @@ live.timer-sync.status=Status # ===== INFO info.help=Help -info.about=About +info.about_yweb=About yWeb +info.about=About NI-Image +info.about.your_image=Your NI-Image +info.about.actual_image=Actual NI-Image +info.about.image_upd_no=No update available +info.about.image_upd_yes=Update available info.check_for_updates=Check for Updates info.your_version=Your Version info.actual_version=Actual Version @@ -498,11 +503,6 @@ ni.configure=Configure ni.dblclick=Doubleclick required ni.infopage=NI Infopage -ni.about.your_image=Your NI-Image -ni.about.actual_image=Actual NI-Image -ni.about.image_upd_no=No update available -ni.about.image_upd_yes=Update available - ni.camd-control=Softcams ni.camd-control.title=Softcam-Control