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

1 files changed, 5 insertions, 5 deletions

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index cc7b38ee4..4f65e9bf1 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -62,12 +62,12 @@ class SubscriptionsAction extends GalleryAction
         $user =& common_current_user();
         if ($user && ($user->id == $this->profile->id)) {
             $this->element('p', null,
-                           _('These are the people whose notices '.
-                             'you listen to.'));
+                           _('These are the users whose notices '.
+                             'you have subscribed to.'));
         } else {
             $this->element('p', null,
-                           sprintf(_('These are the people whose '.
-                                     'notices %s listens to.'),
+                           sprintf(_('These are the users whose '.
+                                     'notices %s has subscribed to.'),
                                    $this->profile->nickname));
         }
     }
@@ -118,7 +118,7 @@ class SubscriptionsAction extends GalleryAction
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->user->id === $current_user->id) {
-                $message = _('You\'re not listening to anyone\'s notices right now, try subscribing to people you know. Try [people search](%%action.peoplesearch%%), look for members in groups you\'re interested in and in our [featured users](%%action.featured%%). If you\'re a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to people you already follow there.');
+                $message = _('You have not subscribed to anyone\'s notices right now. Try subscribing to users you know. Try [user search](%%action.peoplesearch%%), look for members in groups you\'re interested in and in our [featured users](%%action.featured%%). If you are a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to users you already follow there.');
             } else {
                 $message = sprintf(_('%s is not listening to anyone.'), $this->user->nickname);
             }