Merge branch 'testing' into 0.9.x

[quix0rs-gnu-social.git] / actions / confirmaddress.php

diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 6fd74f3ff7889bf40e55d9df9343edecb0d10e6c..8bf8c8c4d4d7a75de8c27ba5029421d88b3c0aac 100644 (file)
--- 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;
         }
@@ -141,7 +143,7 @@ class ConfirmaddressAction extends Action
 
     function title()
     {
-        return _('Confirm Address');
+        return _('Confirm address');
     }
 
     /**