Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

9 files changed, 14 insertions, 14 deletions

diff --git a/scripts/console.php b/scripts/console.php
index fecb75b4a..2a000d39b 100755
--- a/scripts/console.php
+++ b/scripts/console.php
@@ -90,7 +90,7 @@ function readline_emulation($prompt)
         if ($retval == 0) {
             return $line;
         } elseif ($retval == 127) {
-            // Could not execute bash even though we thought we saw it.
+            // Couldn't execute bash even though we thought we saw it.
             // Shell probably spit out an error message, sorry :(
             // Fall through to fgets()...
         } else {
diff --git a/scripts/createsim.php b/scripts/createsim.php
index 592853f86..1266a9700 100644
--- a/scripts/createsim.php
+++ b/scripts/createsim.php
@@ -85,7 +85,7 @@ function newSub($i)
     $from = User::staticGet('nickname', $fromnick);
 
     if (empty($from)) {
-        throw new Exception("Cannot find user '$fromnick'.");
+        throw new Exception("Can't find user '$fromnick'.");
     }
 
     $t = rand(0, $i - 1);
@@ -102,7 +102,7 @@ function newSub($i)
     $to = User::staticGet('nickname', $tunic);
 
     if (empty($to)) {
-        throw new Exception("Cannot find user '$tunic'.");
+        throw new Exception("Can't find user '$tunic'.");
     }
 
     subs_subscribe_to($from, $to);
diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php
index 39331f1a8..52389123c 100644
--- a/scripts/deleteuser.php
+++ b/scripts/deleteuser.php
@@ -39,14 +39,14 @@ if (have_option('i', 'id')) {
     $id = get_option_value('i', 'id');
     $user = User::staticGet('id', $id);
     if (empty($user)) {
-        print "Cannot find user with ID $id\n";
+        print "Can't find user with ID $id\n";
         exit(1);
     }
 } else if (have_option('n', 'nickname')) {
     $nickname = get_option_value('n', 'nickname');
     $user = User::staticGet('nickname', $nickname);
     if (empty($user)) {
-        print "Cannot find user with nickname '$nickname'\n";
+        print "Can't find user with nickname '$nickname'\n";
         exit(1);
     }
 } else {
diff --git a/scripts/fixup_utf8.php b/scripts/fixup_utf8.php
index 5581633ec..5a9fba7c3 100755
--- a/scripts/fixup_utf8.php
+++ b/scripts/fixup_utf8.php
@@ -76,7 +76,7 @@ class UTF8FixerUpper
         $succ = mysqli_set_charset($conn, $charset);
 
         if (!$succ) {
-            echo "ERROR: Could not set charset\n";
+            echo "ERROR: couldn't set charset\n";
             $db->disconnect();
             return NULL;
         }
diff --git a/scripts/makegroupadmin.php b/scripts/makegroupadmin.php
index 07f980d58..a68798451 100644
--- a/scripts/makegroupadmin.php
+++ b/scripts/makegroupadmin.php
@@ -67,7 +67,7 @@ try {
         $member->created    = common_sql_now();
 
         if (!$member->insert()) {
-            throw new Exception("Cannot add '$nickname' to '$groupname'.");
+            throw new Exception("Can't add '$nickname' to '$groupname'.");
         }
     }
 
@@ -80,7 +80,7 @@ try {
     $member->is_admin = 1;
 
     if (!$member->update($orig)) {
-        throw new Exception("Cannot make '$nickname' admin of '$groupname'.");
+        throw new Exception("Can't make '$nickname' admin of '$groupname'.");
     }
 
 } catch (Exception $e) {
diff --git a/scripts/registeruser.php b/scripts/registeruser.php
index 8aab325b7..5d9c8862d 100644
--- a/scripts/registeruser.php
+++ b/scripts/registeruser.php
@@ -60,7 +60,7 @@ try {
                                  'fullname' => $fullname));
 
     if (empty($user)) {
-        throw new Exception("Cannot register user '$nickname' with password '$password' and fullname '$fullname'.");
+        throw new Exception("Can't register user '$nickname' with password '$password' and fullname '$fullname'.");
     }
 
     if (!empty($email)) {
@@ -71,7 +71,7 @@ try {
 
         if (!$user->updateKeys($orig)) {
             print "Failed!\n";
-            throw new Exception("Cannot update email address.");
+            throw new Exception("Can't update email address.");
         }
     }
 
diff --git a/scripts/showcache.php b/scripts/showcache.php
index 6b00a8f7b..f17979572 100644
--- a/scripts/showcache.php
+++ b/scripts/showcache.php
@@ -58,7 +58,7 @@ print "Checking key '$k'...\n";
 $c = common_memcache();
 
 if (empty($c)) {
-    die("Cannot initialize cache object!\n");
+    die("Can't initialize cache object!\n");
 }
 
 $obj = $c->get($k);
diff --git a/scripts/sitemap.php b/scripts/sitemap.php
index ee5d33e1e..f8c392146 100755
--- a/scripts/sitemap.php
+++ b/scripts/sitemap.php
@@ -377,11 +377,11 @@ function write_file($path, $data)
     }
 
     if (($fh_out = fopen($path,'w')) === false) {
-        error("Could not open $path for writing.");
+        error("couldn't open $path for writing.");
     }
 
     if (fwrite($fh_out, $data) === false) {
-        error("Could not write to $path.");
+        error("couldn't write to $path.");
     }
 }
 
diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index 8d4c9d3d2..580c472ee 100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -98,7 +98,7 @@ foreach ($languages as $language) {
     $new_file = curl_get_file($file_url);
 
     if ($new_file === FALSE) {
-        echo "Could not retrieve .po file for $code: $file_url\n";
+        echo "Couldn't retrieve .po file for $code: $file_url\n";
         continue;
     }