Merge branch '0.9.x' into 1.0.x

Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po

7 files changed, 1291 insertions, 63 deletions

diff --git a/plugins/FacebookBridge/locale/FacebookBridge.pot b/plugins/FacebookBridge/locale/FacebookBridge.pot
index 08c0813fc..132516b79 100644
--- a/plugins/FacebookBridge/locale/FacebookBridge.pot
+++ b/plugins/FacebookBridge/locale/FacebookBridge.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+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"
@@ -36,7 +36,7 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:106
+#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr ""
 
@@ -62,7 +62,7 @@ msgstr ""
 msgid "There is already a local account linked with that Facebook account."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:87
+#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -234,61 +234,62 @@ msgstr ""
 msgid "Save Facebook settings"
 msgstr ""
 
-#: actions/facebooksettings.php:139
+#: actions/facebooksettings.php:137
 msgid "Connected Facebook user"
 msgstr ""
 
-#: actions/facebooksettings.php:166
+#: actions/facebooksettings.php:164
 msgid "Publish my notices to Facebook."
 msgstr ""
 
-#: actions/facebooksettings.php:176
+#: actions/facebooksettings.php:174
 msgid "Send \"@\" replies to Facebook."
 msgstr ""
 
 #. TRANS: Submit button to save synchronisation settings.
-#: actions/facebooksettings.php:185
+#: actions/facebooksettings.php:183
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
 
 #. TRANS: Legend.
-#: actions/facebooksettings.php:194
+#: actions/facebooksettings.php:192
 msgid "Disconnect my account from Facebook"
 msgstr ""
 
-#: actions/facebooksettings.php:202
+#: actions/facebooksettings.php:199
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
 "a password](%s) first."
 msgstr ""
 
-#: actions/facebooksettings.php:215
+#: actions/facebooksettings.php:213
+#, php-format
 msgid ""
-"Keep your %1$s account but disconnect from Facebook. You'll use your 1%$s "
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
 "password to log in."
 msgstr ""
 
 #. TRANS: Submit button.
-#: actions/facebooksettings.php:222
+#: actions/facebooksettings.php:220
 msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr ""
 
-#: actions/facebooksettings.php:246
+#: actions/facebooksettings.php:243
 msgid "There was a problem saving your sync preferences."
 msgstr ""
 
 #. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: actions/facebooksettings.php:249
+#: actions/facebooksettings.php:246
 msgid "Sync preferences saved."
 msgstr ""
 
-#: actions/facebooksettings.php:264
+#: actions/facebooksettings.php:260
 msgid "Couldn't delete link to Facebook."
 msgstr ""
 
-#: actions/facebooksettings.php:268
+#: actions/facebooksettings.php:264
 msgid "You have disconnected from Facebook."
 msgstr ""
diff --git a/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
new file mode 100644
index 000000000..e416f0e72
--- /dev/null
+++ b/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
@@ -0,0 +1,302 @@
+# Translation of StatusNet - FacebookBridge to Breton (Brezhoneg)
+# Expored from translatewiki.net
+#
+# Author: Y-M D
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FacebookBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:55+0000\n"
+"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-30 20:40:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+#: FacebookBridgePlugin.php:201 FacebookBridgePlugin.php:240
+#: FacebookBridgePlugin.php:281
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:203
+msgid "Login or register using Facebook"
+msgstr "Kevreañ pe en em enskrivañ dre Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:242
+msgid "Facebook integration configuration"
+msgstr ""
+
+#. TRANS: Tooltip for menu item "Facebook".
+#. TRANS: Page title for Facebook settings.
+#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+msgid "Facebook settings"
+msgstr "Arventennoù Facebook"
+
+#: FacebookBridgePlugin.php:547
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr ""
+
+#: lib/facebookclient.php:776
+msgid "Your Facebook connection has been removed"
+msgstr ""
+
+#: lib/facebookclient.php:835
+#, php-format
+msgid "Contact the %s administrator to retrieve your account"
+msgstr ""
+
+#: actions/facebookfinishlogin.php:88
+msgid ""
+"You must be logged into Facebook to register a local account using Facebook."
+msgstr ""
+
+#: actions/facebookfinishlogin.php:118
+msgid "There is already a local account linked with that Facebook account."
+msgstr "Un implijer lec'hel liammet d'ar gont Facebook-se a zo dija."
+
+#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
+
+#: actions/facebookfinishlogin.php:150
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+"Rankout a rit bezañ a-du gant termenoù an aotre-implijout evit krouiñ ur "
+"gont."
+
+#: actions/facebookfinishlogin.php:167
+msgid "An unknown error has occured."
+msgstr "Ur gudenn dizanv a zo bet."
+
+#: actions/facebookfinishlogin.php:185
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your "
+"Facebook to a local account. You can either create a new local account, or "
+"connect with an existing local account."
+msgstr ""
+
+#. TRANS: Page title.
+#: actions/facebookfinishlogin.php:195
+msgid "Facebook Setup"
+msgstr ""
+
+#. TRANS: Legend.
+#: actions/facebookfinishlogin.php:229
+msgid "Connection options"
+msgstr "Dibarzhioù kevreañ"
+
+#. TRANS: %s is the name of the license used by the user for their status updates.
+#: actions/facebookfinishlogin.php:239
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+
+#. TRANS: Legend.
+#: actions/facebookfinishlogin.php:256
+msgid "Create new account"
+msgstr "Krouiñ ur gont nevez"
+
+#: actions/facebookfinishlogin.php:258
+msgid "Create a new user with this nickname."
+msgstr "Krouiñ un implijer nevez gant al lesanv-se."
+
+#. TRANS: Field label.
+#: actions/facebookfinishlogin.php:262
+msgid "New nickname"
+msgstr "Lesanv nevez"
+
+#: actions/facebookfinishlogin.php:264
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
+
+#. TRANS: Submit button.
+#: actions/facebookfinishlogin.php:268
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Krouiñ"
+
+#: actions/facebookfinishlogin.php:274
+msgid "Connect existing account"
+msgstr "Kevreañ d'ur gont a zo dioutañ"
+
+#: actions/facebookfinishlogin.php:276
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr ""
+
+#. TRANS: Field label.
+#: actions/facebookfinishlogin.php:280
+msgid "Existing nickname"
+msgstr "Lesanv a zo dioutañ"
+
+#: actions/facebookfinishlogin.php:283
+msgid "Password"
+msgstr "Ger-tremen"
+
+#. TRANS: Submit button.
+#: actions/facebookfinishlogin.php:287
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Kevreañ"
+
+#. TRANS: Client error trying to register with registrations not allowed.
+#. TRANS: Client error trying to register with registrations 'invite only'.
+#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+msgid "Registration not allowed."
+msgstr "N'eo ket aotreet krouiñ kontoù."
+
+#. TRANS: Client error trying to register with an invalid invitation code.
+#: actions/facebookfinishlogin.php:322
+msgid "Not a valid invitation code."
+msgstr "N'eo ket reizh ar c'hod pedadenn."
+
+#: actions/facebookfinishlogin.php:335
+msgid "Nickname not allowed."
+msgstr "Lesanv nann-aotreet."
+
+#: actions/facebookfinishlogin.php:340
+msgid "Nickname already in use. Try another one."
+msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
+
+#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+msgid "Error connecting user to Facebook."
+msgstr ""
+
+#: actions/facebookfinishlogin.php:468
+msgid "Invalid username or password."
+msgstr "Anv implijer pe ger-tremen direizh."
+
+#: actions/facebooklogin.php:43
+msgid "Already logged in."
+msgstr "Kevreet oc'h dija."
+
+#. TRANS: Instructions.
+#: actions/facebooklogin.php:52
+msgid "Login with your Facebook Account"
+msgstr "Kevreit gant ho kont Facebook"
+
+#. TRANS: Page title.
+#: actions/facebooklogin.php:67
+msgid "Login with Facebook"
+msgstr "Kevreañ gant Facebook"
+
+#: actions/facebookadminpanel.php:52
+msgid "Facebook"
+msgstr "Facebook"
+
+#: actions/facebookadminpanel.php:62
+msgid "Facebook integration settings"
+msgstr "Arventennoù enframmañ Facebook"
+
+#: actions/facebookadminpanel.php:123
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr ""
+
+#: actions/facebookadminpanel.php:129
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr ""
+
+#: actions/facebookadminpanel.php:178
+msgid "Facebook application settings"
+msgstr "Arventennoù poellad Facebook"
+
+#: actions/facebookadminpanel.php:184
+msgid "Application ID"
+msgstr "ID ar poellad"
+
+#: actions/facebookadminpanel.php:185
+msgid "ID of your Facebook application"
+msgstr "ID ho poellad Facebook"
+
+#: actions/facebookadminpanel.php:193
+msgid "Secret"
+msgstr "Kuzh"
+
+#: actions/facebookadminpanel.php:194
+msgid "Application secret"
+msgstr ""
+
+#: actions/facebookadminpanel.php:210
+msgid "Save"
+msgstr "Enrollañ"
+
+#: actions/facebookadminpanel.php:210
+msgid "Save Facebook settings"
+msgstr ""
+
+#: actions/facebooksettings.php:137
+msgid "Connected Facebook user"
+msgstr ""
+
+#: actions/facebooksettings.php:164
+msgid "Publish my notices to Facebook."
+msgstr ""
+
+#: actions/facebooksettings.php:174
+msgid "Send \"@\" replies to Facebook."
+msgstr ""
+
+#. TRANS: Submit button to save synchronisation settings.
+#: actions/facebooksettings.php:183
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Enrollañ"
+
+#. TRANS: Legend.
+#: actions/facebooksettings.php:192
+msgid "Disconnect my account from Facebook"
+msgstr ""
+
+#: actions/facebooksettings.php:199
+#, php-format
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+
+#: actions/facebooksettings.php:213
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+
+#. TRANS: Submit button.
+#: actions/facebooksettings.php:220
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Digevrañ"
+
+#: actions/facebooksettings.php:243
+msgid "There was a problem saving your sync preferences."
+msgstr ""
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+#: actions/facebooksettings.php:246
+msgid "Sync preferences saved."
+msgstr ""
+
+#: actions/facebooksettings.php:260
+msgid "Couldn't delete link to Facebook."
+msgstr ""
+
+#: actions/facebooksettings.php:264
+msgid "You have disconnected from Facebook."
+msgstr ""
diff --git a/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
new file mode 100644
index 000000000..38d44b942
--- /dev/null
+++ b/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
@@ -0,0 +1,300 @@
+# Translation of StatusNet - FacebookBridge to Catalan (Català)
+# Expored from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FacebookBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:55+0000\n"
+"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-30 20:40:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+#: FacebookBridgePlugin.php:201 FacebookBridgePlugin.php:240
+#: FacebookBridgePlugin.php:281
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:203
+msgid "Login or register using Facebook"
+msgstr "Inicieu-hi una sessió o registreu-vos-hi des del Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:242
+msgid "Facebook integration configuration"
+msgstr "Configuració de la integració del Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#. TRANS: Page title for Facebook settings.
+#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+msgid "Facebook settings"
+msgstr "Paràmetres del Facebook"
+
+#: FacebookBridgePlugin.php:547
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Un connector per integrar l'StatusNet amb el Facebook"
+
+#: lib/facebookclient.php:776
+msgid "Your Facebook connection has been removed"
+msgstr "S'ha eliminat la connexió amb el Facebook"
+
+#: lib/facebookclient.php:835
+#, php-format
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Contacteu amb l'administrador de %s per recuperar el vostre compte"
+
+#: actions/facebookfinishlogin.php:88
+msgid ""
+"You must be logged into Facebook to register a local account using Facebook."
+msgstr ""
+
+#: actions/facebookfinishlogin.php:118
+msgid "There is already a local account linked with that Facebook account."
+msgstr ""
+
+#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/facebookfinishlogin.php:150
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: actions/facebookfinishlogin.php:167
+msgid "An unknown error has occured."
+msgstr ""
+
+#: actions/facebookfinishlogin.php:185
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your "
+"Facebook to a local account. You can either create a new local account, or "
+"connect with an existing local account."
+msgstr ""
+
+#. TRANS: Page title.
+#: actions/facebookfinishlogin.php:195
+msgid "Facebook Setup"
+msgstr ""
+
+#. TRANS: Legend.
+#: actions/facebookfinishlogin.php:229
+msgid "Connection options"
+msgstr ""
+
+#. TRANS: %s is the name of the license used by the user for their status updates.
+#: actions/facebookfinishlogin.php:239
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+
+#. TRANS: Legend.
+#: actions/facebookfinishlogin.php:256
+msgid "Create new account"
+msgstr ""
+
+#: actions/facebookfinishlogin.php:258
+msgid "Create a new user with this nickname."
+msgstr ""
+
+#. TRANS: Field label.
+#: actions/facebookfinishlogin.php:262
+msgid "New nickname"
+msgstr ""
+
+#: actions/facebookfinishlogin.php:264
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#. TRANS: Submit button.
+#: actions/facebookfinishlogin.php:268
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Crea"
+
+#: actions/facebookfinishlogin.php:274
+msgid "Connect existing account"
+msgstr "Connecta el compte ja existent"
+
+#: actions/facebookfinishlogin.php:276
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr ""
+
+#. TRANS: Field label.
+#: actions/facebookfinishlogin.php:280
+msgid "Existing nickname"
+msgstr ""
+
+#: actions/facebookfinishlogin.php:283
+msgid "Password"
+msgstr "Contrasenya"
+
+#. TRANS: Submit button.
+#: actions/facebookfinishlogin.php:287
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Connecta"
+
+#. TRANS: Client error trying to register with registrations not allowed.
+#. TRANS: Client error trying to register with registrations 'invite only'.
+#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+msgid "Registration not allowed."
+msgstr "El registre no està permès"
+
+#. TRANS: Client error trying to register with an invalid invitation code.
+#: actions/facebookfinishlogin.php:322
+msgid "Not a valid invitation code."
+msgstr "No és un codi d'invitació vàlid"
+
+#: actions/facebookfinishlogin.php:335
+msgid "Nickname not allowed."
+msgstr "No es permet el sobrenom."
+
+#: actions/facebookfinishlogin.php:340
+msgid "Nickname already in use. Try another one."
+msgstr "El sobrenom ja és en ús. Trieu-ne un altre."
+
+#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+msgid "Error connecting user to Facebook."
+msgstr ""
+
+#: actions/facebookfinishlogin.php:468
+msgid "Invalid username or password."
+msgstr ""
+
+#: actions/facebooklogin.php:43
+msgid "Already logged in."
+msgstr ""
+
+#. TRANS: Instructions.
+#: actions/facebooklogin.php:52
+msgid "Login with your Facebook Account"
+msgstr ""
+
+#. TRANS: Page title.
+#: actions/facebooklogin.php:67
+msgid "Login with Facebook"
+msgstr ""
+
+#: actions/facebookadminpanel.php:52
+msgid "Facebook"
+msgstr ""
+
+#: actions/facebookadminpanel.php:62
+msgid "Facebook integration settings"
+msgstr ""
+
+#: actions/facebookadminpanel.php:123
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr ""
+
+#: actions/facebookadminpanel.php:129
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr ""
+
+#: actions/facebookadminpanel.php:178
+msgid "Facebook application settings"
+msgstr ""
+
+#: actions/facebookadminpanel.php:184
+msgid "Application ID"
+msgstr ""
+
+#: actions/facebookadminpanel.php:185
+msgid "ID of your Facebook application"
+msgstr ""
+
+#: actions/facebookadminpanel.php:193
+msgid "Secret"
+msgstr ""
+
+#: actions/facebookadminpanel.php:194
+msgid "Application secret"
+msgstr ""
+
+#: actions/facebookadminpanel.php:210
+msgid "Save"
+msgstr ""
+
+#: actions/facebookadminpanel.php:210
+msgid "Save Facebook settings"
+msgstr "Desa els paràmetres del Facebook"
+
+#: actions/facebooksettings.php:137
+msgid "Connected Facebook user"
+msgstr ""
+
+#: actions/facebooksettings.php:164
+msgid "Publish my notices to Facebook."
+msgstr ""
+
+#: actions/facebooksettings.php:174
+msgid "Send \"@\" replies to Facebook."
+msgstr ""
+
+#. TRANS: Submit button to save synchronisation settings.
+#: actions/facebooksettings.php:183
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Desa"
+
+#. TRANS: Legend.
+#: actions/facebooksettings.php:192
+msgid "Disconnect my account from Facebook"
+msgstr ""
+
+#: actions/facebooksettings.php:199
+#, php-format
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+
+#: actions/facebooksettings.php:213
+#, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+
+#. TRANS: Submit button.
+#: actions/facebooksettings.php:220
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Desconnecta"
+
+#: actions/facebooksettings.php:243
+msgid "There was a problem saving your sync preferences."
+msgstr ""
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+#: actions/facebooksettings.php:246
+msgid "Sync preferences saved."
+msgstr ""
+
+#: actions/facebooksettings.php:260
+msgid "Couldn't delete link to Facebook."
+msgstr ""
+
+#: actions/facebooksettings.php:264
+msgid "You have disconnected from Facebook."
+msgstr ""
diff --git a/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
new file mode 100644
index 000000000..5478474bc
--- /dev/null
+++ b/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
@@ -0,0 +1,316 @@
+# Translation of StatusNet - FacebookBridge to Interlingua (Interlingua)
+# Expored from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FacebookBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:55+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-30 20:40:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+#: FacebookBridgePlugin.php:201 FacebookBridgePlugin.php:240
+#: FacebookBridgePlugin.php:281
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:203
+msgid "Login or register using Facebook"
+msgstr "Aperir session o crear conto usante Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:242
+msgid "Facebook integration configuration"
+msgstr "Configuration del integration de Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#. TRANS: Page title for Facebook settings.
+#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+msgid "Facebook settings"
+msgstr "Configuration de Facebook"
+
+#: FacebookBridgePlugin.php:547
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Un plug-in pro integrar StatusNet con Facebook."
+
+#: lib/facebookclient.php:776
+msgid "Your Facebook connection has been removed"
+msgstr "Tu connexion a Facebook ha essite removite"
+
+#: lib/facebookclient.php:835
+#, php-format
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Contacta le administrator de %s pro recuperar tu conto"
+
+#: actions/facebookfinishlogin.php:88
+msgid ""
+"You must be logged into Facebook to register a local account using Facebook."
+msgstr ""
+"Tu debe aperir session in Facebook pro registrar un conto local usante "
+"Facebook."
+
+#: actions/facebookfinishlogin.php:118
+msgid "There is already a local account linked with that Facebook account."
+msgstr "Il ha jam un conto local ligate a iste conto de Facebook."
+
+#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Occurreva un problema con le indicio de tu session. Per favor reproba."
+
+#: actions/facebookfinishlogin.php:150
+msgid "You can't register if you don't agree to the license."
+msgstr "Tu non pote crear un conto si tu non accepta le licentia."
+
+#: actions/facebookfinishlogin.php:167
+msgid "An unknown error has occured."
+msgstr "Un error incognite ha occurrite."
+
+#: actions/facebookfinishlogin.php:185
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your "
+"Facebook to a local account. You can either create a new local account, or "
+"connect with an existing local account."
+msgstr ""
+"Isto es le prime vice que tu ha aperite un session in %s; dunque, nos debe "
+"connecter tu Facebook a un conto local. Tu pote crear un nove conto local, o "
+"connecter con un conto local existente."
+
+#. TRANS: Page title.
+#: actions/facebookfinishlogin.php:195
+msgid "Facebook Setup"
+msgstr "Configuration de Facebook"
+
+#. TRANS: Legend.
+#: actions/facebookfinishlogin.php:229
+msgid "Connection options"
+msgstr "Optiones de connexion"
+
+#. TRANS: %s is the name of the license used by the user for their status updates.
+#: actions/facebookfinishlogin.php:239
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Mi texto e files es disponibile sub %s excepte iste datos private: "
+"contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de "
+"telephono."
+
+#. TRANS: Legend.
+#: actions/facebookfinishlogin.php:256
+msgid "Create new account"
+msgstr "Crear nove conto"
+
+#: actions/facebookfinishlogin.php:258
+msgid "Create a new user with this nickname."
+msgstr "Crear un nove usator con iste pseudonymo."
+
+#. TRANS: Field label.
+#: actions/facebookfinishlogin.php:262
+msgid "New nickname"
+msgstr "Nove pseudonymo"
+
+#: actions/facebookfinishlogin.php:264
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
+
+#. TRANS: Submit button.
+#: actions/facebookfinishlogin.php:268
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Crear"
+
+#: actions/facebookfinishlogin.php:274
+msgid "Connect existing account"
+msgstr "Connecter conto existente"
+
+#: actions/facebookfinishlogin.php:276
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr ""
+"Si tu ha jam un conto, aperi session con tu nomine de usator e contrasigno "
+"pro connecter lo a tu Facebook."
+
+#. TRANS: Field label.
+#: actions/facebookfinishlogin.php:280
+msgid "Existing nickname"
+msgstr "Pseudonymo existente"
+
+#: actions/facebookfinishlogin.php:283
+msgid "Password"
+msgstr "Contrasigno"
+
+#. TRANS: Submit button.
+#: actions/facebookfinishlogin.php:287
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Connecter"
+
+#. TRANS: Client error trying to register with registrations not allowed.
+#. TRANS: Client error trying to register with registrations 'invite only'.
+#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+msgid "Registration not allowed."
+msgstr "Creation de conto non permittite."
+
+#. TRANS: Client error trying to register with an invalid invitation code.
+#: actions/facebookfinishlogin.php:322
+msgid "Not a valid invitation code."
+msgstr "Le codice de invitation es invalide."
+
+#: actions/facebookfinishlogin.php:335
+msgid "Nickname not allowed."
+msgstr "Pseudonymo non permittite."
+
+#: actions/facebookfinishlogin.php:340
+msgid "Nickname already in use. Try another one."
+msgstr "Pseudonymo ja in uso. Proba un altere."
+
+#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+msgid "Error connecting user to Facebook."
+msgstr "Error durante le connexion del usator a Facebook."
+
+#: actions/facebookfinishlogin.php:468
+msgid "Invalid username or password."
+msgstr "Nomine de usator o contrasigno invalide."
+
+#: actions/facebooklogin.php:43
+msgid "Already logged in."
+msgstr "Tu es jam authenticate."
+
+#. TRANS: Instructions.
+#: actions/facebooklogin.php:52
+msgid "Login with your Facebook Account"
+msgstr "Aperir session con tu conto de Facebook"
+
+#. TRANS: Page title.
+#: actions/facebooklogin.php:67
+msgid "Login with Facebook"
+msgstr "Aperir session con Facebook"
+
+#: actions/facebookadminpanel.php:52
+msgid "Facebook"
+msgstr "Facebook"
+
+#: actions/facebookadminpanel.php:62
+msgid "Facebook integration settings"
+msgstr "Configurationes de integration de Facebook"
+
+#: actions/facebookadminpanel.php:123
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr "ID de Facebook invalide. Longitude maximal es 255 characteres."
+
+#: actions/facebookadminpanel.php:129
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr "Secreto de Facebook invalide. Longitude maximal es 255 characteres."
+
+#: actions/facebookadminpanel.php:178
+msgid "Facebook application settings"
+msgstr "Configurationes del application de Facebook"
+
+#: actions/facebookadminpanel.php:184
+msgid "Application ID"
+msgstr "ID de application"
+
+#: actions/facebookadminpanel.php:185
+msgid "ID of your Facebook application"
+msgstr "Le ID de tu application Facebook"
+
+#: actions/facebookadminpanel.php:193
+msgid "Secret"
+msgstr "Secreto"
+
+#: actions/facebookadminpanel.php:194
+msgid "Application secret"
+msgstr "Secreto de application"
+
+#: actions/facebookadminpanel.php:210
+msgid "Save"
+msgstr "Salveguardar"
+
+#: actions/facebookadminpanel.php:210
+msgid "Save Facebook settings"
+msgstr "Salveguardar configuration Facebook"
+
+#: actions/facebooksettings.php:137
+msgid "Connected Facebook user"
+msgstr "Usator de Facebook connectite"
+
+#: actions/facebooksettings.php:164
+msgid "Publish my notices to Facebook."
+msgstr "Publicar mi notas in Facebook."
+
+#: actions/facebooksettings.php:174
+msgid "Send \"@\" replies to Facebook."
+msgstr "Inviar responsas \"@\" a Facebook."
+
+#. TRANS: Submit button to save synchronisation settings.
+#: actions/facebooksettings.php:183
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salveguardar"
+
+#. TRANS: Legend.
+#: actions/facebooksettings.php:192
+msgid "Disconnect my account from Facebook"
+msgstr "Disconnecter mi conto ab Facebook"
+
+#: actions/facebooksettings.php:199
+#, php-format
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+"Per disconnecter tu Facebook, tu non plus poterea aperir session! Per favor "
+"[defini un contrasigno](%s) primo."
+
+#: actions/facebooksettings.php:213
+#, fuzzy, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+"Retene tu conto de %1$s ma disconnecte ab Facebook. Tu pote usar tu "
+"contrasigno de %1$s pro aperir session."
+
+#. TRANS: Submit button.
+#: actions/facebooksettings.php:220
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Disconnecter"
+
+#: actions/facebooksettings.php:243
+msgid "There was a problem saving your sync preferences."
+msgstr ""
+"Occurreva un problema durante le salveguarda de tu preferentias de "
+"synchronisation."
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+#: actions/facebooksettings.php:246
+msgid "Sync preferences saved."
+msgstr "Preferentias de synchronisation salveguardate."
+
+#: actions/facebooksettings.php:260
+msgid "Couldn't delete link to Facebook."
+msgstr "Non poteva deler le ligamine a Facebook."
+
+#: actions/facebooksettings.php:264
+msgid "You have disconnected from Facebook."
+msgstr "Tu te ha disconnectite de Facebook."
diff --git a/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
index 2d338e877..23614078e 100644
--- a/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:19:00+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:55+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 17:54:27+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 20:40:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -41,7 +41,7 @@ msgstr "Поставки за обединување со Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:106
+#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Поставки за Facebook"
 
@@ -69,7 +69,7 @@ msgstr ""
 msgid "There is already a local account linked with that Facebook account."
 msgstr "Веќе постои локална сметка поврзана со тааа сметка на Facebook."
 
-#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:87
+#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Се поајви проблем со Вашиот сесиски жетон. Обидете се повторно."
 
@@ -248,30 +248,30 @@ msgstr "Зачувај"
 msgid "Save Facebook settings"
 msgstr "Зачувај поставки за Facebook"
 
-#: actions/facebooksettings.php:139
+#: actions/facebooksettings.php:137
 msgid "Connected Facebook user"
 msgstr "Поврзан корисник на Facebook"
 
-#: actions/facebooksettings.php:166
+#: actions/facebooksettings.php:164
 msgid "Publish my notices to Facebook."
 msgstr "Објавувај ми ги забелешките на Facebook."
 
-#: actions/facebooksettings.php:176
+#: actions/facebooksettings.php:174
 msgid "Send \"@\" replies to Facebook."
 msgstr "Испраќај „@“-одговори на Facebook."
 
 #. TRANS: Submit button to save synchronisation settings.
-#: actions/facebooksettings.php:185
+#: actions/facebooksettings.php:183
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зачувај"
 
 #. TRANS: Legend.
-#: actions/facebooksettings.php:194
+#: actions/facebooksettings.php:192
 msgid "Disconnect my account from Facebook"
 msgstr "Исклучи ми ја сметката од Facebook"
 
-#: actions/facebooksettings.php:202
+#: actions/facebooksettings.php:199
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
@@ -280,37 +280,34 @@ msgstr ""
 "Ако ја исклучите сметката од Faceboook, тогаш нема да можете да се "
 "најавувате! Најпрвин [ставете лозинка](%s)."
 
-#: actions/facebooksettings.php:215
+#: actions/facebooksettings.php:213
+#, fuzzy, php-format
 msgid ""
-"Keep your %1$s account but disconnect from Facebook. You'll use your 1%$s "
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
 "password to log in."
 msgstr ""
 "Задржете ја сметката на %1$s, но исклучете ја од Facebook. За најава ќе ја "
 "користите лозинката на 1%$s."
 
 #. TRANS: Submit button.
-#: actions/facebooksettings.php:222
+#: actions/facebooksettings.php:220
 msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "Исклучи"
 
-#: actions/facebooksettings.php:246
+#: actions/facebooksettings.php:243
 msgid "There was a problem saving your sync preferences."
 msgstr "Се појави проблем при зачувувањето на нагодувањата за усогласување."
 
 #. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: actions/facebooksettings.php:249
+#: actions/facebooksettings.php:246
 msgid "Sync preferences saved."
 msgstr "Нагодувањата за усогласување се зачувани."
 
-#: actions/facebooksettings.php:264
+#: actions/facebooksettings.php:260
 msgid "Couldn't delete link to Facebook."
 msgstr "Не можев да ја избришам врската со Facebook."
 
-#: actions/facebooksettings.php:268
+#: actions/facebooksettings.php:264
 msgid "You have disconnected from Facebook."
 msgstr "Сега сте исклучени од Facebook."
-
-#~ msgid "Nickname must have only lowercase letters and numbers and no spaces."
-#~ msgstr ""
-#~ "Прекарот мора да има само мали букви и бројки и да нема празни места."
diff --git a/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
index 359425d22..06a115f2b 100644
--- a/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:19:00+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:56+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 17:54:27+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 20:40:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -41,7 +41,7 @@ msgstr "Instellingen voor Facebookintegratie"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:106
+#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Facebookinstellingen"
 
@@ -71,7 +71,7 @@ msgstr ""
 msgid "There is already a local account linked with that Facebook account."
 msgstr "Er is al een lokale gebruiker verbonden met deze Facebookgebruiker."
 
-#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:87
+#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
@@ -253,30 +253,30 @@ msgstr "Opslaan"
 msgid "Save Facebook settings"
 msgstr "Facebookinstellingen opslaan"
 
-#: actions/facebooksettings.php:139
+#: actions/facebooksettings.php:137
 msgid "Connected Facebook user"
 msgstr "Gekoppelde Facebookgebruiker"
 
-#: actions/facebooksettings.php:166
+#: actions/facebooksettings.php:164
 msgid "Publish my notices to Facebook."
 msgstr "Mijn mededelingen publiceren op Facebook."
 
-#: actions/facebooksettings.php:176
+#: actions/facebooksettings.php:174
 msgid "Send \"@\" replies to Facebook."
 msgstr "Antwoorden met \"@\" naar Facebook verzenden."
 
 #. TRANS: Submit button to save synchronisation settings.
-#: actions/facebooksettings.php:185
+#: actions/facebooksettings.php:183
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
 
 #. TRANS: Legend.
-#: actions/facebooksettings.php:194
+#: actions/facebooksettings.php:192
 msgid "Disconnect my account from Facebook"
 msgstr "Mijn gebruiker loskoppelen van Facebook"
 
-#: actions/facebooksettings.php:202
+#: actions/facebooksettings.php:199
 #, php-format
 msgid ""
 "Disconnecting your Faceboook would make it impossible to log in! Please [set "
@@ -285,40 +285,36 @@ msgstr ""
 "Door los te koppelen van Faceboook zou u niet meer kunnen aanmelden! [Stel "
 "eerst een wachtwoord in](%s)."
 
-#: actions/facebooksettings.php:215
+#: actions/facebooksettings.php:213
+#, fuzzy, php-format
 msgid ""
-"Keep your %1$s account but disconnect from Facebook. You'll use your 1%$s "
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
 "password to log in."
 msgstr ""
 "Uw gebruiker bij %1$s behouden maar deze loskoppelen van Facebook. U kunt uw "
 "wachtwoord van %1$s gebruiken om aan te melden."
 
 #. TRANS: Submit button.
-#: actions/facebooksettings.php:222
+#: actions/facebooksettings.php:220
 msgctxt "BUTTON"
 msgid "Disconnect"
 msgstr "Loskoppelen"
 
-#: actions/facebooksettings.php:246
+#: actions/facebooksettings.php:243
 msgid "There was a problem saving your sync preferences."
 msgstr ""
 "Er is een fout opgetreden tijdens het opslaan van uw "
 "synchronisatievoorkeuren."
 
 #. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: actions/facebooksettings.php:249
+#: actions/facebooksettings.php:246
 msgid "Sync preferences saved."
 msgstr "Uw synchronisatievoorkeuren zijn opgeslagen."
 
-#: actions/facebooksettings.php:264
+#: actions/facebooksettings.php:260
 msgid "Couldn't delete link to Facebook."
 msgstr "Het was niet mogelijk de verwijzing naar Facebook te verwijderen."
 
-#: actions/facebooksettings.php:268
+#: actions/facebooksettings.php:264
 msgid "You have disconnected from Facebook."
 msgstr "U bent losgekoppeld van Facebook."
-
-#~ 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/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
new file mode 100644
index 000000000..600f86dce
--- /dev/null
+++ b/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
@@ -0,0 +1,316 @@
+# Translation of StatusNet - FacebookBridge to Ukrainian (Українська)
+# Expored from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - FacebookBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11: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-11-30 20:40:35+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); 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-facebookbridge\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: Menu item.
+#. TRANS: Menu item tab.
+#: FacebookBridgePlugin.php:201 FacebookBridgePlugin.php:240
+#: FacebookBridgePlugin.php:281
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:203
+msgid "Login or register using Facebook"
+msgstr "Увійти або зареєструватись з Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:242
+msgid "Facebook integration configuration"
+msgstr "Налаштування інтеграції з Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#. TRANS: Page title for Facebook settings.
+#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+msgid "Facebook settings"
+msgstr "Налаштування Facebook"
+
+#: FacebookBridgePlugin.php:547
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Додаток для інтеграції StatusNet з Facebook."
+
+#: lib/facebookclient.php:776
+msgid "Your Facebook connection has been removed"
+msgstr "З’єднання з Facebook було видалено"
+
+#: lib/facebookclient.php:835
+#, php-format
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Зверніться до адміністратора %s, аби відновити свій обліковий запис"
+
+#: actions/facebookfinishlogin.php:88
+msgid ""
+"You must be logged into Facebook to register a local account using Facebook."
+msgstr ""
+"Спочатку ви маєте увійти до Facebook, аби мати змогу зареєструвати акаунт на "
+"цьому сервісі за допомогою Facebook."
+
+#: actions/facebookfinishlogin.php:118
+msgid "There is already a local account linked with that Facebook account."
+msgstr "Один з тутешніх акаунтів вже прив’язаний до цього профілю у Facebook."
+
+#: actions/facebookfinishlogin.php:141 actions/facebooksettings.php:86
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Виникла проблема з вашим токеном сесії. Спробуйте пізніше, будь ласка."
+
+#: actions/facebookfinishlogin.php:150
+msgid "You can't register if you don't agree to the license."
+msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії."
+
+#: actions/facebookfinishlogin.php:167
+msgid "An unknown error has occured."
+msgstr "Сталася невідома помилка."
+
+#: actions/facebookfinishlogin.php:185
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your "
+"Facebook to a local account. You can either create a new local account, or "
+"connect with an existing local account."
+msgstr ""
+"Ви вперше увійшли до сайту %s, отже ми мусимо приєднати ваш акаунт Facebook "
+"до акаунту на даному сайті. Ви маєте можливість створити новий акаунт або "
+"використати такий, що вже існує."
+
+#. TRANS: Page title.
+#: actions/facebookfinishlogin.php:195
+msgid "Facebook Setup"
+msgstr "Установки Facebook"
+
+#. TRANS: Legend.
+#: actions/facebookfinishlogin.php:229
+msgid "Connection options"
+msgstr "Опції з’єднання"
+
+#. TRANS: %s is the name of the license used by the user for their status updates.
+#: actions/facebookfinishlogin.php:239
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+"Мої дописи і файли доступні на умовах %s, окрім цих приватних даних: пароль, "
+"електронна адреса, адреса IM, телефонний номер."
+
+#. TRANS: Legend.
+#: actions/facebookfinishlogin.php:256
+msgid "Create new account"
+msgstr "Створити новий акаунт"
+
+#: actions/facebookfinishlogin.php:258
+msgid "Create a new user with this nickname."
+msgstr "Створити нового користувача з цим нікнеймом."
+
+#. TRANS: Field label.
+#: actions/facebookfinishlogin.php:262
+msgid "New nickname"
+msgstr "Новий псевдонім"
+
+#: actions/facebookfinishlogin.php:264
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+"1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
+
+#. TRANS: Submit button.
+#: actions/facebookfinishlogin.php:268
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Створити"
+
+#: actions/facebookfinishlogin.php:274
+msgid "Connect existing account"
+msgstr "Приєднати акаунт, який вже існує"
+
+#: actions/facebookfinishlogin.php:276
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr ""
+"Якщо ви вже маєте акаунт, увійдіть з вашим ім’ям користувача та паролем, аби "
+"приєднати їх до Facebook."
+
+#. TRANS: Field label.
+#: actions/facebookfinishlogin.php:280
+msgid "Existing nickname"
+msgstr "Нікнейм, який вже існує"
+
+#: actions/facebookfinishlogin.php:283
+msgid "Password"
+msgstr "Пароль"
+
+#. TRANS: Submit button.
+#: actions/facebookfinishlogin.php:287
+msgctxt "BUTTON"
+msgid "Connect"
+msgstr "Під’єднати"
+
+#. TRANS: Client error trying to register with registrations not allowed.
+#. TRANS: Client error trying to register with registrations 'invite only'.
+#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+msgid "Registration not allowed."
+msgstr "Реєстрацію не дозволено."
+
+#. TRANS: Client error trying to register with an invalid invitation code.
+#: actions/facebookfinishlogin.php:322
+msgid "Not a valid invitation code."
+msgstr "Це не дійсний код запрошення."
+
+#: actions/facebookfinishlogin.php:335
+msgid "Nickname not allowed."
+msgstr "Нікнейм не допускається."
+
+#: actions/facebookfinishlogin.php:340
+msgid "Nickname already in use. Try another one."
+msgstr "Це ім’я вже використовується. Спробуйте інше."
+
+#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+msgid "Error connecting user to Facebook."
+msgstr "Помилка при підключенні до Facebook."
+
+#: actions/facebookfinishlogin.php:468
+msgid "Invalid username or password."
+msgstr "Недійсне ім’я або пароль."
+
+#: actions/facebooklogin.php:43
+msgid "Already logged in."
+msgstr "Ви вже увійшли."
+
+#. TRANS: Instructions.
+#: actions/facebooklogin.php:52
+msgid "Login with your Facebook Account"
+msgstr "Увійти з акаунтом Facebook"
+
+#. TRANS: Page title.
+#: actions/facebooklogin.php:67
+msgid "Login with Facebook"
+msgstr "Увійти з Facebook"
+
+#: actions/facebookadminpanel.php:52
+msgid "Facebook"
+msgstr "Facebook"
+
+#: actions/facebookadminpanel.php:62
+msgid "Facebook integration settings"
+msgstr "Налаштування інтеграції з Facebook"
+
+#: actions/facebookadminpanel.php:123
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr ""
+"Неприпустимий ідентифікатор Facebook. Максимальна довжина — 255 символів."
+
+#: actions/facebookadminpanel.php:129
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr "Помилковий секретний код Facebook. Максимальна довжина — 255 символів."
+
+#: actions/facebookadminpanel.php:178
+msgid "Facebook application settings"
+msgstr "Налаштування додатку для Facebook"
+
+#: actions/facebookadminpanel.php:184
+msgid "Application ID"
+msgstr "Ідентифікатор додатку"
+
+#: actions/facebookadminpanel.php:185
+msgid "ID of your Facebook application"
+msgstr "Ідентифікатор вашого додатку Facebook"
+
+#: actions/facebookadminpanel.php:193
+msgid "Secret"
+msgstr "Секретний код"
+
+#: actions/facebookadminpanel.php:194
+msgid "Application secret"
+msgstr "Секретний код додатку"
+
+#: actions/facebookadminpanel.php:210
+msgid "Save"
+msgstr "Зберегти"
+
+#: actions/facebookadminpanel.php:210
+msgid "Save Facebook settings"
+msgstr "Зберегти налаштування Facebook"
+
+#: actions/facebooksettings.php:137
+msgid "Connected Facebook user"
+msgstr "Під’єднаний користувач Facebook"
+
+#: actions/facebooksettings.php:164
+msgid "Publish my notices to Facebook."
+msgstr "Публікувати мої дописи у Facebook."
+
+#: actions/facebooksettings.php:174
+msgid "Send \"@\" replies to Facebook."
+msgstr "Надсилати «@» відповіді до Facebook."
+
+#. TRANS: Submit button to save synchronisation settings.
+#: actions/facebooksettings.php:183
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зберегти"
+
+#. TRANS: Legend.
+#: actions/facebooksettings.php:192
+msgid "Disconnect my account from Facebook"
+msgstr "Від’єднати мій акаунт від Facebook"
+
+#: actions/facebooksettings.php:199
+#, php-format
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please [set "
+"a password](%s) first."
+msgstr ""
+"Якщо від’єднати ваш акаунт від Faceboook зараз, то це унеможливить вхід до "
+"сервісу у майбутньому! Будь ласка, спочатку [встановіть пароль](%s)."
+
+#: actions/facebooksettings.php:213
+#, fuzzy, php-format
+msgid ""
+"Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
+"password to log in."
+msgstr ""
+"Зберегти ваш акаунт %1$s, але від’єднати його від Facebook. Ви можете "
+"використовувати пароль від %1$s для входу на сайт."
+
+#. TRANS: Submit button.
+#: actions/facebooksettings.php:220
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Від’єднати"
+
+#: actions/facebooksettings.php:243
+msgid "There was a problem saving your sync preferences."
+msgstr "Виникла проблема при збереженні параметрів синхронізації."
+
+#. TRANS: Confirmation that synchronisation settings have been saved into the system.
+#: actions/facebooksettings.php:246
+msgid "Sync preferences saved."
+msgstr "Параметри синхронізації збережено."
+
+#: actions/facebooksettings.php:260
+msgid "Couldn't delete link to Facebook."
+msgstr "Не можу видалити посилання на Facebook."
+
+#: actions/facebooksettings.php:264
+msgid "You have disconnected from Facebook."
+msgstr "Ви від’єдналися від Facebook."