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/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -137,11 +137,11 @@ class TwitterBridgePlugin extends Plugin
    /*
     * Add a login tab for 'Sign in with Twitter'
     *
-     * @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');

@@ -160,11 +160,11 @@ class TwitterBridgePlugin extends Plugin
    /**
     * Add the Twitter Settings page to the Connect Settings menu
     *
-     * @param Action &$action The calling page
+     * @param Action $action The calling page
     *
     * @return boolean hook return
     */
-    function onEndConnectSettingsNav(&$action)
+    function onEndConnectSettingsNav($action)
    {
        if (self::hasKeys()) {
            $action_name = $action->trimmed('action');
--- a/plugins/TwitterBridge/locale/TwitterBridge.pot
+++ b/plugins/TwitterBridge/locale/TwitterBridge.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"
@@ -23,11 +23,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr ""

-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr ""

-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -208,66 +208,66 @@ msgstr ""
 msgid "Create a new user with this nickname."
 msgstr ""

-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr ""

-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""

-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr ""

-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr ""

-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
 msgstr ""

-#: twitterauthorization.php:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr ""

-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr ""

-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr ""

-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr ""

-#: twitterauthorization.php:439
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr ""

-#: twitterauthorization.php:452
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr ""

-#: twitterauthorization.php:457
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr ""

-#: twitterauthorization.php:472
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr ""

-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr ""

-#: twitterauthorization.php:503
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr ""

--- a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge 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 - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:10+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10:26+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:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:14+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-twitterbridge\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"

-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr ""

-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -55,11 +55,11 @@ msgstr "Twitter"

 #: TwitterBridgePlugin.php:152
 msgid "Login or register using Twitter"
-msgstr ""
+msgstr "Kevreañ pe en em enskrivañ dre Twitter"

 #: TwitterBridgePlugin.php:175
 msgid "Twitter integration options"
-msgstr ""
+msgstr "Dibarzhioù enframmañ Twitter"

 #: TwitterBridgePlugin.php:303
 msgid "Twitter bridge configuration"
@@ -213,66 +213,66 @@ msgstr "Krouiñ ur gont nevez"
 msgid "Create a new user with this nickname."
 msgstr "Krouiñ un implijer nevez gant al lesanv-se."

-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Lesanv nevez"

-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""

-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Krouiñ"

-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Kevreañ d'ur gont a zo dioutañ"

-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
 msgstr ""

-#: twitterauthorization.php:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Lesanv a zo dioutañ"

-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Ger-tremen"

-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Kevreañ"

-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "N'eo ket aotreet krouiñ kontoù."

-#: twitterauthorization.php:439
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr ""

-#: twitterauthorization.php:452
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "Lesanv nann-aotreet."

-#: twitterauthorization.php:457
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."

-#: twitterauthorization.php:472
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr ""

-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr ""

-#: twitterauthorization.php:503
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Anv implijer pe ger-tremen direizh."

--- a/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Catalan (Català)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toniher
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:10+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10:26+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:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:14+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-twitterbridge\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"

-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "S'ha inhabilitat el vostre pont del Twitter."

-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -239,23 +239,23 @@ msgstr "Crea un compte nou"
 msgid "Create a new user with this nickname."
 msgstr "Crea un usuari nom amb aquest sobrenom."

-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Nou sobrenom"

-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 lletres en minúscules o nombres, sense puntuació o espais"

-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Crea"

-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Connecta un compte ja existent"

-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
@@ -263,44 +263,44 @@ msgstr ""
 "Si ja teniu un compte, inicieu una sessió amb el vostre usuari i contrasenya "
 "per connectar-lo al vostre compte del Twitter."

-#: twitterauthorization.php:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Sobrenom ja existent"

-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Contrasenya"

-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Connecta"

-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "No es permet el registre."

-#: twitterauthorization.php:439
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "No és un codi d'invitació vàlid."

-#: twitterauthorization.php:452
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "El sobrenom no és permès."

-#: twitterauthorization.php:457
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "El sobrenom ja és en ús. Proveu-ne un altre."

-#: twitterauthorization.php:472
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "Error en registrar l'usuari."

-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr "Error en connectar l'usuari al Twitter."

-#: twitterauthorization.php:503
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Nom d'usuari o contrasenya no vàlida."

--- a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Persian (فارسی)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Mjbmr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:10+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10:26+0000\n"
 "Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:14+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: fa\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr ""

-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "پل توییتر شما غیر فعال شده است."

-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -213,66 +213,66 @@ msgstr "ایجاد حساب کاربری جدید"
 msgid "Create a new user with this nickname."
 msgstr "ایجاد یک کاربر جدید با این نام مستعار."

-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "نام مستعار جدید"

-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""

-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "ایجاد"

-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "اتصال به حساب کاربری موجود"

-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
 msgstr ""

-#: twitterauthorization.php:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "نام مستعار موجود"

-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "رمز عبور"

-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "اتصال"

-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "اجازهٔ ثبت‌نام داده نشده است."

-#: twitterauthorization.php:439
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "کد دعوت نامعتبر است."

-#: twitterauthorization.php:452
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "نام مستعار مجاز نیست."

-#: twitterauthorization.php:457
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "این نام مستعار در حال حاضر مورد استفاده است. یکی دیگر را بیازمایید."

-#: twitterauthorization.php:472
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "خطا در ثبت نام کاربر."

-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr "خطا در اتصال کاربر به توییتر."

-#: twitterauthorization.php:503
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "نام کاربری یا رمز عبور اشتباه است."

--- a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10:26+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:14+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: fr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -29,11 +29,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"

-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Votre passerelle Twitter a été désactivée."

-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -243,23 +243,23 @@ msgstr "Créer un nouveau compte"
 msgid "Create a new user with this nickname."
 msgstr "Créer un nouvel utilisateur avec ce pseudonyme."

-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Nouveau pseudonyme"

-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"

-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Créer"

-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Se connecter à un compte existant"

-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
@@ -267,44 +267,44 @@ msgstr ""
 "Si vous avez déjà un compte ici, connectez-vous avec votre nom d’utilisateur "
 "et mot de passe pour l’associer à votre compte Twitter."

-#: twitterauthorization.php:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Pseudonyme existant"

-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Mot de passe"

-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Connexion"

-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "Inscription non autorisée."

-#: twitterauthorization.php:439
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "Le code d’invitation n’est pas valide."

-#: twitterauthorization.php:452
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "Pseudonyme non autorisé."

-#: twitterauthorization.php:457
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."

-#: twitterauthorization.php:472
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "Erreur lors de l’inscription de l’utilisateur."

-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr "Erreur de connexion de l’utilisateur à Twitter."

-#: twitterauthorization.php:503
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Nom d’utilisateur ou mot de passe incorrect."

--- a/plugins/TwitterBridge/locale/gl/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/gl/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34:14+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
--- a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10:26+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:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:14+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-twitterbridge\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"

-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Tu ponte a Twitter ha essite disactivate."

-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -234,23 +234,23 @@ msgstr "Crear nove conto"
 msgid "Create a new user with this nickname."
 msgstr "Crear un nove usator con iste pseudonymo."

-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Nove pseudonymo"

-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 minusculas o numeros, sin punctuation o spatios"

-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Crear"

-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Connecter conto existente"

-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
@@ -258,44 +258,44 @@ msgstr ""
 "Si tu ha jam un conto, aperi session con tu nomine de usator e contrasigno "
 "pro connecter lo a tu conto de Twitter."

-#: twitterauthorization.php:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Pseudonymo existente"

-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Contrasigno"

-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Connecter"

-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "Creation de conto non permittite."

-#: twitterauthorization.php:439
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "Le codice de invitation es invalide."

-#: twitterauthorization.php:452
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "Pseudonymo non permittite."

-#: twitterauthorization.php:457
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."

-#: twitterauthorization.php:472
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "Error durante le registration del usator."

-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr "Error durante le connexion del usator a Twitter."

-#: twitterauthorization.php:503
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."

--- a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10:26+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:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:14+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-twitterbridge\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"

-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Вашиот мост до Twitter е оневозможен."

-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -236,23 +236,23 @@ msgstr "Создај нова сметка"
 msgid "Create a new user with this nickname."
 msgstr "Создај нов корисник со овој прекар."

-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Нов прекар"

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

-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Создај"

-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Поврзи постоечка сметка"

-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
@@ -260,44 +260,44 @@ msgstr ""
 "Ако веќе имате сметка, најавете се со корисничкото име и лозинката за да ја "
 "поврзете со профилот на Twitter."

-#: twitterauthorization.php:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Постоечки прекар"

-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Лозинка"

-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Поврзи се"

-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "Регистрацијата не е дозволена."

-#: twitterauthorization.php:439
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "Ова не е важечки код за покана."

-#: twitterauthorization.php:452
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "Прекарот не е дозволен."

-#: twitterauthorization.php:457
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "Прекарот е зафатен. Одберете друг."

-#: twitterauthorization.php:472
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "Грешка при регистрирање на корисникот."

-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr "Грешка при поврзувањето на корисникот со Twitter."

-#: twitterauthorization.php:503
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Неважечко корисничко име или лозинка."

@@ -333,7 +333,7 @@ msgstr ""

 #: twittersettings.php:136
 msgid "set a password"
-msgstr "поставете лозинка"
+msgstr "ставете лозинка"

 #: twittersettings.php:138
 msgid " first."
--- a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10:26+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:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:14+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-twitterbridge\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"

-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Uw koppeling naar Twitter is uitgeschakeld."

-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -241,23 +241,23 @@ msgstr "Nieuwe gebruiker aanmaken"
 msgid "Create a new user with this nickname."
 msgstr "Nieuwe gebruiker aanmaken met deze gebruikersnaam."

-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Nieuwe gebruikersnaam"

-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"

-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Aanmaken"

-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Verbinden met een bestaande gebruiker"

-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
@@ -265,45 +265,45 @@ msgstr ""
 "Als u al een gebruiker hebt, meld dan aan met uw gebruikersnaam en "
 "wachtwoord om deze daarna te koppelen met uw Twittergebruiker."

-#: twitterauthorization.php:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Bestaande gebruikersnaam"

-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Wachtwoord"

-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Koppelen"

-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "Registratie is niet toegestaan."

-#: twitterauthorization.php:439
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "De uitnodigingscode is ongeldig."

-#: twitterauthorization.php:452
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "Gebruikersnaam niet toegestaan."

-#: twitterauthorization.php:457
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr ""
 "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."

-#: twitterauthorization.php:472
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "Fout bij het registreren van de gebruiker."

-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr "Fout bij het verbinden van de gebruiker met Twitter."

-#: twitterauthorization.php:503
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."

--- a/plugins/TwitterBridge/locale/ru/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ru/LC_MESSAGES/TwitterBridge.po
@@ -0,0 +1,372 @@
+# Translation of StatusNet - TwitterBridge to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: Lockal
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TwitterBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:24:58+0000\n"
+"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-01-14 13:22:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
+#: twitterimport.php:114
+#, php-format
+msgid "RT @%1$s %2$s"
+msgstr ""
+
+#: twitter.php:407
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: twitter.php:411
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. We no longer seem to have permission to update your Twitter "
+"status. Did you maybe revoke %3$s's access?\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s"
+msgstr ""
+
+#: TwitterBridgePlugin.php:151 TwitterBridgePlugin.php:174
+#: TwitterBridgePlugin.php:302 twitteradminpanel.php:52
+msgid "Twitter"
+msgstr "Twitter"
+
+#: TwitterBridgePlugin.php:152
+msgid "Login or register using Twitter"
+msgstr "Войти или зарегистрироваться с помощью Twitter"
+
+#: TwitterBridgePlugin.php:175
+msgid "Twitter integration options"
+msgstr "Настройки интеграции с Twitter"
+
+#: TwitterBridgePlugin.php:303
+msgid "Twitter bridge configuration"
+msgstr "Настройки моста с Twitter"
+
+#: TwitterBridgePlugin.php:327
+msgid ""
+"The Twitter \"bridge\" plugin allows integration of a StatusNet instance "
+"with <a href=\"http://twitter.com/\">Twitter</a>."
+msgstr ""
+
+#: twitteradminpanel.php:62
+msgid "Twitter bridge settings"
+msgstr ""
+
+#: twitteradminpanel.php:150
+msgid "Invalid consumer key. Max length is 255 characters."
+msgstr ""
+
+#: twitteradminpanel.php:156
+msgid "Invalid consumer secret. Max length is 255 characters."
+msgstr ""
+
+#: twitteradminpanel.php:212
+msgid "Twitter application settings"
+msgstr ""
+
+#: twitteradminpanel.php:218
+msgid "Consumer key"
+msgstr ""
+
+#: twitteradminpanel.php:219
+msgid "Consumer key assigned by Twitter"
+msgstr ""
+
+#: twitteradminpanel.php:227
+msgid "Consumer secret"
+msgstr ""
+
+#: twitteradminpanel.php:228
+msgid "Consumer secret assigned by Twitter"
+msgstr ""
+
+#: twitteradminpanel.php:238
+msgid "Note: a global consumer key and secret are set."
+msgstr ""
+
+#: twitteradminpanel.php:245
+msgid "Integration source"
+msgstr ""
+
+#: twitteradminpanel.php:246
+msgid "Name of your Twitter application"
+msgstr ""
+
+#: twitteradminpanel.php:258
+msgid "Options"
+msgstr ""
+
+#: twitteradminpanel.php:265
+msgid "Enable \"Sign-in with Twitter\""
+msgstr ""
+
+#: twitteradminpanel.php:267
+msgid "Allow users to login with their Twitter credentials"
+msgstr ""
+
+#: twitteradminpanel.php:274
+msgid "Enable Twitter import"
+msgstr ""
+
+#: twitteradminpanel.php:276
+msgid ""
+"Allow users to import their Twitter friends' timelines. Requires daemons to "
+"be manually configured."
+msgstr ""
+
+#: twitteradminpanel.php:293 twittersettings.php:200
+msgid "Save"
+msgstr "Сохранить"
+
+#: twitteradminpanel.php:293
+msgid "Save Twitter settings"
+msgstr "Сохранить настройки Twitter"
+
+#: twitterlogin.php:56
+msgid "Already logged in."
+msgstr "Вы уже авторизовались."
+
+#: twitterlogin.php:64
+msgid "Twitter Login"
+msgstr ""
+
+#: twitterlogin.php:69
+msgid "Login with your Twitter account"
+msgstr "Войти с помощью учётной записи Twitter"
+
+#: twitterlogin.php:87
+msgid "Sign in with Twitter"
+msgstr ""
+
+#: twitterauthorization.php:120 twittersettings.php:226
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: twitterauthorization.php:126
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: twitterauthorization.php:135
+msgid "Something weird happened."
+msgstr ""
+
+#: twitterauthorization.php:181 twitterauthorization.php:229
+#: twitterauthorization.php:300
+msgid "Couldn't link your Twitter account."
+msgstr ""
+
+#: twitterauthorization.php:201
+msgid "Couldn't link your Twitter account: oauth_token mismatch."
+msgstr ""
+
+#: twitterauthorization.php:312
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your Twitter "
+"account to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+
+#: twitterauthorization.php:318
+msgid "Twitter Account Setup"
+msgstr ""
+
+#: twitterauthorization.php:351
+msgid "Connection options"
+msgstr ""
+
+#: twitterauthorization.php:360
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+
+#: twitterauthorization.php:381
+msgid "Create new account"
+msgstr ""
+
+#: twitterauthorization.php:383
+msgid "Create a new user with this nickname."
+msgstr ""
+
+#: twitterauthorization.php:386
+msgid "New nickname"
+msgstr ""
+
+#: twitterauthorization.php:388
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#: twitterauthorization.php:391
+msgid "Create"
+msgstr ""
+
+#: twitterauthorization.php:396
+msgid "Connect existing account"
+msgstr ""
+
+#: twitterauthorization.php:398
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+
+#: twitterauthorization.php:401
+msgid "Existing nickname"
+msgstr ""
+
+#: twitterauthorization.php:404
+msgid "Password"
+msgstr ""
+
+#: twitterauthorization.php:407
+msgid "Connect"
+msgstr ""
+
+#: twitterauthorization.php:423 twitterauthorization.php:432
+msgid "Registration not allowed."
+msgstr ""
+
+#: twitterauthorization.php:439
+msgid "Not a valid invitation code."
+msgstr ""
+
+#: twitterauthorization.php:452
+msgid "Nickname not allowed."
+msgstr ""
+
+#: twitterauthorization.php:457
+msgid "Nickname already in use. Try another one."
+msgstr ""
+
+#: twitterauthorization.php:472
+msgid "Error registering user."
+msgstr ""
+
+#: twitterauthorization.php:483 twitterauthorization.php:521
+#: twitterauthorization.php:541
+msgid "Error connecting user to Twitter."
+msgstr ""
+
+#: twitterauthorization.php:503
+msgid "Invalid username or password."
+msgstr ""
+
+#: twittersettings.php:58
+msgid "Twitter settings"
+msgstr ""
+
+#: twittersettings.php:69
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+
+#: twittersettings.php:116
+msgid "Twitter account"
+msgstr ""
+
+#: twittersettings.php:121
+msgid "Connected Twitter account"
+msgstr ""
+
+#: twittersettings.php:126
+msgid "Disconnect my account from Twitter"
+msgstr ""
+
+#: twittersettings.php:132
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+
+#: twittersettings.php:136
+msgid "set a password"
+msgstr ""
+
+#: twittersettings.php:138
+msgid " first."
+msgstr ""
+
+#. TRANS: %1$s is the current website name.
+#: twittersettings.php:142
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Twitter. You can use your %1$s "
+"password to log in."
+msgstr ""
+
+#: twittersettings.php:150
+msgid "Disconnect"
+msgstr ""
+
+#: twittersettings.php:157
+msgid "Preferences"
+msgstr ""
+
+#: twittersettings.php:161
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: twittersettings.php:168
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: twittersettings.php:175
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: twittersettings.php:184
+msgid "Import my friends timeline."
+msgstr ""
+
+#: twittersettings.php:202
+msgid "Add"
+msgstr "Добавить"
+
+#: twittersettings.php:236
+msgid "Unexpected form submission."
+msgstr ""
+
+#: twittersettings.php:251
+msgid "No Twitter connection to remove."
+msgstr ""
+
+#: twittersettings.php:259
+msgid "Couldn't remove Twitter user."
+msgstr "Ошибка при удалении пользователя Twitter."
+
+#: twittersettings.php:263
+msgid "Twitter account disconnected."
+msgstr "Учётная запись в Twitter отключена."
+
+#: twittersettings.php:283 twittersettings.php:294
+msgid "Couldn't save Twitter preferences."
+msgstr "Ошибка при сохранении настроек Twitter."
+
+#: twittersettings.php:302
+msgid "Twitter preferences saved."
+msgstr "Настройки Twitter сохранены."
--- a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Turkish (Türkçe)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Maidis
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10:26+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:14+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: tr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr ""

-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr ""

-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -218,25 +218,25 @@ msgstr "Yeni hesap oluştur"
 msgid "Create a new user with this nickname."
 msgstr "Bu kullanıcı adıyla yeni bir kullanıcı oluştur."

-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Yeni kullanıcı adı"

-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 tane küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
 "verilmez"

-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Oluştur"

-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Varolan hesaba bağlan"

-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
@@ -244,44 +244,44 @@ msgstr ""
 "Halihazırda bir hesabınız varsa, Twitter hesabınızla bağlantı kurmak için "
 "kullanıcı adı ve parolanızla giriş yapın."

-#: twitterauthorization.php:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Varolan kullanıcı adı"

-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Parola"

-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Bağlan"

-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "Kayıt yapılmasına izin verilmiyor."

-#: twitterauthorization.php:439
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "Geçerli bir davet kodu değil."

-#: twitterauthorization.php:452
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "Bu kullanıcı adına izin verilmiyor."

-#: twitterauthorization.php:457
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "Kullanıcı adı halihazırda kullanılıyor. Başka bir tane deneyin."

-#: twitterauthorization.php:472
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "Kullanıcı kayıt hatası."

-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr "Twitter'a kullanıcı bağlama hatası."

-#: twitterauthorization.php:503
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Geçersiz kullanıcı adı veya parola."

--- a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10:26+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:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:14+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-twitterbridge\n"
@@ -29,11 +29,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"

-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Ваш місток до Twitter було відключено."

-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -237,24 +237,24 @@ msgstr "Створити новий акаунт"
 msgid "Create a new user with this nickname."
 msgstr "Створити нового користувача з цим нікнеймом."

-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Новий нікнейм"

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

-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Створити"

-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Приєднати акаунт, який вже існує"

-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
@@ -262,44 +262,44 @@ msgstr ""
 "Якщо ви вже маєте акаунт, увійдіть з вашим ім’ям користувача та паролем, аби "
 "приєднати їх до Twitter."

-#: twitterauthorization.php:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Нікнейм, який вже існує"

-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Пароль"

-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Під’єднати"

-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "Реєстрацію не дозволено."

-#: twitterauthorization.php:439
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "Це не дійсний код запрошення."

-#: twitterauthorization.php:452
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "Нікнейм не допускається."

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

-#: twitterauthorization.php:472
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "Помилка при реєстрації користувача."

-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr "Помилка при підключенні користувача до Twitter."

-#: twitterauthorization.php:503
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Недійсне ім’я або пароль."

--- a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: PhiLiP
 # Author: ZhengYiFeng
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10:27+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: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:29:14+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: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -30,11 +30,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"

-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "你的 Twitter bridge 已被禁用。"

-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
@@ -230,66 +230,66 @@ msgstr "创建新帐户"
 msgid "Create a new user with this nickname."
 msgstr "以此昵称创建新帐户"

-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "新昵称"

-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 到 64 个小写字母或数字，不包含标点或空格"

-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "创建"

-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "关联现有账号"

-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
 msgstr "如果你已有帐号，请输入用户名和密码登录并将其与你的 Twitter 账号关联。"

-#: twitterauthorization.php:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "已存在的昵称"

-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "密码"

-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "关联"

-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "不允许注册。"

-#: twitterauthorization.php:439
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "无效的邀请码。"

-#: twitterauthorization.php:452
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "昵称不被允许。"

-#: twitterauthorization.php:457
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"

-#: twitterauthorization.php:472
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "注册用户出错。"

-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr "关联用户到 Twitter 出错。"

-#: twitterauthorization.php:503
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"

--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -45,7 +45,7 @@ function add_twitter_user($twitter_id, $screen_name)
    $fuser = new Foreign_user();

    $fuser->nickname = $screen_name;
-    $fuser->uri = 'http://twitter.com/#!/' . $screen_name;
+    $fuser->uri = 'http://twitter.com/' . $screen_name;
    $fuser->id = $twitter_id;
    $fuser->service = TWITTER_SERVICE;
    $fuser->created = common_sql_now();
@@ -173,18 +173,20 @@ function broadcast_twitter($notice)

    // Don't bother with basic auth, since it's no longer allowed
    if (!empty($flink) && TwitterOAuthClient::isPackedToken($flink->credentials)) {
-        if (!empty($notice->repeat_of) && is_twitter_notice($notice->repeat_of)) {
-            $retweet = retweet_notice($flink, Notice::staticGet('id', $notice->repeat_of));
-            if (is_object($retweet)) {
-                Notice_to_status::saveNew($notice->id, twitter_id($retweet));
-                return true;
+        if (is_twitter_bound($notice, $flink)) {
+            if (!empty($notice->repeat_of) && is_twitter_notice($notice->repeat_of)) {
+                $retweet = retweet_notice($flink, Notice::staticGet('id', $notice->repeat_of));
+                if (is_object($retweet)) {
+                    Notice_to_status::saveNew($notice->id, twitter_id($retweet));
+                    return true;
+                } else {
+                    // Our error processing will have decided if we need to requeue
+                    // this or can discard safely.
+                    return $retweet;
+                }
            } else {
-                // Our error processing will have decided if we need to requeue
-                // this or can discard safely.
-                return $retweet;
+                return broadcast_oauth($notice, $flink);
            }
-        } else if (is_twitter_bound($notice, $flink)) {
-            return broadcast_oauth($notice, $flink);
        }
    }

--- a/plugins/TwitterBridge/twitterauthorization.php
+++ b/plugins/TwitterBridge/twitterauthorization.php
@@ -241,7 +241,7 @@ class TwitterauthorizationAction extends Action

            $this->twuid = $twitter_user->id;
            $this->tw_fields = array("screen_name" => $twitter_user->screen_name,
-                                     "name" => $twitter_user->name);
+                                     "fullname" => $twitter_user->name);
            $this->access_token = $atok;
            $this->tryLogin();
        }
@@ -373,7 +373,7 @@ class TwitterauthorizationAction extends Action
        $this->hidden('access_token_secret', $this->access_token->secret);
        $this->hidden('twuid', $this->twuid);
        $this->hidden('tw_fields_screen_name', $this->tw_fields['screen_name']);
-        $this->hidden('tw_fields_name', $this->tw_fields['name']);
+        $this->hidden('tw_fields_name', $this->tw_fields['fullname']);

        $this->elementStart('fieldset');
        $this->hidden('token', common_session_token());
@@ -382,11 +382,24 @@ class TwitterauthorizationAction 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');
        $this->input('newname', _m('New nickname'),
                     ($this->username) ? $this->username : '',
                     _m('1-64 lowercase letters or numbers, no punctuation or spaces'));
        $this->elementEnd('li');
+        $this->elementStart('li');
+        $this->input('email', _('Email'), $this->getEmail(),
+                     _('Used only for updates, announcements, '.
+                       'and password recovery'));
+        $this->elementEnd('li');
+
+        // Hook point for captcha etc
+        Event::handle('EndRegistrationFormData', array($this));
+
        $this->elementEnd('ul');
        $this->submit('create', _m('Create'));
        $this->elementEnd('fieldset');
@@ -411,6 +424,32 @@ class TwitterauthorizationAction extends Action
        $this->elementEnd('form');
    }

+    /**
+     * Get specified e-mail from the form, or the invite code.
+     *
+     * @return string
+     */
+    function getEmail()
+    {
+        $email = $this->trimmed('email');
+        if (!empty($email)) {
+            return $email;
+        }
+
+        // Terrible hack for invites...
+        if (common_config('site', 'inviteonly')) {
+            $code = $_SESSION['invitecode'];
+            if ($code) {
+                $invite = Invitation::staticGet($code);
+
+                if ($invite && $invite->address_type == 'email') {
+                    return $invite->address;
+                }
+            }
+        }
+        return '';
+    }
+
    function message($msg)
    {
        $this->message_text = $msg;
@@ -419,6 +458,10 @@ class TwitterauthorizationAction extends Action

    function createNewUser()
    {
+        if (!Event::handle('StartRegistrationTry', array($this))) {
+            return;
+        }
+
        if (common_config('site', 'closed')) {
            $this->clientError(_m('Registration not allowed.'));
            return;
@@ -458,7 +501,7 @@ class TwitterauthorizationAction extends Action
            return;
        }

-        $fullname = trim($this->tw_fields['name']);
+        $fullname = trim($this->tw_fields['fullname']);

        $args = array('nickname' => $nickname, 'fullname' => $fullname);

@@ -466,6 +509,11 @@ class TwitterauthorizationAction extends Action
            $args['code'] = $invite->code;
        }

+        $email = $this->getEmail();
+        if (!empty($email)) {
+            $args['email'] = $email;
+        }
+
        $user = User::register($args);

        if (empty($user)) {
@@ -490,6 +538,8 @@ class TwitterauthorizationAction extends Action
        common_debug('TwitterBridge Plugin - ' .
                     "Registered new user $user->id from Twitter user $this->twuid");

+        Event::handle('EndRegistrationTry', array($this));
+
        common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)),
                        303);
    }
@@ -596,8 +646,8 @@ class TwitterauthorizationAction extends Action

    function bestNewNickname()
    {
-        if (!empty($this->tw_fields['name'])) {
-            $nickname = $this->nicknamize($this->tw_fields['name']);
+        if (!empty($this->tw_fields['fullname'])) {
+            $nickname = $this->nicknamize($this->tw_fields['fullname']);
            if ($this->isNewNickname($nickname)) {
                return $nickname;
            }
--- a/plugins/TwitterBridge/twitterimport.php
+++ b/plugins/TwitterBridge/twitterimport.php
@@ -264,7 +264,7 @@ class TwitterImport
    function ensureProfile($user)
    {
        // check to see if there's already a profile for this user
-        $profileurl = 'http://twitter.com/#!/' . $user->screen_name;
+        $profileurl = 'http://twitter.com/' . $user->screen_name;
        $profile = $this->getProfileByUrl($user->screen_name, $profileurl);

        if (!empty($profile)) {
@@ -554,8 +554,8 @@ class TwitterImport
        }

        // Move all the entities into order so we can
-        // replace them in reverse order and thus
-        // not mess up their indices
+        // replace them and escape surrounding plaintext
+        // in order

        $toReplace = array();

@@ -577,56 +577,85 @@ class TwitterImport
            }
        }

-        // sort in reverse order by key
+        // sort in forward order by key

-        krsort($toReplace);
+        ksort($toReplace);
+
+        $result = '';
+        $cursor = 0;

        foreach ($toReplace as $part) {
            list($type, $object) = $part;
+            $start = $object->indices[0];
+            $end = $object->indices[1];
+            if ($cursor < $start) {
+                // Copy in the preceding plaintext
+                $result .= $this->twitEscape(mb_substr($text, $cursor, $start - $cursor));
+                $cursor = $start;
+            }
+            $orig = $this->twitEscape(mb_substr($text, $start, $end - $start));
            switch($type) {
            case self::URL:
-                $linkText = $this->makeUrlLink($object);
+                $linkText = $this->makeUrlLink($object, $orig);
                break;
            case self::HASHTAG:
-                $linkText = $this->makeHashtagLink($object);
+                $linkText = $this->makeHashtagLink($object, $orig);
                break;
            case self::MENTION:
-                $linkText = $this->makeMentionLink($object);
+                $linkText = $this->makeMentionLink($object, $orig);
                break;
            default:
+                $linkText = $orig;
                continue;
            }
-            $text = mb_substr($text, 0, $object->indices[0]) . $linkText . mb_substr($text, $object->indices[1]);
+            $result .= $linkText;
+            $cursor = $end;
        }
-        return $text;
+        $last = $this->twitEscape(mb_substr($text, $cursor));
+        $result .= $last;
+
+        return $result;
    }

-    function makeUrlLink($object)
+    function twitEscape($str)
    {
-        return "<a href='{$object->url}' class='extlink'>{$object->url}</a>";
+        // Twitter seems to preemptive turn < and > into &lt; and &gt;
+        // but doesn't for &, so while you may have some magic protection
+        // against XSS by not bothing to escape manually, you still get
+        // invalid XHTML. Thanks!
+        //
+        // Looks like their web interface pretty much sends anything
+        // through intact, so.... to do equivalent, decode all entities
+        // and then re-encode the special ones.
+        return htmlspecialchars(html_entity_decode($str, ENT_COMPAT, 'UTF-8'));
    }

-    function makeHashtagLink($object)
+    function makeUrlLink($object, $orig)
    {
-        return "#" . self::tagLink($object->text);
+        return "<a href='{$object->url}' class='extlink'>{$orig}</a>";
    }

-    function makeMentionLink($object)
+    function makeHashtagLink($object, $orig)
    {
-        return "@".self::atLink($object->screen_name, $object->name);
+        return "#" . self::tagLink($object->text, substr($orig, 1));
    }

-    static function tagLink($tag)
+    function makeMentionLink($object, $orig)
    {
-        return "<a href='https://search.twitter.com/search?q=%23{$tag}' class='hashtag'>{$tag}</a>";
+        return "@".self::atLink($object->screen_name, $object->name, substr($orig, 1));
    }

-    static function atLink($screenName, $fullName=null)
+    static function tagLink($tag, $orig)
+    {
+        return "<a href='https://search.twitter.com/search?q=%23{$tag}' class='hashtag'>{$orig}</a>";
+    }
+
+    static function atLink($screenName, $fullName, $orig)
    {
        if (!empty($fullName)) {
-            return "<a href='http://twitter.com/#!/{$screenName}' title='{$fullName}'>{$screenName}</a>";
+            return "<a href='http://twitter.com/#!/{$screenName}' title='{$fullName}'>{$orig}</a>";
        } else {
-            return "<a href='http://twitter.com/#!/{$screenName}'>{$screenName}</a>";
+            return "<a href='http://twitter.com/#!/{$screenName}'>{$orig}</a>";
        }
    }

@@ -646,6 +675,7 @@ class TwitterImport
                    $reply = new Reply();
                    $reply->notice_id  = $notice->id;
                    $reply->profile_id = $user->id;
+                    $reply->modified   = $notice->created;
                    common_log(LOG_INFO, __METHOD__ . ": saving reply: notice {$notice->id} to profile {$user->id}");
                    $id = $reply->insert();
                }
--- a/plugins/TwitterBridge/twitterlogin.php
+++ b/plugins/TwitterBridge/twitterlogin.php
@@ -83,7 +83,7 @@ class TwitterloginAction extends Action
        $this->elementStart('a', array('href' => common_local_url('twitterauthorization',
                                                                  null,
                                                                  array('signin' => true))));
-        $this->element('img', array('src' => common_path('plugins/TwitterBridge/Sign-in-with-Twitter-lighter.png'),
+        $this->element('img', array('src' => Plugin::staticPath('TwitterBridge', 'Sign-in-with-Twitter-lighter.png'),
                                    'alt' => _m('Sign in with Twitter')));
        $this->elementEnd('a');
    }