Merge branch 'master' into share_api

Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php

1 files changed, 73 insertions, 0 deletions

diff --git a/l10n/ar_SA/admin_dependencies_chk.po b/l10n/ar_SA/admin_dependencies_chk.po
new file mode 100644
index 00000000000..defa48d8f6f
--- /dev/null
+++ b/l10n/ar_SA/admin_dependencies_chk.po
@@ -0,0 +1,73 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-13 23:12+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar_SA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: settings.php:33
+msgid ""
+"The php-json module is needed by the many applications for inter "
+"communications"
+msgstr ""
+
+#: settings.php:39
+msgid ""
+"The php-curl modude is needed to fetch the page title when adding a "
+"bookmarks"
+msgstr ""
+
+#: settings.php:45
+msgid "The php-gd module is needed to create thumbnails of your images"
+msgstr ""
+
+#: settings.php:51
+msgid "The php-ldap module is needed connect to your ldap server"
+msgstr ""
+
+#: settings.php:57
+msgid "The php-zip module is needed download multiple files at once"
+msgstr ""
+
+#: settings.php:63
+msgid ""
+"The php-mb_multibyte module is needed to manage correctly the encoding."
+msgstr ""
+
+#: settings.php:69
+msgid "The php-ctype module is needed validate data."
+msgstr ""
+
+#: settings.php:75
+msgid "The php-xml module is needed to share files with webdav."
+msgstr ""
+
+#: settings.php:81
+msgid ""
+"The allow_url_fopen directive of your php.ini should be set to 1 to retrieve"
+" knowledge base from OCS servers"
+msgstr ""
+
+#: settings.php:87
+msgid "The php-pdo module is needed to store owncloud data into a database."
+msgstr ""
+
+#: templates/settings.php:2
+msgid "Dependencies status"
+msgstr ""
+
+#: templates/settings.php:7
+msgid "Used by :"
+msgstr ""