summaryrefslogtreecommitdiff
path: root/actions/subscriptions.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-08 17:06:41 -0500
committerEvan Prodromou <evan@status.net>2009-11-08 17:06:41 -0500
commit111f6a775daf9334adb05c9f8e539d682238f4dd (patch)
treece98d1968560538272e53a79ef4551b194eb1ab8 /actions/subscriptions.php
parentb7e2e3fd2b7e36f75c810a599334c2ca8abcca55 (diff)
parentda444f8a15043f326aa9a629ba5f0b25bc35b1e5 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/subscriptions.php')
-rw-r--r--actions/subscriptions.php10
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);
}