Merge branch '0.9.x' into 1.0.x

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

6 files changed, 32 insertions, 36 deletions

diff --git a/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po
index 4b3a4c78a..49e10b024 100644
--- a/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:43:21+0000\n"
+"POT-Creation-Date: 2010-10-20 00:18+0000\n"
+"PO-Revision-Date: 2010-10-20 00:21:19+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:36:34+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-19 23:49:55+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: de\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: OpenExternalLinkTargetPlugin.php:59
-#, fuzzy
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
 "Öffnet externe Links (mit rel=external) in einem neuen Fenster oder Tab."
diff --git a/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
index 2ef0e2924..596593888 100644
--- a/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - OpenExternalLinkTarget to French (Français)
 # Expored from translatewiki.net
 #
+# Author: Peter17
 # Author: Verdy p
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,20 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:43:21+0000\n"
+"POT-Creation-Date: 2010-10-20 17:39+0000\n"
+"PO-Revision-Date: 2010-10-20 17:42:16+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:36:34+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-20 01:18:29+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75070); 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-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: OpenExternalLinkTargetPlugin.php:59
-#, fuzzy
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
 "Ouvre les liens externes (p. ex., avec rel=external) dans une nouvelle "
diff --git a/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
index aa191d266..65aa5dc31 100644
--- a/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,21 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:43:21+0000\n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:03:46+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:36:34+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:33:42+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-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: OpenExternalLinkTargetPlugin.php:59
-#, fuzzy
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
-"Aperi ligamines externe (p.ex. con rel=external) in un nove fenestra o "
-"scheda."
+"Aperi ligamines externe (i.e. con rel=external) in un nove fenestra o scheda."
diff --git a/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
index c8088c712..9dcc804c6 100644
--- a/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,20 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:43:21+0000\n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:03:46+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:36:34+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:33:42+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-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #: OpenExternalLinkTargetPlugin.php:59
-#, fuzzy
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
-"Отвора надворешни врски (на пр. со rel=external) во нов прозорец или јазиче."
+"Отвора надворешни врски (т.е. со rel=external) во нов прозорец или јазиче."
diff --git a/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
index e3ec4647b..3a3d82cca 100644
--- a/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,21 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:43:21+0000\n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:03:46+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:36:34+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-18 20:33:42+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-openexternallinktarget\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: OpenExternalLinkTargetPlugin.php:59
-#, fuzzy
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
 msgstr ""
-"Opent externe verwijzingen in een nieuw venster of tabblad (bv. met "
-"\"rel=external\")."
+"Opent externe verwijzingen (met \"rel=external\") in een nieuw venster of "
+"tabblad."
diff --git a/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
index 57b647c65..f6a328095 100644
--- a/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:43:22+0000\n"
+"POT-Creation-Date: 2010-10-20 00:18+0000\n"
+"PO-Revision-Date: 2010-10-20 00:21:19+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:36:34+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-19 23:49:55+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-openexternallinktarget\n"
@@ -23,6 +23,7 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #: OpenExternalLinkTargetPlugin.php:59
-#, fuzzy
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
-msgstr "Відкривати зовнішні посилання у новому вікні або вкладці."
+msgstr ""
+"Відкривати зовнішні посилання (тобто з rel=external) у новому вікні або "
+"вкладці."