From fc5002015b2a9e16a3c6b9992d55b45c73a8d2fb Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sun, 8 Nov 2009 23:28:51 +0100
Subject: Revert "* [Cc]an't -> [Cc]annot"

This reverts commit 0ab17f382b9993ada3d12d4cdace72cca53fb545.
---
 lib/attachmentlist.php   | 2 +-
 lib/noticelist.php       | 2 +-
 lib/profilelist.php      | 2 +-
 lib/serverexception.php  | 2 +-
 lib/settingsaction.php   | 2 +-
 lib/util.php             | 2 +-
 lib/xmppqueuehandler.php | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 60095dace..51ceca857 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -71,7 +71,7 @@ class AttachmentList extends Widget
     /**
      * show the list of notices
      *
-     * "Uses up" the stream by looping through it. So, probably cannot
+     * "Uses up" the stream by looping through it. So, probably can't
      * be called twice on the same list.
      *
      * @return int count of notices listed.
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 027db2b3e..bf12bb73c 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -75,7 +75,7 @@ class NoticeList extends Widget
     /**
      * show the list of notices
      *
-     * "Uses up" the stream by looping through it. So, probably cannot
+     * "Uses up" the stream by looping through it. So, probably can't
      * be called twice on the same list.
      *
      * @return int count of notices listed.
diff --git a/lib/profilelist.php b/lib/profilelist.php
index f3eb66658..bbb722701 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -269,7 +269,7 @@ class ProfileListItem extends Widget
                 $usf = new UnsubscribeForm($this->out, $this->profile);
                 $usf->show();
             } else {
-                // Is it a local user? cannot remote sub from a list
+                // Is it a local user? can't remote sub from a list
                 // XXX: make that possible!
                 $other = User::staticGet('id', $this->profile->id);
                 if (!empty($other)) {
diff --git a/lib/serverexception.php b/lib/serverexception.php
index 6b2d55a0b..7dc9765ad 100644
--- a/lib/serverexception.php
+++ b/lib/serverexception.php
@@ -34,7 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 /**
  * Class for server exceptions
  *
- * Subclass of PHP Exception for server errors. The user typically cannot fix these.
+ * Subclass of PHP Exception for server errors. The user typically can't fix these.
  *
  * @category Exception
  * @package  StatusNet
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 4193ea521..c3669868d 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -72,7 +72,7 @@ class SettingsAction extends CurrentUserDesignAction
             $this->clientError(_('Not logged in.'));
             return;
         } else if (!common_is_real_login()) {
-            // Cookie theft means that automatic logins cannot
+            // Cookie theft means that automatic logins can't
             // change important settings or see private info, and
             // _all_ our settings are important
             common_set_returnto($this->selfUrl());
diff --git a/lib/util.php b/lib/util.php
index dde3fb48f..a4865c46c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -576,7 +576,7 @@ function common_linkify($url) {
         } elseif (is_string($longurl_data)) {
             $longurl = $longurl_data;
         } else {
-            throw new ServerException("Cannot linkify url '$url'");
+            throw new ServerException("Can't linkify url '$url'");
         }
     }
     $attrs = array('href' => $canon, 'title' => $longurl, 'rel' => 'external');
diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php
index 8acdcafe7..f28fc9088 100644
--- a/lib/xmppqueuehandler.php
+++ b/lib/xmppqueuehandler.php
@@ -43,7 +43,7 @@ class XmppQueueHandler extends QueueHandler
         $this->conn = jabber_connect($this->_id.$this->transport());
 
         if (empty($this->conn)) {
-            $this->log(LOG_ERR, "Could not connect to server.");
+            $this->log(LOG_ERR, "Couldn't connect to server.");
             return false;
         }
 
-- 
cgit v1.2.3-54-g00ecf