diff options
author | Sarven Capadisli <csarven@status.net> | 2009-11-08 23:10:34 +0000 |
---|---|---|
committer | Sarven Capadisli <csarven@status.net> | 2009-11-08 23:10:34 +0000 |
commit | 8e58f241739b97bd53f78035781f16e2067a31d9 (patch) | |
tree | 8ad366f5f408d1181b1816f607a120fe0c91c502 /actions/recoverpassword.php | |
parent | 2a0a363e1d846334bc37d46b5f6f42e64a5a96eb (diff) | |
parent | b78a35ec73980d8dfa2fcb68ef81936f4b3c110b (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/recoverpassword.php')
-rw-r--r-- | actions/recoverpassword.php | 8 |
1 files changed, 4 insertions, 4 deletions
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.')); |