[OpenID] Added synchronization button and corresponding action

UI:
- "Delete" area is now "Actions" area
- Updated themes to better reflect the changes

Routes:
- index.php?action=finishsyncopenid => finishsyncopenid

Translations:
- Updated OpenID translation files
- Updated OpenID POT file

Versioning:
- Bump OpenID minor version
- Bump GS patch version

Why would have labeling the Synchronize button of Sync been of bad taste? - answered by XRevan86:

In "synchronise" "ch" is a digraph meaning /k/ (actually /x/ turned into /k/ in English but whatever).
So… not separate letters.
It's like "ph" in "alphabet", or "sh" in "sheep", or "ch" in "chop" -- "ch" can mean a whole variety of sounds.

diff --git a/lib/framework.php b/lib/framework.php
index a9a003270bddfcef705b899292644f78f41a6f2a..4824c5d5d411f0ef3b13591abb7be67616190d12 100644 (file)
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -22,7 +22,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 define('GNUSOCIAL_ENGINE', 'GNU social');
 define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/');
 
-define('GNUSOCIAL_BASE_VERSION', '1.19.2');
+define('GNUSOCIAL_BASE_VERSION', '1.19.3');
 define('GNUSOCIAL_LIFECYCLE', 'rc0'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 
 define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);

diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index b8211166e701e96d036abe8c39098bb10081df20..34ee1ecccb93f3d3fcd14afeeb032a2b4fb0b9aa 100644 (file)
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -50,7 +50,7 @@ if (!defined('STATUSNET')) {
  */
 class OpenIDPlugin extends Plugin
 {
-    const PLUGIN_VERSION = '2.0.0';
+    const PLUGIN_VERSION = '2.1.0';
 
     // Plugin parameter: set true to disallow non-OpenID logins
     // If set, overrides the setting in database or $config['site']['openidonly']
@@ -83,6 +83,8 @@ class OpenIDPlugin extends Plugin
                     array('action' => 'finishopenidlogin'));
         $m->connect('index.php?action=finishaddopenid',
                     array('action' => 'finishaddopenid'));
+        $m->connect('index.php?action=finishsyncopenid',
+                    array('action' => 'finishsyncopenid'));
         $m->connect('main/openidserver', array('action' => 'openidserver'));
         $m->connect('panel/openid', array('action' => 'openidadminpanel'));
 

diff --git a/plugins/OpenID/actions/finishsyncopenid.php b/plugins/OpenID/actions/finishsyncopenid.php
new file mode 100644 (file)
index 0000000..293237a
--- /dev/null
+++ b/plugins/OpenID/actions/finishsyncopenid.php
@@ -0,0 +1,166 @@
+<?php
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// GNU social is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * OpenID Sync completion
+ *
+ * @package   GNUsocial
+ * @author    Bruno Casteleiro <brunoccast@fc.up.pt>
+ * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
+ * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ */
+
+defined('GNUSOCIAL') || die();
+
+require_once(INSTALLDIR . '/plugins/OpenID/openid.php');
+
+/**
+ * Action that handles OpenID Sync completion.
+ *
+ * @copyright 2019 Free Software Foundation, Inc http://www.fsf.org
+ * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ */
+class FinishsyncopenidAction extends Action
+{
+    public $msg = null;
+
+    /**
+     * Handle the redirect back from OpenID confirmation
+     *
+     * Check to see if the user's logged in, and then try
+     * to use the OpenID login system.
+     *
+     * @param array $args $_REQUEST arguments
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        parent::handle();
+        if (!common_logged_in()) {
+            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+            $this->clientError(_m('Not logged in.'));
+        } else {
+            $this->tryLogin();
+        }
+    }
+
+    /**
+     * Try to log in using OpenID
+     *
+     * Check the OpenID for validity; potentially store it.
+     *
+     * @return void
+     */
+    public function tryLogin()
+    {
+        $consumer = oid_consumer();
+
+        $response = $consumer->complete(common_local_url('finishsyncopenid'));
+
+        if ($response->status == Auth_OpenID_CANCEL) {
+            // TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
+            $this->message(_m('OpenID authentication cancelled.'));
+            return;
+        } elseif ($response->status == Auth_OpenID_FAILURE) {
+            // TRANS: OpenID authentication failed; display the error message.
+            // TRANS: %s is the error message.
+            $this->message(sprintf(
+                _m('OpenID authentication failed: %s.'),
+                $response->message
+            ));
+        } elseif ($response->status == Auth_OpenID_SUCCESS) {
+            $display   = $response->getDisplayIdentifier();
+            $canonical = ($response->endpoint && $response->endpoint->canonicalID) ?
+              $response->endpoint->canonicalID : $display;
+
+            $sreg_resp = Auth_OpenID_SRegResponse::fromSuccessResponse($response);
+
+            if ($sreg_resp) {
+                $sreg = $sreg_resp->contents();
+            }
+
+            // Launchpad teams extension
+            if (!oid_check_teams($response)) {
+                // TRANS: OpenID authentication error.
+                $this->message(_m('OpenID authentication aborted: You are not allowed to login to this site.'));
+                return;
+            }
+
+            $cur = common_current_user();
+
+            // start a transaction
+
+            $cur->query('BEGIN');
+
+            if (Event::handle('StartOpenIDUpdateUser', [$cur, $canonical, &$sreg])) {
+                if (!oid_update_user($cur, $sreg)) {
+                    // TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
+                    $this->message(_m('Error updating profile.'));
+                    return;
+                }
+            }
+            Event::handle('EndOpenIDUpdateUser', [$cur, $canonical, $sreg]);
+            
+            // success!
+
+            $cur->query('COMMIT');
+
+            oid_set_last($display);
+
+            common_redirect(common_local_url('openidsettings'), 303);
+        }
+    }
+
+    /**
+     * Show a failure message
+     *
+     * Something went wrong. Save the message, and show the page.
+     *
+     * @param string $msg Error message to show
+     *
+     * @return void
+     */
+    public function message($msg)
+    {
+        $this->message = $msg;
+        $this->showPage();
+    }
+
+    /**
+     * Title of the page
+     *
+     * @return string title
+     */
+    public function title()
+    {
+        // TRANS: Title after getting the status of the OpenID authorisation request.
+        // TODO update after understanding the function ^
+        return _m('OpenID Synchronization');
+    }
+
+    /**
+     * Show error message
+     *
+     * @return void
+     */
+    public function showPageNotice()
+    {
+        if ($this->message) {
+            $this->element('p', 'error', $this->message);
+        }
+    }
+}

diff --git a/plugins/OpenID/actions/openidsettings.php b/plugins/OpenID/actions/openidsettings.php
index fd35e0f96f9e00a6672fa53c6251ea488e7745bd..9349ad91d89bdaa3bca7a8b98eaa8891f887272b 100644 (file)
--- a/plugins/OpenID/actions/openidsettings.php
+++ b/plugins/OpenID/actions/openidsettings.php
@@ -108,8 +108,9 @@ class OpenidsettingsAction extends SettingsAction
             $this->elementEnd('li');
             $this->elementStart('li');
             // TRANS: Field label.
-            $this->checkbox('openid-sync', _m('Sync Account'), false,
-                _m('Syncronize GNU social profile with this OpenID identity.'));
+            $this->checkbox('openid-sync', _m('Synchronize Account'), false,
+                            // TRANS: Form guide.
+                            _m('Synchronize GNU social profile with this OpenID identity.'));
             $this->elementEnd('li');
             $this->elementEnd('ul');
             // TRANS: Button text for adding an OpenID URL.
@@ -125,40 +126,55 @@ class OpenidsettingsAction extends SettingsAction
 
         if ($cnt > 0) {
             // TRANS: Header on OpenID settings page.
-            $this->element('h2', null, _m('HEADER', 'Remove OpenID'));
-
+            $this->element('h2', null, _m('HEADER', 'OpenID Actions'));
+            
             if ($cnt == 1 && !$this->scoped->hasPassword()) {
                 $this->element('p', 'form_guide',
                                // TRANS: Form guide.
-                               _m('Removing your only OpenID '.
-                                  'would make it impossible to log in! ' .
-                                  'If you need to remove it, '.
-                                  'add another OpenID first.'));
+                               _m('You can\'t remove your main OpenID account ' .
+                                  'without either adding a password to your ' .
+                                  'GNU social account or another OpenID account. ' .
+                                  'You can synchronize your profile with your ' .
+                                  'OpenID by clicking the button labeled "Synchronize".'));
 
                 if ($oid->fetch()) {
-                    $this->elementStart('p');
+                    $this->elementStart('form', ['method' => 'POST',
+                                                 'id' => 'form_settings_openid_actions' . $idx,
+                                                 'class' => 'form_settings',
+                                                 'action' => common_local_url('openidsettings')]);
+                    $this->elementStart('fieldset');
+                    $this->hidden('token', common_session_token());
                     $this->element('a', ['href' => $oid->canonical], $oid->display);
-                    $this->elementEnd('p');
+                    $this->hidden("openid_url", $oid->canonical);
+                    // TRANS: Button text to sync OpenID with the GS profile.
+                    $this->submit("sync", _m('BUTTON', 'Synchronize'), 'submit sync');
+                    $this->elementEnd('fieldset');
+                    $this->elementEnd('form');
                 }
             } else {
                 $this->element('p', 'form_guide',
                                // TRANS: Form guide.
-                               _m('You can remove an OpenID from your account '.
-                                  'by clicking the button marked "Remove".'));
+                               _m('You can remove an OpenID from your account ' .
+                                  'by clicking the button labeled "Remove". ' .
+                                  'You can synchronize your profile with an OpenID ' .
+                                  'by clicking the button labeled "Synchronize".'));
                 $idx = 0;
 
                 while ($oid->fetch()) {
                     $this->elementStart('form', ['method' => 'POST',
-                                                 'id' => 'form_settings_openid_delete' . $idx,
+                                                 'id' => 'form_settings_openid_actions' . $idx,
                                                  'class' => 'form_settings',
-                                                 'action' =>
-                                                 common_local_url('openidsettings')]);
+                                                 'action' => common_local_url('openidsettings')]);
                     $this->elementStart('fieldset');
                     $this->hidden('token', common_session_token());
                     $this->element('a', ['href' => $oid->canonical], $oid->display);
                     $this->hidden("openid_url{$idx}", $oid->canonical, 'openid_url');
+                    $this->elementStart('span', ['class' => 'element_actions']);
+                    // TRANS: Button text to sync an OpenID with the GS profile.
+                    $this->submit("sync{$idx}", _m('BUTTON', 'Synchronize'), 'submit', 'sync');
                     // TRANS: Button text to remove an OpenID.
-                    $this->submit("remove{$idx}", _m('BUTTON', 'Remove'), 'submit remove', 'remove');
+                    $this->submit("remove{$idx}", _m('BUTTON', 'Remove'), 'submit', 'remove');
+                    $this->elementEnd('span');
                     $this->elementEnd('fieldset');
                     $this->elementEnd('form');
                     $idx++;
@@ -243,6 +259,8 @@ class OpenidsettingsAction extends SettingsAction
             }
         } elseif ($this->arg('remove')) {
             return $this->removeOpenid();
+        } elseif ($this->arg('sync')) {
+            return $this->syncOpenid();
         } elseif ($this->arg('remove_trustroots')) {
             return $this->removeTrustroots();
         } elseif ($this->arg('save_prefs')) {
@@ -305,6 +323,26 @@ class OpenidsettingsAction extends SettingsAction
         return _m('OpenID removed.');
     }
 
+    /**
+     * Handles a request to sync an OpenID to the user's profile
+     *
+     * @return void
+     */
+    public function syncOpenid()
+    {
+        $oid = User_openid::getKV('canonical', $this->trimmed('openid_url'));
+
+        if (!$oid instanceof User_openid) {
+            throw new ClientException(_m('No such OpenID.'));
+        }
+        
+        $result = oid_authenticate($this->trimmed('openid_url'), 'finishsyncopenid');
+        if (is_string($result)) { // error message
+            throw new ServerException($result);
+        }
+        return _m('Synchronized OpenID.');
+    }
+
     /**
      * Handles a request to save preferences
      *

diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot
index 72a225b58879db720056f05a971f85c53736ffbe..3a407a3bb5289cc33ba7525d0af433677c7c58cf 100644 (file)
--- a/plugins/OpenID/locale/OpenID.pot
+++ b/plugins/OpenID/locale/OpenID.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-06-08 18:20+0100\n"
+"POT-Creation-Date: 2019-06-09 16:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,299 +17,233 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. TRANS: Client error message trying to log on with OpenID while already logged on.
-#: actions/openidlogin.php:33 actions/finishopenidlogin.php:37
-msgid "Already logged in."
+#. TRANS: Title for identity verification page.
+#: actions/openidtrust.php:51
+msgid "OpenID Identity Verification"
 msgstr ""
 
-#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
-#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: actions/openidlogin.php:74
-#, php-format
+#. TRANS: Client error when visiting page directly.
+#: actions/openidtrust.php:69
 msgid ""
-"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
-"before changing your settings."
+"This page should only be reached during OpenID processing, not directly."
 msgstr ""
 
-#. TRANS: OpenID plugin message.
-#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
-#: actions/openidlogin.php:80
+#. TRANS: Page notice. %s is a trustroot name.
+#: actions/openidtrust.php:118
 #, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr ""
-
-#. TRANS: OpenID plugin message. Title.
-#: actions/openidlogin.php:114
-msgctxt "TITLE"
-msgid "OpenID Login"
-msgstr ""
-
-#. TRANS: OpenID plugin logon form legend.
-#: actions/openidlogin.php:132 OpenIDPlugin.php:632
-msgctxt "LEGEND"
-msgid "OpenID login"
-msgstr ""
-
-#. TRANS: Field label.
-#: actions/openidlogin.php:140
-msgctxt "LABEL"
-msgid "OpenID provider"
+msgid ""
+"%s has asked to verify your identity. Click Continue to verify your identity "
+"and login without creating a new password."
 msgstr ""
 
-#. TRANS: Form guide.
-#: actions/openidlogin.php:149 OpenIDPlugin.php:649
-msgid "Enter your username."
+#. TRANS: Button text to continue OpenID identity verification.
+#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
+#: actions/openidtrust.php:136 OpenIDPlugin.php:617
+msgctxt "BUTTON"
+msgid "Continue"
 msgstr ""
 
-#. TRANS: Form guide.
-#: actions/openidlogin.php:151 OpenIDPlugin.php:651
-msgid "You will be sent to the provider's site for authentication."
+#. TRANS: Button text to cancel OpenID identity verification.
+#: actions/openidtrust.php:138
+msgctxt "BUTTON"
+msgid "Cancel"
 msgstr ""
 
-#. TRANS: OpenID plugin logon form field label.
-#. TRANS: Field label.
-#. TRANS: OpenID plugin logon form field label.
-#: actions/openidlogin.php:155 actions/openidsettings.php:101
-#: OpenIDPlugin.php:655
-msgid "OpenID URL"
+#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+#: actions/finishsyncopenid.php:55 actions/finishaddopenid.php:66
+msgid "Not logged in."
 msgstr ""
 
-#. TRANS: OpenID plugin logon form field title.
-#. TRANS: OpenID plugin logon form field instructions.
-#: actions/openidlogin.php:158 OpenIDPlugin.php:658
-msgid "Your OpenID URL."
+#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
+#: actions/finishsyncopenid.php:76 actions/finishopenidlogin.php:254
+#: actions/finishaddopenid.php:87
+msgid "OpenID authentication cancelled."
 msgstr ""
 
-#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
-#: actions/openidlogin.php:163
-msgid "Remember me"
+#. TRANS: OpenID authentication failed; display the error message. %s is the error message.
+#: actions/finishsyncopenid.php:82 actions/finishopenidlogin.php:258
+#: actions/finishaddopenid.php:93
+#, php-format
+msgid "OpenID authentication failed: %s."
 msgstr ""
 
-#. TRANS: OpenID plugin logon form field title.
-#: actions/openidlogin.php:165
-msgid "Automatically login in the future; not for shared computers!"
+#. TRANS: OpenID authentication error.
+#. TRANS: Message displayed when OpenID authentication is aborted.
+#. TRANS: OpenID authentication error.
+#: actions/finishsyncopenid.php:99 actions/finishopenidlogin.php:279
+#: actions/finishaddopenid.php:110
+msgid ""
+"OpenID authentication aborted: You are not allowed to login to this site."
 msgstr ""
 
-#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
-#: actions/openidlogin.php:170
-msgctxt "BUTTON"
-msgid "Login"
+#. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
+#: actions/finishsyncopenid.php:112 actions/finishaddopenid.php:145
+msgid "Error updating profile."
 msgstr ""
 
-#. TRANS: Title of OpenID settings page for a user.
-#: actions/openidsettings.php:55
-msgctxt "TITLE"
-msgid "OpenID settings"
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#. TODO update after understanding the function ^
+#: actions/finishsyncopenid.php:152
+msgid "OpenID Synchronization"
 msgstr ""
 
-#. TRANS: Form instructions for OpenID settings.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#: actions/openidsettings.php:67
+#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
+#. TRANS: %s is a request identity.
+#: actions/openidserver.php:113
 #, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
-"account. Manage your associated OpenIDs from here."
+msgid "You are not authorized to use the identity %s."
 msgstr ""
 
-#. TRANS: Fieldset legend.
-#: actions/openidsettings.php:96
-msgctxt "LEGEND"
-msgid "Add OpenID"
+#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
+#: actions/openidserver.php:134
+msgid "Just an OpenID provider. Nothing to see here, move along..."
 msgstr ""
 
-#. TRANS: Form guide.
-#: actions/openidsettings.php:103
-msgid "An OpenID URL which identifies you."
+#. TRANS: Client error message trying to log on with OpenID while already logged on.
+#: actions/finishopenidlogin.php:37 actions/openidlogin.php:33
+msgid "Already logged in."
 msgstr ""
 
-#. TRANS: Button text for adding an OpenID URL.
-#: actions/openidsettings.php:108
-msgctxt "BUTTON"
-msgid "Add"
+#. TRANS: Message given when there is a problem with the user's session token.
+#: actions/finishopenidlogin.php:42
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#. TRANS: Header on OpenID settings page.
-#: actions/openidsettings.php:120
-msgctxt "HEADER"
-msgid "Remove OpenID"
+#: actions/finishopenidlogin.php:49
+msgid "You cannot register if you do not agree to the license."
 msgstr ""
 
-#. TRANS: Form guide.
-#: actions/openidsettings.php:126
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
+#: actions/finishopenidlogin.php:60
+msgid "An unknown error has occured."
 msgstr ""
 
-#. TRANS: Form guide.
-#: actions/openidsettings.php:142
+#. TRANS: Instructions given after a first successful logon using OpenID.
+#. TRANS: %s is the site name.
+#: actions/finishopenidlogin.php:77
+#, php-format
 msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
+"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."
 msgstr ""
 
-#. TRANS: Button text to remove an OpenID.
-#. TRANS: Button text to remove an OpenID trustroot.
-#: actions/openidsettings.php:159 actions/openidsettings.php:199
-msgctxt "BUTTON"
-msgid "Remove"
+#. TRANS: Title
+#: actions/finishopenidlogin.php:84
+msgctxt "TITLE"
+msgid "OpenID Account Setup"
 msgstr ""
 
 #. TRANS: Fieldset legend.
-#: actions/openidsettings.php:174
-msgid "OpenID Trusted Sites"
+#: actions/finishopenidlogin.php:122
+msgid "Create new account"
 msgstr ""
 
 #. TRANS: Form guide.
-#: actions/openidsettings.php:178
-msgid ""
-"The following sites are allowed to access your identity and log you in. You "
-"can remove a site from this list to deny it access to your OpenID."
-msgstr ""
-
-#: actions/openidsettings.php:205
-msgctxt "LEGEND"
-msgid "Preferences"
-msgstr ""
-
-#. TRANS: Button text to save OpenID prefs
-#. TRANS: Button text to save OpenID settings.
-#: actions/openidsettings.php:209 actions/openidadminpanel.php:284
-msgctxt "BUTTON"
-msgid "Save"
-msgstr ""
-
-#. TRANS: Form validation error if no OpenID providers can be added.
-#: actions/openidsettings.php:228
-msgid "Cannot add new providers."
-msgstr ""
-
-#. TRANS: Unexpected form validation error.
-#: actions/openidsettings.php:245
-msgid "No known action for POST."
-msgstr ""
-
-#. TRANS: Form validation error when trying to remove a non-existing trustroot.
-#: actions/openidsettings.php:266
-msgid "No such OpenID trustroot."
-msgstr ""
-
-#. TRANS: Success message after removing trustroots.
-#: actions/openidsettings.php:271
-msgid "Trustroots removed."
+#: actions/finishopenidlogin.php:125
+msgid "Create a new user with this nickname."
 msgstr ""
 
-#. TRANS: Form validation error for a non-existing OpenID.
-#: actions/openidsettings.php:288
-msgid "No such OpenID."
+#: actions/finishopenidlogin.php:134
+msgid "New nickname"
 msgstr ""
 
-#. TRANS: Form validation error if OpenID is connected to another user.
-#: actions/openidsettings.php:292
-msgid "That OpenID does not belong to you."
+#. TRANS: Field title.
+#: actions/finishopenidlogin.php:137
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
-#. TRANS: Success message after removing an OpenID.
-#: actions/openidsettings.php:296
-msgid "OpenID removed."
+#. TRANS: Field label.
+#: actions/finishopenidlogin.php:141
+msgid "Email"
 msgstr ""
 
-#: actions/openidsettings.php:328
-msgid "OpenID preferences saved."
+#. TRANS: Field title.
+#: actions/finishopenidlogin.php:144
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
-#. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
-#: actions/finishaddopenid.php:66
-msgid "Not logged in."
+#. TRANS: OpenID plugin link text.
+#. TRANS: %s is a link to a license with the license name as link text.
+#: actions/finishopenidlogin.php:161
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
 msgstr ""
 
-#. TRANS: Status message in case the response from the OpenID provider is that the logon attempt was cancelled.
-#: actions/finishaddopenid.php:87 actions/finishopenidlogin.php:243
-msgid "OpenID authentication cancelled."
+#. TRANS: Button label in form in which to create a new user on the site for an OpenID.
+#: actions/finishopenidlogin.php:174
+msgctxt "BUTTON"
+msgid "Create"
 msgstr ""
 
-#. TRANS: OpenID authentication failed; display the error message.
-#. TRANS: %s is the error message.
-#. TRANS: OpenID authentication failed; display the error message. %s is the error message.
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:247
-#, php-format
-msgid "OpenID authentication failed: %s."
+#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
+#: actions/finishopenidlogin.php:188
+msgid "Connect existing account"
 msgstr ""
 
-#. TRANS: OpenID authentication error.
-#. TRANS: Message displayed when OpenID authentication is aborted.
-#: actions/finishaddopenid.php:109 actions/finishopenidlogin.php:268
+#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
+#: actions/finishopenidlogin.php:191
 msgid ""
-"OpenID authentication aborted: You are not allowed to login to this site."
-msgstr ""
-
-#. TRANS: Message in case a user tries to add an OpenID that is already connected to them.
-#: actions/finishaddopenid.php:120
-msgid "You already have this OpenID!"
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
 msgstr ""
 
-#. TRANS: Message in case a user tries to add an OpenID that is already used by another user.
-#: actions/finishaddopenid.php:123
-msgid "Someone else already has this OpenID."
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: actions/finishopenidlogin.php:195
+msgid "Existing nickname"
 msgstr ""
 
-#. TRANS: Message in case the OpenID object cannot be connected to the user.
-#: actions/finishaddopenid.php:136
-msgid "Error connecting user."
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: actions/finishopenidlogin.php:199
+msgid "Password"
 msgstr ""
 
-#. TRANS: Message in case the user or the user profile cannot be saved in StatusNet.
-#: actions/finishaddopenid.php:143
-msgid "Error updating profile."
+#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
+#: actions/finishopenidlogin.php:203
+msgid "Sync Account"
 msgstr ""
 
-#. TRANS: Title after getting the status of the OpenID authorisation request.
-#: actions/finishaddopenid.php:183
-msgid "OpenID Login"
+#: actions/finishopenidlogin.php:204
+msgid "Syncronize GNU social profile with this OpenID identity."
 msgstr ""
 
-#. TRANS: Title for identity verification page.
-#: actions/openidtrust.php:51
-msgid "OpenID Identity Verification"
+#. TRANS: Button text in form in which to connect an OpenID to an existing user on the site.
+#: actions/finishopenidlogin.php:208
+msgctxt "BUTTON"
+msgid "Connect"
 msgstr ""
 
-#. TRANS: Client error when visiting page directly.
-#: actions/openidtrust.php:69
-msgid ""
-"This page should only be reached during OpenID processing, not directly."
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
+#: actions/finishopenidlogin.php:335 actions/finishopenidlogin.php:344
+msgid "Registration not allowed."
 msgstr ""
 
-#. TRANS: Page notice. %s is a trustroot name.
-#: actions/openidtrust.php:118
-#, php-format
-msgid ""
-"%s has asked to verify your identity. Click Continue to verify your identity "
-"and login without creating a new password."
+#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
+#: actions/finishopenidlogin.php:351
+msgid "Not a valid invitation code."
 msgstr ""
 
-#. TRANS: Button text to continue OpenID identity verification.
-#. TRANS: button label for OAuth authorization page when needing OpenID authentication first.
-#: actions/openidtrust.php:136 OpenIDPlugin.php:615
-msgctxt "BUTTON"
-msgid "Continue"
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
+#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
+#: actions/finishopenidlogin.php:366 actions/finishopenidlogin.php:450
+msgid "Stored OpenID not found."
 msgstr ""
 
-#. TRANS: Button text to cancel OpenID identity verification.
-#: actions/openidtrust.php:138
-msgctxt "BUTTON"
-msgid "Cancel"
+#. TRANS: OpenID plugin server error.
+#: actions/finishopenidlogin.php:375
+msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
-#. TRANS: OpenID plugin client error given trying to add an unauthorised OpenID to a user (403).
-#. TRANS: %s is a request identity.
-#: actions/openidserver.php:113
-#, php-format
-msgid "You are not authorized to use the identity %s."
+#. TRANS: OpenID plugin message.
+#: actions/finishopenidlogin.php:438
+msgid "Invalid username or password."
 msgstr ""
 
-#. TRANS: OpenID plugin client error given when not getting a response for a given OpenID provider (500).
-#: actions/openidserver.php:134
-msgid "Just an OpenID provider. Nothing to see here, move along..."
+#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
+#: actions/finishopenidlogin.php:457
+msgid "Error connecting user to OpenID."
 msgstr ""
 
 #. TRANS: Title for OpenID bridge administration page.
@@ -399,184 +333,286 @@ msgid ""
 "authentication for all users!"
 msgstr ""
 
+#. TRANS: Button text to save OpenID settings.
+#. TRANS: Button text to save OpenID prefs
+#: actions/openidadminpanel.php:284 actions/openidsettings.php:229
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
 #. TRANS: Button title to save OpenID settings.
 #: actions/openidadminpanel.php:286
 msgid "Save OpenID settings."
 msgstr ""
 
-#. TRANS: Message given when there is a problem with the user's session token.
-#: actions/finishopenidlogin.php:42
-msgid "There was a problem with your session token. Try again, please."
+#. TRANS: Title of OpenID settings page for a user.
+#: actions/openidsettings.php:57
+msgctxt "TITLE"
+msgid "OpenID settings"
 msgstr ""
 
-#. TRANS: Message given if user does not agree with the site's license.
-#: actions/finishopenidlogin.php:48
-msgid "You cannot register if you do not agree to the license."
+#. TRANS: Form instructions for OpenID settings.
+#. TRANS: This message contains Markdown links in the form [description](link).
+#: actions/openidsettings.php:69
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
 msgstr ""
 
-#. TRANS: Messag given on an unknown error.
-#: actions/finishopenidlogin.php:57
-msgid "An unknown error has occured."
+#. TRANS: Fieldset legend.
+#: actions/openidsettings.php:98
+msgctxt "LEGEND"
+msgid "Add OpenID"
 msgstr ""
 
-#. TRANS: Instructions given after a first successful logon using OpenID.
-#. TRANS: %s is the site name.
-#: actions/finishopenidlogin.php:73
-#, php-format
-msgid ""
-"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."
+#. TRANS: Field label.
+#. TRANS: OpenID plugin logon form field label.
+#: actions/openidsettings.php:103 actions/openidlogin.php:155
+#: OpenIDPlugin.php:657
+msgid "OpenID URL"
 msgstr ""
 
-#. TRANS: Title
-#: actions/finishopenidlogin.php:80
-msgctxt "TITLE"
-msgid "OpenID Account Setup"
+#. TRANS: Form guide.
+#: actions/openidsettings.php:105
+msgid "An OpenID URL which identifies you."
 msgstr ""
 
-#. TRANS: Fieldset legend.
-#: actions/finishopenidlogin.php:118
-msgid "Create new account"
+#. TRANS: Field label.
+#: actions/openidsettings.php:111
+msgid "Synchronize Account"
 msgstr ""
 
 #. TRANS: Form guide.
-#: actions/finishopenidlogin.php:121
-msgid "Create a new user with this nickname."
+#: actions/openidsettings.php:113
+msgid "Synchronize GNU social profile with this OpenID identity."
 msgstr ""
 
-#. TRANS: Field label.
-#: actions/finishopenidlogin.php:129
-msgid "New nickname"
+#. TRANS: Button text for adding an OpenID URL.
+#: actions/openidsettings.php:117
+msgctxt "BUTTON"
+msgid "Add"
 msgstr ""
 
-#. TRANS: Field title.
-#: actions/finishopenidlogin.php:132
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+#. TRANS: Header on OpenID settings page.
+#: actions/openidsettings.php:129
+msgctxt "HEADER"
+msgid "OpenID Actions"
 msgstr ""
 
-#. TRANS: Field label.
-#: actions/finishopenidlogin.php:136
-msgid "Email"
+#. TRANS: Form guide.
+#: actions/openidsettings.php:134
+msgid ""
+"You can't remove your main OpenID account without either adding a password "
+"to your GNU social account or another OpenID account. You can synchronize "
+"your profile with your OpenID by clicking the button labeled \"Synchronize\"."
 msgstr ""
 
-#. TRANS: Field title.
-#: actions/finishopenidlogin.php:138
-msgid "Used only for updates, announcements, and password recovery."
+#. TRANS: Button text to sync OpenID with the GS profile.
+#. TRANS: Button text to sync an OpenID with the GS profile.
+#: actions/openidsettings.php:150 actions/openidsettings.php:174
+msgctxt "BUTTON"
+msgid "Synchronize"
 msgstr ""
 
-#. TRANS: OpenID plugin link text.
-#. TRANS: %s is a link to a license with the license name as link text.
-#: actions/finishopenidlogin.php:155
-#, php-format
+#. TRANS: Form guide.
+#: actions/openidsettings.php:157
 msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
+"You can remove an OpenID from your account by clicking the button labeled "
+"\"Remove\". You can synchronize your profile with an OpenID by clicking the "
+"button labeled \"Synchronize\"."
 msgstr ""
 
-#. TRANS: Button label in form in which to create a new user on the site for an OpenID.
-#: actions/finishopenidlogin.php:168
+#. TRANS: Button text to remove an OpenID.
+#. TRANS: Button text to remove an OpenID trustroot.
+#: actions/openidsettings.php:176 actions/openidsettings.php:219
 msgctxt "BUTTON"
-msgid "Create"
+msgid "Remove"
 msgstr ""
 
-#. TRANS: Used as form legend for form in which to connect an OpenID to an existing user on the site.
-#: actions/finishopenidlogin.php:182
-msgid "Connect existing account"
+#. TRANS: Fieldset legend.
+#: actions/openidsettings.php:192
+msgid "OpenID Trusted Sites"
 msgstr ""
 
-#. TRANS: User instructions for form in which to connect an OpenID to an existing user on the site.
-#: actions/finishopenidlogin.php:185
+#. TRANS: Form guide.
+#: actions/openidsettings.php:196
 msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
+"The following sites are allowed to access your identity and log you in. You "
+"can remove a site from this list to deny it access to your OpenID."
 msgstr ""
 
-#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: actions/finishopenidlogin.php:189
-msgid "Existing nickname"
+#: actions/openidsettings.php:225
+msgctxt "LEGEND"
+msgid "Preferences"
 msgstr ""
 
-#. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: actions/finishopenidlogin.php:193
-msgid "Password"
+#. TRANS: Form validation error if no OpenID providers can be added.
+#: actions/openidsettings.php:248
+msgid "Cannot add new providers."
 msgstr ""
 
-#. TRANS: Button text in form in which to connect an OpenID to an existing user on the site.
-#: actions/finishopenidlogin.php:197
-msgctxt "BUTTON"
-msgid "Connect"
+#. TRANS: Unexpected form validation error.
+#: actions/openidsettings.php:271
+msgid "No known action for POST."
 msgstr ""
 
-#. TRANS: OpenID plugin message. No new user registration is allowed on the site.
-#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and none was provided.
-#: actions/finishopenidlogin.php:324 actions/finishopenidlogin.php:333
-msgid "Registration not allowed."
+#. TRANS: Form validation error when trying to remove a non-existing trustroot.
+#: actions/openidsettings.php:293
+msgid "No such OpenID trustroot."
 msgstr ""
 
-#. TRANS: OpenID plugin message. No new user registration is allowed on the site without an invitation code, and the one provided was not valid.
-#: actions/finishopenidlogin.php:340
-msgid "Not a valid invitation code."
+#. TRANS: Success message after removing trustroots.
+#: actions/openidsettings.php:298
+msgid "Trustroots removed."
 msgstr ""
 
-#. TRANS: OpenID plugin server error. A stored OpenID cannot be retrieved.
-#. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
-#: actions/finishopenidlogin.php:355 actions/finishopenidlogin.php:438
-msgid "Stored OpenID not found."
+#. TRANS: Form validation error for a non-existing OpenID.
+#: actions/openidsettings.php:315 actions/openidsettings.php:336
+msgid "No such OpenID."
 msgstr ""
 
-#. TRANS: OpenID plugin server error.
-#: actions/finishopenidlogin.php:364
-msgid "Creating new account for OpenID that already has a user."
+#. TRANS: Form validation error if OpenID is connected to another user.
+#: actions/openidsettings.php:319
+msgid "That OpenID does not belong to you."
+msgstr ""
+
+#. TRANS: Success message after removing an OpenID.
+#: actions/openidsettings.php:323
+msgid "OpenID removed."
+msgstr ""
+
+#: actions/openidsettings.php:343
+msgid "Synchronized OpenID."
+msgstr ""
+
+#: actions/openidsettings.php:375
+msgid "OpenID preferences saved."
+msgstr ""
+
+#. TRANS: OpenID plugin message. Rememberme logins have to reauthenticate before changing any profile settings.
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: actions/openidlogin.php:74
+#, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
 msgstr ""
 
 #. TRANS: OpenID plugin message.
-#: actions/finishopenidlogin.php:426
-msgid "Invalid username or password."
+#. TRANS: "OpenID" is the display text for a link with URL "(%%doc.openid%%)".
+#: actions/openidlogin.php:80
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr ""
 
-#. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: actions/finishopenidlogin.php:445
-msgid "Error connecting user to OpenID."
+#. TRANS: OpenID plugin message. Title.
+#: actions/openidlogin.php:114
+msgctxt "TITLE"
+msgid "OpenID Login"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form legend.
+#: actions/openidlogin.php:132 OpenIDPlugin.php:634
+msgctxt "LEGEND"
+msgid "OpenID login"
+msgstr ""
+
+#. TRANS: Field label.
+#: actions/openidlogin.php:140
+msgctxt "LABEL"
+msgid "OpenID provider"
+msgstr ""
+
+#. TRANS: Form guide.
+#: actions/openidlogin.php:149 OpenIDPlugin.php:651
+msgid "Enter your username."
+msgstr ""
+
+#. TRANS: Form guide.
+#: actions/openidlogin.php:151 OpenIDPlugin.php:653
+msgid "You will be sent to the provider's site for authentication."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field title.
+#. TRANS: OpenID plugin logon form field instructions.
+#: actions/openidlogin.php:158 OpenIDPlugin.php:660
+msgid "Your OpenID URL."
+msgstr ""
+
+#. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
+#: actions/openidlogin.php:163
+msgid "Remember me"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form field title.
+#: actions/openidlogin.php:165
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+
+#. TRANS: OpenID plugin logon form button label to start logon with the data provided in the logon form.
+#: actions/openidlogin.php:170
+msgctxt "BUTTON"
+msgid "Login"
+msgstr ""
+
+#. TRANS: Message in case a user tries to add an OpenID that is already connected to them.
+#: actions/finishaddopenid.php:121
+msgid "You already have this OpenID!"
+msgstr ""
+
+#. TRANS: Message in case a user tries to add an OpenID that is already used by another user.
+#: actions/finishaddopenid.php:124
+msgid "Someone else already has this OpenID."
+msgstr ""
+
+#. TRANS: Message in case the OpenID object cannot be connected to the user.
+#: actions/finishaddopenid.php:137
+msgid "Error connecting user."
+msgstr ""
+
+#. TRANS: Title after getting the status of the OpenID authorisation request.
+#: actions/finishaddopenid.php:187
+msgid "OpenID Login"
 msgstr ""
 
 #. TRANS: Client exception thrown when an action is not available.
-#: OpenIDPlugin.php:141
+#: OpenIDPlugin.php:143
 msgid "Unavailable action."
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Login"
-#: OpenIDPlugin.php:190
+#: OpenIDPlugin.php:192
 msgctxt "TOOLTIP"
 msgid "Login to the site."
 msgstr ""
 
 #. TRANS: Main menu option when not logged in to log in
-#: OpenIDPlugin.php:193
+#: OpenIDPlugin.php:195
 msgctxt "MENU"
 msgid "Login"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Help"
-#: OpenIDPlugin.php:198
+#: OpenIDPlugin.php:200
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr ""
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: OpenIDPlugin.php:201
+#: OpenIDPlugin.php:203
 msgctxt "MENU"
 msgid "Help"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Search"
-#: OpenIDPlugin.php:207
+#: OpenIDPlugin.php:209
 msgctxt "TOOLTIP"
 msgid "Search for people or text."
 msgstr ""
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: OpenIDPlugin.php:210
+#: OpenIDPlugin.php:212
 msgctxt "MENU"
 msgid "Search"
 msgstr ""
@@ -584,25 +620,25 @@ msgstr ""
 #. TRANS: OpenID plugin menu item on site logon page.
 #. TRANS: OpenID plugin menu item on user settings page.
 #. TRANS: OpenID configuration menu item.
-#: OpenIDPlugin.php:267 OpenIDPlugin.php:303 OpenIDPlugin.php:477
-#: OpenIDPlugin.php:557
+#: OpenIDPlugin.php:269 OpenIDPlugin.php:305 OpenIDPlugin.php:479
+#: OpenIDPlugin.php:559
 msgctxt "MENU"
 msgid "OpenID"
 msgstr ""
 
 #. TRANS: OpenID plugin tooltip for logon menu item.
-#: OpenIDPlugin.php:269
+#: OpenIDPlugin.php:271
 msgid "Login or register with OpenID."
 msgstr ""
 
 #. TRANS: OpenID plugin tooltip for user settings menu item.
-#: OpenIDPlugin.php:305
+#: OpenIDPlugin.php:307
 msgid "Add or remove OpenIDs."
 msgstr ""
 
 #. TRANS: Page notice for logged in users to try and get them to add an OpenID account to their StatusNet account.
 #. TRANS: This message contains Markdown links in the form (description)[link].
-#: OpenIDPlugin.php:419
+#: OpenIDPlugin.php:421
 #, php-format
 msgid ""
 "(Have an [OpenID](http://openid.net/)? [Add an OpenID to your account]"
@@ -611,7 +647,7 @@ msgstr ""
 
 #. TRANS: Page notice for anonymous users to try and get them to register with an OpenID account.
 #. TRANS: This message contains Markdown links in the form (description)[link].
-#: OpenIDPlugin.php:424
+#: OpenIDPlugin.php:426
 #, php-format
 msgid ""
 "(Have an [OpenID](http://openid.net/)? Try our [OpenID registration]"
@@ -620,7 +656,7 @@ msgstr ""
 
 #. TRANS: Page notice on the login page to try and get them to log on with an OpenID account.
 #. TRANS: This message contains Markdown links in the form (description)[link].
-#: OpenIDPlugin.php:432
+#: OpenIDPlugin.php:434
 #, php-format
 msgid ""
 "(Have an [OpenID](http://openid.net/)? Try our [OpenID login](%%action."
@@ -628,17 +664,17 @@ msgid ""
 msgstr ""
 
 #. TRANS: Tooltip for OpenID configuration menu item.
-#: OpenIDPlugin.php:559
+#: OpenIDPlugin.php:561
 msgid "OpenID configuration."
 msgstr ""
 
 #. TRANS: Plugin description.
-#: OpenIDPlugin.php:605
+#: OpenIDPlugin.php:607
 msgid "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 msgstr ""
 
 #. TRANS: Field label.
-#: OpenIDPlugin.php:640
+#: OpenIDPlugin.php:642
 msgid "OpenID provider"
 msgstr ""
 

diff --git a/plugins/OpenID/locale/en_GB/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/en_GB/LC_MESSAGES/OpenID.po
index 35a4976338047a129013334de84fd0533c4905be..ea2a829f9888cf3cbeaeb29518305c7aebaa5506 100644 (file)
--- a/plugins/OpenID/locale/en_GB/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/en_GB/LC_MESSAGES/OpenID.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Luke Hollins <luke@farcry.ca>, 2015
+# Bruno Casteleiro <brunoccast@fc.up.pt>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU social\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-02-02 17:47+0100\n"
 "PO-Revision-Date: 2015-03-09 11:46+0000\n"
-"Last-Translator: Luke Hollins <luke@farcry.ca>\n"
+"Last-Translator: Bruno Casteleiro <brunoccast@fc.up.pt>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/gnu-social/gnu-social/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -198,28 +199,30 @@ msgid "Add"
 msgstr "Add"
 
 #. TRANS: Header on OpenID settings page.
-#: actions/openidsettings.php:133
+#: actions/openidsettings.php:129
 msgctxt "HEADER"
-msgid "Remove OpenID"
-msgstr "Remove OpenID"
+msgid "OpenID Actions"
+msgstr "OpenID Actions"
 
 #. TRANS: Form guide.
-#: actions/openidsettings.php:139
+#: actions/openidsettings.php:134
 msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to"
-" remove it, add another OpenID first."
-msgstr "Removing your only OpenID would make it impossible to log in! If you need to remove it, add another OpenID first."
+"You can't remove your main OpenID account without either adding a password "
+"to your GNU social account or another OpenID account. You can synchronize "
+"your profile with your OpenID by clicking the button labeled \"Synchronize\"."
+msgstr "You can't remove your main OpenID account without either adding a password to your GNU social account or another OpenID account. You can synchronize your profile with your OpenID by clicking the button labeled \"Synchronize\"."
 
 #. TRANS: Form guide.
-#: actions/openidsettings.php:155
+#: actions/openidsettings.php:157
 msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr "You can remove an OpenID from your account by clicking the button marked \"Remove\"."
+"You can remove an OpenID from your account by clicking the button labeled "
+"\"Remove\". You can synchronize your profile with an OpenID by clicking "
+"the button labeled \"Synchronize\"."
+msgstr "You can remove an OpenID from your account by clicking the button labeled \"Remove\". You can synchronize your profile with an OpenID by clicking the button labeled \"Synchronize\"."
 
 #. TRANS: Button text to remove an OpenID.
 #. TRANS: Button text to remove an OpenID trustroot.
-#: actions/openidsettings.php:179 actions/openidsettings.php:223
+#: actions/openidsettings.php:177 actions/openidsettings.php:223
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remove"
@@ -744,3 +747,28 @@ msgstr "Use <a href=\"http://openid.net/\">OpenID</a> to login to the site."
 #: OpenIDPlugin.php:687
 msgid "OpenID provider"
 msgstr "OpenID provider"
+
+#. TRANS: Field label.
+#: actions/openidsettings.php:111
+msgid "Synchronize Account"
+msgstr "Synchronize Account"
+
+#. TRANS: Form guide
+#: actions/openidsettings.php:113
+msgid "Synchronize GNU social profile with this OpenID identity."
+msgstr "Synchronize GNU social profile with this OpenID identity."
+
+#. TRANS: Button text to sync OpenID with the GS profile.
+#: actions/openidsettings.php:150 actions/openidsettings.php:174
+msgctxt "BUTTON"
+msgid "Synchronize"
+msgstr "Synchronize"
+
+#: actions/openidsettings.php:343
+msgid "Synchronized OpenID."
+msgstr "Synchronized OpenID."
+
+#. TRANS: Title
+#: actions/finishsyncopenid:152
+msgid "OpenID Synchronization"
+msgstr "OpenID Synchronization"
\ No newline at end of file

diff --git a/plugins/OpenID/locale/pt/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/pt/LC_MESSAGES/OpenID.po
index af12000fc264e4484b696eb9710c3a1c687dbbad..c00f0a4ebd812470deb12488ba3d6a96bda69707 100644 (file)
--- a/plugins/OpenID/locale/pt/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/pt/LC_MESSAGES/OpenID.po
@@ -3,13 +3,14 @@
 # This file is under https://www.gnu.org/licenses/agpl v3 or later
 # 
 # Translators:
+# Bruno Casteleiro <brunoccast@fc.up.pt>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU social\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-02-02 17:47+0100\n"
 "PO-Revision-Date: 2015-02-05 16:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Bruno Casteleiro <brunoccast@fc.up.pt>\n"
 "Language-Team: Portuguese (http://www.transifex.com/gnu-social/gnu-social/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -197,10 +198,10 @@ msgid "Add"
 msgstr "Adicionar"
 
 #. TRANS: Header on OpenID settings page.
-#: actions/openidsettings.php:133
+#: actions/openidsettings.php:129
 msgctxt "HEADER"
-msgid "Remove OpenID"
-msgstr ""
+msgid "OpenID Actions"
+msgstr "Opções OpenID"
 
 #. TRANS: Form guide.
 #: actions/openidsettings.php:139
@@ -743,3 +744,44 @@ msgstr ""
 #: OpenIDPlugin.php:687
 msgid "OpenID provider"
 msgstr ""
+
+#. TRANS: Field label.
+#: actions/openidsettings.php:111
+msgid "Synchronize Account"
+msgstr "Sincronizar Conta"
+
+#. TRANS: Form guide.
+#: actions/openidsettings.php:113
+msgid "Synchronize GNU social profile with this OpenID identity."
+msgstr "Sincronizar perfil do GNU social com esta identidade OpenID."
+
+#. TRANS: Form guide.
+#: actions/openidsettings.php:134
+msgid ""
+"You can't remove your main OpenID account without either adding a password "
+"to your GNU social account or another OpenID account. You can synchronize "
+"your profile with your OpenID by clicking the button labeled \"Synchronize\"."
+msgstr "Não podes remover a tua única conta OpenID sem primeiro adicionares uma palavra-passe à tua conta do GNU social ou adicionar outra identidade OpenID. Podes sincronizar o teu perfil com o teu OpenID clicando no botão \"Sincronizar\"."
+
+#. TRANS: Button text to sync OpenID with the GS profile.
+#: actions/openidsettings.php:150 actions/openidsettings.php:174
+msgctxt "BUTTON"
+msgid "Sincronizar"
+msgstr "Sincronizar"
+
+#. TRANS: Form guide.
+#: actions/openidsettings.php:157
+msgid ""
+"You can remove an OpenID from your account by clicking the button labeled "
+"\"Remove\". You can synchronize your profile with an OpenID by clicking "
+"the button labeled \"Synchronize\"."
+msgstr "Podes remover uma das tuas contas OpenID clicando no botão \"Remover\". Podes sincronizar o teu perfil com uma conta OpenID clicando no botão \"Sincronizar\"."
+
+#: actions/openidsettings.php:343
+msgid "Synchronized OpenID."
+msgstr "OpenID sincronizado."
+
+#. TRANS: Title
+#: actions/finishsyncopenid:152
+msgid "OpenID Synchronization"
+msgstr "Sincronização OpenID"
\ No newline at end of file

diff --git a/plugins/OpenID/locale/pt_BR/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/pt_BR/LC_MESSAGES/OpenID.po
index e2002118caf65f2f414543c3adc00856c7b36783..97679742cfcede3b672639311fb227ee194b1312 100644 (file)
--- a/plugins/OpenID/locale/pt_BR/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/pt_BR/LC_MESSAGES/OpenID.po
@@ -3,13 +3,14 @@
 # This file is under https://www.gnu.org/licenses/agpl v3 or later
 # 
 # Translators:
+# Phablulo Joel
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU social\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-02-02 17:47+0100\n"
 "PO-Revision-Date: 2015-04-29 02:53+0000\n"
-"Last-Translator: digitaldreamer <digitaldreamer@email.cz>\n"
+"Last-Translator: Phablulo Joel\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/gnu-social/gnu-social/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -197,10 +198,10 @@ msgid "Add"
 msgstr "Adicionar"
 
 #. TRANS: Header on OpenID settings page.
-#: actions/openidsettings.php:133
+#: actions/openidsettings.php:129
 msgctxt "HEADER"
-msgid "Remove OpenID"
-msgstr ""
+msgid "OpenID Actions"
+msgstr "Opções OpenID"
 
 #. TRANS: Form guide.
 #: actions/openidsettings.php:139
@@ -743,3 +744,44 @@ msgstr ""
 #: OpenIDPlugin.php:687
 msgid "OpenID provider"
 msgstr ""
+
+#. TRANS: Field label.
+#: actions/openidsettings.php:111
+msgid "Synchronize Account"
+msgstr "Sincronizar Conta"
+
+#. TRANS: Form guide.
+#: actions/openidsettings.php:113
+msgid "Synchronize GNU social profile with this OpenID identity."
+msgstr "Sincronizar perfil do GNU social com esta conta OpenID"
+
+#. TRANS: Form guide.
+#: actions/openidsettings.php:134
+msgid ""
+"You can't remove your main OpenID account without either adding a password "
+"to your GNU social account or another OpenID account. You can synchronize "
+"your profile with your OpenID by clicking the button labeled \"Synchronize\"."
+msgstr "Você não pode remover sua única conta OpenID sem primeiro adicionar uma senha à sua conta do GNU Social ou adicionar outra conta OpenID. Para sincronizar seu perfil, clique no botão \"Sincronizar\"."
+
+#. TRANS: Button text to sync OpenID with the GS profile.
+#: actions/openidsettings.php:150 actions/openidsettings.php:174
+msgctxt "BUTTON"
+msgid "Sincronizar"
+msgstr "Sincronizar"
+
+#. TRANS: Form guide.
+#: actions/openidsettings.php:157
+msgid ""
+"You can remove an OpenID from your account by clicking the button labeled "
+"\"Remove\". You can synchronize your profile with an OpenID by clicking "
+"the button labeled \"Synchronize\"."
+msgstr "Você pode remover uma de suas contas OpenID clicando no botão \"Remover\" ou sincronizar seu perfil com uma conta OpenID clicando no botão \"Sincronizar\"."
+
+#: actions/openidsettings.php:343
+msgid "Synchronized OpenID."
+msgstr "OpenID sincronizado."
+
+#. TRANS: Title
+#: actions/finishsyncopenid:152
+msgid "OpenID Synchronization"
+msgstr "Sincronização OpenID"
\ No newline at end of file

diff --git a/plugins/OpenID/locale/ru/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ru/LC_MESSAGES/OpenID.po
index 963994af052c061c8a6fc5d93bc8289d76ed878c..7f12f4d892bae4717e94ef2f3147cd6936b05e5a 100644 (file)
--- a/plugins/OpenID/locale/ru/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ru/LC_MESSAGES/OpenID.po
@@ -3,13 +3,14 @@
 # This file is under https://www.gnu.org/licenses/agpl v3 or later
 # 
 # Translators:
+# Alexei Sorokin <sor.alexei@meowr.ru>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU social\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-02-02 17:47+0100\n"
 "PO-Revision-Date: 2015-02-05 16:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Alexei Sorokin <sor.alexei@meowr.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/gnu-social/gnu-social/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -197,10 +198,10 @@ msgid "Add"
 msgstr "Добавить"
 
 #. TRANS: Header on OpenID settings page.
-#: actions/openidsettings.php:133
+#: actions/openidsettings.php:129
 msgctxt "HEADER"
-msgid "Remove OpenID"
-msgstr ""
+msgid "OpenID Actions"
+msgstr "Действия с OpenID"
 
 #. TRANS: Form guide.
 #: actions/openidsettings.php:139
@@ -743,3 +744,44 @@ msgstr ""
 #: OpenIDPlugin.php:687
 msgid "OpenID provider"
 msgstr ""
+
+#. TRANS: Field label.
+#: actions/openidsettings.php:111
+msgid "Synchronize Account"
+msgstr "Синхронизировать аккаунт"
+
+#. TRANS: Form guide.
+#: actions/openidsettings.php:113
+msgid "Synchronize GNU social profile with this OpenID identity."
+msgstr "Синхронизировать профиль GNU social с этим идентификатором OpenID"
+
+#. TRANS: Form guide.
+#: actions/openidsettings.php:134
+msgid ""
+"You can't remove your main OpenID account without either adding a password "
+"to your GNU social account or another OpenID account. You can synchronize "
+"your profile with your OpenID by clicking the button labeled \"Synchronize\"."
+msgstr "Вы не можете удалить ваш основной аккаунт OpenID без добавления к вашему аккаунту GNU social либо пароля, либо иного аккаунта OpenID. Вы можете синхронизировать ваш профиль с OpenID нажатием на кнопку \"Синхронизировать\"."
+
+#. TRANS: Button text to sync OpenID with the GS profile.
+#: actions/openidsettings.php:150 actions/openidsettings.php:174
+msgctxt "BUTTON"
+msgid "Sincronizar"
+msgstr "синхронизировать"
+
+#. TRANS: Form guide.
+#: actions/openidsettings.php:157
+msgid ""
+"You can remove an OpenID from your account by clicking the button labeled "
+"\"Remove\". You can synchronize your profile with an OpenID by clicking "
+"the button labeled \"Synchronize\"."
+msgstr "Вы можете удалить OpenID с вашего аккаунта нажатием на кнопку \"Удалить\". Вы можете синхронизировать ваш профиль с OpenID нажатием на кнопку \"Синхронизировать\"."
+
+#: actions/openidsettings.php:343
+msgid "Synchronized OpenID."
+msgstr "Синхронизированный OpenID."
+
+#. TRANS: Title
+#: actions/finishsyncopenid:152
+msgid "OpenID Synchronization"
+msgstr "Синхронизация OpenID"
\ No newline at end of file

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index cfb7720e63c681c0a3496306645be11c0c93aaec..9fee33c8958049b06af63bab40ae47f8e2b232f9 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1359,8 +1359,16 @@ form label.submit {
     font-weight: normal;
 }
 
+.form_settings input.sync {
+    margin-left: 11px;
+}
+
 .form_settings input.remove {
-    margin-left:11px;
+    margin-left: 11px;
+}
+
+.form_settings .element_actions {
+    margin-left: 11px;
 }
 
 .form_settings .form_data li {