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

1 files changed, 42 insertions, 0 deletions

diff --git a/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po b/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po
new file mode 100644
index 000000000..93d1af8b5
--- /dev/null
+++ b/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po
@@ -0,0 +1,42 @@
+# Translation of StatusNet - Minify 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 - Minify\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:56+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-09-27 23:19:56+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-minify\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: minify.php:49
+msgid "The parameter \"f\" is not a valid path."
+msgstr "Le parametro \"f\" non es un cammino valide."
+
+#: minify.php:53
+msgid "The parameter \"f\" is required but missing."
+msgstr "Le parametro \"f\" es necessari, ma manca."
+
+#: minify.php:111
+msgid "File type not supported."
+msgstr "Typo de file non supportate."
+
+#: MinifyPlugin.php:179
+msgid ""
+"The Minify plugin minifies StatusNet's CSS and JavaScript, removing "
+"whitespace and comments."
+msgstr ""
+"Le plug-in Minify minimisa le CSS e JavaScript de StatusNet, removente "
+"spatio blanc e commentos."