diff options
| author | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2009-11-08 23:33:58 +0100 |
|---|---|---|
| committer | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2009-11-08 23:33:58 +0100 |
| commit | b10f362ede8c39746c168363bf4fa6481995592b (patch) | |
| tree | c7a6d4d2ca280ba50d1dbac1113507432e3fe12e /actions/emailsettings.php | |
| parent | 5ab709b73977131813884558bf56d97172a7aa26 (diff) | |
| parent | fc5002015b2a9e16a3c6b9992d55b45c73a8d2fb (diff) | |
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/emailsettings.php')
| -rw-r--r-- | actions/emailsettings.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 715457eab..67b991cdc 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -452,7 +452,7 @@ class EmailsettingsAction extends AccountSettingsAction if (!$user->updateKeys($orig)) { common_log_db_error($user, 'UPDATE', __FILE__); - $this->serverError(_("Could not update user record.")); + $this->serverError(_("Couldn't update user record.")); } $this->showForm(_('Incoming email address removed.'), true); @@ -474,7 +474,7 @@ class EmailsettingsAction extends AccountSettingsAction if (!$user->updateKeys($orig)) { common_log_db_error($user, 'UPDATE', __FILE__); - $this->serverError(_("Could not update user record.")); + $this->serverError(_("Couldn't update user record.")); } $this->showForm(_('New incoming email address added.'), true); |