summaryrefslogtreecommitdiff
path: root/actions/smssettings.php
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-08 23:33:58 +0100
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2009-11-08 23:33:58 +0100
commitb10f362ede8c39746c168363bf4fa6481995592b (patch)
treec7a6d4d2ca280ba50d1dbac1113507432e3fe12e /actions/smssettings.php
parent5ab709b73977131813884558bf56d97172a7aa26 (diff)
parentfc5002015b2a9e16a3c6b9992d55b45c73a8d2fb (diff)
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/smssettings.php')
-rw-r--r--actions/smssettings.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 4debe1967..9fa7f62fb 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -525,7 +525,7 @@ class SmssettingsAction extends ConnectSettingsAction
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);