Merge branch '0.9.x' into 1.0.x

Conflicts:
	actions/subscriptions.php
	lib/router.php
	lib/xmppmanager.php
	lib/xmppoutqueuehandler.php

1 files changed, 14 insertions, 14 deletions

diff --git a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
index 001358077..a4cbfe32f 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-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:36+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:04:59+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-04 23:10:56+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-20 17:54:47+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75280); 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"
@@ -207,9 +207,9 @@ msgstr "Nome de usuario ou contrasinal incorrectos."
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$s is a page number.
 #: facebookhome.php:153
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s and friends, page %2$d"
-msgstr "%s e amigos"
+msgstr "%1$s e amigos, páxina %2$d"
 
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname
@@ -228,7 +228,7 @@ msgstr ""
 
 #: facebookhome.php:210
 msgid "Okay, do it!"
-msgstr ""
+msgstr "De acordo, facédeo!"
 
 #. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
 #: facebookhome.php:217
@@ -288,7 +288,7 @@ msgstr "Enviar as invitacións"
 #: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
 msgctxt "MENU"
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #: FacebookPlugin.php:190
@@ -342,7 +342,7 @@ msgstr ""
 #: facebookaction.php:169
 msgctxt "MENU"
 msgid "Home"
-msgstr ""
+msgstr "Inicio"
 
 #. TRANS: Tooltip for 'Home' link that leads to a start page.
 #: facebookaction.php:171
@@ -353,7 +353,7 @@ msgstr "Inicio"
 #: facebookaction.php:180
 msgctxt "MENU"
 msgid "Invite"
-msgstr ""
+msgstr "Convidar"
 
 #. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
 #: facebookaction.php:182
@@ -364,7 +364,7 @@ msgstr "Convidar"
 #: facebookaction.php:192
 msgctxt "MENU"
 msgid "Settings"
-msgstr ""
+msgstr "Parámetros"
 
 #. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
 #: facebookaction.php:194
@@ -394,7 +394,7 @@ msgstr "Alcume"
 #: facebookaction.php:282
 msgctxt "BUTTON"
 msgid "Login"
-msgstr ""
+msgstr "Rexistro"
 
 #: facebookaction.php:288
 msgid "Lost or forgotten password?"
@@ -495,7 +495,7 @@ msgstr " primeiro."
 #: FBConnectSettings.php:145
 msgctxt "BUTTON"
 msgid "Disconnect"
-msgstr ""
+msgstr "Desconectarse"
 
 #: FBConnectSettings.php:180
 msgid "Couldn't delete link to Facebook."
@@ -530,7 +530,7 @@ msgstr ""
 #: facebooksettings.php:102
 msgctxt "BUTTON"
 msgid "Save"
-msgstr ""
+msgstr "Gardar"
 
 #. TRANS: %s is the application name.
 #: facebooksettings.php:111