diff --git a/checkin_notes b/checkin_notes
index 21b5d94f65..973e59e154 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -4832,3 +4832,17 @@ Charlie 10 May 2007
         ViewResources.cpp, h
         common/
             wxPieCtrl.cpp, h
+
+David  11 May 2007
+    - translation.inc: backed out change of 7 May;
+        we need to use " to expand $PROJECT var
+    - scheduler:
+        take work_buf_min into account in deciding whether
+        a result will be reported by its deadline.
+    - all back end programs:
+        better error message if can't parse config file
+
+    html/inc/
+        translation.inc
+    sched/
+        *.C
diff --git a/html/inc/translation.inc b/html/inc/translation.inc
index 8fe76649b9..95357a3182 100644
--- a/html/inc/translation.inc
+++ b/html/inc/translation.inc
@@ -140,7 +140,7 @@ function buildLanguages($langdir,$transdir,$prjtransdir,$compdir){
                     for ($i=0;$i<sizeof($interface);$i++){
                         if (isset($keys[$i]) && isset($language[$keys[$i]]) && $language[$keys[$i]]!="") {
                             //Translate to PHP
-                            fwrite($fh, "\$language_lookup_array[".$keys[$i]."] = '".addslashes($language[$keys[$i]])."';\n");
+                            fwrite($fh, "\$language_lookup_array[".$keys[$i]."] = \"".addslashes($language[$keys[$i]])."\";\n");
                         }
                     }
                     fwrite($fh, '?>');
@@ -190,7 +190,7 @@ function buildLanguages($langdir,$transdir,$prjtransdir,$compdir){
                     $keys = array_keys($language);
                     for ($i=0;$i<sizeof($interface);$i++){
                         if ($language[$keys[$i]]!="") {
-                            fwrite($fh, "\$language_lookup_array[".($real_interface_size+$keys[$i])."] = '".addslashes($language[$keys[$i]])."';\n");                //Translate to PHP
+                            fwrite($fh, "\$language_lookup_array[".($real_interface_size+$keys[$i])."] = \"".addslashes($language[$keys[$i]])."\";\n");                //Translate to PHP
                         }
                     }
                     fwrite($fh, '?>');
diff --git a/sched/assimilator.C b/sched/assimilator.C
index 4224820b03..33f94e8262 100644
--- a/sched/assimilator.C
+++ b/sched/assimilator.C
@@ -33,6 +33,8 @@
 #include "boinc_db.h"
 #include "parse.h"
 #include "util.h"
+#include "str_util.h"
+
 #include "sched_config.h"
 #include "sched_util.h"
 #include "sched_msgs.h"
@@ -189,7 +191,9 @@ int main(int argc, char** argv) {
 
     retval = config.parse_file("..");
     if (retval) {
-        log_messages.printf(SCHED_MSG_LOG::MSG_CRITICAL, "Can't parse config file\n");
+        log_messages.printf(SCHED_MSG_LOG::MSG_CRITICAL,
+            "Can't parse ../config.xml: %s\n", boincerror(retval)
+        );
         exit(1);
     }
 
diff --git a/sched/db_dump.C b/sched/db_dump.C
index 6915821da6..d60ef7f1f1 100644
--- a/sched/db_dump.C
+++ b/sched/db_dump.C
@@ -65,6 +65,7 @@
 #include "boinc_db.h"
 #include "filesys.h"
 #include "util.h"
+#include "str_util.h"
 #include "error_numbers.h"
 #include "md5_file.h"
 #include "parse.h"
@@ -811,7 +812,9 @@ int main(int argc, char** argv) {
 
     retval = config.parse_file("..");
     if (retval) {
-        log_messages.printf(SCHED_MSG_LOG::MSG_CRITICAL, "Can't parse config file\n");
+        log_messages.printf(SCHED_MSG_LOG::MSG_CRITICAL,
+            "Can't parse ../config.xml: %s\n", boincerror(retval)
+        );
         exit(1);
     }
     retval = boinc_db.open(
diff --git a/sched/delete_file.C b/sched/delete_file.C
index 528ba3e4ea..6a1cd27849 100644
--- a/sched/delete_file.C
+++ b/sched/delete_file.C
@@ -36,6 +36,8 @@
 #include <string.h>
 
 #include "boinc_db.h"
+#include "str_util.h"
+
 #include "sched_config.h"
 #include "sched_util.h"
 
@@ -103,7 +105,7 @@ int main(int argc, char** argv) {
     // parse the configuration file to get database information
     retval = config.parse_file(".");
     if (retval) {
-        fprintf(stderr, "Can't parse config file: %d\n", retval);
+        fprintf(stderr, "Can't parse ../config.xml: %s\n", boincerror(retval));
         exit(1);
     }
 
diff --git a/sched/feeder.C b/sched/feeder.C
index a373c1f6b9..2721a84e10 100644
--- a/sched/feeder.C
+++ b/sched/feeder.C
@@ -101,6 +101,8 @@ using std::vector;
 #include "error_numbers.h"
 #include "synch.h"
 #include "util.h"
+#include "str_util.h"
+
 #include "sched_config.h"
 #include "sched_shmem.h"
 #include "sched_util.h"
@@ -512,7 +514,9 @@ int main(int argc, char** argv) {
 
     retval = config.parse_file("..");
     if (retval) {
-        log_messages.printf(SCHED_MSG_LOG::MSG_CRITICAL, "can't parse config file\n");
+        log_messages.printf(SCHED_MSG_LOG::MSG_CRITICAL,
+            "Can't parse ../config.xml: %s\n", boincerror(retval)
+        );
         exit(1);
     }
 
diff --git a/sched/file_deleter.C b/sched/file_deleter.C
index 718b3ad7b5..3f8ff5d14a 100644
--- a/sched/file_deleter.C
+++ b/sched/file_deleter.C
@@ -584,7 +584,7 @@ int main(int argc, char** argv) {
     retval = config.parse_file("..");
     if (retval) {
         log_messages.printf(SCHED_MSG_LOG::MSG_CRITICAL,
-            "Can't parse config file\n"
+            "Can't parse ../config.xml: %s\n", boincerror(retval)
         );
         exit(1);
     }
diff --git a/sched/get_file.C b/sched/get_file.C
index 67b542d137..d78d7be753 100644
--- a/sched/get_file.C
+++ b/sched/get_file.C
@@ -33,13 +33,15 @@
 #endif
 #include <stdlib.h>
 #include <string.h>
-
 #include <time.h>
+
 #include "boinc_db.h"
+#include "util.h"
+#include "str_util.h"
+
 #include "sched_config.h"
 #include "sched_util.h"
 #include "md5_file.h"
-#include "util.h"
 
 SCHED_CONFIG config;
 
@@ -179,7 +181,7 @@ int main(int argc, char** argv) {
 
     retval = config.parse_file(".");
     if (retval) {
-        fprintf(stderr, "Can't parse config file: %d\n", retval);
+        fprintf(stderr, "Can't parse ../config.xml: %s\n", boincerror(retval));
         exit(1);
     }
 
diff --git a/sched/main.C b/sched/main.C
index e211a6479e..05ca19ef0b 100644
--- a/sched/main.C
+++ b/sched/main.C
@@ -47,6 +47,7 @@ using namespace std;
 #include "error_numbers.h"
 #include "shmem.h"
 #include "util.h"
+#include "str_util.h"
 
 #include "sched_config.h"
 #include "server_types.h"
@@ -293,7 +294,7 @@ int main(int argc, char** argv) {
     retval = config.parse_file("..");
     if (retval) {
         log_messages.printf(SCHED_MSG_LOG::MSG_CRITICAL,
-            "Can't parse config file\n"
+            "Can't parse ../config.xml: %s\n", boincerror(retval)
         );
         send_message("Server can't parse configuration file", 3600, true);
         exit(0);
diff --git a/sched/message_handler.C b/sched/message_handler.C
index 26c7f8f357..2387c85821 100644
--- a/sched/message_handler.C
+++ b/sched/message_handler.C
@@ -34,6 +34,8 @@ using namespace std;
 
 #include "boinc_db.h"
 #include "util.h"
+#include "str_util.h"
+
 #include "sched_config.h"
 #include "sched_util.h"
 #include "sched_msgs.h"
@@ -139,7 +141,7 @@ int main(int argc, char** argv) {
     retval = config.parse_file("..");
     if (retval) {
         log_messages.printf(SCHED_MSG_LOG::MSG_CRITICAL,
-            "Can't parse config file: %d\n", retval
+            "Can't parse ../config.xml: %s\n", boincerror(retval)
         );
         exit(1);
     }
diff --git a/sched/request_file_list.C b/sched/request_file_list.C
index 15b952b1de..bd59e8e06b 100644
--- a/sched/request_file_list.C
+++ b/sched/request_file_list.C
@@ -33,6 +33,8 @@
 #include <time.h>
 
 #include "boinc_db.h"
+#include "str_util.h"
+
 #include "sched_config.h"
 #include "sched_util.h"
 
@@ -97,7 +99,7 @@ int main(int argc, char** argv) {
 
     retval = config.parse_file(".");
     if (retval) {
-        fprintf(stderr, "Can't parse config file: %d\n", retval);
+        fprintf(stderr, "Can't parse ../config.xml: %s\n", boincerror(retval));
         exit(1);
     }
 
diff --git a/sched/sched_send.C b/sched/sched_send.C
index 2c4343b280..a52241b8e0 100644
--- a/sched/sched_send.C
+++ b/sched/sched_send.C
@@ -381,7 +381,9 @@ static inline void check_deadline(WORKUNIT& wu, SCHEDULER_REQUEST& request, SCHE
     //
     if (!config.ignore_delay_bound && request.estimated_delay>0) {
         double ewd = estimate_wallclock_duration(wu, request, reply);
-        if (request.estimated_delay + ewd > wu.delay_bound) {
+        double est_completion_delay = request.estimated_delay + ewd;
+        double est_report_delay = max(est_completion_delay, request.global_prefs.work_buf_min());
+        if (est_report_delay> wu.delay_bound) {
             log_messages.printf(
                 SCHED_MSG_LOG::MSG_DEBUG,
                 "[WU#%d %s] needs %d seconds on [HOST#%d]; delay_bound is %d (request.estimated_delay is %f)\n",
diff --git a/sched/send_file.C b/sched/send_file.C
index 8933ab7427..fd74cee2e0 100644
--- a/sched/send_file.C
+++ b/sched/send_file.C
@@ -32,13 +32,15 @@
 #endif
 #include <stdlib.h>
 #include <string.h>
-
 #include <time.h>
+
 #include "boinc_db.h"
+#include "util.h"
+#include "str_util.h"
+#include "md5_file.h"
+
 #include "sched_config.h"
 #include "sched_util.h"
-#include "md5_file.h"
-#include "util.h"
 
 SCHED_CONFIG config;
 
@@ -198,7 +200,7 @@ int main(int argc, char** argv) {
     }
     retval = config.parse_file(".");
     if (retval) {
-        fprintf(stderr, "Can't parse config file: %d\n", retval);
+        fprintf(stderr, "Can't parse ../config.xml: %s\n", boincerror(retval));
         exit(1);
     }
 
diff --git a/sched/trickle_handler.C b/sched/trickle_handler.C
index 2ebd6d5a79..0d1ad603da 100644
--- a/sched/trickle_handler.C
+++ b/sched/trickle_handler.C
@@ -140,7 +140,7 @@ int main(int argc, char** argv) {
     retval = config.parse_file("..");
     if (retval) {
         log_messages.printf(SCHED_MSG_LOG::CRITICAL,
-            "Can't parse config file: %d\n", retval
+            "Can't parse ../config.xml: %s\n", boincerror(retval)
         );
         exit(1);
     }
diff --git a/sched/update_stats.C b/sched/update_stats.C
index ffd69604aa..bbff22a5bc 100644
--- a/sched/update_stats.C
+++ b/sched/update_stats.C
@@ -35,6 +35,8 @@
 
 #include "boinc_db.h"
 #include "util.h"
+#include "str_util.h"
+
 #include "sched_config.h"
 #include "sched_util.h"
 #include "sched_msgs.h"
@@ -178,7 +180,9 @@ int main(int argc, char** argv) {
 
     retval = config.parse_file("..");
     if (retval) {
-        log_messages.printf(SCHED_MSG_LOG::MSG_CRITICAL, "Can't parse config file\n");
+        log_messages.printf(SCHED_MSG_LOG::MSG_CRITICAL,
+            "Can't parse ../config.xml: %s\n", boincerror(retval)
+        );
         exit(1);
     }
     retval = boinc_db.open(config.db_name, config.db_host, config.db_user, config.db_passwd);
diff --git a/sched/validator.C b/sched/validator.C
index db75108fe0..4f87d5663a 100644
--- a/sched/validator.C
+++ b/sched/validator.C
@@ -42,7 +42,9 @@ using namespace std;
 
 #include "boinc_db.h"
 #include "util.h"
+#include "str_util.h"
 #include "error_numbers.h"
+
 #include "sched_config.h"
 #include "sched_util.h"
 #include "sched_msgs.h"
@@ -721,7 +723,7 @@ int main(int argc, char** argv) {
     retval = config.parse_file("..");
     if (retval) {
         log_messages.printf(SCHED_MSG_LOG::MSG_CRITICAL,
-            "Can't parse config file: %d\n", retval
+            "Can't parse ../config.xml: %s\n", boincerror(retval)
         );
         exit(1);
     }