Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

1 files changed, 3 insertions, 1 deletions

diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index cc8351d8d..8bf8c8c4d 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -87,10 +87,12 @@ class ConfirmaddressAction extends Action
         }
         $type = $confirm->address_type;
         if (!in_array($type, array('email', 'jabber', 'sms'))) {
-            $this->serverError(sprintf(_('Unrecognized address type %s'), $type));
+            // TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
+            $this->serverError(sprintf(_('Unrecognized address type %s.'), $type));
             return;
         }
         if ($cur->$type == $confirm->address) {
+            // TRANS: Client error for an already confirmed email/jabbel/sms address.
             $this->clientError(_('That address has already been confirmed.'));
             return;
         }