Merge branch '1.0.x' into schema-x

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

8 files changed, 65 insertions, 63 deletions

diff --git a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
index b3e3c5358..ba7c15f96 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-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:42:54+0000\n"
+"POT-Creation-Date: 2010-10-23 18:02+0000\n"
+"PO-Revision-Date: 2010-10-23 18:04:58+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-09 14:34:55+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74952); 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: de\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -352,7 +352,7 @@ msgstr "Logge dich mit deinem Facebook-Benutzerkonto ein"
 #. TRANS: Page title.
 #: FBConnectLogin.php:57
 msgid "Facebook Login"
-msgstr ""
+msgstr "Facebook Login"
 
 #: facebookremove.php:53
 msgid "Couldn't remove Facebook user: already deleted."
@@ -471,7 +471,7 @@ msgstr "Von Facebook bereitgestellter API-Schlüssel"
 
 #: facebookadminpanel.php:193
 msgid "Secret"
-msgstr ""
+msgstr "Geheim"
 
 #: facebookadminpanel.php:194
 msgid "API secret provided by Facebook"
@@ -513,7 +513,7 @@ msgstr ""
 #. TRANS: Preceded by "Please " and followed by " first."
 #: FBConnectSettings.php:130
 msgid "set a password"
-msgstr ""
+msgstr "Passwort vergeben"
 
 #. TRANS: Preceded by "Please set a password".
 #: FBConnectSettings.php:132
@@ -528,15 +528,15 @@ msgstr "Abmelden"
 
 #: FBConnectSettings.php:180
 msgid "Couldn't delete link to Facebook."
-msgstr ""
+msgstr "Link zu Facebook konnte nicht gelöscht werden."
 
 #: FBConnectSettings.php:196
 msgid "You have disconnected from Facebook."
-msgstr ""
+msgstr "Sie sind bei Facebook abgemeldet."
 
 #: FBConnectSettings.php:199
 msgid "Not sure what you're trying to do."
-msgstr ""
+msgstr "Prozess konnte nicht verarbeitet werden."
 
 #: facebooksettings.php:61
 msgid "There was a problem saving your sync preferences!"
diff --git a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
index 5c23e606f..c2d798d9d 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-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:42:54+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: 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-09 14:34:55+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74952); 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: fr\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -355,7 +355,7 @@ msgstr "Connexion Facebook"
 
 #: facebookremove.php:53
 msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
+msgstr "Impossible de supprimer l’utilisateur Facebook : déjà supprimé."
 
 #: facebookremove.php:63
 msgid "Couldn't remove Facebook user."
@@ -370,7 +370,7 @@ msgstr "Accueil"
 #. TRANS: Tooltip for 'Home' link that leads to a start page.
 #: facebookaction.php:171
 msgid "Home"
-msgstr "Page d’accueil"
+msgstr "Accueil"
 
 #. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
 #: facebookaction.php:180
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
diff --git a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
index dad630000..39e66eae3 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-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:42:54+0000\n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:03:20+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-09 14:34:55+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:29:08+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); 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"
@@ -347,7 +347,7 @@ msgstr "Authentication con Facebook"
 
 #: facebookremove.php:53
 msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
+msgstr "Non poteva remover usator de Facebook: jam delite."
 
 #: facebookremove.php:63
 msgid "Couldn't remove Facebook user."
diff --git a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
index 5fa2d31a3..ae4d971a4 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-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:42:55+0000\n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:03:20+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-09 14:34:55+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:29:08+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); 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"
@@ -348,7 +348,7 @@ msgstr "Најава со Facebook"
 
 #: facebookremove.php:53
 msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
+msgstr "Не можев да го отстранам корисникот на Facebook: веќе е избришан."
 
 #: facebookremove.php:63
 msgid "Couldn't remove Facebook user."
@@ -437,7 +437,7 @@ msgstr "Facebook"
 
 #: facebookadminpanel.php:62
 msgid "Facebook integration settings"
-msgstr "Поставки за обедунување со Facebook"
+msgstr "Поставки за обединување со Facebook"
 
 #: facebookadminpanel.php:123
 msgid "Invalid Facebook API key. Max length is 255 characters."
diff --git a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
index d0b778bcb..2cfa7dfc0 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-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: 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-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: no\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -166,12 +166,12 @@ msgstr "Ugyldig brukernavn eller passord."
 #. TRANS: Page title.
 #: facebooklogin.php:90 facebookaction.php:255
 msgid "Login"
-msgstr ""
+msgstr "Logg inn"
 
 #. TRANS: Legend.
 #: facebooknoticeform.php:144
 msgid "Send a notice"
-msgstr ""
+msgstr "Send en notis"
 
 #. TRANS: Field label.
 #: facebooknoticeform.php:157
@@ -200,9 +200,9 @@ msgstr "Feil brukernavn eller passord."
 #. 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 og venner"
+msgstr "%1$s og venner, side %2$d"
 
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname
@@ -231,7 +231,7 @@ msgstr "Hopp over"
 
 #: facebookhome.php:244 facebookaction.php:336
 msgid "Pagination"
-msgstr ""
+msgstr "Paginering"
 
 #. TRANS: Pagination link.
 #: facebookhome.php:254 facebookaction.php:345
@@ -247,23 +247,23 @@ msgstr "Før"
 #: facebookinvite.php:69
 #, php-format
 msgid "Thanks for inviting your friends to use %s."
-msgstr ""
+msgstr "Takk for at du inviterte vennene dine til å bruke %s."
 
 #. TRANS: Followed by an unordered list with invited friends.
 #: facebookinvite.php:72
 msgid "Invitations have been sent to the following users:"
-msgstr ""
+msgstr "Invitasjoner har blitt sendt til følgende brukere:"
 
 #: facebookinvite.php:91
 #, php-format
 msgid "You have been invited to %s"
-msgstr ""
+msgstr "Du har blitt invitert til å %s"
 
 #. TRANS: %s is the name of the site.
 #: facebookinvite.php:101
 #, php-format
 msgid "Invite your friends to use %s"
-msgstr ""
+msgstr "Inviter vennene dine til å bruke %s"
 
 #. TRANS: %s is the name of the site.
 #: facebookinvite.php:124
diff --git a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
index ef24b9259..c9ad7ee95 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-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:42:55+0000\n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:03:20+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-09 14:34:55+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:29:08+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); 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"
@@ -356,6 +356,8 @@ msgstr "Aanmelden via Facebook"
 #: facebookremove.php:53
 msgid "Couldn't remove Facebook user: already deleted."
 msgstr ""
+"Het was niet mogelijk om de Facebookgebruiker te verwijderen: gebruiker is "
+"al verwijderd."
 
 #: facebookremove.php:63
 msgid "Couldn't remove Facebook user."
diff --git a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
index a93ebc4fd..6a9a7b514 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-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:42:55+0000\n"
+"POT-Creation-Date: 2010-10-20 00:18+0000\n"
+"PO-Revision-Date: 2010-10-20 00:20:57+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-09 14:34:55+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-19 23:49:54+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); 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"
@@ -351,7 +351,7 @@ msgstr "Вхід Facebook"
 
 #: facebookremove.php:53
 msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
+msgstr "Не вдалося видалити користувача Facebook: вже видалений."
 
 #: facebookremove.php:63
 msgid "Couldn't remove Facebook user."