diff --git a/src/nhttpd/web/Y_Settings_nhttpd.yhtm b/src/nhttpd/web/Y_Settings_nhttpd.yhtm index bd0dbc75b..fa8307880 100644 --- a/src/nhttpd/web/Y_Settings_nhttpd.yhtm +++ b/src/nhttpd/web/Y_Settings_nhttpd.yhtm @@ -96,11 +96,13 @@ function do_submit() {=L:set.nhttpd.server=} + {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ {=L:set.nhttpd.ips_without_keep_alive=}
{=L:set.nhttpd.ips_without_keep_alive_desc=} + =} {=L:set.nhttpd.cache=} {=L:set.nhttpd.cache_info=}  diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index 25bca7b87..0e1dfb32b 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -82,8 +82,26 @@ set.reload_neutrino=Neutrino neuladen set.reboot_required=Neustart notwendig set.sync_with_neutrino_desc=After changing settings via yWeb:
Choose on TV "Main Menu->Service->Soft restart", to accept the changes within neutrino.

After changing settings within Neutrino:
Choose on TV "Main Menu->Settings->Save settings now", to accept these changes and reload this page. set.sync_with_neutrino=Zur Synchronisation mit Neutrino -========Settings Menue +========Settings General & Menue set.menue.webserver=Webserver +ucodes=Ucodes +boot_logo=Boot Logo +timer_settings=Timer Einstellungen +zapit=Zapit +backup_restore=Sichern und Wiederherstellen +video_audio=Video/Audio +parental=Jugendschutz +direct_recording=Direktaufnahme +recording=Aufnahme +audio_player=Audioplayer +esound_server=Esound Server +movieplayer=Movieplayer +pictureviewer=Bildbetrachter +lcd_display=LC-Display +key_settings=Tastenbelegung +boot_options=Bootoptionen +peronalization=Personalisierung +plugins=Plugins ========Neutrino Settings - Recording set.rec.rec_dest=Aufnahmeziel set.rec.device=Aufnahmegerät @@ -161,6 +179,7 @@ set.nhttpd.allowed_file_extensions=Erlaubte Dateiendungen / MIME set.nhttpd.allow_all_file_extensions=Alle Dateiendungen erlauben set.nhttpd.url_of_logos_desc=URL bzw. Verzeichnis der Logos eingeben set.nhttpd.url_of_logos=URL bzw. Verzeichnis der Logos +set.nhttpd.server=Server set.nhttpd.ips_without_keep_alive_desc=(z.B. JtG Server, Mit Kommas trennen) set.nhttpd.ips_without_keep_alive=IPs mit No keep-alive set.nhttpd.cache=Cache @@ -178,25 +197,7 @@ set.yweb.box_tag=Box Bezeichnung set.yweb.box_color_desc=Farbe der Box Bezeichnung im Top-Menue. z.B. 2188e0 eingeben ohne # set.yweb.box_color=Farbe set.yweb.start_page=Startseite -=======Settings general -ucodes=Ucodes -boot_logo=Boot Logo -timer_settings=Timer Einstellungen -zapit=Zapit -backup_restore=Sichern und Wiederherstellen -video_audio=Video/Audio -parental=Jugendschutz -direct_recording=Direktaufnahme -recording=Aufnahme -audio_player=Audioplayer -esound_server=Esound Server -movieplayer=Movieplayer -pictureviewer=Bildbetrachter -lcd_display=LC-Display -key_settings=Tastenbelegung -boot_options=Bootoptionen -peronalization=Personalisierung -plugins=Plugins + ============ Tools Info tools.info.show_messages=Kernel Meldungen tools.info.processes=Prozesse diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English index 66e5342c2..c44327a02 100644 --- a/src/nhttpd/web/languages/English +++ b/src/nhttpd/web/languages/English @@ -84,8 +84,26 @@ set.reload_neutrino=reload Neutrino set.reboot_required=reboot required set.sync_with_neutrino_desc=After changing settings via yWeb:
Choose on TV "Main Menu->Service->Soft restart", to accept the changes within neutrino.

After changing settings within Neutrino:
Choose on TV "Main Menu->Settings->Save settings now", to accept these changes and reload this page. set.sync_with_neutrino=Synchronization with Neutrino -========Settings Menue +=======Settings General & Menue set.menue.webserver=Webserver +ucodes=Ucodes +boot_logo=Boot Logo +timer_settings=Timer Settings +zapit=Zapit +backup_restore=Backup & Restore +video_audio=Video/Audio +parental=Parental +direct_recording=Direct Recording +recording=Recording +audio_player=Audioplayer +esound_server=Esound Server +movieplayer=Movieplayer +pictureviewer=Picture Viewer +lcd_display=LC-Display +key_settings=Key Layout +boot_options=Boot options +peronalization=Personalization +plugins=Plugins ========Neutrino Settings - Recording set.rec.rec_dest=Recoring destination set.rec.device=Recording device @@ -163,6 +181,7 @@ set.nhttpd.allowed_file_extensions=Allowed File Extensions / MIME set.nhttpd.allow_all_file_extensions=Allow all File Extensions set.nhttpd.url_of_logos_desc=Enter URL or directory of Logos set.nhttpd.url_of_logos=URL or directory of Logos +set.nhttpd.server=Server set.nhttpd.ips_without_keep_alive_desc=(e.g. JtG Server, separate with commas) set.nhttpd.ips_without_keep_alive=IPs with No keep-alive set.nhttpd.cache=Cache @@ -180,25 +199,6 @@ set.yweb.box_tag=Box Tag set.yweb.box_color_desc=Box Name color in Top-Menue. e.g. enter 2188e0 without # set.yweb.box_color=Color set.yweb.start_page=Start page -=======Settings general -ucodes=Ucodes -boot_logo=Boot Logo -timer_settings=Timer Settings -zapit=Zapit -backup_restore=Backup & Restore -video_audio=Video/Audio -parental=Parental -direct_recording=Direct Recording -recording=Recording -audio_player=Audioplayer -esound_server=Esound Server -movieplayer=Movieplayer -pictureviewer=Picture Viewer -lcd_display=LC-Display -key_settings=Key Layout -boot_options=Boot options -peronalization=Personalization -plugins=Plugins ============ Tools Info tools.info.show_messages=Kernel Messages tools.info.processes=Processes @@ -289,7 +289,7 @@ date=date from=from to=to program=program -others=others +others=Others description=description color=Color tag=Tag