From 89e71763ae9f4ea67e52293f954e8f2ec1cdc7d8 Mon Sep 17 00:00:00 2001 From: yjogol Date: Sat, 6 Mar 2010 08:17:53 +0000 Subject: [PATCH] yweb: remote & osd multilanguage (ybug 473, 474) git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@459 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/nhttpd/web/Y_Tools_Rcsim.yhtm | 2 +- src/nhttpd/web/Y_Tools_fbshot.yhtm | 17 +++++++---------- src/nhttpd/web/Y_Tools_remote_osd.yhtm | 6 +++--- src/nhttpd/web/languages/Deutsch | 9 +++++++-- src/nhttpd/web/languages/English | 9 +++++++-- 5 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/nhttpd/web/Y_Tools_Rcsim.yhtm b/src/nhttpd/web/Y_Tools_Rcsim.yhtm index 74631b585..5418f02c1 100644 --- a/src/nhttpd/web/Y_Tools_Rcsim.yhtm +++ b/src/nhttpd/web/Y_Tools_Rcsim.yhtm @@ -6,7 +6,7 @@ function rcsim(_key) { if(_key == "KEY_POWER") - if(confirm("wirklich ausschalten? Power down?") != true) + if(confirm("{=L:bc.control.shutdown.ask=}") != true) return; loadSyncURL("/control/rcem?"+_key); } diff --git a/src/nhttpd/web/Y_Tools_fbshot.yhtm b/src/nhttpd/web/Y_Tools_fbshot.yhtm index 7ec6cebc1..9b16935f4 100644 --- a/src/nhttpd/web/Y_Tools_fbshot.yhtm +++ b/src/nhttpd/web/Y_Tools_fbshot.yhtm @@ -10,7 +10,7 @@ function do_snapshot(){ function do_snapshot2(){ var _shot = document.getElementById("shot"); var filename = id("file").value; - dbox_exec_tools("fbshot fb -q /tmp/"+filename+".png"); + dbox_exec_tools("fbshot fb /tmp/"+filename+".png"); show_waitbox(false); show_obj("shot", true); _shot.src = "/tmp/"+filename+".png?"+Math.random(); @@ -22,9 +22,9 @@ function do_dboxshot(){ function do_dboxshot2(){ var _shot = document.getElementById("shot"); var filename = id("file").value; - var res = dbox_exec_tools("fbshot -r -o /tmp/"+filename+".bmp"); + var res = dbox_exec_tools("fbshot fb /tmp/"+filename+".png"); if(res != "") - dbox_exec_tools("fbshot -o /tmp/"+filename+".bmp"); + dbox_exec_tools("fbshot -o /tmp/"+filename+".png"); show_waitbox(false); show_obj("shot", true); _shot.src = "/tmp/"+filename+".bmp?"+Math.random(); @@ -39,17 +39,14 @@ function do_clearshot2(){ -{=var-set:wait_text=Schnappschuss wird erstellt (take snapshot)=}{=include-block:Y_Blocks.txt;snip_wait=} +{=var-set:wait_text={=L:bc.osd.shap_wait_text=}=}{=include-block:Y_Blocks.txt;snip_wait=}
- {=var-set:help_url=Help-BoxControl-OSD_Screenshot=}{=var-set:menu=OSD Screenshot=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:help_url=Help-BoxControl-OSD_Screenshot=}{=var-set:menu={=L:bc.menue.osd_screenshot=}=}{=include-block:Y_Blocks.txt;work_menu=}
- + {=var-set:dboxshot={=if-file-exists:/bin/dboxshot~true~{=if-file-exists:/var/bin/dboxshot~true~false=}=}=} - {=if-equal:{=var-get:dboxshot=}~true~ - - =} - +  Filename:
diff --git a/src/nhttpd/web/Y_Tools_remote_osd.yhtm b/src/nhttpd/web/Y_Tools_remote_osd.yhtm index 62d3b067a..6cd7140c8 100644 --- a/src/nhttpd/web/Y_Tools_remote_osd.yhtm +++ b/src/nhttpd/web/Y_Tools_remote_osd.yhtm @@ -28,11 +28,11 @@ function do_clearshot2(){
- {=var-set:help_url=Help-BoxControl-Remote_OSD=}{=var-set:menu=Remote & OSD=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:help_url=Help-BoxControl-Remote_OSD=}{=var-set:menu={=L:bc.menue.remote_osd=}=}{=include-block:Y_Blocks.txt;work_menu=}
- + wait
diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index 0a85cd546..e3ee72799 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -93,7 +93,7 @@ bc.menue.switch_to_radio=Zum Radio umschalten bc.menue.webinf_slavebox=Webinterface der SlaveBox bc.menue.volumen_display=Lautstärke Anzeige -========= BOX Control +========= Boxcontrol bc.control.freemem=FreeMem bc.control.lock=sperren bc.control.unlock=freigeben @@ -113,12 +113,17 @@ bc.control.reboot=Neustart bc.control.shutdown.ask=dbox wirklich ausschalten? bc.control.shutdown=Ausschalten -========= BOX Control - Message +========= Boxcontrol - 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 +======== Boxcontrol - Remote & OSD +bc.osd.shot=Schnappschuss +bc.osd.delete_shots=Schnappschuss löschen +bc.osd.shap_wait_text=Schnappschuss wird erstellt + ====== EXtension ext.installer_updater=Installation ext.uninstaller=Deinstallation Erweiterungen diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English index 9360fe7f6..9eae2e401 100644 --- a/src/nhttpd/web/languages/English +++ b/src/nhttpd/web/languages/English @@ -95,7 +95,7 @@ bc.menue.switch_to_radio=switch to Radio bc.menue.webinf_slavebox=Webinterface der SlaveBox bc.menue.volumen_display=volumen display -========= BOX Control +========= Boxcontrol bc.control.freemem=FreeMem bc.control.lock=lock bc.control.unlock=unlock @@ -117,12 +117,17 @@ bc.control.shutdown=shutdown bc.control.status=Status bc.control.restart=restart -========= BOX Control - Message +========= Boxcontrol - 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 +======== Boxcontrol - Remote & OSD +bc.osd.shot=Shot +bc.osd.delete_shots=Delete shots +bc.osd.shap_wait_text=Take Snapshot + ====== EXtension ext.installer_updater=Installer/Updater ext.uninstaller=Extensions Uninstaller