Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

svn path=/trunk/boinc/; revision=22102

This commit is contained in:
David Anderson 2010-08-03 03:56:13 +00:00
parent f5260dff06
commit 8677a50473
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
checkin_notes
View File

@ -5718,3 +5718,7 @@ Rom 2 Aug 2010
client/
net_status.cpp
David 2 Aug 2010
client/
net_status.cpp

2
client/net_stats.cpp
View File

@ -272,7 +272,7 @@ void NET_STATUS::poll() {
// wait until after a round of automatic proxy detection
// before attempting to contact the reference site
//
if (net_status.need_autodetect_proxy_settings && !net_status.have_autodetect_proxy_settings) return;
if (working_proxy_info.need_autodetect_proxy_settings && !working_proxy_info.have_autodetect_proxy_settings) return;
if (net_status.need_to_contact_reference_site && !gstate.gui_http.is_busy()) {
net_status.contact_reference_site();

6
html/inc/host.inc
View File

@ -119,7 +119,7 @@ function show_host($host, $user, $ipprivate) {
row2(tra("Operating System"), "$host->os_name <br> $host->os_version");
$v = boinc_version($host->serialnum);
if ($v) {
row2(tra("BOINC client version"), $v);
row2(tra("BOINC version"), $v);
}
$x = $host->m_nbytes/(1024*1024);
$y = round($x, 2);
@ -176,9 +176,9 @@ function show_host($host, $user, $ipprivate) {
}
if ($user) {
row2(tra("Number of times client has contacted server"), $host->rpc_seqno);
row2(tra("Number of times BOINC has contacted server"), $host->rpc_seqno);
row2(tra("Last time contacted server"), sched_log_link($host->rpc_time));
row2(tra("% of time BOINC client is running"), 100*$host->on_frac." %");
row2(tra("% of time BOINC is running"), 100*$host->on_frac." %");
if ($host->connected_frac > 0) {
row2(tra("While BOINC running, % of time host has an Internet connection"), 100*$host->connected_frac." %");
}

6
html/inc/result.inc
View File

@ -146,7 +146,7 @@ function state_string($result) {
case 4: return tra("Timed out - no response");
case 5: return tra("Didn't need");
case 6: return tra("Validate error");
case 7: return tra("Client detached");
case 7: return tra("Abandoned");
}
}
return tra("Unknown");
@ -169,13 +169,13 @@ function result_outcome_string($result) {
case 2: return tra("Couldn't send");
case 3:
if ($result->exit_status <> -221) {
return tra("Client error");
return tra("Computation error");
}
return tra("Redundant result");
case 4: return tra("No reply");
case 5: return tra("Didn't need");
case 6: return tra("Validate error");
case 7: return tra("Client detached");
case 7: return tra("Abandoned");
}
return tra("Unknown");
}

4
html/user/prefs.php
View File

@ -33,9 +33,9 @@ $updated = get_int("updated", true);
page_head(tra("%1 preferences", subset_name($subset)));
if (isset($updated)) {
echo "<p style='color: red'>
".tra("Your preferences have been updated. Client-related preferences
".tra("Your preferences have been updated, and
will take effect when your computer communicates with %1
or you issue the %2Update%3 command from the BOINC client.",
or you issue the %2Update%3 command from the BOINC Manager.",
PROJECT, "<strong>", "</strong>")."
</p>
";