Merge branch 'release/0.5' into develop

3 files changed, 5 insertions, 5 deletions

diff --git a/script/generate_pot.sh b/script/generate_pot.sh
index 287d33e7f..1ca361d08 100755
--- a/script/generate_pot.sh
+++ b/script/generate_pot.sh
@@ -6,3 +6,4 @@ rake gettext:store_model_attributes
 rake gettext:find
 git checkout ../locale/*/app.po
 
+echo "Now commit the new app.pot and push.  See TRANSLATE.md for more info"
\ No newline at end of file
diff --git a/script/load-sample-data b/script/load-sample-data
index 92846ce17..e5f1be4cd 100755
--- a/script/load-sample-data
+++ b/script/load-sample-data
@@ -16,4 +16,4 @@ ENV["RAILS_ENV"] = env        # so restore to what it was before
 load_raw_emails_data
 END
 
-echo "Loaded fixtures."
+echo "Loaded fixtures.  You may now wish to run $LOC/update-xapian-index"
diff --git a/script/spec-all-pairs b/script/spec-all-pairs
index 338f56147..e8fa77be9 100755
--- a/script/spec-all-pairs
+++ b/script/spec-all-pairs
@@ -4,8 +4,7 @@
 # to winkle out order-dependent failures.
 
 test_pair () {
-    rake db:test:purge > /dev/null
-    rake db:test:clone_structure > /dev/null
+    rake db:test:prepare > /dev/null 2>&1
     if script/spec "$1" "$2" > /dev/null 2>&1
     then
         echo "OK: $1 $2"
@@ -40,8 +39,8 @@ pairs_from_stdin() {
     while read line
     do
         case "$line" in
-        \*\ FAILED:\ *)
-        spec/*.rb spec/$.rb)
+        \*\ FAILED:\ *|\
+        spec/*.rb\ spec/*.rb)
           line=${line#\* FAILED: }
           if ! test_pair $line
           then