diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-08 17:06:41 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-08 17:06:41 -0500 |
| commit | 111f6a775daf9334adb05c9f8e539d682238f4dd (patch) | |
| tree | ce98d1968560538272e53a79ef4551b194eb1ab8 /actions/replies.php | |
| parent | b7e2e3fd2b7e36f75c810a599334c2ca8abcca55 (diff) | |
| parent | da444f8a15043f326aa9a629ba5f0b25bc35b1e5 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/replies.php')
| -rw-r--r-- | actions/replies.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/replies.php b/actions/replies.php index a13b5a227..2829a7335 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -195,12 +195,12 @@ class RepliesAction extends OwnerDesignAction function showEmptyListMessage() { - $message = sprintf(_('This is the timeline showing replies to %s but %s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' '; + $message = sprintf(_('This is the timeline showing replies to %s but %s has not received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' '; if (common_logged_in()) { $current_user = common_current_user(); if ($this->user->id === $current_user->id) { - $message .= _('You can engage other users in a conversation, subscribe to more people or [join groups](%%action.groups%%).'); + $message .= _('You can engage other users in a conversation, subscribe to more users or [join groups](%%action.groups%%).'); } else { $message .= sprintf(_('You can try to [nudge %s](../%s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname); } |