Merge branch '1.0.x' into testing

[quix0rs-gnu-social.git] / plugins / OpenID / finishopenidlogin.php

diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php
index bc93bc21a62f219734cf0d4ed82437946f0f0564..0d3f0fcb765ab2efc5581bc9690a7d1ced6b2a45 100644 (file)
--- a/plugins/OpenID/finishopenidlogin.php
+++ b/plugins/OpenID/finishopenidlogin.php
@@ -45,7 +45,7 @@ class FinishopenidloginAction extends Action
             if ($this->arg('create')) {
                 if (!$this->boolean('license')) {
                     // TRANS: Message given if user does not agree with the site's license.
-                    $this->showForm(_m('You can\'t register if you don\'t agree to the license.'),
+                    $this->showForm(_m('You cannot register if you do not agree to the license.'),
                                     $this->trimmed('newname'));
                     return;
                 }
@@ -70,14 +70,14 @@ class FinishopenidloginAction extends Action
             $this->element('div', 'instructions',
                            // TRANS: Instructions given after a first successful logon using OpenID.
                            // TRANS: %s is the site name.
-                           sprintf(_m('This is the first time you\'ve logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name')));
+                           sprintf(_m('This is the first time you have logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name')));
         }
     }
 
     function title()
     {
         // TRANS: Title
-        return _m('OpenID Account Setup');
+        return _m('TITLE','OpenID Account Setup');
     }
 
     function showForm($error=null, $username=null)
@@ -114,8 +114,10 @@ class FinishopenidloginAction extends Action
         $this->hidden('token', common_session_token());
         $this->elementStart('fieldset', array('id' => 'form_openid_createaccount'));
         $this->element('legend', null,
+                       // TRANS: Fieldset legend.
                        _m('Create new account'));
         $this->element('p', null,
+                       // TRANS: Form guide.
                        _m('Create a new user with this nickname.'));
         $this->elementStart('ul', 'form_data');
 
@@ -123,12 +125,16 @@ class FinishopenidloginAction extends Action
         Event::handle('StartRegistrationFormData', array($this));
 
         $this->elementStart('li');
+        // TRANS: Field label.
         $this->input('newname', _m('New nickname'),
                      ($this->username) ? $this->username : '',
+                     // TRANS: Field title.
                      _m('1-64 lowercase letters or numbers, no punctuation or spaces.'));
         $this->elementEnd('li');
         $this->elementStart('li');
+        // TRANS: Field label.
         $this->input('email', _m('Email'), $this->getEmail(),
+                     // TRANS: Field title.
                      _m('Used only for updates, announcements, '.
                        'and password recovery.'));
         $this->elementEnd('li');
@@ -145,7 +151,7 @@ class FinishopenidloginAction extends Action
         $this->elementStart('label', array('for' => 'license',
                                           'class' => 'checkbox'));
         // TRANS: OpenID plugin link text.
-        // TRANS: %s is a link to a licese with the license name as link text.
+        // TRANS: %s is a link to a license with the license name as link text.
         $message = _m('My text and files are available under %s ' .
                      'except this private data: password, ' .
                      'email address, IM address, and phone number.');
@@ -187,7 +193,7 @@ class FinishopenidloginAction extends Action
         $this->password('password', _m('Password'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
-        // TRANS: Button label in form in which to connect an OpenID to an existing user on the site.
+        // TRANS: Button text in form in which to connect an OpenID to an existing user on the site.
         $this->submit('connect', _m('BUTTON', 'Connect'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
@@ -238,7 +244,7 @@ class FinishopenidloginAction extends Action
             return;
         } else if ($response->status == Auth_OpenID_FAILURE) {
             // TRANS: OpenID authentication failed; display the error message. %s is the error message.
-            $this->message(sprintf(_m('OpenID authentication failed: %s'), $response->message));
+            $this->message(sprintf(_m('OpenID authentication failed: %s.'), $response->message));
         } else if ($response->status == Auth_OpenID_SUCCESS) {
             // This means the authentication succeeded; extract the
             // identity URL and Simple Registration data (if it was
@@ -258,7 +264,8 @@ class FinishopenidloginAction extends Action
 
             // Launchpad teams extension
             if (!oid_check_teams($response)) {
-                $this->message(_m('OpenID authentication aborted: you are not allowed to login to this site.'));
+                // TRANS: Message displayed when OpenID authentication is aborted.
+                $this->message(_m('OpenID authentication aborted: You are not allowed to login to this site.'));
                 return;
             }
 
@@ -490,7 +497,6 @@ class FinishopenidloginAction extends Action
 
     function bestNewNickname($display, $sreg)
     {
-
         // Try the passed-in nickname
 
         if (!empty($sreg['nickname'])) {
@@ -549,7 +555,6 @@ class FinishopenidloginAction extends Action
     // 1. Plain hostname, like http://evanp.myopenid.com/
     // 2. One element in path, like http://profile.typekey.com/EvanProdromou/
     //    or http://getopenid.com/evanprodromou
-
     function urlToNickname($openid)
     {
         return common_url_to_nickname($openid);
@@ -579,7 +584,6 @@ class FinishopenidloginAction extends Action
     }
 
     // Given a string, try to make it work as a nickname
-
     function nicknamize($str)
     {
         return common_nicknamize($str);