Fix merge conflicts

92 files changed, 1861 insertions, 508 deletions

diff --git a/settings/admin.php b/settings/admin.php
index 8369ee64e06..a36f2190386 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 OC_Util::checkAdminUser();
 
 OC_Util::addStyle( "settings", "settings" );
@@ -18,16 +18,24 @@ $forms=OC_App::getForms('admin');
 $htaccessworking=OC_Util::ishtaccessworking();
 
 $entries=OC_Log_Owncloud::getEntries(3);
-function compareEntries($a,$b){
+$entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
+
+function compareEntries($a,$b) {
 	return $b->time - $a->time;
 }
 usort($entries, 'compareEntries');
 
 $tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
 $tmpl->assign('entries',$entries);
+$tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking',$htaccessworking);
+$tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
+$tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
+$tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
+$tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
+$tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
 $tmpl->assign('forms',array());
-foreach($forms as $form){
+foreach($forms as $form) {
 	$tmpl->append('forms',$form);
 }
 $tmpl->printPage();
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
new file mode 100644
index 00000000000..71cb046fc8d
--- /dev/null
+++ b/settings/ajax/apps/ocs.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// Init owncloud
+require_once '../../../lib/base.php';
+
+OC_JSON::checkAdminUser();
+
+$l = OC_L10N::get('core');
+
+if(OC_Config::getValue('appstoreenabled', true)==false) {
+	OCP\JSON::success(array('type' => 'external', 'data' => array()));
+}
+
+$enabledApps=OC_App::getEnabledApps();
+
+if(is_null($enabledApps)) {
+	OCP\JSON::error(array('data' => array('message' => $l->t('Unable to load list from App Store'))));
+}
+
+$apps=array();
+
+// apps from external repo via OCS
+$catagoryNames=OC_OCSClient::getCategories();
+if(is_array($catagoryNames)) {
+	$categories=array_keys($catagoryNames);
+	$page=0;
+	$filter='approved';
+	$externalApps=OC_OCSClient::getApplications($categories, $page, $filter);
+	foreach($externalApps as $app) {
+		// show only external apps that aren't enabled yet
+		$local=false;
+		foreach($enabledApps as $a) {
+			if($a == $app['name']) {
+				$local=true;
+			}
+		}
+
+		if(!$local) {
+			if($app['preview']=='') {
+				$pre='trans.png';
+			} else {
+				$pre=$app['preview'];
+			}
+			$apps[]=array(
+				'name'=>$app['name'],
+				'id'=>$app['id'],
+				'active'=>false,
+				'description'=>$app['description'],
+				'author'=>$app['personid'],
+				'license'=>$app['license'],
+				'preview'=>$pre,
+				'internal'=>false,
+				'internallabel'=>'3rd Party App',
+			);
+		}
+	}
+}
+
+OCP\JSON::success(array('type' => 'external', 'data' => $apps));
+
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 4ba6813517b..b251fea504b 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -1,7 +1,8 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
+OCP\JSON::callCheck();
 
 $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
 $password = $_POST["password"];
@@ -11,13 +12,24 @@ $oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
-if( (!OC_Group::inGroup( OC_User::getUser(), 'admin' ) && ($username!=OC_User::getUser() || !OC_User::checkPassword($username,$oldPassword)))) {
+$userstatus = null;
+if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
+	$userstatus = 'admin';
+}
+if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
+	$userstatus = 'subadmin';
+}
+if(OC_User::getUser() == $username && OC_User::checkPassword($username, $oldPassword)) {
+	$userstatus = 'user';
+}
+
+if(is_null($userstatus)) {
 	OC_JSON::error( array( "data" => array( "message" => "Authentication error" )));
 	exit();
 }
 
 // Return Success story
-if( OC_User::setPassword( $username, $password )){
+if( OC_User::setPassword( $username, $password )) {
 	OC_JSON::success(array("data" => array( "username" => $username )));
 }
 else{
diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index af8ad3dd8c0..83733ac4d2d 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -1,11 +1,12 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
+OCP\JSON::callCheck();
 
 // Check if we are a user
-if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
-	OC_JSON::error(array("data" => array( "message" => "Authentication error" )));
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )) {
+	OC_JSON::error(array("data" => array( "message" => $l->t("Authentication error") )));
 	exit();
 }
 
@@ -14,15 +15,15 @@ OCP\JSON::callCheck();
 $groupname = $_POST["groupname"];
 
 // Does the group exist?
-if( in_array( $groupname, OC_Group::getGroups())){
-	OC_JSON::error(array("data" => array( "message" => "Group already exists" )));
+if( in_array( $groupname, OC_Group::getGroups())) {
+	OC_JSON::error(array("data" => array( "message" => $l->t("Group already exists") )));
 	exit();
 }
 
 // Return Success story
-if( OC_Group::createGroup( $groupname )){
+if( OC_Group::createGroup( $groupname )) {
 	OC_JSON::success(array("data" => array( "groupname" => $groupname )));
 }
 else{
-	OC_JSON::error(array("data" => array( "message" => "Unable to add group" )));
+	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to add group") )));
 }
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index c56df4bc15a..bdf7e4983ac 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -1,24 +1,43 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
+OCP\JSON::callCheck();
 
 // Check if we are a user
-if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || (!OC_Group::inGroup( OC_User::getUser(), 'admin' ) && !OC_SubAdmin::isSubAdmin(OC_User::getUser()))) {
 	OC_JSON::error(array("data" => array( "message" => "Authentication error" )));
 	exit();
 }
 OCP\JSON::callCheck();
 
-$groups = array();
-if( isset( $_POST["groups"] )){
-	$groups = $_POST["groups"];
+$isadmin = OC_Group::inGroup(OC_User::getUser(), 'admin')?true:false;
+
+if($isadmin) {
+	$groups = array();
+	if( isset( $_POST["groups"] )) {
+		$groups = $_POST["groups"];
+	}
+}else{
+	if(isset( $_POST["groups"] )) {
+		$groups = array();
+		foreach($_POST["groups"] as $group) {
+			if(OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group)) {
+				$groups[] = $group;
+			}
+		}
+		if(count($groups) == 0) {
+			$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+		}
+	}else{
+		$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	}
 }
 $username = $_POST["username"];
 $password = $_POST["password"];
 
 // Does the group exist?
-if( in_array( $username, OC_User::getUsers())){
+if( in_array( $username, OC_User::getUsers())) {
 	OC_JSON::error(array("data" => array( "message" => "User already exists" )));
 	exit();
 }
@@ -26,13 +45,16 @@ if( in_array( $username, OC_User::getUsers())){
 // Return Success story
 try {
 	OC_User::createUser($username, $password);
-	foreach( $groups as $i ){
-		if(!OC_Group::groupExists($i)){
+	foreach( $groups as $i ) {
+		if(!OC_Group::groupExists($i)) {
 			OC_Group::createGroup($i);
 		}
 		OC_Group::addToGroup( $username, $i );
 	}
-	OC_JSON::success(array("data" => array( "username" => $username, "groups" => implode( ", ", OC_Group::getUserGroups( $username )))));
+	OC_JSON::success(array("data" => 
+				array( 
+					"username" => $username, 
+					"groups" => implode( ", ", OC_Group::getUserGroups( $username )))));
 } catch (Exception $exception) {
 	OC_JSON::error(array("data" => array( "message" => $exception->getMessage())));
 }
diff --git a/settings/ajax/disableapp.php b/settings/ajax/disableapp.php
index cc006988707..977a536af21 100644
--- a/settings/ajax/disableapp.php
+++ b/settings/ajax/disableapp.php
@@ -1,6 +1,6 @@
 <?php
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 OC_JSON::setContentTypeHeader();
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index bd53a50210c..1075a9a433c 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -1,13 +1,14 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 OC_JSON::setContentTypeHeader();
 
-if(OC_App::enable($_POST['appid'])){
-	OC_JSON::success();
-}else{
-	OC_JSON::error();
+$appid = OC_App::enable($_POST['appid']);
+if($appid !== false) {
+	OC_JSON::success(array('data' => array('appid' => $appid)));
+} else {
+	OC_JSON::error(array("data" => array( "message" => $l->t("Could not enable app. ") )));
 }
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index d9e80de37ba..9b9240f8253 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -6,7 +6,7 @@
  */
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 OC_JSON::checkAdminUser();
 
@@ -14,4 +14,6 @@ $count=(isset($_GET['count']))?$_GET['count']:50;
 $offset=(isset($_GET['offset']))?$_GET['offset']:0;
 
 $entries=OC_Log_Owncloud::getEntries($count,$offset);
-OC_JSON::success(array("data" => OC_Util::sanitizeHTML($entries)));
+OC_JSON::success(array(
+	"data" => OC_Util::sanitizeHTML($entries), 
+	"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false));
diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index 803a424854c..2a40ba09a8a 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -1,16 +1,16 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
 $l=OC_L10N::get('core');
 
 // Get data
-if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_EMAIL) ){
+if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_EMAIL) ) {
 	$email=trim($_POST['email']);
-	OC_Preferences::setValue(OC_User::getUser(),'settings','email',$email);
+	OC_Preferences::setValue(OC_User::getUser(), 'settings', 'email', $email);
 	OC_JSON::success(array("data" => array( "message" => $l->t("Email saved") )));
 }else{
 	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid email") )));
diff --git a/settings/ajax/openid.php b/settings/ajax/openid.php
index bf4ead06020..ecec085383c 100644
--- a/settings/ajax/openid.php
+++ b/settings/ajax/openid.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 $l=OC_L10N::get('settings');
 
@@ -10,9 +10,9 @@ OCP\JSON::callCheck();
 OC_JSON::checkAppEnabled('user_openid');
 
 // Get data
-if( isset( $_POST['identity'] ) ){
+if( isset( $_POST['identity'] ) ) {
 	$identity=$_POST['identity'];
-	OC_Preferences::setValue(OC_User::getUser(),'user_openid','identity',$identity);
+	OC_Preferences::setValue(OC_User::getUser(), 'user_openid', 'identity', $identity);
 	OC_JSON::success(array("data" => array( "message" => $l->t("OpenID Changed") )));
 }else{
 	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
diff --git a/settings/ajax/removegroup.php b/settings/ajax/removegroup.php
index f8c2065956c..33e1a514c88 100644
--- a/settings/ajax/removegroup.php
+++ b/settings/ajax/removegroup.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
@@ -9,9 +9,9 @@ OCP\JSON::callCheck();
 $name = $_POST["groupname"];
 
 // Return Success story
-if( OC_Group::deleteGroup( $name )){
+if( OC_Group::deleteGroup( $name )) {
 	OC_JSON::success(array("data" => array( "groupname" => $name )));
 }
 else{
-	OC_JSON::error(array("data" => array( "message" => "Unable to delete group" )));
+	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to delete group") )));
 }
diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 230815217c3..6b11fa5c4fb 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -1,17 +1,23 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
-OC_JSON::checkAdminUser();
+OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
 $username = $_POST["username"];
 
+if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
+	$l = OC_L10N::get('core');
+	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	exit();
+}
+
 // Return Success story
-if( OC_User::deleteUser( $username )){
+if( OC_User::deleteUser( $username )) {
 	OC_JSON::success(array("data" => array( "username" => $username )));
 }
 else{
-	OC_JSON::error(array("data" => array( "message" => "Unable to delete user" )));
+	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to delete user") )));
 }
diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php
index 54b103cd4fe..42eea7a96fd 100644
--- a/settings/ajax/setlanguage.php
+++ b/settings/ajax/setlanguage.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 $l=OC_L10N::get('settings');
 
@@ -10,10 +10,10 @@ OCP\JSON::callCheck();
 
 
 // Get data
-if( isset( $_POST['lang'] ) ){
+if( isset( $_POST['lang'] ) ) {
 	$languageCodes=OC_L10N::findAvailableLanguages();
 	$lang=$_POST['lang'];
-	if(array_search($lang,$languageCodes) or $lang=='en'){
+	if(array_search($lang, $languageCodes) or $lang=='en') {
 		OC_Preferences::setValue( OC_User::getUser(), 'core', 'lang', $lang );
 		OC_JSON::success(array("data" => array( "message" => $l->t("Language changed") )));
 	}else{
diff --git a/settings/ajax/setloglevel.php b/settings/ajax/setloglevel.php
index 4b97ba2aa32..982899e106a 100644
--- a/settings/ajax/setloglevel.php
+++ b/settings/ajax/setloglevel.php
@@ -5,12 +5,10 @@
  * See the COPYING-README file.
  */
 
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
 OC_Config::setValue( 'loglevel', $_POST['level'] );
 
 echo 'true';
-
-?>
\ No newline at end of file
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 2b412c0f2fd..2352ae9e427 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -6,18 +6,24 @@
  */
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
-OC_JSON::checkAdminUser();
+OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
 $username = isset($_POST["username"])?$_POST["username"]:'';
 
+if(($username == '' && !OC_Group::inGroup(OC_User::getUser(), 'admin')) || (!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
+	$l = OC_L10N::get('core');
+	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	exit();
+}
+
 //make sure the quota is in the expected format
 $quota=$_POST["quota"];
-if($quota!='none' and $quota!='default'){
+if($quota!='none' and $quota!='default') {
 	$quota= OC_Helper::computerFileSize($quota);
-	if($quota==0){
+	if($quota==0) {
 		$quota='default';
 	}else{
 		$quota=OC_Helper::humanFileSize($quota);
@@ -25,13 +31,13 @@ if($quota!='none' and $quota!='default'){
 }
 
 // Return Success story
-if($username){
-	OC_Preferences::setValue($username,'files','quota',$quota);
+if($username) {
+	OC_Preferences::setValue($username, 'files', 'quota', $quota);
 }else{//set the default quota when no username is specified
-	if($quota=='default'){//'default' as default quota makes no sense
+	if($quota=='default') {//'default' as default quota makes no sense
 		$quota='none';
 	}
-	OC_Appconfig::setValue('files','default_quota',$quota);
+	OC_Appconfig::setValue('files', 'default_quota', $quota);
 }
-OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>$quota)));
+OC_JSON::success(array("data" => array( "username" => $username ,'quota' => $quota)));
 
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 95338ed0267..65747968c17 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -1,29 +1,37 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
-OC_JSON::checkAdminUser();
+OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
 $success = true;
-$error = "add user to";
-$action = "add";
-
 $username = $_POST["username"];
 $group = OC_Util::sanitizeHTML($_POST["group"]);
 
-if(!OC_Group::groupExists($group)){
+if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) {
+	$l = OC_L10N::get('core');
+	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
+	exit();
+}
+
+if(!OC_Group::groupExists($group)) {
 	OC_Group::createGroup($group);
 }
 
+$l = OC_L10N::get('settings');
+
+$error = $l->t("Unable to add user to group %s", $group);
+$action = "add";
+
 // Toggle group
-if( OC_Group::inGroup( $username, $group )){
+if( OC_Group::inGroup( $username, $group )) {
 	$action = "remove";
-	$error = "remove user from";
-	$success = OC_Group::removeFromGroup( $username, $group );
+    $error = $l->t("Unable to remove user from group %s", $group);
+    $success = OC_Group::removeFromGroup( $username, $group );
 	$usersInGroup=OC_Group::usersInGroup($group);
-	if(count($usersInGroup)==0){
+	if(count($usersInGroup)==0) {
 		OC_Group::deleteGroup($group);
 	}
 }
@@ -32,9 +40,9 @@ else{
 }
 
 // Return Success story
-if( $success ){
+if( $success ) {
 	OC_JSON::success(array("data" => array( "username" => $username, "action" => $action, "groupname" => $group )));
 }
 else{
-	OC_JSON::error(array("data" => array( "message" => "Unable to $error group $group" )));
+	OC_JSON::error(array("data" => array( "message" => $error )));
 }
diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php
new file mode 100644
index 00000000000..5f7126dca34
--- /dev/null
+++ b/settings/ajax/togglesubadmins.php
@@ -0,0 +1,19 @@
+<?php
+
+// Init owncloud
+require_once '../../lib/base.php';
+
+OC_JSON::checkAdminUser();
+OCP\JSON::callCheck();
+
+$username = $_POST["username"];
+$group = OC_Util::sanitizeHTML($_POST["group"]);
+
+// Toggle group
+if(OC_SubAdmin::isSubAdminofGroup($username, $group)) {
+	OC_SubAdmin::deleteSubAdmin($username, $group);
+}else{
+	OC_SubAdmin::createSubAdmin($username, $group);
+}
+
+OC_JSON::success();
\ No newline at end of file
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
new file mode 100644
index 00000000000..840b6d72dc7
--- /dev/null
+++ b/settings/ajax/userlist.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Michael Gapczynski
+ * @copyright 2012 Michael Gapczynski mtgap@owncloud.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+require_once '../../lib/base.php';
+
+OC_JSON::callCheck();
+OC_JSON::checkSubAdminUser();
+if (isset($_GET['offset'])) {
+	$offset = $_GET['offset'];
+} else {
+	$offset = 0;
+}
+$users = array();
+if (OC_Group::inGroup(OC_User::getUser(), 'admin')) {
+	$batch = OC_User::getUsers('', 10, $offset);
+	foreach ($batch as $user) {
+		$users[] = array(
+			'name' => $user, 
+			'groups' => join(', ', OC_Group::getUserGroups($user)), 
+			'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)), 
+			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+	}
+} else {
+	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	$batch = OC_Group::usersInGroups($groups, '', 10, $offset);
+	foreach ($batch as $user) {
+		$users[] = array(
+			'name' => $user, 
+			'groups' => join(', ', OC_Group::getUserGroups($user)), 
+			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+	}
+}
+OC_JSON::success(array('data' => $users));
\ No newline at end of file
diff --git a/settings/apps.php b/settings/apps.php
index 762395c031b..e613814fe94 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -21,7 +21,7 @@
 *
 */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 OC_Util::checkAdminUser();
 
 // Load the files we need
@@ -32,12 +32,17 @@ OC_App::setActiveNavigationEntry( "core_apps" );
 $registeredApps=OC_App::getAllApps();
 $apps=array();
 
-$blacklist=array('files','files_imageviewer','files_textviewer');//we dont want to show configuration for these
+//TODO which apps do we want to blacklist and how do we integrate blacklisting with the multi apps folder feature
+$blacklist=array('files');//we dont want to show configuration for these
 
-foreach($registeredApps as $app){
-	if(array_search($app,$blacklist)===false){
+foreach($registeredApps as $app) {
+	if(array_search($app, $blacklist)===false) {
 		$info=OC_App::getAppInfo($app);
-		$active=(OC_Appconfig::getValue($app,'enabled','no')=='yes')?true:false;
+		if (!isset($info['name'])) {
+			OC_Log::write('core', 'App id "'.$app.'" has no name in appinfo', OC_Log::ERROR);
+			continue;
+		}
+		$active=(OC_Appconfig::getValue($app, 'enabled', 'no')=='yes')?true:false;
 		$info['active']=$active;
 		if(isset($info['shipped']) and ($info['shipped']=='true')) {
 			$info['internal']=true;
@@ -47,53 +52,22 @@ foreach($registeredApps as $app){
 			$info['internallabel']='3rd Party App';
 		}
 		$info['preview']='trans.png';
+		$info['version']=OC_App::getAppVersion($app);
 		$apps[]=$info;
 	}
 }
 
-function app_sort($a, $b){
-	if ($a['active'] != $b['active']){
+function app_sort($a, $b) {
+	if ($a['active'] != $b['active']) {
 		return $b['active'] - $a['active'];
 	}
 	return strcmp($a['name'], $b['name']);
 }
 usort($apps, 'app_sort');
 
-// apps from external repo via OCS
- $catagoryNames=OC_OCSClient::getCategories();
- if(is_array($catagoryNames)){
- 	$categories=array_keys($catagoryNames);
-	$page=0;
- 	$externalApps=OC_OCSClient::getApplications($categories,$page);
- 	foreach($externalApps as $app){
-		// show only external apps that are not exist yet
-		$local=false;
- 		foreach($apps as $a){
-			if($a['name']==$app['name']) $local=true;			
-		}
-
-		if(!$local) {
- 			if($app['preview']=='') $pre='trans.png'; else $pre=$app['preview'];
-	 		$apps[]=array(
- 				'name'=>$app['name'],
- 				'id'=>$app['id'],
- 				'active'=>false,
- 				'description'=>$app['description'],
- 				'author'=>$app['personid'],
- 				'license'=>$app['license'],
- 				'preview'=>$pre,
- 				'internal'=>false,
- 				'internallabel'=>'3rd Party App',
- 			);
-		}
- 	}
- }
-
-
-
 $tmpl = new OC_Template( "settings", "apps", "user" );
-$tmpl->assign('apps',$apps, false);
+$tmpl->assign('apps', $apps, false);
 $appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
-$tmpl->assign('appid',$appid);
+$tmpl->assign('appid', $appid);
 
 $tmpl->printPage();
diff --git a/settings/css/settings.css b/settings/css/settings.css
index d5634eec81f..f41edc96fb8 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -22,14 +22,14 @@ form { display:inline; }
 table:not(.nostyle) th { height:2em; color:#999; }
 table:not(.nostyle) th, table:not(.nostyle) td { border-bottom:1px solid #ddd; padding:0 .5em; padding-left:.8em; text-align:left; font-weight:normal; }
 td.name, td.password { padding-left:.8em; }
-td.password>img, td.remove>img, td.quota>img { visibility:hidden; }
+td.password>img, td.remove>a, td.quota>img { visibility:hidden; }
 td.password, td.quota { width:12em; cursor:pointer; }
 td.password>span, td.quota>span { margin-right: 1.2em; color: #C7C7C7; }
 
 td.remove { width:1em; padding-right:1em; }
 tr:hover>td.password>span { margin:0; cursor:pointer; }
-tr:hover>td.remove>img, tr:hover>td.password>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
-tr:hover>td.remove>img { float:right; }
+tr:hover>td.remove>a, tr:hover>td.password>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
+tr:hover>td.remove>a { float:right; }
 li.selected { background-color:#ddd; }
 #content>table:not(.nostyle) { margin-top:3em; }
 table:not(.nostyle) { width:100%; }
@@ -43,15 +43,26 @@ div.quota>span { position:absolute; right:0em; white-space:nowrap; top: 0.7em }
 select.quota.active { background: #fff; }
 
 /* APPS */
+.appinfo { margin: 1em; }
+h3 { font-size: 1.4em; font-weight: bold; }
+ul.applist li { height: 2.2em; padding: 0.2em 0.2em 0.2em 0.8em !important; }
 li { color:#888; }
 li.active { color:#000; }
-small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size:6pt; padding:4px; border-radius: 4px;}
-span.version { margin-left:3em; color:#ddd; }
+small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;}
+small.externalapp.list { float: right; }
+span.version { margin-left:3em; margin-right:3em; color:#555; }
+
+.app { position: relative; display: inline-block; padding: 0.2em 0 0.2em 0 !important; text-overflow: hidden; overflow: hidden; white-space: nowrap; /*transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear;*/ }
+.app.externalapp { max-width: 12.5em; z-index: 100; }
+/* Transition to complete width! */
+.app:hover, .app:active { max-width: inherit; }
+
+.appslink { text-decoration: underline; }
 
 /* LOG */
 #log { white-space:normal; }
 
 /* ADMIN */
 span.securitywarning {color:#C33; font-weight:bold; }
-h3.settingsNotice { font-size: 1.2em; }
-.settingsNotice { font-weight:bold; padding: 0.5em 0; }
+input[type=radio] { width:1em; }
+table.shareAPI td { padding-right: 2em; }
\ No newline at end of file
diff --git a/settings/help.php b/settings/help.php
index b1dc1c5be77..9157308dd57 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 OC_Util::checkLoggedIn();
 
 
@@ -15,7 +15,7 @@ OC_App::setActiveNavigationEntry( "help" );
 
 $pagesize=7;
 if(isset($_GET['page'])) $page=$_GET['page']; else $page=0;
-$kbe=OC_OCSClient::getKnownledgebaseEntries($page,$pagesize);
+$kbe=OC_OCSClient::getKnownledgebaseEntries($page, $pagesize);
 $totalitems=$kbe['totalitems'];
 unset($kbe['totalitems']);
 $pagecount=ceil($totalitems/$pagesize);
diff --git a/settings/img/admin.png b/settings/img/admin.png
index c1e6d6b8a7f..13d653f92a8 100644
--- a/settings/img/admin.png
+++ b/settings/img/admin.png
diff --git a/settings/img/apps.png b/settings/img/apps.png
index 17f47d632b9..e9845d012be 100644
--- a/settings/img/apps.png
+++ b/settings/img/apps.png
diff --git a/settings/img/help.png b/settings/img/help.png
index 2257d144d11..37ccb356830 100644
--- a/settings/img/help.png
+++ b/settings/img/help.png
diff --git a/settings/img/log.png b/settings/img/log.png
index c84b3b29f19..b34a58f844c 100644
--- a/settings/img/log.png
+++ b/settings/img/log.png
diff --git a/settings/img/personal.png b/settings/img/personal.png
index 8204028f70e..8edc5a16cd6 100644
--- a/settings/img/personal.png
+++ b/settings/img/personal.png
diff --git a/settings/img/users.png b/settings/img/users.png
index f56e2442c9e..79ad3d667e1 100644
--- a/settings/img/users.png
+++ b/settings/img/users.png
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 4f295ab6f5d..95b7a503c27 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -3,5 +3,31 @@ $(document).ready(function(){
 		$.post(OC.filePath('settings','ajax','setloglevel.php'), { level: $(this).val() },function(){
 			OC.Log.reload();
 		} );
-	})
-});
\ No newline at end of file
+	});
+
+	$('#backgroundjobs input').change(function(){
+		if($(this).attr('checked')){
+			var mode = $(this).val();
+			if (mode == 'ajax' || mode == 'webcron' || mode == 'cron') {
+				OC.AppConfig.setValue('core', 'backgroundjobs_mode', mode);
+			}
+		}
+	});
+
+	$('#shareAPIEnabled').change(function() {
+		$('.shareAPI td:not(#enable)').toggle();
+	});
+
+	$('#shareAPI input').change(function() {
+		if ($(this).attr('type') == 'checkbox') {
+			if (this.checked) {
+				var value = 'yes';
+			} else {
+				var value = 'no';
+			}
+		} else {
+			var value = $(this).val();
+		}
+		OC.AppConfig.setValue('core', $(this).attr('name'), value);
+	});
+});
diff --git a/settings/js/apps.js b/settings/js/apps.js
index cfef894c6fb..bb931232763 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -1,79 +1,134 @@
 /**
  * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
+ * Copyright (c) 2012, Thomas Tanghus <thomas@tanghus.net>
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
 
+OC.Settings = OC.Settings || {};
+OC.Settings.Apps = OC.Settings.Apps || {
+	loadOCS:function() {
+		$.getJSON(OC.filePath('settings', 'ajax', 'apps/ocs.php'), function(jsondata) {
+			if(jsondata.status == 'success'){
+				var apps = jsondata.data;
+				$.each(apps, function(b, appdata) {
+					OC.Settings.Apps.insertApp(appdata);
+				});
+			} else {
+				OC.dialogs.alert(jsondata.data.message, t('core', 'Error'));
+			}
+		});
+	},
+	loadApp:function(app) {
+		var page = $('#rightcontent');
+		page.find('p.license').show();
+		page.find('span.name').text(app.name);
+		page.find('small.externalapp').text(app.internallabel);
+		if (app.version) {
+			page.find('span.version').text(app.version);
+		} else {
+			page.find('span.version').text('');
+		}
+		page.find('p.description').html(app.description);
+		page.find('img.preview').attr('src', app.preview);
+		page.find('small.externalapp').attr('style', 'visibility:visible');
+		page.find('span.author').text(app.author);
+		page.find('span.licence').text(app.licence);
+
+		page.find('input.enable').show();
+		page.find('input.enable').val((app.active) ? t('settings', 'Disable') : t('settings', 'Enable'));
+		page.find('input.enable').data('appid', app.id);
+		page.find('input.enable').data('active', app.active);
+		if (app.internal == false) {
+			page.find('p.appslink').show();
+			page.find('a').attr('href', 'http://apps.owncloud.com/content/show.php?content=' + app.id);
+		} else {
+			page.find('p.appslink').hide();
+		}
+	},
+	enableApp:function(appid, active, element) {
+		console.log('enableApp:', appid, active, element);
+		var appitem=$('#leftcontent li[data-id="'+appid+'"]');
+		appData = appitem.data('app');
+		appData.active = !active;
+		appitem.data('app', appData);
+		if(active) {
+			$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appid},function(result) {
+				if(!result || result.status!='success') {
+					OC.dialogs.alert('Error while disabling app','Error');
+				}
+				else {
+					element.data('active',false);
+					element.val(t('settings','Enable'));
+				}
+			},'json');
+			$('#leftcontent li[data-id="'+appid+'"]').removeClass('active');
+		} else {
+			$.post(OC.filePath('settings','ajax','enableapp.php'),{appid:appid},function(result) {
+				if(!result || result.status!='success') {
+					OC.dialogs.alert('Error while enabling app','Error');
+				}
+				else {
+					element.data('active',true);
+					element.val(t('settings','Disable'));
+				}
+			},'json');
+			$('#leftcontent li[data-id="'+appid+'"]').addClass('active');
+		}
+	},
+	insertApp:function(appdata) {
+		var applist = $('#leftcontent li');
+		var app =
+				$('<li data-id="' + appdata.id + '" data-type="external" data-installed="0">'
+				+ '<a class="app externalapp" href="' + OC.filePath('settings', 'apps', 'index.php') + '&appid=' + appdata.id+'">'
+				+ appdata.name+'</a><small class="externalapp list">3rd party</small></li>');
+		app.data('app', appdata);
+		var added = false;
+		applist.each(function() {
+			if(!parseInt($(this).data('installed')) && $(this).find('a').text().toLowerCase() > appdata.name.toLowerCase()) {
+				$(this).before(app);
+				added = true;
+				return false; // dang, remember this to get out of loop
+			}
+		});
+		if(!added) {
+			applist.last().after(app);
+		}
+		return app;
+	}
+};
+
 $(document).ready(function(){
 	$('#leftcontent li').each(function(index,li){
-		var app=$.parseJSON($(this).children('span').text());
+		var app = OC.get('appData_'+$(li).data('id'));
 		$(li).data('app',app);
+		$(this).find('span.hidden').remove();
 	});
 	$('#leftcontent li').keydown(function(event) {
 		if (event.which == 13 || event.which == 32) {
-			$(event.target).click()
+			$(event.target).click();
 		}
 		return false;
 	});
-	$('#leftcontent li').click(function(){
-		var app=$(this).data('app');
-		$('#rightcontent p.license').show();
-		$('#rightcontent span.name').text(app.name);
-		$('#rightcontent small.externalapp').text(app.internallabel);
-		$('#rightcontent span.version').text(app.version);
-		$('#rightcontent p.description').text(app.description);
-		$('#rightcontent img.preview').attr('src',app.preview);
-		$('#rightcontent small.externalapp').attr('style','visibility:visible');
-		$('#rightcontent span.author').text(app.author);
-		$('#rightcontent span.licence').text(app.licence);
-		
-		$('#rightcontent input.enable').show();
-		$('#rightcontent input.enable').val((app.active)?t('settings','Disable'):t('settings','Enable'));
-		$('#rightcontent input.enable').data('appid',app.id);
-		$('#rightcontent input.enable').data('active',app.active);
-		if ( app.internal == false ) {
-			$('#rightcontent p.appslink').show();
-			$('#rightcontent a').attr('href','http://apps.owncloud.com/content/show.php?content='+app.id);
-		} else {
-			$('#rightcontent p.appslink').hide();
+
+	$(document).on('click', '#leftcontent', function(event){
+		var tgt = $(event.target);
+		if (tgt.is('li') || tgt.is('a')) {
+			var item = tgt.is('li') ? $(tgt) : $(tgt).parent();
+			var app = item.data('app');
+			OC.Settings.Apps.loadApp(app);
 		}
 		return false;
 	});
 	$('#rightcontent input.enable').click(function(){
 		var element = $(this);
-		var app=$(this).data('appid');
+		var appid=$(this).data('appid');
 		var active=$(this).data('active');
-		if(app){
-			if(active){
-				$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:app},function(result){
-					if(!result || result.status!='success'){
-						OC.dialogs.alert('Error while disabling app','Error');
-					}
-					else {
-						element.data('active',false);
-						element.val(t('settings','Enable'));
-						var appData=$('#leftcontent li[data-id="'+app+'"]');
-						appData.active=false;
-					}
-				},'json');
-				$('#leftcontent li[data-id="'+app+'"]').removeClass('active');
-			}else{
-				$.post(OC.filePath('settings','ajax','enableapp.php'),{appid:app},function(result){
-					if(!result || result.status!='success'){
-						OC.dialogs.alert('Error while enabling app','Error');
-					}
-					else {
-						element.data('active',true);
-						element.val(t('settings','Disable'));
-						var appData=$('#leftcontent li[data-id="'+app+'"]');
-						appData.active=true;
-					}
-				},'json');
-				$('#leftcontent li[data-id="'+app+'"]').addClass('active');
-			}
+		if(appid) {
+			OC.Settings.Apps.enableApp(appid, active, element);
 		}
 	});
-	
+
 	if(appid) {
 		var item = $('#leftcontent li[data-id="'+appid+'"]');
 		if(item) {
@@ -82,4 +137,6 @@ $(document).ready(function(){
 			$('#leftcontent').animate({scrollTop: $(item).offset().top-70}, 'slow','swing');
 		}
 	}
+
+	OC.Settings.Apps.loadOCS();
 });
diff --git a/settings/js/log.js b/settings/js/log.js
index fe2e92f7a86..04a7bf8b288 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -23,6 +23,9 @@ OC.Log={
 			if(result.status=='success'){
 				OC.Log.addEntries(result.data);
 				$('html, body').animate({scrollTop: $(document).height()}, 800);
+				if(!result.remain){
+					$('#moreLog').css('display', 'none');
+				}
 			}
 		});
 	},
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 77d103c53b6..a866e321ad6 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -83,4 +83,4 @@ OC.msg={
 			$(selector).html( data.data.message ).addClass('error');
 		}
 	}
-}
+};
diff --git a/settings/js/users.js b/settings/js/users.js
index 63ad426ecf4..20bd94993bc 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -4,7 +4,7 @@
  * See the COPYING-README file.
  */
 
-UserList={
+var UserList={
 	useUndo:true,
 	
 	/**
@@ -22,12 +22,8 @@ UserList={
 		// Set undo flag
 		UserList.deleteCanceled = false;
 		
-		// Hide user in table to reflect deletion
-		$(this).parent().parent().hide();
-		$('tr').filterAttr( 'data-uid', UserList.deleteUid ).hide();
-		
 		// Provide user with option to undo
-		$('#notification').text(t('files','undo delete user'));
+		$('#notification').html(t('users', 'deleted')+' '+uid+'<span class="undo">'+t('users', 'undo')+'</span>');
 		$('#notification').data('deleteuser',true);
 		$('#notification').fadeIn();
 			
@@ -66,35 +62,149 @@ UserList={
 				}
 			});
  		}
-	}
-}
+	},
 
-$(document).ready(function(){
-	function setQuota(uid,quota,ready){
-		$.post(
-			OC.filePath('settings','ajax','setquota.php'),
-			{username:uid,quota:quota},
-			function(result){
-				if(ready){
-					ready(result.data.quota);
+	add:function(username, groups, subadmin, quota, sort) {
+		var tr = $('tbody tr').first().clone();
+		tr.data('uid', username);
+		tr.find('td.name').text(username);
+		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
+		groupsSelect.data('username', username);
+		groupsSelect.data('userGroups', groups);
+		tr.find('td.groups').empty();
+		if (tr.find('td.subadmins').length > 0) {
+			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'Group Admin') + '">');
+			subadminSelect.data('username', username);
+			subadminSelect.data('userGroups', groups);
+			subadminSelect.data('subadmin', subadmin);
+			tr.find('td.subadmins').empty();
+		}
+		var allGroups = String($('#content table').data('groups')).split(', ');
+		$.each(allGroups, function(i, group) {
+			groupsSelect.append($('<option value="'+group+'">'+group+'</option>'));
+			if (typeof subadminSelect !== 'undefined' && group != 'admin') {
+				subadminSelect.append($('<option value="'+group+'">'+group+'</option>'));
+			}
+		});
+		tr.find('td.groups').append(groupsSelect);
+		UserList.applyMultiplySelect(groupsSelect);
+		if (tr.find('td.subadmins').length > 0) {
+			tr.find('td.subadmins').append(subadminSelect);
+			UserList.applyMultiplySelect(subadminSelect);
+		}
+		if (tr.find('td.remove img').length == 0 && OC.currentUser != username) {
+			tr.find('td.remove').append($('<img alt="Delete" title="'+t('settings','Delete')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
+		} else if (OC.currentUser == username) {
+			tr.find('td.remove a').remove();
+		}
+		var quotaSelect = tr.find('select.quota-user');
+		if (quota == 'default') {
+			quotaSelect.find('option').attr('selected', null);
+			quotaSelect.find('option').first().attr('selected', 'selected');
+			quotaSelect.data('previous', 'default');
+		} else {
+			if (quotaSelect.find('option[value="'+quota+'"]').length > 0) {
+				quotaSelect.find('option[value="'+quota+'"]').attr('selected', 'selected');
+			} else {
+				quotaSelect.append('<option value="'+quota+'" selected="selected">'+quota+'</option>');
+			}
+		}
+		var added = false;
+		if (sort) {
+			username = username.toLowerCase();
+			$('tbody tr').each(function() {
+				if (username < $(this).data('uid').toLowerCase()) {
+					$(tr).insertBefore($(this));
+					added = true;
+					return false;
 				}
+			});
+		} 
+		if (!added) {
+			$(tr).appendTo('tbody');
+		}
+		return tr;
+	},
+
+	update:function() {
+		if (typeof UserList.offset === 'undefined') {
+			UserList.offset = $('tbody tr').length;
+		}
+		$.get(OC.filePath('settings', 'ajax', 'userlist.php'), { offset: UserList.offset }, function(result) {
+			if (result.status === 'success') {
+				$.each(result.data, function(index, user) {
+					var tr = UserList.add(user.name, user.groups, user.subadmin, user.quota, false);
+					UserList.offset++;
+					if (index == 9) {
+						$(tr).bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+							$(this).unbind(event);
+							UserList.update();
+						});
+					}
+				});
 			}
-		);
-	}
-	
-	function applyMultiplySelect(element){
+		});
+	},
+
+	applyMultiplySelect:function(element) {
 		var checked=[];
 		var user=element.data('username');
-		if(element.data('userGroups')){
-			checked=element.data('userGroups').split(', ');
+		if($(element).attr('class') == 'groupsselect'){
+			if(element.data('userGroups')){
+				checked=String(element.data('userGroups')).split(', ');
+			}
+			if(user){
+				var checkHandeler=function(group){
+					if(user==OC.currentUser && group=='admin'){
+						return false;
+					}
+					if(!isadmin && checked.length == 1 && checked[0] == group){
+						return false;
+					}
+					$.post(
+						OC.filePath('settings','ajax','togglegroups.php'),
+						{
+							username:user,
+							group:group
+						},
+						function(){}
+					);
+				};
+			}else{
+				checkHandeler=false;
+			}
+			var addGroup = function(group) {
+				$('select[multiple]').each(function(index, element) {
+					if ($(element).find('option[value="'+group +'"]').length == 0) {
+						$(element).append('<option value="'+group+'">'+group+'</option>');
+					}
+				})
+			};
+			var label;
+			if(isadmin){
+				label = t('core', 'add group');
+			}else{
+				label = null;
+			}
+			element.multiSelect({
+				createCallback:addGroup,
+				createText:label,
+				checked:checked,
+				oncheck:checkHandeler,
+				onuncheck:checkHandeler,
+				minWidth: 100,
+			});
 		}
-		if(user){
+		if($(element).attr('class') == 'subadminsselect'){
+			if(element.data('subadmin')){
+				checked=String(element.data('subadmin')).split(', ');
+			}
 			var checkHandeler=function(group){
-				if(user==OC.currentUser && group=='admin'){
+				if(group=='admin'){
 					return false;
 				}
 				$.post(
-					OC.filePath('settings','ajax','togglegroups.php'),
+					OC.filePath('settings','ajax','togglesubadmins.php'),
 					{
 						username:user,
 						group:group
@@ -102,36 +212,55 @@ $(document).ready(function(){
 					function(){}
 				);
 			};
-		}else{
-			checkHandeler=false;
+			
+			var addSubAdmin = function(group) {
+				$('select[multiple]').each(function(index, element) {
+					if ($(element).find('option[value="'+group +'"]').length == 0) {
+						$(element).append('<option value="'+group+'">'+group+'</option>');
+					}
+				})
+			};
+			element.multiSelect({
+				createCallback:addSubAdmin,
+				createText:null,
+				checked:checked,
+				oncheck:checkHandeler,
+				onuncheck:checkHandeler,
+				minWidth: 100,
+			});
 		}
-		var addGroup = function(group) {
-			$('select[multiple]').each(function(index, element) {
-				if ($(element).find('option[value="'+group +'"]').length == 0) {
-					$(element).append('<option value="'+group+'">'+group+'</option>');
+	}
+}
+
+$(document).ready(function(){
+
+	$('tbody tr:last').bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+		UserList.update();
+	});
+
+	function setQuota(uid,quota,ready){
+		$.post(
+			OC.filePath('settings','ajax','setquota.php'),
+			{username:uid,quota:quota},
+			function(result){
+				if(ready){
+					ready(result.data.quota);
 				}
-			})
-		};
-		element.multiSelect({
-			createCallback:addGroup,
-			createText:'add group',
-			checked:checked,
-			oncheck:checkHandeler,
-			onuncheck:checkHandeler,
-			minWidth: 100,
-		});
+			}
+		);
 	}
+	
+	
 	$('select[multiple]').each(function(index,element){
-		applyMultiplySelect($(element));
+		UserList.applyMultiplySelect($(element));
 	});
 	
-	$('td.remove>img').live('click',function(event){
-		
-		var uid = $(this).parent().parent().data('uid');
-		
+	$('td.remove>a').live('click',function(event){
+		var row = $(this).parent().parent();
+		var uid = $(row).data('uid');
+		$(row).hide();
 		// Call function for handling delete/undo
-		UserList.do_delete( uid );
-		
+		UserList.do_delete(uid);
 	});
 	
 	$('td.password>img').live('click',function(event){
@@ -252,44 +381,21 @@ $(document).ready(function(){
 			function(result){
 				if(result.status!='success'){
 					OC.dialogs.alert(result.data.message, 'Error creating user');
-				}
-				else {
-					var tr=$('#content table tbody tr').first().clone();
-					tr.attr('data-uid',username);
-					tr.find('td.name').text(username);
-					var select=$('<select multiple="multiple" data-placehoder="Groups" title="Groups">');
-					select.data('username',username);
-					select.data('userGroups',groups.join(', '));
-					tr.find('td.groups').empty();
-					var allGroups=$('#content table').data('groups').split(', ');
-					for(var i=0;i<groups.length;i++){
-						if(allGroups.indexOf(groups[i])==-1){
-							allGroups.push(groups[i]);
-						}
-					}
-					$.each(allGroups,function(i,group){
-						select.append($('<option value="'+group+'">'+group+'</option>'));
-					});
-					tr.find('td.groups').append(select);
-					if(tr.find('td.remove img').length==0){
-						tr.find('td.remove').append($('<img alt="Delete" title="'+t('settings','Delete')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
-					}
-					applyMultiplySelect(select);
-					$('#content table tbody').last().append(tr);
-
-					tr.find('select.quota-user option').attr('selected',null);
-					tr.find('select.quota-user option').first().attr('selected','selected');
-					tr.find('select.quota-user').data('previous','default');
+				} else {
+					UserList.add(username, result.data.groups, null, 'default', true);
 				}
 			}
 		);
 	});
 	// Handle undo notifications
 	$('#notification').hide();
-	$('#notification').click(function(){
-		if($('#notification').data('deleteuser'))
-		{
-			$( 'tr' ).filterAttr( 'data-uid', UserList.deleteUid ).show();
+	$('#notification .undo').live('click', function() {
+		if($('#notification').data('deleteuser')) {
+			$('tbody tr').each(function(index, row) {
+				if ($(row).data('uid') == UserList.deleteUid) {
+					$(row).show();
+				}
+			});
 			UserList.deleteCanceled=true;
 			UserList.deleteFiles=null;
 		}
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index ff711e7ccc9..eca8a300b1b 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -4,8 +4,6 @@
 "Language changed" => "تم تغيير اللغة",
 "__language_name__" => "__language_name__",
 "Select an App" => "إختر تطبيقاً",
-"-licensed" => "-مسجل",
-"by" => "من قبل",
 "Ask a question" => "إسأل سؤال",
 "Problems connecting to help database." => "الاتصال بقاعدة بيانات المساعدة لم يتم بنجاح",
 "Go there manually." => "إذهب هنالك بنفسك",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 6e0c6e2fee4..b261c22b032 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,27 +1,38 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Е-пощата е записана",
+"Invalid email" => "Неправилна е-поща",
 "OpenID Changed" => "OpenID е сменено",
 "Invalid request" => "Невалидна заявка",
 "Language changed" => "Езика е сменен",
+"Disable" => "Изключване",
+"Enable" => "Включване",
+"Saving..." => "Записване...",
 "Select an App" => "Изберете програма",
-"-licensed" => "-лицензирано",
-"by" => "от",
+"Documentation" => "Документация",
 "Ask a question" => "Задайте въпрос",
 "Problems connecting to help database." => "Проблеми при свързване с помощната база",
 "Go there manually." => "Отидете ръчно.",
 "Answer" => "Отговор",
 "You use" => "Вие ползвате",
 "of the available" => "от наличните",
+"Download" => "Изтегляне",
 "Your password got changed" => "Вашата парола е сменена",
 "Unable to change your password" => "Невъзможна промяна на паролата",
 "Current password" => "Текуща парола",
 "New password" => "Нова парола",
 "show" => "показва",
 "Change password" => "Промяна на парола",
+"Email" => "Е-поща",
+"Your email address" => "Адресът на е-пощата ви",
+"Fill in an email address to enable password recovery" => "Въведете е-поща за възстановяване на паролата",
 "Language" => "Език",
+"Help translate" => "Помощ за превода",
 "use this address to connect to your ownCloud in your file manager" => "ползвай този адрес за връзка с Вашия ownCloud във файловия мениджър",
 "Name" => "Име",
 "Password" => "Парола",
 "Groups" => "Групи",
 "Create" => "Ново",
+"Default Quota" => "Квота по подразбиране",
+"Quota" => "Квота",
 "Delete" => "Изтриване"
 );
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 56e67c1a134..67b1d77dc7a 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,14 +1,42 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "No s'ha pogut carregar la llista des de l'App Store",
+"Authentication error" => "Error d'autenticació",
+"Group already exists" => "El grup ja existeix",
+"Unable to add group" => "No es pot afegir el grup",
+"Email saved" => "S'ha desat el correu electrònic",
+"Invalid email" => "El correu electrònic no és vàlid",
 "OpenID Changed" => "OpenID ha canviat",
 "Invalid request" => "Sol.licitud no vàlida",
+"Unable to delete group" => "No es pot eliminar el grup",
+"Unable to delete user" => "No es pot eliminar l'usuari",
 "Language changed" => "S'ha canviat l'idioma",
+"Unable to add user to group %s" => "No es pot afegir l'usuari al grup %s",
+"Unable to remove user from group %s" => "No es pot eliminar l'usuari del grup %s",
+"Error" => "Error",
+"Disable" => "Desactiva",
+"Enable" => "Activa",
+"Saving..." => "S'està desant...",
 "__language_name__" => "Català",
+"Security Warning" => "Avís de seguretat",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "La carpeta de dades i els vostres fitxersprobablement són accessibles des d'Internet. La fitxer .htaccess que ownCloud proporciona no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web.",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "executa una tasca en carregar cada pàgina",
+"Share API" => "API de compartir",
+"Enable Share API" => "Activa l'API de compartir",
+"Allow apps to use the Share API" => "Permet que les aplicacions usin l'API de compartir",
+"Allow links" => "Permet enllaços",
+"Allow users to share items to the public with links" => "Permet als usuaris compartir elements amb el públic amb enllaços",
+"Allow resharing" => "Permet compartir de nou",
+"Allow users to share items shared with them again" => "Permet als usuaris comparir elements ja compartits amb ells",
+"Allow users to share with anyone" => "Permet als usuaris compartir amb qualsevol",
+"Allow users to only share with users in their groups" => "Permet als usuaris compartir només amb usuaris del seu grup",
 "Log" => "Registre",
 "More" => "Més",
-"Add your App" => "Afegeiu la vostra aplicació",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Add your App" => "Afegiu la vostra aplicació",
 "Select an App" => "Seleccioneu una aplicació",
-"-licensed" => "- amb llicència",
-"by" => "de",
+"See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>",
 "Documentation" => "Documentació",
 "Managing Big Files" => "Gestió de fitxers grans",
 "Ask a question" => "Feu una pregunta",
@@ -16,7 +44,7 @@
 "Go there manually." => "Vés-hi manualment.",
 "Answer" => "Resposta",
 "You use" => "Esteu usant",
-"of the available" => "del disponible",
+"of the available" => "d'un total disponible de",
 "Desktop and Mobile Syncing Clients" => "Clients de sincronització d'escriptori i de mòbil",
 "Download" => "Baixada",
 "Your password got changed" => "La contrasenya ha canviat",
@@ -37,6 +65,7 @@
 "Create" => "Crea",
 "Default Quota" => "Quota per defecte",
 "Other" => "Altre",
+"Group Admin" => "Grup Admin",
 "Quota" => "Quota",
 "Delete" => "Suprimeix"
 );
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index bef172a9f58..6fbac99b37d 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,16 +1,44 @@
 <?php $TRANSLATIONS = array(
-"OpenID Changed" => "OpenID změněn",
-"Invalid request" => "Chybný dotaz",
+"Unable to load list from App Store" => "Nelze načíst seznam z App Store",
+"Authentication error" => "Chyba ověření",
+"Group already exists" => "Skupina již existuje",
+"Unable to add group" => "Nelze přidat skupinu",
+"Email saved" => "E-mail uložen",
+"Invalid email" => "Neplatný e-mail",
+"OpenID Changed" => "OpenID změněno",
+"Invalid request" => "Neplatný požadavek",
+"Unable to delete group" => "Nelze smazat skupinu",
+"Unable to delete user" => "Nelze smazat uživatele",
 "Language changed" => "Jazyk byl změněn",
+"Unable to add user to group %s" => "Nelze přidat uživatele do skupiny %s",
+"Unable to remove user from group %s" => "Nelze odstranit uživatele ze skupiny %s",
+"Error" => "Chyba",
+"Disable" => "Zakázat",
+"Enable" => "Povolit",
+"Saving..." => "Ukládám...",
 "__language_name__" => "Česky",
-"Log" => "Log",
+"Security Warning" => "Bezpečnostní varování",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Váš adresář dat a soubory jsou pravděpodobně přístupné z internetu. Soubor .htacces, který ownCloud poskytuje nefunguje. Doporučujeme Vám abyste nastavili Váš webový server tak, aby nebylo možno přistupovat do adresáře s daty, nebo přesunuli adresář dat mimo kořenovou složku dokumentů webového serveru.",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "spustit jednu úlohu s každou načtenou stránkou",
+"Share API" => "API sdílení",
+"Enable Share API" => "Povolit API sdílení",
+"Allow apps to use the Share API" => "Povolit aplikacím používat API sdílení",
+"Allow links" => "Povolit odkazy",
+"Allow users to share items to the public with links" => "Povolit uživatelům sdílet položky s veřejností pomocí odkazů",
+"Allow resharing" => "Povolit znovu-sdílení",
+"Allow users to share items shared with them again" => "Povolit uživatelům znovu sdílet položky, které jsou pro ně sdíleny",
+"Allow users to share with anyone" => "Povolit uživatelům sdílet s kýmkoliv",
+"Allow users to only share with users in their groups" => "Povolit uživatelům sdílet pouze s uživateli v jejich skupinách",
+"Log" => "Záznam",
 "More" => "Více",
-"Add your App" => "Přidat vaší aplikaci",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Add your App" => "Přidat Vaší aplikaci",
 "Select an App" => "Vyberte aplikaci",
-"-licensed" => "-licencováno",
-"by" => "podle",
+"See application page at apps.owncloud.com" => "Více na stránce s aplikacemi na apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>",
 "Documentation" => "Dokumentace",
-"Managing Big Files" => "Spravování velkých souborů",
+"Managing Big Files" => "Správa velkých souborů",
 "Ask a question" => "Zeptat se",
 "Problems connecting to help database." => "Problémy s připojením k databázi s nápovědou.",
 "Go there manually." => "Přejít ručně.",
@@ -20,23 +48,24 @@
 "Desktop and Mobile Syncing Clients" => "Klienti pro synchronizaci",
 "Download" => "Stáhnout",
 "Your password got changed" => "Vaše heslo bylo změněno",
-"Unable to change your password" => "Vaše heslo se nepodařilo změnit",
-"Current password" => "Aktuální heslo",
+"Unable to change your password" => "Vaše heslo nelze změnit",
+"Current password" => "Současné heslo",
 "New password" => "Nové heslo",
 "show" => "zobrazit",
 "Change password" => "Změnit heslo",
-"Email" => "Email",
-"Your email address" => "Vaše emailová adresa",
-"Fill in an email address to enable password recovery" => "Pro povolení změny hesla vyplňte email adresu",
+"Email" => "E-mail",
+"Your email address" => "Vaše e-mailová adresa",
+"Fill in an email address to enable password recovery" => "Pro povolení změny hesla vyplňte adresu e-mailu",
 "Language" => "Jazyk",
-"Help translate" => "Pomoci překládat",
+"Help translate" => "Pomoci s překladem",
 "use this address to connect to your ownCloud in your file manager" => "tuto adresu použijte pro připojení k ownCloud ve Vašem správci souborů",
 "Name" => "Jméno",
 "Password" => "Heslo",
 "Groups" => "Skupiny",
 "Create" => "Vytvořit",
 "Default Quota" => "Výchozí kvóta",
-"Other" => "Jiné",
+"Other" => "Jiná",
+"Group Admin" => "Správa skupiny",
 "Quota" => "Kvóta",
-"Delete" => "Vymazat"
+"Delete" => "Smazat"
 );
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 4cd7abfc90c..16b4e11eb99 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,14 +1,32 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store",
+"Authentication error" => "Adgangsfejl",
+"Email saved" => "Email adresse gemt",
+"Invalid email" => "Ugyldig email adresse",
 "OpenID Changed" => "OpenID ændret",
 "Invalid request" => "Ugyldig forespørgsel",
 "Language changed" => "Sprog ændret",
+"Error" => "Fejl",
+"Disable" => "Deaktiver",
+"Enable" => "Aktiver",
+"Saving..." => "Gemmer...",
 "__language_name__" => "Dansk",
+"Security Warning" => "Sikkerhedsadvarsel",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "udfør en opgave for hver indlæst side",
+"Share API" => "Del API",
+"Enable Share API" => "Aktiver dele API",
+"Allow apps to use the Share API" => "Tillad apps a bruge dele APIen",
+"Allow links" => "Tillad links",
+"Allow users to share items to the public with links" => "Tillad brugere at dele elementer med offentligheden med links",
+"Allow resharing" => "Tillad gendeling",
+"Allow users to share with anyone" => "Tillad brugere at dele med hvem som helst",
+"Allow users to only share with users in their groups" => "Tillad kun deling med brugere i brugerens egen gruppe",
 "Log" => "Log",
 "More" => "Mere",
 "Add your App" => "Tilføj din App",
 "Select an App" => "Vælg en App",
-"-licensed" => "-licenseret",
-"by" => "af",
+"See application page at apps.owncloud.com" => "Se applikationens side på apps.owncloud.com",
 "Documentation" => "Dokumentation",
 "Managing Big Files" => "Håndter store filer",
 "Ask a question" => "Stil et spørgsmål",
@@ -37,6 +55,7 @@
 "Create" => "Ny",
 "Default Quota" => "Standard kvote",
 "Other" => "Andet",
+"Group Admin" => "Gruppe Administrator",
 "Quota" => "Kvote",
 "Delete" => "Slet"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index d1659e4d181..ce1ef9c7ea1 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,42 +1,71 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Die Liste der Apps im Store konnte nicht geladen werden.",
+"Authentication error" => "Anmeldungsfehler",
+"Group already exists" => "Gruppe existiert bereits",
+"Unable to add group" => "Gruppe konnte nicht angelegt werden",
+"Email saved" => "E-Mail gespeichert",
+"Invalid email" => "Ungültige E-Mail",
 "OpenID Changed" => "OpenID geändert",
 "Invalid request" => "Ungültige Anfrage",
+"Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
+"Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
 "Language changed" => "Sprache geändert",
+"Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
+"Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
+"Error" => "Fehler",
+"Disable" => "Deaktivieren",
+"Enable" => "Aktivieren",
+"Saving..." => "Speichern...",
 "__language_name__" => "Deutsch",
+"Security Warning" => "Sicherheitshinweis",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis ist möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei von OwnCloud funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Führe eine Aufgabe pro geladener Seite aus.",
+"Share API" => "Teilungs-API",
+"Enable Share API" => "Teilungs-API aktivieren",
+"Allow apps to use the Share API" => "Erlaubt Nutzern, die Teilungs-API zu nutzen",
+"Allow links" => "Links erlauben",
+"Allow users to share items to the public with links" => "Erlaube Nutzern, Dateien mithilfe von Links mit der Öffentlichkeit zu teilen",
+"Allow resharing" => "Erneutes Teilen erlauben",
+"Allow users to share items shared with them again" => "Erlaubt Nutzern, Dateien die mit ihnen geteilt wurden, erneut zu teilen",
+"Allow users to share with anyone" => "Erlaube Nutzern mit jedem zu Teilen",
+"Allow users to only share with users in their groups" => "Erlaube Nutzern nur das Teilen in ihrer Gruppe",
 "Log" => "Log",
-"More" => "mehr",
-"Add your App" => "Füge deine App hinzu",
-"Select an App" => "Wähle eine Anwendung aus",
-"-licensed" => "-lizenziert",
-"by" => "von",
+"More" => "Mehr",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
+"Add your App" => "Fügen Sie Ihre App hinzu",
+"Select an App" => "Wählen Sie eine Anwendung aus",
+"See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
 "Documentation" => "Dokumentation",
-"Managing Big Files" => "große Dateien verwalten",
-"Ask a question" => "Stell eine Frage",
+"Managing Big Files" => "Große Dateien verwalten",
+"Ask a question" => "Stellen Sie eine Frage",
 "Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
 "Go there manually." => "Datenbank direkt besuchen.",
 "Answer" => "Antwort",
-"You use" => "Du nutzt",
+"You use" => "Sie nutzen",
 "of the available" => "der verfügbaren",
-"Desktop and Mobile Syncing Clients" => "Desktop und mobile synchronierungs Clients",
+"Desktop and Mobile Syncing Clients" => "Desktop- und mobile Synchronierungs-Clients",
 "Download" => "Download",
-"Your password got changed" => "Dein Passwort wurde geändert.",
+"Your password got changed" => "Ihr Passwort wurde geändert.",
 "Unable to change your password" => "Passwort konnte nicht geändert werden",
 "Current password" => "Aktuelles Passwort",
 "New password" => "Neues Passwort",
 "show" => "zeigen",
 "Change password" => "Passwort ändern",
 "Email" => "E-Mail",
-"Your email address" => "Ihre E-Mail Adresse",
-"Fill in an email address to enable password recovery" => "Trage eine E-Mail Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Your email address" => "Ihre E-Mail-Adresse",
+"Fill in an email address to enable password recovery" => "Tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
 "Language" => "Sprache",
-"Help translate" => "Hilf bei der Übersetzung!",
-"use this address to connect to your ownCloud in your file manager" => "Benutze diese Adresse, um deine ownCloud mit deinem Dateimanager zu verbinden.",
+"Help translate" => "Helfen Sie bei der Übersetzung",
+"use this address to connect to your ownCloud in your file manager" => "Benutzen Sie diese Adresse, um Ihre ownCloud mit Ihrem Dateimanager zu verbinden.",
 "Name" => "Name",
 "Password" => "Passwort",
 "Groups" => "Gruppen",
 "Create" => "Anlegen",
-"Default Quota" => "Standard Quota",
-"Other" => "andere",
+"Default Quota" => "Standard-Quota",
+"Other" => "Andere",
+"Group Admin" => "Gruppenadministrator",
 "Quota" => "Quota",
 "Delete" => "Löschen"
 );
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 3d063daa3bd..536e72bad69 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,14 +1,24 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Σφάλμα στην φόρτωση της λίστας από το App Store",
+"Authentication error" => "Σφάλμα πιστοποίησης",
+"Email saved" => "Το Email αποθηκεύτηκε ",
+"Invalid email" => "Μη έγκυρο email",
 "OpenID Changed" => "Το OpenID άλλαξε",
 "Invalid request" => "Μη έγκυρο αίτημα",
 "Language changed" => "Η γλώσσα άλλαξε",
+"Error" => "Σφάλμα",
+"Disable" => "Απενεργοποίηση",
+"Enable" => "Ενεργοποίηση",
+"Saving..." => "Αποθήκευση...",
 "__language_name__" => "__όνομα_γλώσσας__",
+"Security Warning" => "Προειδοποίηση Ασφαλείας",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Εκτέλεση μίας εργασίας με κάθε σελίδα που φορτώνεται",
 "Log" => "Αρχείο καταγραφής",
 "More" => "Περισσότερο",
 "Add your App" => "Πρόσθεσε τη δικιά σου εφαρμογή ",
 "Select an App" => "Επιλέξτε μια εφαρμογή",
-"-licensed" => "-με άδεια",
-"by" => "από",
+"See application page at apps.owncloud.com" => "Η σελίδα εφαρμογών στο apps.owncloud.com",
 "Documentation" => "Τεκμηρίωση",
 "Managing Big Files" => "Διαχείριση μεγάλων αρχείων",
 "Ask a question" => "Ρωτήστε μια ερώτηση",
@@ -37,6 +47,7 @@
 "Create" => "Δημιουργία",
 "Default Quota" => "Προεπιλεγμένο όριο",
 "Other" => "Άλλα",
+"Group Admin" => "Διαχειρηστής ομάδας",
 "Quota" => "Σύνολο χώρου",
 "Delete" => "Διαγραφή"
 );
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index c79817a2721..61ac0fac272 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,14 +1,24 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ne eblis ŝargi liston el aplikaĵovendejo",
+"Authentication error" => "Aŭtentiga eraro",
+"Email saved" => "La retpoŝtadreso konserviĝis",
+"Invalid email" => "Nevalida retpoŝtadreso",
 "OpenID Changed" => "La agordo de OpenID estas ŝanĝita",
 "Invalid request" => "Nevalida peto",
 "Language changed" => "La lingvo estas ŝanĝita",
+"Error" => "Eraro",
+"Disable" => "Malkapabligi",
+"Enable" => "Kapabligi",
+"Saving..." => "Konservante...",
 "__language_name__" => "Esperanto",
-"Log" => "Registro",
+"Security Warning" => "Sekureca averto",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "lanĉi unu taskon po ĉiu paĝo ŝargita",
+"Log" => "Protokolo",
 "More" => "Pli",
 "Add your App" => "Aldonu vian aplikaĵon",
 "Select an App" => "Elekti aplikaĵon",
-"-licensed" => "-permesila",
-"by" => "de",
+"See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
 "Documentation" => "Dokumentaro",
 "Managing Big Files" => "Administrante grandajn dosierojn",
 "Ask a question" => "Faru demandon",
@@ -37,6 +47,7 @@
 "Create" => "Krei",
 "Default Quota" => "Defaŭlta kvoto",
 "Other" => "Alia",
+"Group Admin" => "Grupadministranto",
 "Quota" => "Kvoto",
 "Delete" => "Forigi"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index c8ddb412ecf..36561d9aee5 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,14 +1,42 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
+"Authentication error" => "Error de autenticación",
+"Group already exists" => "El grupo ya existe",
+"Unable to add group" => "No se pudo añadir el grupo",
+"Email saved" => "Correo guardado",
+"Invalid email" => "Correo no válido",
 "OpenID Changed" => "OpenID cambiado",
 "Invalid request" => "Solicitud no válida",
+"Unable to delete group" => "No se pudo eliminar el grupo",
+"Unable to delete user" => "No se pudo eliminar el usuario",
 "Language changed" => "Idioma cambiado",
+"Unable to add user to group %s" => "Imposible añadir el usuario al grupo %s",
+"Unable to remove user from group %s" => "Imposible eliminar al usuario del grupo %s",
+"Error" => "Error",
+"Disable" => "Desactivar",
+"Enable" => "Activar",
+"Saving..." => "Guardando...",
 "__language_name__" => "Castellano",
+"Security Warning" => "Advertencia de seguridad",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "El directorio de datos -data- y sus archivos probablemente son accesibles desde internet. El archivo .htaccess que provee ownCloud no está funcionando. Recomendamos fuertemente que configure su servidor web de forma que el directorio de datos ya no sea accesible o mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "ejecutar una tarea con cada página cargada",
+"Share API" => "API de compartición",
+"Enable Share API" => "Activar API de compartición",
+"Allow apps to use the Share API" => "Permitir a las aplicaciones usar la API de compartición",
+"Allow links" => "Permitir enlaces",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos públicamente con enlaces",
+"Allow resharing" => "Permitir re-compartir",
+"Allow users to share items shared with them again" => "Permitir a los usuarios compartir elementos compartidos con ellos de nuevo",
+"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquiera",
+"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir con usuarios en sus grupos",
 "Log" => "Registro",
 "More" => "Más",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Añade tu aplicación",
 "Select an App" => "Seleccionar una aplicación",
-"-licensed" => "-autorizado",
-"by" => "por",
+"See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
 "Documentation" => "Documentación",
 "Managing Big Files" => "Administra archivos grandes",
 "Ask a question" => "Hacer una pregunta",
@@ -37,6 +65,7 @@
 "Create" => "Crear",
 "Default Quota" => "Cuota predeterminada",
 "Other" => "Otro",
+"Group Admin" => "Grupo admin",
 "Quota" => "Cuota",
 "Delete" => "Eliminar"
 );
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 75ba2b72f0b..13924f75484 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,14 +1,40 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "App Sotre'i nimekirja laadimine ebaõnnestus",
+"Authentication error" => "Autentimise viga",
+"Group already exists" => "Grupp on juba olemas",
+"Unable to add group" => "Keela grupi lisamine",
+"Email saved" => "Kiri on salvestatud",
+"Invalid email" => "Vigane e-post",
 "OpenID Changed" => "OpenID on muudetud",
 "Invalid request" => "Vigane päring",
+"Unable to delete group" => "Keela grupi kustutamine",
+"Unable to delete user" => "Keela kasutaja kustutamine",
 "Language changed" => "Keel on muudetud",
+"Unable to add user to group %s" => "Kasutajat ei saa lisada gruppi %s",
+"Unable to remove user from group %s" => "Kasutajat ei saa eemaldada grupist %s",
+"Error" => "Viga",
+"Disable" => "Lülita välja",
+"Enable" => "Lülita sisse",
+"Saving..." => "Salvestamine...",
 "__language_name__" => "Eesti",
+"Security Warning" => "Turvahoiatus",
+"Cron" => "Ajastatud töö",
+"execute one task with each page loaded" => "käivita iga laetud lehe juures üks ülesanne",
+"Share API" => "Jagamise API",
+"Enable Share API" => "Luba jagamise API",
+"Allow apps to use the Share API" => "Luba rakendustel kasutada jagamise API-t",
+"Allow links" => "Luba linke",
+"Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega",
+"Allow resharing" => "Luba edasijagamine",
+"Allow users to share items shared with them again" => "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud",
+"Allow users to share with anyone" => "Luba kasutajatel kõigiga jagada",
+"Allow users to only share with users in their groups" => "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad",
 "Log" => "Logi",
 "More" => "Veel",
 "Add your App" => "Lisa oma rakendus",
 "Select an App" => "Vali programm",
-"-licensed" => "-litsenseeritud",
-"by" => "kelle poolt",
+"See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>",
 "Documentation" => "Dokumentatsioon",
 "Managing Big Files" => "Suurte failide haldamine",
 "Ask a question" => "Küsi küsimus",
@@ -37,6 +63,7 @@
 "Create" => "Lisa",
 "Default Quota" => "Vaikimisi kvoot",
 "Other" => "Muu",
+"Group Admin" => "Grupi admin",
 "Quota" => "Mahupiir",
 "Delete" => "Kustuta"
 );
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 4ef58dd1126..51e62bc9ddc 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,13 +1,42 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
+"Authentication error" => "Autentifikazio errorea",
+"Group already exists" => "Taldea dagoeneko existitzenda",
+"Unable to add group" => "Ezin izan da taldea gehitu",
+"Email saved" => "Eposta gorde da",
+"Invalid email" => "Baliogabeko eposta",
 "OpenID Changed" => "OpenID aldatuta",
 "Invalid request" => "Baliogabeko eskaria",
+"Unable to delete group" => "Ezin izan da taldea ezabatu",
+"Unable to delete user" => "Ezin izan da erabiltzailea ezabatu",
 "Language changed" => "Hizkuntza aldatuta",
+"Unable to add user to group %s" => "Ezin izan da erabiltzailea %s taldera gehitu",
+"Unable to remove user from group %s" => "Ezin izan da erabiltzailea %s taldetik ezabatu",
+"Error" => "Errorea",
+"Disable" => "Ez-gaitu",
+"Enable" => "Gaitu",
+"Saving..." => "Gordetzen...",
 "__language_name__" => "Euskera",
+"Security Warning" => "Segurtasun abisua",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "exekutatu zeregina orri karga bakoitzean",
+"Share API" => "Partekatze APIa",
+"Enable Share API" => "Gaitu Partekatze APIa",
+"Allow apps to use the Share API" => "Baimendu aplikazioak Partekatze APIa erabiltzeko",
+"Allow links" => "Baimendu loturak",
+"Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki partekatzen",
+"Allow resharing" => "Baimendu birpartekatzea",
+"Allow users to share items shared with them again" => "Baimendu erabiltzaileak haiekin partekatutako fitxategiak berriz ere partekatzen",
+"Allow users to share with anyone" => "Baimendu erabiltzaileak edonorekin partekatzen",
+"Allow users to only share with users in their groups" => "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin partekatzen",
+"Log" => "Egunkaria",
 "More" => "Gehiago",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
 "Add your App" => "Gehitu zure aplikazioa",
 "Select an App" => "Aukeratu programa bat",
-"-licensed" => "lizentziarekin",
-"by" => " Egilea:",
+"See application page at apps.owncloud.com" => "Ikusi programen orria apps.owncloud.com en",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>",
 "Documentation" => "Dokumentazioa",
 "Managing Big Files" => "Fitxategi handien kudeaketa",
 "Ask a question" => "Egin galdera bat",
@@ -34,7 +63,9 @@
 "Password" => "Pasahitza",
 "Groups" => "Taldeak",
 "Create" => "Sortu",
+"Default Quota" => "Kuota lehentsia",
 "Other" => "Besteak",
+"Group Admin" => "Talde administradorea",
 "Quota" => "Kuota",
 "Delete" => "Ezabatu"
 );
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 892de2d9ec0..215966728d6 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,14 +1,20 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "ایمیل ذخیره شد",
+"Invalid email" => "ایمیل غیر قابل قبول",
 "OpenID Changed" => "OpenID تغییر کرد",
 "Invalid request" => "درخواست غیر قابل قبول",
 "Language changed" => "زبان تغییر کرد",
+"Error" => "خطا",
+"Disable" => "غیرفعال",
+"Enable" => "فعال",
+"Saving..." => "درحال ذخیره ...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "اخطار امنیتی",
 "Log" => "کارنامه",
 "More" => "بیشتر",
 "Add your App" => "برنامه خود را بیافزایید",
 "Select an App" => "یک برنامه انتخاب کنید",
-"-licensed" => "مجوزنامه",
-"by" => "به وسیله",
+"See application page at apps.owncloud.com" => "صفحه این اٌپ را در apps.owncloud.com ببینید",
 "Documentation" => "مستندات",
 "Managing Big Files" => "مدیریت پرونده های بزرگ",
 "Ask a question" => "یک سوال بپرسید",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 76964b30800..edd5465b7da 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,14 +1,42 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)",
+"Authentication error" => "Todennusvirhe",
+"Group already exists" => "Ryhmä on jo olemassa",
+"Unable to add group" => "Ryhmän lisäys epäonnistui",
+"Email saved" => "Sähköposti tallennettu",
+"Invalid email" => "Virheellinen sähköposti",
 "OpenID Changed" => "OpenID on vaihdettu",
 "Invalid request" => "Virheellinen pyyntö",
+"Unable to delete group" => "Ryhmän poisto epäonnistui",
+"Unable to delete user" => "Käyttäjän poisto epäonnistui",
 "Language changed" => "Kieli on vaihdettu",
+"Unable to add user to group %s" => "Käyttäjän tai ryhmän %s lisääminen ei onnistu",
+"Unable to remove user from group %s" => "Käyttäjän poistaminen ryhmästä %s ei onnistu",
+"Error" => "Virhe",
+"Disable" => "Poista käytöstä",
+"Enable" => "Käytä",
+"Saving..." => "Tallennetaan...",
 "__language_name__" => "_kielen_nimi_",
+"Security Warning" => "Turvallisuusvaroitus",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htaccess-tiedosto, jolla kontrolloidaan pääsyä, ei toimi. Suosittelemme, että muutat web-palvelimesi asetukset niin ettei data-kansio ole enää pääsyä tai siirrät data-kansion pois web-palvelimen tiedostojen juuresta.",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "suorita yksi tehtävä jokaisella ladatulla sivulla",
+"Share API" => "Jaon ohelmointirajapinta (Share API)",
+"Enable Share API" => "Ota käyttöön jaon ohjelmoitirajapinta (Share API)",
+"Allow apps to use the Share API" => "Salli sovellusten käyttää jaon ohjelmointirajapintaa (Share API)",
+"Allow links" => "Salli linkit",
+"Allow users to share items to the public with links" => "Salli käyttäjien jakaa kohteita julkisesti linkkejä käyttäen",
+"Allow resharing" => "Salli uudelleenjako",
+"Allow users to share items shared with them again" => "Salli käyttäjien jakaa heille itselleen jaettuja tietoja edelleen",
+"Allow users to share with anyone" => "Salli käyttäjien jakaa kohteita kenen tahansa kanssa",
+"Allow users to only share with users in their groups" => "Salli käyttäjien jakaa kohteita vain omien ryhmien jäsenten kesken",
 "Log" => "Loki",
 "More" => "Lisää",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
 "Add your App" => "Lisää ohjelmasi",
 "Select an App" => "Valitse ohjelma",
-"-licensed" => "-lisenssöity",
-"by" => "henkilölle",
+"See application page at apps.owncloud.com" => "Katso sovellussivu osoitteessa apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>",
 "Documentation" => "Dokumentaatio",
 "Managing Big Files" => "Suurten tiedostojen hallinta",
 "Ask a question" => "Kysy jotain",
@@ -16,7 +44,7 @@
 "Go there manually." => "Ohje löytyy sieltä.",
 "Answer" => "Vastaus",
 "You use" => "Olet käyttänyt",
-"of the available" => "käytettävissäsi on yhteensä",
+"of the available" => ", käytettävissäsi on yhteensä",
 "Desktop and Mobile Syncing Clients" => "Tietokoneen ja mobiililaitteiden synkronointisovellukset",
 "Download" => "Lataa",
 "Your password got changed" => "Salasanasi on vaihdettu",
@@ -27,7 +55,7 @@
 "Change password" => "Vaihda salasana",
 "Email" => "Sähköposti",
 "Your email address" => "Sähköpostiosoitteesi",
-"Fill in an email address to enable password recovery" => "Kirjoita sähköpostiosoitteesi alle, jotta unohdettu salasana voidaan palauttaa",
+"Fill in an email address to enable password recovery" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa",
 "Language" => "Kieli",
 "Help translate" => "Auta kääntämisessä",
 "use this address to connect to your ownCloud in your file manager" => "voit yhdistää tiedostonhallintasovelluksellasi ownCloudiin käyttämällä tätä osoitetta",
@@ -37,6 +65,7 @@
 "Create" => "Luo",
 "Default Quota" => "Oletuskiintiö",
 "Other" => "Muu",
+"Group Admin" => "Ryhmän ylläpitäjä",
 "Quota" => "Kiintiö",
 "Delete" => "Poista"
 );
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 7e9a92f6bbf..a1c38d1e79e 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,14 +1,42 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
+"Authentication error" => "Erreur d'authentification",
+"Group already exists" => "Ce groupe existe déjà",
+"Unable to add group" => "Impossible d'ajouter le groupe",
+"Email saved" => "E-mail sauvegardé",
+"Invalid email" => "E-mail invalide",
 "OpenID Changed" => "Identifiant OpenID changé",
 "Invalid request" => "Requête invalide",
+"Unable to delete group" => "Impossible de supprimer le groupe",
+"Unable to delete user" => "Impossible de supprimer l'utilisateur",
 "Language changed" => "Langue changée",
+"Unable to add user to group %s" => "Impossible d'ajouter l'utilisateur au groupe %s",
+"Unable to remove user from group %s" => "Impossible de supprimer l'utilisateur du groupe %s",
+"Error" => "Erreur",
+"Disable" => "Désactiver",
+"Enable" => "Activer",
+"Saving..." => "Sauvegarde...",
 "__language_name__" => "Français",
+"Security Warning" => "Alertes de sécurité",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Votre répertoire de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni avec ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce répertoire ne soit plus accessible, ou bien de déplacer le répertoire de données à l'extérieur de la racine du serveur web.",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "exécuter une tâche pour chaque page chargée",
+"Share API" => "API de partage",
+"Enable Share API" => "Activer l'API de partage",
+"Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
+"Allow links" => "Autoriser les liens",
+"Allow users to share items to the public with links" => "Autoriser les utilisateurs à partager du contenu public avec des liens",
+"Allow resharing" => "Autoriser le re-partage",
+"Allow users to share items shared with them again" => "Autoriser les utilisateurs à partager des éléments déjà partagés entre eux",
+"Allow users to share with anyone" => "Autoriser les utilisateurs à partager avec tout le monde",
+"Allow users to only share with users in their groups" => "Autoriser les utilisateurs à ne partager qu'avec les utilisateurs dans leurs groupes",
 "Log" => "Journaux",
 "More" => "Plus",
-"Add your App" => "Ajouter votre application",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Add your App" => "Ajoutez votre application",
 "Select an App" => "Sélectionner une Application",
-"-licensed" => "sous licence",
-"by" => "par",
+"See application page at apps.owncloud.com" => "Voir la page des applications à l'url apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>",
 "Documentation" => "Documentation",
 "Managing Big Files" => "Gérer les gros fichiers",
 "Ask a question" => "Poser une question",
@@ -16,7 +44,7 @@
 "Go there manually." => "S'y rendre manuellement.",
 "Answer" => "Réponse",
 "You use" => "Vous utilisez",
-"of the available" => "d'espace de stockage sur un total de",
+"of the available" => "de votre espace de stockage d'une taille totale de",
 "Desktop and Mobile Syncing Clients" => "Clients de synchronisation Mobile et Ordinateur",
 "Download" => "Télécharger",
 "Your password got changed" => "Votre mot de passe a été changé",
@@ -37,6 +65,7 @@
 "Create" => "Créer",
 "Default Quota" => "Quota par défaut",
 "Other" => "Autre",
+"Group Admin" => "Groupe Admin",
 "Quota" => "Quota",
 "Delete" => "Supprimer"
 );
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 0459d940b4d..245ef329e8c 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,14 +1,24 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Non se puido cargar a lista desde a App Store",
+"Authentication error" => "Erro na autenticación",
+"Email saved" => "Correo electrónico gardado",
+"Invalid email" => "correo electrónico non válido",
 "OpenID Changed" => "Mudou o OpenID",
 "Invalid request" => "Petición incorrecta",
 "Language changed" => "O idioma mudou",
+"Error" => "Erro",
+"Disable" => "Deshabilitar",
+"Enable" => "Habilitar",
+"Saving..." => "Gardando...",
 "__language_name__" => "Galego",
+"Security Warning" => "Aviso de seguridade",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "executar unha tarefa con cada páxina cargada",
 "Log" => "Conectar",
 "More" => "Máis",
 "Add your App" => "Engade o teu aplicativo",
 "Select an App" => "Escolla un Aplicativo",
-"-licensed" => "-licenciado",
-"by" => "por",
+"See application page at apps.owncloud.com" => "Vexa a páxina do aplicativo en apps.owncloud.com",
 "Documentation" => "Documentación",
 "Managing Big Files" => "Xestionar Grandes Ficheiros",
 "Ask a question" => "Pregunte",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 39055c21398..c7189e94354 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,14 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "הדוא״ל נשמר",
+"Invalid email" => "דוא״ל לא חוקי",
 "OpenID Changed" => "OpenID השתנה",
 "Invalid request" => "בקשה לא חוקית",
 "Language changed" => "שפה השתנתה",
+"Disable" => "בטל",
+"Enable" => "הפעל",
+"Saving..." => "שומר..",
 "__language_name__" => "עברית",
 "Log" => "יומן",
 "More" => "עוד",
 "Add your App" => "הוספת היישום שלך",
 "Select an App" => "בחירת יישום",
-"-licensed" => "רשיון",
-"by" => "מאת",
+"See application page at apps.owncloud.com" => "צפה בעמוד הישום ב apps.owncloud.com",
 "Documentation" => "תיעוד",
 "Managing Big Files" => "ניהול קבצים גדולים",
 "Ask a question" => "שאל שאלה",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 5f357a85d2f..de540cb50fe 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,14 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nemogićnost učitavanja liste sa Apps Stora",
+"Authentication error" => "Greška kod autorizacije",
+"Email saved" => "Email spremljen",
+"Invalid email" => "Neispravan email",
 "OpenID Changed" => "OpenID promijenjen",
 "Invalid request" => "Neispravan zahtjev",
 "Language changed" => "Jezik promijenjen",
+"Error" => "Greška",
+"Disable" => "Isključi",
+"Enable" => "Uključi",
+"Saving..." => "Spremanje...",
 "__language_name__" => "__ime_jezika__",
+"Cron" => "Cron",
 "Log" => "dnevnik",
 "More" => "više",
 "Add your App" => "Dodajte vašu aplikaciju",
 "Select an App" => "Odaberite Aplikaciju",
-"-licensed" => "-licencirano",
-"by" => "od",
+"See application page at apps.owncloud.com" => "Pogledajte stranicu s aplikacijama na apps.owncloud.com",
 "Documentation" => "dokumentacija",
 "Managing Big Files" => "Upravljanje velikih datoteka",
 "Ask a question" => "Postavite pitanje",
@@ -37,6 +45,7 @@
 "Create" => "Izradi",
 "Default Quota" => "standardni kvota",
 "Other" => "ostali",
+"Group Admin" => "Grupa Admin",
 "Quota" => "kvota",
 "Delete" => "Obriši"
 );
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 7eb7772f6dd..23534d85759 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,14 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
+"Authentication error" => "Hitelesítési hiba",
+"Email saved" => "Email mentve",
+"Invalid email" => "Hibás email",
 "OpenID Changed" => "OpenID megváltozott",
 "Invalid request" => "Érvénytelen kérés",
 "Language changed" => "A nyelv megváltozott",
+"Error" => "Hiba",
+"Disable" => "Letiltás",
+"Enable" => "Engedélyezés",
+"Saving..." => "Mentés...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Biztonsági figyelmeztetés",
 "Log" => "Napló",
 "More" => "Tovább",
 "Add your App" => "App hozzáadása",
 "Select an App" => "Egy App kiválasztása",
-"-licensed" => "-licencelt",
-"by" => ":",
+"See application page at apps.owncloud.com" => "Lásd apps.owncloud.com, alkalmazások oldal",
 "Documentation" => "Dokumentáció",
 "Managing Big Files" => "Nagy fájlok kezelése",
 "Ask a question" => "Tégy fel egy kérdést",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index 7b2b631b687..e9d6a065a21 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -7,7 +7,6 @@
 "More" => "Plus",
 "Add your App" => "Adder tu application",
 "Select an App" => "Selectionar un app",
-"by" => "per",
 "Documentation" => "Documentation",
 "Ask a question" => "Facer un question",
 "Answer" => "Responsa",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index bf35b79240a..636be1af955 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,14 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email tersimpan",
+"Invalid email" => "Email tidak sah",
 "OpenID Changed" => "OpenID telah dirubah",
 "Invalid request" => "Permintaan tidak valid",
 "Language changed" => "Bahasa telah diganti",
+"Disable" => "NonAktifkan",
+"Enable" => "Aktifkan",
+"Saving..." => "Menyimpan...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Peringatan Keamanan",
 "Log" => "Log",
 "More" => "Lebih",
 "Add your App" => "Tambahkan App anda",
 "Select an App" => "Pilih satu aplikasi",
-"-licensed" => "-terlisensi",
-"by" => "oleh",
+"See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com",
 "Documentation" => "Dokumentasi",
 "Managing Big Files" => "Mengelola berkas besar",
 "Ask a question" => "Ajukan pertanyaan",
@@ -37,6 +42,7 @@
 "Create" => "Buat",
 "Default Quota" => "Kuota default",
 "Other" => "Lain-lain",
+"Group Admin" => "Admin Grup",
 "Quota" => "Quota",
 "Delete" => "Hapus"
 );
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index a4b255546a1..e8728f6a1c7 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,14 +1,42 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Impossibile caricare l'elenco dall'App Store",
+"Authentication error" => "Errore di autenticazione",
+"Group already exists" => "Il gruppo esiste già",
+"Unable to add group" => "Impossibile aggiungere il gruppo",
+"Email saved" => "Email salvata",
+"Invalid email" => "Email non valida",
 "OpenID Changed" => "OpenID modificato",
 "Invalid request" => "Richiesta non valida",
+"Unable to delete group" => "Impossibile eliminare il gruppo",
+"Unable to delete user" => "Impossibile eliminare l'utente",
 "Language changed" => "Lingua modificata",
+"Unable to add user to group %s" => "Impossibile aggiungere l'utente al gruppo %s",
+"Unable to remove user from group %s" => "Impossibile rimuovere l'utente dal gruppo %s",
+"Error" => "Errore",
+"Disable" => "Disabilita",
+"Enable" => "Abilita",
+"Saving..." => "Salvataggio in corso...",
 "__language_name__" => "Italiano",
+"Security Warning" => "Avviso di sicurezza",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess fornito da ownCloud non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile e spostare la cartella fuori dalla radice del server web.",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "esegui un'attività con ogni pagina caricata",
+"Share API" => "API di condivisione",
+"Enable Share API" => "Abilita API di condivisione",
+"Allow apps to use the Share API" => "Consenti alle applicazioni di utilizzare le API di condivisione",
+"Allow links" => "Consenti collegamenti",
+"Allow users to share items to the public with links" => "Consenti agli utenti di condividere elementi al pubblico con collegamenti",
+"Allow resharing" => "Consenti la ri-condivisione",
+"Allow users to share items shared with them again" => "Consenti agli utenti di condividere elementi già condivisi",
+"Allow users to share with anyone" => "Consenti agli utenti di condividere con chiunque",
+"Allow users to only share with users in their groups" => "Consenti agli utenti di condividere con gli utenti del proprio gruppo",
 "Log" => "Registro",
 "More" => "Altro",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è licenziato nei termini della <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Aggiungi la tua applicazione",
 "Select an App" => "Seleziona un'applicazione",
-"-licensed" => "-rilasciato",
-"by" => "da",
+"See application page at apps.owncloud.com" => "Vedere la pagina dell'applicazione su apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>",
 "Documentation" => "Documentazione",
 "Managing Big Files" => "Gestione file grandi",
 "Ask a question" => "Fai una domanda",
@@ -27,7 +55,7 @@
 "Change password" => "Modifica password",
 "Email" => "Email",
 "Your email address" => "Il tuo indirizzo email",
-"Fill in an email address to enable password recovery" => "Inserici il tuo indirizzo email per abilitare il recupero della password",
+"Fill in an email address to enable password recovery" => "Inserisci il tuo indirizzo email per abilitare il recupero della password",
 "Language" => "Lingua",
 "Help translate" => "Migliora la traduzione",
 "use this address to connect to your ownCloud in your file manager" => "usa questo indirizzo per connetterti al tuo ownCloud dal gestore file",
@@ -37,6 +65,7 @@
 "Create" => "Crea",
 "Default Quota" => "Quota predefinita",
 "Other" => "Altro",
+"Group Admin" => "Gruppo di amministrazione",
 "Quota" => "Quote",
 "Delete" => "Elimina"
 );
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 69e56983744..88c8b4c81c1 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,14 +1,42 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "アプリストアからリストをロードできません",
+"Authentication error" => "認証エラー",
+"Group already exists" => "グループは既に存在しています",
+"Unable to add group" => "グループを追加できません",
+"Email saved" => "メールアドレスを保存しました",
+"Invalid email" => "無効なメールアドレス",
 "OpenID Changed" => "OpenIDが変更されました",
 "Invalid request" => "無効なリクエストです",
+"Unable to delete group" => "グループを削除できません",
+"Unable to delete user" => "ユーザを削除できません",
 "Language changed" => "言語が変更されました",
+"Unable to add user to group %s" => "ユーザをグループ %s に追加できません",
+"Unable to remove user from group %s" => "ユーザをグループ %s から削除できません",
+"Error" => "エラー",
+"Disable" => "無効",
+"Enable" => "有効",
+"Saving..." => "保存中...",
 "__language_name__" => "Japanese (日本語)",
+"Security Warning" => "セキュリティ警告",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "データディレクトリとファイルが恐らくインターネットからアクセスできるようになっています。ownCloudが提供する .htaccessファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。",
+"Cron" => "cron(自動定期実行)",
+"execute one task with each page loaded" => "ページを開く毎にタスクを1つ実行",
+"Share API" => "Share API",
+"Enable Share API" => "Share APIを有効",
+"Allow apps to use the Share API" => "Share APIの使用をアプリケーションに許可",
+"Allow links" => "リンクを許可",
+"Allow users to share items to the public with links" => "ユーザーがリンクによる公開でアイテムを共有することが出来るようにする",
+"Allow resharing" => "再共有を許可",
+"Allow users to share items shared with them again" => "ユーザーが共有されているアイテムをさらに共有することが出来るようにする",
+"Allow users to share with anyone" => "ユーザーが誰にでも共有出来るようにする",
+"Allow users to only share with users in their groups" => "ユーザーがグループの人にしか共有出来ないようにする",
 "Log" => "ログ",
 "More" => "もっと",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>により開発されています、<a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>ライセンスは、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスにより提供されています。",
 "Add your App" => "アプリを追加",
 "Select an App" => "アプリを選択してください",
-"-licensed" => "ライセンス",
-"by" => "@",
+"See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>",
 "Documentation" => "ドキュメント",
 "Managing Big Files" => "大きなファイルを扱うには",
 "Ask a question" => "質問してください",
@@ -37,6 +65,7 @@
 "Create" => "作成",
 "Default Quota" => "デフォルトのクォータサイズ",
 "Other" => "その他",
+"Group Admin" => "グループ管理者",
 "Quota" => "クオータ",
 "Delete" => "削除"
 );
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index a2c1210af6b..0ff261c9295 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,14 +1,24 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "앱 스토어에서 목록을 가져올 수 없습니다",
+"Authentication error" => "인증 오류",
+"Email saved" => "이메일 저장",
+"Invalid email" => "잘못된 이메일",
 "OpenID Changed" => "OpenID 변경됨",
 "Invalid request" => "잘못된 요청",
 "Language changed" => "언어가 변경되었습니다",
+"Error" => "에러",
+"Disable" => "비활성화",
+"Enable" => "활성화",
+"Saving..." => "저장...",
 "__language_name__" => "한국어",
+"Security Warning" => "보안 경고",
+"Cron" => "크론",
+"execute one task with each page loaded" => "각 페이지가 로드 된 하나의 작업을 실행",
 "Log" => "로그",
 "More" => "더",
 "Add your App" => "앱 추가",
 "Select an App" => "프로그램 선택",
-"-licensed" => " 라이선스 사용",
-"by" => " by ",
+"See application page at apps.owncloud.com" => "application page at apps.owncloud.com을 보시오.",
 "Documentation" => "문서",
 "Managing Big Files" => "큰 파일 관리",
 "Ask a question" => "질문하기",
@@ -37,6 +47,7 @@
 "Create" => "만들기",
 "Default Quota" => "기본 할당량",
 "Other" => "다른",
+"Group Admin" => "그룹 관리자",
 "Quota" => "할당량",
 "Delete" => "삭제"
 );
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 29072720a02..5728299d0df 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -1,14 +1,30 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Konnt Lescht net vum App Store lueden",
+"Authentication error" => "Authentifikatioun's Fehler",
+"Email saved" => "E-mail gespäichert",
+"Invalid email" => "Ongülteg e-mail",
 "OpenID Changed" => "OpenID huet geännert",
 "Invalid request" => "Ongülteg Requête",
 "Language changed" => "Sprooch huet geännert",
+"Error" => "Fehler",
+"Disable" => "Ofschalten",
+"Enable" => "Aschalten",
+"Saving..." => "Speicheren...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Sécherheets Warnung",
+"Cron" => "Cron",
+"Share API" => "Share API",
+"Enable Share API" => "Share API aschalten",
+"Allow apps to use the Share API" => "Erlab Apps d'Share API ze benotzen",
+"Allow links" => "Links erlaben",
+"Allow resharing" => "Resharing erlaben",
+"Allow users to share with anyone" => "Useren erlaben mat egal wiem ze sharen",
+"Allow users to only share with users in their groups" => "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen",
 "Log" => "Log",
 "More" => "Méi",
 "Add your App" => "Setz deng App bei",
 "Select an App" => "Wiel eng Applikatioun aus",
-"-licensed" => "-Lizenséiert",
-"by" => "vun",
+"See application page at apps.owncloud.com" => "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un",
 "Documentation" => "Dokumentatioun",
 "Managing Big Files" => "Grouss Fichieren verwalten",
 "Ask a question" => "Stell eng Fro",
@@ -37,6 +53,7 @@
 "Create" => "Erstellen",
 "Default Quota" => "Standard Quota",
 "Other" => "Aner",
+"Group Admin" => "Gruppen Admin",
 "Quota" => "Quota",
 "Delete" => "Läschen"
 );
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 504217a9db5..169892d6b21 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,13 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Neįmanoma įkelti sąrašo iš Programų Katalogo",
+"Email saved" => "El. paštas išsaugotas",
+"Invalid email" => "Netinkamas el. paštas",
 "OpenID Changed" => "OpenID pakeistas",
 "Invalid request" => "Klaidinga užklausa",
 "Language changed" => "Kalba pakeista",
+"Error" => "Klaida",
+"Disable" => "Išjungti",
+"Enable" => "Įjungti",
+"Saving..." => "Saugoma..",
 "__language_name__" => "Kalba",
+"Security Warning" => "Saugumo įspėjimas",
+"Cron" => "Cron",
 "Log" => "Žurnalas",
 "More" => "Daugiau",
 "Add your App" => "Pridėti programėlę",
 "Select an App" => "Pasirinkite programą",
-"-licensed" => "-licencijuota",
 "Documentation" => "Dokumentacija",
 "Ask a question" => "Užduoti klausimą",
 "Problems connecting to help database." => "Problemos jungiantis prie duomenų bazės",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
new file mode 100644
index 00000000000..9780127890a
--- /dev/null
+++ b/settings/l10n/lv.php
@@ -0,0 +1,52 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nebija iespējams lejuplādēt sarakstu no aplikāciju veikala",
+"Authentication error" => "Ielogošanās kļūme",
+"Email saved" => "Epasts tika saglabāts",
+"Invalid email" => "Nepareizs epasts",
+"OpenID Changed" => "OpenID nomainīts",
+"Invalid request" => "Nepareizs vaicājums",
+"Language changed" => "Valoda tika nomainīta",
+"Error" => "Kļūme",
+"Disable" => "Atvienot",
+"Enable" => "Pievienot",
+"Saving..." => "Saglabā...",
+"__language_name__" => "__valodas_nosaukums__",
+"Security Warning" => "Brīdinājums par drošību",
+"Cron" => "Cron",
+"Log" => "Log",
+"More" => "Vairāk",
+"Add your App" => "Pievieno savu aplikāciju",
+"Select an App" => "Izvēlies aplikāciju",
+"See application page at apps.owncloud.com" => "Apskatie aplikāciju lapu - apps.owncloud.com",
+"Documentation" => "Dokumentācija",
+"Managing Big Files" => "Rīkoties ar apjomīgiem failiem",
+"Ask a question" => "Uzdod jautajumu",
+"Problems connecting to help database." => "Problēmas ar datubāzes savienojumu",
+"Go there manually." => "Nokļūt tur pašrocīgi",
+"Answer" => "Atbildēt",
+"You use" => "Jūs iymantojat",
+"of the available" => "no pieejamajiem",
+"Desktop and Mobile Syncing Clients" => "Desktop un mobīlo ierīču sinhronizācijas rīks",
+"Download" => "Lejuplādēt",
+"Your password got changed" => "Jūsu parole tika nomainīta",
+"Unable to change your password" => "Nav iespējams nomainīt jūsu paroli",
+"Current password" => "Pašreizējā parole",
+"New password" => "Jauna parole",
+"show" => "parādīt",
+"Change password" => "Nomainīt paroli",
+"Email" => "Epasts",
+"Your email address" => "Jūsu epasta adrese",
+"Fill in an email address to enable password recovery" => "Ievadiet epasta adresi, lai vēlak būtu iespēja atgūt paroli, ja būs nepieciešamība",
+"Language" => "Valoda",
+"Help translate" => "Palīdzi tulkot",
+"use this address to connect to your ownCloud in your file manager" => "izmanto šo adresi lai ielogotos ownCloud no sava failu pārlūka",
+"Name" => "Vārds",
+"Password" => "Parole",
+"Groups" => "Grupas",
+"Create" => "Izveidot",
+"Default Quota" => "Apjoms pēc noklusējuma",
+"Other" => "Cits",
+"Group Admin" => "Grupas administrators",
+"Quota" => "Apjoms",
+"Delete" => "Izdzēst"
+);
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 4a61ba9d512..ce89f3b40c7 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,14 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Електронската пошта е снимена",
+"Invalid email" => "Неисправна електронска пошта",
 "OpenID Changed" => "OpenID сменето",
 "Invalid request" => "неправилно барање",
 "Language changed" => "Јазикот е сменет",
+"Disable" => "Оневозможи",
+"Enable" => "Овозможи",
+"Saving..." => "Снимам...",
 "__language_name__" => "__language_name__",
 "Log" => "Записник",
 "More" => "Повеќе",
 "Add your App" => "Додадете ја Вашата апликација",
 "Select an App" => "Избери аппликација",
-"-licensed" => "-licensed",
-"by" => "од",
+"See application page at apps.owncloud.com" => "Види ја страницата со апликации на apps.owncloud.com",
 "Documentation" => "Документација",
 "Managing Big Files" => "Управување со големи датотеки",
 "Ask a question" => "Постави прашање",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index f0fba7a7c03..a1d3007c895 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -1,23 +1,36 @@
 <?php $TRANSLATIONS = array(
-"OpenID Changed" => "OpenID ditukar",
+"Authentication error" => "Ralat pengesahan",
+"Email saved" => "Emel disimpan",
+"Invalid email" => "Emel tidak sah",
+"OpenID Changed" => "OpenID diubah",
 "Invalid request" => "Permintaan tidak sah",
-"Language changed" => "Bahasa ditukar",
+"Language changed" => "Bahasa diubah",
+"Disable" => "Nyahaktif",
+"Enable" => "Aktif",
+"Saving..." => "Simpan...",
 "__language_name__" => "_nama_bahasa_",
+"Security Warning" => "Amaran keselamatan",
+"Log" => "Log",
+"More" => "Lanjutan",
+"Add your App" => "Tambah apps anda",
 "Select an App" => "Pilih aplikasi",
-"-licensed" => "-dilesen",
-"by" => "oleh",
+"See application page at apps.owncloud.com" => "Lihat halaman applikasi di apps.owncloud.com",
+"Documentation" => "Dokumentasi",
+"Managing Big Files" => "Mengurus Fail Besar",
 "Ask a question" => "Tanya soalan",
 "Problems connecting to help database." => "Masalah menghubung untuk membantu pengkalan data",
 "Go there manually." => "Pergi ke sana secara manual",
 "Answer" => "Jawapan",
 "You use" => "Anda menggunakan",
 "of the available" => "yang tersedia",
-"Your password got changed" => "Kata laluan anda ditukar",
-"Unable to change your password" => "Gagal menukar kata laluan anda ",
-"Current password" => "Kata laluan terkini",
+"Desktop and Mobile Syncing Clients" => "Klien Selarian untuk Desktop dan Mobile",
+"Download" => "Muat turun",
+"Your password got changed" => "Kata laluan anda diubah",
+"Unable to change your password" => "Gagal mengubah kata laluan anda ",
+"Current password" => "Kata laluan semasa",
 "New password" => "Kata laluan baru",
 "show" => "Papar",
-"Change password" => "Tukar kata laluan",
+"Change password" => "Ubah kata laluan",
 "Email" => "Emel",
 "Your email address" => "Alamat emel anda",
 "Fill in an email address to enable password recovery" => "Isi alamat emel anda untuk membolehkan pemulihan kata laluan",
@@ -28,6 +41,8 @@
 "Password" => "Kata laluan ",
 "Groups" => "Kumpulan",
 "Create" => "Buat",
+"Default Quota" => "Kuota Lalai",
+"Other" => "Lain",
 "Quota" => "Kuota",
 "Delete" => "Padam"
 );
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 1379bb9c2ed..183406d0b0a 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,21 +1,33 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
+"Authentication error" => "Autentikasjonsfeil",
+"Email saved" => "Epost lagret",
+"Invalid email" => "Ugyldig epost",
 "OpenID Changed" => "OpenID endret",
 "Invalid request" => "Ugyldig forespørsel",
 "Language changed" => "Språk endret",
+"Error" => "Feil",
+"Disable" => "Slå avBehandle ",
+"Enable" => "Slå på",
+"Saving..." => "Lagrer...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Sikkerhetsadvarsel",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "utfør en oppgave med hver side som blir lastet",
 "Log" => "Logg",
 "More" => "Mer",
 "Add your App" => "Legg til din App",
 "Select an App" => "Velg en app",
-"-licensed" => "-lisensiert",
-"by" => "av",
+"See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
 "Documentation" => "Dokumentasjon",
+"Managing Big Files" => "Håndtere store filer",
 "Ask a question" => "Still et spørsmål",
 "Problems connecting to help database." => "Problemer med å koble til hjelp-databasen",
 "Go there manually." => "Gå dit manuelt",
 "Answer" => "Svar",
 "You use" => "Du bruker",
 "of the available" => "av den tilgjengelige",
+"Desktop and Mobile Syncing Clients" => "Klienter for datamaskiner og mobile enheter",
 "Download" => "Last ned",
 "Your password got changed" => "Passordet ditt ble endret",
 "Unable to change your password" => "Kunne ikke endre passordet ditt",
@@ -34,6 +46,8 @@
 "Groups" => "Grupper",
 "Create" => "Opprett",
 "Default Quota" => "Standard Kvote",
+"Other" => "Annet",
+"Group Admin" => "Gruppeadministrator",
 "Quota" => "Kvote",
 "Delete" => "Slett"
 );
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 939907ef710..a942d519123 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,14 +1,42 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Kan de lijst niet van de App store laden",
+"Authentication error" => "Authenticatie fout",
+"Group already exists" => "Groep bestaat al",
+"Unable to add group" => "Niet in staat om groep toe te voegen",
+"Email saved" => "E-mail bewaard",
+"Invalid email" => "Ongeldige e-mail",
 "OpenID Changed" => "OpenID is aangepast",
 "Invalid request" => "Ongeldig verzoek",
+"Unable to delete group" => "Niet in staat om groep te verwijderen",
+"Unable to delete user" => "Niet in staat om gebruiker te verwijderen",
 "Language changed" => "Taal aangepast",
+"Unable to add user to group %s" => "Niet in staat om gebruiker toe te voegen aan groep %s",
+"Unable to remove user from group %s" => "Niet in staat om gebruiker te verwijderen uit groep %s",
+"Error" => "Fout",
+"Disable" => "Uitschakelen",
+"Enable" => "Inschakelen",
+"Saving..." => "Aan het bewaren.....",
 "__language_name__" => "Nederlands",
+"Security Warning" => "Veiligheidswaarschuwing",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Uw data folder en uw bestanden zijn hoogst waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess bestand dat ownCloud meelevert werkt niet.  Het is ten zeerste aangeraden om uw webserver zodanig te configureren, dat de data folder niet bereikbaar is vanaf het internet of verplaatst uw data folder naar een locatie buiten de webserver document root.",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Voer 1 taak uit bij elke geladen pagina",
+"Share API" => "Deel API",
+"Enable Share API" => "Zet de Deel API aan",
+"Allow apps to use the Share API" => "Sta apps toe om de Deel API te gebruiken",
+"Allow links" => "Sta links toe",
+"Allow users to share items to the public with links" => "Sta gebruikers toe om items via links publiekelijk te maken",
+"Allow resharing" => "Sta verder delen toe",
+"Allow users to share items shared with them again" => "Sta gebruikers toe om items nogmaals te delen",
+"Allow users to share with anyone" => "Sta gebruikers toe om met iedereen te delen",
+"Allow users to only share with users in their groups" => "Sta gebruikers toe om alleen met gebruikers in hun groepen te delen",
 "Log" => "Log",
 "More" => "Meer",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Voeg je App toe",
 "Select an App" => "Selecteer een app",
-"-licensed" => "-gelicentieerd",
-"by" => "door",
+"See application page at apps.owncloud.com" => "Zie de applicatiepagina op apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>",
 "Documentation" => "Documentatie",
 "Managing Big Files" => "Onderhoud van grote bestanden",
 "Ask a question" => "Stel een vraag",
@@ -37,6 +65,7 @@
 "Create" => "Creëer",
 "Default Quota" => "Standaard limiet",
 "Other" => "Andere",
+"Group Admin" => "Groep Administrator",
 "Quota" => "Limieten",
 "Delete" => "verwijderen"
 );
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 87c9cecb24e..25cf29b91d5 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,11 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Klarer ikkje å laste inn liste fra App Store",
+"Authentication error" => "Feil i autentisering",
+"Email saved" => "E-postadresse lagra",
+"Invalid email" => "Ugyldig e-postadresse",
 "OpenID Changed" => "OpenID endra",
 "Invalid request" => "Ugyldig førespurnad",
 "Language changed" => "Språk endra",
+"Error" => "Feil",
+"Disable" => "Slå av",
+"Enable" => "Slå på",
 "__language_name__" => "Nynorsk",
 "Select an App" => "Vel ein applikasjon",
-"-licensed" => "-lisensiert",
-"by" => "av",
 "Ask a question" => "Spør om noko",
 "Problems connecting to help database." => "Problem ved tilkopling til hjelpedatabasen.",
 "Go there manually." => "Gå der på eigen hand.",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index d9dac06c007..ba6a36f28f4 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,14 +1,42 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nie mogę załadować listy aplikacji",
+"Authentication error" => "Błąd uwierzytelniania",
+"Group already exists" => "Grupa już istnieje",
+"Unable to add group" => "Nie można dodać grupy",
+"Email saved" => "Email zapisany",
+"Invalid email" => "Niepoprawny email",
 "OpenID Changed" => "Zmieniono OpenID",
 "Invalid request" => "Nieprawidłowe żądanie",
+"Unable to delete group" => "Nie można usunąć grupy",
+"Unable to delete user" => "Nie można usunąć użytkownika",
 "Language changed" => "Język zmieniony",
+"Unable to add user to group %s" => "Nie można dodać użytkownika do grupy %s",
+"Unable to remove user from group %s" => "Nie można usunąć użytkownika z grupy %s",
+"Error" => "Błąd",
+"Disable" => "Wyłączone",
+"Enable" => "Włączone",
+"Saving..." => "Zapisywanie...",
 "__language_name__" => "Polski",
+"Security Warning" => "Ostrzeżenia bezpieczeństwa",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "wykonanie jednego zadania z każdej  załadowanej strony",
+"Share API" => "Udostępnij API",
+"Enable Share API" => "Włącz udostępniane API",
+"Allow apps to use the Share API" => "Zezwalaj aplikacjom na używanie API",
+"Allow links" => "Zezwalaj na łącza",
+"Allow users to share items to the public with links" => "Zezwalaj użytkownikom na puliczne współdzielenie elementów za pomocą linków",
+"Allow resharing" => "Zezwól na ponowne udostępnianie",
+"Allow users to share items shared with them again" => "Zezwalaj użytkownikom na ponowne współdzielenie elementów już z nimi współdzilonych",
+"Allow users to share with anyone" => "Zezwalaj użytkownikom na współdzielenie z kimkolwiek",
+"Allow users to only share with users in their groups" => "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup",
 "Log" => "Log",
 "More" => "Więcej",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Stwirzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Dodaj aplikacje",
 "Select an App" => "Zaznacz aplikacje",
-"-licensed" => "-licencjonowany",
-"by" => "przez",
+"See application page at apps.owncloud.com" => "Zobacz stronę aplikacji na apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>",
 "Documentation" => "Dokumentacja",
 "Managing Big Files" => "Zarządzanie dużymi plikami",
 "Ask a question" => "Zadaj pytanie",
@@ -37,6 +65,7 @@
 "Create" => "Utwórz",
 "Default Quota" => "Domyślny udział",
 "Other" => "Inne",
+"Group Admin" => "Grupa Admin",
 "Quota" => "Udział",
 "Delete" => "Usuń"
 );
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 35cf507194a..9bd4923e3c0 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,14 +1,22 @@
 <?php $TRANSLATIONS = array(
+"Authentication error" => "erro de autenticação",
+"Email saved" => "Email gravado",
+"Invalid email" => "Email inválido",
 "OpenID Changed" => "Mudou OpenID",
 "Invalid request" => "Pedido inválido",
 "Language changed" => "Mudou Idioma",
+"Error" => "Erro",
+"Disable" => "Desabilitado",
+"Enable" => "Habilitado",
+"Saving..." => "Gravando...",
 "__language_name__" => "Português",
+"Security Warning" => "Aviso de Segurança",
+"execute one task with each page loaded" => "executar uma tarefa com cada página em aberto",
 "Log" => "Log",
 "More" => "Mais",
 "Add your App" => "Adicione seu Aplicativo",
 "Select an App" => "Selecione uma Aplicação",
-"-licensed" => "-licenciados",
-"by" => "por",
+"See application page at apps.owncloud.com" => "Ver página do aplicativo em apps.owncloud.com",
 "Documentation" => "Documentação",
 "Managing Big Files" => "Gerênciando Arquivos Grandes",
 "Ask a question" => "Faça uma pergunta",
@@ -37,6 +45,7 @@
 "Create" => "Criar",
 "Default Quota" => "Quota Padrão",
 "Other" => "Outro",
+"Group Admin" => "Grupo Administrativo",
 "Quota" => "Cota",
 "Delete" => "Apagar"
 );
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index af7088daa12..98eb41b15e4 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,14 +1,24 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
+"Authentication error" => "Erro de autenticação",
+"Email saved" => "Email guardado",
+"Invalid email" => "Email inválido",
 "OpenID Changed" => "OpenID alterado",
 "Invalid request" => "Pedido inválido",
 "Language changed" => "Idioma alterado",
+"Error" => "Erro",
+"Disable" => "Desativar",
+"Enable" => "Ativar",
+"Saving..." => "A guardar...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Aviso de Segurança",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Executar uma tarefa com cada página carregada",
 "Log" => "Log",
 "More" => "Mais",
 "Add your App" => "Adicione a sua aplicação",
 "Select an App" => "Selecione uma aplicação",
-"-licensed" => "-licenciado",
-"by" => "por",
+"See application page at apps.owncloud.com" => "Ver a página da aplicação em apps.owncloud.com",
 "Documentation" => "Documentação",
 "Managing Big Files" => "Gestão de ficheiros grandes",
 "Ask a question" => "Coloque uma questão",
@@ -37,6 +47,7 @@
 "Create" => "Criar",
 "Default Quota" => "Quota por defeito",
 "Other" => "Outro",
+"Group Admin" => "Grupo Administrador",
 "Quota" => "Quota",
 "Delete" => "Apagar"
 );
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 1b69b7a84fe..a41e7bc06c1 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,14 +1,24 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Imposibil de încărcat lista din App Store",
+"Authentication error" => "Eroare de autentificare",
+"Email saved" => "E-mail salvat",
+"Invalid email" => "E-mail nevalid",
 "OpenID Changed" => "OpenID schimbat",
 "Invalid request" => "Cerere eronată",
 "Language changed" => "Limba a fost schimbată",
+"Error" => "Erroare",
+"Disable" => "Dezactivați",
+"Enable" => "Activați",
+"Saving..." => "Salvez...",
 "__language_name__" => "_language_name_",
+"Security Warning" => "Avertisment de securitate",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "executâ o sarcină cu fiecare pagină încărcată",
 "Log" => "Jurnal de activitate",
 "More" => "Mai mult",
 "Add your App" => "Adaugă aplicația ta",
 "Select an App" => "Selectează o aplicație",
-"-licensed" => "-autorizat",
-"by" => "de",
+"See application page at apps.owncloud.com" => "Vizualizează pagina applicației pe apps.owncloud.com",
 "Documentation" => "Documetație",
 "Managing Big Files" => "Gestionînd fișiere mari",
 "Ask a question" => "Întreabă",
@@ -37,6 +47,7 @@
 "Create" => "Crează",
 "Default Quota" => "Cotă implicită",
 "Other" => "Altele",
+"Group Admin" => "Grupul Admin ",
 "Quota" => "Cotă",
 "Delete" => "Șterge"
 );
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 4ab514815cb..f8e70b391cd 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,14 +1,42 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Загрузка из App Store запрещена",
+"Authentication error" => "Ошибка авторизации",
+"Group already exists" => "Группа уже существует",
+"Unable to add group" => "Невозможно добавить группу",
+"Email saved" => "Email сохранен",
+"Invalid email" => "Неправильный Email",
 "OpenID Changed" => "OpenID изменён",
 "Invalid request" => "Неверный запрос",
+"Unable to delete group" => "Невозможно удалить группу",
+"Unable to delete user" => "Невозможно удалить пользователя",
 "Language changed" => "Язык изменён",
+"Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s",
+"Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s",
+"Error" => "Ошибка",
+"Disable" => "Выключить",
+"Enable" => "Включить",
+"Saving..." => "Сохранение...",
 "__language_name__" => "Русский ",
+"Security Warning" => "Предупреждение безопасности",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или вынести каталог data за пределы корневого каталога веб-сервера.",
+"Cron" => "Задание",
+"execute one task with each page loaded" => "Запускать задание при загрузке каждой страницы",
+"Share API" => "API публикации",
+"Enable Share API" => "Включить API публикации",
+"Allow apps to use the Share API" => "Разрешить API публикации для приложений",
+"Allow links" => "Разрешить ссылки",
+"Allow users to share items to the public with links" => "Разрешить пользователям публикацию при помощи ссылок",
+"Allow resharing" => "Включить повторную публикацию",
+"Allow users to share items shared with them again" => "Разрешить пользователям публиковать доступные им элементы других пользователей",
+"Allow users to share with anyone" => "Разрешить публиковать для любых пользователей",
+"Allow users to only share with users in their groups" => "Ограничить публикацию группами пользователя",
 "Log" => "Журнал",
 "More" => "Ещё",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Добавить приложение",
 "Select an App" => "Выберите приложение",
-"-licensed" => "-лицензия",
-"by" => "от",
+"See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>",
 "Documentation" => "Документация",
 "Managing Big Files" => "Управление большими файлами",
 "Ask a question" => "Задать вопрос",
@@ -37,6 +65,7 @@
 "Create" => "Создать",
 "Default Quota" => "Квота по умолчанию",
 "Other" => "Другое",
+"Group Admin" => "Группа Администраторы",
 "Quota" => "Квота",
 "Delete" => "Удалить"
 );
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index fe755aecb46..f8032afe5b4 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,14 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email uložený",
+"Invalid email" => "Neplatný email",
 "OpenID Changed" => "OpenID zmenené",
 "Invalid request" => "Neplatná požiadavka",
 "Language changed" => "Jazyk zmenený",
+"Disable" => "Zakázať",
+"Enable" => "Povoliť",
+"Saving..." => "Ukladám...",
 "__language_name__" => "Slovensky",
 "Log" => "Záznam",
 "More" => "Viac",
 "Add your App" => "Pridať vašu aplikáciu",
 "Select an App" => "Vyberte aplikáciu",
-"-licensed" => "-licencované",
-"by" => "od",
+"See application page at apps.owncloud.com" => "Pozrite si stránku aplikácie na apps.owncloud.com",
 "Documentation" => "Dokumentácia",
 "Managing Big Files" => "Spravovanie veľké súbory",
 "Ask a question" => "Opýtajte sa otázku",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 58afe21f45f..cc8690878df 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,14 +1,42 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ne morem naložiti seznama iz App Store",
+"Authentication error" => "Napaka overitve",
+"Group already exists" => "Skupina že obstaja",
+"Unable to add group" => "Ni mogoče dodati skupine",
+"Email saved" => "E-poštni naslov je bil shranjen",
+"Invalid email" => "Neveljaven e-poštni naslov",
 "OpenID Changed" => "OpenID je bil spremenjen",
 "Invalid request" => "Neveljaven zahtevek",
+"Unable to delete group" => "Ni mogoče izbrisati skupine",
+"Unable to delete user" => "Ni mogoče izbrisati uporabnika",
 "Language changed" => "Jezik je bil spremenjen",
+"Unable to add user to group %s" => "Uporabnika ni mogoče dodati k skupini %s",
+"Unable to remove user from group %s" => "Uporabnika ni mogoče odstraniti iz skupine %s",
+"Error" => "Napaka",
+"Disable" => "Onemogoči",
+"Enable" => "Omogoči",
+"Saving..." => "Shranjevanje...",
 "__language_name__" => "__ime_jezika__",
+"Security Warning" => "Varnostno opozorilo",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Vaša mapa data in vaše datoteke so verjetno vsem dostopne preko interneta. Datoteka .htaccess vključena v ownCloud ni omogočena. Močno vam priporočamo, da nastavite vaš spletni strežnik tako, da mapa data ne bo več na voljo vsem, ali pa jo preselite izven korenske mape spletnega strežnika.",
+"Cron" => "Periodično opravilo",
+"execute one task with each page loaded" => "izvedi eno nalogo z vsako naloženo stranjo",
+"Share API" => "API souporabe",
+"Enable Share API" => "Omogoči API souporabe",
+"Allow apps to use the Share API" => "Dovoli aplikacijam uporabo API-ja souporabe",
+"Allow links" => "Dovoli povezave",
+"Allow users to share items to the public with links" => "Uporabnikom dovoli souporabo z javnimi povezavami",
+"Allow resharing" => "Dovoli nadaljnjo souporabo",
+"Allow users to share items shared with them again" => "Uporabnikom dovoli nadaljnjo souporabo",
+"Allow users to share with anyone" => "Uporabnikom dovoli souporabo s komerkoli",
+"Allow users to only share with users in their groups" => "Uporabnikom dovoli souporabo le znotraj njihove skupine",
 "Log" => "Dnevnik",
 "More" => "Več",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Razvit s strani <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnosti ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je izdana pod licenco <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Dodajte vašo aplikacijo",
 "Select an App" => "Izberite aplikacijo",
-"-licensed" => "-licencirana",
-"by" => "s strani",
+"See application page at apps.owncloud.com" => "Obiščite spletno stran aplikacije na apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencirana s strani <span class=\"author\"></span>",
 "Documentation" => "Dokumentacija",
 "Managing Big Files" => "Upravljanje velikih datotek",
 "Ask a question" => "Postavi vprašanje",
@@ -37,6 +65,7 @@
 "Create" => "Ustvari",
 "Default Quota" => "Privzeta količinska omejitev",
 "Other" => "Drugo",
+"Group Admin" => "Administrator skupine",
 "Quota" => "Količinska omejitev",
 "Delete" => "Izbriši"
 );
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 7dede8fdc74..84881c2f1a8 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -3,8 +3,6 @@
 "Invalid request" => "Неисправан захтев",
 "Language changed" => "Језик је измењен",
 "Select an App" => "Изаберите програм",
-"-licensed" => "-лиценциран",
-"by" => "од",
 "Ask a question" => "Поставите питање",
 "Problems connecting to help database." => "Проблем у повезивању са базом помоћи",
 "Go there manually." => "Отиђите тамо ручно.",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 0229a763613..8bfc0fa989f 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -3,8 +3,6 @@
 "Invalid request" => "Neispravan zahtev",
 "Language changed" => "Jezik je izmenjen",
 "Select an App" => "Izaberite program",
-"-licensed" => "-licenciran",
-"by" => "od",
 "Ask a question" => "Postavite pitanje",
 "Problems connecting to help database." => "Problem u povezivanju sa bazom pomoći",
 "Go there manually." => "Otiđite tamo ručno.",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 40a370aabeb..dab31f80015 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,25 +1,53 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Kan inte ladda listan från App Store",
+"Authentication error" => "Autentiseringsfel",
+"Group already exists" => "Gruppen finns redan",
+"Unable to add group" => "Kan inte lägga till grupp",
+"Email saved" => "E-post sparad",
+"Invalid email" => "Ogiltig e-post",
 "OpenID Changed" => "OpenID ändrat",
 "Invalid request" => "Ogiltig begäran",
+"Unable to delete group" => "Kan inte radera grupp",
+"Unable to delete user" => "Kan inte radera användare",
 "Language changed" => "Språk ändrades",
+"Unable to add user to group %s" => "Kan inte lägga till användare i gruppen %s",
+"Unable to remove user from group %s" => "Kan inte radera användare från gruppen %s",
+"Error" => "Fel",
+"Disable" => "Deaktivera",
+"Enable" => "Aktivera",
+"Saving..." => "Sparar...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Säkerhetsvarning",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din datamapp och dina filer kan möjligen vara nåbara från internet. Filen .htaccess som ownCloud tillhandahåller fungerar inte. Vi rekommenderar starkt att du ställer in din webbserver på ett sätt så att datamappen inte är nåbar. Alternativt att ni flyttar datamappen utanför webbservern.",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "utför en uppgift vid varje sidladdning",
+"Share API" => "Delat API",
+"Enable Share API" => "Aktivera delat API",
+"Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
+"Allow links" => "Tillåt länkar",
+"Allow users to share items to the public with links" => "Tillåt delning till allmänheten via publika länkar",
+"Allow resharing" => "Tillåt dela vidare",
+"Allow users to share items shared with them again" => "Tillåt användare att dela vidare filer som delats med dom",
+"Allow users to share with anyone" => "Tillåt delning med alla",
+"Allow users to only share with users in their groups" => "Tillåt bara delning med användare i egna grupper",
 "Log" => "Logg",
 "More" => "Mera",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Lägg till din applikation",
 "Select an App" => "Välj en App",
-"-licensed" => "-licensierat",
-"by" => "av",
+"See application page at apps.owncloud.com" => "Se programsida på apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>",
 "Documentation" => "Dokumentation",
 "Managing Big Files" => "Hantering av stora filer",
 "Ask a question" => "Ställ en fråga",
-"Problems connecting to help database." => "Problem med att ansluta till hjälp-databasen.",
-"Go there manually." => "Gå dit manuellt",
+"Problems connecting to help database." => "Problem med att ansluta till hjälpdatabasen.",
+"Go there manually." => "Gå dit manuellt.",
 "Answer" => "Svar",
 "You use" => "Du använder",
 "of the available" => "av tillgängliga",
 "Desktop and Mobile Syncing Clients" => "Synkroniseringsklienter för dator och mobil",
 "Download" => "Ladda ner",
-"Your password got changed" => "Ditt lösenord ändrades",
+"Your password got changed" => "Ditt lösenord har ändrats",
 "Unable to change your password" => "Kunde inte ändra ditt lösenord",
 "Current password" => "Nuvarande lösenord",
 "New password" => "Nytt lösenord",
@@ -37,6 +65,7 @@
 "Create" => "Skapa",
 "Default Quota" => "Förvald datakvot",
 "Other" => "Annat",
+"Group Admin" => "Gruppadministratör",
 "Quota" => "Kvot",
-"Delete" => "Ta bort"
+"Delete" => "Radera"
 );
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 5b744cb6be9..61b2eb940dd 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,14 +1,42 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "ไม่สามารถโหลดรายการจาก App Store ได้",
+"Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
+"Group already exists" => "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
+"Unable to add group" => "ไม่สามารถเพิ่มกลุ่มได้",
+"Email saved" => "อีเมลถูกบันทึกแล้ว",
+"Invalid email" => "อีเมลไม่ถูกต้อง",
 "OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
 "Invalid request" => "คำร้องขอไม่ถูกต้อง",
+"Unable to delete group" => "ไม่สามารถลบกลุ่มได้",
+"Unable to delete user" => "ไม่สามารถลบผู้ใช้งานได้",
 "Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
+"Unable to add user to group %s" => "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้",
+"Unable to remove user from group %s" => "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้",
+"Error" => "ข้อผิดพลาด",
+"Disable" => "ปิดใช้งาน",
+"Enable" => "เปิดใช้งาน",
+"Saving..." => "กำลังบันทึุกข้อมูล...",
 "__language_name__" => "ภาษาไทย",
+"Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "ไดเร็กทอรี่ข้อมูลและไฟล์ของคุณสามารถเข้าถึงได้จากอินเทอร์เน็ต ไฟล์ .htaccess ที่ ownCloud มีให้ไม่สามารถทำงานได้อย่างเหมาะสม เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ใหม่ในรูปแบบที่ไดเร็กทอรี่เก็บข้อมูลไม่สามารถเข้าถึงได้อีกต่อไป หรือคุณได้ย้ายไดเร็กทอรี่ที่ใช้เก็บข้อมูลไปอยู่ภายนอกตำแหน่ง root ของเว็บเซิร์ฟเวอร์แล้ว",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง",
+"Share API" => "API สำหรับคุณสมบัติแชร์ข้อมูล",
+"Enable Share API" => "เปิดใช้งาน API สำหรับคุณสมบัติแชร์ข้อมูล",
+"Allow apps to use the Share API" => "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
+"Allow links" => "อนุญาตให้ใช้งานลิงก์ได้",
+"Allow users to share items to the public with links" => "อนุญาตให้ผู้ใช้งานสามารถแชร์ข้อมูลรายการต่างๆไปให้สาธารณะชนเป็นลิงก์ได้",
+"Allow resharing" => "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้",
+"Allow users to share items shared with them again" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น",
+"Allow users to share with anyone" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้",
+"Allow users to only share with users in their groups" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น",
 "Log" => "บันทึกการเปลี่ยนแปลง",
 "More" => "เพิ่มเติม",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "เพิ่มแอปของคุณ",
 "Select an App" => "เลือก App",
-"-licensed" => "-ได้รับอนุญาติแล้ว",
-"by" => "โดย",
+"See application page at apps.owncloud.com" => "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>",
 "Documentation" => "เอกสารคู่มือการใช้งาน",
 "Managing Big Files" => "การจัดการไฟล์ขนาดใหญ่",
 "Ask a question" => "สอบถามข้อมูล",
@@ -37,6 +65,7 @@
 "Create" => "สร้าง",
 "Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น",
 "Other" => "อื่นๆ",
+"Group Admin" => "ผู้ดูแลกลุ่ม",
 "Quota" => "พื้นที่",
 "Delete" => "ลบ"
 );
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 01ad142a3db..6e68d792e74 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,14 +1,20 @@
 <?php $TRANSLATIONS = array(
+"Authentication error" => "Eşleşme hata",
+"Email saved" => "Eposta kaydedildi",
+"Invalid email" => "Geçersiz eposta",
 "OpenID Changed" => "OpenID Değiştirildi",
 "Invalid request" => "Geçersiz istek",
 "Language changed" => "Dil değiştirildi",
+"Disable" => "Etkin değil",
+"Enable" => "Etkin",
+"Saving..." => "Kaydediliyor...",
 "__language_name__" => "__dil_adı__",
+"Security Warning" => "Güvenlik Uyarisi",
 "Log" => "Günlük",
 "More" => "Devamı",
 "Add your App" => "Uygulamanı Ekle",
 "Select an App" => "Bir uygulama seçin",
-"-licensed" => "-lisanslı",
-"by" => "yapan",
+"See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ",
 "Documentation" => "Dökümantasyon",
 "Managing Big Files" => "Büyük Dosyaların Yönetimi",
 "Ask a question" => "Bir soru sorun",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
new file mode 100644
index 00000000000..37ecd73fb68
--- /dev/null
+++ b/settings/l10n/uk.php
@@ -0,0 +1,21 @@
+<?php $TRANSLATIONS = array(
+"OpenID Changed" => "OpenID змінено",
+"Invalid request" => "Помилковий запит",
+"Language changed" => "Мова змінена",
+"Select an App" => "Вибрати додаток",
+"Ask a question" => "Запитати",
+"Problems connecting to help database." => "Проблема при з'єднані з базою допомоги",
+"You use" => "Ви використовуєте",
+"of the available" => "з доступної",
+"Your password got changed" => "Ваш пароль змінено",
+"Current password" => "Поточний пароль",
+"New password" => "Новий пароль",
+"show" => "показати",
+"Change password" => "Змінити пароль",
+"Language" => "Мова",
+"Name" => "Ім'я",
+"Password" => "Пароль",
+"Groups" => "Групи",
+"Create" => "Створити",
+"Delete" => "Видалити"
+);
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
new file mode 100644
index 00000000000..d1d7e0c433f
--- /dev/null
+++ b/settings/l10n/vi.php
@@ -0,0 +1,71 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Không thể tải danh sách ứng dụng từ App Store",
+"Authentication error" => "Lỗi xác thực",
+"Group already exists" => "Nhóm đã tồn tại",
+"Unable to add group" => "Không thể thêm nhóm",
+"Email saved" => "Lưu email",
+"Invalid email" => "Email không hợp lệ",
+"OpenID Changed" => "Đổi OpenID",
+"Invalid request" => "Yêu cầu không hợp lệ",
+"Unable to delete group" => "Không thể xóa nhóm",
+"Unable to delete user" => "Không thể xóa người dùng",
+"Language changed" => "Ngôn ngữ đã được thay đổi",
+"Unable to add user to group %s" => "Không thể thêm người dùng vào nhóm %s",
+"Unable to remove user from group %s" => "Không thể xóa người dùng từ nhóm %s",
+"Error" => "Lỗi",
+"Disable" => "Vô hiệu",
+"Enable" => "Cho phép",
+"Saving..." => "Đang tiến hành lưu ...",
+"__language_name__" => "__Ngôn ngữ___",
+"Security Warning" => "Cảnh bảo bảo mật",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ internet. Tập tin .htaccess của ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ webserver của bạn để thư mục dữ liệu không  còn bị truy cập hoặc bạn di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Thực thi một nhiệm vụ với mỗi trang được nạp",
+"Share API" => "Chia sẻ API",
+"Enable Share API" => "Bật chia sẻ API",
+"Allow apps to use the Share API" => "Cho phép các ứng dụng sử dụng chia sẻ API",
+"Allow links" => "Cho phép liên kết",
+"Allow users to share items to the public with links" => "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết",
+"Allow resharing" => "Cho phép chia sẻ lại",
+"Allow users to share items shared with them again" => "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ",
+"Allow users to share with anyone" => "Cho phép người dùng chia sẻ với bất cứ ai",
+"Allow users to only share with users in their groups" => "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ",
+"Log" => "Log",
+"More" => "nhiều hơn",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Add your App" => "Thêm ứng dụng của bạn",
+"Select an App" => "Chọn một ứng dụng",
+"See application page at apps.owncloud.com" => "Xem ứng dụng tại apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Giấy phép được cấp bởi  <span class=\"author\"></span>",
+"Documentation" => "Tài liệu",
+"Managing Big Files" => "Quản lý tập tin lớn",
+"Ask a question" => "Đặt câu hỏi",
+"Problems connecting to help database." => "Vấn đề kết nối đến cơ sở dữ liệu.",
+"Go there manually." => "Đến bằng thủ công",
+"Answer" => "trả lời",
+"You use" => "Bạn sử dụng",
+"of the available" => "có sẵn",
+"Desktop and Mobile Syncing Clients" => "Đồng bộ dữ liệu",
+"Download" => "Tải về",
+"Your password got changed" => "Mật khẩu đã được thay đổi",
+"Unable to change your password" => "Không thể đổi mật khẩu",
+"Current password" => "Mật khẩu cũ",
+"New password" => "Mật khẩu mới ",
+"show" => "Hiện",
+"Change password" => "Đổi mật khẩu",
+"Email" => "Email",
+"Your email address" => "Email của bạn",
+"Fill in an email address to enable password recovery" => "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu",
+"Language" => "Ngôn ngữ",
+"Help translate" => "Dịch ",
+"use this address to connect to your ownCloud in your file manager" => "sử dụng địa chỉ này để kết nối với ownCloud của bạn trong quản lý tập tin ",
+"Name" => "Tên",
+"Password" => "Mật khẩu",
+"Groups" => "Nhóm",
+"Create" => "Tạo",
+"Default Quota" => "Hạn ngạch mặt định",
+"Other" => "Khác",
+"Group Admin" => "Nhóm quản trị",
+"Quota" => "Hạn ngạch",
+"Delete" => "Xóa"
+);
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
new file mode 100644
index 00000000000..83111beb10e
--- /dev/null
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -0,0 +1,51 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "不能从App Store 中加载列表",
+"Authentication error" => "认证错误",
+"Email saved" => "Email 保存了",
+"Invalid email" => "非法Email",
+"OpenID Changed" => "OpenID 改变了",
+"Invalid request" => "非法请求",
+"Language changed" => "语言改变了",
+"Error" => "错误",
+"Disable" => "禁用",
+"Enable" => "启用",
+"Saving..." => "保存中...",
+"__language_name__" => "Chinese",
+"Security Warning" => "安全警告",
+"Cron" => "定时",
+"Log" => "日志",
+"More" => "更多",
+"Add your App" => "添加你的应用程序",
+"Select an App" => "选择一个程序",
+"See application page at apps.owncloud.com" => "在owncloud.com上查看应用程序",
+"Documentation" => "文档",
+"Managing Big Files" => "管理大文件",
+"Ask a question" => "提一个问题",
+"Problems connecting to help database." => "连接到帮助数据库时的问题",
+"Go there manually." => "收到转到.",
+"Answer" => "回答",
+"You use" => "你使用",
+"of the available" => "可用的",
+"Desktop and Mobile Syncing Clients" => "桌面和移动同步客户端",
+"Download" => "下载",
+"Your password got changed" => "你的密码已经改变",
+"Unable to change your password" => "不能改变你的密码",
+"Current password" => "现在的密码",
+"New password" => "新密码",
+"show" => "展示",
+"Change password" => "改变密码",
+"Email" => "Email",
+"Your email address" => "你的email地址",
+"Fill in an email address to enable password recovery" => "输入一个邮箱地址以激活密码恢复功能",
+"Language" => "语言",
+"Help translate" => "帮助翻译",
+"use this address to connect to your ownCloud in your file manager" => "使用这个地址和你的文件管理器连接到你的ownCloud",
+"Name" => "名字",
+"Password" => "密码",
+"Groups" => "组",
+"Create" => "新建",
+"Default Quota" => "默认限额",
+"Other" => "其他的",
+"Quota" => "限额",
+"Delete" => "删除"
+);
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index d274b372ee9..07f361d3b62 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,14 +1,42 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "无法从应用商店载入列表",
+"Authentication error" => "认证错误",
+"Group already exists" => "已存在组",
+"Unable to add group" => "不能添加组",
+"Email saved" => "电子邮件已保存",
+"Invalid email" => "无效的电子邮件",
 "OpenID Changed" => "OpenID 已修改",
 "Invalid request" => "非法请求",
+"Unable to delete group" => "不能删除组",
+"Unable to delete user" => "不能删除用户",
 "Language changed" => "语言已修改",
+"Unable to add user to group %s" => "不能把用户添加到组 %s",
+"Unable to remove user from group %s" => "不能从组%s中移除用户",
+"Error" => "错误",
+"Disable" => "禁用",
+"Enable" => "启用",
+"Saving..." => "正在保存",
 "__language_name__" => "简体中文",
+"Security Warning" => "安全警告",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
+"Cron" => "计划任务",
+"execute one task with each page loaded" => "为每个装入的页面执行任务",
+"Share API" => "共享API",
+"Enable Share API" => "开启共享API",
+"Allow apps to use the Share API" => "允许 应用 使用共享API",
+"Allow links" => "允许连接",
+"Allow users to share items to the public with links" => "允许用户使用连接向公众共享",
+"Allow resharing" => "允许再次共享",
+"Allow users to share items shared with them again" => "允许用户将共享给他们的项目再次共享",
+"Allow users to share with anyone" => "允许用户向任何人共享",
+"Allow users to only share with users in their groups" => "允许用户只向同组用户共享",
 "Log" => "日志",
 "More" => "更多",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。",
 "Add your App" => "添加应用",
 "Select an App" => "选择一个应用",
-"-licensed" => "-许可证",
-"by" => "由",
+"See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程序页面",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准： <span class=\"author\"></span>",
 "Documentation" => "文档",
 "Managing Big Files" => "管理大文件",
 "Ask a question" => "提问",
@@ -37,6 +65,7 @@
 "Create" => "创建",
 "Default Quota" => "默认配额",
 "Other" => "其它",
+"Group Admin" => "组管理",
 "Quota" => "配额",
 "Delete" => "删除"
 );
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index aeb1db48719..0abeb6e285c 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,14 +1,36 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "無法從 App Store 讀取清單",
+"Authentication error" => "認證錯誤",
+"Group already exists" => "群組已存在",
+"Unable to add group" => "群組增加失敗",
+"Email saved" => "Email已儲存",
+"Invalid email" => "無效的email",
 "OpenID Changed" => "OpenID 已變更",
 "Invalid request" => "無效請求",
+"Unable to delete group" => "群組刪除錯誤",
+"Unable to delete user" => "使用者刪除錯誤",
 "Language changed" => "語言已變更",
+"Unable to add user to group %s" => "使用者加入群組%s錯誤",
+"Unable to remove user from group %s" => "使用者移出群組%s錯誤",
+"Error" => "錯誤",
+"Disable" => "停用",
+"Enable" => "啟用",
+"Saving..." => "儲存中...",
 "__language_name__" => "__語言_名稱__",
+"Security Warning" => "安全性警告",
+"Cron" => "定期執行",
+"execute one task with each page loaded" => "當頁面載入時，執行",
+"Allow links" => "允許連結",
+"Allow users to share items to the public with links" => "允許使用者以結連公開分享檔案",
+"Allow resharing" => "允許轉貼分享",
+"Allow users to share items shared with them again" => "允許使用者轉貼共享檔案",
+"Allow users to share with anyone" => "允許使用者公開分享",
+"Allow users to only share with users in their groups" => "僅允許使用者在群組內分享",
 "Log" => "紀錄",
 "More" => "更多",
 "Add your App" => "添加你的 App",
 "Select an App" => "選擇一個應用程式",
-"-licensed" => "-已許可",
-"by" => "由",
+"See application page at apps.owncloud.com" => "查看應用程式頁面於 apps.owncloud.com",
 "Documentation" => "文件",
 "Managing Big Files" => "管理大檔案",
 "Ask a question" => "提問",
@@ -27,7 +49,7 @@
 "Change password" => "變更密碼",
 "Email" => "電子郵件",
 "Your email address" => "你的電子郵件信箱",
-"Fill in an email address to enable password recovery" => "請甜入店子郵件信箱以便回復密碼",
+"Fill in an email address to enable password recovery" => "請填入電子郵件信箱以便回復密碼",
 "Language" => "語言",
 "Help translate" => "幫助翻譯",
 "use this address to connect to your ownCloud in your file manager" => "使用這個位址去連接到你的私有雲檔案管理員",
@@ -37,6 +59,7 @@
 "Create" => "創造",
 "Default Quota" => "預設容量限制",
 "Other" => "其他",
+"Group Admin" => "群組 管理員",
 "Quota" => "容量限制",
 "Delete" => "刪除"
 );
diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index 621ee5ab55c..6d3b6ebe634 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -14,10 +14,14 @@ return array(
 'en'=>'English',
 'es'=>'Español',
 'et_EE'=>'Eesti',
+'fa'=>'فارسى',
+'fi_FI'=>'Suomi',
 'fr'=>'Français',
+'hi'=>'हिन्दी',
 'id'=>'Bahasa Indonesia',
 'it'=>'Italiano',
 'lb'=>'Lëtzebuergesch',
+//'l10n-de'=>'',
 'ms_MY'=>'Bahasa Melayu',
 'nb_NO'=>'Norwegian Bokmål',
 'nl'=>'Nederlands',
@@ -42,4 +46,9 @@ return array(
 'ia'=>'Interlingua',
 'sl'=>'Slovenski',
 'nn_NO'=>'Nynorsk',
+'lv'=>'Latviešu',
+'mk'=>'македонски',
+'uk'=>'Українська',
+'vi'=>'tiếng việt',
+'zh_TW'=>'臺灣話',
 );
diff --git a/settings/log.php b/settings/log.php
deleted file mode 100644
index ddbf72c4433..00000000000
--- a/settings/log.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Robin Appelman
- * @copyright 2012 Robin Appelman icewind1991@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-require_once('../lib/base.php');
-OC_Util::checkAdminUser();
-
-// Load the files we need
-OC_Util::addStyle( "settings", "settings" );
-OC_Util::addScript( "settings", "apps" );
-OC_App::setActiveNavigationEntry( "core_log" );
-
-$entries=OC_Log_Owncloud::getEntries();
-
-OC_Util::addScript('settings','log');
-OC_Util::addStyle('settings','settings');
-
-function compareEntries($a,$b){
-	return $b->time - $a->time;
-}
-usort($entries, 'compareEntries');
-
-$tmpl = new OC_Template( "settings", "log", "user" );
-$tmpl->assign('entries',$entries);
-
-$tmpl->printPage();
diff --git a/settings/personal.php b/settings/personal.php
index d82db0d0e7e..4f92985c797 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 OC_Util::checkLoggedIn();
 
 // Highlight navigation entry
@@ -18,29 +18,34 @@ OC_App::setActiveNavigationEntry( 'personal' );
 // calculate the disc space
 $rootInfo=OC_FileCache::get('');
 $sharedInfo=OC_FileCache::get('/Shared');
-$used=$rootInfo['size']-$sharedInfo['size'];
+if (!isset($sharedInfo['size'])) {
+	$sharedSize = 0;
+} else {
+	$sharedSize = $sharedInfo['size'];
+}
+$used=$rootInfo['size']-$sharedSize;
 $free=OC_Filesystem::free_space();
 $total=$free+$used;
 if($total==0) $total=1;  // prevent division by zero
 $relative=round(($used/$total)*10000)/100;
 
-$email=OC_Preferences::getValue(OC_User::getUser(), 'settings','email','');
+$email=OC_Preferences::getValue(OC_User::getUser(), 'settings', 'email', '');
 
 $lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
 $languageCodes=OC_L10N::findAvailableLanguages();
 sort ($languageCodes);
 
 //put the current language in the front
-unset($languageCodes[array_search($lang,$languageCodes)]);
-array_unshift($languageCodes,$lang);
+unset($languageCodes[array_search($lang, $languageCodes)]);
+array_unshift($languageCodes, $lang);
 
 $languageNames=include 'languageCodes.php';
 $languages=array();
-foreach($languageCodes as $lang){
-	$l=OC_L10N::get('settings',$lang);
-	if(substr($l->t('__language_name__'),0,1)!='_'){//first check if the language name is in the translation file
+foreach($languageCodes as $lang) {
+	$l=OC_L10N::get('settings', $lang);
+	if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file
 		$languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));
-	}elseif(isset($languageNames[$lang])){
+	}elseif(isset($languageNames[$lang])) {
 		$languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);
 	}else{//fallback to language code
 		$languages[]=array('code'=>$lang,'name'=>$lang);
@@ -49,15 +54,15 @@ foreach($languageCodes as $lang){
 
 // Return template
 $tmpl = new OC_Template( 'settings', 'personal', 'user');
-$tmpl->assign('usage',OC_Helper::humanFileSize($used));
-$tmpl->assign('total_space',OC_Helper::humanFileSize($total));
-$tmpl->assign('usage_relative',$relative);
-$tmpl->assign('email',$email);
-$tmpl->assign('languages',$languages);
+$tmpl->assign('usage', OC_Helper::humanFileSize($used));
+$tmpl->assign('total_space', OC_Helper::humanFileSize($total));
+$tmpl->assign('usage_relative', $relative);
+$tmpl->assign('email', $email);
+$tmpl->assign('languages', $languages);
 
 $forms=OC_App::getForms('personal');
-$tmpl->assign('forms',array());
-foreach($forms as $form){
-	$tmpl->append('forms',$form);
+$tmpl->assign('forms', array());
+foreach($forms as $form) {
+	$tmpl->append('forms', $form);
 }
 $tmpl->printPage();
diff --git a/settings/settings.php b/settings/settings.php
index a49de85520b..24099ef5742 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 OC_Util::checkLoggedIn();
 
 OC_Util::addStyle( 'settings', 'settings' );
@@ -13,8 +13,8 @@ OC_App::setActiveNavigationEntry( 'settings' );
 
 $tmpl = new OC_Template( 'settings', 'settings', 'user');
 $forms=OC_App::getForms('settings');
-$tmpl->assign('forms',array());
-foreach($forms as $form){
-	$tmpl->append('forms',$form);
+$tmpl->assign('forms', array());
+foreach($forms as $form) {
+	$tmpl->append('forms', $form);
 }
 $tmpl->printPage();
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 033cd1a1642..4edbe64e967 100755..100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -13,7 +13,9 @@ if(!$_['htaccessworking']) {
 <fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
 
-	<span class="securitywarning">Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.</span>
+	<span class="securitywarning">
+        <?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.'); ?>
+    </span>
 	
 </fieldset>	
 <?php	
@@ -21,9 +23,48 @@ if(!$_['htaccessworking']) {
 ?>
 
 
-<?php foreach($_['forms'] as $form){
+<?php foreach($_['forms'] as $form) {
 	echo $form;
 };?>
+
+<fieldset class="personalblock" id="backgroundjobs">
+	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
+	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ) { echo 'checked="checked"'; } ?>>
+	<label for="backgroundjobs_ajax" title="<?php echo $l->t("execute one task with each page loaded"); ?>">AJAX</label><br />
+	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ) { echo 'checked="checked"'; } ?>>
+	<label for="backgroundjobs_webcron" title="<?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?>">Webcron</label><br />
+	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ) { echo 'checked="checked"'; } ?>>
+	<label for="backgroundjobs_cron" title="<?php echo $l->t("use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?>">Cron</label><br />
+</fieldset>
+
+<fieldset class="personalblock" id="shareAPI">
+	<legend><strong><?php echo $l->t('Share API');?></strong></legend>
+	<table class="shareAPI nostyle">
+		<tr>
+			<td id="enable">
+				<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
+				<label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br />
+				<em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
+			</td>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+				<input type="checkbox" name="shareapi_allow_links" id="allowLinks" value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
+				<label for="allowLinks"><?php echo $l->t('Allow links');?></label><br />
+				<em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
+			</td>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
+				<label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br />
+				<em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+				<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
+				<label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br />
+				<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly" value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
+				<label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br />
+			</td>
+		</tr>
+	</table>
+</fieldset>
+
 <fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('Log');?></strong></legend>
 	Log level: <select name='loglevel' id='loglevel'>
@@ -52,12 +93,15 @@ if(!$_['htaccessworking']) {
 		</tr>
 	<?php endforeach;?>
 </table>
+<?php if($_['entriesremain']): ?>
 <input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'></input>
+<?php endif; ?>
+
 </fieldset>
 
 
 <p class="personalblock">
 	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br />
-	Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="http://gitorious.org/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.
+    <?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
 </p>
 
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 6edaf6c5848..30f919ac753 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -7,24 +7,27 @@
 	var appid = '<?php echo $_['appid']; ?>';
 </script>
 <div id="controls">
-	<a class="button" target="_blank" href="http://owncloud.org/dev/writing-apps/"><?php echo $l->t('Add your App');?></a>
+	<a class="button" target="_blank" href="http://owncloud.org/dev/apps/getting-started/"><?php echo $l->t('Add your App');?></a>
 </div>
-<ul id="leftcontent">
+<ul id="leftcontent" class="applist">
 	<?php foreach($_['apps'] as $app):?>
-	<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>">
-		<a href="?appid=<?php echo $app['id'] ?>"><?php  echo htmlentities($app['name']) ?></a>
-		<span class="hidden">
-			<?php OC_JSON::encodedPrint($app,false) ?>
-		</span>
-		<?php  if(!$app['internal']) echo '<small class="externalapp">3rd party</small>' ?>
+	<li <?php if($app['active']) echo 'class="active"'?> data-id="<?php echo $app['id'] ?>"
+		data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
+		<a class="app<?php if(!$app['internal']) echo ' externalapp' ?>" href="?appid=<?php echo $app['id'] ?>"><?php echo htmlentities($app['name']) ?></a>
+		<script type="application/javascript">
+			appData_<?php echo $app['id'] ?>=<?php OC_JSON::encodedPrint($app,false) ?>;
+		</script>
+		<?php  if(!$app['internal']) echo '<small class="externalapp list">3rd party</small>' ?>
 	</li>
 	<?php endforeach;?>
 </ul>
 <div id="rightcontent">
+	<div class="appinfo">
 	<h3><strong><span class="name"><?php echo $l->t('Select an App');?></span></strong><span class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
 	<p class="description"></p>
 	<img src="" class="preview" />
 	<p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p>
-	<p class="license hidden"><span class="licence"></span><?php echo $l->t('-licensed');?> <?php echo $l->t('by');?> <span class="author"></span></p>
+    <p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p>
 	<input class="enable hidden" type="submit" />
+	</div>
 </div>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index a53ec76d681..b2a78ff8512 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,4 +1,5 @@
-<?php /**
+<?php 
+/**
  * 2012 Frank Karlitschek frank@owncloud.org
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
@@ -10,7 +11,7 @@
 	<a class="button newquestion" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new" target="_blank"><?php echo $l->t( 'Ask a question' ); ?></a>
 	<?php
 		$url=OC_Helper::linkTo( "settings", "help.php" ).'?page=';
-		$pageNavi=OC_Util::getPageNavi($_['pagecount'],$_['page'],$url);
+		$pageNavi=OC_Util::getPageNavi($_['pagecount'], $_['page'], $url);
 		if($pageNavi)
 		{
 			$pageNavi->printPage();
@@ -25,7 +26,7 @@
 <?php else:?>
 	<?php foreach($_["kbe"] as $kb): ?>
 	<div class="helpblock">
-		<?php if($kb["preview1"] <> "") { echo('<img class="preview" src="'.$kb["preview1"].'" />'); } ?>
+		<?php if($kb["preview1"] <> "") echo('<img class="preview" src="'.$kb["preview1"].'" />'); ?>
 		<?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.$kb["name"].'</strong></a></p>');?>
 		<p><?php echo $kb['description'];?></p>
 		<?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.$kb['answer'].'</p>');?>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index ee40120d724..4503f3d50b4 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -51,7 +51,7 @@
 	<em><?php echo $l->t('use this address to connect to your ownCloud in your file manager');?></em>
 </p>
 
-<?php foreach($_['forms'] as $form){
+<?php foreach($_['forms'] as $form) {
 	echo $form;
 };?>
 
diff --git a/settings/templates/settings.php b/settings/templates/settings.php
index 98acd541e36..12368a1cdb6 100644
--- a/settings/templates/settings.php
+++ b/settings/templates/settings.php
@@ -4,6 +4,6 @@
  * See the COPYING-README file.
  */?>
 
-<?php foreach($_['forms'] as $form){
+<?php foreach($_['forms'] as $form) {
 	echo $form;
 };?>
\ No newline at end of file
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 55112424561..eef9b291357 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -1,20 +1,27 @@
-<?php /**
+<?php
+/**
  * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
-
 $allGroups=array();
 foreach($_["groups"] as $group) {
-	$allGroups[]=$group['name'];
+	$allGroups[] = $group['name'];
 }
+$_['subadmingroups'] = $allGroups;
+$items = array_flip($_['subadmingroups']);
+unset($items['admin']);
+$_['subadmingroups'] = array_flip($items);
 ?>
-
+<script>
+var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
+</script>
 <div id="controls">
-	<form id="newuser">
-		<input id="newusername" placeholder="<?php echo $l->t('Name')?>" /> <input
+	<form id="newuser" autocomplete="off">
+		<input id="newusername" type="text" placeholder="<?php echo $l->t('Name')?>" /> <input
 			type="password" id="newuserpassword"
 			placeholder="<?php echo $l->t('Password')?>" /> <select
+			class="groupsselect"
 			id="newusergroups" data-placeholder="groups"
 			title="<?php echo $l->t('Groups')?>" multiple="multiple">
 			<?php foreach($_["groups"] as $group): ?>
@@ -27,6 +34,7 @@ foreach($_["groups"] as $group) {
 	<div class="quota">
 		<span><?php echo $l->t('Default Quota');?>:</span>
 		<div class="quota-select-wrapper">
+			<?php if((bool) $_['isadmin']): ?>
 			<select class='quota'>
 				<?php foreach($_['quota_preset'] as $preset):?>
 				<?php if($preset!='default'):?>
@@ -37,7 +45,7 @@ foreach($_["groups"] as $group) {
 				</option>
 				<?php endif;?>
 				<?php endforeach;?>
-				<?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?>
+				<?php if(array_search($_['default_quota'], $_['quota_preset'])===false):?>
 				<option selected="selected"
 					value='<?php echo $_['default_quota'];?>'>
 					<?php echo $_['default_quota'];?>
@@ -48,18 +56,29 @@ foreach($_["groups"] as $group) {
 					...
 				</option>
 			</select> <input class='quota-other'></input>
+			<?php endif; ?>
+			<?php if((bool) !$_['isadmin']): ?>
+				<select class='quota' disabled="disabled">
+					<option selected="selected">
+				<?php echo $_['default_quota'];?>
+					</option>
+				</select>
+			<?php endif; ?>
 		</div>
 	</div>
 </div>
 
 <div id='notification'></div>
 
-<table data-groups="<?php echo implode(', ',$allGroups);?>">
+<table data-groups="<?php echo implode(', ', $allGroups);?>">
 	<thead>
 		<tr>
 			<th id='headerName'><?php echo $l->t('Name')?></th>
 			<th id="headerPassword"><?php echo $l->t( 'Password' ); ?></th>
 			<th id="headerGroups"><?php echo $l->t( 'Groups' ); ?></th>
+			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
+			<th id="headerSubAdmins"><?php echo $l->t('Group Admin'); ?></th>
+			<?php endif;?>
 			<th id="headerQuota"><?php echo $l->t( 'Quota' ); ?></th>
 			<th id="headerRemove">&nbsp;</th>
 		</tr>
@@ -69,10 +88,11 @@ foreach($_["groups"] as $group) {
 		<tr data-uid="<?php echo $user["name"] ?>">
 			<td class="name"><?php echo $user["name"]; ?></td>
 			<td class="password"><span>●●●●●●●</span> <img class="svg action"
-				src="<?php echo image_path('core','actions/rename.svg')?>"
-				alt="set new password" title="set new password" />
+				src="<?php echo image_path('core', 'actions/rename.svg')?>"
+				alt="set new password" title="set new password"/>
 			</td>
 			<td class="groups"><select
+				class="groupsselect"
 				data-username="<?php echo $user['name'] ;?>"
 				data-user-groups="<?php echo $user['groups'] ;?>"
 				data-placeholder="groups" title="<?php echo $l->t('Groups')?>"
@@ -84,6 +104,21 @@ foreach($_["groups"] as $group) {
 					<?php endforeach;?>
 			</select>
 			</td>
+			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
+			<td class="subadmins"><select
+				class="subadminsselect"
+				data-username="<?php echo $user['name'] ;?>"
+				data-subadmin="<?php echo $user['subadmin'] ;?>"
+				data-placeholder="subadmins" title="<?php echo $l->t('Group Admin')?>"
+				multiple="multiple">
+					<?php foreach($_["subadmingroups"] as $group): ?>
+					<option value="<?php echo $group;?>">
+						<?php echo $group;?>
+					</option>
+					<?php endforeach;?>
+			</select>
+			</td>
+			<?php endif;?>
 			<td class="quota">
 				<div class="quota-select-wrapper">
 					<select class='quota-user'>
@@ -94,7 +129,7 @@ foreach($_["groups"] as $group) {
 							<?php echo $preset;?>
 						</option>
 						<?php endforeach;?>
-						<?php if(array_search($user['quota'],$_['quota_preset'])===false):?>
+						<?php if(array_search($user['quota'], $_['quota_preset'])===false):?>
 						<option selected="selected" value='<?php echo $user['quota'];?>'>
 							<?php echo $user['quota'];?>
 						</option>
@@ -106,16 +141,14 @@ foreach($_["groups"] as $group) {
 					</select> <input class='quota-other'></input>
 				</div>
 			</td>
-			<td class="remove"><?php if($user['name']!=OC_User::getUser()):?> <img
-				alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action"
-				src="<?php echo image_path('core','actions/delete.svg') ?>" /> <?php endif;?>
+			<td class="remove">
+				<?php if($user['name']!=OC_User::getUser()):?> 
+					<a href="#" class="action delete" original-title="<?php echo $l->t('Delete')?>">
+						<img src="<?php echo image_path('core', 'actions/delete.svg') ?>" />
+					</a>
+				<?php endif;?>
 			</td>
 		</tr>
 		<?php endforeach; ?>
 	</tbody>
-</table>
-
-<!-- use a standard notification class / system for this message -->
-<?php if( $_["share_notice"] ):?>
-<h3 class="settingsNotice center"><?php echo $_["share_notice"]; ?></h3>
-<?php endif;?>	
\ No newline at end of file
+</table>
\ No newline at end of file
diff --git a/settings/trans.png b/settings/trans.png
index e6920168bf2..ef57510d530 100644
--- a/settings/trans.png
+++ b/settings/trans.png
diff --git a/settings/users.php b/settings/users.php
index c3259d2a3f1..e76505cc78d 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -5,46 +5,56 @@
  * See the COPYING-README file.
  */
 
-require_once('../lib/base.php');
-OC_Util::checkAdminUser();
+require_once '../lib/base.php';
+OC_Util::checkSubAdminUser();
 
 // We have some javascript foo!
 OC_Util::addScript( 'settings', 'users' );
 OC_Util::addScript( 'core', 'multiselect' );
+OC_Util::addScript('core', 'jquery.inview');
 OC_Util::addStyle( 'settings', 'settings' );
 OC_App::setActiveNavigationEntry( 'core_users' );
 
 $users = array();
 $groups = array();
 
-foreach( OC_User::getUsers() as $i ){
-	$users[] = array( "name" => $i, "groups" => join( ", ", OC_Group::getUserGroups( $i ) ),'quota'=>OC_Preferences::getValue($i,'files','quota','default'));
+$isadmin = OC_Group::inGroup(OC_User::getUser(), 'admin')?true:false;
+if($isadmin) {
+	$accessiblegroups = OC_Group::getGroups();
+	$accessibleusers = OC_User::getUsers('', 30);
+	$subadmins = OC_SubAdmin::getAllSubAdmins();
+}else{
+	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	$accessibleusers = OC_Group::usersInGroups($accessiblegroups, '', 30);
+	$subadmins = false;
 }
 
-foreach( OC_Group::getGroups() as $i ){
+foreach($accessibleusers as $i) {
+	$users[] = array(
+		"name" => $i, 
+		"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
+		'quota'=>OC_Preferences::getValue($i, 'files', 'quota', 'default'),
+		'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($i)));
+}
+
+foreach( $accessiblegroups as $i ) {
 	// Do some more work here soon
 	$groups[] = array( "name" => $i );
 }
-$quotaPreset=OC_Appconfig::getValue('files','quota_preset','default,none,1 GB, 5 GB, 10 GB');
+$quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', 'default,none,1 GB, 5 GB, 10 GB');
 $quotaPreset=explode(',',$quotaPreset);
-foreach($quotaPreset as &$preset){
+foreach($quotaPreset as &$preset) {
 	$preset=trim($preset);
 }
 
-$defaultQuota=OC_Appconfig::getValue('files','default_quota','none');
-
-$shareNotice = '';
-
-if (\OC_App::isEnabled( "files_sharing" ) ) {
-
-	$shareNotice = 'Note: users may only share to groups that they belong to, and their members';
-	
-}
+$defaultQuota=OC_Appconfig::getValue('files', 'default_quota', 'none');
 
 $tmpl = new OC_Template( "settings", "users", "user" );
 $tmpl->assign( "users", $users );
 $tmpl->assign( "groups", $groups );
+$tmpl->assign( 'isadmin', (int) $isadmin);
+$tmpl->assign( 'subadmins', $subadmins);
+$tmpl->assign( 'numofgroups', count($accessiblegroups));
 $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);
-$tmpl->assign( 'share_notice', $shareNotice);
-$tmpl->printPage();
+$tmpl->printPage();
\ No newline at end of file