Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
	actions/hostmeta.php
	actions/imsettings.php
	classes/User.php
	lib/adminpanelaction.php
	lib/channel.php
	lib/default.php
	lib/router.php
	lib/util.php

11 files changed, 298 insertions, 3 deletions

diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php
index 06ea49ff5..b63cc8a55 100644
--- a/plugins/LilUrl/LilUrlPlugin.php
+++ b/plugins/LilUrl/LilUrlPlugin.php
@@ -38,7 +38,7 @@ class LilUrlPlugin extends UrlShortenerPlugin
     function onInitializePlugin(){
         parent::onInitializePlugin();
         if(!isset($this->serviceUrl)){
-            throw new Exception("must specify a serviceUrl");
+            throw new Exception(_m('A serviceUrl must be specified.'));
         }
     }
 
@@ -69,4 +69,3 @@ class LilUrlPlugin extends UrlShortenerPlugin
         return true;
     }
 }
-
diff --git a/plugins/LilUrl/locale/LilUrl.pot b/plugins/LilUrl/locale/LilUrl.pot
index 47ed36727..65f0baf68 100644
--- a/plugins/LilUrl/locale/LilUrl.pot
+++ b/plugins/LilUrl/locale/LilUrl.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-29 23:39+0000\n"
+"POT-Creation-Date: 2010-10-03 19:53+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"
@@ -16,6 +16,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: LilUrlPlugin.php:43
+msgid "A serviceUrl must be specified."
+msgstr ""
+
 #: LilUrlPlugin.php:68
 #, php-format
 msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
diff --git a/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po
new file mode 100644
index 000000000..9594e8354
--- /dev/null
+++ b/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - LilUrl 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LilUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:52+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-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); 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-lilurl\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: LilUrlPlugin.php:43
+msgid "A serviceUrl must be specified."
+msgstr "Une URL de service doit être spécifiée."
+
+#: LilUrlPlugin.php:68
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Utilise le service de raccourcissement d’URL <a href=\"http://%1$s/\">%1$s</"
+"a>."
diff --git a/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po
new file mode 100644
index 000000000..a1a360101
--- /dev/null
+++ b/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - LilUrl 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 - LilUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:52+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-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); 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-lilurl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: LilUrlPlugin.php:43
+msgid "A serviceUrl must be specified."
+msgstr "Un serviceUrl debe esser specificate."
+
+#: LilUrlPlugin.php:68
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Usa le servicio de accurtamento de URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po
new file mode 100644
index 000000000..97261be9f
--- /dev/null
+++ b/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - LilUrl to Japanese (日本語)
+# Expored from translatewiki.net
+#
+# Author: 青子守歌
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LilUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:52+0000\n"
+"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ja\n"
+"X-Message-Group: #out-statusnet-plugin-lilurl\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: LilUrlPlugin.php:43
+msgid "A serviceUrl must be specified."
+msgstr ""
+
+#: LilUrlPlugin.php:68
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "<a href=\"http://%1$s/\">%1$s</a>をURL短縮サービスとして利用する。"
diff --git a/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po
new file mode 100644
index 000000000..7a09a9df6
--- /dev/null
+++ b/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po
@@ -0,0 +1,33 @@
+# Translation of StatusNet - LilUrl to Macedonian (Македонски)
+# Expored from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LilUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:52+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-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); 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-lilurl\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#: LilUrlPlugin.php:43
+msgid "A serviceUrl must be specified."
+msgstr "Мора да се назначи адреса на службата (serviceUrl)."
+
+#: LilUrlPlugin.php:68
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Користи <a href=\"http://%1$s/\">%1$s</a> - служба за скратување на URL-"
+"адреси."
diff --git a/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po
new file mode 100644
index 000000000..4699be8b2
--- /dev/null
+++ b/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - LilUrl to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
+# Expored from translatewiki.net
+#
+# Author: Nghtwlkr
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LilUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:52+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-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); 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-lilurl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: LilUrlPlugin.php:43
+msgid "A serviceUrl must be specified."
+msgstr "En tjeneste-Url må spesifiseres."
+
+#: LilUrlPlugin.php:68
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "Bruker URL-forkortertjenesten <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po
new file mode 100644
index 000000000..a139c9d4f
--- /dev/null
+++ b/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po
@@ -0,0 +1,33 @@
+# Translation of StatusNet - LilUrl to Dutch (Nederlands)
+# Expored from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LilUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:52+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-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); 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-lilurl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: LilUrlPlugin.php:43
+msgid "A serviceUrl must be specified."
+msgstr "Er moet een serviceUrl opgegeven worden."
+
+#: LilUrlPlugin.php:68
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Gebruikt de dienst <a href=\"http://%1$s/\">%1$s</a> om URL's korter te "
+"maken."
diff --git a/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po
new file mode 100644
index 000000000..1523fd5cd
--- /dev/null
+++ b/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - LilUrl to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: Eleferen
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LilUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:52+0000\n"
+"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-plugin-lilurl\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"
+
+#: LilUrlPlugin.php:43
+msgid "A serviceUrl must be specified."
+msgstr "Должен быть указан URL-адрес сервису."
+
+#: LilUrlPlugin.php:68
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr "Использование службы сокращения URL <a href=\"http://%1$s/\">%1$s</a>."
diff --git a/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po
new file mode 100644
index 000000000..f7dfe8a18
--- /dev/null
+++ b/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po
@@ -0,0 +1,33 @@
+# Translation of StatusNet - LilUrl to Tagalog (Tagalog)
+# Expored from translatewiki.net
+#
+# Author: AnakngAraw
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - LilUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:53+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-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); 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-lilurl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: LilUrlPlugin.php:43
+msgid "A serviceUrl must be specified."
+msgstr "Dapat tukuyin ang isang URL ng palingkuran."
+
+#: LilUrlPlugin.php:68
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Gumagamit ng <a href=\"http://%1$s/\">%1$s</a> na serbisyong pampaikli ng "
+"URL."
diff --git a/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po
new file mode 100644
index 000000000..5eb5059c6
--- /dev/null
+++ b/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po
@@ -0,0 +1,33 @@
+# Translation of StatusNet - LilUrl 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 - LilUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:53+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-01 20:38:59+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); 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-lilurl\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"
+
+#: LilUrlPlugin.php:43
+msgid "A serviceUrl must be specified."
+msgstr "URL-адресу сервісу має бути зазначено."
+
+#: LilUrlPlugin.php:68
+#, php-format
+msgid "Uses <a href=\"http://%1$s/\">%1$s</a> URL-shortener service."
+msgstr ""
+"Використання <a href=\"http://%1$s/\">%1$s</a> для скорочення URL-адрес."