diff --git a/checkin_notes b/checkin_notes index 8ceeac28a4..a291301a91 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3164,3 +3164,10 @@ David 23 Apr 2010 net_stats.cpp,h cs_prefs.cpp cs_scheduler.cpp + +David 25 Apr 2010 + - user web: message tweaks + + html/inc/ + prefs.inc + prefs_util.inc diff --git a/doc/docutil.php b/doc/docutil.php index 6ed1243042..8ef51564c7 100644 --- a/doc/docutil.php +++ b/doc/docutil.php @@ -80,7 +80,8 @@ function copyright() { echo " Copyright © $y University of California. Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, + under the terms of the + GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation. "; } diff --git a/html/inc/prefs.inc b/html/inc/prefs.inc index 7032b59734..73f9280c87 100644 --- a/html/inc/prefs.inc +++ b/html/inc/prefs.inc @@ -73,7 +73,7 @@ $venues = array("home", "school", "work"); $cpu_prefs = array( new PREF_BOOL( tra( - "Suspend work while computer is on battery power? %1(matters only for portable computers)%2", + "Suspend work while computer is on battery power? %1 Matters only for portable computers %2", "
", "" ), @@ -87,7 +87,7 @@ $cpu_prefs = array( ), new PREF_BOOL( tra( - "Suspend GPU work while computer is in use? %1Enforced by version 6.7+%2", + "Suspend GPU work while computer is in use? %1 Enforced by version 6.7+ %2", "
", "" ), @@ -101,7 +101,7 @@ $cpu_prefs = array( ), new PREF_NUM( tra( - "Suspend work if no mouse/keyboard activity in last %1(Needed to enter low-power mode on some computers)%2", + "Suspend work if no mouse/keyboard activity in last %1 Needed to enter low-power mode on some computers %2", "
", "" ), @@ -110,7 +110,7 @@ $cpu_prefs = array( ), new PREF_NUM( tra( - "Suspend work if CPU usage is above %1 0 means no restriction
Enforced by version 6.10.30+%2", + "Suspend work if CPU usage is above %1 0 means no restriction
Enforced by version 6.10.30+ %2", "
", "" ), @@ -118,7 +118,7 @@ $cpu_prefs = array( new NUM_SPEC("%", 0, 100, 25) ), new PREF_HOUR_RANGE( - tra("Do work only between the hours of %1 (no restriction if equal)%2", + tra("Do work only between the hours of %1 No restriction if equal %2", "
", "" ), @@ -126,7 +126,7 @@ $cpu_prefs = array( ), new PREF_BOOL( tra( - "Leave tasks in memory while suspended? %1(suspended tasks will consume swap space if 'yes')%2", + "Leave tasks in memory while suspended? %1 Suspended tasks will consume swap space if 'yes' %2", "
", "" ), @@ -135,7 +135,7 @@ $cpu_prefs = array( ), new PREF_NUM( tra( - "Switch between tasks every %1(recommended: 60 minutes)%2", + "Switch between tasks every %1 Recommended: 60 minutes %2", "
", "" ), @@ -149,7 +149,7 @@ $cpu_prefs = array( ), new PREF_NUM( tra( - "On multiprocessors, use at most %1 Enforced by version 6.1+%2", + "On multiprocessors, use at most %1 Enforced by version 6.1+ %2", "
", "" ), @@ -158,7 +158,7 @@ $cpu_prefs = array( ), new PREF_NUM( tra( - "Use at most %1 (Can be used to reduce CPU heat)%2", + "Use at most %1 Can be used to reduce CPU heat %2", "
", "" ), @@ -176,7 +176,7 @@ $disk_prefs = array( new NUM_SPEC(tra("GB"), 0, 9999999, $dp->disk_max_used_gb) ), new PREF_NUM( - tra("Disk: leave free at least %1(Values smaller than %2 are ignored)%3", + tra("Disk: leave free at least %1 Values smaller than %2 are ignored %3", "
", "0.001", "" @@ -214,7 +214,7 @@ $disk_prefs = array( $net_prefs = array( new PREF_NUM( tra( - "Computer is connected to the Internet about every %1(Leave blank or 0 if always connected.%2 BOINC will try to maintain at least this much work.)%3", + "Computer is connected to the Internet about every %1 Leave blank or 0 if always connected. %2 BOINC will try to maintain at least this much work. %3", "
", "
", "" @@ -229,7 +229,7 @@ $net_prefs = array( ), new PREF_BOOL( tra( - "Confirm before connecting to Internet? %1(matters only if you have a modem, ISDN or VPN connection)%2", + "Confirm before connecting to Internet? %1 Matters only if you have a modem, ISDN or VPN connection %2", "
", "" ), @@ -238,7 +238,7 @@ $net_prefs = array( ), new PREF_BOOL( tra( - "Disconnect when done? %1(matters only if you have a modem, ISDN or VPN connection)%2", + "Disconnect when done? %1 Matters only if you have a modem, ISDN or VPN connection %2", "
", "" ), @@ -260,7 +260,10 @@ $net_prefs = array( "net_start_hour", "net_end_hour" ), new PREF_NUM2( - tra("Transfer at most"), + tra("Transfer at most %1 Enforced by version 6.10.46+ %2", + "
", + "" + ), "daily_xfer_limit_mb", "daily_xfer_period_days", new NUM_SPEC(tra("Mbytes every"), 0, 9999999, 0), @@ -268,7 +271,7 @@ $net_prefs = array( ), new PREF_BOOL( tra( - "Skip image file verification? %1 Check this ONLY if your Internet provider modifies image files (UMTS does this, for example). %2 Skipping verification reduces the security of BOINC.%3", + "Skip image file verification? %1 Check this ONLY if your Internet provider modifies image files (UMTS does this, for example). %2 Skipping verification reduces the security of BOINC. %3", "
", "", "" @@ -284,21 +287,21 @@ define("NETWORK_LIMIT_DESC", tra("Network usage")); define('ATI_SELECT_DESC', tra( - "Use ATI GPU if present %1(enforced by 6.10+ clients)%2", + "Use ATI GPU if present %1 Enforced by version 6.10+ %2", "
", "" ) ); define('CUDA_SELECT_DESC', tra( - "Use NVIDIA GPU if present %1(enforced by 6.10+ clients)%2", + "Use NVIDIA GPU if present %1 Enforced by version 6.10+ %2", "
", "" ) ); define('CPU_SELECT_DESC', tra( - "Use CPU %1(enforced by 6.10+ clients)%2", + "Use CPU %1 Enforced by version 6.10+ %2", "
", "" ) @@ -306,7 +309,7 @@ define('CPU_SELECT_DESC', define("ALLOW_BETA_WORK", tra( - "Run test applications? %1This helps us develop applications, but may cause jobs to fail on your computer%2", + "Run test applications? %1 This helps us develop applications, but may cause jobs to fail on your computer %2", "
", "" ) @@ -567,22 +570,6 @@ function prefs_parse_global($prefs_xml) { return $parse_result; } -function hour_str($x) { - return "$x:00"; -} - -function hour_select($x, $name) { - $s = ""; - $s = $s. "\n"; - return $s; -} - //////////////////////////////////////////// // // display preference subsets as Columns @@ -726,7 +713,7 @@ function prefs_show_global($prefs) { function prefs_show_resource($prefs, $columns=false) { global $app_types; $x = tra( - "Resource share %1If you participate in multiple BOINC projects, this is the proportion of your resources used by %2%3", + "Resource share %1 If you participate in multiple BOINC projects, this is the proportion of your resources used by %2 %3", "
", PROJECT, "" diff --git a/html/inc/prefs_util.inc b/html/inc/prefs_util.inc index a0520fdbb0..bb21d1dff5 100644 --- a/html/inc/prefs_util.inc +++ b/html/inc/prefs_util.inc @@ -276,6 +276,17 @@ class PREF_NUM2 extends PREF { } } +function hour_select($x, $name) { + $s = ""; + $s = $s. "\n"; + return $s; +} + class PREF_HOUR_RANGE extends PREF { public $tag2; function __construct($desc, $tag, $tag2) { @@ -290,7 +301,7 @@ class PREF_HOUR_RANGE extends PREF { if ($h1 == $h2) { $v = "---"; } else { - $v = hour_str($h1)." ".tra("and")." ".hour_str($h2); + $v = "$h1:00 ".tra("and")." $h2:00"; } echo "$v"; }