summaryrefslogtreecommitdiff
path: root/actions/emailsettings.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-11-08 23:27:24 +0100
committerBrion Vibber <brion@pobox.com>2009-11-08 23:27:24 +0100
commitec6a38a62786c85e8ee30c5726ea81f82465b39d (patch)
tree31bb66f24f8fb4de55d9f6a21728278fcac804a1 /actions/emailsettings.php
parentc7961fe6dc033d1d40ab7d7f9bb994492ae4ea7b (diff)
parent104a47e4a2903f1c7ea73363a73cee12f0cf14ac (diff)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/emailsettings.php')
-rw-r--r--actions/emailsettings.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 67b991cdc..715457eab 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(_("Couldn't update user record."));
+ $this->serverError(_("Could not 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(_("Couldn't update user record."));
+ $this->serverError(_("Could not update user record."));
}
$this->showForm(_('New incoming email address added.'), true);