diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-08 21:23:09 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-08 21:23:09 -0500 |
| commit | 76b0e6e6f4151235d5032d1aa90f0937b415bd87 (patch) | |
| tree | 47ef20a3cd3d6ef9ace200be56af16d9b3e02965 /actions/replies.php | |
| parent | 7ee9737ef67fded89fb51602b06c8f77fba97bb1 (diff) | |
| parent | f086dddf43a8e1593a615e77c2fdd605623acf49 (diff) | |
Merge branch '0.9.x' into adminpanel
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); } |