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

40 files changed, 51 insertions, 51 deletions

diff --git a/actions/allrss.php b/actions/allrss.php
index 28b1be27d..4a5d15c7b 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -56,7 +56,7 @@ class AllrssAction extends Rss10Action
      *
      * @param array $args Web and URL arguments
      *
-     * @return boolean false if user doesn't exist
+     * @return boolean false if user does not exist
      */
     function prepare($args)
     {
diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php
index 96179f175..c7c0e7c00 100644
--- a/actions/apiaccountratelimitstatus.php
+++ b/actions/apiaccountratelimitstatus.php
@@ -36,7 +36,7 @@ if (!defined('STATUSNET')) {
 require_once INSTALLDIR . '/lib/apibareauth.php';
 
 /**
- * We don't have a rate limit, but some clients check this method.
+ * We do not have a rate limit, but some clients check this method.
  * It always returns the same thing: 150 hits left.
  *
  * @category API
diff --git a/actions/apiaccountupdateprofileimage.php b/actions/apiaccountupdateprofileimage.php
index 72fb361bf..2f8e9628c 100644
--- a/actions/apiaccountupdateprofileimage.php
+++ b/actions/apiaccountupdateprofileimage.php
@@ -102,7 +102,7 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction
         }
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php
index 1cab2df5d..4f941f6c3 100644
--- a/actions/apiblockcreate.php
+++ b/actions/apiblockcreate.php
@@ -94,7 +94,7 @@ class ApiBlockCreateAction extends ApiAuthAction
         }
 
         if (empty($this->user) || empty($this->other)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php
index 16dbf94ca..328f18ab0 100644
--- a/actions/apiblockdestroy.php
+++ b/actions/apiblockdestroy.php
@@ -93,7 +93,7 @@ class ApiBlockDestroyAction extends ApiAuthAction
         }
 
         if (empty($this->user) || empty($this->other)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
index a21fe86d2..5b3f412ad 100644
--- a/actions/apidirectmessage.php
+++ b/actions/apidirectmessage.php
@@ -74,7 +74,7 @@ class ApiDirectMessageAction extends ApiAuthAction
         $this->user = $this->auth_user;
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index ca1ee70dd..fed6acc30 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -72,7 +72,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
         $this->user = $this->auth_user;
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php
index 3d9b7e001..fb73624c9 100644
--- a/actions/apifriendshipsdestroy.php
+++ b/actions/apifriendshipsdestroy.php
@@ -113,7 +113,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction
             return;
         }
 
-        // Don't allow unsubscribing from yourself!
+        // Do not allow unsubscribing from yourself!
 
         if ($this->user->id == $this->other->id) {
             $this->clientError(
diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php
index f66e83073..895dfb7ab 100644
--- a/actions/apigroupcreate.php
+++ b/actions/apigroupcreate.php
@@ -109,7 +109,7 @@ class ApiGroupCreateAction extends ApiAuthAction
         }
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index a8a40a6b3..a822d18dd 100644
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -87,7 +87,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
         parent::handle($args);
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index 071cd9290..ffda3986f 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -96,7 +96,7 @@ class ApiGroupJoinAction extends ApiAuthAction
         }
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 0d4bb9e4d..8665ea1aa 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -96,7 +96,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
         }
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index c529c1e40..7b05f8a96 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -87,7 +87,7 @@ class ApiGroupListAction extends ApiBareAuthAction
         parent::handle($args);
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index e369fa71e..5c23accca 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -136,7 +136,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
         }
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index bc68dd192..2c691bb84 100644
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -84,7 +84,7 @@ class ApiSubscriptionsAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return false;
         }
 
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index b8ae74f13..f84d7b4cb 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -67,7 +67,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 66dd3f2b2..e84f77372 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -76,7 +76,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index fe5ff0f28..0956ccdce 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -76,7 +76,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 285735fd1..ca1d21772 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -78,7 +78,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
-            $this->clientError(_('No such user!'), 404, $this->format);
+            $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
 
diff --git a/actions/attachment.php b/actions/attachment.php
index 6981354d1..ca9e57845 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -146,7 +146,7 @@ class AttachmentAction extends Action
     }
 
     /**
-     * Don't show local navigation
+     * Do not show local navigation
      *
      * @return void
      */
@@ -170,7 +170,7 @@ class AttachmentAction extends Action
     }
 
     /**
-     * Don't show page notice
+     * Do not show page notice
      *
      * @return void
      */
diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index 537950792..1a6925e11 100644
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -49,7 +49,7 @@ class AvatarbynicknameAction extends Action
      *
      * @param array $args query arguments
      * 
-     * @return boolean false if nickname or user isn't found
+     * @return boolean false if nickname or user is not found
      */
     function handle($args)
     {
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 4a48a9c34..ba8e86d0f 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -67,7 +67,7 @@ class DeletenoticeAction extends Action
             common_user_error(_('Not logged in.'));
             exit;
         } else if ($this->notice->profile_id != $this->user_profile->id &&
-                   !$this->user->hasRight(Right::deleteOthersNotice)) {
+                   !$this->user->hasRight(Right::DELETEOTHERSNOTICE)) {
             common_user_error(_('Can\'t delete this notice.'));
             exit;
         }
diff --git a/actions/groupblock.php b/actions/groupblock.php
index 979a56a81..133101eb7 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -95,7 +95,7 @@ class GroupblockAction extends Action
             $this->clientError(_('User is already blocked from group.'));
             return false;
         }
-        // XXX: could have proactive blocks, but we don't have UI for it.
+        // XXX: could have proactive blocks, but we do not have UI for it.
         if (!$this->profile->isMember($this->group)) {
             $this->clientError(_('User is not a member of group.'));
             return false;
diff --git a/actions/login.php b/actions/login.php
index ad57dd667..679817520 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -159,7 +159,7 @@ class LoginAction extends Action
         $url = common_get_returnto();
 
         if ($url) {
-            // We don't have to return to it again
+            // We do not have to return to it again
             common_set_returnto(null);
         } else {
             $url = common_local_url('all',
diff --git a/actions/logout.php b/actions/logout.php
index 1e0adae57..7e768fca6 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -81,7 +81,7 @@ class LogoutAction extends Action
     {
         common_set_user(null);
         common_real_login(false); // not logged in
-        common_forgetme(); // don't log back in!
+        common_forgetme(); // do not log back in!
     }
 
 }
diff --git a/actions/microsummary.php b/actions/microsummary.php
index 5c01a9ce0..5c761e8bb 100644
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -59,7 +59,7 @@ class MicrosummaryAction extends Action
         $user     = User::staticGet('nickname', $nickname);
 
         if (!$user) {
-            $this->clientError(_('No such user'), 404);
+            $this->clientError(_('No such user.'), 404);
             return;
         }
         
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 095a7d1d3..73307fdfc 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -61,7 +61,7 @@ class NewmessageAction extends Action
     /**
      * Title of the page
      *
-     * Note that this usually doesn't get called unless something went wrong
+     * Note that this usually does not get called unless something went wrong
      *
      * @return string page title
      */
@@ -113,7 +113,7 @@ class NewmessageAction extends Action
             $this->other = User::staticGet('id', $this->to);
 
             if (!$this->other) {
-                $this->clientError(_('No such user'), 404);
+                $this->clientError(_('No such user.'), 404);
                 return false;
             }
 
diff --git a/actions/newnotice.php b/actions/newnotice.php
index fbd7ab6bc..fc06e5c98 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -59,7 +59,7 @@ class NewnoticeAction extends Action
     /**
      * Title of the page
      *
-     * Note that this usually doesn't get called unless something went wrong
+     * Note that this usually does not get called unless something went wrong
      *
      * @return string page title
      */
diff --git a/actions/opensearch.php b/actions/opensearch.php
index d5e6698f3..b205d2fe2 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -52,7 +52,7 @@ class OpensearchAction extends Action
      *
      * @param array $args query arguments
      * 
-     * @return boolean false if user doesn't exist
+     * @return boolean false if user does not exist
      */
     function handle($args)
     {
@@ -75,7 +75,7 @@ class OpensearchAction extends Action
         $this->element('Url', array('type' => 'text/html', 'method' => 'get',
                        'template' => str_replace('---', '{searchTerms}', common_local_url($type, array('q' => '---')))));
         $this->element('Image', array('height' => 16, 'width' => 16, 'type' => 'image/vnd.microsoft.icon'), common_path('favicon.ico'));
-        $this->element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), theme_path('logo.png'));
+        $this->element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), Theme::path('logo.png'));
         $this->element('AdultContent', null, 'false');
         $this->element('Language', null, common_language());
         $this->element('OutputEncoding', null, 'UTF-8');
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 87eb45a7d..6658d279f 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -97,7 +97,7 @@ class PasswordsettingsAction extends AccountSettingsAction
 
 
         $this->elementStart('ul', 'form_data');
-        // Users who logged in with OpenID won't have a pwd
+        // Users who logged in with OpenID will not have a pwd
         if ($user->password) {
             $this->elementStart('li');
             $this->password('oldpassword', _('Old password'));
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 9776c1fb4..dcff35f6e 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -149,13 +149,13 @@ class RecoverpasswordAction extends Action
             $this->elementStart('div', 'instructions');
             if ($this->mode == 'recover') {
                 $this->element('p', null,
-                               _('If you\'ve forgotten or lost your' .
+                               _('If you have forgotten or lost your' .
                                  ' password, you can get a new one sent to' .
                                  ' the email address you have stored' .
                                  ' in your account.'));
             } else if ($this->mode == 'reset') {
                 $this->element('p', null,
-                               _('You\'ve been identified. Enter a' .
+                               _('You have been identified. Enter a' .
                                  ' new password below. '));
             }
             $this->elementEnd('div');
@@ -185,10 +185,10 @@ class RecoverpasswordAction extends Action
                                            'class' => 'form_settings',
                                            'action' => common_local_url('recoverpassword')));
         $this->elementStart('fieldset');
-        $this->element('legend', null, _('Password recover'));
+        $this->element('legend', null, _('Password recovery'));
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
-        $this->input('nicknameoremail', _('Nickname or email'),
+        $this->input('nicknameoremail', _('Nickname or email address'),
                      $this->trimmed('nicknameoremail'),
                      _('Your nickname on this server, ' .
                         'or your registered email address.'));
diff --git a/actions/register.php b/actions/register.php
index 57f8e7bdf..c4f6760aa 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -174,7 +174,7 @@ class RegisterAction extends Action
             $bio      = $this->trimmed('bio');
             $location = $this->trimmed('location');
 
-            // We don't trim these... whitespace is OK in a password!
+            // We do not trim these... whitespace is OK in a password!
             $password = $this->arg('password');
             $confirm  = $this->arg('confirm');
 
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index aee2a5d8e..74025cf80 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -151,7 +151,7 @@ class RemotesubscribeAction extends Action
         $this->profile_url = $this->trimmed('profile_url');
 
         if (!$this->profile_url) {
-            $this->showForm(_('No such user'));
+            $this->showForm(_('No such user.'));
             return;
         }
 
diff --git a/actions/showgroup.php b/actions/showgroup.php
index a4af29391..ae956befa 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -418,7 +418,7 @@ class ShowgroupAction extends GroupDesignAction
         // XXX: WORM cache this
         $members = $this->group->getMembers();
         $members_count = 0;
-        /** $member->count() doesn't work. */
+        /** $member->count() does not work. */
         while ($members->fetch()) {
             $members_count++;
         }
diff --git a/actions/showmessage.php b/actions/showmessage.php
index db757948b..cf3a819c1 100644
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -137,7 +137,7 @@ class ShowmessageAction extends MailboxAction
     }
     
     /**
-     * Don't show local navigation
+     * Do not show local navigation
      *
      * @return void
      */
@@ -147,7 +147,7 @@ class ShowmessageAction extends MailboxAction
     }
     
     /**
-     * Don't show page notice
+     * Do not show page notice
      *
      * @return void
      */
@@ -157,7 +157,7 @@ class ShowmessageAction extends MailboxAction
     }
 
     /**
-     * Don't show aside
+     * Do not show aside
      *
      * @return void
      */
@@ -167,7 +167,7 @@ class ShowmessageAction extends MailboxAction
     }
  
     /**
-     * Don't show any instructions
+     * Do not show any instructions
      *
      * @return string
      */
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 5d16fdad9..688089f02 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -208,7 +208,7 @@ class ShownoticeAction extends OwnerDesignAction
     }
 
     /**
-     * Don't show local navigation
+     * Do not show local navigation
      *
      * @return void
      */
@@ -234,7 +234,7 @@ class ShownoticeAction extends OwnerDesignAction
     }
 
     /**
-     * Don't show page notice
+     * Do not show page notice
      *
      * @return void
      */
@@ -244,7 +244,7 @@ class ShownoticeAction extends OwnerDesignAction
     }
 
     /**
-     * Don't show aside
+     * Do not show aside
      *
      * @return void
      */
diff --git a/actions/showstream.php b/actions/showstream.php
index 663638c18..4952ebdb7 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -253,7 +253,7 @@ class ShowstreamAction extends ProfileAction
     }
 }
 
-// We don't show the author for a profile, since we already know who it is!
+// We do not show the author for a profile, since we already know who it is!
 
 class ProfileNoticeList extends NoticeList
 {
diff --git a/actions/sup.php b/actions/sup.php
index 5daf0a1c1..a199f247e 100644
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -61,7 +61,7 @@ class SupAction extends Action
         $notice = new Notice();
 
         # XXX: cache this. Depends on how big this protocol becomes;
-        # Re-doing this query every 15 seconds isn't the end of the world.
+        # Re-doing this query every 15 seconds is not the end of the world.
 
         $divider = common_sql_date(time() - $seconds);
 
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 7d618c471..511d7cdc6 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -250,7 +250,7 @@ class TwitapisearchatomAction extends ApiAction
         }
 
         // FIXME: this alternate link is not quite right because our
-        // web-based notice search doesn't support a rpp (responses per
+        // web-based notice search does not support a rpp (responses per
         // page) param yet
 
         $this->element('link', array('type' => 'text/html',
diff --git a/actions/twitapitrends.php b/actions/twitapitrends.php
index 779405e6d..2d17e77cc 100644
--- a/actions/twitapitrends.php
+++ b/actions/twitapitrends.php
@@ -55,7 +55,7 @@ class TwitapitrendsAction extends ApiAction
      *
      * @param array $args Web and URL arguments
      *
-     * @return boolean false if user doesn't exist
+     * @return boolean false if user does not exist
      */
     function prepare($args)
     {