diff --git a/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm b/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm index 7adf30f94..90802d838 100644 --- a/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm +++ b/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm @@ -76,55 +76,55 @@ function init(){ {=var-set:dboxshot={=if-file-exists:/bin/dboxshot~true~{=if-file-exists:/var/bin/dboxshot~true~false=}=}=}
-

{=L:boxcontrol=}

+

{=L:main.boxcontrol=}

-

{=L:control=}

+

{=L:bc.menue.control=}

- +
. .

- +   - + - +    -   -   +   +  
@@ -134,7 +134,7 @@ function init(){
diff --git a/src/nhttpd/web/Y_Boxcontrol_Messages.yhtm b/src/nhttpd/web/Y_Boxcontrol_Messages.yhtm index fef59dbfa..3b7b77225 100644 --- a/src/nhttpd/web/Y_Boxcontrol_Messages.yhtm +++ b/src/nhttpd/web/Y_Boxcontrol_Messages.yhtm @@ -4,19 +4,19 @@
- {=var-set:help_url=Help-BoxControl-Message=}{=var-set:menu={=L:messages=}=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:help_url=Help-BoxControl-Message=}{=var-set:menu={=L:bc.menue.messages=}=}{=include-block:Y_Blocks.txt;work_menu=}
- + - +
{=L:message_to_screen=}
{=L:bc.msg.message_to_screen=}
- - + +
{=L:popup_to_screen=}
{=L:bc.msg.popup_to_screen=}
- - + +

diff --git a/src/nhttpd/web/Y_Ext_Menue.yhtm b/src/nhttpd/web/Y_Ext_Menue.yhtm index f4fbcade8..27bbe21c6 100644 --- a/src/nhttpd/web/Y_Ext_Menue.yhtm +++ b/src/nhttpd/web/Y_Ext_Menue.yhtm @@ -29,7 +29,7 @@ function build_menu(){
-

{=L:extensions=}

+

{=L:main.extensions=}

{=L:normal=}
diff --git a/src/nhttpd/web/Y_Info_Menue.yhtm b/src/nhttpd/web/Y_Info_Menue.yhtm index b1422bd7e..ab4ac86f3 100644 --- a/src/nhttpd/web/Y_Info_Menue.yhtm +++ b/src/nhttpd/web/Y_Info_Menue.yhtm @@ -21,16 +21,16 @@ function init(){ {=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip2=}~1~=}=}
-

Info

+

{=L:main.info=}

diff --git a/src/nhttpd/web/Y_Menue.yhtm b/src/nhttpd/web/Y_Menue.yhtm index 1e0ac1cbd..8e69324e2 100644 --- a/src/nhttpd/web/Y_Menue.yhtm +++ b/src/nhttpd/web/Y_Menue.yhtm @@ -98,29 +98,29 @@ function vlc() {
- {=L:version=} {=ini-get:Y_Version.txt;version=} + {=L:main.version=} {=ini-get:Y_Version.txt;version=} -   -   -   - +   +   +   +   diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/src/nhttpd/web/Y_Settings_Menue.yhtm index 59fede898..094bfe8bd 100644 --- a/src/nhttpd/web/Y_Settings_Menue.yhtm +++ b/src/nhttpd/web/Y_Settings_Menue.yhtm @@ -41,7 +41,7 @@ function init(){ {=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip2=}~1~=}=}
-

{=L:settings=}

+

{=L:main.settings=}

{=L:general=}
diff --git a/src/nhttpd/web/Y_Tools_Boxcontrol.yhtm b/src/nhttpd/web/Y_Tools_Boxcontrol.yhtm index 5f91dd2b0..011f3578b 100644 --- a/src/nhttpd/web/Y_Tools_Boxcontrol.yhtm +++ b/src/nhttpd/web/Y_Tools_Boxcontrol.yhtm @@ -21,73 +21,73 @@ function goUrl(_url){
- {=var-set:help_url=Help-BoxControl-Control=}{=var-set:menu=Control=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:help_url=Help-BoxControl-Control=}{=var-set:menu={=L:bc.menue.control=}=}{=include-block:Y_Blocks.txt;work_menu=}
- + - + {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ - + ~=} - + {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ - +
{=L:box=}{=L:standby_mode=}
{=L:bc.control.box=}{=L:bc.control.standby_mode=}
- - + + {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ - + ~=}
{=L:playback=}{=L:recording_mode=}
{=L:bc.control.playback=}{=L:bc.control.recording_mode=}
- + - +
{=L:epg_sectiond=}{=L:spts=}
{=L:bc.control.epg_sectiond=}{=L:bc.control.spts=}
- - - + + + - +
{=L:remote=}{=L:live_lock=}
{=L:bc.control.remote=}{=L:bc.control.live_lock=}
- + - - + +
{=L:optical_output=}{=L:esound_server=}
{=L:bc.control.optical_output=}{=L:bc.control.esound_server=}
- + diff --git a/src/nhttpd/web/Y_Tools_Menue.yhtm b/src/nhttpd/web/Y_Tools_Menue.yhtm index 22a6b1e86..9fe6fc960 100644 --- a/src/nhttpd/web/Y_Tools_Menue.yhtm +++ b/src/nhttpd/web/Y_Tools_Menue.yhtm @@ -35,9 +35,9 @@ function init(){ {=var-set:etherwake={=if-equal:{=global-var-get:boxtype=}~coolstream~{=if-file-exists:/bin/ether-wake~/bin/ether-wake~{=if-file-exists:/var/bin/ether-wake~/var/bin/ether-wake~=}=}~{=if-file-exists:/bin/etherwake~/bin/etherwake~{=if-file-exists:/var/bin/etherwake~/var/bin/etherwake~=}=}=}=}
-

{=L:tools=}

+

{=L:main.tools=}

-
{=L:tools=}
+
{=L:main.tools=}
    {=if-empty:{=var-get:management=}~ diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index 4a26e1dbe..5f6f6a260 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -1,68 +1,74 @@ -# Main Menue -boxcontrol=Boxsteuerung -boxcontrol_desc=Boxcontrol & Bouquets -live=Live -live_desc=LiveView, Aufnahmeliste, EPG -tools=Werkzeuge -tools_desc=Mounts, WOL, Experten Werkzeuge, Flashen -settings=Einstellungen -settings_desc=Einstellungen für die Box, Webserver, ... -extensions=Erweiterungen -extensions_desc=Installierte Erweiterungen und Verwaltung -info=Info -info_desc=Information über das yWeb, Version -live_tv_desc=LiveTV -live_tv_popup_desc=LiveTV Popup -remote_full_desc=Fernbedinung & OSD Vollbild -stream_to_vlc_client_desc=Live TV direkt im VLC Client -version=Version +# ==========Main Menue +main.boxcontrol=Boxsteuerung +main.boxcontrol_desc=Boxcontrol & Bouquets +main.live=Live +main.live_desc=LiveView, Aufnahmeliste, EPG +main.tools=Werkzeuge +main.tools_desc=Mounts, WOL, Experten Werkzeuge, Flashen +main.settings=Einstellungen +main.settings_desc=Einstellungen für die Box, Webserver, ... +main.extensions=Erweiterungen +main.extensions_desc=Installierte Erweiterungen und Verwaltung +main.info=Info +main.info_desc=Information über das yWeb, Version +main.live_tv_desc=LiveTV +main.live_tv_popup_desc=LiveTV Popup +main.remote_full_desc=Fernbedinung & OSD Vollbild +main.stream_to_vlc_client_desc=Live TV direkt im VLC Client +main.version=Version #========= Boxcontrol Menue -bouquets_desc=Sender auswählen -bouquets=Sender -control_desc=Box Funktionen (Neustart, Aufnahmemodus,...) -control=Steuerung -messages_desc=Nachricht an die Box senden -messages=Nachrichten -remote_desc=Fernbedinung -remote=Fernbedienung -lcd_screenshot_desc=lcd screenshot machen -lcd_screenshot=LCD Screenshot -lcd_screenshot_desc_ni=lcshot nicht installiert in /bin oder /var/bin -osd_screenshot_desc=osd screenshot machen -osd_screenshot=OSD Screenshot -osd_screenshot_desc_ni=fbshot nicht installiert in /bin oder /var/bin -remote_osd_desc=Fernbedienung und On Screen Display -remote_osd=Fernbed. & OSD -remote_osd_desc_ni=dboxshot nicht installiert in /bin oder /var/bin +bc.menue.bouquets_desc=Sender auswählen +bc.menue.bouquets=Sender +bc.menue.control_desc=Box Funktionen (Neustart, Aufnahmemodus,...) +bc.menue.control=Steuerung +bc.menue.messages_desc=Nachricht an die Box senden +bc.menue.messages=Nachrichten +bc.menue.remote_desc=Fernbedinung +bc.menue.remote=Fernbedienung +bc.menue.lcd_screenshot_desc=lcd screenshot machen +bc.menue.lcd_screenshot=LCD Screenshot +bc.menue.lcd_screenshot_desc_ni=lcshot nicht installiert in /bin oder /var/bin +bc.menue.osd_screenshot_desc=osd screenshot machen +bc.menue.osd_screenshot=OSD Screenshot +bc.menue.osd_screenshot_desc_ni=fbshot nicht installiert in /bin oder /var/bin +bc.menue.remote_osd_desc=Fernbedienung und On Screen Display +bc.menue.remote_osd=Fernbed. & OSD +bc.menue.remote_osd_desc_ni=dboxshot nicht installiert in /bin oder /var/bin -decrease_volume=Lautstärke verringern -increase_volume=Lautstärke erhöhen -mute_volume=Lautstärke an / aus -switch_to_tv=Zum TV umschalten -switch_to_radio=Zum Radio umschalten -webinf_slavebox=Webinterface der SlaveBox -volumen_display=Lautstärke Anzeige +bc.menue.decrease_volume=Lautstärke verringern +bc.menue.increase_volume=Lautstärke erhöhen +bc.menue.mute_volume=Lautstärke an / aus +bc.menue.switch_to_tv=Zum TV umschalten +bc.menue.switch_to_radio=Zum Radio umschalten +bc.menue.webinf_slavebox=Webinterface der SlaveBox +bc.menue.volumen_display=Lautstärke Anzeige ========= BOX Control -freemem=FreeMem -lock=sperren -unlock=freigeben -lcd_unlock=LCD freigeben -standby_mode=Standby Modus -recording_mode=Aufnahmemodus -box=Box -playback=Abspielen -epg_sectiond=EPG Sectiond -spts=SPTS -live_lock=Live sperren -optical_output=Optischer Ausgang -esound_server=ESound Server +bc.control.freemem=FreeMem +bc.control.lock=sperren +bc.control.unlock=freigeben +bc.control.lcd_unlock=LCD freigeben +bc.control.standby_mode=Standby Modus +bc.control.recording_mode=Aufnahmemodus +bc.control.box=Box +bc.control.remote=Fernbedienung +bc.control.playback=Abspielen +bc.control.epg_sectiond=EPG Sectiond +bc.control.spts=SPTS +bc.control.live_lock=Live sperren +bc.control.optical_output=Optischer Ausgang +bc.control.esound_server=ESound Server +bc.control.reboot.ask=Box wirklich neu starten? +bc.control.reboot=Neustart +bc.control.shutdown.ask=dbox wirklich ausschalten? +bc.control.shutdown=Ausschalten -message_to_screen_desc=Nachricht eingeben -message_to_screen=Meldung auf Bildschirm -popup_to_screen=Popup auf Bildschirm -send_message=Nachricht senden +========= BOX Control - Message +bc.msg.message_to_screen_desc=Nachricht eingeben +bc.msg.message_to_screen=Meldung auf Bildschirm +bc.msg.popup_to_screen=Popup auf Bildschirm +bc.msg.send_message=Nachricht senden ====== EXtension ext.installer_updater=Installation restriced_by_management_ip=Zugriff verwert wg. ManagementIP diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English index 3611b7f2a..ea19bfc6b 100644 --- a/src/nhttpd/web/languages/English +++ b/src/nhttpd/web/languages/English @@ -1,70 +1,77 @@ +#========= MAIN Menue +main.live_tv_desc=LiveTV +main.live_tv_popup_desc=LiveTV popup +main.remote_full_desc=Remote & OSD full +main.stream_to_vlc_client_desc=Stream to VLC Client +main.version=Version + # =========Main Menue -boxcontrol=Boxcontrol -boxcontrol_desc=Boxcontrol & Bouquets -live=Live -live_desc=LiveView, Timer Sync & Settings -tools=Tools -tools_desc=Mounts, WOL, Expert Tools -settings=Settings -settings_desc=Settings for Box, Web, Plugins ... -extensions=Extensions -extensions_desc=User Extentions ... -info=Info -info_desc=Information about yWeb, Updates - -live_tv_desc=LiveTV -live_tv_popup_desc=LiveTV popup -remote_full_desc=Remote & OSD full -stream_to_vlc_client_desc=Stream to VLC Client - -version=Version +main.boxcontrol=Boxcontrol +main.boxcontrol_desc=Boxcontrol & Bouquets +main.live=Live +main.live_desc=LiveView, Timer Sync & Settings +main.tools=Tools +main.tools_desc=Mounts, WOL, Expert Tools +main.settings=Settings +main.settings_desc=Settings for Box, Web, Plugins ... +main.extensions=Extensions +main.extensions_desc=User Extensions ... +main.info=Info +main.info_desc=Information about yWeb, Updates #========= Boxcontrol Menue -bouquets_desc=Switch channels -bouquets=Bouquets -control_desc=control box functions (reboot, remote control, SPTS, ...) -control=Control -messages_desc=send Messages to box -messages=Messages -remote_desc=Web-based Remote Control -remote=Remote -lcd_screenshot_desc=make lcd screenshot -lcd_screenshot=LCD Screenshot -lcd_screenshot_desc_ni=lcshot not installed at /bin or /var/bin -osd_screenshot_desc=make osd screenshot -osd_screenshot=OSD Screenshot -osd_screenshot_desc_ni=fbshot not installed at /bin or /var/bin -remote_osd_desc=remote and osd -remote_osd=Remote & OSD -remote_osd_desc_ni=dboxshot not installed at /bin or /var/bin +bc.menue.bouquets_desc=Switch channels +bc.menue.bouquets=Bouquets +bc.menue.control_desc=control box functions (reboot, remote control, SPTS, ...) +bc.menue.control=Control +bc.menue.messages_desc=send Messages to box +bc.menue.messages=Messages +bc.menue.remote_desc=Web-based Remote Control +bc.menue.remote=Remote +bc.menue.lcd_screenshot_desc=make lcd screenshot +bc.menue.lcd_screenshot=LCD Screenshot +bc.menue.lcd_screenshot_desc_ni=lcshot not installed at /bin or /var/bin +bc.menue.osd_screenshot_desc=make osd screenshot +bc.menue.osd_screenshot=OSD Screenshot +bc.menue.osd_screenshot_desc_ni=fbshot not installed at /bin or /var/bin +bc.menue.remote_osd_desc=remote and osd +bc.menue.remote_osd=Remote & OSD +bc.menue.remote_osd_desc_ni=dboxshot not installed at /bin or /var/bin -decrease_volume=decrease volumen -increase_volume=increase volumen -mute_volume=mute volumen -switch_to_tv=switch to TV -switch_to_radio=switch to Radio -webinf_slavebox=Webinterface der SlaveBox -volumen_display=volumen display +bc.menue.decrease_volume=decrease volumen +bc.menue.increase_volume=increase volumen +bc.menue.mute_volume=mute volumen +bc.menue.switch_to_tv=switch to TV +bc.menue.switch_to_radio=switch to Radio +bc.menue.webinf_slavebox=Webinterface der SlaveBox +bc.menue.volumen_display=volumen display ========= BOX Control -freemem=FreeMem -lock=lock -unlock=unlock -lcd_unlock=LCD unlock -standby_mode=standby mode -recording_mode=recording mode -box=box -playback=playback -epg_sectiond=EPG Sectiond -spts=SPTS -live_lock=live lock -optical_output=optical output -esound_server=ESound Server - -message_to_screen_desc=enter message to send to TV screen -message_to_screen=Message on screen -popup_to_screen=Message as popup -send_message=send message +bc.control.freemem=FreeMem +bc.control.lock=lock +bc.control.unlock=unlock +bc.control.lcd_unlock=LCD unlock +bc.control.standby_mode=standby mode +bc.control.recording_mode=recording mode +bc.control.box=box +bc.control.remote=remote +bc.control.playback=playback +bc.control.epg_sectiond=EPG Sectiond +bc.control.spts=SPTS +bc.control.live_lock=live lock +bc.control.optical_output=optical output +bc.control.esound_server=ESound Server +bc.control.reboot.ask=Really restart the Box? +bc.control.reboot=reboot +bc.control.shutdown.ask=Really shutdown the Box? +bc.control.shutdown=shutdown +bc.control.status=Status +bc.control.restart=restart +========= BOX Control - Message +bc.msg.message_to_screen_desc=enter message to send to TV screen +bc.msg.message_to_screen=Message on screen +bc.msg.popup_to_screen=Message as popup +bc.msg.send_message=send message ====== EXtension ext.installer_updater=Installer/Updater restriced_by_management_ip=restricted by ManagementIP