Merge branch '0.9.x' into 1.0.x

Conflicts: actions/confirmaddress.php actions/emailsettings.php actions/hostmeta.php actions/imsettings.php actions/login.php actions/profilesettings.php actions/showgroup.php actions/smssettings.php actions/urlsettings.php actions/userauthorization.php actions/userdesignsettings.php classes/Memcached_DataObject.php index.php lib/accountsettingsaction.php lib/action.php lib/common.php lib/connectsettingsaction.php lib/designsettings.php lib/personalgroupnav.php lib/profileaction.php lib/userprofile.php plugins/ClientSideShorten/ClientSideShortenPlugin.php plugins/Facebook/FBConnectSettings.php plugins/Facebook/FacebookPlugin.php plugins/NewMenu/NewMenuPlugin.php plugins/NewMenu/newmenu.css
2011-02-28 15:39:43 -08:00
parent babdc430f9 061c8d959b
commit b7d0746694
1504 changed files with 136871 additions and 78532 deletions
--- a/plugins/FacebookBridge/FacebookBridgePlugin.php
+++ b/plugins/FacebookBridge/FacebookBridgePlugin.php
@@ -24,7 +24,7 @@
 * @category  Pugin
 * @package   StatusNet
 * @author    Zach Copley <zach@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
 * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
 * @link      http://status.net/
 */
@@ -47,8 +47,9 @@ define("FACEBOOK_SERVICE", 2);
 */
 class FacebookBridgePlugin extends Plugin
 {
-    public $appId    = null; // Facebook application ID
-    public $secret   = null; // Facebook application secret
+    public $appId;  // Facebook application ID
+    public $secret; // Facebook application secret
+
    public $facebook = null; // Facebook application instance
    public $dir      = null; // Facebook plugin dir

@@ -61,6 +62,28 @@ class FacebookBridgePlugin extends Plugin
     */
    function initialize()
    {
+
+        // Allow the id and key to be passed in
+        // Control panel will override
+
+        if (isset($this->appId)) {
+            $appId = common_config('facebook', 'appid');
+            if (empty($appId)) {
+                Config::save(
+                    'facebook',
+                    'appid',
+                    $this->appId
+                );
+            }
+        }
+
+        if (isset($this->secret)) {
+            $secret = common_config('facebook', 'secret');
+            if (empty($secret)) {
+                Config::save('facebook', 'secret', $this->secret);
+            }
+        }
+
        $this->facebook = Facebookclient::getFacebook(
            $this->appId,
            $this->secret
@@ -156,28 +179,22 @@ class FacebookBridgePlugin extends Plugin
        // Always add the admin panel route
        $m->connect('panel/facebook', array('action' => 'facebookadminpanel'));

-        // Only add these routes if an application has been setup on
-        // Facebook for the plugin to use.
-        if ($this->hasApplication()) {
-
-            $m->connect(
-                'main/facebooklogin',
-                array('action' => 'facebooklogin')
-            );
-            $m->connect(
-                'main/facebookfinishlogin',
-                array('action' => 'facebookfinishlogin')
-            );
-            $m->connect(
-                'settings/facebook',
-                array('action' => 'facebooksettings')
-            );
-            $m->connect(
-                'facebook/deauthorize',
-                array('action' => 'facebookdeauthorize')
-            );
-
-        }
+        $m->connect(
+            'main/facebooklogin',
+            array('action' => 'facebooklogin')
+        );
+        $m->connect(
+            'main/facebookfinishlogin',
+            array('action' => 'facebookfinishlogin')
+        );
+        $m->connect(
+            'settings/facebook',
+            array('action' => 'facebooksettings')
+        );
+        $m->connect(
+            'facebook/deauthorize',
+            array('action' => 'facebookdeauthorize')
+        );

        return true;
    }
@@ -186,11 +203,11 @@ class FacebookBridgePlugin extends Plugin
     * Add a login tab for Facebook, but only if there's a Facebook
     * application defined for the plugin to use.
     *
-     * @param Action &action the current action
+     * @param Action $action the current action
     *
     * @return void
     */
-    function onEndLoginGroupNav(&$action)
+    function onEndLoginGroupNav($action)
    {
        $action_name = $action->trimmed('action');

@@ -252,11 +269,11 @@ class FacebookBridgePlugin extends Plugin
     * Add a tab for user-level Facebook settings if the user
     * has a link to Facebook
     *
-     * @param Action &action the current action
+     * @param Action $action the current action
     *
     * @return void
     */
-    function onEndConnectSettingsNav(&$action)
+    function onEndConnectSettingsNav($action)
    {
        if ($this->hasApplication()) {
            $action_name = $action->trimmed('action');
--- a/plugins/FacebookBridge/actions/facebookfinishlogin.php
+++ b/plugins/FacebookBridge/actions/facebookfinishlogin.php
@@ -257,12 +257,20 @@ class FacebookfinishloginAction extends Action
        $this->element('p', null,
                       _m('Create a new user with this nickname.'));
        $this->elementStart('ul', 'form_data');
+
+        // Hook point for captcha etc
+        Event::handle('StartRegistrationFormData', array($this));
+
        $this->elementStart('li');
        // TRANS: Field label.
        $this->input('newname', _m('New nickname'),
                     ($this->username) ? $this->username : '',
                     _m('1-64 lowercase letters or numbers, no punctuation or spaces'));
        $this->elementEnd('li');
+
+        // Hook point for captcha etc
+        Event::handle('EndRegistrationFormData', array($this));
+
        $this->elementEnd('ul');
        // TRANS: Submit button.
        $this->submit('create', _m('BUTTON','Create'));
--- a/plugins/FacebookBridge/actions/facebooklogin.php
+++ b/plugins/FacebookBridge/actions/facebooklogin.php
@@ -89,10 +89,7 @@ class FacebookloginAction extends Action
        );

        $attrs = array(
-            'src' => common_path(
-                'plugins/FacebookBridge/images/login-button.png',
-                true
-            ),
+            'src' => Plugin::staticPath('FacebookBridge', 'images/login-button.png'),
            'alt'   => 'Login with Facebook',
            'title' => 'Login with Facebook'
        );
--- a/plugins/FacebookBridge/lib/facebookclient.php
+++ b/plugins/FacebookBridge/lib/facebookclient.php
@@ -51,7 +51,14 @@ class Facebookclient
    function __construct($notice)
    {
        $this->facebook = self::getFacebook();
-        $this->notice   = $notice;
+
+        if (empty($this->facebook)) {
+            throw new FacebookApiException(
+                "Could not create Facebook client! Bad application ID or secret?"
+            );
+        }
+
+        $this->notice = $notice;

        $this->flink = Foreign_link::getByUserID(
            $notice->profile_id,
@@ -89,6 +96,22 @@ class Facebookclient
            $secret = common_config('facebook', 'global_secret');
        }

+        if (empty($appId)) {
+            common_log(
+                LOG_WARNING,
+                "Couldn't find Facebook application ID!",
+                __FILE__
+            );
+        }
+
+        if (empty($secret)) {
+            common_log(
+                LOG_WARNING,
+                "Couldn't find Facebook application ID!",
+                __FILE__
+            );
+        }
+
        return new Facebook(
            array(
               'appId'  => $appId,
@@ -115,14 +138,7 @@ class Facebookclient
    function isFacebookBound() {

        if (empty($this->flink)) {
-            common_log(
-                LOG_WARN,
-                sprintf(
-                    "No Foreign_link to Facebook for the author of notice %d.",
-                    $this->notice->id
-                ),
-                __FILE__
-            );
+            // User hasn't setup bridging
            return false;
        }

@@ -180,16 +196,10 @@ class Facebookclient
                // Otherwise we most likely have an access token
                return $this->sendGraph();
            }
-
-        } else {
-            common_debug(
-                sprintf(
-                    "Skipping notice %d - not bound for Facebook",
-                    $this->notice->id,
-                    __FILE__
-                )
-            );
        }
+
+        // dequeue
+        return true;
    }

    /*
--- a/plugins/FacebookBridge/locale/FacebookBridge.pot
+++ b/plugins/FacebookBridge/locale/FacebookBridge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\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"
@@ -18,37 +18,37 @@ msgstr ""

 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:201 FacebookBridgePlugin.php:240
-#: FacebookBridgePlugin.php:281
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
 msgctxt "MENU"
 msgid "Facebook"
 msgstr ""

 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:203
+#: FacebookBridgePlugin.php:226
 msgid "Login or register using Facebook"
 msgstr ""

 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:242
+#: FacebookBridgePlugin.php:265
 msgid "Facebook integration configuration"
 msgstr ""

 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr ""

-#: FacebookBridgePlugin.php:547
+#: FacebookBridgePlugin.php:570
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr ""

-#: lib/facebookclient.php:776
+#: lib/facebookclient.php:760
 msgid "Your Facebook connection has been removed"
 msgstr ""

-#: lib/facebookclient.php:835
+#: lib/facebookclient.php:819
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr ""
@@ -110,69 +110,69 @@ msgid "Create a new user with this nickname."
 msgstr ""

 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:262
+#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr ""

-#: actions/facebookfinishlogin.php:264
+#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""

 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:268
+#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr ""

-#: actions/facebookfinishlogin.php:274
+#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr ""

-#: actions/facebookfinishlogin.php:276
+#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
 msgstr ""

 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:280
+#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr ""

-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr ""

 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:287
+#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr ""

 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr ""

 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:322
+#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr ""

-#: actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr ""

-#: actions/facebookfinishlogin.php:340
+#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr ""

-#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr ""

-#: actions/facebookfinishlogin.php:468
+#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr ""

--- a/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FacebookBridge to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:55+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07:52+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:24:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -23,37 +23,37 @@ msgstr ""

 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:201 FacebookBridgePlugin.php:240
-#: FacebookBridgePlugin.php:281
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:203
+#: FacebookBridgePlugin.php:226
 msgid "Login or register using Facebook"
 msgstr "Kevreañ pe en em enskrivañ dre Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:242
+#: FacebookBridgePlugin.php:265
 msgid "Facebook integration configuration"
 msgstr ""

 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Arventennoù Facebook"

-#: FacebookBridgePlugin.php:547
+#: FacebookBridgePlugin.php:570
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr ""

-#: lib/facebookclient.php:776
+#: lib/facebookclient.php:760
 msgid "Your Facebook connection has been removed"
 msgstr ""

-#: lib/facebookclient.php:835
+#: lib/facebookclient.php:819
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr ""
@@ -117,69 +117,69 @@ msgid "Create a new user with this nickname."
 msgstr "Krouiñ un implijer nevez gant al lesanv-se."

 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:262
+#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Lesanv nevez"

-#: actions/facebookfinishlogin.php:264
+#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"

 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:268
+#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Krouiñ"

-#: actions/facebookfinishlogin.php:274
+#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Kevreañ d'ur gont a zo dioutañ"

-#: actions/facebookfinishlogin.php:276
+#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
 msgstr ""

 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:280
+#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Lesanv a zo dioutañ"

-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Ger-tremen"

 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:287
+#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Kevreañ"

 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr "N'eo ket aotreet krouiñ kontoù."

 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:322
+#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "N'eo ket reizh ar c'hod pedadenn."

-#: actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Lesanv nann-aotreet."

-#: actions/facebookfinishlogin.php:340
+#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."

-#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr ""

-#: actions/facebookfinishlogin.php:468
+#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Anv implijer pe ger-tremen direizh."

@@ -239,11 +239,11 @@ msgstr "Enrollañ"

 #: actions/facebookadminpanel.php:210
 msgid "Save Facebook settings"
-msgstr ""
+msgstr "Enrollañ arventennoù Facebook"

 #: actions/facebooksettings.php:137
 msgid "Connected Facebook user"
-msgstr ""
+msgstr "Implijer Facebook kevreet"

 #: actions/facebooksettings.php:164
 msgid "Publish my notices to Facebook."
@@ -251,7 +251,7 @@ msgstr ""

 #: actions/facebooksettings.php:174
 msgid "Send \"@\" replies to Facebook."
-msgstr ""
+msgstr "Kas respontoù \"@\" da Facebook."

 #. TRANS: Submit button to save synchronisation settings.
 #: actions/facebooksettings.php:183
@@ -262,7 +262,7 @@ msgstr "Enrollañ"
 #. TRANS: Legend.
 #: actions/facebooksettings.php:192
 msgid "Disconnect my account from Facebook"
-msgstr ""
+msgstr "Digevreañ ma c'hont deus Facebook"

 #: actions/facebooksettings.php:199
 #, php-format
@@ -295,8 +295,8 @@ msgstr ""

 #: actions/facebooksettings.php:260
 msgid "Couldn't delete link to Facebook."
-msgstr ""
+msgstr "N'eus ket bet gallet diverkañ al liamm war-du Facebook."

 #: actions/facebooksettings.php:264
 msgid "You have disconnected from Facebook."
-msgstr ""
+msgstr "Digevreet ho peus deus Facebook."
--- a/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FacebookBridge to Catalan (Català)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toniher
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:55+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07:53+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:24:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -23,37 +23,37 @@ msgstr ""

 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:201 FacebookBridgePlugin.php:240
-#: FacebookBridgePlugin.php:281
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:203
+#: FacebookBridgePlugin.php:226
 msgid "Login or register using Facebook"
 msgstr "Inicieu-hi una sessió o registreu-vos-hi des del Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:242
+#: FacebookBridgePlugin.php:265
 msgid "Facebook integration configuration"
 msgstr "Configuració de la integració del Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Paràmetres del Facebook"

-#: FacebookBridgePlugin.php:547
+#: FacebookBridgePlugin.php:570
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Un connector per integrar l'StatusNet amb el Facebook"

-#: lib/facebookclient.php:776
+#: lib/facebookclient.php:760
 msgid "Your Facebook connection has been removed"
 msgstr "S'ha eliminat la connexió amb el Facebook"

-#: lib/facebookclient.php:835
+#: lib/facebookclient.php:819
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr "Contacteu amb l'administrador de %s per recuperar el vostre compte"
@@ -62,22 +62,24 @@ msgstr "Contacteu amb l'administrador de %s per recuperar el vostre compte"
 msgid ""
 "You must be logged into Facebook to register a local account using Facebook."
 msgstr ""
+"Heu d'haver iniciat una sessió al Facebook per registrar un compte local "
+"fent servir el Facebook."

 #: actions/facebookfinishlogin.php:118
 msgid "There is already a local account linked with that Facebook account."
-msgstr ""
+msgstr "Ja hi ha un compte local enllaçat amb aquest compte del Facebook."

 #: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
 msgid "There was a problem with your session token. Try again, please."
-msgstr ""
+msgstr "S'ha produït un problema amb el testimoni de sessió. Proveu-ho de nou."

 #: actions/facebookfinishlogin.php:150
 msgid "You can't register if you don't agree to the license."
-msgstr ""
+msgstr "No podeu registrar-vos-hi si no accepteu la llicència."

 #: actions/facebookfinishlogin.php:167
 msgid "An unknown error has occured."
-msgstr ""
+msgstr "S'ha produït un error desconegut."

 #: actions/facebookfinishlogin.php:185
 #, php-format
@@ -86,16 +88,19 @@ msgid ""
 "Facebook to a local account. You can either create a new local account, or "
 "connect with an existing local account."
 msgstr ""
+"És la primera vegada que inicieu una sessió a %s, per tant, hem de connectar "
+"el vostre Facebook a un compte local. Podeu crear un compte local nou, o bé "
+"connectar-vos amb un compte ja existent."

 #. TRANS: Page title.
 #: actions/facebookfinishlogin.php:195
 msgid "Facebook Setup"
-msgstr ""
+msgstr "Configuració del Facebook"

 #. TRANS: Legend.
 #: actions/facebookfinishlogin.php:229
 msgid "Connection options"
-msgstr ""
+msgstr "Opcions de connexió"

 #. TRANS: %s is the name of the license used by the user for their status updates.
 #: actions/facebookfinishlogin.php:239
@@ -104,136 +109,143 @@ msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
+"El meu text i fitxers es troben disponibles sota %s excepte pel que fa a les "
+"dades privades: contrasenya, adreça electrònica, adreça de MI i número de "
+"telèfon."

 #. TRANS: Legend.
 #: actions/facebookfinishlogin.php:256
 msgid "Create new account"
-msgstr ""
+msgstr "Crea un compte nou"

 #: actions/facebookfinishlogin.php:258
 msgid "Create a new user with this nickname."
-msgstr ""
+msgstr "Crea un usuari nou amb aquest sobrenom"

 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:262
+#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
-msgstr ""
+msgstr "Nou sobrenom"

-#: actions/facebookfinishlogin.php:264
+#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
+msgstr "1-64 lletres en minúscules o nombres, sense puntuacions o espais"

 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:268
+#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Crea"

-#: actions/facebookfinishlogin.php:274
+#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Connecta el compte ja existent"

-#: actions/facebookfinishlogin.php:276
+#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
 msgstr ""
+"Si ja teniu un compte, inicieu una sessió amb el vostre nom d'usuari i "
+"contrasenya per connectar-lo al Facebook."

 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:280
+#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
-msgstr ""
+msgstr "ja existeix el sobrenom"

-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Contrasenya"

 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:287
+#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Connecta"

 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr "El registre no està permès"

 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:322
+#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "No és un codi d'invitació vàlid"

-#: actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "No es permet el sobrenom."

-#: actions/facebookfinishlogin.php:340
+#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "El sobrenom ja és en ús. Trieu-ne un altre."

-#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
-msgstr ""
+msgstr "S'ha produït un error en connectar l'usuari al Facebook."

-#: actions/facebookfinishlogin.php:468
+#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
-msgstr ""
+msgstr "Nom d'usuari o contrasenya no vàlids"

 #: actions/facebooklogin.php:43
 msgid "Already logged in."
-msgstr ""
+msgstr "Ja heu iniciat una sessió."

 #. TRANS: Instructions.
 #: actions/facebooklogin.php:52
 msgid "Login with your Facebook Account"
-msgstr ""
+msgstr "Inicieu una sessió amb el compte del Facebook"

 #. TRANS: Page title.
 #: actions/facebooklogin.php:67
 msgid "Login with Facebook"
-msgstr ""
+msgstr "Inicia una sessió amb el Facebook"

 #: actions/facebookadminpanel.php:52
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"

 #: actions/facebookadminpanel.php:62
 msgid "Facebook integration settings"
-msgstr ""
+msgstr "Paràmetres d'integració del Facebook"

 #: actions/facebookadminpanel.php:123
 msgid "Invalid Facebook ID. Max length is 255 characters."
-msgstr ""
+msgstr "L'ID del Facebook no és vàlid. La longitud màxima són 255 caràcters."

 #: actions/facebookadminpanel.php:129
 msgid "Invalid Facebook secret. Max length is 255 characters."
 msgstr ""
+"La clau secreta del Facebook no és vàlida. La longitud màxima són 255 "
+"caràcters."

 #: actions/facebookadminpanel.php:178
 msgid "Facebook application settings"
-msgstr ""
+msgstr "Paràmetres d'aplicació del Facebook"

 #: actions/facebookadminpanel.php:184
 msgid "Application ID"
-msgstr ""
+msgstr "ID de l'aplicació"

 #: actions/facebookadminpanel.php:185
 msgid "ID of your Facebook application"
-msgstr ""
+msgstr "ID de la vostra aplicació de Facebook"

 #: actions/facebookadminpanel.php:193
 msgid "Secret"
-msgstr ""
+msgstr "Clau secreta"

 #: actions/facebookadminpanel.php:194
 msgid "Application secret"
-msgstr ""
+msgstr "Clau secreta de l'aplicació"

 #: actions/facebookadminpanel.php:210
 msgid "Save"
-msgstr ""
+msgstr "Desa"

 #: actions/facebookadminpanel.php:210
 msgid "Save Facebook settings"
@@ -241,15 +253,15 @@ msgstr "Desa els paràmetres del Facebook"

 #: actions/facebooksettings.php:137
 msgid "Connected Facebook user"
-msgstr ""
+msgstr "Usuari del Facebook connectat"

 #: actions/facebooksettings.php:164
 msgid "Publish my notices to Facebook."
-msgstr ""
+msgstr "Publica els meus avisos al Facebook."

 #: actions/facebooksettings.php:174
 msgid "Send \"@\" replies to Facebook."
-msgstr ""
+msgstr "Envia respostes amb «@» al Facebook."

 #. TRANS: Submit button to save synchronisation settings.
 #: actions/facebooksettings.php:183
@@ -260,7 +272,7 @@ msgstr "Desa"
 #. TRANS: Legend.
 #: actions/facebooksettings.php:192
 msgid "Disconnect my account from Facebook"
-msgstr ""
+msgstr "Desconnecta el meu compte del Facebook"

 #: actions/facebooksettings.php:199
 #, php-format
@@ -268,6 +280,8 @@ msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
 "a password](%s) first."
 msgstr ""
+"En desconnectar el Facebook serà impossible que inicieu una sessió! [set a "
+"password](%s) primer."

 #: actions/facebooksettings.php:213
 #, php-format
@@ -275,6 +289,8 @@ msgid ""
 "Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
 "password to log in."
 msgstr ""
+"Mantingueu el vostre compte %1$s però desconnecteu-vos del Facebook. Fareu "
+"servir la vostra contrasenya de %1$s per iniciar una sessió."

 #. TRANS: Submit button.
 #: actions/facebooksettings.php:220
@@ -284,17 +300,17 @@ msgstr "Desconnecta"

 #: actions/facebooksettings.php:243
 msgid "There was a problem saving your sync preferences."
-msgstr ""
+msgstr "S'ha produït un problema en desar les preferències de sincronització."

 #. TRANS: Confirmation that synchronisation settings have been saved into the system.
 #: actions/facebooksettings.php:246
 msgid "Sync preferences saved."
-msgstr ""
+msgstr "S'han desat les preferències de sincronització."

 #: actions/facebooksettings.php:260
 msgid "Couldn't delete link to Facebook."
-msgstr ""
+msgstr "No s'ha pogut eliminar l'enllaç al Facebook."

 #: actions/facebooksettings.php:264
 msgid "You have disconnected from Facebook."
-msgstr ""
+msgstr "Us heu desconnectat del Facebook."
--- a/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po
@@ -0,0 +1,318 @@
+# Translation of StatusNet - FacebookBridge to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FacebookBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07:53+0000\n"
+"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-01-29 22:24:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:226
+msgid "Login or register using Facebook"
+msgstr "Über Facebook anmelden oder registrieren"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:265
+msgid "Facebook integration configuration"
+msgstr "Konfiguration der Facebook-Integration"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#. TRANS: Page title for Facebook settings.
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
+msgid "Facebook settings"
+msgstr "Facebook-Einstellungen"
+
+#: FacebookBridgePlugin.php:570
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Ein Plugin zur Integration von StatusNet mit Facebook."
+
+#: lib/facebookclient.php:760
+msgid "Your Facebook connection has been removed"
+msgstr "Ihre Facebook-Verbindung wurde entfernt"
+
+#: lib/facebookclient.php:819
+#, php-format
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Kontaktiere den %s-Administrator um dein Konto zurück zu bekommen"
+
+#: actions/facebookfinishlogin.php:88
+msgid ""
+"You must be logged into Facebook to register a local account using Facebook."
+msgstr ""
+"Du musst bei Facebook angemeldet sein, um ein lokales Konto mit Facebook zu "
+"registrieren."
+
+#: actions/facebookfinishlogin.php:118
+msgid "There is already a local account linked with that Facebook account."
+msgstr ""
+"Es gibt bereits ein lokales Konto, das mit diesem Facebook-Konto verbunden "
+"ist."
+
+#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Es gab ein Problem mit deinem Sitzungstoken. Versuche es bitte erneut."
+
+#: actions/facebookfinishlogin.php:150
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+"Du kannst dich nicht registrieren, falls du die Lizenz nicht akzeptierst."
+
+#: actions/facebookfinishlogin.php:167
+msgid "An unknown error has occured."
+msgstr "Ein unbekannter Fehler ist aufgetreten."
+
+#: actions/facebookfinishlogin.php:185
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your "
+"Facebook to a local account. You can either create a new local account, or "
+"connect with an existing local account."
+msgstr ""
+"Dies ist das erste Mal, dass du dich bei %s angemeldet hast, also müssen wir "
+"Facebook mit deinem lokalen Konto verbinden. Du kannst entweder ein neues "
+"lokales Konto erstellen, oder mit einem bestehenden verbinden."
+
+#. TRANS: Page title.
+#: actions/facebookfinishlogin.php:195
+msgid "Facebook Setup"
+msgstr "Facebook-Einrichtung"
+
+#. TRANS: Legend.
+#: actions/facebookfinishlogin.php:229
+msgid "Connection options"
+msgstr "Verbindungsoptionen"
+
+#. TRANS: %s is the name of the license used by the user for their status updates.
+#: actions/facebookfinishlogin.php:239
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Mein Text und meine Dateien sind mit Ausnahme dieser privaten Daten unter %s "
+"verfügbar: Passwort, E-Mail-Adresse, IM-Adresse und Telefonnummer."
+
+#. TRANS: Legend.
+#: actions/facebookfinishlogin.php:256
+msgid "Create new account"
+msgstr "Neues Konto erstellen"
+
+#: actions/facebookfinishlogin.php:258
+msgid "Create a new user with this nickname."
+msgstr "Einen neuen Benutzer mit diesem Spitznamen erstellen."
+
+#. TRANS: Field label.
+#: actions/facebookfinishlogin.php:266
+msgid "New nickname"
+msgstr "Neuer Spitzname"
+
+#: actions/facebookfinishlogin.php:268
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1–64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen"
+
+#. TRANS: Submit button.
+#: actions/facebookfinishlogin.php:276
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Erstellen"
+
+#: actions/facebookfinishlogin.php:282
+msgid "Connect existing account"
+msgstr "Verbinde vorhandenes Konto"
+
+#: actions/facebookfinishlogin.php:284
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr ""
+"Falls de bereits ein Konto hast, melde dich mit deinem Benutzernamen und "
+"Passwort an, um es mit deinem Facebook zu verbinden."
+
+#. TRANS: Field label.
+#: actions/facebookfinishlogin.php:288
+msgid "Existing nickname"
+msgstr "Vorhandener Spitzname"
+
+#: actions/facebookfinishlogin.php:291
+msgid "Password"
+msgstr "Passwort"
+
+#. TRANS: Submit button.
+#: actions/facebookfinishlogin.php:295
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Verbinden"
+
+#. TRANS: Client error trying to register with registrations not allowed.
+#. TRANS: Client error trying to register with registrations 'invite only'.
+#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
+msgid "Registration not allowed."
+msgstr "Registrierung nicht erlaubt."
+
+#. TRANS: Client error trying to register with an invalid invitation code.
+#: actions/facebookfinishlogin.php:334
+msgid "Not a valid invitation code."
+msgstr "Ungültiger Einladungs-Code."
+
+#: actions/facebookfinishlogin.php:347
+msgid "Nickname not allowed."
+msgstr "Spitzname nicht erlaubt."
+
+#: actions/facebookfinishlogin.php:352
+msgid "Nickname already in use. Try another one."
+msgstr "Spitzname bereits vergeben. Versuche einen anderen."
+
+#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
+msgid "Error connecting user to Facebook."
+msgstr "Fehler bei der Verbindung des Benutzers zu Facebook."
+
+#: actions/facebookfinishlogin.php:482
+msgid "Invalid username or password."
+msgstr "Benutzername oder Kennwort ungültig."
+
+#: actions/facebooklogin.php:43
+msgid "Already logged in."
+msgstr "Bereits angemeldet."
+
+#. TRANS: Instructions.
+#: actions/facebooklogin.php:52
+msgid "Login with your Facebook Account"
+msgstr "Mit ihrem Facebook-Konto anmelden"
+
+#. TRANS: Page title.
+#: actions/facebooklogin.php:67
+msgid "Login with Facebook"
+msgstr "Mit Facebook anmelden"
+
+#: actions/facebookadminpanel.php:52
+msgid "Facebook"
+msgstr "Facebook"
+
+#: actions/facebookadminpanel.php:62
+msgid "Facebook integration settings"
+msgstr "Einstellungen der Facebook-Integration"
+
+#: actions/facebookadminpanel.php:123
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr "Ungültige Facebook-ID. Die maximale Länge beträgt 255 Zeichen."
+
+#: actions/facebookadminpanel.php:129
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr "Ungültiges Facebook-Geheimnis. Die maximale Länge beträgt 255 Zeichen."
+
+#: actions/facebookadminpanel.php:178
+msgid "Facebook application settings"
+msgstr "Einstellungen der Facebook-Anwendung"
+
+#: actions/facebookadminpanel.php:184
+msgid "Application ID"
+msgstr "Anwendungs-ID"
+
+#: actions/facebookadminpanel.php:185
+msgid "ID of your Facebook application"
+msgstr "ID ihrer Facebook-Anwendung"
+
+#: actions/facebookadminpanel.php:193
+msgid "Secret"
+msgstr "Geheimnis"
+
+#: actions/facebookadminpanel.php:194
+msgid "Application secret"
+msgstr "Anwendungs-Geheimnis"
+
+#: actions/facebookadminpanel.php:210
+msgid "Save"
+msgstr "Speichern"
+
+#: actions/facebookadminpanel.php:210
+msgid "Save Facebook settings"
+msgstr "Facebook-Einstellungen speichern"
+
+#: actions/facebooksettings.php:137
+msgid "Connected Facebook user"
+msgstr "Verbundene Facebook-Benuter"
+
+#: actions/facebooksettings.php:164
+msgid "Publish my notices to Facebook."
+msgstr "Meine Nachrichten auf Facebook veröffentlichen."
+
+#: actions/facebooksettings.php:174
+msgid "Send \"@\" replies to Facebook."
+msgstr "\"@\"-Antworten zu Facebook senden."
+
+#. TRANS: Submit button to save synchronisation settings.
+#: actions/facebooksettings.php:183
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Speichern"
+
+#. TRANS: Legend.
+#: actions/facebooksettings.php:192
+msgid "Disconnect my account from Facebook"
+msgstr "Mein Konto von Facebook trennen"
+
+#: actions/facebooksettings.php:199
+#, php-format
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+"Die Trennung von Facebook würde es unmöglich machen, sich anzumelden! Bitte "
+"zuerst ein [Passwort setzen](%s)."
+
+#: actions/facebooksettings.php:213
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+"Du behältst dein %1$s-Konto, trennst es aber von Facebook. Du wirst dein %1"
+"$s-Passwort benutzen, um dich anzumelden."
+
+#. TRANS: Submit button.
+#: actions/facebooksettings.php:220
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Trennen"
+
+#: actions/facebooksettings.php:243
+msgid "There was a problem saving your sync preferences."
+msgstr ""
+"Es ist ein Problem beim Speichern ihrer Synchronisations-Einstellungen "
+"aufgetreten."
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+#: actions/facebooksettings.php:246
+msgid "Sync preferences saved."
+msgstr "Synchronisations-Einstellungen gespeichert."
+
+#: actions/facebooksettings.php:260
+msgid "Couldn't delete link to Facebook."
+msgstr "Konnte die Verbindung zu Facebook nicht löschen."
+
+#: actions/facebooksettings.php:264
+msgid "You have disconnected from Facebook."
+msgstr "Du bist nun nicht mehr mit Facebook verbunden."
--- a/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FacebookBridge to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:55+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07:53+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:24:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -23,37 +23,37 @@ msgstr ""

 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:201 FacebookBridgePlugin.php:240
-#: FacebookBridgePlugin.php:281
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:203
+#: FacebookBridgePlugin.php:226
 msgid "Login or register using Facebook"
 msgstr "Aperir session o crear conto usante Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:242
+#: FacebookBridgePlugin.php:265
 msgid "Facebook integration configuration"
 msgstr "Configuration del integration de Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Configuration de Facebook"

-#: FacebookBridgePlugin.php:547
+#: FacebookBridgePlugin.php:570
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Un plug-in pro integrar StatusNet con Facebook."

-#: lib/facebookclient.php:776
+#: lib/facebookclient.php:760
 msgid "Your Facebook connection has been removed"
 msgstr "Tu connexion a Facebook ha essite removite"

-#: lib/facebookclient.php:835
+#: lib/facebookclient.php:819
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr "Contacta le administrator de %s pro recuperar tu conto"
@@ -123,25 +123,25 @@ msgid "Create a new user with this nickname."
 msgstr "Crear un nove usator con iste pseudonymo."

 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:262
+#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Nove pseudonymo"

-#: actions/facebookfinishlogin.php:264
+#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 minusculas o numeros, sin punctuation o spatios"

 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:268
+#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Crear"

-#: actions/facebookfinishlogin.php:274
+#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Connecter conto existente"

-#: actions/facebookfinishlogin.php:276
+#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -150,44 +150,44 @@ msgstr ""
 "pro connecter lo a tu Facebook."

 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:280
+#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Pseudonymo existente"

-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Contrasigno"

 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:287
+#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Connecter"

 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr "Creation de conto non permittite."

 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:322
+#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "Le codice de invitation es invalide."

-#: actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Pseudonymo non permittite."

-#: actions/facebookfinishlogin.php:340
+#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."

-#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr "Error durante le connexion del usator a Facebook."

-#: actions/facebookfinishlogin.php:468
+#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."

@@ -282,7 +282,7 @@ msgstr ""
 "[defini un contrasigno](%s) primo."

 #: actions/facebooksettings.php:213
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
 "password to log in."
--- a/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FacebookBridge to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:55+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07:53+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:24:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -23,37 +23,37 @@ msgstr ""

 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:201 FacebookBridgePlugin.php:240
-#: FacebookBridgePlugin.php:281
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:203
+#: FacebookBridgePlugin.php:226
 msgid "Login or register using Facebook"
 msgstr "Најава или регистрација со Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:242
+#: FacebookBridgePlugin.php:265
 msgid "Facebook integration configuration"
 msgstr "Поставки за обединување со Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Поставки за Facebook"

-#: FacebookBridgePlugin.php:547
+#: FacebookBridgePlugin.php:570
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Приклучок за обединување на StatusNet со Facebook."

-#: lib/facebookclient.php:776
+#: lib/facebookclient.php:760
 msgid "Your Facebook connection has been removed"
 msgstr "Вашата врска со Facebook е отстранета"

-#: lib/facebookclient.php:835
+#: lib/facebookclient.php:819
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr "Контактирајте го администраторот на %s за да си ја повртатите сметката"
@@ -122,25 +122,25 @@ msgid "Create a new user with this nickname."
 msgstr "Создај нов корисник со овој прекар."

 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:262
+#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Нов прекар"

-#: actions/facebookfinishlogin.php:264
+#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 мали букви и бројки, без интерпункциски знаци и празни места"

 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:268
+#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Создај"

-#: actions/facebookfinishlogin.php:274
+#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Поврзи постоечка сметка"

-#: actions/facebookfinishlogin.php:276
+#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -149,44 +149,44 @@ msgstr ""
 "поврзете со профилот на Facebook."

 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:280
+#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Постоечки прекар"

-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Лозинка"

 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:287
+#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Поврзи"

 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr "Регистрирањето не е дозволено."

 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:322
+#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "Ова не е важечки код за покана."

-#: actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Прекарот не е дозволен."

-#: actions/facebookfinishlogin.php:340
+#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."

-#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr "Грешка при поврзувањето на корисникот со Facebook."

-#: actions/facebookfinishlogin.php:468
+#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Погрешно име или лозинка."

@@ -281,7 +281,7 @@ msgstr ""
 "најавувате! Најпрвин [ставете лозинка](%s)."

 #: actions/facebooksettings.php:213
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
 "password to log in."
--- a/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FacebookBridge to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07:53+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:24:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -23,37 +23,37 @@ msgstr ""

 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:201 FacebookBridgePlugin.php:240
-#: FacebookBridgePlugin.php:281
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:203
+#: FacebookBridgePlugin.php:226
 msgid "Login or register using Facebook"
 msgstr "Aanmelden of registreren via Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:242
+#: FacebookBridgePlugin.php:265
 msgid "Facebook integration configuration"
 msgstr "Instellingen voor Facebookintegratie"

 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Facebookinstellingen"

-#: FacebookBridgePlugin.php:547
+#: FacebookBridgePlugin.php:570
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Een plug-in voor het integreren van StatusNet met Facebook."

-#: lib/facebookclient.php:776
+#: lib/facebookclient.php:760
 msgid "Your Facebook connection has been removed"
 msgstr "Uw koppeling met Facebook is verwijderd"

-#: lib/facebookclient.php:835
+#: lib/facebookclient.php:819
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr ""
@@ -126,25 +126,25 @@ msgid "Create a new user with this nickname."
 msgstr "Nieuwe gebruiker aanmaken met deze gebruikersnaam."

 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:262
+#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Nieuwe gebruikersnaam"

-#: actions/facebookfinishlogin.php:264
+#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"

 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:268
+#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Aanmaken"

-#: actions/facebookfinishlogin.php:274
+#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Verbinden met een bestaande gebruiker"

-#: actions/facebookfinishlogin.php:276
+#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -153,45 +153,45 @@ msgstr ""
 "wachtwoord om deze daarna te koppelen met uw Facebookgebruiker."

 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:280
+#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Bestaande gebruikersnaam"

-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Wachtwoord"

 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:287
+#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Koppelen"

 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr "Registratie is niet toegestaan."

 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:322
+#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "De uitnodigingscode is ongeldig."

-#: actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Gebruikersnaam niet toegestaan."

-#: actions/facebookfinishlogin.php:340
+#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr ""
 "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."

-#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr "Fout bij het verbinden van de gebruiker met Facebook."

-#: actions/facebookfinishlogin.php:468
+#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."

@@ -286,7 +286,7 @@ msgstr ""
 "eerst een wachtwoord in](%s)."

 #: actions/facebooksettings.php:213
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
 "password to log in."
--- a/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FacebookBridge to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07:53+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:24:13+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -24,37 +24,37 @@ msgstr ""

 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
-#: FacebookBridgePlugin.php:201 FacebookBridgePlugin.php:240
-#: FacebookBridgePlugin.php:281
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:203
+#: FacebookBridgePlugin.php:226
 msgid "Login or register using Facebook"
 msgstr "Увійти або зареєструватись з Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:242
+#: FacebookBridgePlugin.php:265
 msgid "Facebook integration configuration"
 msgstr "Налаштування інтеграції з Facebook"

 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Налаштування Facebook"

-#: FacebookBridgePlugin.php:547
+#: FacebookBridgePlugin.php:570
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Додаток для інтеграції StatusNet з Facebook."

-#: lib/facebookclient.php:776
+#: lib/facebookclient.php:760
 msgid "Your Facebook connection has been removed"
 msgstr "З’єднання з Facebook було видалено"

-#: lib/facebookclient.php:835
+#: lib/facebookclient.php:819
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr "Зверніться до адміністратора %s, аби відновити свій обліковий запис"
@@ -123,26 +123,26 @@ msgid "Create a new user with this nickname."
 msgstr "Створити нового користувача з цим нікнеймом."

 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:262
+#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Новий псевдонім"

-#: actions/facebookfinishlogin.php:264
+#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"

 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:268
+#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Створити"

-#: actions/facebookfinishlogin.php:274
+#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Приєднати акаунт, який вже існує"

-#: actions/facebookfinishlogin.php:276
+#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -151,44 +151,44 @@ msgstr ""
 "приєднати їх до Facebook."

 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:280
+#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Нікнейм, який вже існує"

-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Пароль"

 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:287
+#: actions/facebookfinishlogin.php:295
 msgctxt "BUTTON"
 msgid "Connect"
 msgstr "Під’єднати"

 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
 msgid "Registration not allowed."
 msgstr "Реєстрацію не дозволено."

 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:322
+#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "Це не дійсний код запрошення."

-#: actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Нікнейм не допускається."

-#: actions/facebookfinishlogin.php:340
+#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім’я вже використовується. Спробуйте інше."

-#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr "Помилка при підключенні до Facebook."

-#: actions/facebookfinishlogin.php:468
+#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Недійсне ім’я або пароль."

@@ -284,7 +284,7 @@ msgstr ""
 "сервісу у майбутньому! Будь ласка, спочатку [встановіть пароль](%s)."

 #: actions/facebooksettings.php:213
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
 "password to log in."
--- a/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po
@@ -0,0 +1,301 @@
+# Translation of StatusNet - FacebookBridge to Simplified Chinese (‪中文(简体)‬)
+# Exported from translatewiki.net
+#
+# Author: Hydra
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FacebookBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:38:46+0000\n"
+"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"hans>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-02-23 21:16:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: zh-hans\n"
+"X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:226
+msgid "Login or register using Facebook"
+msgstr "登入或使用 Facebook 的注册"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:265
+msgid "Facebook integration configuration"
+msgstr "Facebook 整合配置"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#. TRANS: Page title for Facebook settings.
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
+msgid "Facebook settings"
+msgstr "Facebook 的设置"
+
+#: FacebookBridgePlugin.php:570
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "StatusNet 与结合 Facebook 的插件。"
+
+#: lib/facebookclient.php:760
+msgid "Your Facebook connection has been removed"
+msgstr "Facebook 的连接已被删除"
+
+#: lib/facebookclient.php:819
+#, php-format
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "与 %s 管理员联系，以检索您的帐户"
+
+#: actions/facebookfinishlogin.php:88
+msgid ""
+"You must be logged into Facebook to register a local account using Facebook."
+msgstr "您必须登录到 Facebook 注册使用 Facebook 的本地帐户。"
+
+#: actions/facebookfinishlogin.php:118
+msgid "There is already a local account linked with that Facebook account."
+msgstr "已存在与该 Facebook 帐户相关的本地帐户。"
+
+#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
+msgid "There was a problem with your session token. Try again, please."
+msgstr "有一个与您的会话令牌的问题。请再次尝试。"
+
+#: actions/facebookfinishlogin.php:150
+msgid "You can't register if you don't agree to the license."
+msgstr "如果您不同意该许可，您不能注册。"
+
+#: actions/facebookfinishlogin.php:167
+msgid "An unknown error has occured."
+msgstr "出现了一个未知的错误。"
+
+#: actions/facebookfinishlogin.php:185
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your "
+"Facebook to a local account. You can either create a new local account, or "
+"connect with an existing local account."
+msgstr ""
+
+#. TRANS: Page title.
+#: actions/facebookfinishlogin.php:195
+msgid "Facebook Setup"
+msgstr "Facebook 安装程序"
+
+#. TRANS: Legend.
+#: actions/facebookfinishlogin.php:229
+msgid "Connection options"
+msgstr "连接选项"
+
+#. TRANS: %s is the name of the license used by the user for their status updates.
+#: actions/facebookfinishlogin.php:239
+#, 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: Legend.
+#: actions/facebookfinishlogin.php:256
+msgid "Create new account"
+msgstr "创建新的帐户"
+
+#: actions/facebookfinishlogin.php:258
+msgid "Create a new user with this nickname."
+msgstr "此别名与创建新用户。"
+
+#. TRANS: Field label.
+#: actions/facebookfinishlogin.php:266
+msgid "New nickname"
+msgstr "新的昵称"
+
+#: actions/facebookfinishlogin.php:268
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 个小写字母或没有标点符号或空格的数字"
+
+#. TRANS: Submit button.
+#: actions/facebookfinishlogin.php:276
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "创建"
+
+#: actions/facebookfinishlogin.php:282
+msgid "Connect existing account"
+msgstr "连接现有的帐户"
+
+#: actions/facebookfinishlogin.php:284
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr "如果您已经有一个的帐户使用您的用户名和密码以连接到在 Facebook 的登录。"
+
+#. TRANS: Field label.
+#: actions/facebookfinishlogin.php:288
+msgid "Existing nickname"
+msgstr "现有的昵称"
+
+#: actions/facebookfinishlogin.php:291
+msgid "Password"
+msgstr "密码"
+
+#. TRANS: Submit button.
+#: actions/facebookfinishlogin.php:295
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "连接"
+
+#. TRANS: Client error trying to register with registrations not allowed.
+#. TRANS: Client error trying to register with registrations 'invite only'.
+#: actions/facebookfinishlogin.php:316 actions/facebookfinishlogin.php:326
+msgid "Registration not allowed."
+msgstr "不允许注册。"
+
+#. TRANS: Client error trying to register with an invalid invitation code.
+#: actions/facebookfinishlogin.php:334
+msgid "Not a valid invitation code."
+msgstr "不是一个有效的邀请代码。"
+
+#: actions/facebookfinishlogin.php:347
+msgid "Nickname not allowed."
+msgstr "不允许使用的昵称。"
+
+#: actions/facebookfinishlogin.php:352
+msgid "Nickname already in use. Try another one."
+msgstr "别名已在使用中。请尝试另一个。"
+
+#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
+msgid "Error connecting user to Facebook."
+msgstr "Facebook 中连接用户时出错。"
+
+#: actions/facebookfinishlogin.php:482
+msgid "Invalid username or password."
+msgstr "无效的用户名或密码。"
+
+#: actions/facebooklogin.php:43
+msgid "Already logged in."
+msgstr "已登录。"
+
+#. TRANS: Instructions.
+#: actions/facebooklogin.php:52
+msgid "Login with your Facebook Account"
+msgstr "与您的 Facebook 帐户登录"
+
+#. TRANS: Page title.
+#: actions/facebooklogin.php:67
+msgid "Login with Facebook"
+msgstr "使用 Facebook 登录"
+
+#: actions/facebookadminpanel.php:52
+msgid "Facebook"
+msgstr "Facebook"
+
+#: actions/facebookadminpanel.php:62
+msgid "Facebook integration settings"
+msgstr "Facebook 集成设置"
+
+#: actions/facebookadminpanel.php:123
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr "无效的 Facebook ID。最大长度为 255 个字符。"
+
+#: actions/facebookadminpanel.php:129
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr "无效的 Facebook 秘密。最大长度为 255 个字符。"
+
+#: actions/facebookadminpanel.php:178
+msgid "Facebook application settings"
+msgstr "Facebook 应用程序设置"
+
+#: actions/facebookadminpanel.php:184
+msgid "Application ID"
+msgstr "应用程序 ID"
+
+#: actions/facebookadminpanel.php:185
+msgid "ID of your Facebook application"
+msgstr "Facebook 应用程序的 ID"
+
+#: actions/facebookadminpanel.php:193
+msgid "Secret"
+msgstr "秘密"
+
+#: actions/facebookadminpanel.php:194
+msgid "Application secret"
+msgstr "应用程序的秘密"
+
+#: actions/facebookadminpanel.php:210
+msgid "Save"
+msgstr "保存"
+
+#: actions/facebookadminpanel.php:210
+msgid "Save Facebook settings"
+msgstr "保存的 Facebook 设置"
+
+#: actions/facebooksettings.php:137
+msgid "Connected Facebook user"
+msgstr "已连接的 Facebook 用户"
+
+#: actions/facebooksettings.php:164
+msgid "Publish my notices to Facebook."
+msgstr "将我的通知发布到 Facebook。"
+
+#: actions/facebooksettings.php:174
+msgid "Send \"@\" replies to Facebook."
+msgstr "发送 \"@\" Facebook 的答复。"
+
+#. TRANS: Submit button to save synchronisation settings.
+#: actions/facebooksettings.php:183
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "保存"
+
+#. TRANS: Legend.
+#: actions/facebooksettings.php:192
+msgid "Disconnect my account from Facebook"
+msgstr "从 Facebook 拔下我的账户"
+
+#: actions/facebooksettings.php:199
+#, php-format
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+
+#: actions/facebooksettings.php:213
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+
+#. TRANS: Submit button.
+#: actions/facebooksettings.php:220
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr ""
+
+#: actions/facebooksettings.php:243
+msgid "There was a problem saving your sync preferences."
+msgstr ""
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+#: actions/facebooksettings.php:246
+msgid "Sync preferences saved."
+msgstr ""
+
+#: actions/facebooksettings.php:260
+msgid "Couldn't delete link to Facebook."
+msgstr ""
+
+#: actions/facebooksettings.php:264
+msgid "You have disconnected from Facebook."
+msgstr ""