summaryrefslogtreecommitdiff
path: root/plugins/Facebook
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Facebook')
-rw-r--r--plugins/Facebook/FBConnectAuth.php15
-rw-r--r--plugins/Facebook/facebookaction.php2
-rw-r--r--plugins/Facebook/locale/Facebook.pot14
-rw-r--r--plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po26
-rw-r--r--plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po24
-rw-r--r--plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po25
-rw-r--r--plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po23
-rw-r--r--plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po31
-rw-r--r--plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po27
-rw-r--r--plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po540
-rw-r--r--plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po23
17 files changed, 714 insertions, 198 deletions
diff --git a/plugins/Facebook/FBConnectAuth.php b/plugins/Facebook/FBConnectAuth.php
index d6d378626..84d51578f 100644
--- a/plugins/Facebook/FBConnectAuth.php
+++ b/plugins/Facebook/FBConnectAuth.php
@@ -257,13 +257,10 @@ class FBConnectauthAction extends Action
}
}
- $nickname = $this->trimmed('newname');
-
- if (!Validate::string($nickname, array('min_length' => 1,
- 'max_length' => 64,
- 'format' => NICKNAME_FMT))) {
- $this->showForm(_m('Nickname must have only lowercase letters and numbers and no spaces.'));
- return;
+ try {
+ $nickname = Nickname::normalize($this->trimmed('newname'));
+ } catch (NicknameException $e) {
+ $this->showForm($e->getMessage());
}
if (!User::allowed_nickname($nickname)) {
@@ -447,9 +444,7 @@ class FBConnectauthAction extends Action
function isNewNickname($str)
{
- if (!Validate::string($str, array('min_length' => 1,
- 'max_length' => 64,
- 'format' => NICKNAME_FMT))) {
+ if (!Nickname::isValid($str)) {
return false;
}
if (!User::allowed_nickname($str)) {
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php
index 4c15fc039..e4edcea0d 100644
--- a/plugins/Facebook/facebookaction.php
+++ b/plugins/Facebook/facebookaction.php
@@ -370,7 +370,7 @@ class FacebookAction extends Action
$this->showPage(_m('No notice content!'));
return;
} else {
- $content_shortened = common_shorten_links($content);
+ $content_shortened = $user->shortenLinks($content);
if (Notice::contentTooLong($content_shortened)) {
// @todo FIXME: i18n: Needs plural.
diff --git a/plugins/Facebook/locale/Facebook.pot b/plugins/Facebook/locale/Facebook.pot
index b93939299..6c4466621 100644
--- a/plugins/Facebook/locale/Facebook.pot
+++ b/plugins/Facebook/locale/Facebook.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+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"
@@ -138,23 +138,19 @@ msgstr ""
msgid "Not a valid invitation code."
msgstr ""
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr ""
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr ""
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr ""
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr ""
diff --git a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
index cb73ace8e..453445d85 100644
--- a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18: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-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -147,23 +147,19 @@ msgstr "N'eo ket aotreet krouiñ kontoù."
msgid "Not a valid invitation code."
msgstr "N'eo ket reizh ar c'hod pedadenn."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Lesanv nann-aotreet."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr ""
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Anv implijer pe ger-tremen direizh."
@@ -452,7 +448,7 @@ msgstr "Enrollañ"
#: facebookadminpanel.php:210
msgid "Save Facebook settings"
-msgstr ""
+msgstr "Enrollañ arventennoù Facebook"
#. TRANS: Instructions.
#: FBConnectSettings.php:66
@@ -465,12 +461,12 @@ msgstr ""
#: FBConnectSettings.php:98
msgid "Connected Facebook user"
-msgstr ""
+msgstr "Implijer Facebook kevreet"
#. TRANS: Legend.
#: FBConnectSettings.php:118
msgid "Disconnect my account from Facebook"
-msgstr ""
+msgstr "Digevreañ ma c'hont deus Facebook"
#. TRANS: Followed by a link containing text "set a password".
#: FBConnectSettings.php:125
diff --git a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
index 6293a7af8..d9cec5fdc 100644
--- a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:52+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: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -167,25 +167,19 @@ msgstr "Registrierung nicht erlaubt."
msgid "Not a valid invitation code."
msgstr "Kein gültiger Einladungscode."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Der Benutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. "
-"Leerzeichen sind nicht erlaubt."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Benutzername nicht erlaubt."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Fehler beim Verbinden des Benutzers mit Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Benutzername oder Passwort falsch."
@@ -582,3 +576,8 @@ msgstr "%s erlauben, meinen Facebook-Status zu aktualisieren"
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr "Synchronisierungs-Einstellungen"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Der Benutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. "
+#~ "Leerzeichen sind nicht erlaubt."
diff --git a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
index 8bb4e4fbc..0f4599c7f 100644
--- a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
@@ -11,13 +11,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:52+0000\n"
"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -162,25 +162,19 @@ msgstr "Registro de usuario no permitido."
msgid "Not a valid invitation code."
msgstr "No es un código de invitación válido."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"El nombre de usuario debe tener sólo letras minúsculas y números, sin "
-"espacios."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Nombre de usuario no autorizado."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "El nombre de usuario ya existe. Prueba con otro."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Error de conexión del usuario a Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Nombre de usuario o contraseña inválidos."
@@ -567,3 +561,8 @@ msgstr ""
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr ""
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "El nombre de usuario debe tener sólo letras minúsculas y números, sin "
+#~ "espacios."
diff --git a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
index d62550a39..0288bb000 100644
--- a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:53+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-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -166,25 +166,19 @@ msgstr "Inscription non autorisée."
msgid "Not a valid invitation code."
msgstr "Le code d’invitation n’est pas valide."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Les pseudonymes ne peuvent contenir que des lettres minuscules et des "
-"chiffres, sans espaces."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Pseudonyme non autorisé."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Erreur de connexion de l’utilisateur à Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Nom d’utilisateur ou mot de passe incorrect."
@@ -585,3 +579,8 @@ msgstr "Autoriser %s à mettre à jour mon statut Facebook"
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr "Préférences de synchronisation"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Les pseudonymes ne peuvent contenir que des lettres minuscules et des "
+#~ "chiffres, sans espaces."
diff --git a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
index 13478bc0f..7ac523490 100644
--- a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:53+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-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); 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-facebook\n"
@@ -148,25 +148,19 @@ msgstr "Non se permite o rexistro."
msgid "Not a valid invitation code."
msgstr "O código da invitación é incorrecto."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"O alcume debe ter só letras en minúscula e números, e non pode ter espazos "
-"en branco."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr ""
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Ese alcume xa está en uso. Probe con outro."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr ""
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "O nome de usuario ou contrasinal non son correctos."
@@ -549,3 +543,8 @@ msgstr ""
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr ""
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "O alcume debe ter só letras en minúscula e números, e non pode ter "
+#~ "espazos en branco."
diff --git a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
index 00153ab2f..eb276166c 100644
--- a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18: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-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -161,23 +161,19 @@ msgstr "Creation de conto non permittite."
msgid "Not a valid invitation code."
msgstr "Le codice de invitation es invalide."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Pseudonymo non permittite."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Pseudonymo ja in uso. Proba un altere."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Error durante le connexion del usator a Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Nomine de usator o contrasigno invalide."
@@ -574,3 +570,7 @@ msgstr "Permitter a %s de actualisar mi stato de Facebook"
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr "Preferentias de synchronisation"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
diff --git a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
index b663b17c5..e670a7459 100644
--- a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:34+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18: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-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -161,24 +161,19 @@ msgstr "Регистрацијата не е дозволена."
msgid "Not a valid invitation code."
msgstr "Ова не е важечки код за покана."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Прекарот мора да се состои само од мали букви и бројки, без празни места."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Прекарот не е дозволен."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Прекарот е зафатен. Одберете друг."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Грешка при поврзувањето на корисникот со Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Неважечко корисничко име или лозинка."
@@ -571,3 +566,7 @@ msgstr "Дозволи %s да го менува мојот статус на Fa
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr "Услогласи нагодувања"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Прекарот мора да се состои само од мали букви и бројки, без празни места."
diff --git a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
index d35302232..1d7873e97 100644
--- a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:35+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:56+0000\n"
"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -143,23 +143,19 @@ msgstr "Registrering ikke tillatt."
msgid "Not a valid invitation code."
msgstr "Ikke en gyldig invitasjonskode."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Kallenavn kan kun ha små bokstaver og tall og ingen mellomrom."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Kallenavn er ikke tillatt."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Kallenavnet er allerede i bruk. Prøv et annet."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr ""
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Ugyldig brukernavn eller passord."
@@ -542,3 +538,6 @@ msgstr "Tillat %s å oppdatere min Facebook-status"
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr ""
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr "Kallenavn kan kun ha små bokstaver og tall og ingen mellomrom."
diff --git a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
index 5b60c244d..6812d8671 100644
--- a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:35+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18: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-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -37,7 +37,7 @@ msgid ""
msgstr ""
"Hallo %1$s.\n"
"\n"
-"Het spijt ons je te moeten meedelen dat het niet mogelijk is uw "
+"Het spijt ons u te moeten meedelen dat het niet mogelijk is uw "
"Facebookstatus bij te werken vanuit %2$s. De Facebookapplicatie is "
"uitgeschakeld voor uw gebruiker. Dit kan komen doordat u de toegangsrechten "
"voor de Facebookapplicatie hebt ingetrokken of omdat u uw Facebookgebruiker "
@@ -80,7 +80,7 @@ msgid ""
"Facebook to a local account. You can either create a new account, or connect "
"with your existing account, if you have one."
msgstr ""
-"De is de eerste keer dat u aanmeldt bij %s en dan moeten we uw "
+"Dit is de eerste keer dat u aanmeldt bij %s en dan moeten we uw "
"Facebookgebruiker koppelen met uw lokale gebruiker. U kunt een nieuwe "
"gebruiker aanmaken of koppelen met een bestaande gebruiker als u die al hebt."
@@ -166,26 +166,20 @@ msgstr "Registratie is niet toegestaan."
msgid "Not a valid invitation code."
msgstr "De uitnodigingscode is ongeldig."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
-"zijn niet toegestaan."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Gebruikersnaam niet toegestaan."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr ""
"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Fout bij het verbinden van de gebruiker met Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Ongeldige gebruikersnaam of wachtwoord."
@@ -582,3 +576,8 @@ msgstr "%s toestaan mijn Facebookstatus bij te werken"
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr "Synchronisatievooreuren"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
+#~ "zijn niet toegestaan."
diff --git a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
index 88b3ea2d1..70fbdf3e5 100644
--- a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
@@ -10,14 +10,14 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:35+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:56+0000\n"
"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
"br>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -145,25 +145,19 @@ msgstr "Não é permitido o registro."
msgid "Not a valid invitation code."
msgstr "O código de convite é inválido."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"O apelido deve conter apenas letras minúsculas e números e não pode ter "
-"espaços."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Apelido não permitido."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Este apelido já está em uso. Tente outro."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Erro ao conectar o usuário ao Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr ""
@@ -548,3 +542,8 @@ msgstr ""
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr ""
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "O apelido deve conter apenas letras minúsculas e números e não pode ter "
+#~ "espaços."
diff --git a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
index c8fbf25fe..5833cdb95 100644
--- a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:35+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:56+0000\n"
"Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tl\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -167,25 +167,19 @@ msgstr "Hindi pinapahintulutan ang pagpapatala."
msgid "Not a valid invitation code."
msgstr "Hindi isang tanggap na kodigo ng paanyaya."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Ang palayaw ay dapat na may mga maliliit na mga titik lamang at mga bilang "
-"at walang mga patlang."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Hindi pinapahintulutan ang palayaw."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Ginagamit na ang palayaw. Subukan ang iba."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "May kamalian sa pag-ugnay ng tagagamit sa Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Hindi tanggap na pangalan ng tagagamit o hudyat."
@@ -587,3 +581,8 @@ msgstr "Pahintulutan si %s na isapanahon ang aking katayuan ng Facebook"
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr "Mga nais sa pagsabay"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Ang palayaw ay dapat na may mga maliliit na mga titik lamang at mga "
+#~ "bilang at walang mga patlang."
diff --git a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
index 058733a1f..a8bc05155 100644
--- a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:35+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:56+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-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -163,25 +163,19 @@ msgstr "Реєстрацію не дозволено."
msgid "Not a valid invitation code."
msgstr "Це не дійсний код запрошення."
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Ім’я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
-"інтервалів."
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "Нікнейм не допускається."
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "Цей нікнейм вже використовується. Спробуйте інший."
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "Помилка при підключенні до Facebook."
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "Невірне ім’я або пароль."
@@ -577,3 +571,8 @@ msgstr "Дозволити додатку %s оновлювати мій ста
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr "Параметри синхронізації"
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr ""
+#~ "Ім’я користувача повинно складатись з літер нижнього регістру і цифр, "
+#~ "ніяких інтервалів."
diff --git a/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po
new file mode 100644
index 000000000..31b660d19
--- /dev/null
+++ b/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po
@@ -0,0 +1,540 @@
+# Translation of StatusNet - Facebook to Vietnamese (Tiếng Việt)
+# Expored from translatewiki.net
+#
+# Author: Minh Nguyen
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Facebook\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:56+0000\n"
+"Language-Team: Vietnamese <http://translatewiki.net/wiki/Portal:vi>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: vi\n"
+"X-Message-Group: #out-statusnet-plugin-facebook\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: facebookutil.php:429
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %2$s, and have disabled the Facebook application for "
+"your account. This may be because you have removed the Facebook "
+"application's authorization, or have deleted your Facebook account. You can "
+"re-enable the Facebook application and automatic status updating by re-"
+"installing the %2$s Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%2$s"
+msgstr ""
+
+#: FBConnectAuth.php:55
+msgid "You must be logged into Facebook to use Facebook Connect."
+msgstr ""
+
+#: FBConnectAuth.php:79
+msgid "There is already a local user linked with this Facebook account."
+msgstr ""
+
+#: FBConnectAuth.php:91 FBConnectSettings.php:166
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: FBConnectAuth.php:96
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: FBConnectAuth.php:106
+msgid "An unknown error has occured."
+msgstr ""
+
+#. TRANS: %s is the site name.
+#: FBConnectAuth.php:121
+#, 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 account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+
+#. TRANS: Page title.
+#: FBConnectAuth.php:128
+msgid "Facebook Account Setup"
+msgstr "Thiết lập Tài khoản Facebook"
+
+#. TRANS: Legend.
+#: FBConnectAuth.php:162
+msgid "Connection options"
+msgstr ""
+
+#. TRANS: %s is the name of the license used by the user for their status updates.
+#: FBConnectAuth.php:172
+#, 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.
+#: FBConnectAuth.php:189
+msgid "Create new account"
+msgstr ""
+
+#: FBConnectAuth.php:191
+msgid "Create a new user with this nickname."
+msgstr ""
+
+#. TRANS: Field label.
+#: FBConnectAuth.php:195
+msgid "New nickname"
+msgstr ""
+
+#: FBConnectAuth.php:197
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#. TRANS: Submit button.
+#: FBConnectAuth.php:201
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Tạo"
+
+#: FBConnectAuth.php:207
+msgid "Connect existing account"
+msgstr ""
+
+#: FBConnectAuth.php:209
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr ""
+
+#. TRANS: Field label.
+#: FBConnectAuth.php:213
+msgid "Existing nickname"
+msgstr ""
+
+#: FBConnectAuth.php:216 facebookaction.php:277
+msgid "Password"
+msgstr "Mật khẩu"
+
+#. TRANS: Submit button.
+#: FBConnectAuth.php:220
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Kết nối"
+
+#. TRANS: Client error trying to register with registrations not allowed.
+#. TRANS: Client error trying to register with registrations 'invite only'.
+#: FBConnectAuth.php:237 FBConnectAuth.php:247
+msgid "Registration not allowed."
+msgstr ""
+
+#. TRANS: Client error trying to register with an invalid invitation code.
+#: FBConnectAuth.php:255
+msgid "Not a valid invitation code."
+msgstr ""
+
+#: FBConnectAuth.php:267
+msgid "Nickname not allowed."
+msgstr ""
+
+#: FBConnectAuth.php:272
+msgid "Nickname already in use. Try another one."
+msgstr ""
+
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+msgid "Error connecting user to Facebook."
+msgstr ""
+
+#: FBConnectAuth.php:310
+msgid "Invalid username or password."
+msgstr ""
+
+#. TRANS: Page title.
+#: facebooklogin.php:90 facebookaction.php:255
+msgid "Login"
+msgstr "Đăng nhập"
+
+#. TRANS: Legend.
+#: facebooknoticeform.php:144
+msgid "Send a notice"
+msgstr ""
+
+#. TRANS: Field label.
+#: facebooknoticeform.php:157
+#, php-format
+msgid "What's up, %s?"
+msgstr ""
+
+#: facebooknoticeform.php:169
+msgid "Available characters"
+msgstr ""
+
+#. TRANS: Button text.
+#: facebooknoticeform.php:196
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Gửi"
+
+#: facebookhome.php:103
+msgid "Server error: Couldn't get user!"
+msgstr ""
+
+#: facebookhome.php:122
+msgid "Incorrect username or password."
+msgstr ""
+
+#. TRANS: Page title.
+#. TRANS: %1$s is a user nickname, %2$s is a page number.
+#: facebookhome.php:153
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr ""
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname
+#: facebookhome.php:157
+#, php-format
+msgid "%s and friends"
+msgstr "%s và bạn bè"
+
+#. TRANS: Instructions. %s is the application name.
+#: facebookhome.php:185
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: facebookhome.php:210
+msgid "Okay, do it!"
+msgstr ""
+
+#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
+#: facebookhome.php:217
+msgctxt "BUTTON"
+msgid "Skip"
+msgstr "Bỏ qua"
+
+#: facebookhome.php:244 facebookaction.php:336
+msgid "Pagination"
+msgstr ""
+
+#. TRANS: Pagination link.
+#: facebookhome.php:254 facebookaction.php:345
+msgid "After"
+msgstr "Sau"
+
+#. TRANS: Pagination link.
+#: facebookhome.php:263 facebookaction.php:353
+msgid "Before"
+msgstr "Trước"
+
+#. TRANS: %s is the name of the site.
+#: facebookinvite.php:69
+#, php-format
+msgid "Thanks for inviting your friends to use %s."
+msgstr ""
+
+#. TRANS: Followed by an unordered list with invited friends.
+#: facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
+msgstr ""
+
+#: facebookinvite.php:91
+#, php-format
+msgid "You have been invited to %s"
+msgstr ""
+
+#. TRANS: %s is the name of the site.
+#: facebookinvite.php:101
+#, php-format
+msgid "Invite your friends to use %s"
+msgstr ""
+
+#. TRANS: %s is the name of the site.
+#: facebookinvite.php:124
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#. TRANS: Page title.
+#: facebookinvite.php:143
+msgid "Send invitations"
+msgstr ""
+
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookPlugin.php:190
+msgid "Facebook integration configuration"
+msgstr ""
+
+#: FacebookPlugin.php:431
+msgid "Facebook Connect User"
+msgstr "Người dùng Kết nối Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookPlugin.php:463
+msgid "Login or register using Facebook"
+msgstr ""
+
+#. TRANS: Tooltip for menu item "Facebook".
+#. TRANS: Page title.
+#: FacebookPlugin.php:487 FBConnectSettings.php:55
+msgid "Facebook Connect Settings"
+msgstr "Thiết lập Kết nối Facebook"
+
+#: FacebookPlugin.php:591
+msgid ""
+"The Facebook plugin allows integrating StatusNet instances with <a href="
+"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
+msgstr ""
+
+#: FBConnectLogin.php:33
+msgid "Already logged in."
+msgstr ""
+
+#. TRANS: Instructions.
+#: FBConnectLogin.php:42
+msgid "Login with your Facebook Account"
+msgstr ""
+
+#. TRANS: Page title.
+#: FBConnectLogin.php:57
+msgid "Facebook Login"
+msgstr "Đăng nhập vào Facebook"
+
+#: facebookremove.php:53
+msgid "Couldn't remove Facebook user: already deleted."
+msgstr ""
+
+#: facebookremove.php:63
+msgid "Couldn't remove Facebook user."
+msgstr ""
+
+#. TRANS: Link description for 'Home' link that leads to a start page.
+#: facebookaction.php:169
+msgctxt "MENU"
+msgid "Home"
+msgstr "Trang chủ"
+
+#. TRANS: Tooltip for 'Home' link that leads to a start page.
+#: facebookaction.php:171
+msgid "Home"
+msgstr "Trang chủ"
+
+#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
+#: facebookaction.php:180
+msgctxt "MENU"
+msgid "Invite"
+msgstr ""
+
+#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
+#: facebookaction.php:182
+msgid "Invite"
+msgstr ""
+
+#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
+#: facebookaction.php:192
+msgctxt "MENU"
+msgid "Settings"
+msgstr "Thiết lập"
+
+#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
+#: facebookaction.php:194
+msgid "Settings"
+msgstr "Thiết lập"
+
+#: facebookaction.php:233
+#, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet?"
+msgstr ""
+
+#: facebookaction.php:235
+msgid " a new account."
+msgstr ""
+
+#: facebookaction.php:242
+msgid "Register"
+msgstr "Đăng ký"
+
+#: facebookaction.php:274
+msgid "Nickname"
+msgstr ""
+
+#. TRANS: Login button.
+#: facebookaction.php:282
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Đăng nhập"
+
+#: facebookaction.php:288
+msgid "Lost or forgotten password?"
+msgstr ""
+
+#: facebookaction.php:370
+msgid "No notice content!"
+msgstr ""
+
+#: facebookaction.php:377
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+
+#: facebookaction.php:431
+msgid "Notices"
+msgstr ""
+
+#: facebookadminpanel.php:52
+msgid "Facebook"
+msgstr "Facebook"
+
+#: facebookadminpanel.php:62
+msgid "Facebook integration settings"
+msgstr ""
+
+#: facebookadminpanel.php:123
+msgid "Invalid Facebook API key. Max length is 255 characters."
+msgstr ""
+
+#: facebookadminpanel.php:129
+msgid "Invalid Facebook API secret. Max length is 255 characters."
+msgstr ""
+
+#: facebookadminpanel.php:178
+msgid "Facebook application settings"
+msgstr "Thiết lập ứng dụng Facebook"
+
+#: facebookadminpanel.php:184
+msgid "API key"
+msgstr ""
+
+#: facebookadminpanel.php:185
+msgid "API key provided by Facebook"
+msgstr ""
+
+#: facebookadminpanel.php:193
+msgid "Secret"
+msgstr ""
+
+#: facebookadminpanel.php:194
+msgid "API secret provided by Facebook"
+msgstr ""
+
+#: facebookadminpanel.php:210
+msgid "Save"
+msgstr "Lưu"
+
+#: facebookadminpanel.php:210
+msgid "Save Facebook settings"
+msgstr "Lưu các thiết lập Facebook"
+
+#. TRANS: Instructions.
+#: FBConnectSettings.php:66
+msgid "Manage how your account connects to Facebook"
+msgstr ""
+
+#: FBConnectSettings.php:90
+msgid "There is no Facebook user connected to this account."
+msgstr ""
+
+#: FBConnectSettings.php:98
+msgid "Connected Facebook user"
+msgstr "Người dùng Facebook kết nối"
+
+#. TRANS: Legend.
+#: FBConnectSettings.php:118
+msgid "Disconnect my account from Facebook"
+msgstr ""
+
+#. TRANS: Followed by a link containing text "set a password".
+#: FBConnectSettings.php:125
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please "
+msgstr ""
+
+#. TRANS: Preceded by "Please " and followed by " first."
+#: FBConnectSettings.php:130
+msgid "set a password"
+msgstr ""
+
+#. TRANS: Preceded by "Please set a password".
+#: FBConnectSettings.php:132
+msgid " first."
+msgstr ""
+
+#. TRANS: Submit button.
+#: FBConnectSettings.php:145
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Ngắt kết nối"
+
+#: FBConnectSettings.php:180
+msgid "Couldn't delete link to Facebook."
+msgstr ""
+
+#: FBConnectSettings.php:196
+msgid "You have disconnected from Facebook."
+msgstr ""
+
+#: FBConnectSettings.php:199
+msgid "Not sure what you're trying to do."
+msgstr ""
+
+#: facebooksettings.php:61
+msgid "There was a problem saving your sync preferences!"
+msgstr ""
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+#: facebooksettings.php:64
+msgid "Sync preferences saved."
+msgstr ""
+
+#: facebooksettings.php:87
+msgid "Automatically update my Facebook status with my notices."
+msgstr ""
+
+#: facebooksettings.php:94
+msgid "Send \"@\" replies to Facebook."
+msgstr ""
+
+#. TRANS: Submit button to save synchronisation settings.
+#: facebooksettings.php:102
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Lưu"
+
+#. TRANS: %s is the application name.
+#: facebooksettings.php:111
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: facebooksettings.php:124
+#, php-format
+msgid "Allow %s to update my Facebook status"
+msgstr ""
+
+#. TRANS: Page title for synchronisation settings.
+#: facebooksettings.php:134
+msgid "Sync preferences"
+msgstr ""
diff --git a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
index 03f85020c..5a4ad5ca0 100644
--- a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
@@ -10,14 +10,14 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Facebook\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:46:36+0000\n"
+"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"PO-Revision-Date: 2010-11-30 20:18:56+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-10-23 18:57:01+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75590); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -157,23 +157,19 @@ msgstr "不允许注册。"
msgid "Not a valid invitation code."
msgstr "对不起,无效的邀请码。"
-#: FBConnectAuth.php:265
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "昵称只能使用小写字母和数字且不能使用空格。"
-
-#: FBConnectAuth.php:270
+#: FBConnectAuth.php:267
msgid "Nickname not allowed."
msgstr "昵称不被允许。"
-#: FBConnectAuth.php:275
+#: FBConnectAuth.php:272
msgid "Nickname already in use. Try another one."
msgstr "昵称已被使用,换一个吧。"
-#: FBConnectAuth.php:293 FBConnectAuth.php:327 FBConnectAuth.php:347
+#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
msgid "Error connecting user to Facebook."
msgstr "连接用户至Facebook时发生错误。"
-#: FBConnectAuth.php:313
+#: FBConnectAuth.php:310
msgid "Invalid username or password."
msgstr "用户名或密码不正确。"
@@ -557,3 +553,6 @@ msgstr ""
#: facebooksettings.php:134
msgid "Sync preferences"
msgstr ""
+
+#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
+#~ msgstr "昵称只能使用小写字母和数字且不能使用空格。"