[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-509-gc595f02
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-509-gc595f02
|
From: GetAway <tux...@ne...> - 2015-04-05 15:18:00
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via c595f0222ba149499395d077e31ad46cd458cd18 (commit)
from 227b75aa77f5f76ce922ce275ecb6f31e8142c95 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c595f0222ba149499395d077e31ad46cd458cd18
Author: GetAway <get...@t-...>
Date: Sun Apr 5 17:14:26 2015 +0200
yWeb: introduce multilanguage (part4)
use english in scripts
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js
index d55dbeb..f59993b 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js
@@ -169,7 +169,7 @@ function loadXMLDoc(_url, _processReqChange)
}
}
else
- alert("Kein Browser-Support fr XMLHttpRequest");
+ alert("No Browser-Support for XMLHttpRequest");
}
function loadSyncURL2(_url)
{
@@ -202,7 +202,7 @@ function loadSyncURL(_url)
}
}
else
- alert("Kein Browser-Support fr XMLHttpRequest");
+ alert("No Browser-Support for XMLHttpRequest");
if (_req.readyState == 4 && _req.status == 200)
return _req.responseText;
else
@@ -229,7 +229,7 @@ function loadSyncURLxml(_url)
}
}
else
- alert("Kein Browser-Support fr XMLHttpRequest");
+ alert("No Browser-Support for XMLHttpRequest");
if (_req.readyState == 4 && _req.status == 200)
return _req.responseXML;
else
@@ -381,7 +381,7 @@ function dbox_reload_neutrino(){
}
function dbox_exec_command(_cmd)
{
- alert("Diese Funktion dbox_exec_command wurde aus Sicherheitsgruenden abgeschafft. Bitte Extension updaten.");
+ alert("The function dbox_exec_command was abolished for security reasons. Please update extentions.");
var __cmd = _cmd.replace(/ /g, "&");
// return loadSyncURL("/control/exec?Y_Tools&exec_cmd&"+__cmd);
}
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Ext_Update.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Ext_Update.js
index 3b4b062..4de42a3 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Ext_Update.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Ext_Update.js
@@ -151,7 +151,7 @@ function do_set_updates2(){
var extfile=ext.build_extension_file();
document.f.extentions.value=extfile;
show_waitbox(false);
- alert("update fertig. Menue neuladen.");
+ alert("Update finished. Reload Menue");
do_submit();
}
var avaiable=0;
@@ -164,11 +164,11 @@ function show_free(){
avaiable = RegExp.$4;
var percentage = RegExp.$5;
if (total != "") {
- str = "Platz in /var Gesamt: " + total + "k Benutzt: " + used + "k Frei: " + avaiable + "k Anteil benutzt: " + percentage;
+ str = "Space in /var Total: " + total + "kB; Used: " + used + "kB; Free: " + avaiable + "kB; Anteil benutzt: " + percentage;
$('avaiable').update(avaiable);
}
else
- str = "Kann freien Speicherplatz nicht ermitteln /var ist keine Partition! JFFS2 oder YADD?";
+ str = "Can not determine free space. /var is not a partition! JFFS2 or YADD?";
$("free").update(str);
}
/*uninstall*/
@@ -214,7 +214,7 @@ function do_uninstall2(tag){
var extfile=ext.build_extension_file();
document.f.extentions.value=extfile;
show_waitbox(false);
- alert("update fertig. Menue neuladen.");
+ alert("Update finished. Menue reload.");
do_submit();
}
function uninstall_build_list(){
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Flash.js b/tuxbox/neutrino/daemons/nhttpd/web/Y_Flash.js
index 467c25e..10a1608 100755
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Flash.js
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Flash.js
@@ -92,7 +92,7 @@ function progress_get()
}
function do_submit()
{
- var msg = "Image flashen?";
+ var msg = "Flash Image?";
if(document.f.demo.checked)
msg = "DEMO: "+msg;
if(confirm(msg)==true){
@@ -112,6 +112,6 @@ function do_image_flash_ready()
window.clearInterval(aktiv);
$('flash_diag').hide();
loadSyncURL("/control/lcd?lock=0");
- alert("Image geflasht. Nach Reboot OK druecken");
+ alert("Image flashed. After Reboot press OK.");
top.location.href="/";
}
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 74be22d..6d740e0 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.0.10
-date=17.03.2015
+version=2.8.0.11
+date=05.04.2015
type=Release
info=Tuxbox
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Live.sh b/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Live.sh
index c74e346..a8d1de7 100755
--- a/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Live.sh
+++ b/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Live.sh
@@ -109,7 +109,7 @@ case "$1" in
;;
*)
- echo "Parameter falsch: $*" ;;
+ echo "Parameter wrong: $*" ;;
esac
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Plugins.sh b/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Plugins.sh
index a0b7109..58b9fdd 100755
--- a/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Plugins.sh
+++ b/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Plugins.sh
@@ -50,7 +50,7 @@ skin_set()
fi
config_set_value_direct $y_config_Y_Web 'skin' $1
- msg="Skin geaendert - Jetzt Browser Refresh/Aktualisierung ausfuehren"
+ msg="Skin changed - Please refresh browser now"
y_format_message_html
}
@@ -65,6 +65,6 @@ case "$1" in
skin_get)
skin_get ;;
*)
- echo "Parameter falsch: $*" ;;
+ echo "Parameter wrong: $*" ;;
esac
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh b/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh
index 1a3412e..7b64d30 100755
--- a/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh
+++ b/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh
@@ -69,10 +69,10 @@ image_upload()
{
if [ -s "$y_upload_file" ]
then
- msg="<b>Image upload ok</b><br>"
+ msg="<b>Image upload ok</b><br />"
msg="$msg <script language='JavaScript' type='text/javascript'>window.setTimeout('parent.do_image_upload_ready()',1000)</script>"
else
- msg="Upload-Problem.<br>Bitte nochmal hochladen."
+ msg="Upload-Problem.<br />Try again, please."
msg="$msg <script language='JavaScript' type='text/javascript'>window.setTimeout('parent.do_image_upload_ready_error()',1000)</script>"
fi
y_format_message_html
@@ -150,7 +150,7 @@ flash_mtd()
done
fi
# msg_nmsg "flashen%20fertig.%20Reboot..."
- msg="geflasht ... bitte jetzt box neu starten ..."
+ msg="flashed ... please reboot your box ..."
msg="$msg <script language='JavaScript' type='text/javascript'>window.setTimeout('parent.do_image_flash_ready()',1000)</script>"
y_format_message_html
@@ -159,7 +159,7 @@ flash_mtd()
busybox reboot -d10
fi
else
- msg="Upload-Problem.<br>Bitte nochmal hochladen."
+ msg="Upload-Problem.<br />Try again, please."
msg="$msg <script language='JavaScript' type='text/javascript'>window.setTimeout('parent.do_image_flash_ready()',1000)</script>"
y_format_message_html
fi
@@ -173,34 +173,34 @@ upload_copy()
then
cp "$y_upload_file" "$1"
else
- msg="Upload-Problem.<br>Bitte nochmal hochladen."
+ msg="Upload-Problem.<br />Try again, please."
fi
}
# -----------------------------------------------------------
bootlogo_upload()
{
- msg="Boot-Logo neu gesetzt"
+ msg="Set new Boot-Logo"
upload_copy "$y_boot_logo"
y_format_message_html
}
# -----------------------------------------------------------
bootlogo_lcd_upload()
{
- msg="Boot-Logo-LCD neu gesetzt"
+ msg="Set new Boot-Logo-LCD"
upload_copy "$y_boot_logo_lcd"
y_format_message_html
}
# -----------------------------------------------------------
ucodes_upload()
{
- msg="$1 hochgeladen<br><a href='/Y_Settings_ucodes.htm'><u>naechste Datei</u></a>"
+ msg="$1 uploaded<br /><a href='/Y_Settings_ucodes.htm'><u>next file</u></a>"
upload_copy "$y_path_ucodes/$1"
y_format_message_html
}
# -----------------------------------------------------------
zapit_upload()
{
- msg="$1 hochgeladen<br><a href='/Y_Settings_zapit.htm'><u>naechste Datei</u></a>"
+ msg="$1 uploaded<br /><a href='/Y_Settings_zapit.htm'><u>next file</u></a>"
upload_copy "$y_path_zapit/$1"
y_format_message_html
}
@@ -267,7 +267,7 @@ do_mount()
echo "$res"
echo "view mounts"
m=`mount`
- msg="mount cmd:$cmd<br><br>res=$res<br>view Mounts;<br>$m"
+ msg="mount cmd:$cmd<br /><br />res=$res<br />view Mounts;<br />$m"
y_format_message_html
}
# -----------------------------------------------------------
@@ -386,7 +386,7 @@ do_installer()
echo '<link rel="stylesheet" type="text/css" href="/Y_User.css">'
echo "<meta http-equiv='refresh' content='0; $y_out_html'>"
echo '</head>'
- echo "<body><a href='$y_out_html'>If automatic forwarding does not go.</a>"
+ echo "<body><a href='$y_out_html'>If automatic forwarding does not work.</a>"
echo '</body></html>'
# cat $y_out_html
else
@@ -404,7 +404,7 @@ do_installer()
y_format_message_html
fi
else
- msg="Upload-Problem.<br>Try again, please."
+ msg="Upload-Problem.<br />Try again, please."
y_format_message_html
fi
}
@@ -448,7 +448,7 @@ do_ext_uninstaller()
proc()
{
msg=`cat /proc/$1`
- msg="<b>proc: $1</b><br><br>$msg"
+ msg="<b>proc: $1</b><br /><br />$msg"
y_format_message_html
}
# -----------------------------------------------------------
@@ -461,7 +461,7 @@ wol()
else
msg=`/bin/ether-wake $1`
fi
- msg="<b>Wake on LAN $1</b><br><br>$msg"
+ msg="<b>Wake on LAN $1</b><br /><br />$msg"
y_format_message_html
}
# -----------------------------------------------------------
@@ -567,7 +567,7 @@ case "$1" in
zapit_upload) zapit_upload $2 ;;
kernel-stack) msg=`dmesg`; y_format_message_html ;;
ps) msg=`ps aux`; y_format_message_html ;;
- free) f=`free`; p=`df -h`; msg="RAM Speichernutzung\n-------------------\n$f\n\nPartitionen\n-------------------\n$p"
+ free) f=`free`; p=`df -h`; msg="RAM memory usage\n-------------------\n$f\n\npartitions\n-------------------\n$p"
y_format_message_html ;;
yreboot) yreboot; echo "Reboot..." ;;
check_yWeb_conf) check_Y_Web_conf ;;
@@ -655,7 +655,7 @@ case "$1" in
df /tmp|grep /tmp
;;
*)
- echo "[Y_Tools.sh] Parameter falsch: $*" ;;
+ echo "[Y_Tools.sh] Parameter wrong: $*" ;;
esac
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_Baselib.js | 8 ++--
tuxbox/neutrino/daemons/nhttpd/web/Y_Ext_Update.js | 8 ++--
tuxbox/neutrino/daemons/nhttpd/web/Y_Flash.js | 4 +-
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 +-
.../neutrino/daemons/nhttpd/web/scripts/Y_Live.sh | 2 +-
.../daemons/nhttpd/web/scripts/Y_Plugins.sh | 4 +-
.../neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh | 32 ++++++++++----------
7 files changed, 31 insertions(+), 31 deletions(-)
--
Tuxbox-GIT: apps
|
