Merge branch 'master' into update_shipped_apps_from_appstore

Conflicts:
	lib/private/app.php
	settings/templates/apps.php

91 files changed, 2192 insertions, 1012 deletions

diff --git a/settings/admin.php b/settings/admin.php
index a0769892ef4..d2be04fcd1d 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -82,12 +82,16 @@ $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links
 $tmpl->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired());
 $tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'));
 $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
-$tmpl->assign('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'yes'));
+$tmpl->assign('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'no'));
 $tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
 $tmpl->assign('forms', array());
 foreach($forms as $form) {
 	$tmpl->append('forms', $form);
 }
+
+$databaseOverload = (strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false);
+$tmpl->assign('databaseOverload', $databaseOverload);
+
 $tmpl->printPage();
 
 /**
diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index 0a79527c219..854f2c37189 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -4,6 +4,7 @@ OCP\JSON::callCheck();
 OC_JSON::checkAdminUser();
 
 $groupname = $_POST["groupname"];
+$l = OC_L10N::get('settings');
 
 // Does the group exist?
 if( in_array( $groupname, OC_Group::getGroups())) {
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index 94b56fa0349..ae1d8856f43 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -43,12 +43,15 @@ try {
 		OC_Group::addToGroup( $username, $i );
 	}
 
-	OC_JSON::success(array("data" =>
+	$userManager = \OC_User::getManager();
+	$user = $userManager->get($username);
+	OCP\JSON::success(array("data" =>
 				array(
 					// returns whether the home already existed
 					"homeExists" => $homeExists,
 					"username" => $username,
-					"groups" => OC_Group::getUserGroups( $username ))));
+					"groups" => OC_Group::getUserGroups( $username ),
+					'storageLocation' => $user->getHome())));
 } catch (Exception $exception) {
-	OC_JSON::error(array("data" => array( "message" => $exception->getMessage())));
+	OCP\JSON::error(array("data" => array( "message" => $exception->getMessage())));
 }
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index 735794360b3..81ca1e0338d 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -3,8 +3,10 @@
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
+$groups = isset($_POST['groups']) ? $_POST['groups'] : null;
+
 try {
-	OC_App::enable(OC_App::cleanAppId($_POST['appid']));
+	OC_App::enable(OC_App::cleanAppId($_POST['appid']), $groups);
 	OC_JSON::success();
 } catch (Exception $e) {
 	OC_Log::write('core', $e->getMessage(), OC_Log::ERROR);
diff --git a/settings/ajax/grouplist.php b/settings/ajax/grouplist.php
new file mode 100644
index 00000000000..91700adc359
--- /dev/null
+++ b/settings/ajax/grouplist.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Arthur Schiwon
+ * @copyright 2014 Arthur Schiwon <blizzz@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/>.
+ *
+ */
+
+OC_JSON::callCheck();
+OC_JSON::checkSubAdminUser();
+if (isset($_GET['pattern']) && !empty($_GET['pattern'])) {
+	$pattern = $_GET['pattern'];
+} else {
+	$pattern = '';
+}
+$groups = array();
+$adminGroups = array();
+$groupManager = \OC_Group::getManager();
+$isAdmin = OC_User::isAdminUser(OC_User::getUser());
+
+//we pass isAdmin as true, because OC_SubAdmin has no search feature,
+//groups will be filtered out later
+$groupsInfo = new \OC\Group\MetaData(OC_User::getUser(), true, $groupManager);
+$groupsInfo->setSorting($groupsInfo::SORT_USERCOUNT);
+list($adminGroups, $groups) = $groupsInfo->get($pattern);
+
+$accessibleGroups = $groupManager->search($pattern);
+if(!$isAdmin) {
+	$subadminGroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
+	$accessibleGroups = array_intersect($groups, $subadminGroups);
+}
+
+OC_JSON::success(
+	array('data' => array('adminGroups' => $adminGroups, 'groups' => $groups)));
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index 4abf54b8987..32237d60b6e 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -32,26 +32,55 @@ if (isset($_GET['limit'])) {
 } else {
 	$limit = 10;
 }
+if (isset($_GET['gid']) && !empty($_GET['gid'])) {
+	$gid = $_GET['gid'];
+} else {
+	$gid = false;
+}
+if (isset($_GET['pattern']) && !empty($_GET['pattern'])) {
+	$pattern = $_GET['pattern'];
+} else {
+	$pattern = '';
+}
 $users = array();
+$userManager = \OC_User::getManager();
 if (OC_User::isAdminUser(OC_User::getUser())) {
-	$batch = OC_User::getDisplayNames('', $limit, $offset);
-	foreach ($batch as $user => $displayname) {
+	if($gid !== false) {
+		$batch = OC_Group::displayNamesInGroup($gid, $pattern, $limit, $offset);
+	} else {
+		$batch = OC_User::getDisplayNames($pattern, $limit, $offset);
+	}
+	foreach ($batch as $uid => $displayname) {
+		$user = $userManager->get($uid);
 		$users[] = array(
-			'name' => $user,
+			'name' => $uid,
 			'displayname' => $displayname,
-			'groups' => join(', ', OC_Group::getUserGroups($user)),
-			'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)),
-			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+			'groups' => join(', ', OC_Group::getUserGroups($uid)),
+			'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($uid)),
+			'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'),
+			'storageLocation' => $user->getHome(),
+			'lastLogin' => $user->getLastLogin(),
+		);
 	}
 } else {
 	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
-	$batch = OC_Group::usersInGroups($groups, '', $limit, $offset);
-	foreach ($batch as $user) {
+	if($gid !== false && in_array($gid, $groups)) {
+		$groups = array($gid);
+	} elseif($gid !== false) {
+		//don't you try to investigate loops you must not know about
+		$groups = array();
+	}
+	$batch = OC_Group::usersInGroups($groups, $pattern, $limit, $offset);
+	foreach ($batch as $uid) {
+		$user = $userManager->get($uid);
 		$users[] = array(
 			'name' => $user,
-			'displayname' => OC_User::getDisplayName($user),
-			'groups' => join(', ', OC_Group::getUserGroups($user)),
-			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+			'displayname' => $user->getDisplayName(),
+			'groups' => join(', ', OC_Group::getUserGroups($uid)),
+			'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'),
+			'storageLocation' => $user->getHome(),
+			'lastLogin' => $user->getLastLogin(),
+		);
 	}
 }
 OC_JSON::success(array('data' => $users));
diff --git a/settings/apps.php b/settings/apps.php
index 6fd2efc2018..7573c8b573f 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -25,13 +25,16 @@ OC_Util::checkAdminUser();
 
 // Load the files we need
 OC_Util::addStyle( "settings", "settings" );
+OC_Util::addScript("core", "multiselect");
 OC_App::setActiveNavigationEntry( "core_apps" );
 
 $combinedApps = OC_App::listAllApps();
+$groups = \OC_Group::getGroups();
 
 $tmpl = new OC_Template( "settings", "apps", "user" );
 
 $tmpl->assign('apps', $combinedApps);
+$tmpl->assign('groups', $groups);
 
 $appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
 
diff --git a/settings/css/settings.css b/settings/css/settings.css
index be6cfe1e9bf..cd81cfb2b3d 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -5,6 +5,16 @@
 select#languageinput, select#timezone { width:15em; }
 input#openid, input#webdav { width:20em; }
 
+#user-controls {
+	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
+	position: fixed;
+	right: 0;
+	left: 230px;
+	height: 44px;
+	padding: 0; margin: 0;
+	background: #eee; border-bottom: 1px solid #e7e7e7;
+	z-index: 50;
+}
 
 /* PERSONAL */
 #rootcert_import {
@@ -13,10 +23,13 @@ input#openid, input#webdav { width:20em; }
 }
 
 /* Sync clients */
-.clientsbox { margin:12px; }
-.clientsbox h1 { font-size:40px; font-weight:bold; margin:50px 0 20px; }
-.clientsbox h2 { font-size:20px; font-weight:bold; margin:35px 0 10px; }
-.clientsbox .center { margin-top:10px; }
+.clientsbox h2 {
+	font-size: 20px;
+	margin: 35px 0 10px;
+}
+.clientsbox .center {
+	margin-top: 10px;
+}
 
 #passworderror { display:none; }
 #passwordchanged { display:none; }
@@ -44,7 +57,37 @@ table.nostyle label { margin-right: 2em; }
 table.nostyle td { padding: 0.2em 0; }
 
 /* USERS */
+#newgroup-init a span { margin-left: 20px; }
+#newgroup-init a span:before {
+	position: absolute;	left: 12px; top:-2px;
+	content: '+'; font-weight: bold; font-size: 150%;
+}
+.usercount { float: left; margin: 5px; }
+li.active span.utils .delete {
+	float: left; position: relative; opacity: 0.5;
+	top: -7px; left: 7px; width: 44px; height: 44px;
+}
+li.active .rename {
+	padding: 8px 14px 20px 14px;
+	top: 0px; position: absolute; width: 16px; height: 16px;
+	opacity: 0.5;
+	display: inline-block !important;
+}
+li.active span.utils .delete img { margin: 14px; }
+li.active .rename { opacity: 0.5; }
+li.active span.utils .delete:hover, li.active .rename:hover { opacity: 1; }
+span.utils .delete, .rename { display: none; }
+#app-navigation ul li.active > span.utils .delete,
+#app-navigation ul li.active > span.utils .rename { display: block; }
+#usersearchform { position: absolute; top: 4px; right: 10px; }
+#usersearchform label { font-weight: 700; }
 form { display:inline; }
+
+/* display table at full width */
+table.grid {
+	width: 100%;
+}
+
 table.grid th { height:2em; color:#999; }
 table.grid th, table.grid 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; }
@@ -57,9 +100,8 @@ tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:point
 tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
 tr:hover>td.remove>a { float:right; }
 
-table.grid { width:100%; }
 div.quota {
-	float: right;
+	margin: 10px;
 	display: block;
 }
 div.quota-select-wrapper { position: relative; }
@@ -78,6 +120,8 @@ div.quota>span {
 }
 select.quota.active { background: #fff; }
 
+input.userFilter {width: 200px;}
+
 /* positioning fixes */
 #newuser .multiselect {
 	min-width: 150px !important;
@@ -158,6 +202,10 @@ table.shareAPI .indent { padding-left: 2em; }
 	vertical-align: text-bottom;
 }
 
+.cronstatus.success {
+	border-radius: 50%;
+}
+
 #selectGroups select {
 	-moz-box-sizing: border-box;
 	-webkit-box-sizing: border-box;
@@ -176,8 +224,6 @@ span.error {
         background: #ce3702;
 }
 
-/* HELP */
-.pressed {background-color:#DDD;}
 
 /* PASSWORD */
 .strengthify-wrapper {
@@ -192,3 +238,22 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 	left: 185px;
 	width: 129px;
 }
+
+
+
+
+
+/* HELP */
+
+.help-includes {
+	overflow: hidden !important;
+}
+
+.help-iframe {
+	width: 100%;
+	height: 100%;
+	margin: 0;
+	padding: 0;
+	border: 0;
+	overflow: auto;
+}
diff --git a/settings/js/admin.js b/settings/js/admin.js
index bc95c6a3dc5..8c7572fa394 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -83,6 +83,9 @@ $(document).ready(function(){
 	$('#allowLinks').change(function() {
 		$("#publicLinkSettings").toggleClass('hidden', !this.checked);
 	});
+	$('#allowResharing').change(function() {
+		$("#resharingSettings").toggleClass('hidden', !this.checked);
+	});
 
 	$('#security').change(function(){
 		$.post(OC.filePath('settings','ajax','setsecurity.php'), { enforceHTTPS: $('#forcessl').val() },function(){} );
diff --git a/settings/js/apps.js b/settings/js/apps.js
index a12131b0224..95e56485a6a 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -96,12 +96,41 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		} else {
 			page.find(".warning").hide();
 		}
+
+		page.find("div.multiselect").parent().remove();
+		if(OC.Settings.Apps.isType(app, 'filesystem') || OC.Settings.Apps.isType(app, 'prelogin') ||
+			OC.Settings.Apps.isType(app, 'authentication') || OC.Settings.Apps.isType(app, 'logging')) {
+			page.find("#groups_enable").hide();
+			page.find("label[for='groups_enable']").hide();
+			page.find("#groups_enable").attr('checked', null);
+		} else {
+			$('#group_select > option').each(function (i, el) {
+				if (app.groups.length === 0 || app.groups.indexOf(el.value) >= 0) {
+					$(el).attr('selected', 'selected');
+				} else {
+					$(el).attr('selected', null);
+				}
+			});
+			if (app.active) {
+				if (app.groups.length) {
+					$('#group_select').multiSelect();
+					page.find("#groups_enable").attr('checked','checked');
+				} else {
+					page.find("#groups_enable").attr('checked', null);
+				}
+				page.find("#groups_enable").show();
+				page.find("label[for='groups_enable']").show();
+			} else {
+				page.find("#groups_enable").hide();
+				page.find("label[for='groups_enable']").hide();
+			}
+		}
 	},
-	enableApp:function(appid, active, element) {
-		console.log('enableApp:', appid, active, element);
+	enableApp:function(appid, active, element, groups) {
+		groups = groups || [];
 		var appitem=$('#app-navigation ul li[data-id="'+appid+'"]');
 		element.val(t('settings','Please wait....'));
-		if(active) {
+		if(active && !groups.length) {
 			$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appid},function(result) {
 				if(!result || result.status !== 'success') {
 					if (result.data && result.data.message) {
@@ -116,14 +145,19 @@ OC.Settings.Apps = OC.Settings.Apps || {
 				}
 				else {
 					appitem.data('active',false);
+					appitem.data('groups', '');
 					element.data('active',false);
 					OC.Settings.Apps.removeNavigation(appid);
 					appitem.removeClass('active');
 					element.val(t('settings','Enable'));
+					element.parent().find("#groups_enable").hide();
+					element.parent().find("label[for='groups_enable']").hide();
+					var app = OC.get('appData_' + appid);
+					app.active = false;
 				}
 			},'json');
 		} else {
-			$.post(OC.filePath('settings','ajax','enableapp.php'),{appid:appid},function(result) {
+			$.post(OC.filePath('settings','ajax','enableapp.php'),{appid: appid, groups: groups},function(result) {
 				if(!result || result.status !== 'success') {
 					if (result.data && result.data.message) {
 						OC.Settings.Apps.showErrorMessage(result.data.message);
@@ -140,6 +174,21 @@ OC.Settings.Apps = OC.Settings.Apps || {
 					element.data('active',true);
 					appitem.addClass('active');
 					element.val(t('settings','Disable'));
+					var app = OC.get('appData_' + appid);
+					app.active = true;
+					if (OC.Settings.Apps.isType(app, 'filesystem') || OC.Settings.Apps.isType(app, 'prelogin') ||
+						OC.Settings.Apps.isType(app, 'authentication') || OC.Settings.Apps.isType(app, 'logging')) {
+						element.parent().find("#groups_enable").hide();
+						element.parent().find("label[for='groups_enable']").hide();
+					} else {
+						element.parent().find("#groups_enable").show();
+						element.parent().find("label[for='groups_enable']").show();
+						if (groups) {
+							appitem.data('groups', JSON.stringify(groups));
+						} else {
+							appitem.data('groups', '');
+						}
+					}
 				}
 			},'json')
 			.fail(function() {
@@ -153,7 +202,6 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		}
 	},
 	updateApp:function(appid, element) {
-		console.log('updateApp:', appid, element);
 		element.val(t('settings','Updating....'));
 		$.post(OC.filePath('settings','ajax','updateapp.php'),{appid:appid},function(result) {
 			if(!result || result.status !== 'success') {
@@ -204,7 +252,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			if(response.status === 'success'){
 				var navIds=response.nav_ids;
 				for(var i=0; i< navIds.length; i++){
-					$('#apps .wrapper').children('li[data-id="'+navIds[i]+'"]').remove();
+					$('#apps ul').children('li[data-id="'+navIds[i]+'"]').remove();
 				}
 			}
 		});
@@ -215,7 +263,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 				var navEntries=response.nav_entries;
 				for(var i=0; i< navEntries.length; i++){
 					var entry = navEntries[i];
-					var container = $('#apps .wrapper');
+					var container = $('#apps ul');
 
 					if(container.children('li[data-id="'+entry.id+'"]').length === 0){
 						var li=$('<li></li>');
@@ -229,8 +277,9 @@ OC.Settings.Apps = OC.Settings.Apps || {
 						li.append(a);
 
 						// append the new app as last item in the list
-						// (.push is from sticky footer)
-						$('#apps .wrapper .push').before(li);
+						// which is the "add apps" entry with the id
+						// #apps-management
+						$('#apps-management').before(li);
 
 						// scroll the app navigation down
 						// so the newly added app is seen
@@ -240,11 +289,12 @@ OC.Settings.Apps = OC.Settings.Apps || {
 
 						// draw attention to the newly added app entry
 						// by flashing it twice
-						container.children('li[data-id="' + entry.id + '"]')
-							.animate({opacity: 0.3})
+						$('#header .menutoggle')
+							.animate({opacity: 0.5})
+							.animate({opacity: 1})
+							.animate({opacity: 0.5})
 							.animate({opacity: 1})
-							.animate({opacity: 0.3})
-							.animate({opacity: 1});
+							.animate({opacity: 0.75});
 
 						if (!SVGSupport() && entry.icon.match(/\.svg$/i)) {
 							$(img).addClass('svg');
@@ -258,12 +308,18 @@ OC.Settings.Apps = OC.Settings.Apps || {
 	showErrorMessage: function(message) {
 		$('.appinfo .warning').show();
 		$('.appinfo .warning').text(message);
+	},
+	isType: function(app, type){
+		return app.types && app.types.indexOf(type) !== -1;
 	}
 };
 
 $(document).ready(function(){
 	$('#app-navigation ul li').each(function(index,li){
 		var app = OC.get('appData_'+$(li).data('id'));
+		if (app) {
+			app.groups= $(li).data('groups') || [];
+		}
 		$(li).data('app',app);
 		$(this).find('span.hidden').remove();
 	});
@@ -308,6 +364,20 @@ $(document).ready(function(){
 		}
 	});
 
+	$('#group_select').change(function() {
+		var element = $('#app-content input.enable');
+		var groups = $(this).val();
+		var appid = element.data('appid');
+		if (appid) {
+			OC.Settings.Apps.enableApp(appid, false, element, groups);
+			var li = $('[data-id="'+appid+'"]');
+			var app = OC.get('appData_' + $(li).data('id'));
+			app.groups = groups;
+			li.data('groups', groups);
+			li.attr('data-groups', JSON.stringify(groups));
+		}
+	});
+
 	if(appid) {
 		var item = $('#app-navigation ul li[data-id="'+appid+'"]');
 		if(item) {
@@ -316,4 +386,16 @@ $(document).ready(function(){
 			$('#app-navigation').animate({scrollTop: $(item).offset().top-70}, 'slow','swing');
 		}
 	}
+
+	$("#groups_enable").change(function() {
+		if (this.checked) {
+			$("div.multiselect").parent().remove();
+			$('#group_select').multiSelect();
+		} else {
+			$('#group_select').hide().val(null);
+			$("div.multiselect").parent().remove();
+		}
+
+		$('#group_select').change();
+	});
 });
diff --git a/settings/js/users.js b/settings/js/users.js
deleted file mode 100644
index eef3c237277..00000000000
--- a/settings/js/users.js
+++ /dev/null
@@ -1,546 +0,0 @@
-/**
- * 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.
- */
-
-function setQuota (uid, quota, ready) {
-	$.post(
-		OC.filePath('settings', 'ajax', 'setquota.php'),
-		{username: uid, quota: quota},
-		function (result) {
-			if (ready) {
-				ready(result.data.quota);
-			}
-		}
-	);
-}
-
-var UserList = {
-	useUndo: true,
-	availableGroups: [],
-	offset: 30, //The first 30 users are there. No prob, if less in total.
-				//hardcoded in settings/users.php
-
-	usersToLoad: 10, //So many users will be loaded when user scrolls down
-
-	/**
-	 * @brief Initiate user deletion process in UI
-	 * @param string uid the user ID to be deleted
-	 *
-	 * Does not actually delete the user; it sets them for
-	 * deletion when the current page is unloaded, at which point
-	 * finishDelete() completes the process. This allows for 'undo'.
-	 */
-	do_delete: function (uid) {
-		if (typeof UserList.deleteUid !== 'undefined') {
-			//Already a user in the undo queue
-			UserList.finishDelete(null);
-		}
-		UserList.deleteUid = uid;
-
-		// Set undo flag
-		UserList.deleteCanceled = false;
-
-		// Provide user with option to undo
-		$('#notification').data('deleteuser', true);
-		OC.Notification.showHtml(t('settings', 'deleted') + ' ' + escapeHTML(uid) + '<span class="undo">' + t('settings', 'undo') + '</span>');
-	},
-
-	/**
-	 * @brief Delete a user via ajax
-	 * @param bool ready whether to use ready() upon completion
-	 *
-	 * Executes deletion via ajax of user identified by property deleteUid
-	 * if 'undo' has not been used.  Completes the user deletion procedure
-	 * and reflects success in UI.
-	 */
-	finishDelete: function (ready) {
-
-		// Check deletion has not been undone
-		if (!UserList.deleteCanceled && UserList.deleteUid) {
-
-			// Delete user via ajax
-			$.ajax({
-				type: 'POST',
-				url: OC.filePath('settings', 'ajax', 'removeuser.php'),
-				async: false,
-				data: { username: UserList.deleteUid },
-				success: function (result) {
-					if (result.status === 'success') {
-						// Remove undo option, & remove user from table
-						OC.Notification.hide();
-						$('tr').filterAttr('data-uid', UserList.deleteUid).remove();
-						UserList.deleteCanceled = true;
-						if (ready) {
-							ready();
-						}
-					} else {
-						OC.dialogs.alert(result.data.message, t('settings', 'Unable to remove user'));
-					}
-				}
-			});
-		}
-	},
-
-	add: function (username, displayname, groups, subadmin, quota, sort) {
-		var tr = $('tbody tr').first().clone();
-		var subadminsEl;
-		var subadminSelect;
-		var groupsSelect;
-		if (tr.find('div.avatardiv').length){
-			$('div.avatardiv', tr).avatar(username, 32);
-		}
-		tr.attr('data-uid', username);
-		tr.attr('data-displayName', displayname);
-		tr.find('td.name').text(username);
-		tr.find('td.displayName > span').text(displayname);
-
-		// make them look like the multiselect buttons
-		// until they get time to really get initialized
-		groupsSelect = $('<select multiple="multiple" class="groupsselect multiselect button" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>')
-			.attr('data-username', username)
-			.data('user-groups', groups);
-		if (tr.find('td.subadmins').length > 0) {
-			subadminSelect = $('<select multiple="multiple" class="subadminsselect multiselect button" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">')
-				.attr('data-username', username)
-				.data('user-groups', groups)
-				.data('subadmin', subadmin);
-			tr.find('td.subadmins').empty();
-		}
-		$.each(this.availableGroups, function (i, group) {
-			groupsSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
-			if (typeof subadminSelect !== 'undefined' && group !== 'admin') {
-				subadminSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
-			}
-		});
-		tr.find('td.groups').empty().append(groupsSelect);
-		subadminsEl = tr.find('td.subadmins');
-		if (subadminsEl.length > 0) {
-			subadminsEl.append(subadminSelect);
-		}
-		if (tr.find('td.remove img').length === 0 && OC.currentUser !== username) {
-			var rm_img = $('<img class="svg action">').attr({
-				src: OC.imagePath('core', 'actions/delete')
-			});
-			var rm_link = $('<a class="action delete">')
-				.attr({ href: '#', 'original-title': t('settings', 'Delete')})
-				.append(rm_img);
-			tr.find('td.remove').append(rm_link);
-		} 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="' + escapeHTML(quota) + '" selected="selected">' + escapeHTML(quota) + '</option>');
-			}
-		}
-		$(tr).appendTo('tbody');
-
-		if (sort) {
-			UserList.doSort();
-		}
-
-		quotaSelect.on('change', function () {
-			var uid = $(this).parent().parent().attr('data-uid');
-			var quota = $(this).val();
-			setQuota(uid, quota, function(returnedQuota){
-				if (quota !== returnedQuota) {
-					$(quotaSelect).find(':selected').text(returnedQuota);
-				}
-			});
-		});
-
-		// defer init so the user first sees the list appear more quickly
-		window.setTimeout(function(){
-			quotaSelect.singleSelect();
-			UserList.applyMultiplySelect(groupsSelect);
-			if (subadminSelect) {
-				UserList.applyMultiplySelect(subadminSelect);
-			}
-		}, 0);
-		return tr;
-	},
-	// From http://my.opera.com/GreyWyvern/blog/show.dml/1671288
-	alphanum: function(a, b) {
-		function chunkify(t) {
-			var tz = [], x = 0, y = -1, n = 0, i, j;
-
-			while (i = (j = t.charAt(x++)).charCodeAt(0)) {
-			var m = (i === 46 || (i >=48 && i <= 57));
-			if (m !== n) {
-				tz[++y] = "";
-				n = m;
-			}
-			tz[y] += j;
-			}
-			return tz;
-		}
-
-		var aa = chunkify(a.toLowerCase());
-		var bb = chunkify(b.toLowerCase());
-
-		for (x = 0; aa[x] && bb[x]; x++) {
-			if (aa[x] !== bb[x]) {
-			var c = Number(aa[x]), d = Number(bb[x]);
-			if (c === aa[x] && d === bb[x]) {
-				return c - d;
-			} else {
-				return (aa[x] > bb[x]) ? 1 : -1;
-			}
-			}
-		}
-		return aa.length - bb.length;
-	},
-	doSort: function() {
-		var self = this;
-		var rows = $('tbody tr').get();
-
-		rows.sort(function(a, b) {
-			return UserList.alphanum($(a).find('td.name').text(), $(b).find('td.name').text());
-		});
-
-		var items = [];
-		$.each(rows, function(index, row) {
-			items.push(row);
-			if(items.length === 100) {
-				$('tbody').append(items);
-				items = [];
-			}
-		});
-		if(items.length > 0) {
-			$('tbody').append(items);
-		}
-	},
-	update: function () {
-		if (UserList.updating) {
-			return;
-		}
-		$('table+.loading').css('visibility', 'visible');
-		UserList.updating = true;
-		var query = $.param({ offset: UserList.offset, limit: UserList.usersToLoad });
-		$.get(OC.generateUrl('/settings/ajax/userlist') + '?' + query, function (result) {
-			var loadedUsers = 0;
-			var trs = [];
-			if (result.status === 'success') {
-				//The offset does not mirror the amount of users available,
-				//because it is backend-dependent. For correct retrieval,
-				//always the limit(requested amount of users) needs to be added.
-				$.each(result.data, function (index, user) {
-					if($('tr[data-uid="' + user.name + '"]').length > 0) {
-						return true;
-					}
-					var tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, false);
-					tr.addClass('appear transparent');
-					trs.push(tr);
-					loadedUsers++;
-				});
-				if (result.data.length > 0) {
-					UserList.doSort();
-					$('table+.loading').css('visibility', 'hidden');
-				}
-				else {
-					UserList.noMoreEntries = true;
-					$('table+.loading').remove();
-				}
-				UserList.offset += loadedUsers;
-				// animate
-				setTimeout(function() {
-					for (var i = 0; i < trs.length; i++) {
-						trs[i].removeClass('transparent');
-					}
-				}, 0);
-			}
-			UserList.updating = false;
-		});
-	},
-
-	applyMultiplySelect: function (element) {
-		var checked = [];
-		var user = element.attr('data-username');
-		if ($(element).hasClass('groupsselect')) {
-			if (element.data('userGroups')) {
-				checked = element.data('userGroups');
-			}
-			if (user) {
-				var checkHandeler = function (group) {
-					if (user === OC.currentUser && group === 'admin') {
-						return false;
-					}
-					if (!oc_isadmin && checked.length === 1 && checked[0] === group) {
-						return false;
-					}
-					$.post(
-						OC.filePath('settings', 'ajax', 'togglegroups.php'),
-						{
-							username: user,
-							group: group
-						},
-						function (response) {
-							if(response.status === 'success'
-									&& UserList.availableGroups.indexOf(response.data.groupname) === -1
-									&& response.data.action === 'add') {
-								UserList.availableGroups.push(response.data.groupname);
-							}
-							if(response.data.message) {
-								OC.Notification.show(response.data.message);
-							}
-						}
-					);
-				};
-			} else {
-				checkHandeler = false;
-			}
-			var addGroup = function (select, group) {
-				$('select[multiple]').each(function (index, element) {
-					if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
-						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
-					}
-				});
-			};
-			var label;
-			if (oc_isadmin) {
-				label = t('settings', 'add group');
-			} else {
-				label = null;
-			}
-			element.multiSelect({
-				createCallback: addGroup,
-				createText: label,
-				selectedFirst: true,
-				checked: checked,
-				oncheck: checkHandeler,
-				onuncheck: checkHandeler,
-				minWidth: 100
-			});
-		}
-		if ($(element).hasClass('subadminsselect')) {
-			if (element.data('subadmin')) {
-				checked = element.data('subadmin');
-			}
-			var checkHandeler = function (group) {
-				if (group === 'admin') {
-					return false;
-				}
-				$.post(
-					OC.filePath('settings', 'ajax', 'togglesubadmins.php'),
-					{
-						username: user,
-						group: group
-					},
-					function () {
-					}
-				);
-			};
-
-			var addSubAdmin = function (group) {
-				$('select[multiple]').each(function (index, element) {
-					if ($(element).find('option[value="' + group + '"]').length === 0) {
-						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
-					}
-				});
-			};
-			element.multiSelect({
-				createCallback: addSubAdmin,
-				createText: null,
-				checked: checked,
-				oncheck: checkHandeler,
-				onuncheck: checkHandeler,
-				minWidth: 100
-			});
-		}
-	},
-
-	_onScroll: function(e) {
-		if (!!UserList.noMoreEntries) {
-			return;
-		}
-		if ($(window).scrollTop() + $(window).height() > $(document).height() - 500) {
-			UserList.update(true);
-		}
-	},
-};
-
-$(document).ready(function () {
-
-	UserList.doSort();
-	UserList.availableGroups = $('#content table').data('groups');
-	$(window).scroll(function(e) {UserList._onScroll(e);});
-	$('table').after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>'));
-
-	$('select[multiple]').each(function (index, element) {
-		UserList.applyMultiplySelect($(element));
-	});
-
-	$('table').on('click', 'td.remove>a', function (event) {
-		var row = $(this).parent().parent();
-		var uid = $(row).attr('data-uid');
-		$(row).hide();
-		// Call function for handling delete/undo
-		UserList.do_delete(uid);
-	});
-
-	$('table').on('click', 'td.password>img', function (event) {
-		event.stopPropagation();
-		var img = $(this);
-		var uid = img.parent().parent().attr('data-uid');
-		var input = $('<input type="password">');
-		img.css('display', 'none');
-		img.parent().children('span').replaceWith(input);
-		input.focus();
-		input.keypress(function (event) {
-			if (event.keyCode === 13) {
-				if ($(this).val().length > 0) {
-					var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
-					$.post(
-						OC.generateUrl('/settings/users/changepassword'),
-						{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
-						function (result) {
-							if (result.status != 'success') {
-								OC.Notification.show(t('admin', result.data.message));
-							}
-						}
-					);
-					input.blur();
-				} else {
-					input.blur();
-				}
-			}
-		});
-		input.blur(function () {
-			$(this).replaceWith($('<span>●●●●●●●</span>'));
-			img.css('display', '');
-		});
-	});
-	$('input:password[id="recoveryPassword"]').keyup(function(event) {
-		OC.Notification.hide();
-	});
-
-	$('table').on('click', 'td.password', function (event) {
-		$(this).children('img').click();
-	});
-
-	$('table').on('click', 'td.displayName>img', function (event) {
-		event.stopPropagation();
-		var img = $(this);
-		var uid = img.parent().parent().attr('data-uid');
-		var displayName = escapeHTML(img.parent().parent().attr('data-displayName'));
-		var input = $('<input type="text" value="' + displayName + '">');
-		img.css('display', 'none');
-		img.parent().children('span').replaceWith(input);
-		input.focus();
-		input.keypress(function (event) {
-			if (event.keyCode === 13) {
-				if ($(this).val().length > 0) {
-					$.post(
-						OC.filePath('settings', 'ajax', 'changedisplayname.php'),
-						{username: uid, displayName: $(this).val()},
-						function (result) {
-							if (result && result.status==='success'){
-								img.parent().parent().find('div.avatardiv').avatar(result.data.username, 32);
-							}
-						}
-					);
-					input.blur();
-				} else {
-					input.blur();
-				}
-			}
-		});
-		input.blur(function () {
-			var input = $(this),
-				displayName = input.val();
-			input.closest('tr').attr('data-displayName', displayName);
-			input.replaceWith('<span>' + escapeHTML(displayName) + '</span>');
-			img.css('display', '');
-		});
-	});
-	$('table').on('click', 'td.displayName', function (event) {
-		$(this).children('img').click();
-	});
-
-	$('select.quota, select.quota-user').singleSelect().on('change', function () {
-		var select = $(this);
-		var uid = $(this).parent().parent().attr('data-uid');
-		var quota = $(this).val();
-		setQuota(uid, quota, function(returnedQuota){
-			if (quota !== returnedQuota) {
-				select.find(':selected').text(returnedQuota);
-			}
-		});
-	});
-
-	$('#newuser').submit(function (event) {
-		event.preventDefault();
-		var username = $('#newusername').val();
-		var password = $('#newuserpassword').val();
-		if ($.trim(username) === '') {
-			OC.dialogs.alert(
-				t('settings', 'A valid username must be provided'),
-				t('settings', 'Error creating user'));
-			return false;
-		}
-		if ($.trim(password) === '') {
-			OC.dialogs.alert(
-				t('settings', 'A valid password must be provided'),
-				t('settings', 'Error creating user'));
-			return false;
-		}
-		var groups = $('#newusergroups').prev().children('div').data('settings').checked;
-		$('#newuser').get(0).reset();
-		$.post(
-			OC.filePath('settings', 'ajax', 'createuser.php'),
-			{
-				username: username,
-				password: password,
-				groups: groups
-			},
-			function (result) {
-				if (result.status !== 'success') {
-					OC.dialogs.alert(result.data.message,
-						t('settings', 'Error creating user'));
-				} else {
-					if (result.data.groups) {
-						var addedGroups = result.data.groups;
-						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
-					}
-					if (result.data.homeExists){
-						OC.Notification.hide();
-						OC.Notification.show(t('settings', 'Warning: Home directory for user "{user}" already exists', {user: result.data.username}));
-						if (UserList.notificationTimeout){
-							window.clearTimeout(UserList.notificationTimeout);
-						}
-						UserList.notificationTimeout = window.setTimeout(
-							function(){
-								OC.Notification.hide();
-								UserList.notificationTimeout = null;
-							}, 10000);
-					}
-					if($('tr[data-uid="' + username + '"]').length === 0) {
-						UserList.add(username, username, result.data.groups, null, 'default', true);
-					}
-				}
-			}
-		);
-	});
-	// Handle undo notifications
-	OC.Notification.hide();
-	$('#notification').on('click', '.undo', function () {
-		if ($('#notification').data('deleteuser')) {
-			$('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
-			UserList.deleteCanceled = true;
-		}
-		OC.Notification.hide();
-	});
-	UserList.useUndo = ('onbeforeunload' in window);
-	$(window).bind('beforeunload', function () {
-		UserList.finishDelete(null);
-	});
-});
diff --git a/settings/js/users/deleteHandler.js b/settings/js/users/deleteHandler.js
new file mode 100644
index 00000000000..894744ba3e9
--- /dev/null
+++ b/settings/js/users/deleteHandler.js
@@ -0,0 +1,171 @@
+/**
+ * Copyright (c) 2014, Arthur Schiwon <blizzz@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * takes care of deleting things represented by an ID
+ *
+ * @class
+ * @param {string} endpoint the corresponding ajax PHP script. Currently limited
+ * to settings - ajax path.
+ * @param {string} paramID the by the script expected parameter name holding the
+ * ID of the object to delete
+ * @param {markCallback} markCallback function to be called after successfully
+ * marking the object for deletion.
+ * @param {removeCallback} removeCallback the function to be called after
+ * successful delete.
+ */
+function DeleteHandler(endpoint, paramID, markCallback, removeCallback) {
+	this.oidToDelete = false;
+	this.canceled = false;
+
+	this.ajaxEndpoint = endpoint;
+	this.ajaxParamID = paramID;
+
+	this.markCallback = markCallback;
+	this.removeCallback = removeCallback;
+	this.undoCallback = false;
+
+	this.notifier = false;
+	this.notificationDataID = false;
+	this.notificationMessage = false;
+	this.notificationPlaceholder = '%oid';
+}
+
+/**
+ * The function to be called after successfully marking the object for deletion
+ * @callback markCallback
+ * @param {string} oid the ID of the specific user or group
+ */
+
+/**
+ * The function to be called after successful delete. The id of the object will
+ * be passed as argument. Unsuccessful operations will display an error using
+ * OC.dialogs, no callback is fired.
+ * @callback removeCallback
+ * @param {string} oid the ID of the specific user or group
+ */
+
+/**
+ * This callback is fired after "undo" was clicked so the consumer can update
+ * the web interface
+ * @callback undoCallback
+ * @param {string} oid the ID of the specific user or group
+ */
+
+/**
+ * enabled the notification system. Required for undo UI.
+ *
+ * @param {object} notifier Usually OC.Notification
+ * @param {string} dataID an identifier for the notifier, e.g. 'deleteuser'
+ * @param {string} message the message that should be shown upon delete. %oid
+ * will be replaced with the affected id of the item to be deleted
+ * @param {undoCallback} undoCallback called after "undo" was clicked
+ */
+DeleteHandler.prototype.setNotification = function(notifier, dataID, message, undoCallback) {
+	this.notifier = notifier;
+	this.notificationDataID = dataID;
+	this.notificationMessage = message;
+	this.undoCallback = undoCallback;
+
+	var dh = this;
+
+	$('#notification').on('click', '.undo', function () {
+		if ($('#notification').data(dh.notificationDataID)) {
+			var oid = dh.oidToDelete;
+			dh.cancel();
+			if(typeof dh.undoCallback !== 'undefined') {
+				dh.undoCallback(oid);
+			}
+		}
+		dh.notifier.hide();
+	});
+};
+
+/**
+ * shows the Undo Notification (if configured)
+ */
+DeleteHandler.prototype.showNotification = function() {
+	if(this.notifier !== false) {
+		if(!this.notifier.isHidden()) {
+			this.hideNotification();
+		}
+		$('#notification').data(this.notificationDataID, true);
+		var msg = this.notificationMessage.replace(this.notificationPlaceholder,
+											this.oidToDelete);
+		this.notifier.showHtml(msg);
+	}
+};
+
+/**
+ * hides the Undo Notification
+ */
+DeleteHandler.prototype.hideNotification = function() {
+	if(this.notifier !== false) {
+		$('#notification').removeData(this.notificationDataID);
+		this.notifier.hide();
+	}
+};
+
+/**
+ * initializes the delete operation for a given object id
+ *
+ * @param {string} oid the object id
+ */
+DeleteHandler.prototype.mark = function(oid) {
+	if(this.oidToDelete !== false) {
+		this.delete();
+	}
+	this.oidToDelete = oid;
+	this.canceled = false;
+	this.markCallback(oid);
+	this.showNotification();
+};
+
+/**
+ * cancels a delete operation
+ */
+DeleteHandler.prototype.cancel = function() {
+	this.canceled = true;
+	this.oidToDelete = false;
+};
+
+/**
+ * executes a delete operation. Requires that the operation has been
+ * initialized by mark(). On error, it will show a message via
+ * OC.dialogs.alert. On success, a callback is fired so that the client can
+ * update the web interface accordingly.
+ */
+DeleteHandler.prototype.delete = function() {
+	if(this.canceled || this.oidToDelete === false) {
+		return false;
+	}
+
+	var dh = this;
+	if($('#notification').data(this.notificationDataID) === true) {
+		dh.hideNotification();
+	}
+
+	var payload = {};
+	payload[dh.ajaxParamID] = dh.oidToDelete;
+	$.ajax({
+		type: 'POST',
+		url: OC.filePath('settings', 'ajax', dh.ajaxEndpoint),
+		async: false,
+		data: payload,
+		success: function (result) {
+			if (result.status === 'success') {
+				// Remove undo option, & remove user from table
+
+				//TODO: following line
+				dh.removeCallback(dh.oidToDelete);
+				dh.canceled = true;
+			} else {
+				OC.dialogs.alert(result.data.message, t('settings', 'Unable to delete ' + escapeHTML(dh.oidToDelete)));
+				dh.undoCallback(dh.oidToDelete);
+			}
+		}
+	});
+};
diff --git a/settings/js/users/filter.js b/settings/js/users/filter.js
new file mode 100644
index 00000000000..1f7a29de0c9
--- /dev/null
+++ b/settings/js/users/filter.js
@@ -0,0 +1,82 @@
+/**
+ * Copyright (c) 2014, Arthur Schiwon <blizzz@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * @brief this object takes care of the filter functionality on the user
+ * management page
+ * @param jQuery input element that works as the user text input field
+ * @param object the UserList object
+ */
+function UserManagementFilter(filterInput, userList, groupList) {
+	this.filterInput = filterInput;
+	this.userList = userList;
+	this.groupList = groupList;
+	this.thread = undefined;
+	this.oldval = this.filterInput.val();
+
+	this.init();
+}
+
+/**
+ * @brief sets up when the filter action shall be triggered
+ */
+UserManagementFilter.prototype.init = function() {
+	var umf = this;
+	this.filterInput.keyup(function(e) {
+		//we want to react on any printable letter, plus on modifying stuff like
+		//Backspace and Delete. extended https://stackoverflow.com/a/12467610
+		var valid =
+			e.keyCode ===  0 || e.keyCode ===  8  || // like ö or ж; backspace
+			e.keyCode ===  9 || e.keyCode === 46  || // tab; delete
+			e.keyCode === 32                      || // space
+			(e.keyCode >  47 && e.keyCode <   58) || // number keys
+			(e.keyCode >  64 && e.keyCode <   91) || // letter keys
+			(e.keyCode >  95 && e.keyCode <  112) || // numpad keys
+			(e.keyCode > 185 && e.keyCode <  193) || // ;=,-./` (in order)
+			(e.keyCode > 218 && e.keyCode <  223);   // [\]' (in order)
+
+		//besides the keys, the value must have been changed compared to last
+		//time
+		if(valid && umf.oldVal !== umf.getPattern()) {
+			umf.run();
+		}
+
+		umf.oldVal = umf.getPattern();
+	});
+};
+
+/**
+ * @brief the filter action needs to be done, here the accurate steps are being
+ * taken care of
+ */
+UserManagementFilter.prototype.run = _.debounce(function() {
+		this.userList.empty();
+		this.userList.update(GroupList.getCurrentGID());
+		this.groupList.empty();
+		this.groupList.update();
+	},
+	300
+);
+
+/**
+ * @brief returns the filter String
+ * @returns string
+ */
+UserManagementFilter.prototype.getPattern = function() {
+	return this.filterInput.val();
+};
+
+/**
+ * @brief adds reset functionality to an HTML element
+ * @param jQuery the jQuery representation of that element
+ */
+UserManagementFilter.prototype.addResetButton = function(button) {
+	var umf = this;
+	button.click(function(){
+		umf.filterInput.val('');
+		umf.run();
+	});
+};
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
new file mode 100644
index 00000000000..0ff8bdd6384
--- /dev/null
+++ b/settings/js/users/groups.js
@@ -0,0 +1,292 @@
+/**
+ * Copyright (c) 2014, Raghu Nayyar <beingminimal@gmail.com>
+ * Copyright (c) 2014, Arthur Schiwon <blizzz@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+var $userGroupList;
+
+var GroupList;
+GroupList = {
+	activeGID: '',
+
+	addGroup: function (gid, usercount) {
+		var $li = $userGroupList.find('.isgroup:last-child').clone();
+		$li
+			.data('gid', gid)
+			.find('.groupname').text(gid);
+		GroupList.setUserCount($li, usercount);
+
+		$li.appendTo($userGroupList);
+
+		GroupList.sortGroups();
+
+		return $li;
+	},
+
+	setUserCount: function (groupLiElement, usercount) {
+		var $groupLiElement = $(groupLiElement);
+		if (usercount === undefined || usercount === 0) {
+			usercount = '';
+		}
+		$groupLiElement.data('usercount', usercount);
+		$groupLiElement.find('.usercount').text(usercount);
+	},
+
+	getCurrentGID: function () {
+		return GroupList.activeGID;
+	},
+
+	sortGroups: function () {
+		var lis = $('.isgroup').get();
+
+		lis.sort(function (a, b) {
+			return UserList.alphanum(
+				$(a).find('a span').text(),
+				$(b).find('a span').text()
+			);
+		});
+
+		var items = [];
+		$.each(lis, function (index, li) {
+			items.push(li);
+			if (items.length === 100) {
+				$userGroupList.append(items);
+				items = [];
+			}
+		});
+		if (items.length > 0) {
+			$userGroupList.append(items);
+		}
+	},
+
+	createGroup: function (groupname) {
+		$.post(
+			OC.filePath('settings', 'ajax', 'creategroup.php'),
+			{
+				groupname: groupname
+			},
+			function (result) {
+				if (result.status !== 'success') {
+					OC.dialogs.alert(result.data.message,
+						t('settings', 'Error creating group'));
+				}
+				else {
+					if (result.data.groupname) {
+						var addedGroup = result.data.groupname;
+						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, [addedGroup]));
+						GroupList.addGroup(result.data.groupname);
+
+						$('.groupsselect, .subadminsselect')
+							.append($('<option>', { value: result.data.groupname })
+								.text(result.data.groupname));
+					}
+					GroupList.toggleAddGroup();
+				}
+			}
+		);
+	},
+
+	update: function () {
+		if (GroupList.updating) {
+			return;
+		}
+		GroupList.updating = true;
+		$.get(
+			OC.generateUrl('/settings/ajax/grouplist'),
+			{pattern: filter.getPattern()},
+			function (result) {
+
+				var lis = [];
+				if (result.status === 'success') {
+					$.each(result.data, function (i, subset) {
+						$.each(subset, function (index, group) {
+							if (GroupList.getGroupLI(group.name).length > 0) {
+								GroupList.setUserCount(GroupList.getGroupLI(group.name).first(), group.usercount);
+							}
+							else {
+								var $li = GroupList.addGroup(group.name, group.usercount);
+
+								$li.addClass('appear transparent');
+								lis.push($li);
+							}
+						});
+					});
+					if (result.data.length > 0) {
+						GroupList.doSort();
+					}
+					else {
+						GroupList.noMoreEntries = true;
+					}
+					_.defer(function () {
+						$(lis).each(function () {
+							this.removeClass('transparent')
+						});
+					});
+				}
+				GroupList.updating = false;
+
+			}
+		);
+	},
+
+	elementBelongsToAddGroup: function (el) {
+		return !(el !== $('#newgroup-form').get(0) &&
+		$('#newgroup-form').find($(el)).length === 0);
+	},
+
+	hasAddGroupNameText: function () {
+		var name = $('#newgroupname').val();
+		return $.trim(name) !== '';
+
+	},
+
+	showGroup: function (gid) {
+		GroupList.activeGID = gid;
+		UserList.empty();
+		UserList.update(gid);
+		$userGroupList.find('li').removeClass('active');
+		if (gid !== undefined) {
+			//TODO: treat Everyone properly
+			GroupList.getGroupLI(gid).addClass('active');
+		}
+	},
+
+	isAddGroupButtonVisible: function () {
+		return $('#newgroup-init').is(":visible");
+	},
+
+	toggleAddGroup: function (event) {
+		if (GroupList.isAddGroupButtonVisible()) {
+			event.stopPropagation();
+			$('#newgroup-form').show();
+			$('#newgroup-init').hide();
+			$('#newgroupname').focus();
+		}
+		else {
+			$('#newgroup-form').hide();
+			$('#newgroup-init').show();
+			$('#newgroupname').val('');
+		}
+	},
+
+	isGroupNameValid: function (groupname) {
+		if ($.trim(groupname) === '') {
+			OC.dialogs.alert(
+				t('settings', 'A valid group name must be provided'),
+				t('settings', 'Error creating group'));
+			return false;
+		}
+		return true;
+	},
+
+	hide: function (gid) {
+		GroupList.getGroupLI(gid).hide();
+	},
+	show: function (gid) {
+		GroupList.getGroupLI(gid).show();
+	},
+	remove: function (gid) {
+		GroupList.getGroupLI(gid).remove();
+	},
+	empty: function () {
+		$userGroupList.find('.isgroup').filter(function(index, item){
+			return $(item).data('gid') !== '';
+		}).remove();
+	},
+	initDeleteHandling: function () {
+		//set up handler
+		GroupDeleteHandler = new DeleteHandler('removegroup.php', 'groupname',
+			GroupList.hide, GroupList.remove);
+
+		//configure undo
+		OC.Notification.hide();
+		var msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
+			t('settings', 'undo') + '</span>';
+		GroupDeleteHandler.setNotification(OC.Notification, 'deletegroup', msg,
+			GroupList.show);
+
+		//when to mark user for delete
+		$userGroupList.on('click', '.delete', function () {
+			// Call function for handling delete/undo
+			GroupDeleteHandler.mark(GroupList.getElementGID(this));
+		});
+
+		//delete a marked user when leaving the page
+		$(window).on('beforeunload', function () {
+			GroupDeleteHandler.delete();
+		});
+	},
+
+	getGroupLI: function (gid) {
+		return $userGroupList.find('li.isgroup').filter(function () {
+			return GroupList.getElementGID(this) === gid;
+		});
+	},
+
+	getElementGID: function (element) {
+		return ($(element).closest('li').data('gid') || '').toString();
+	}
+};
+
+$(document).ready( function () {
+	$userGroupList = $('#usergrouplist');
+	GroupList.initDeleteHandling();
+
+	// Display or hide of Create Group List Element
+	$('#newgroup-form').hide();
+	$('#newgroup-init').on('click', function (e) {
+		GroupList.toggleAddGroup(e);
+	});
+
+	$(document).on('click keydown keyup', function(event) {
+		if(!GroupList.isAddGroupButtonVisible() &&
+			!GroupList.elementBelongsToAddGroup(event.target) &&
+			!GroupList.hasAddGroupNameText()) {
+			GroupList.toggleAddGroup();
+		}
+		// Escape
+		if(!GroupList.isAddGroupButtonVisible() && event.keyCode && event.keyCode === 27) {
+			GroupList.toggleAddGroup();
+		}
+	});
+
+
+	// Responsible for Creating Groups.
+	$('#newgroup-form form').submit(function (event) {
+		event.preventDefault();
+		if(GroupList.isGroupNameValid($('#newgroupname').val())) {
+			GroupList.createGroup($('#newgroupname').val());
+		}
+	});
+
+	// click on group name
+	$userGroupList.on('click', '.isgroup', function () {
+		GroupList.showGroup(GroupList.getElementGID(this));
+	});
+
+	// Implements Quota Settings Toggle.
+	var $appSettings = $('#app-settings');
+	$('#app-settings-header').on('click keydown',function(event) {
+		if(wrongKey(event)) {
+			return;
+		}
+		if($appSettings.hasClass('open')) {
+			$appSettings.switchClass('open', '');
+		} else {
+			$appSettings.switchClass('', 'open');
+		}
+	});
+	$('body').on('click', function(event){
+		if($appSettings.find(event.target).length === 0) {
+			$appSettings.switchClass('open', '');
+		}
+	});
+
+});
+
+var wrongKey = function(event) {
+	return ((event.type === 'keydown' || event.type === 'keypress') &&
+		(event.keyCode !== 32 && event.keyCode !== 13));
+};
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
new file mode 100644
index 00000000000..68098e03a50
--- /dev/null
+++ b/settings/js/users/users.js
@@ -0,0 +1,616 @@
+/**
+ * Copyright (c) 2014, Arthur Schiwon <blizzz@owncloud.com>
+ * Copyright (c) 2014, Raghu Nayyar <beingminimal@gmail.com>
+ * 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.
+ */
+
+var $userList;
+var $userListBody;
+var filter;
+
+var UserList = {
+	availableGroups: [],
+	offset: 30, //The first 30 users are there. No prob, if less in total.
+				//hardcoded in settings/users.php
+
+	usersToLoad: 10, //So many users will be loaded when user scrolls down
+	currentGid: '',
+
+	add: function (username, displayname, groups, subadmin, quota, storageLocation, lastLogin, sort) {
+		var $tr = $userListBody.find('tr:first-child').clone();
+		var subadminsEl;
+		var subadminSelect;
+		var groupsSelect;
+		if ($tr.find('div.avatardiv').length){
+			$tr.find('.avatardiv').imageplaceholder(username, displayname);
+			$('div.avatardiv', $tr).avatar(username, 32);
+		}
+		$tr.data('uid', username);
+		$tr.data('displayname', displayname);
+		$tr.find('td.name').text(username);
+		$tr.find('td.displayName > span').text(displayname);
+
+		// make them look like the multiselect buttons
+		// until they get time to really get initialized
+		groupsSelect = $('<select multiple="multiple" class="groupsselect multiselect button" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>')
+			.data('username', username)
+			.data('user-groups', groups);
+		if ($tr.find('td.subadmins').length > 0) {
+			subadminSelect = $('<select multiple="multiple" class="subadminsselect multiselect button" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">')
+				.data('username', username)
+				.data('user-groups', groups)
+				.data('subadmin', subadmin);
+			$tr.find('td.subadmins').empty();
+		}
+		$.each(this.availableGroups, function (i, group) {
+			groupsSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
+			if (typeof subadminSelect !== 'undefined' && group !== 'admin') {
+				subadminSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>'));
+			}
+		});
+		$tr.find('td.groups').empty().append(groupsSelect);
+		subadminsEl = $tr.find('td.subadmins');
+		if (subadminsEl.length > 0) {
+			subadminsEl.append(subadminSelect);
+		}
+		if ($tr.find('td.remove img').length === 0 && OC.currentUser !== username) {
+			var deleteImage = $('<img class="svg action">').attr({
+				src: OC.imagePath('core', 'actions/delete')
+			});
+			var deleteLink = $('<a class="action delete">')
+				.attr({ href: '#', 'original-title': t('settings', 'Delete')})
+				.append(deleteImage);
+			$tr.find('td.remove').append(deleteLink);
+		} else if (OC.currentUser === username) {
+			$tr.find('td.remove a').remove();
+		}
+		var $quotaSelect = $tr.find('.quota-user');
+		if (quota === 'default') {
+			$quotaSelect
+				.data('previous', 'default')
+				.find('option').attr('selected', null)
+				.first().attr('selected', 'selected');
+		} else {
+			if ($quotaSelect.find('option[value="' + quota + '"]').length > 0) {
+				$quotaSelect.find('option[value="' + quota + '"]').attr('selected', 'selected');
+			} else {
+				$quotaSelect.append('<option value="' + escapeHTML(quota) + '" selected="selected">' + escapeHTML(quota) + '</option>');
+			}
+		}
+		$tr.find('td.storageLocation').text(storageLocation);
+		if(lastLogin === 0) {
+			lastLogin = t('settings', 'never');
+		} else {
+			lastLogin = new Date(lastLogin * 1000);
+			lastLogin = relative_modified_date(lastLogin.getTime() / 1000);
+		}
+		$tr.find('td.lastLogin').text(lastLogin);
+		$tr.appendTo($userList);
+		if(UserList.isEmpty === true) {
+			//when the list was emptied, one row was left, necessary to keep
+			//add working and the layout unbroken. We need to remove this item
+			$tr.show();
+			$userListBody.find('tr:first').remove();
+			UserList.isEmpty = false;
+			UserList.checkUsersToLoad();
+		}
+		if (sort) {
+			UserList.doSort();
+		}
+
+		$quotaSelect.on('change', function () {
+			var uid = UserList.getUID(this);
+			var quota = $(this).val();
+			setQuota(uid, quota, function(returnedQuota){
+				if (quota !== returnedQuota) {
+					$($quotaSelect).find(':selected').text(returnedQuota);
+				}
+			});
+		});
+
+		// defer init so the user first sees the list appear more quickly
+		window.setTimeout(function(){
+			$quotaSelect.singleSelect();
+			UserList.applyGroupSelect(groupsSelect);
+			if (subadminSelect) {
+				UserList.applySubadminSelect(subadminSelect);
+			}
+		}, 0);
+		return $tr;
+	},
+	// From http://my.opera.com/GreyWyvern/blog/show.dml/1671288
+	alphanum: function(a, b) {
+		function chunkify(t) {
+			var tz = [], x = 0, y = -1, n = 0, i, j;
+
+			while (i = (j = t.charAt(x++)).charCodeAt(0)) {
+				var m = (i === 46 || (i >=48 && i <= 57));
+				if (m !== n) {
+					tz[++y] = "";
+					n = m;
+				}
+				tz[y] += j;
+			}
+			return tz;
+		}
+
+		var aa = chunkify(a.toLowerCase());
+		var bb = chunkify(b.toLowerCase());
+
+		for (var x = 0; aa[x] && bb[x]; x++) {
+			if (aa[x] !== bb[x]) {
+				var c = Number(aa[x]), d = Number(bb[x]);
+				if (c === aa[x] && d === bb[x]) {
+					return c - d;
+				} else {
+					return (aa[x] > bb[x]) ? 1 : -1;
+				}
+			}
+		}
+		return aa.length - bb.length;
+	},
+	preSortSearchString: function(a, b) {
+		var pattern = filter.getPattern();
+		if(typeof pattern === 'undefined') {
+			return undefined;
+		}
+		pattern = pattern.toLowerCase();
+		var aMatches = false;
+		var bMatches = false;
+		if(typeof a === 'string' && a.toLowerCase().indexOf(pattern) === 0) {
+			aMatches = true;
+		}
+		if(typeof b === 'string' && b.toLowerCase().indexOf(pattern) === 0) {
+			bMatches = true;
+		}
+
+		if((aMatches && bMatches) || (!aMatches && !bMatches)) {
+			return undefined;
+		}
+
+		if(aMatches) {
+			return -1;
+		} else {
+			return 1;
+		}
+	},
+	doSort: function() {
+		var rows = $userListBody.find('tr').get();
+
+		rows.sort(function(a, b) {
+			a = $(a).find('td.name').text();
+			b = $(b).find('td.name').text();
+			var firstSort = UserList.preSortSearchString(a, b);
+			if(typeof firstSort !== 'undefined') {
+				return firstSort;
+			}
+			return UserList.alphanum(a, b);
+		});
+
+		var items = [];
+		$.each(rows, function(index, row) {
+			items.push(row);
+			if(items.length === 100) {
+				$userListBody.append(items);
+				items = [];
+			}
+		});
+		if(items.length > 0) {
+			$userListBody.append(items);
+		}
+	},
+	checkUsersToLoad: function() {
+		//30 shall be loaded initially, from then on always 10 upon scrolling
+		if(UserList.isEmpty === false) {
+			UserList.usersToLoad = 10;
+		} else {
+			UserList.usersToLoad = 30;
+		}
+	},
+	empty: function() {
+		//one row needs to be kept, because it is cloned to add new rows
+		$userListBody.find('tr:not(:first)').remove();
+		var $tr = $userListBody.find('tr:first');
+		$tr.hide();
+		//on an update a user may be missing when the username matches with that
+		//of the hidden row. So change this to a random string.
+		$tr.data('uid', Math.random().toString(36).substring(2));
+		UserList.isEmpty = true;
+		UserList.offset = 0;
+		UserList.checkUsersToLoad();
+	},
+	hide: function(uid) {
+		UserList.getRow(uid).hide();
+	},
+	show: function(uid) {
+		UserList.getRow(uid).show();
+	},
+	remove: function(uid) {
+		UserList.getRow(uid).remove();
+	},
+	has: function(uid) {
+		return UserList.getRow(uid).length > 0;
+	},
+	getRow: function(uid) {
+		return $userListBody.find('tr').filter(function(){
+			return UserList.getUID(this) === uid;
+		});
+	},
+	getUID: function(element) {
+		return ($(element).closest('tr').data('uid') || '').toString();
+	},
+	getDisplayName: function(element) {
+		return ($(element).closest('tr').data('displayname') || '').toString();
+	},
+	initDeleteHandling: function() {
+		//set up handler
+		UserDeleteHandler = new DeleteHandler('removeuser.php', 'username',
+											UserList.hide, UserList.remove);
+
+		//configure undo
+		OC.Notification.hide();
+		var msg = t('settings', 'deleted') + ' %oid <span class="undo">' +
+			t('settings', 'undo') + '</span>';
+		UserDeleteHandler.setNotification(OC.Notification, 'deleteuser', msg,
+										UserList.show);
+
+		//when to mark user for delete
+		$userListBody.on('click', '.delete', function () {
+			// Call function for handling delete/undo
+			var uid = UserList.getUID(this);
+			UserDeleteHandler.mark(uid);
+		});
+
+		//delete a marked user when leaving the page
+		$(window).on('beforeunload', function () {
+			UserDeleteHandler.delete();
+		});
+	},
+	update: function (gid) {
+		if (UserList.updating) {
+			return;
+		}
+		$userList.siblings('.loading').css('visibility', 'visible');
+		UserList.updating = true;
+		if(gid === undefined) {
+			gid = '';
+		}
+		UserList.currentGid = gid;
+		var pattern = filter.getPattern();
+		$.get(
+			OC.generateUrl('/settings/ajax/userlist'),
+			{ offset: UserList.offset, limit: UserList.usersToLoad, gid: gid, pattern: pattern },
+			function (result) {
+				var loadedUsers = 0;
+				var trs = [];
+				if (result.status === 'success') {
+					//The offset does not mirror the amount of users available,
+					//because it is backend-dependent. For correct retrieval,
+					//always the limit(requested amount of users) needs to be added.
+					$.each(result.data, function (index, user) {
+						if(UserList.has(user.name)) {
+							return true;
+						}
+						var $tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, user.storageLocation, user.lastLogin, false);
+						$tr.addClass('appear transparent');
+						trs.push($tr);
+						loadedUsers++;
+					});
+					if (result.data.length > 0) {
+						UserList.doSort();
+						$userList.siblings('.loading').css('visibility', 'hidden');
+					}
+					else {
+						UserList.noMoreEntries = true;
+						$userList.siblings('.loading').remove();
+					}
+					UserList.offset += loadedUsers;
+					// animate
+					setTimeout(function() {
+						for (var i = 0; i < trs.length; i++) {
+							trs[i].removeClass('transparent');
+						}
+					}, 0);
+				}
+				UserList.updating = false;
+		});
+	},
+
+	applyGroupSelect: function (element) {
+		var checked = [];
+		var $element = $(element);
+		var user = UserList.getUID($element);
+
+		if ($element.data('user-groups')) {
+			checked = $element.data('user-groups');
+		}
+		var checkHandler = null;
+		if(user) { // Only if in a user row, and not the #newusergroups select
+			checkHandler = function (group) {
+				if (user === OC.currentUser && group === 'admin') {
+					return false;
+				}
+				if (!oc_isadmin && checked.length === 1 && checked[0] === group) {
+					return false;
+				}
+				$.post(
+					OC.filePath('settings', 'ajax', 'togglegroups.php'),
+					{
+						username: user,
+						group: group
+					},
+					function (response) {
+						if (response.status === 'success') {
+							GroupList.update();
+							if (UserList.availableGroups.indexOf(response.data.groupname) === -1 &&
+								response.data.action === 'add'
+							) {
+								UserList.availableGroups.push(response.data.groupname);
+							}
+						}
+						if (response.data.message) {
+							OC.Notification.show(response.data.message);
+						}
+					}
+				);
+			}
+		};
+		var addGroup = function (select, group) {
+			$('select[multiple]').each(function (index, element) {
+				$element = $(element);
+				if ($element.find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $element.data('msid')) {
+					$element.append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
+				}
+			});
+			GroupList.addGroup(escapeHTML(group));
+		};
+		var label;
+		if (oc_isadmin) {
+			label = t('settings', 'add group');
+		}
+		else {
+			label = null;
+		}
+		$element.multiSelect({
+			createCallback: addGroup,
+			createText: label,
+			selectedFirst: true,
+			checked: checked,
+			oncheck: checkHandler,
+			onuncheck: checkHandler,
+			minWidth: 100
+		});
+	},
+
+	applySubadminSelect: function (element) {
+		var checked = [];
+		var $element = $(element);
+		var user = UserList.getUID($element);
+
+		if ($element.data('subadmin')) {
+			checked = $element.data('subadmin');
+		}
+		var checkHandler = function (group) {
+			if (group === 'admin') {
+				return false;
+			}
+			$.post(
+				OC.filePath('settings', 'ajax', 'togglesubadmins.php'),
+				{
+					username: user,
+					group: group
+				},
+				function () {
+				}
+			);
+		};
+
+		var addSubAdmin = function (group) {
+			$('select[multiple]').each(function (index, element) {
+				if ($(element).find('option[value="' + group + '"]').length === 0) {
+					$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
+				}
+			});
+		};
+		$element.multiSelect({
+			createCallback: addSubAdmin,
+			createText: null,
+			checked: checked,
+			oncheck: checkHandler,
+			onuncheck: checkHandler,
+			minWidth: 100
+		});
+	},
+
+	_onScroll: function() {
+		if (!!UserList.noMoreEntries) {
+			return;
+		}
+		if (UserList.scrollArea.scrollTop() + UserList.scrollArea.height() > UserList.scrollArea.get(0).scrollHeight - 500) {
+			UserList.update(UserList.currentGid, true);
+		}
+	}
+};
+
+function setQuota (uid, quota, ready) {
+	$.post(
+		OC.filePath('settings', 'ajax', 'setquota.php'),
+		{username: uid, quota: quota},
+		function (result) {
+			if (ready) {
+				ready(result.data.quota);
+			}
+		}
+	);
+}
+
+$(document).ready(function () {
+	$userList = $('#userlist');
+	$userListBody = $userList.find('tbody');
+
+	UserList.initDeleteHandling();
+
+	// Implements User Search
+	filter = new UserManagementFilter($('#usersearchform input'), UserList, GroupList);
+
+	UserList.doSort();
+	UserList.availableGroups = $userList.data('groups');
+
+
+	UserList.scrollArea = $('#app-content');
+	UserList.scrollArea.scroll(function(e) {UserList._onScroll(e);});
+
+
+	$userList.after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>'));
+
+	$('.groupsselect').each(function (index, element) {
+		UserList.applyGroupSelect(element);
+	});
+	$('.subadminsselect').each(function (index, element) {
+		UserList.applySubadminSelect(element);
+	});
+
+	$userListBody.on('click', '.password', function (event) {
+		event.stopPropagation();
+
+		var $td = $(this).closest('td');
+		var uid = UserList.getUID($td);
+		var $input = $('<input type="password">');
+		$td.find('img').hide();
+		$td.children('span').replaceWith($input);
+		$input
+			.focus()
+			.keypress(function (event) {
+				if (event.keyCode === 13) {
+					if ($(this).val().length > 0) {
+						var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
+						$.post(
+							OC.generateUrl('/settings/users/changepassword'),
+							{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
+							function (result) {
+								if (result.status != 'success') {
+									OC.Notification.show(t('admin', result.data.message));
+								}
+							}
+						);
+						$input.blur();
+					} else {
+						$input.blur();
+					}
+				}
+			})
+			.blur(function () {
+				$(this).replaceWith($('<span>●●●●●●●</span>'));
+				$td.find('img').show();
+			});
+	});
+	$('input:password[id="recoveryPassword"]').keyup(function() {
+		OC.Notification.hide();
+	});
+
+	$userListBody.on('click', '.displayName', function (event) {
+		event.stopPropagation();
+		var $td = $(this).closest('td');
+		var $tr = $td.closest('tr');
+		var uid = UserList.getUID($td);
+		var displayName = escapeHTML(UserList.getDisplayName($td));
+		var $input = $('<input type="text" value="' + displayName + '">');
+		$td.find('img').hide();
+		$td.children('span').replaceWith($input);
+		$input
+			.focus()
+			.keypress(function (event) {
+				if (event.keyCode === 13) {
+					if ($(this).val().length > 0) {
+						$tr.find('.avatardiv').imageplaceholder(uid, displayName);
+						$.post(
+							OC.filePath('settings', 'ajax', 'changedisplayname.php'),
+							{username: uid, displayName: $(this).val()},
+							function (result) {
+								if (result && result.status==='success'){
+									$tr.find('.avatardiv').avatar(result.data.username, 32);
+								}
+							}
+						);
+						$input.blur();
+					} else {
+						$input.blur();
+					}
+				}
+			})
+			.blur(function () {
+				var displayName = $input.val();
+				$tr.data('displayname', displayName);
+				$input.replaceWith('<span>' + escapeHTML(displayName) + '</span>');
+				$td.find('img').show();
+			});
+	});
+
+	$('#default_quota, .quota-user').singleSelect().on('change', function () {
+		var $select = $(this);
+		var uid = UserList.getUID($select);
+		var quota = $select.val();
+		setQuota(uid, quota, function(returnedQuota){
+			if (quota !== returnedQuota) {
+				$select.find(':selected').text(returnedQuota);
+			}
+		});
+	});
+
+	$('#newuser').submit(function (event) {
+		event.preventDefault();
+		var username = $('#newusername').val();
+		var password = $('#newuserpassword').val();
+		if ($.trim(username) === '') {
+			OC.dialogs.alert(
+				t('settings', 'A valid username must be provided'),
+				t('settings', 'Error creating user'));
+			return false;
+		}
+		if ($.trim(password) === '') {
+			OC.dialogs.alert(
+				t('settings', 'A valid password must be provided'),
+				t('settings', 'Error creating user'));
+			return false;
+		}
+		var groups = $('#newusergroups').val();
+		$('#newuser').get(0).reset();
+		$.post(
+			OC.filePath('settings', 'ajax', 'createuser.php'),
+			{
+				username: username,
+				password: password,
+				groups: groups
+			},
+			function (result) {
+				if (result.status !== 'success') {
+					OC.dialogs.alert(result.data.message,
+						t('settings', 'Error creating user'));
+				} else {
+					if (result.data.groups) {
+						var addedGroups = result.data.groups;
+						UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups));
+					}
+					if (result.data.homeExists){
+						OC.Notification.hide();
+						OC.Notification.show(t('settings', 'Warning: Home directory for user "{user}" already exists', {user: result.data.username}));
+						if (UserList.notificationTimeout){
+							window.clearTimeout(UserList.notificationTimeout);
+						}
+						UserList.notificationTimeout = window.setTimeout(
+							function(){
+								OC.Notification.hide();
+								UserList.notificationTimeout = null;
+							}, 10000);
+					}
+					if(!UserList.has(username)) {
+						UserList.add(username, username, result.data.groups, null, 'default', result.data.storageLocation, 0, true);
+					}
+				}
+			}
+		);
+	});
+
+});
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 719129d6be2..9be19f04fca 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -52,10 +52,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت.",
 "deleted" => "تم الحذف",
 "undo" => "تراجع",
-"Unable to remove user" => "تعذر حذف المستخدم",
 "Groups" => "مجموعات",
 "Group Admin" => "مدير المجموعة",
 "Delete" => "إلغاء",
+"never" => "بتاتا",
 "add group" => "اضافة مجموعة",
 "A valid username must be provided" => "يجب ادخال اسم مستخدم صحيح",
 "Error creating user" => "حصل خطأ اثناء انشاء مستخدم",
@@ -99,7 +99,6 @@ $TRANSLATIONS = array(
 "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" => "السماح للمستعمينٍ لإعادة المشاركة فقط مع المستعملين في مجموعاتهم",
-"Allow mail notification" => "السماح بتنبيهات البريد الالكتروني.",
 "Security" => "حماية",
 "Enforce HTTPS" => "فرض HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "اجبار العميل للاتصال بـ %s عن طريق اتصال مشفر",
@@ -119,6 +118,7 @@ $TRANSLATIONS = array(
 "Documentation:" => "التوثيق",
 "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>",
+"All" => "الكل",
 "Administrator Documentation" => "كتاب توثيق المدير",
 "Online Documentation" => "توثيق متوفر على الشبكة",
 "Forum" => "منتدى",
@@ -153,12 +153,13 @@ $TRANSLATIONS = array(
 "Create" => "انشئ",
 "Admin Recovery Password" => "استعادة كلمة المرور للمسؤول",
 "Enter the recovery password in order to recover the users files during password change" => "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور",
-"Default Storage" => "وحدة التخزين الافتراضية",
+"Group" => "مجموعة",
+"Default Quota" => "الحصة النسبية الإفتراضية",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "يرجى ادخال تخزين quota (مثل:\"512 MB\" او  \"12 GB\")",
 "Unlimited" => "غير محدود",
 "Other" => "شيء آخر",
 "Username" => "إسم المستخدم",
-"Storage" => "وحدة التخزين",
+"Quota" => "حصه",
 "change full name" => "تغيير اسمك الكامل",
 "set new password" => "اعداد كلمة مرور جديدة",
 "Default" => "افتراضي"
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
index fd7a6146972..0513589482f 100644
--- a/settings/l10n/ast.php
+++ b/settings/l10n/ast.php
@@ -61,12 +61,13 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
 "Delete encryption keys permanently." => "Desanciar dafechu les claves de cifráu.",
 "Restore encryption keys." => "Restaurar claves de cifráu.",
+"Unable to delete " => "Nun pue desaniciase",
 "deleted" => "desaniciáu",
 "undo" => "desfacer",
-"Unable to remove user" => "Imposible desaniciar al usuariu",
 "Groups" => "Grupos",
 "Group Admin" => "Alministrador del Grupu",
 "Delete" => "Desaniciar",
+"never" => "enxamás",
 "add group" => "amestar Grupu",
 "A valid username must be provided" => "Tien d'apurrise un nome d'usuariu válidu",
 "Error creating user" => "Fallu al crear usuariu",
@@ -121,7 +122,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Permitir a los usuarios compartir de nuevu elementos ya compartíos",
 "Allow users to share with anyone" => "Permitir a los usuarios compartir con cualesquier persona",
 "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir namái colos usuarios nos sos grupos",
-"Allow mail notification" => "Permitir notificaciones per corréu-e",
 "Allow users to send mail notification for shared files" => "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos",
 "Security" => "Seguridá",
 "Enforce HTTPS" => "Forciar HTTPS",
@@ -130,6 +130,7 @@ $TRANSLATIONS = array(
 "Email Server" => "Sirvidor de corréu-e",
 "This is used for sending out notifications." => "Esto úsase pa unviar notificaciones.",
 "From address" => "Dende la direición",
+"mail" => "corréu",
 "Authentication required" => "Necesítase autenticación",
 "Server address" => "Direición del sirvidor",
 "Port" => "Puertu",
@@ -151,6 +152,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Ver la páxina d'aplicaciones en apps.owncloud.com",
 "See application website" => "Ver sitiu web de l'aplicación",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-llicencia otorgada por <span class=\"author\"></span>",
+"All" => "Toos",
 "Administrator Documentation" => "Documentación d'alministrador",
 "Online Documentation" => "Documentación en llinia",
 "Forum" => "Foru",
@@ -188,12 +190,15 @@ $TRANSLATIONS = array(
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de la contraseña d'alministración",
 "Enter the recovery password in order to recover the users files during password change" => "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
-"Default Storage" => "Almacenamientu predetermináu",
+"Add Group" => "Amestar grupu",
+"Group" => "Grupu",
+"Everyone" => "Toos",
+"Admins" => "Almins",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor indica la cuota d'almacenamientu (ex: \"512 MB\" o \"12 GB\")",
 "Unlimited" => "Non llendáu",
 "Other" => "Otru",
 "Username" => "Nome d'usuariu",
-"Storage" => "Almacenamientu",
+"Last Login" => "Aniciu de sesión caberu",
 "change full name" => "camudar el nome completu",
 "set new password" => "afitar nueva contraseña",
 "Default" => "Predetermináu"
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 9573343a1d6..93529b3a3c8 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -24,6 +24,7 @@ $TRANSLATIONS = array(
 "undo" => "възтановяване",
 "Groups" => "Групи",
 "Delete" => "Изтриване",
+"never" => "никога",
 "add group" => "нова група",
 "__language_name__" => "__language_name__",
 "None" => "Няма",
@@ -56,11 +57,11 @@ $TRANSLATIONS = array(
 "Help translate" => "Помогнете с превода",
 "Login Name" => "Потребител",
 "Create" => "Създаване",
-"Default Storage" => "Хранилище по подразбиране",
+"Default Quota" => "Квота по подразбиране",
 "Unlimited" => "Неограничено",
 "Other" => "Други",
 "Username" => "Потребител",
-"Storage" => "Хранилище",
+"Quota" => "Квота",
 "Default" => "По подразбиране"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index a782a53bca1..a5f52992ebe 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -24,6 +24,7 @@ $TRANSLATIONS = array(
 "Groups" => "গোষ্ঠীসমূহ",
 "Group Admin" => "গোষ্ঠী প্রশাসক",
 "Delete" => "মুছে",
+"never" => "কখনোই নয়",
 "__language_name__" => "__language_name__",
 "None" => "কোনটিই নয়",
 "Login" => "প্রবেশ",
@@ -59,11 +60,9 @@ $TRANSLATIONS = array(
 "Help translate" => "অনুবাদ করতে সহায়তা করুন",
 "Login Name" => "প্রবেশ",
 "Create" => "তৈরী কর",
-"Default Storage" => "পূর্বনির্ধারিত সংরক্ষণাগার",
 "Unlimited" => "অসীম",
 "Other" => "অন্যান্য",
 "Username" => "ব্যবহারকারী",
-"Storage" => "সংরক্ষণাগার",
 "Default" => "পূর্বনির্ধারিত"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index a1e6c25bbf5..c2ba3c7403f 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -58,10 +58,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Desencriptant fitxers... Espereu, això pot trigar una estona.",
 "deleted" => "esborrat",
 "undo" => "desfés",
-"Unable to remove user" => "No s'ha pogut eliminar l'usuari",
 "Groups" => "Grups",
 "Group Admin" => "Grup Admin",
 "Delete" => "Esborra",
+"never" => "mai",
 "add group" => "afegeix grup",
 "A valid username must be provided" => "Heu de facilitar un nom d'usuari vàlid",
 "Error creating user" => "Error en crear l'usuari",
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Permet als usuaris compartir de nou elements ja compartits amb ells",
 "Allow users to share with anyone" => "Permet compartir amb qualsevol",
 "Allow users to only share with users in their groups" => "Permet als usuaris compartir només amb els usuaris del seu grup",
-"Allow mail notification" => "Permet notificacions per correu electrónic",
 "Security" => "Seguretat",
 "Enforce HTTPS" => "Força HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Força la connexió dels clients a %s a través d'una connexió encriptada.",
@@ -141,6 +140,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
 "See application website" => "Mostra la web de l'aplicació",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>",
+"All" => "Tots",
 "Administrator Documentation" => "Documentació d'administrador",
 "Online Documentation" => "Documentació en línia",
 "Forum" => "Fòrum",
@@ -176,12 +176,13 @@ $TRANSLATIONS = array(
 "Create" => "Crea",
 "Admin Recovery Password" => "Recuperació de contrasenya d'administrador",
 "Enter the recovery password in order to recover the users files during password change" => "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
-"Default Storage" => "Emmagatzemament per defecte",
+"Group" => "Grup",
+"Default Quota" => "Quota per defecte",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Escriviu la quota d'emmagatzemament (per ex.: \"512 MB\" o \"12 GB\")",
 "Unlimited" => "Il·limitat",
 "Other" => "Un altre",
 "Username" => "Nom d'usuari",
-"Storage" => "Emmagatzemament",
+"Quota" => "Quota",
 "change full name" => "canvia el nom complet",
 "set new password" => "estableix nova contrasenya",
 "Default" => "Per defecte"
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 2b68fa87792..e2ff2bbeaaf 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -64,10 +64,10 @@ $TRANSLATIONS = array(
 "Restore encryption keys." => "Obnovit šifrovací klíče",
 "deleted" => "smazáno",
 "undo" => "vrátit zpět",
-"Unable to remove user" => "Nelze odebrat uživatele",
 "Groups" => "Skupiny",
 "Group Admin" => "Správa skupiny",
 "Delete" => "Smazat",
+"never" => "nikdy",
 "add group" => "přidat skupinu",
 "A valid username must be provided" => "Musíte zadat platné uživatelské jméno",
 "Error creating user" => "Chyba při vytváření užiatele",
@@ -123,7 +123,6 @@ $TRANSLATIONS = array(
 "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",
-"Allow mail notification" => "Povolit e-mailová upozornění",
 "Allow users to send mail notification for shared files" => "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory",
 "Exclude groups from sharing" => "Vyjmout skupiny ze sdílení",
 "These groups will still be able to receive shares, but not to initiate them." => "Těmto skupinám bude stále možno sdílet, nemohou ale sami sdílet ostatním.",
@@ -155,6 +154,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Více na stránce s aplikacemi na apps.owncloud.com",
 "See application website" => "Prohlédněte si webovou stránku aplikace",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>",
+"All" => "Vše",
 "Administrator Documentation" => "Dokumentace správce",
 "Online Documentation" => "Online dokumentace",
 "Forum" => "Fórum",
@@ -193,12 +193,13 @@ $TRANSLATIONS = array(
 "Create" => "Vytvořit",
 "Admin Recovery Password" => "Heslo obnovy správce",
 "Enter the recovery password in order to recover the users files during password change" => "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
-"Default Storage" => "Výchozí úložiště",
+"Group" => "Skupina",
+"Default Quota" => "Výchozí kvóta",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Zvolte prosím kvótu pro úložiště (např. \"512 MB\" nebo \"12 GB\")",
 "Unlimited" => "Neomezeně",
 "Other" => "Jiný",
 "Username" => "Uživatelské jméno",
-"Storage" => "Úložiště",
+"Quota" => "Kvóta",
 "change full name" => "změnit celé jméno",
 "set new password" => "nastavit nové heslo",
 "Default" => "Výchozí"
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
index 5beeeadae96..b99541b6cf5 100644
--- a/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
 "undo" => "dadwneud",
 "Groups" => "Grwpiau",
 "Delete" => "Dileu",
+"never" => "byth",
 "None" => "Dim",
 "Login" => "Mewngofnodi",
 "Security Warning" => "Rhybudd Diogelwch",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index e37b776dc2c..e5cfe0412ce 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -49,10 +49,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
 "deleted" => "Slettet",
 "undo" => "fortryd",
-"Unable to remove user" => "Kan ikke fjerne bruger",
 "Groups" => "Grupper",
 "Group Admin" => "Gruppe Administrator",
 "Delete" => "Slet",
+"never" => "aldrig",
 "add group" => "Tilføj gruppe",
 "A valid username must be provided" => "Et gyldigt brugernavn skal angives",
 "Error creating user" => "Fejl ved oprettelse af bruger",
@@ -101,7 +101,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Tillad brugere at dele elementer delt med dem igen",
 "Allow users to share with anyone" => "Tillad brugere at dele med alle",
 "Allow users to only share with users in their groups" => "Tillad brugere at kun dele med brugerne i deres grupper",
-"Allow mail notification" => "Tillad mail underretninger",
 "Security" => "Sikkerhed",
 "Enforce HTTPS" => "Gennemtving HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
@@ -128,6 +127,7 @@ $TRANSLATIONS = array(
 "Documentation:" => "Dokumentation:",
 "See application page at apps.owncloud.com" => "Se applikationens side på apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>",
+"All" => "Alle",
 "Administrator Documentation" => "Administrator Dokumentation",
 "Online Documentation" => "Online dokumentation",
 "Forum" => "Forum",
@@ -162,12 +162,13 @@ $TRANSLATIONS = array(
 "Create" => "Ny",
 "Admin Recovery Password" => "Administrator gendannelse kodeord",
 "Enter the recovery password in order to recover the users files during password change" => "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
-"Default Storage" => "Standard opbevaring",
+"Group" => "Gruppe",
+"Default Quota" => "Standard kvote",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Indtast venligst lagerkvote (f.eks. \"512 MB\" eller \"12 GB\")",
 "Unlimited" => "Ubegrænset",
 "Other" => "Andet",
 "Username" => "Brugernavn",
-"Storage" => "Opbevaring",
+"Quota" => "Kvote",
 "change full name" => "ændre fulde navn",
 "set new password" => "skift kodeord",
 "Default" => "Standard"
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index eb32555701f..4eed8bfc51b 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -62,12 +62,15 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
 "Delete encryption keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen.",
 "Restore encryption keys." => "Verschlüsselungsschlüssel wiederherstellen.",
+"Unable to delete " => "Löschen nicht möglich",
+"Error creating group" => "Fehler beim Erstellen der Gruppe",
+"A valid group name must be provided" => "Ein gültiger Gruppenname muss angegeben werden",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
-"Unable to remove user" => "Benutzer konnte nicht entfernt werden.",
 "Groups" => "Gruppen",
 "Group Admin" => "Gruppenadministrator",
 "Delete" => "Löschen",
+"never" => "niemals",
 "add group" => "Gruppe hinzufügen",
 "A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
 "Error creating user" => "Beim Anlegen des Benutzers ist ein Fehler aufgetreten",
@@ -91,6 +94,10 @@ $TRANSLATIONS = array(
 "Setup Warning" => "Einrichtungswarnung",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Bitte prüfe nochmals die <a href=\"%s\">Installationsanleitungen</a>.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
+"Database Performance Info" => "Info zur Datenbankperformance",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden.",
 "Module 'fileinfo' missing" => "Modul 'fileinfo' fehlt ",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.",
 "Your PHP version is outdated" => "Deine PHP-Version ist veraltet",
@@ -123,7 +130,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
 "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
 "Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen",
-"Allow mail notification" => "Mail-Benachrichtigung erlauben",
 "Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
 "Exclude groups from sharing" => "Gruppen von Freigaben ausschließen",
 "These groups will still be able to receive shares, but not to initiate them." => "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
@@ -156,6 +162,8 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Weitere Anwendungen findest Du auf apps.owncloud.com",
 "See application website" => "Siehe Anwendungs-Website",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
+"Enable only for specific groups" => "Nur für spezifizierte Gruppen aktivieren",
+"All" => "Alle",
 "Administrator Documentation" => "Dokumentation für Administratoren",
 "Online Documentation" => "Online-Dokumentation",
 "Forum" => "Forum",
@@ -194,12 +202,19 @@ $TRANSLATIONS = array(
 "Create" => "Anlegen",
 "Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
 "Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-"Default Storage" => "Standard-Speicher",
+"Search Users and Groups" => "Nutzer und Gruppen suchen",
+"Add Group" => "Gruppe hinzufügen",
+"Group" => "Gruppe",
+"Everyone" => "Jeder",
+"Admins" => "Administratoren",
+"Default Quota" => "Standard-Quota",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")",
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
 "Username" => "Benutzername",
-"Storage" => "Speicher",
+"Quota" => "Quota",
+"Storage Location" => "Speicherort",
+"Last Login" => "Letzte Anmeldung",
 "change full name" => "Vollständigen Namen ändern",
 "set new password" => "Neues Passwort setzen",
 "Default" => "Standard"
diff --git a/settings/l10n/de_AT.php b/settings/l10n/de_AT.php
index d31b9ad151a..c1542941577 100644
--- a/settings/l10n/de_AT.php
+++ b/settings/l10n/de_AT.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Invalid request" => "Fehlerhafte Anfrage",
 "Delete" => "Löschen",
+"never" => "niemals",
 "__language_name__" => "Deutsch (Österreich)",
 "Server address" => "Adresse des Servers",
 "Password" => "Passwort",
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index 77d22684429..4174f36a594 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -31,10 +31,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
-"Unable to remove user" => "Der Benutzer konnte nicht entfernt werden.",
 "Groups" => "Gruppen",
 "Group Admin" => "Gruppenadministrator",
 "Delete" => "Löschen",
+"never" => "niemals",
 "add group" => "Gruppe hinzufügen",
 "A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
 "Error creating user" => "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
@@ -80,6 +80,7 @@ $TRANSLATIONS = array(
 "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>",
+"All" => "Alle",
 "Administrator Documentation" => "Dokumentation für Administratoren",
 "Online Documentation" => "Online-Dokumentation",
 "Forum" => "Forum",
@@ -105,11 +106,9 @@ $TRANSLATIONS = array(
 "Create" => "Erstellen",
 "Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
 "Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-"Default Storage" => "Standard-Speicher",
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
 "Username" => "Benutzername",
-"Storage" => "Speicher",
 "set new password" => "Neues Passwort setzen",
 "Default" => "Standard"
 );
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 16c4ed8a175..793d141a165 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -62,12 +62,15 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
 "Delete encryption keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen.",
 "Restore encryption keys." => "Verschlüsselungsschlüssel wiederherstellen.",
+"Unable to delete " => "Löschen nicht möglich",
+"Error creating group" => "Fehler beim Erstellen der Gruppe",
+"A valid group name must be provided" => "Ein gültiger Gruppenname muss angegeben werden",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
-"Unable to remove user" => "Der Benutzer konnte nicht entfernt werden.",
 "Groups" => "Gruppen",
 "Group Admin" => "Gruppenadministrator",
 "Delete" => "Löschen",
+"never" => "niemals",
 "add group" => "Gruppe hinzufügen",
 "A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
 "Error creating user" => "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
@@ -91,6 +94,10 @@ $TRANSLATIONS = array(
 "Setup Warning" => "Einrichtungswarnung",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Bitte prüfen Sie nochmals die <a href=\"%s\">Installationsanleitungen</a>.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
+"Database Performance Info" => "Info zur Datenbankperformance",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden.",
 "Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
 "Your PHP version is outdated" => "Ihre PHP-Version ist veraltet",
@@ -123,7 +130,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
 "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
 "Allow users to only share with users in their groups" => "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen",
-"Allow mail notification" => "Mail-Benachrichtigung erlauben",
 "Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
 "Exclude groups from sharing" => "Gruppen von Freigaben ausschließen",
 "These groups will still be able to receive shares, but not to initiate them." => "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
@@ -156,6 +162,8 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
 "See application website" => "Siehe Anwendungs-Website",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
+"Enable only for specific groups" => "Nur für spezifizierte Gruppen aktivieren",
+"All" => "Alle",
 "Administrator Documentation" => "Dokumentation für Administratoren",
 "Online Documentation" => "Online-Dokumentation",
 "Forum" => "Forum",
@@ -194,12 +202,19 @@ $TRANSLATIONS = array(
 "Create" => "Erstellen",
 "Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
 "Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-"Default Storage" => "Standard-Speicher",
+"Search Users and Groups" => "Nutzer und Gruppen suchen",
+"Add Group" => "Gruppe hinzufügen",
+"Group" => "Gruppe",
+"Everyone" => "Jeder",
+"Admins" => "Administratoren",
+"Default Quota" => "Standard-Quota",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")",
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
 "Username" => "Benutzername",
-"Storage" => "Speicher",
+"Quota" => "Quota",
+"Storage Location" => "Speicherort",
+"Last Login" => "Letzte Anmeldung",
 "change full name" => "Vollständigen Namen ändern",
 "set new password" => "Neues Passwort setzen",
 "Default" => "Standard"
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 03981cab6cd..f9822837a8c 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -64,10 +64,10 @@ $TRANSLATIONS = array(
 "Restore encryption keys." => "Επαναφορά των κλειδιών κρυπτογράφησης.",
 "deleted" => "διαγράφηκε",
 "undo" => "αναίρεση",
-"Unable to remove user" => "Αδυναμία αφαίρεση χρήστη",
 "Groups" => "Ομάδες",
 "Group Admin" => "Ομάδα Διαχειριστών",
 "Delete" => "Διαγραφή",
+"never" => "ποτέ",
 "add group" => "προσθήκη ομάδας",
 "A valid username must be provided" => "Πρέπει να δοθεί έγκυρο όνομα χρήστη",
 "Error creating user" => "Σφάλμα δημιουργίας χρήστη",
@@ -123,7 +123,6 @@ $TRANSLATIONS = array(
 "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" => "Επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας",
-"Allow mail notification" => "Επιτρέπονται ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
 "Allow users to send mail notification for shared files" => "Επιτρέψτε στους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία",
 "Exclude groups from sharing" => "Εξαίρεση ομάδων από τον διαμοιρασμό",
 "These groups will still be able to receive shares, but not to initiate them." => "Αυτές οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοιρασμούς, αλλά δεν θα είναι δυνατό να τους δημιουργήσουν.",
@@ -134,6 +133,7 @@ $TRANSLATIONS = array(
 "Email Server" => "Διακομιστής Email",
 "This is used for sending out notifications." => "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
 "From address" => "Από τη διεύθυνση",
+"mail" => "ταχυδρομείο",
 "Authentication required" => "Απαιτείται πιστοποίηση",
 "Server address" => "Διεύθυνση διακομιστή",
 "Port" => "Θύρα",
@@ -155,6 +155,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Δείτε την σελίδα εφαρμογών στο apps.owncloud.com",
 "See application website" => "Δείτε την ιστοσελίδα της εφαρμογής",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Άδεια χρήσης <span class=\"licence\"></span> από <span class=\"author\"></span>",
+"All" => "Όλες",
 "Administrator Documentation" => "Τεκμηρίωση Διαχειριστή",
 "Online Documentation" => "Τεκμηρίωση στο Διαδίκτυο",
 "Forum" => "Φόρουμ",
@@ -193,12 +194,13 @@ $TRANSLATIONS = array(
 "Create" => "Δημιουργία",
 "Admin Recovery Password" => "Κωδικός Επαναφοράς Διαχειριστή ",
 "Enter the recovery password in order to recover the users files during password change" => "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
-"Default Storage" => "Προκαθορισμένη Αποθήκευση ",
+"Group" => "Ομάδα",
+"Default Quota" => "Προεπιλεγμένο Όριο",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Παρακαλώ εισάγετε επιτρεπόμενα μερίδια αποθηκευτικού χώρου (π.χ. \"512 MB\"  ή \"12 GB\")",
 "Unlimited" => "Απεριόριστο",
 "Other" => "Άλλο",
 "Username" => "Όνομα χρήστη",
-"Storage" => "Αποθήκευση",
+"Quota" => "Σύνολο Χώρου",
 "change full name" => "αλλαγή πλήρους ονόματος",
 "set new password" => "επιλογή νέου κωδικού",
 "Default" => "Προκαθορισμένο"
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index ef3cc9bb519..a267093ab92 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -64,10 +64,10 @@ $TRANSLATIONS = array(
 "Restore encryption keys." => "Restore encryption keys.",
 "deleted" => "deleted",
 "undo" => "undo",
-"Unable to remove user" => "Unable to remove user",
 "Groups" => "Groups",
 "Group Admin" => "Group Admin",
 "Delete" => "Delete",
+"never" => "never",
 "add group" => "add group",
 "A valid username must be provided" => "A valid username must be provided",
 "Error creating user" => "Error creating user",
@@ -91,6 +91,8 @@ $TRANSLATIONS = array(
 "Setup Warning" => "Setup Warning",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Please double check the <a href=\"%s\">installation guides</a>.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
 "Module 'fileinfo' missing" => "Module 'fileinfo' missing",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.",
 "Your PHP version is outdated" => "Your PHP version is outdated",
@@ -123,7 +125,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Allow users to share items shared with them again",
 "Allow users to share with anyone" => "Allow users to share with anyone",
 "Allow users to only share with users in their groups" => "Allow users to only share with users in their groups",
-"Allow mail notification" => "Allow mail notification",
 "Allow users to send mail notification for shared files" => "Allow users to send mail notification for shared files",
 "Exclude groups from sharing" => "Exclude groups from sharing",
 "These groups will still be able to receive shares, but not to initiate them." => "These groups will still be able to receive shares, but not to initiate them.",
@@ -156,6 +157,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "See application page at apps.owncloud.com",
 "See application website" => "See application website",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
+"All" => "All",
 "Administrator Documentation" => "Administrator Documentation",
 "Online Documentation" => "Online Documentation",
 "Forum" => "Forum",
@@ -194,12 +196,11 @@ $TRANSLATIONS = array(
 "Create" => "Create",
 "Admin Recovery Password" => "Admin Recovery Password",
 "Enter the recovery password in order to recover the users files during password change" => "Enter the recovery password in order to recover the user's files during password change",
-"Default Storage" => "Default Storage",
+"Group" => "Group",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Please enter storage quota (e.g. \"512 MB\" or \"12 GB\")",
 "Unlimited" => "Unlimited",
 "Other" => "Other",
 "Username" => "Username",
-"Storage" => "Storage",
 "change full name" => "change full name",
 "set new password" => "set new password",
 "Default" => "Default"
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 775419b72dd..d1413e7d039 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -48,10 +48,10 @@ $TRANSLATIONS = array(
 "Restore encryption keys." => "Restaŭri ĉifroklavojn.",
 "deleted" => "forigita",
 "undo" => "malfari",
-"Unable to remove user" => "Ne eblis forigi la uzanton",
 "Groups" => "Grupoj",
 "Group Admin" => "Grupadministranto",
 "Delete" => "Forigi",
+"never" => "neniam",
 "add group" => "aldoni grupon",
 "A valid username must be provided" => "Valida uzantonomo devas proviziĝi",
 "Error creating user" => "Eraris kreo de uzanto",
@@ -77,7 +77,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili",
 "Allow users to share with anyone" => "Kapabligi uzantojn kunhavigi kun ĉiu ajn",
 "Allow users to only share with users in their groups" => "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj",
-"Allow mail notification" => "Permesi retpoŝtan sciigon",
 "Security" => "Sekuro",
 "Email Server" => "Retpoŝtoservilo",
 "From address" => "El adreso",
@@ -101,6 +100,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
 "See application website" => "Vidi la TTT-ejon de la aplikaĵo",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
+"All" => "Ĉio",
 "Administrator Documentation" => "Dokumentaro por administrantoj",
 "Online Documentation" => "Reta dokumentaro",
 "Forum" => "Forumo",
@@ -132,11 +132,12 @@ $TRANSLATIONS = array(
 "Delete Encryption Keys" => "Forigi ĉifroklavojn",
 "Login Name" => "Ensaluti",
 "Create" => "Krei",
-"Default Storage" => "Defaŭlta konservejo",
+"Group" => "Grupo",
+"Default Quota" => "Defaŭlta kvoto",
 "Unlimited" => "Senlima",
 "Other" => "Alia",
 "Username" => "Uzantonomo",
-"Storage" => "Konservejo",
+"Quota" => "Kvoto",
 "change full name" => "ŝanĝi plenan nomon",
 "set new password" => "agordi novan pasvorton",
 "Default" => "Defaŭlta"
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index e5069661f44..9398e3b29b4 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -64,10 +64,10 @@ $TRANSLATIONS = array(
 "Restore encryption keys." => "Restaurar claves de cifrado.",
 "deleted" => "eliminado",
 "undo" => "deshacer",
-"Unable to remove user" => "Imposible eliminar al usuario",
 "Groups" => "Grupos",
 "Group Admin" => "Administrador del Grupo",
 "Delete" => "Eliminar",
+"never" => "nunca",
 "add group" => "añadir Grupo",
 "A valid username must be provided" => "Se debe proporcionar un nombre de usuario válido",
 "Error creating user" => "Error al crear usuario",
@@ -91,6 +91,7 @@ $TRANSLATIONS = array(
 "Setup Warning" => "Advertencia de configuración",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Probablemente esto sea causado por un cache o acelerador, como por ejemplo Zend OPcache o eAccelerator.",
 "Module 'fileinfo' missing" => "No se ha encontrado el módulo \"fileinfo\"",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.",
 "Your PHP version is outdated" => "Su versión de PHP no está actualizada",
@@ -123,7 +124,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Permitir a los usuarios compartir de nuevo elementos ya compartidos",
 "Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquier persona",
 "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los usuarios en sus grupos",
-"Allow mail notification" => "Permitir notificaciones por correo electrónico",
 "Allow users to send mail notification for shared files" => "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos",
 "Exclude groups from sharing" => "Excluye grupos de compartir",
 "These groups will still be able to receive shares, but not to initiate them." => "Estos grupos aún podrán recibir contenidos compartidos, pero no podrán, pero no podrán iniciarlos.",
@@ -156,6 +156,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com",
 "See application website" => "Ver sitio web de la aplicación",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>",
+"All" => "Todos",
 "Administrator Documentation" => "Documentación de administrador",
 "Online Documentation" => "Documentación en línea",
 "Forum" => "Foro",
@@ -194,12 +195,13 @@ $TRANSLATIONS = array(
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de la contraseña de administración",
 "Enter the recovery password in order to recover the users files during password change" => "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
-"Default Storage" => "Almacenamiento predeterminado",
+"Group" => "Grupo",
+"Default Quota" => "Cuota predeterminada",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
 "Unlimited" => "Ilimitado",
 "Other" => "Otro",
 "Username" => "Nombre de usuario",
-"Storage" => "Almacenamiento",
+"Quota" => "Cuota",
 "change full name" => "cambiar el nombre completo",
 "set new password" => "establecer nueva contraseña",
 "Default" => "Predeterminado"
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index f212b842ed5..37f87bf3bfa 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -56,10 +56,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Desencriptando archivos... Por favor espere, esto puede tardar.",
 "deleted" => "borrado",
 "undo" => "deshacer",
-"Unable to remove user" => "Imposible borrar usuario",
 "Groups" => "Grupos",
 "Group Admin" => "Grupo Administrador",
 "Delete" => "Borrar",
+"never" => "nunca",
 "add group" => "agregar grupo",
 "A valid username must be provided" => "Debe ingresar un nombre de usuario válido",
 "Error creating user" => "Error creando usuario",
@@ -107,7 +107,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Permite a los usuarios volver a compartir items que les fueron compartidos",
 "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 sólo con los de sus mismos grupos",
-"Allow mail notification" => "Permitir notificaciones por correo",
 "Allow users to send mail notification for shared files" => "Habilitar a los usuarios para enviar notificaciones por correo para archivos compartidos",
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
@@ -137,6 +136,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Mirá la web de aplicaciones apps.owncloud.com",
 "See application website" => "Ver sitio web de la aplicación",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\">",
+"All" => "Todos",
 "Administrator Documentation" => "Documentación de Administrador",
 "Online Documentation" => "Documentación en línea",
 "Forum" => "Foro",
@@ -172,12 +172,13 @@ $TRANSLATIONS = array(
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de contraseña de administrador",
 "Enter the recovery password in order to recover the users files during password change" => "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña",
-"Default Storage" => "Almacenamiento Predeterminado",
+"Group" => "Grupo",
+"Default Quota" => "Cuota predeterminada",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor ingrese la cuota de almacenamiento (ej.: \"512 MB\" o \"12 GB\")",
 "Unlimited" => "Ilimitado",
 "Other" => "Otros",
 "Username" => "Nombre de usuario",
-"Storage" => "Almacenamiento",
+"Quota" => "Cuota",
 "change full name" => "Cambiar nombre completo",
 "set new password" => "Configurar nueva contraseña",
 "Default" => "Predeterminado"
diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php
index 84d0ffd9bd5..d3e4065b5c2 100644
--- a/settings/l10n/es_MX.php
+++ b/settings/l10n/es_MX.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
 "deleted" => "eliminado",
 "undo" => "deshacer",
-"Unable to remove user" => "Imposible eliminar al usuario",
 "Groups" => "Grupos",
 "Group Admin" => "Administrador del Grupo",
 "Delete" => "Eliminar",
+"never" => "nunca",
 "add group" => "añadir Grupo",
 "A valid username must be provided" => "Se debe proporcionar un nombre de usuario válido",
 "Error creating user" => "Error al crear usuario",
@@ -86,7 +86,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Permitir a los usuarios compartir de nuevo elementos ya compartidos",
 "Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquier persona",
 "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los usuarios en sus grupos",
-"Allow mail notification" => "Permitir notificaciones por correo electrónico",
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
@@ -104,6 +103,7 @@ $TRANSLATIONS = array(
 "Select an App" => "Seleccionar una aplicación",
 "See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>",
+"All" => "Todos",
 "Administrator Documentation" => "Documentación de administrador",
 "Online Documentation" => "Documentación en línea",
 "Forum" => "Foro",
@@ -138,12 +138,10 @@ $TRANSLATIONS = array(
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de la contraseña de administración",
 "Enter the recovery password in order to recover the users files during password change" => "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
-"Default Storage" => "Almacenamiento predeterminado",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
 "Unlimited" => "Ilimitado",
 "Other" => "Otro",
 "Username" => "Nombre de usuario",
-"Storage" => "Almacenamiento",
 "change full name" => "cambiar el nombre completo",
 "set new password" => "establecer nueva contraseña",
 "Default" => "Predeterminado"
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 7e85505bbc8..59002373e04 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -58,10 +58,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
 "deleted" => "kustutatud",
 "undo" => "tagasi",
-"Unable to remove user" => "Kasutaja eemaldamine ebaõnnestus",
 "Groups" => "Grupid",
 "Group Admin" => "Grupi admin",
 "Delete" => "Kustuta",
+"never" => "mitte kunagi",
 "add group" => "lisa grupp",
 "A valid username must be provided" => "Sisesta nõuetele vastav kasutajatunnus",
 "Error creating user" => "Viga kasutaja loomisel",
@@ -114,7 +114,6 @@ $TRANSLATIONS = array(
 "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",
-"Allow mail notification" => "Luba teavitused e-postiga",
 "Allow users to send mail notification for shared files" => "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta",
 "Security" => "Turvalisus",
 "Enforce HTTPS" => "Sunni peale HTTPS-i kasutamine",
@@ -144,6 +143,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com",
 "See application website" => "Vaata rakendi veebilehte",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>",
+"All" => "Kõik",
 "Administrator Documentation" => "Administraatori dokumentatsioon",
 "Online Documentation" => "Online dokumentatsioon",
 "Forum" => "Foorum",
@@ -179,12 +179,13 @@ $TRANSLATIONS = array(
 "Create" => "Lisa",
 "Admin Recovery Password" => "Admini parooli taastamine",
 "Enter the recovery password in order to recover the users files during password change" => "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
-"Default Storage" => "Vaikimisi maht",
+"Group" => "Grupp",
+"Default Quota" => "Vaikimisi kvoot",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Palun sisesta mahupiir (nt: \"512 MB\" või \"12 GB\")",
 "Unlimited" => "Piiramatult",
 "Other" => "Muu",
 "Username" => "Kasutajanimi",
-"Storage" => "Maht",
+"Quota" => "Mahupiir",
 "change full name" => "Muuda täispikka nime",
 "set new password" => "määra uus parool",
 "Default" => "Vaikeväärtus"
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 29e9e42abb1..f96733d0b1c 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -44,10 +44,10 @@ $TRANSLATIONS = array(
 "Strong password" => "Pasahitz sendoa",
 "deleted" => "ezabatuta",
 "undo" => "desegin",
-"Unable to remove user" => "Ezin izan da erabiltzailea aldatu",
 "Groups" => "Taldeak",
 "Group Admin" => "Talde administradorea",
 "Delete" => "Ezabatu",
+"never" => "inoiz",
 "add group" => "gehitu taldea",
 "A valid username must be provided" => "Baliozko erabiltzaile izena eman behar da",
 "Error creating user" => "Errore bat egon da erabiltzailea sortzean",
@@ -85,7 +85,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen",
 "Allow users to share with anyone" => "Baimendu erabiltzaileak edonorekin elkarbanatzen",
 "Allow users to only share with users in their groups" => "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen",
-"Allow mail notification" => "Baimendu posta bidezko jakinarazpenak",
 "Security" => "Segurtasuna",
 "Enforce HTTPS" => "Behartu HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu.",
@@ -104,6 +103,7 @@ $TRANSLATIONS = array(
 "Select an App" => "Aukeratu programa bat",
 "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>",
+"All" => "Denak",
 "Administrator Documentation" => "Administradore dokumentazioa",
 "Online Documentation" => "Online dokumentazioa",
 "Forum" => "Foroa",
@@ -137,12 +137,13 @@ $TRANSLATIONS = array(
 "Create" => "Sortu",
 "Admin Recovery Password" => "Kudeatzaile pasahitz berreskuratzea",
 "Enter the recovery password in order to recover the users files during password change" => "berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
-"Default Storage" => "Lehenetsitako Biltegiratzea",
+"Group" => "Taldea",
+"Default Quota" => "Kuota lehentsia",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Mesedez sartu biltegiratze kouta (adb: \"512 MB\" edo \"12 GB\")",
 "Unlimited" => "Mugarik gabe",
 "Other" => "Bestelakoa",
 "Username" => "Erabiltzaile izena",
-"Storage" => "Biltegiratzea",
+"Quota" => "Kuota",
 "change full name" => "aldatu izena",
 "set new password" => "ezarri pasahitz berria",
 "Default" => "Lehenetsia"
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 366f7ac6996..2575ff4e1a8 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -42,10 +42,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد.",
 "deleted" => "حذف شده",
 "undo" => "بازگشت",
-"Unable to remove user" => "حذف کاربر امکان پذیر نیست",
 "Groups" => "گروه ها",
 "Group Admin" => "گروه مدیران",
 "Delete" => "حذف",
+"never" => "هرگز",
 "add group" => "افزودن گروه",
 "A valid username must be provided" => "نام کاربری صحیح باید وارد شود",
 "Error creating user" => "خطا در ایجاد کاربر",
@@ -78,7 +78,6 @@ $TRANSLATIONS = array(
 "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" => "اجازه به کاربران برای اشتراک گذاری ، تنها با دیگر کابران گروه خودشان",
-"Allow mail notification" => "مجاز نمودن اطلاع رسانی توسط ایمیل",
 "Security" => "امنیت",
 "Enforce HTTPS" => "وادار کردن HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "کلاینت‌ها را مجبور کن که از یک ارتباط رمزنگاری شده برای اتصال به %s استفاده کنند.",
@@ -97,6 +96,7 @@ $TRANSLATIONS = array(
 "Select an App" => "یک برنامه انتخاب کنید",
 "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>",
+"All" => "همه",
 "Administrator Documentation" => "مستندات مدیر",
 "Online Documentation" => "مستندات آنلاین",
 "Forum" => "انجمن",
@@ -129,11 +129,11 @@ $TRANSLATIONS = array(
 "Create" => "ایجاد کردن",
 "Admin Recovery Password" => "مدیریت بازیابی رمز عبور",
 "Enter the recovery password in order to recover the users files during password change" => "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
-"Default Storage" => "ذخیره سازی پیش فرض",
+"Default Quota" => "سهم پیش فرض",
 "Unlimited" => "نامحدود",
 "Other" => "دیگر",
 "Username" => "نام کاربری",
-"Storage" => "حافظه",
+"Quota" => "سهم",
 "set new password" => "تنظیم کلمه عبور جدید",
 "Default" => "پیش فرض"
 );
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index c3fc3640275..144ebdad225 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -56,12 +56,15 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
 "Delete encryption keys permanently." => "Poista salausavaimet pysyvästi.",
 "Restore encryption keys." => "Palauta salausavaimet.",
+"Unable to delete " => "Poistaminen epäonnistui",
+"Error creating group" => "Virhe ryhmää luotaessa",
+"A valid group name must be provided" => "Anna kelvollinen ryhmän nimi",
 "deleted" => "poistettu",
 "undo" => "kumoa",
-"Unable to remove user" => "Käyttäjän poistaminen ei onnistunut",
 "Groups" => "Ryhmät",
 "Group Admin" => "Ryhmän ylläpitäjä",
 "Delete" => "Poista",
+"never" => "ei koskaan",
 "add group" => "lisää ryhmä",
 "A valid username must be provided" => "Anna kelvollinen käyttäjätunnus",
 "Error creating user" => "Virhe käyttäjää luotaessa",
@@ -82,6 +85,8 @@ $TRANSLATIONS = array(
 "Setup Warning" => "Asetusvaroitus",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web-palvelimen asetukset eivät ole kelvolliset tiedostojen synkronointia varten, koska WebDAV-liitäntä vaikuttaa olevan rikki.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Lue <a href=\"%s\">asennusohjeet</a> tarkasti.",
+"Database Performance Info" => "Tietokannan suorituskyvyn tiedot",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. Käytä komentorivityökalua 'occ db:convert-type' siirtyäksesi toiseen tietokantaan.",
 "Module 'fileinfo' missing" => "Moduuli 'fileinfo' puuttuu",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.",
 "Your PHP version is outdated" => "Käytössä oleva PHP-versio on vanhentunut",
@@ -110,7 +115,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Mahdollistaa käyttäjien jakavan uudelleen heidän kanssaan jaettuja kohteita",
 "Allow users to share with anyone" => "Salli käyttäjien jakaa kenen tahansa kanssa",
 "Allow users to only share with users in their groups" => "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken",
-"Allow mail notification" => "Salli sähköposti-ilmoitukset",
 "Allow users to send mail notification for shared files" => "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista",
 "Exclude groups from sharing" => "Kiellä ryhmiä jakamasta",
 "These groups will still be able to receive shares, but not to initiate them." => "Nämä ryhmät kykenevät vastaanottamaan jakoja, mutta eivät kuitenkaan itse pysty luoda jakoja.",
@@ -142,6 +146,8 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Katso sovellussivu osoitteessa apps.owncloud.com",
 "See application website" => "Lue lisää sovelluksen sivustolta",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>",
+"Enable only for specific groups" => "Salli vain tietyille ryhmille",
+"All" => "Kaikki",
 "Administrator Documentation" => "Ylläpito-ohjeistus",
 "Online Documentation" => "Verkko-ohjeistus",
 "Forum" => "Keskustelupalsta",
@@ -177,12 +183,19 @@ $TRANSLATIONS = array(
 "Delete Encryption Keys" => "Poista salausavaimet",
 "Login Name" => "Kirjautumisnimi",
 "Create" => "Luo",
-"Default Storage" => "Oletustallennustila",
+"Search Users and Groups" => "Etsi käyttäjiä ja ryhmiä",
+"Add Group" => "Lisää ryhmä",
+"Group" => "Ryhmä",
+"Everyone" => "Kaikki",
+"Admins" => "Ylläpitäjät",
+"Default Quota" => "Oletuskiintiö",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Määritä tallennustilan kiintiö (esim. \"512 MB\" tai \"12 GB\")",
 "Unlimited" => "Rajoittamaton",
 "Other" => "Muu",
 "Username" => "Käyttäjätunnus",
-"Storage" => "Tallennustila",
+"Quota" => "Kiintiö",
+"Storage Location" => "Tallennustilan sijainti",
+"Last Login" => "Viimeisin kirjautuminen",
 "change full name" => "muuta koko nimi",
 "set new password" => "aseta uusi salasana",
 "Default" => "Oletus"
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 37e73e0b809..58ddda4ffd2 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -64,10 +64,10 @@ $TRANSLATIONS = array(
 "Restore encryption keys." => "Restaurer les clés de chiffrement",
 "deleted" => "supprimé",
 "undo" => "annuler",
-"Unable to remove user" => "Impossible de retirer l'utilisateur",
 "Groups" => "Groupes",
 "Group Admin" => "Admin Groupe",
 "Delete" => "Supprimer",
+"never" => "jamais",
 "add group" => "ajouter un groupe",
 "A valid username must be provided" => "Un nom d'utilisateur valide doit être saisi",
 "Error creating user" => "Erreur lors de la création de l'utilisateur",
@@ -91,6 +91,7 @@ $TRANSLATIONS = array(
 "Setup Warning" => "Avertissement, problème de configuration",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Veuillez consulter à nouveau les <a href=\"%s\">guides d'installation</a>.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
 "Module 'fileinfo' missing" => "Module 'fileinfo' manquant",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers.",
 "Your PHP version is outdated" => "Votre version de PHP est trop ancienne",
@@ -123,7 +124,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec 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 à partager avec des utilisateurs de leur groupe uniquement",
-"Allow mail notification" => "Autoriser les notifications par couriel",
 "Allow users to send mail notification for shared files" => "Autoriser les utilisateurs à envoyer une notification par courriel concernant les fichiers partagés",
 "Exclude groups from sharing" => "Exclure  les groupes du partage",
 "These groups will still be able to receive shares, but not to initiate them." => "Ces groupes restent autorisés à partager, mais ne peuvent pas les initier",
@@ -156,6 +156,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Voir la page des applications à l'url apps.owncloud.com",
 "See application website" => "Voir le site web de l'application",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>",
+"All" => "Tous",
 "Administrator Documentation" => "Documentation administrateur",
 "Online Documentation" => "Documentation en ligne",
 "Forum" => "Forum",
@@ -194,12 +195,13 @@ $TRANSLATIONS = array(
 "Create" => "Créer",
 "Admin Recovery Password" => "Récupération du mot de passe administrateur",
 "Enter the recovery password in order to recover the users files during password change" => "Entrer le mot de passe de récupération dans le but de récupérer les fichiers utilisateurs pendant le changement de mot de passe",
-"Default Storage" => "Espace de stockage par défaut",
+"Group" => "Groupe",
+"Default Quota" => "Quota par défaut",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Veuillez entrer le quota de stockage (ex. \"512 MB\" ou \"12 GB\")",
 "Unlimited" => "Illimité",
 "Other" => "Autre",
 "Username" => "Nom d'utilisateur",
-"Storage" => "Espace de stockage",
+"Quota" => "Quota",
 "change full name" => "Modifier le nom complet",
 "set new password" => "Changer le mot de passe",
 "Default" => "Défaut"
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 056247b0076..aba604681da 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -62,12 +62,15 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Descifrando ficheiros... isto pode levar un anaco.",
 "Delete encryption keys permanently." => "Eliminar permanentemente as chaves de cifrado.",
 "Restore encryption keys." => "Restaurar as chaves de cifrado.",
+"Unable to delete " => "Non se pode eliminar",
+"Error creating group" => "Produciuse un erro ao crear o grupo",
+"A valid group name must be provided" => "Debe fornecer un nome de grupo",
 "deleted" => "eliminado",
 "undo" => "desfacer",
-"Unable to remove user" => "Non é posíbel retirar o usuario",
 "Groups" => "Grupos",
 "Group Admin" => "Grupo Admin",
 "Delete" => "Eliminar",
+"never" => "nunca",
 "add group" => "engadir un grupo",
 "A valid username must be provided" => "Debe fornecer un nome de usuario",
 "Error creating user" => "Produciuse un erro ao crear o usuario",
@@ -91,6 +94,10 @@ $TRANSLATIONS = array(
 "Setup Warning" => "Configurar os avisos",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Volva comprobar as <a href=\"%s\">guías de instalación</a>",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varios aplicativos sexan inaccesíbeis.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
+"Database Performance Info" => "Información do rendemento da base de datos",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto. Para migrar a outra base de datos use a ferramenta en liña de ordes: «occ db:convert-type»",
 "Module 'fileinfo' missing" => "Non se atopou o módulo «fileinfo»",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.",
 "Your PHP version is outdated" => "A versión de PHP está desactualizada",
@@ -123,7 +130,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Permitir que os usuarios compartan de novo os elementos compartidos con eles",
 "Allow users to share with anyone" => "Permitir que os usuarios compartan con calquera",
 "Allow users to only share with users in their groups" => "Permitir que os usuarios compartan só cos usuarios dos seus grupos",
-"Allow mail notification" => "Permitir o envío de notificacións por correo",
 "Allow users to send mail notification for shared files" => "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos",
 "Exclude groups from sharing" => "Excluír grupos da compartición",
 "These groups will still be able to receive shares, but not to initiate them." => "Estes grupos poderán recibir comparticións, mais non inicialas.",
@@ -156,6 +162,8 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Consulte a páxina do aplicativo en apps.owncloud.com",
 "See application website" => "Vexa o sitio web do aplicativo",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></span>",
+"Enable only for specific groups" => "Activar só para grupos específicos",
+"All" => "Todo",
 "Administrator Documentation" => "Documentación do administrador",
 "Online Documentation" => "Documentación na Rede",
 "Forum" => "Foro",
@@ -194,12 +202,19 @@ $TRANSLATIONS = array(
 "Create" => "Crear",
 "Admin Recovery Password" => "Contrasinal de recuperación do administrador",
 "Enter the recovery password in order to recover the users files during password change" => "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
-"Default Storage" => "Almacenamento predeterminado",
+"Search Users and Groups" => "Buscar usuarios e grupos",
+"Add Group" => "Engadir un grupo",
+"Group" => "Grupo",
+"Everyone" => "Todos",
+"Admins" => "Administradores",
+"Default Quota" => "Cota por omisión",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Introduza a cota de almacenamento (p.ex. «512 MB» ou «12 GB»)",
 "Unlimited" => "Sen límites",
 "Other" => "Outro",
 "Username" => "Nome de usuario",
-"Storage" => "Almacenamento",
+"Quota" => "Cota",
+"Storage Location" => "Localización do almacenamento",
+"Last Login" => "Último acceso",
 "change full name" => "Cambiar o nome completo",
 "set new password" => "estabelecer un novo contrasinal",
 "Default" => "Predeterminado"
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index b5e80155b82..6f317a9d887 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -28,10 +28,10 @@ $TRANSLATIONS = array(
 "Updated" => "מעודכן",
 "deleted" => "נמחק",
 "undo" => "ביטול",
-"Unable to remove user" => "לא ניתן להסיר את המשתמש",
 "Groups" => "קבוצות",
 "Group Admin" => "מנהל הקבוצה",
 "Delete" => "מחיקה",
+"never" => "לעולם לא",
 "add group" => "הוספת קבוצה",
 "A valid username must be provided" => "יש לספק שם משתמש תקני",
 "Error creating user" => "יצירת המשתמש נכשלה",
@@ -71,6 +71,7 @@ $TRANSLATIONS = array(
 "Select an App" => "בחירת יישום",
 "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>",
+"All" => "הכל",
 "Administrator Documentation" => "תיעוד מנהלים",
 "Online Documentation" => "תיעוד מקוון",
 "Forum" => "פורום",
@@ -94,11 +95,12 @@ $TRANSLATIONS = array(
 "Login Name" => "שם כניסה",
 "Create" => "יצירה",
 "Admin Recovery Password" => "ססמת השחזור של המנהל",
-"Default Storage" => "אחסון בררת המחדל",
+"Group" => "קבוצה",
+"Default Quota" => "מכסת בררת המחדל",
 "Unlimited" => "ללא הגבלה",
 "Other" => "אחר",
 "Username" => "שם משתמש",
-"Storage" => "אחסון",
+"Quota" => "מכסה",
 "set new password" => "הגדרת ססמה חדשה",
 "Default" => "בררת מחדל"
 );
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index d0b19c3c3c4..3904b1b0e9d 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -14,6 +14,7 @@ $TRANSLATIONS = array(
 "Groups" => "Grupe",
 "Group Admin" => "Grupa Admin",
 "Delete" => "Obriši",
+"never" => "nikad",
 "__language_name__" => "__ime_jezika__",
 "Login" => "Prijava",
 "Cron" => "Cron",
@@ -34,7 +35,10 @@ $TRANSLATIONS = array(
 "Help translate" => "Pomoć prevesti",
 "Login Name" => "Prijava",
 "Create" => "Izradi",
+"Group" => "Grupa",
+"Default Quota" => "standardni kvota",
 "Other" => "ostali",
-"Username" => "Korisničko ime"
+"Username" => "Korisničko ime",
+"Quota" => "kvota"
 );
 $PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 9cca3377042..c7dc45504e8 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -48,10 +48,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "File-ok kititkosítása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ...",
 "deleted" => "törölve",
 "undo" => "visszavonás",
-"Unable to remove user" => "A felhasználót nem sikerült eltávolítáni",
 "Groups" => "Csoportok",
 "Group Admin" => "Csoportadminisztrátor",
 "Delete" => "Törlés",
+"never" => "soha",
 "add group" => "csoport hozzáadása",
 "A valid username must be provided" => "Érvényes felhasználónevet kell megadnia",
 "Error creating user" => "A felhasználó nem hozható létre",
@@ -95,7 +95,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel",
 "Allow users to share with anyone" => "A felhasználók bárkivel megoszthatják állományaikat",
 "Allow users to only share with users in their groups" => "A felhasználók csak olyanokkal oszthatják meg állományaikat, akikkel közös csoportban vannak",
-"Allow mail notification" => "E-mail értesítések engedélyezése",
 "Security" => "Biztonság",
 "Enforce HTTPS" => "Kötelező HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak a %s szolgáltatáshoz.",
@@ -114,6 +113,7 @@ $TRANSLATIONS = array(
 "Select an App" => "Válasszon egy alkalmazást",
 "See application page at apps.owncloud.com" => "Lásd apps.owncloud.com, alkalmazások oldal",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-a jogtuladonos <span class=\"author\"></span>",
+"All" => "Mind",
 "Administrator Documentation" => "Üzemeltetői leírás",
 "Online Documentation" => "Online leírás",
 "Forum" => "Fórum",
@@ -148,12 +148,13 @@ $TRANSLATIONS = array(
 "Create" => "Létrehozás",
 "Admin Recovery Password" => "A jelszóvisszaállítás adminisztrációja",
 "Enter the recovery password in order to recover the users files during password change" => "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
-"Default Storage" => "Alapértelmezett tárhely",
+"Group" => "Csoport",
+"Default Quota" => "Alapértelmezett kvóta",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Kérjük adja meg a tárolási kvótát (pl.  \"512 MB\" vagy \"12 GB\")",
 "Unlimited" => "Korlátlan",
 "Other" => "Más",
 "Username" => "Felhasználónév",
-"Storage" => "Tárhely",
+"Quota" => "Kvóta",
 "change full name" => "a teljes név megváltoztatása",
 "set new password" => "új jelszó beállítása",
 "Default" => "Alapértelmezett"
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index 0230b3921f8..99d08df7b8f 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
 "Strong password" => "Contrasigno forte",
 "Groups" => "Gruppos",
 "Delete" => "Deler",
+"never" => "nunquam",
 "__language_name__" => "Interlingua",
 "Security Warning" => "Aviso de securitate",
 "Log" => "Registro",
@@ -31,7 +32,10 @@ $TRANSLATIONS = array(
 "Language" => "Linguage",
 "Help translate" => "Adjuta a traducer",
 "Create" => "Crear",
+"Group" => "Gruppo",
+"Default Quota" => "Quota predeterminate",
 "Other" => "Altere",
-"Username" => "Nomine de usator"
+"Username" => "Nomine de usator",
+"Quota" => "Quota"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index ac6cd5cae5a..7a18a12ca3d 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -45,10 +45,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat.",
 "deleted" => "dihapus",
 "undo" => "urungkan",
-"Unable to remove user" => "Tidak dapat menghapus pengguna",
 "Groups" => "Grup",
 "Group Admin" => "Admin Grup",
 "Delete" => "Hapus",
+"never" => "tidak pernah",
 "add group" => "tambah grup",
 "A valid username must be provided" => "Tuliskan nama pengguna yang valid",
 "Error creating user" => "Gagal membuat pengguna",
@@ -91,7 +91,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka.",
 "Allow users to share with anyone" => "Izinkan pengguna untuk berbagi kepada siapa saja",
 "Allow users to only share with users in their groups" => "Hanya izinkan pengguna untuk berbagi dengan pengguna pada grup mereka sendiri",
-"Allow mail notification" => "Izinkan pemberitahuan email",
 "Security" => "Keamanan",
 "Enforce HTTPS" => "Selalu Gunakan HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi.",
@@ -109,6 +108,7 @@ $TRANSLATIONS = array(
 "Select an App" => "Pilih Aplikasi",
 "See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-dilisensikan oleh <span class=\"author\"></span>",
+"All" => "Semua",
 "Administrator Documentation" => "Dokumentasi Administrator",
 "Online Documentation" => "Dokumentasi Online",
 "Forum" => "Forum",
@@ -143,12 +143,13 @@ $TRANSLATIONS = array(
 "Create" => "Buat",
 "Admin Recovery Password" => "Sandi pemulihan Admin",
 "Enter the recovery password in order to recover the users files during password change" => "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
-"Default Storage" => "Penyimpanan Baku",
+"Group" => "Grup",
+"Default Quota" => "Kuota default",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Silakan masukkan jumlah penyimpanan (contoh: \"512 MB\" atau \"12 GB\")",
 "Unlimited" => "Tak terbatas",
 "Other" => "Lainnya",
 "Username" => "Nama pengguna",
-"Storage" => "Penyimpanan",
+"Quota" => "Quota",
 "change full name" => "ubah nama lengkap",
 "set new password" => "setel sandi baru",
 "Default" => "Baku"
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index fc296053138..ae57a00d6a1 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Groups" => "Hópar",
 "Group Admin" => "Hópstjóri",
 "Delete" => "Eyða",
+"never" => "aldrei",
 "__language_name__" => "__nafn_tungumáls__",
 "None" => "Ekkert",
 "Security Warning" => "Öryggis aðvörun",
@@ -59,11 +60,9 @@ $TRANSLATIONS = array(
 "Language" => "Tungumál",
 "Help translate" => "Hjálpa við þýðingu",
 "Create" => "Búa til",
-"Default Storage" => "Sjálfgefin gagnageymsla",
 "Unlimited" => "Ótakmarkað",
 "Other" => "Annað",
 "Username" => "Notendanafn",
-"Storage" => "gagnapláss",
 "Default" => "Sjálfgefið"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index f8c0361c09e..44114d390e3 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -62,12 +62,15 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
 "Delete encryption keys permanently." => "Elimina definitivamente le chiavi di cifratura.",
 "Restore encryption keys." => "Ripristina le chiavi di cifratura.",
+"Unable to delete " => "Impossibile eliminare",
+"Error creating group" => "Errore durante la creazione del gruppo",
+"A valid group name must be provided" => "Deve essere fornito un nome valido per il gruppo",
 "deleted" => "eliminati",
 "undo" => "annulla",
-"Unable to remove user" => "Impossibile rimuovere l'utente",
 "Groups" => "Gruppi",
 "Group Admin" => "Gruppi amministrati",
 "Delete" => "Elimina",
+"never" => "mai",
 "add group" => "aggiungi gruppo",
 "A valid username must be provided" => "Deve essere fornito un nome utente valido",
 "Error creating user" => "Errore durante la creazione dell'utente",
@@ -91,6 +94,10 @@ $TRANSLATIONS = array(
 "Setup Warning" => "Avviso di configurazione",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Sembra che PHP sia configurato per rimuovere i blocchi in linea della documentazione. Ciò renderà inaccessibili diverse applicazioni principali.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
+"Database Performance Info" => "Informazioni prestazioni del database",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite è utilizzato come database. Per installazioni grandi, consigliamo di cambiarlo. Per migrare a un altro database, utilizzare lo strumento da riga di comando: 'occ db:convert-type'",
 "Module 'fileinfo' missing" => "Modulo 'fileinfo' mancante",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.",
 "Your PHP version is outdated" => "La tua versione di PHP è obsoleta",
@@ -123,7 +130,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Consenti agli utenti di condividere a loro volta elementi condivisi da altri",
 "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 solo con utenti dei loro gruppi",
-"Allow mail notification" => "Consenti le notifiche tramite posta elettronica",
 "Allow users to send mail notification for shared files" => "Consenti agli utenti di inviare email di notifica per i file condivisi",
 "Exclude groups from sharing" => "Escludi gruppi dalla condivisione",
 "These groups will still be able to receive shares, but not to initiate them." => "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarle.",
@@ -156,6 +162,8 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Vedere la pagina dell'applicazione su apps.owncloud.com",
 "See application website" => "Visita il sito web dell'applicazione",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>",
+"Enable only for specific groups" => "Abilita solo per gruppi specifici",
+"All" => "Tutti",
 "Administrator Documentation" => "Documentazione amministratore",
 "Online Documentation" => "Documentazione in linea",
 "Forum" => "Forum",
@@ -194,12 +202,19 @@ $TRANSLATIONS = array(
 "Create" => "Crea",
 "Admin Recovery Password" => "Password di ripristino amministrativa",
 "Enter the recovery password in order to recover the users files during password change" => "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
-"Default Storage" => "Archiviazione predefinita",
+"Search Users and Groups" => "Cerca utenti e gruppi",
+"Add Group" => "Aggiungi gruppo",
+"Group" => "Gruppo",
+"Everyone" => "Chiunque",
+"Admins" => "Amministratori",
+"Default Quota" => "Quota predefinita",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Digita la quota di archiviazione (ad es.: \"512 MB\" or \"12 GB\")",
 "Unlimited" => "Illimitata",
 "Other" => "Altro",
 "Username" => "Nome utente",
-"Storage" => "Archiviazione",
+"Quota" => "Quote",
+"Storage Location" => "Posizione di archiviazione",
+"Last Login" => "Ultimo accesso",
 "change full name" => "modica nome completo",
 "set new password" => "imposta una nuova password",
 "Default" => "Predefinito"
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index e580e2956b8..82def2ea851 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -2,7 +2,7 @@
 $TRANSLATIONS = array(
 "Invalid value supplied for %s" => "%s に提供された無効な値",
 "Saved" => "保存されました",
-"test email settings" => "eメール設定をテスト",
+"test email settings" => "メール設定をテスト",
 "If you received this email, the settings seem to be correct." => "このメールを受け取ったら、設定は正しいはずです。",
 "A problem occurred while sending the e-mail. Please revisit your settings." => "メールの送信中に問題が発生しました。設定を再考してください。",
 "Email sent" => "メールを送信しました",
@@ -62,12 +62,14 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
 "Delete encryption keys permanently." => "暗号化キーを永久に削除する。",
 "Restore encryption keys." => "暗号化キーを復元する。",
+"Unable to delete " => "削除できません",
+"Error creating group" => "グループの作成エラー",
 "deleted" => "削除",
 "undo" => "元に戻す",
-"Unable to remove user" => "ユーザーを削除できません",
 "Groups" => "グループ",
 "Group Admin" => "グループ管理者",
 "Delete" => "削除",
+"never" => "無し",
 "add group" => "グループを追加",
 "A valid username must be provided" => "有効なユーザー名を指定する必要があります",
 "Error creating user" => "ユーザー作成エラー",
@@ -123,8 +125,7 @@ $TRANSLATIONS = array(
 "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" => "ユーザーにグループ内のユーザーとのみ共有を許可する",
-"Allow mail notification" => "メール通知を許可",
-"Allow users to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザに許可する",
+"Allow users to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザーに許可する",
 "Security" => "セキュリティ",
 "Enforce HTTPS" => "常にHTTPSを使用する",
 "Forces the clients to connect to %s via an encrypted connection." => "クライアントから %sへの接続を常に暗号化します。",
@@ -132,13 +133,14 @@ $TRANSLATIONS = array(
 "Email Server" => "メールサーバー",
 "This is used for sending out notifications." => "これは通知の送信に使われます。",
 "From address" => "アドレスから",
+"mail" => "メール",
 "Authentication required" => "要求される認証",
 "Server address" => "サーバーアドレス",
 "Port" => "ポート",
 "Credentials" => "資格情報",
 "SMTP Username" => "SMTP ユーザー名",
 "SMTP Password" => "SMTP パスワード",
-"Test email settings" => "メールテスト設定",
+"Test email settings" => "メール設定をテスト",
 "Send email" => "メールを送信",
 "Log" => "ログ",
 "Log level" => "ログレベル",
@@ -153,6 +155,8 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
 "See application website" => "アプリケーションのウェブサイトを見る",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>",
+"Enable only for specific groups" => "特定のグループのみ有効に",
+"All" => "すべて",
 "Administrator Documentation" => "管理者ドキュメント",
 "Online Documentation" => "オンラインドキュメント",
 "Forum" => "フォーラム",
@@ -191,12 +195,18 @@ $TRANSLATIONS = array(
 "Create" => "作成",
 "Admin Recovery Password" => "管理者リカバリパスワード",
 "Enter the recovery password in order to recover the users files during password change" => "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
-"Default Storage" => "デフォルトストレージ",
+"Search Users and Groups" => "ユーザーとグループを検索",
+"Add Group" => "グループを追加",
+"Group" => "グループ",
+"Admins" => "管理者",
+"Default Quota" => "デフォルトのクォータサイズ",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージの割り当てを入力してください (例: \"512MB\" や \"12 GB\")",
 "Unlimited" => "無制限",
 "Other" => "その他",
 "Username" => "ユーザー名",
-"Storage" => "ストレージ",
+"Quota" => "クオータ",
+"Storage Location" => "ストレージの場所",
+"Last Login" => "最終ログイン",
 "change full name" => "フルネームを変更",
 "set new password" => "新しいパスワードを設定",
 "Default" => "デフォルト"
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index b11d6227122..0268d6d00f0 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -28,10 +28,10 @@ $TRANSLATIONS = array(
 "Updated" => "განახლებულია",
 "deleted" => "წაშლილი",
 "undo" => "დაბრუნება",
-"Unable to remove user" => "მომხმარებლის წაშლა ვერ მოხერხდა",
 "Groups" => "ჯგუფები",
 "Group Admin" => "ჯგუფის ადმინისტრატორი",
 "Delete" => "წაშლა",
+"never" => "არასდროს",
 "add group" => "ჯგუფის დამატება",
 "A valid username must be provided" => "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
 "Error creating user" => "შეცდომა მომხმარებლის შექმნისას",
@@ -73,6 +73,7 @@ $TRANSLATIONS = array(
 "Select an App" => "აირჩიეთ აპლიკაცია",
 "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>",
+"All" => "ყველა",
 "Administrator Documentation" => "ადმინისტრატორის დოკუმენტაცია",
 "Online Documentation" => "ონლაინ დოკუმენტაცია",
 "Forum" => "ფორუმი",
@@ -94,11 +95,11 @@ $TRANSLATIONS = array(
 "Help translate" => "თარგმნის დახმარება",
 "Login Name" => "მომხმარებლის სახელი",
 "Create" => "შექმნა",
-"Default Storage" => "საწყისი საცავი",
+"Default Quota" => "საწყისი ქვოტა",
 "Unlimited" => "ულიმიტო",
 "Other" => "სხვა",
 "Username" => "მომხმარებლის სახელი",
-"Storage" => "საცავი",
+"Quota" => "ქვოტა",
 "set new password" => "დააყენეთ ახალი პაროლი",
 "Default" => "საწყისი პარამეტრები"
 );
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
index 0bf073001e4..5c57f6f36b6 100644
--- a/settings/l10n/km.php
+++ b/settings/l10n/km.php
@@ -42,10 +42,10 @@ $TRANSLATIONS = array(
 "Strong password" => "ពាក្យ​សម្ងាត់​ខ្លាំង",
 "deleted" => "បាន​លុប",
 "undo" => "មិន​ធ្វើ​វិញ",
-"Unable to remove user" => "មិន​អាច​ដក​អ្នក​ប្រើ​ចេញ",
 "Groups" => "ក្រុ",
 "Group Admin" => "ក្រុម​អ្នក​គ្រប់គ្រង",
 "Delete" => "លុប",
+"never" => "មិនដែរ",
 "add group" => "បន្ថែម​ក្រុម",
 "A valid username must be provided" => "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
 "Error creating user" => "មាន​កំហុស​ក្នុង​ការ​បង្កើត​អ្នក​ប្រើ",
@@ -106,11 +106,9 @@ $TRANSLATIONS = array(
 "Log-in password" => "ពាក្យ​សម្ងាត់​ចូល​គណនី",
 "Login Name" => "ចូល",
 "Create" => "បង្កើត",
-"Default Storage" => "ឃ្លាំង​ផ្ទុក​លំនាំ​ដើម",
 "Unlimited" => "មិន​កំណត់",
 "Other" => "ផ្សេងៗ",
 "Username" => "ឈ្មោះ​អ្នកប្រើ",
-"Storage" => "ឃ្លាំង​ផ្ទុក",
 "set new password" => "កំណត់​ពាក្យ​សម្ងាត់​ថ្មី",
 "Default" => "លំនាំ​ដើម"
 );
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index f8319249d4d..292e6d4e135 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -48,10 +48,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오.",
 "deleted" => "삭제됨",
 "undo" => "실행 취소",
-"Unable to remove user" => "사용자를 삭제할 수 없음",
 "Groups" => "그룹",
 "Group Admin" => "그룹 관리자",
 "Delete" => "삭제",
+"never" => "없음",
 "add group" => "그룹 추가",
 "A valid username must be provided" => "올바른 사용자 이름을 입력해야 함",
 "Error creating user" => "사용자 생성 오류",
@@ -97,7 +97,6 @@ $TRANSLATIONS = array(
 "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" => "사용자가 속해 있는 그룹의 사용자에게만 공유할 수 있도록 허용",
-"Allow mail notification" => "메일 알림 허용",
 "Security" => "보안",
 "Enforce HTTPS" => "HTTPS 강제 사용",
 "Forces the clients to connect to %s via an encrypted connection." => "클라이언트가 %s에 연결할 때 암호화 연결을 강제로 사용합니다.",
@@ -124,6 +123,7 @@ $TRANSLATIONS = array(
 "Documentation:" => "문서",
 "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>",
+"All" => "모두",
 "Administrator Documentation" => "관리자 문서",
 "Online Documentation" => "온라인 문서",
 "Forum" => "포럼",
@@ -158,12 +158,12 @@ $TRANSLATIONS = array(
 "Create" => "만들기",
 "Admin Recovery Password" => "관리자 복구 암호",
 "Enter the recovery password in order to recover the users files during password change" => "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
-"Default Storage" => "기본 저장소",
+"Default Quota" => "기본 할당량",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "저장소 할당량을 입력하십시오 (예: \"512 MB\", \"12 GB\")",
 "Unlimited" => "무제한",
 "Other" => "기타",
 "Username" => "사용자 이름",
-"Storage" => "저장소",
+"Quota" => "할당량",
 "change full name" => "전체 이름 변경",
 "set new password" => "새 암호 설정",
 "Default" => "기본값"
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index f564527c5df..91a9b62a692 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -22,6 +22,7 @@ $TRANSLATIONS = array(
 "Groups" => "Gruppen",
 "Group Admin" => "Gruppen Admin",
 "Delete" => "Läschen",
+"never" => "ni",
 "__language_name__" => "__language_name__",
 "Login" => "Login",
 "Security Warning" => "Sécherheets Warnung",
@@ -39,6 +40,7 @@ $TRANSLATIONS = array(
 "Add your App" => "Setz deng App bei",
 "Select an App" => "Wiel eng Applikatioun aus",
 "See application page at apps.owncloud.com" => "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un",
+"All" => "All",
 "Password" => "Passwuert",
 "Unable to change your password" => "Konnt däin Passwuert net änneren",
 "Current password" => "Momentan 't Passwuert",
@@ -51,7 +53,10 @@ $TRANSLATIONS = array(
 "Help translate" => "Hëllef iwwersetzen",
 "Login Name" => "Login",
 "Create" => "Erstellen",
+"Group" => "Grupp",
+"Default Quota" => "Standard Quota",
 "Other" => "Aner",
-"Username" => "Benotzernumm"
+"Username" => "Benotzernumm",
+"Quota" => "Quota"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 45728392c41..d1c238ff1a4 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -38,10 +38,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
 "deleted" => "ištrinta",
 "undo" => "anuliuoti",
-"Unable to remove user" => "Nepavyko ištrinti vartotojo",
 "Groups" => "Grupės",
 "Group Admin" => "Grupės administratorius",
 "Delete" => "Ištrinti",
+"never" => "niekada",
 "add group" => "pridėti grupę",
 "A valid username must be provided" => "Vartotojo vardas turi būti tinkamas",
 "Error creating user" => "Klaida kuriant vartotoją",
@@ -75,7 +75,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Leisti naudotojams toliau dalintis elementais pasidalintais su jais",
 "Allow users to share with anyone" => "Leisti naudotojams dalintis su bet kuo",
 "Allow users to only share with users in their groups" => "Leisti naudotojams dalintis tik su naudotojais savo grupėje",
-"Allow mail notification" => "Leisti el. pašto perspėjimą",
 "Security" => "Saugumas",
 "Enforce HTTPS" => "Reikalauti HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Verčia klientus jungtis prie %s per šifruotą ryšį.",
@@ -93,6 +92,7 @@ $TRANSLATIONS = array(
 "Select an App" => "Pasirinkite programą",
 "See application page at apps.owncloud.com" => "Žiūrėti programos puslapį svetainėje apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
+"All" => "Viskas",
 "Administrator Documentation" => "Administratoriaus dokumentacija",
 "Online Documentation" => "Dokumentacija tinkle",
 "Forum" => "Forumas",
@@ -125,11 +125,12 @@ $TRANSLATIONS = array(
 "Create" => "Sukurti",
 "Admin Recovery Password" => "Administracinis atkūrimo slaptažodis",
 "Enter the recovery password in order to recover the users files during password change" => "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
-"Default Storage" => "Numatytas saugojimas",
+"Group" => "Grupė",
+"Default Quota" => "Numatytoji kvota",
 "Unlimited" => "Neribota",
 "Other" => "Kita",
 "Username" => "Prisijungimo vardas",
-"Storage" => "Saugojimas",
+"Quota" => "Limitas",
 "change full name" => "keisti pilną vardą",
 "set new password" => "nustatyti naują slaptažodį",
 "Default" => "Numatytasis"
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 261f5a6d37e..e6ea1695063 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -29,10 +29,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.",
 "deleted" => "izdzests",
 "undo" => "atsaukt",
-"Unable to remove user" => "Nevar izņemt lietotāju",
 "Groups" => "Grupas",
 "Group Admin" => "Grupas administrators",
 "Delete" => "Dzēst",
+"never" => "nekad",
 "add group" => "pievienot grupu",
 "A valid username must be provided" => "Jānorāda derīgs lietotājvārds",
 "Error creating user" => "Kļūda, veidojot lietotāju",
@@ -80,6 +80,7 @@ $TRANSLATIONS = array(
 "Select an App" => "Izvēlies lietotni",
 "See application page at apps.owncloud.com" => "Apskati lietotņu lapu — apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencēts no <span class=\"author\"></span>",
+"All" => "Visi",
 "Administrator Documentation" => "Administratora dokumentācija",
 "Online Documentation" => "Tiešsaistes dokumentācija",
 "Forum" => "Forums",
@@ -105,11 +106,12 @@ $TRANSLATIONS = array(
 "Create" => "Izveidot",
 "Admin Recovery Password" => "Administratora atgūšanas parole",
 "Enter the recovery password in order to recover the users files during password change" => "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā.",
-"Default Storage" => "Noklusējuma krātuve",
+"Group" => "Grupa",
+"Default Quota" => "Apjoms pēc noklusējuma",
 "Unlimited" => "Neierobežota",
 "Other" => "Cits",
 "Username" => "Lietotājvārds",
-"Storage" => "Krātuve",
+"Quota" => "Apjoms",
 "set new password" => "iestatīt jaunu paroli",
 "Default" => "Noklusējuma"
 );
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 27bdcc73048..85077348ceb 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -34,10 +34,10 @@ $TRANSLATIONS = array(
 "Select a profile picture" => "Одбери фотографија за профилот",
 "deleted" => "избришан",
 "undo" => "врати",
-"Unable to remove user" => "Не можам да го одстранам корисникот",
 "Groups" => "Групи",
 "Group Admin" => "Администратор на група",
 "Delete" => "Избриши",
+"never" => "никогаш",
 "add group" => "додади група",
 "A valid username must be provided" => "Мора да се обезбеди валидно корисничко име ",
 "Error creating user" => "Грешка при креирање на корисникот",
@@ -56,7 +56,6 @@ $TRANSLATIONS = array(
 "Allow resharing" => "Овозможи повторно споделување",
 "Allow users to share with anyone" => "Овозможи корисниците да споделуваат со секого",
 "Allow users to only share with users in their groups" => "Овозможи корисниците да споделуваат со корисници од своите групи",
-"Allow mail notification" => "Овозможи известување по електронска пошта",
 "Security" => "Безбедност",
 "Enforce HTTPS" => "Наметни HTTPS",
 "Server address" => "Адреса на сервер",
@@ -72,6 +71,7 @@ $TRANSLATIONS = array(
 "Select an App" => "Избери аппликација",
 "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>",
+"All" => "Сите",
 "Administrator Documentation" => "Администраторска документација",
 "Online Documentation" => "Документација на интернет",
 "Forum" => "Форум",
@@ -99,11 +99,11 @@ $TRANSLATIONS = array(
 "Decrypt all Files" => "Дешифрирај ги сите датотеки",
 "Login Name" => "Име за најава",
 "Create" => "Создај",
-"Default Storage" => "Предефинирано складиште ",
+"Default Quota" => "Предефинирана квота",
 "Unlimited" => "Неограничено",
 "Other" => "Останато",
 "Username" => "Корисничко име",
-"Storage" => "Складиште",
+"Quota" => "Квота",
 "set new password" => "постави нова лозинка",
 "Default" => "Предефиниран"
 );
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 1c5d1189462..304d4f789e7 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
 "deleted" => "dihapus",
 "Groups" => "Kumpulan",
 "Delete" => "Padam",
+"never" => "jangan",
 "__language_name__" => "_nama_bahasa_",
 "Login" => "Log masuk",
 "Security Warning" => "Amaran keselamatan",
@@ -35,7 +36,9 @@ $TRANSLATIONS = array(
 "Help translate" => "Bantu terjemah",
 "Login Name" => "Log masuk",
 "Create" => "Buat",
+"Default Quota" => "Kuota Lalai",
 "Other" => "Lain",
-"Username" => "Nama pengguna"
+"Username" => "Nama pengguna",
+"Quota" => "Kuota"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 4ed4930271d..bc1c48681b5 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -64,10 +64,10 @@ $TRANSLATIONS = array(
 "Restore encryption keys." => "Gjenopprett krypteringsnøkler.",
 "deleted" => "slettet",
 "undo" => "angre",
-"Unable to remove user" => "Kunne ikke slette bruker",
 "Groups" => "Grupper",
 "Group Admin" => "Gruppeadministrator",
 "Delete" => "Slett",
+"never" => "aldri",
 "add group" => "legg til gruppe",
 "A valid username must be provided" => "Oppgi et gyldig brukernavn",
 "Error creating user" => "Feil ved oppretting av bruker",
@@ -91,6 +91,8 @@ $TRANSLATIONS = array(
 "Setup Warning" => "Installasjonsadvarsel",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Vennligst dobbeltsjekk <a href=\"%s\">installasjonsveilederne</a>.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.",
 "Module 'fileinfo' missing" => "Modulen 'fileinfo' mangler",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.",
 "Your PHP version is outdated" => "Din PHP-versjon er udatert",
@@ -123,7 +125,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Tillat brukere å dele filer som allerede har blitt delt med dem",
 "Allow users to share with anyone" => "Tillat brukere å dele med alle",
 "Allow users to only share with users in their groups" => "Tillat kun deling med andre brukere i samme gruppe",
-"Allow mail notification" => "Tillat påminnelser i e-post",
 "Allow users to send mail notification for shared files" => "Tlllat at brukere sender e-postvarsler for delte filer",
 "Exclude groups from sharing" => "Utelukk grupper fra deling",
 "These groups will still be able to receive shares, but not to initiate them." => "Disse gruppene vil fremdeles kunne motta delinger men ikke lage dem.",
@@ -156,6 +157,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
 "See application website" => "Vis applikasjonens nettsted",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>",
+"All" => "Alle",
 "Administrator Documentation" => "Administratordokumentasjon",
 "Online Documentation" => "Online dokumentasjon",
 "Forum" => "Forum",
@@ -194,12 +196,13 @@ $TRANSLATIONS = array(
 "Create" => "Opprett",
 "Admin Recovery Password" => "Administrativt gjenopprettingspassord",
 "Enter the recovery password in order to recover the users files during password change" => "Legg inn gjenopprettingspassordet for å gjenopprette brukerfilene når passordet endres",
-"Default Storage" => "Standard lager",
+"Group" => "Gruppe",
+"Default Quota" => "Standard Kvote",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Legg inn lagringskvote (f.eks. \"512 MB\" eller \"12 GB\")",
 "Unlimited" => "Ubegrenset",
 "Other" => "Annet",
 "Username" => "Brukernavn",
-"Storage" => "Lager",
+"Quota" => "Kvote",
 "change full name" => "endre fullt navn",
 "set new password" => "sett nytt passord",
 "Default" => "Standard"
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index b67908a4a36..e8a12a290e9 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -64,10 +64,10 @@ $TRANSLATIONS = array(
 "Restore encryption keys." => "Herstel de encryptiesleutels",
 "deleted" => "verwijderd",
 "undo" => "ongedaan maken",
-"Unable to remove user" => "Kon gebruiker niet verwijderen",
 "Groups" => "Groepen",
 "Group Admin" => "Groep beheerder",
 "Delete" => "Verwijder",
+"never" => "geen",
 "add group" => "toevoegen groep",
 "A valid username must be provided" => "Er moet een geldige gebruikersnaam worden opgegeven",
 "Error creating user" => "Fout bij aanmaken gebruiker",
@@ -123,7 +123,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen",
 "Allow users to share with anyone" => "Toestaan dat gebruikers met iedereen delen",
 "Allow users to only share with users in their groups" => "Instellen dat gebruikers alleen met leden binnen hun groepen delen",
-"Allow mail notification" => "Toestaan e-mailnotificaties",
 "Allow users to send mail notification for shared files" => "Sta gebruikers toe om e-mailnotificaties  te versturen voor gedeelde bestanden",
 "Exclude groups from sharing" => "Sluit groepen uit van delen",
 "These groups will still be able to receive shares, but not to initiate them." => "Deze groepen kunnen gedeelde mappen bestanden ontvangen, maar kunnen ze niet starten.",
@@ -156,6 +155,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Zie de applicatiepagina op apps.owncloud.com",
 "See application website" => "Zie website van de applicatie",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>",
+"All" => "Alle",
 "Administrator Documentation" => "Beheerdersdocumentatie",
 "Online Documentation" => "Online documentatie",
 "Forum" => "Forum",
@@ -194,12 +194,13 @@ $TRANSLATIONS = array(
 "Create" => "Aanmaken",
 "Admin Recovery Password" => "Beheer herstel wachtwoord",
 "Enter the recovery password in order to recover the users files during password change" => "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
-"Default Storage" => "Standaard Opslaglimiet",
+"Group" => "Groep",
+"Default Quota" => "Standaard limiet",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Geef de opslagquotering op (bijv. \"512 MB\" of \"12 GB\")",
 "Unlimited" => "Ongelimiteerd",
 "Other" => "Anders",
 "Username" => "Gebruikersnaam",
-"Storage" => "Opslaglimiet",
+"Quota" => "Limieten",
 "change full name" => "wijzigen volledige naam",
 "set new password" => "Instellen nieuw wachtwoord",
 "Default" => "Standaard"
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index c064d66c708..9c4617ab3cf 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -38,10 +38,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
 "deleted" => "sletta",
 "undo" => "angra",
-"Unable to remove user" => "Klarte ikkje fjerna brukaren",
 "Groups" => "Grupper",
 "Group Admin" => "Gruppestyrar",
 "Delete" => "Slett",
+"never" => "aldri",
 "add group" => "legg til gruppe",
 "A valid username must be provided" => "Du må oppgje eit gyldig brukarnamn",
 "Error creating user" => "Feil ved oppretting av brukar",
@@ -86,6 +86,7 @@ $TRANSLATIONS = array(
 "Select an App" => "Vel eit program",
 "See application page at apps.owncloud.com" => "Sjå programsida på apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>",
+"All" => "Alle",
 "Administrator Documentation" => "Administratordokumentasjon",
 "Online Documentation" => "Dokumentasjon på nett",
 "Forum" => "Forum",
@@ -117,11 +118,11 @@ $TRANSLATIONS = array(
 "Create" => "Lag",
 "Admin Recovery Password" => "Gjenopprettingspassord for administrator",
 "Enter the recovery password in order to recover the users files during password change" => "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
-"Default Storage" => "Standardlagring",
+"Group" => "Gruppe",
 "Unlimited" => "Ubegrensa",
 "Other" => "Anna",
 "Username" => "Brukarnamn",
-"Storage" => "Lagring",
+"Quota" => "Kvote",
 "set new password" => "lag nytt passord",
 "Default" => "Standard"
 );
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index f6eab80bcb5..153f3898592 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "Groups" => "Grops",
 "Group Admin" => "Grop Admin",
 "Delete" => "Escafa",
+"never" => "jamai",
 "__language_name__" => "__language_name__",
 "Login" => "Login",
 "Security Warning" => "Avertiment de securitat",
@@ -46,7 +47,9 @@ $TRANSLATIONS = array(
 "Help translate" => "Ajuda a la revirada",
 "Login Name" => "Login",
 "Create" => "Crea",
+"Default Quota" => "Quota per defaut",
 "Other" => "Autres",
-"Username" => "Non d'usancièr"
+"Username" => "Non d'usancièr",
+"Quota" => "Quota"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 2ff5b00d986..f8aa5306963 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -64,10 +64,10 @@ $TRANSLATIONS = array(
 "Restore encryption keys." => "Przywróć klucze szyfrujące.",
 "deleted" => "usunięto",
 "undo" => "cofnij",
-"Unable to remove user" => "Nie można usunąć użytkownika",
 "Groups" => "Grupy",
 "Group Admin" => "Administrator grupy",
 "Delete" => "Usuń",
+"never" => "nigdy",
 "add group" => "dodaj grupę",
 "A valid username must be provided" => "Należy podać prawidłową nazwę użytkownika",
 "Error creating user" => "Błąd podczas tworzenia użytkownika",
@@ -91,6 +91,8 @@ $TRANSLATIONS = array(
 "Setup Warning" => "Ostrzeżenia konfiguracji",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Proszę sprawdź ponownie <a href=\"%s\">przewodnik instalacji</a>.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.",
 "Module 'fileinfo' missing" => "Brak modułu „fileinfo”",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
 "Your PHP version is outdated" => "Twoja wersja PHP jest za stara",
@@ -123,7 +125,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych",
 "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",
-"Allow mail notification" => "Pozwól na mailowe powiadomienia",
 "Allow users to send mail notification for shared files" => "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików",
 "Exclude groups from sharing" => "Wyklucz grupy z udostępniania",
 "These groups will still be able to receive shares, but not to initiate them." => "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
@@ -134,6 +135,7 @@ $TRANSLATIONS = array(
 "Email Server" => "Serwer pocztowy",
 "This is used for sending out notifications." => "To jest używane do wysyłania powiadomień",
 "From address" => "Z adresu",
+"mail" => "mail",
 "Authentication required" => "Wymagana autoryzacja",
 "Server address" => "Adres Serwera",
 "Port" => "Port",
@@ -155,6 +157,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Zobacz stronę aplikacji na apps.owncloud.com",
 "See application website" => "Zobacz na stronie aplikacji",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>",
+"All" => "Wszystkie",
 "Administrator Documentation" => "Dokumentacja administratora",
 "Online Documentation" => "Dokumentacja online",
 "Forum" => "Forum",
@@ -193,12 +196,13 @@ $TRANSLATIONS = array(
 "Create" => "Utwórz",
 "Admin Recovery Password" => "Odzyskiwanie hasła administratora",
 "Enter the recovery password in order to recover the users files during password change" => "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
-"Default Storage" => "Magazyn domyślny",
+"Group" => "Grupa",
+"Default Quota" => "Domyślny udział",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Proszę ustawić ograniczenie zasobów (np. \"512 MB\" albo \"12 GB)",
 "Unlimited" => "Bez limitu",
 "Other" => "Inne",
 "Username" => "Nazwa użytkownika",
-"Storage" => "Magazyn",
+"Quota" => "Udział",
 "change full name" => "Zmień pełna nazwę",
 "set new password" => "ustaw nowe hasło",
 "Default" => "Domyślny"
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index e8da8ee94a3..6e02937d093 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -64,10 +64,10 @@ $TRANSLATIONS = array(
 "Restore encryption keys." => "Restaurar chave de criptografia.",
 "deleted" => "excluído",
 "undo" => "desfazer",
-"Unable to remove user" => "Impossível remover usuário",
 "Groups" => "Grupos",
 "Group Admin" => "Grupo Administrativo",
 "Delete" => "Excluir",
+"never" => "nunca",
 "add group" => "adicionar grupo",
 "A valid username must be provided" => "Forneça um nome de usuário válido",
 "Error creating user" => "Erro ao criar usuário",
@@ -91,6 +91,8 @@ $TRANSLATIONS = array(
 "Setup Warning" => "Aviso de Configuração",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, verifique os <a href='%s'>guias de instalação</a>.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.",
 "Module 'fileinfo' missing" => "Módulo 'fileinfo' faltando",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).",
 "Your PHP version is outdated" => "Sua versão de PHP está desatualizada",
@@ -123,7 +125,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Permitir que usuários compartilhem novamente itens compartilhados com eles",
 "Allow users to share with anyone" => "Permitir que usuários compartilhem com qualquer um",
 "Allow users to only share with users in their groups" => "Permitir que usuários compartilhem somente com usuários em seus grupos",
-"Allow mail notification" => "Permitir notificação por email",
 "Allow users to send mail notification for shared files" => "Permitir aos usuários enviar notificação de email para arquivos compartilhados",
 "Exclude groups from sharing" => "Excluir grupos de compartilhamento",
 "These groups will still be able to receive shares, but not to initiate them." => "Esses grupos ainda serão capazes de receber compartilhamentos, mas não para iniciá-los.",
@@ -156,6 +157,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Ver página do aplicativo em apps.owncloud.com",
 "See application website" => "Consulte o site aplicação",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
+"All" => "Todos",
 "Administrator Documentation" => "Documentação de Administrador",
 "Online Documentation" => "Documentação Online",
 "Forum" => "Fórum",
@@ -194,12 +196,13 @@ $TRANSLATIONS = array(
 "Create" => "Criar",
 "Admin Recovery Password" => "Recuperação da Senha do Administrador",
 "Enter the recovery password in order to recover the users files during password change" => "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
-"Default Storage" => "Armazenamento Padrão",
+"Group" => "Grupo",
+"Default Quota" => "Quota Padrão",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor insira cota de armazenamento (ex: \"512\" ou \"12 GB\")",
 "Unlimited" => "Ilimitado",
 "Other" => "Outro",
 "Username" => "Nome de Usuário",
-"Storage" => "Armazenamento",
+"Quota" => "Cota",
 "change full name" => "alterar nome completo",
 "set new password" => "definir nova senha",
 "Default" => "Padrão"
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index f8b63bf55d8..9febec0171e 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -64,10 +64,10 @@ $TRANSLATIONS = array(
 "Restore encryption keys." => "Restaurar chaves encriptadas.",
 "deleted" => "apagado",
 "undo" => "desfazer",
-"Unable to remove user" => "Não foi possível remover o utilizador",
 "Groups" => "Grupos",
 "Group Admin" => "Grupo Administrador",
 "Delete" => "Eliminar",
+"never" => "nunca",
 "add group" => "Adicionar grupo",
 "A valid username must be provided" => "Um nome de utilizador válido deve ser fornecido",
 "Error creating user" => "Erro a criar utilizador",
@@ -123,7 +123,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Permitir que os utilizadores partilhem itens partilhados com eles",
 "Allow users to share with anyone" => "Permitir que os utilizadores partilhem com todos",
 "Allow users to only share with users in their groups" => "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo",
-"Allow mail notification" => "Permitir notificação por email",
 "Allow users to send mail notification for shared files" => "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados",
 "Exclude groups from sharing" => "Excluir grupos das partilhas",
 "These groups will still be able to receive shares, but not to initiate them." => "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
@@ -156,6 +155,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Ver a página da aplicação em apps.owncloud.com",
 "See application website" => "Ver site da aplicação",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
+"All" => "Todos",
 "Administrator Documentation" => "Documentação de administrador.",
 "Online Documentation" => "Documentação Online",
 "Forum" => "Fórum",
@@ -194,12 +194,13 @@ $TRANSLATIONS = array(
 "Create" => "Criar",
 "Admin Recovery Password" => "Recuperar password de administrador",
 "Enter the recovery password in order to recover the users files during password change" => "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
-"Default Storage" => "Armazenamento Padrão",
+"Group" => "Grupo",
+"Default Quota" => "Quota por padrão",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Insira a quota de armazenamento (ex: \"512 MB\" ou \"12 GB\")",
 "Unlimited" => "Ilimitado",
 "Other" => "Outro",
 "Username" => "Nome de utilizador",
-"Storage" => "Armazenamento",
+"Quota" => "Quota",
 "change full name" => "alterar nome completo",
 "set new password" => "definir nova palavra-passe",
 "Default" => "Padrão"
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index b16f65324a7..631a1c45424 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -48,10 +48,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Decriptare fișiere... Te rog așteaptă, poate dura ceva timp.",
 "deleted" => "șters",
 "undo" => "Anulează ultima acțiune",
-"Unable to remove user" => "Imposibil de eliminat utilizatorul",
 "Groups" => "Grupuri",
 "Group Admin" => "Grupul Admin ",
 "Delete" => "Șterge",
+"never" => "niciodată",
 "add group" => "adăugaţi grupul",
 "A valid username must be provided" => "Trebuie să furnizaţi un nume de utilizator valid",
 "Error creating user" => "Eroare la crearea utilizatorului",
@@ -83,7 +83,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Permite utilizatorilor să repartajeze fișiere partajate cu ei",
 "Allow users to share with anyone" => "Permite utilizatorilor să partajeze cu oricine",
 "Allow users to only share with users in their groups" => "Permite utilizatorilor să partajeze doar cu utilizatori din același grup",
-"Allow mail notification" => "Permite notificări prin e-mail",
 "Allow users to send mail notification for shared files" => "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune",
 "Security" => "Securitate",
 "Forces the clients to connect to %s via an encrypted connection." => "Forțează clienții să se conecteze la %s folosind o conexiune sigură",
@@ -104,6 +103,7 @@ $TRANSLATIONS = array(
 "Select an App" => "Selectează o aplicație",
 "See application page at apps.owncloud.com" => "Vizualizează pagina applicației pe apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>",
+"All" => "Toate ",
 "Administrator Documentation" => "Documentație administrator",
 "Online Documentation" => "Documentație online",
 "Forum" => "Forum",
@@ -135,11 +135,12 @@ $TRANSLATIONS = array(
 "Create" => "Crează",
 "Admin Recovery Password" => "Parolă de recuperare a Administratorului",
 "Enter the recovery password in order to recover the users files during password change" => "Introdu parola de recuperare pentru a recupera fișierele utilizatorilor în timpul schimbării parolei",
-"Default Storage" => "Stocare implicită",
+"Group" => "Grup",
+"Default Quota" => "Cotă implicită",
 "Unlimited" => "Nelimitată",
 "Other" => "Altele",
 "Username" => "Nume utilizator",
-"Storage" => "Stocare",
+"Quota" => "Cotă",
 "change full name" => "schimbă numele complet",
 "set new password" => "setează parolă nouă",
 "Default" => "Implicită"
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 82677dbb6dd..5d7518b9c84 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -59,10 +59,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
 "deleted" => "удален",
 "undo" => "отмена",
-"Unable to remove user" => "Невозможно удалить пользователя",
 "Groups" => "Группы",
 "Group Admin" => "Администратор группы",
 "Delete" => "Удалить",
+"never" => "никогда",
 "add group" => "добавить группу",
 "A valid username must be provided" => "Укажите правильное имя пользователя",
 "Error creating user" => "Ошибка создания пользователя",
@@ -108,7 +108,6 @@ $TRANSLATIONS = array(
 "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" => "Разрешить пользователям делать общий доступ только для пользователей их групп",
-"Allow mail notification" => "Разрешить уведомление по почте",
 "Allow users to send mail notification for shared files" => "Разрешить пользователю оповещать почтой о расшаренных файлах",
 "Security" => "Безопасность",
 "Enforce HTTPS" => "Принудить к HTTPS",
@@ -138,6 +137,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
 "See application website" => "См. сайт приложений",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>",
+"All" => "Все",
 "Administrator Documentation" => "Документация администратора",
 "Online Documentation" => "Online документация",
 "Forum" => "Форум",
@@ -172,12 +172,13 @@ $TRANSLATIONS = array(
 "Create" => "Создать",
 "Admin Recovery Password" => "Восстановление пароля администратора",
 "Enter the recovery password in order to recover the users files during password change" => "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
-"Default Storage" => "Хранилище по умолчанию",
+"Group" => "Группа",
+"Default Quota" => "Квота по умолчанию",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Пожалуйста, введите квоту на хранилище (например: \"512 MB\" или \"12 GB\")",
 "Unlimited" => "Неограниченно",
 "Other" => "Другое",
 "Username" => "Имя пользователя",
-"Storage" => "Хранилище",
+"Quota" => "Квота",
 "change full name" => "изменить полное имя",
 "set new password" => "установить новый пароль",
 "Default" => "По умолчанию"
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index f9d912d180d..fe36bd21ba8 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "Groups" => "කණ්ඩායම්",
 "Group Admin" => "කාණ්ඩ පරිපාලක",
 "Delete" => "මකා දමන්න",
+"never" => "කවදාවත්",
 "None" => "කිසිවක් නැත",
 "Login" => "ප්‍රවිශ්ටය",
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
@@ -51,7 +52,9 @@ $TRANSLATIONS = array(
 "Help translate" => "පරිවර්ථන සහය",
 "Login Name" => "ප්‍රවිශ්ටය",
 "Create" => "තනන්න",
+"Default Quota" => "සාමාන්‍ය සලාකය",
 "Other" => "වෙනත්",
-"Username" => "පරිශීලක නම"
+"Username" => "පරිශීලක නම",
+"Quota" => "සලාකය"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/sk.php b/settings/l10n/sk.php
index ab3a1bf5835..4a9a13d6d84 100644
--- a/settings/l10n/sk.php
+++ b/settings/l10n/sk.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Delete" => "Odstrániť",
+"never" => "nikdy",
 "Cancel" => "Zrušiť",
 "Other" => "Ostatné"
 );
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index c977985b669..30742f30a87 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -58,10 +58,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
 "deleted" => "zmazané",
 "undo" => "vrátiť",
-"Unable to remove user" => "Nemožno odobrať používateľa",
 "Groups" => "Skupiny",
 "Group Admin" => "Správca skupiny",
 "Delete" => "Zmazať",
+"never" => "nikdy",
 "add group" => "pridať skupinu",
 "A valid username must be provided" => "Musíte zadať platné používateľské meno",
 "Error creating user" => "Chyba pri vytváraní používateľa",
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Povoliť používateľom ďalej zdieľať zdieľané položky",
 "Allow users to share with anyone" => "Povoliť používateľom zdieľať s kýmkoľvek",
 "Allow users to only share with users in their groups" => "Povoliť používateľom zdieľať len s používateľmi v ich skupinách",
-"Allow mail notification" => "Povoliť odosielať upozornenia emailom",
 "Allow users to send mail notification for shared files" => "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov",
 "Security" => "Zabezpečenie",
 "Enforce HTTPS" => "Vynútiť HTTPS",
@@ -142,6 +141,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Pozrite si stránku aplikácií na apps.owncloud.com",
 "See application website" => "Pozrite si webstránku aplikácie",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>",
+"All" => "Všetky",
 "Administrator Documentation" => "Príručka administrátora",
 "Online Documentation" => "Online príručka",
 "Forum" => "Fórum",
@@ -176,12 +176,13 @@ $TRANSLATIONS = array(
 "Create" => "Vytvoriť",
 "Admin Recovery Password" => "Obnovenie hesla administrátora",
 "Enter the recovery password in order to recover the users files during password change" => "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
-"Default Storage" => "Predvolené úložisko",
+"Group" => "Skupina",
+"Default Quota" => "Predvolená kvóta",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Prosím zadajte kvótu úložného priestoru (napr.: \"512 MB​​\" alebo \"12 GB\")",
 "Unlimited" => "Nelimitované",
 "Other" => "Iné",
 "Username" => "Používateľské meno",
-"Storage" => "Úložisko",
+"Quota" => "Kvóta",
 "change full name" => "zmeniť meno a priezvisko",
 "set new password" => "nastaviť nové heslo",
 "Default" => "Predvolené"
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 8a2b7218442..d8748d4cbd7 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -57,10 +57,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno.",
 "deleted" => "izbrisano",
 "undo" => "razveljavi",
-"Unable to remove user" => "Uporabnika ni mogoče odstraniti",
 "Groups" => "Skupine",
 "Group Admin" => "Skrbnik skupine",
 "Delete" => "Izbriši",
+"never" => "nikoli",
 "add group" => "dodaj skupino",
 "A valid username must be provided" => "Navedeno mora biti veljavno uporabniško ime",
 "Error creating user" => "Napaka ustvarjanja uporabnika",
@@ -111,7 +111,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Uporabnikom dovoli nadaljnjo souporabo predmetov",
 "Allow users to share with anyone" => "Uporabnikom dovoli souporabo s komerkoli",
 "Allow users to only share with users in their groups" => "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine",
-"Allow mail notification" => "Dovoli obvestila preko elektronske pošte",
 "Allow users to send mail notification for shared files" => "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
 "Security" => "Varnost",
 "Enforce HTTPS" => "Zahtevaj uporabo HTTPS",
@@ -139,6 +138,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Obiščite spletno stran programa na apps.owncloud.com",
 "See application website" => "Oglejte si spletno stran programa",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-z dovoljenjem <span class=\"author\"></span>",
+"All" => "Vsi",
 "Administrator Documentation" => "Skrbniška dokumentacija",
 "Online Documentation" => "Spletna dokumentacija",
 "Forum" => "Forum",
@@ -173,12 +173,13 @@ $TRANSLATIONS = array(
 "Create" => "Ustvari",
 "Admin Recovery Password" => "Obnovitev skrbniškega gesla",
 "Enter the recovery password in order to recover the users files during password change" => "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
-"Default Storage" => "Privzeta shramba",
+"Group" => "Skupina",
+"Default Quota" => "Privzeta količinska omejitev",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Vnesite količinsko omejitev prostora (na primer: \"512 MB\" ali \"12 GB\")",
 "Unlimited" => "Neomejeno",
 "Other" => "Drugo",
 "Username" => "Uporabniško ime",
-"Storage" => "Shramba",
+"Quota" => "Količinska omejitev",
 "change full name" => "Spremeni polno ime",
 "set new password" => "nastavi novo geslo",
 "Default" => "Privzeto"
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index ca74ba573c4..752fb7df116 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -27,10 +27,10 @@ $TRANSLATIONS = array(
 "Updated" => "I përditësuar",
 "deleted" => "fshirë",
 "undo" => "anullo veprimin",
-"Unable to remove user" => "E pamundur të fshiet përdoruesi",
 "Groups" => "Grupet",
 "Group Admin" => "Grupi Admin",
 "Delete" => "Fshi",
+"never" => "asnjëherë",
 "add group" => "shto grup",
 "A valid username must be provided" => "Duhet të jepni një emër të vlefshëm përdoruesi",
 "Error creating user" => "Gabim gjatë krijimit të përdoruesit",
@@ -92,11 +92,9 @@ $TRANSLATIONS = array(
 "Create" => "Krijo",
 "Admin Recovery Password" => "Rigjetja e fjalëkalimit të Admin",
 "Enter the recovery password in order to recover the users files during password change" => "Jepni fjalëkalimin e rigjetjes për të rigjetur skedarët e përdoruesit gjatë ndryshimit të fjalëkalimit",
-"Default Storage" => "Vendruajtje e paracaktuar/Default Storage",
 "Unlimited" => "E pakufizuar",
 "Other" => "Tjetër",
 "Username" => "Përdoruesi",
-"Storage" => "Vendruajtja/Storage",
 "set new password" => "vendos fjalëkalim të ri",
 "Default" => "Paracaktuar"
 );
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 408e704d40b..ea9292b2427 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -28,10 +28,10 @@ $TRANSLATIONS = array(
 "Updated" => "Ажурирано",
 "deleted" => "обрисано",
 "undo" => "опозови",
-"Unable to remove user" => "Не могу да уклоним корисника",
 "Groups" => "Групе",
 "Group Admin" => "Управник групе",
 "Delete" => "Обриши",
+"never" => "никада",
 "add group" => "додај групу",
 "A valid username must be provided" => "Морате унети исправно корисничко име",
 "Error creating user" => "Грешка при прављењу корисника",
@@ -92,11 +92,12 @@ $TRANSLATIONS = array(
 "Help translate" => " Помозите у превођењу",
 "Login Name" => "Корисничко име",
 "Create" => "Направи",
-"Default Storage" => "Подразумевано складиште",
+"Group" => "Група",
+"Default Quota" => "Подразумевано ограничење",
 "Unlimited" => "Неограничено",
 "Other" => "Друго",
 "Username" => "Корисничко име",
-"Storage" => "Складиште",
+"Quota" => "Ограничење",
 "set new password" => "постави нову лозинку",
 "Default" => "Подразумевано"
 );
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 2ca3f37e109..3e26ecdc423 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -18,6 +18,7 @@ $TRANSLATIONS = array(
 "Cancel" => "Otkaži",
 "Language" => "Jezik",
 "Create" => "Napravi",
+"Group" => "Grupa",
 "Other" => "Drugo",
 "Username" => "Korisničko ime"
 );
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 160036c7d98..d6f44986620 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -64,10 +64,10 @@ $TRANSLATIONS = array(
 "Restore encryption keys." => "Återställ krypteringsnycklar",
 "deleted" => "raderad",
 "undo" => "ångra",
-"Unable to remove user" => "Kan inte ta bort användare",
 "Groups" => "Grupper",
 "Group Admin" => "Gruppadministratör",
 "Delete" => "Radera",
+"never" => "aldrig",
 "add group" => "lägg till grupp",
 "A valid username must be provided" => "Ett giltigt användarnamn måste anges",
 "Error creating user" => "Fel vid skapande av användare",
@@ -123,7 +123,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Tillåt användare att dela vidare filer som delats med dem",
 "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",
-"Allow mail notification" => "Tillåt e-post notifikation",
 "Allow users to send mail notification for shared files" => "Tillåt användare att skicka mailnotifieringar för delade filer",
 "Exclude groups from sharing" => "Exkludera grupp från att dela",
 "These groups will still be able to receive shares, but not to initiate them." => "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.",
@@ -156,6 +155,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Se programsida på apps.owncloud.com",
 "See application website" => "Se applikationens webbplats",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>",
+"All" => "Alla",
 "Administrator Documentation" => "Administratörsdokumentation",
 "Online Documentation" => "Onlinedokumentation",
 "Forum" => "Forum",
@@ -194,12 +194,13 @@ $TRANSLATIONS = array(
 "Create" => "Skapa",
 "Admin Recovery Password" => "Admin återställningslösenord",
 "Enter the recovery password in order to recover the users files during password change" => "Enter the recovery password in order to recover the users files during password change",
-"Default Storage" => "Förvald lagring",
+"Group" => "Grupp",
+"Default Quota" => "Förvald datakvot",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Var god skriv in lagringskvot (ex: \"512MB\" eller \"12 GB\")",
 "Unlimited" => "Obegränsad",
 "Other" => "Annat",
 "Username" => "Användarnamn",
-"Storage" => "Lagring",
+"Quota" => "Kvot",
 "change full name" => "ändra hela namnet",
 "set new password" => "ange nytt lösenord",
 "Default" => "Förvald"
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 1ce8e5b41d5..48fafcdfdf1 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
 "Groups" => "குழுக்கள்",
 "Group Admin" => "குழு நிர்வாகி",
 "Delete" => "நீக்குக",
+"never" => "ஒருபோதும்",
 "__language_name__" => "_மொழி_பெயர்_",
 "None" => "ஒன்றுமில்லை",
 "Login" => "புகுபதிகை",
@@ -36,6 +37,7 @@ $TRANSLATIONS = array(
 "Select an App" => "செயலி ஒன்றை தெரிவுசெய்க",
 "See application page at apps.owncloud.com" => "apps.owncloud.com இல் செயலி பக்கத்தை பார்க்க",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"அனுமதிப்பத்திரம்\"></span>-அனுமதி பெற்ற <span class=\"ஆசிரியர்\"></span>",
+"All" => "எல்லாம்",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்",
 "Password" => "கடவுச்சொல்",
 "Your password was changed" => "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது",
@@ -50,7 +52,9 @@ $TRANSLATIONS = array(
 "Help translate" => "மொழிபெயர்க்க உதவி",
 "Login Name" => "புகுபதிகை",
 "Create" => "உருவாக்குக",
+"Default Quota" => "பொது இருப்பு பங்கு",
 "Other" => "மற்றவை",
-"Username" => "பயனாளர் பெயர்"
+"Username" => "பயனாளர் பெயர்",
+"Quota" => "பங்கு"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index f2fa7dd6ead..527235919c9 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
 "Groups" => "กลุ่ม",
 "Group Admin" => "ผู้ดูแลกลุ่ม",
 "Delete" => "ลบ",
+"never" => "ไม่ต้องเลย",
 "__language_name__" => "ภาษาไทย",
 "None" => "ไม่มี",
 "Login" => "เข้าสู่ระบบ",
@@ -60,6 +61,7 @@ $TRANSLATIONS = array(
 "Select an App" => "เลือก App",
 "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>",
+"All" => "ทั้งหมด",
 "Administrator Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
 "Online Documentation" => "เอกสารคู่มือการใช้งานออนไลน์",
 "Forum" => "กระดานสนทนา",
@@ -81,11 +83,11 @@ $TRANSLATIONS = array(
 "Help translate" => "ช่วยกันแปล",
 "Login Name" => "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
 "Create" => "สร้าง",
-"Default Storage" => "พื้นที่จำกัดข้อมูลเริ่มต้น",
+"Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น",
 "Unlimited" => "ไม่จำกัดจำนวน",
 "Other" => "อื่นๆ",
 "Username" => "ชื่อผู้ใช้งาน",
-"Storage" => "พื้นที่จัดเก็บข้อมูล",
+"Quota" => "พื้นที่",
 "set new password" => "ตั้งค่ารหัสผ่านใหม่",
 "Default" => "ค่าเริ่มต้น"
 );
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 5bb25289b0f..27b1f280d03 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -62,12 +62,15 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir.",
 "Delete encryption keys permanently." => "Şifreleme anahtarlarını kalıcı olarak sil.",
 "Restore encryption keys." => "Şifreleme anahtarlarını geri yükle.",
+"Unable to delete " => "Silinemeyen: ",
+"Error creating group" => "Grup oluşturulurken hata",
+"A valid group name must be provided" => "Geçerli bir grup adı mutlaka sağlanmalı",
 "deleted" => "silinen:",
 "undo" => "geri al",
-"Unable to remove user" => "Kullanıcı kaldırılamıyor",
 "Groups" => "Gruplar",
 "Group Admin" => "Grup Yöneticisi",
 "Delete" => "Sil",
+"never" => "asla",
 "add group" => "grup ekle",
 "A valid username must be provided" => "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
 "Error creating user" => "Kullanıcı oluşturulurken hata",
@@ -91,6 +94,10 @@ $TRANSLATIONS = array(
 "Setup Warning" => "Kurulum Uyarısı",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya eşitlemesine izin vermek üzere düzgün bir şekilde yapılandırılmamış. WebDAV arayüzü sorunlu görünüyor.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> tekrar kontrol edin.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.",
+"Database Performance Info" => "Veritabanı Başarım Bilgisi",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Veritabanı olarak SQLite kullanılacak. Daha büyük kurulumlar için bunu değiştirmenizi öneririz. Farklı bir veritabanına geçiş yapmak için komut satırı aracını kullanın: 'occ db:convert-type'",
 "Module 'fileinfo' missing" => "Modül 'fileinfo' kayıp",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
 "Your PHP version is outdated" => "PHP sürümünüz eski",
@@ -123,7 +130,6 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Kullanıcıların kendileri ile paylaşılan ögeleri yeniden paylaşmasına izin ver",
 "Allow users to share with anyone" => "Kullanıcıların herkesle paylaşmasına izin ver",
 "Allow users to only share with users in their groups" => "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver",
-"Allow mail notification" => "Posta bilgilendirmesine izin ver",
 "Allow users to send mail notification for shared files" => "Paylaşılmış dosyalar için kullanıcıların posta bildirimi göndermesine izin ver",
 "Exclude groups from sharing" => "Grupları paylaşma eyleminden hariç tut",
 "These groups will still be able to receive shares, but not to initiate them." => "Bu gruplar hala paylaşımları alabilecek, ancak başlatamayacaktır.",
@@ -156,6 +162,8 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ",
 "See application website" => "Uygulama web sitesine bakın",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> ile lisanslayan: <span class=\"author\"></span>",
+"Enable only for specific groups" => "Sadece belirli gruplar için etkinleştir",
+"All" => "Tümü",
 "Administrator Documentation" => "Yönetici Belgelendirmesi",
 "Online Documentation" => "Çevrimiçi Belgelendirme",
 "Forum" => "Forum",
@@ -194,12 +202,19 @@ $TRANSLATIONS = array(
 "Create" => "Oluştur",
 "Admin Recovery Password" => "Yönetici Kurtarma Parolası",
 "Enter the recovery password in order to recover the users files during password change" => "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
-"Default Storage" => "Varsayılan Depolama",
+"Search Users and Groups" => "Kullanıcı ve Grupları Ara",
+"Add Group" => "Grup Ekle",
+"Group" => "Grup",
+"Everyone" => "Herkes",
+"Admins" => "Yöneticiler",
+"Default Quota" => "Varsayılan Kota",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")",
 "Unlimited" => "Sınırsız",
 "Other" => "Diğer",
 "Username" => "Kullanıcı Adı",
-"Storage" => "Depolama",
+"Quota" => "Kota",
+"Storage Location" => "Depolama Konumu",
+"Last Login" => "Son Giriş",
 "change full name" => "tam adı değiştir",
 "set new password" => "yeni parola belirle",
 "Default" => "Öntanımlı"
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index 2136f9af1e5..1e0169efa81 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -27,10 +27,10 @@ $TRANSLATIONS = array(
 "Updated" => "يېڭىلاندى",
 "deleted" => "ئۆچۈرۈلگەن",
 "undo" => "يېنىۋال",
-"Unable to remove user" => "ئىشلەتكۈچىنى چىقىرىۋېتەلمەيدۇ",
 "Groups" => "گۇرۇپپا",
 "Group Admin" => "گۇرۇپپا باشقۇرغۇچى",
 "Delete" => "ئۆچۈر",
+"never" => "ھەرگىز",
 "add group" => "گۇرۇپپا قوش",
 "A valid username must be provided" => "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
 "Error creating user" => "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
@@ -54,6 +54,7 @@ $TRANSLATIONS = array(
 "Add your App" => "ئەپىڭىزنى قوشۇڭ",
 "More Apps" => "تېخىمۇ كۆپ ئەپلەر",
 "Select an App" => "بىر ئەپ تاللاڭ",
+"All" => "ھەممىسى",
 "Administrator Documentation" => "باشقۇرغۇچى قوللانمىسى",
 "Online Documentation" => "توردىكى قوللانما",
 "Forum" => "مۇنبەر",
@@ -70,11 +71,9 @@ $TRANSLATIONS = array(
 "Help translate" => "تەرجىمىگە ياردەم",
 "Login Name" => "تىزىمغا كىرىش ئاتى",
 "Create" => "قۇر",
-"Default Storage" => "كۆڭۈلدىكى ساقلىغۇچ",
 "Unlimited" => "چەكسىز",
 "Other" => "باشقا",
 "Username" => "ئىشلەتكۈچى ئاتى",
-"Storage" => "ساقلىغۇچ",
 "set new password" => "يېڭى ئىم تەڭشە",
 "Default" => "كۆڭۈلدىكى"
 );
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index a1520a0defc..4997dadb4bb 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -32,10 +32,10 @@ $TRANSLATIONS = array(
 "Strong password" => "Надійний пароль",
 "deleted" => "видалені",
 "undo" => "відмінити",
-"Unable to remove user" => "Неможливо видалити користувача",
 "Groups" => "Групи",
 "Group Admin" => "Адміністратор групи",
 "Delete" => "Видалити",
+"never" => "ніколи",
 "add group" => "додати групу",
 "A valid username must be provided" => "Потрібно задати вірне ім'я користувача",
 "Error creating user" => "Помилка при створенні користувача",
@@ -77,6 +77,7 @@ $TRANSLATIONS = array(
 "Select an App" => "Вибрати додаток",
 "See application page at apps.owncloud.com" => "Перегляньте сторінку програм на apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
+"All" => "Всі",
 "Administrator Documentation" => "Документація Адміністратора",
 "Online Documentation" => "Он-Лайн Документація",
 "Forum" => "Форум",
@@ -98,11 +99,11 @@ $TRANSLATIONS = array(
 "Help translate" => "Допомогти з перекладом",
 "Login Name" => "Ім'я Логіну",
 "Create" => "Створити",
-"Default Storage" => "сховище за замовчуванням",
+"Default Quota" => "Квота за замовчуванням",
 "Unlimited" => "Необмежено",
 "Other" => "Інше",
 "Username" => "Ім'я користувача",
-"Storage" => "Сховище",
+"Quota" => "Квота",
 "set new password" => "встановити новий пароль",
 "Default" => "За замовчуванням"
 );
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index ef8c20ef94e..c2fca2200ca 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -30,10 +30,10 @@ $TRANSLATIONS = array(
 "Updated" => "Đã cập nhật",
 "deleted" => "đã xóa",
 "undo" => "lùi lại",
-"Unable to remove user" => "Không thể xóa người ",
 "Groups" => "Nhóm",
 "Group Admin" => "Nhóm quản trị",
 "Delete" => "Xóa",
+"never" => "không thay đổi",
 "__language_name__" => "__Ngôn ngữ___",
 "None" => "Không gì cả",
 "Login" => "Đăng nhập",
@@ -63,6 +63,7 @@ $TRANSLATIONS = array(
 "Select an App" => "Chọn một ứng dụng",
 "See application page at apps.owncloud.com" => "Xem nhiều ứng dụng hơn 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>",
+"All" => "Tất cả",
 "Administrator Documentation" => "Tài liệu quản trị",
 "Online Documentation" => "Tài liệu trực tuyến",
 "Forum" => "Diễn đàn",
@@ -88,11 +89,12 @@ $TRANSLATIONS = array(
 "Help translate" => "Hỗ trợ dịch thuật",
 "Login Name" => "Tên đăng nhập",
 "Create" => "Tạo",
-"Default Storage" => "Bộ nhớ mặc định",
+"Group" => "N",
+"Default Quota" => "Hạn ngạch mặt định",
 "Unlimited" => "Không giới hạn",
 "Other" => "Khác",
 "Username" => "Tên đăng nhập",
-"Storage" => "Bộ nhớ",
+"Quota" => "Hạn ngạch",
 "change full name" => "Đổi họ và t",
 "set new password" => "đặt mật khẩu mới",
 "Default" => "Mặc định"
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 8f35fd938a4..8bf9edf94a4 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -58,10 +58,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "正在解密文件... 请稍等，可能需要一些时间。",
 "deleted" => "已经删除",
 "undo" => "撤销",
-"Unable to remove user" => "无法移除用户",
 "Groups" => "组",
 "Group Admin" => "组管理员",
 "Delete" => "删除",
+"never" => "从不",
 "add group" => "添加组",
 "A valid username must be provided" => "必须提供合法的用户名",
 "Error creating user" => "创建用户出错",
@@ -116,7 +116,6 @@ $TRANSLATIONS = array(
 "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" => "允许用户只向同组用户共享",
-"Allow mail notification" => "允许邮件通知",
 "Allow users to send mail notification for shared files" => "允许用户发送共享文件的邮件通知",
 "Security" => "安全",
 "Enforce HTTPS" => "强制使用 HTTPS",
@@ -146,6 +145,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程序页面",
 "See application website" => "参见应用程序网站",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准： <span class=\"author\"></span>",
+"All" => "全部",
 "Administrator Documentation" => "管理员文档",
 "Online Documentation" => "在线文档",
 "Forum" => "论坛",
@@ -181,12 +181,13 @@ $TRANSLATIONS = array(
 "Create" => "创建",
 "Admin Recovery Password" => "管理恢复密码",
 "Enter the recovery password in order to recover the users files during password change" => "输入恢复密码来在更改密码的时候恢复用户文件",
-"Default Storage" => "默认存储",
+"Group" => "分组",
+"Default Quota" => "默认配额",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "请输入存储限额 (ex: \"512 MB\" or \"12 GB\")",
 "Unlimited" => "无限",
 "Other" => "其它",
 "Username" => "用户名",
-"Storage" => "存储",
+"Quota" => "配额",
 "change full name" => "更改全名",
 "set new password" => "设置新密码",
 "Default" => "默认"
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index c60ca4223e8..e68498e3d70 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -58,10 +58,10 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "檔案解密中，請稍候。",
 "deleted" => "已刪除",
 "undo" => "復原",
-"Unable to remove user" => "無法刪除用戶",
 "Groups" => "群組",
 "Group Admin" => "群組管理員",
 "Delete" => "刪除",
+"never" => "永不",
 "add group" => "新增群組",
 "A valid username must be provided" => "必須提供一個有效的用戶名",
 "Error creating user" => "建立用戶時出現錯誤",
@@ -112,7 +112,6 @@ $TRANSLATIONS = array(
 "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" => "僅允許使用者在群組內分享",
-"Allow mail notification" => "允許郵件通知",
 "Allow users to send mail notification for shared files" => "允許使用者寄送有關分享檔案的郵件通知",
 "Security" => "安全性",
 "Enforce HTTPS" => "強制啟用 HTTPS",
@@ -142,6 +141,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "查看應用程式頁面於 apps.owncloud.com",
 "See application website" => "檢視應用程式網站",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>",
+"All" => "所有",
 "Administrator Documentation" => "管理者說明文件",
 "Online Documentation" => "線上說明文件",
 "Forum" => "論壇",
@@ -177,12 +177,12 @@ $TRANSLATIONS = array(
 "Create" => "建立",
 "Admin Recovery Password" => "管理者復原密碼",
 "Enter the recovery password in order to recover the users files during password change" => "為了修改密碼時能夠取回使用者資料，請輸入另一組還原用密碼",
-"Default Storage" => "預設儲存區",
+"Default Quota" => "預設容量限制",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "請輸入空間配額(例如: \"512 MB\"或是 \"12 GB\")",
 "Unlimited" => "無限制",
 "Other" => "其他",
 "Username" => "使用者名稱",
-"Storage" => "儲存區",
+"Quota" => "容量限制",
 "change full name" => "變更全名",
 "set new password" => "設定新密碼",
 "Default" => "預設"
diff --git a/settings/routes.php b/settings/routes.php
index 433c5d5706e..1c8ad1b3fe8 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -25,6 +25,8 @@ $this->create('settings_admin', '/settings/admin')
 // users
 $this->create('settings_ajax_userlist', '/settings/ajax/userlist')
 	->actionInclude('settings/ajax/userlist.php');
+$this->create('settings_ajax_grouplist', '/settings/ajax/grouplist')
+	->actionInclude('settings/ajax/grouplist.php');
 $this->create('settings_ajax_createuser', '/settings/ajax/createuser.php')
 	->actionInclude('settings/ajax/createuser.php');
 $this->create('settings_ajax_removeuser', '/settings/ajax/removeuser.php')
@@ -44,6 +46,8 @@ $this->create('settings_users_changepassword', '/settings/users/changepassword')
 	->action('OC\Settings\ChangePassword\Controller', 'changeUserPassword');
 $this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php')
 	->actionInclude('settings/ajax/changedisplayname.php');
+$this->create('settings_ajax_changegorupname', '/settings/ajax/changegroupname.php')
+	->actionInclude('settings/ajax/changegroupname.php');	
 // personal
 $this->create('settings_personal_changepassword', '/settings/personal/changepassword')
 	->post()
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index a86fe9c0ac7..8ed22e98b52 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -98,6 +98,20 @@ if (!$_['isAnnotationsWorking']) {
 <?php
 }
 
+// SQLite database performance issue
+if ($_['databaseOverload']) {
+	?>
+<div class="section">
+	<h2><?php p($l->t('Database Performance Info'));?></h2>
+
+	<p class="securitywarning">
+		<?php p($l->t('SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: \'occ db:convert-type\'')); ?>
+	</p>
+
+</div>
+<?php
+}
+
 // if module fileinfo available?
 if (!$_['has_fileinfo']) {
 	?>
@@ -263,24 +277,21 @@ if (!$_['internetconnectionworking']) {
 					   value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
 				<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
 				<em><?php p($l->t('Allow users to share items shared with them again')); ?></em>
-			</td>
-		</tr>
-		<tr>
-			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
-				<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
-					   value="global" <?php if ($_['sharePolicy'] === 'global') print_unescaped('checked="checked"'); ?> />
-				<label for="sharePolicyGlobal"><?php p($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') print_unescaped('checked="checked"'); ?> />
-				<label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/>
+				<div id="resharingSettings" <?php ($_['allowResharing'] === 'yes') ? print_unescaped('class="indent"') : print_unescaped('class="hidden indent"');?>>
+					<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
+						    value="global" <?php if ($_['sharePolicy'] === 'global') print_unescaped('checked="checked"'); ?> />
+					<label for="sharePolicyGlobal"><?php p($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') print_unescaped('checked="checked"'); ?> />
+					<label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/>
+				</div>
 			</td>
 		</tr>
 		<tr>
 			<td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
 				<input type="checkbox" name="shareapi_allow_mail_notification" id="allowMailNotification"
 					   value="1" <?php if ($_['allowMailNotification'] === 'yes') print_unescaped('checked="checked"'); ?> />
-				<label for="allowMailNotification"><?php p($l->t('Allow mail notification'));?></label><br/>
-				<em><?php p($l->t('Allow users to send mail notification for shared files')); ?></em>
+				<label for="allowMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></label><br/>
 			</td>
 		</tr>
 		<tr>
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index e2bc78b07fa..b35eda4350c 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -16,7 +16,7 @@
 		<?php endif; ?>
 
 		<?php foreach($_['apps'] as $app):?>
-		<li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>"
+		<li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>" data-groups="<?php p($app['groups']) ?>"
 			<?php if ( isset( $app['ocs_id'] ) ) { print_unescaped("data-id-ocs=\"{".OC_Util::sanitizeHTML($app['ocs_id'])."}\""); } ?>
 				data-type="<?php p($app['internal'] ? 'internal' : 'external') ?>" data-installed="1">
 			<a class="app<?php if(!$app['internal']) p(' externalapp') ?>"
@@ -54,6 +54,16 @@
 	<input class="enable hidden" type="submit" />
 	<input class="update hidden" type="submit" value="<?php p($l->t('Update')); ?>" />
 	<input class="uninstall hidden" type="submit" value="<?php p($l->t('Uninstall')); ?>"/>
+	<br />
+	<input class="hidden" type="checkbox" id="groups_enable"/>
+	<label class="hidden" for="groups_enable"><?php p($l->t('Enable only for specific groups')); ?></label>
+	<br />
+	<select class="hidden" id="group_select" multiple="multiple" title="<?php p($l->t('All')); ?>">
+		<?php foreach($_['groups'] as $group):?>
+			<option value="<?php p($group);?>"><?php p($group); ?></option>
+		<?php endforeach;?>
+	</select>
+
 	<div class="warning hidden"></div>
 	</div>
 </div>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 3739d220e6e..403dde30dae 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,21 +1,48 @@
-<div id="controls">
+<div id="app-navigation">
+	<ul>
 	<?php if($_['admin']) { ?>
-		<a class="button newquestion <?php p($_['style1']); ?>"
-			href="<?php print_unescaped($_['url1']); ?>"><?php p($l->t( 'User Documentation' )); ?></a>
-		<a class="button newquestion <?php p($_['style2']); ?>"
-			href="<?php print_unescaped($_['url2']); ?>"><?php p($l->t( 'Administrator Documentation' )); ?></a>
+		<li>
+			<a class="<?php p($_['style1']); ?>"
+				href="<?php print_unescaped($_['url1']); ?>">
+				<?php p($l->t( 'User Documentation' )); ?>
+			</a>
+		</li>
+		<li>
+			<a class="<?php p($_['style2']); ?>"
+				href="<?php print_unescaped($_['url2']); ?>">
+				<?php p($l->t( 'Administrator Documentation' )); ?>
+			</a>
+		</li>
 	<?php } ?>
-	<a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php
-		p($l->t( 'Online Documentation' )); ?></a>
-	<a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php
-		p($l->t( 'Forum' )); ?></a>
+
+		<li>
+			<a href="http://owncloud.org/support" target="_blank">
+				<?php p($l->t( 'Online Documentation' )); ?> ↗
+			</a>
+		</li>
+		<li>
+			<a href="https://forum.owncloud.org" target="_blank">
+				<?php p($l->t( 'Forum' )); ?> ↗
+			</a>
+		</li>
+
 	<?php if($_['admin']) { ?>
-		<a class="button newquestion" href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md" target="_blank"><?php
-			p($l->t( 'Bugtracker' )); ?></a>
+		<li>
+			<a href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md"
+				target="_blank">
+				<?php p($l->t( 'Bugtracker' )); ?> ↗
+			</a>
+		</li>
 	<?php } ?>
-	<a class="button newquestion" href="http://owncloud.com" target="_blank"><?php
-		p($l->t( 'Commercial Support' )); ?></a>
+
+	<li>
+		<a href="https://owncloud.com" target="_blank">
+			<?php p($l->t( 'Commercial Support' )); ?> ↗
+		</a>
+	</li>
 </div>
-<div class="help-includes">
-	<iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe">abc</iframe>
+
+<div id="app-content" class="help-includes">
+	<iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe">
+	</iframe>
 </div>
diff --git a/settings/templates/users.php b/settings/templates/users.php
deleted file mode 100644
index 937b40611b0..00000000000
--- a/settings/templates/users.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?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'];
-}
-$_['subadmingroups'] = $allGroups;
-$items = array_flip($_['subadmingroups']);
-unset($items['admin']);
-$_['subadmingroups'] = array_flip($items);
-?>
-
-<div id="controls">
-	<form id="newuser" autocomplete="off">
-		<input id="newusername" type="text" placeholder="<?php p($l->t('Login Name'))?>" /> <input
-			type="password" id="newuserpassword"
-			placeholder="<?php p($l->t('Password'))?>" /> <select
-			class="groupsselect"
-			id="newusergroups" data-placeholder="groups"
-			title="<?php p($l->t('Groups'))?>" multiple="multiple">
-			<?php foreach($_["groups"] as $group): ?>
-			<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
-			<?php endforeach;?>
-		</select> <input type="submit" value="<?php p($l->t('Create'))?>" />
-	</form>
-	<?php if((bool)$_['recoveryAdminEnabled']): ?>
-	<div class="recoveryPassword">
-	<input id="recoveryPassword"
-		   type="password"
-		   placeholder="<?php p($l->t('Admin Recovery Password'))?>"
-		   title="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"
-		   alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
-	</div>
-	<?php endif; ?>
-	<div class="quota">
-		<span><?php p($l->t('Default Storage'));?></span>
-			<?php if((bool) $_['isadmin']): ?>
-			<select class='quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
-				<option
-					<?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?>
-						value='none'>
-					<?php p($l->t('Unlimited'));?>
-				</option>
-				<?php foreach($_['quota_preset'] as $preset):?>
-				<?php if($preset !== 'default'):?>
-				<option
-				<?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?>
-					value='<?php p($preset);?>'>
-					<?php p($preset);?>
-				</option>
-				<?php endif;?>
-				<?php endforeach;?>
-				<?php if($_['defaultQuotaIsUserDefined']):?>
-				<option selected="selected"
-					value='<?php p($_['default_quota']);?>'>
-					<?php p($_['default_quota']);?>
-				</option>
-				<?php endif;?>
-				<option data-new value='other'>
-					<?php p($l->t('Other'));?>
-					...
-				</option>
-			</select>
-			<?php endif; ?>
-			<?php if((bool) !$_['isadmin']): ?>
-				<select class='quota' disabled="disabled">
-					<option selected="selected">
-				<?php p($_['default_quota']);?>
-					</option>
-				</select>
-			<?php endif; ?>
-	</div>
-</div>
-
-<table class="hascontrols grid" data-groups="<?php p(json_encode($allGroups));?>">
-	<thead>
-		<tr>
-			<?php if ($_['enableAvatars']): ?>
-			<th id='headerAvatar'></th>
-			<?php endif; ?>
-			<th id='headerName'><?php p($l->t('Username'))?></th>
-			<th id="headerDisplayName"><?php p($l->t( 'Full Name' )); ?></th>
-			<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
-			<th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th>
-			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
-			<th id="headerSubAdmins"><?php p($l->t('Group Admin')); ?></th>
-			<?php endif;?>
-			<th id="headerQuota"><?php p($l->t('Storage')); ?></th>
-			<th id="headerRemove">&nbsp;</th>
-		</tr>
-	</thead>
-	<tbody>
-		<?php foreach($_["users"] as $user): ?>
-		<tr data-uid="<?php p($user["name"]) ?>"
-			data-displayName="<?php p($user["displayName"]) ?>">
-			<?php if ($_['enableAvatars']): ?>
-			<td class="avatar"><div class="avatardiv"></div></td>
-			<?php endif; ?>
-			<td class="name"><?php p($user["name"]); ?></td>
-			<td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action"
-				src="<?php p(image_path('core', 'actions/rename.svg'))?>"
-				alt="<?php p($l->t("change full name"))?>" title="<?php p($l->t("change full name"))?>"/>
-			</td>
-			<td class="password"><span>●●●●●●●</span> <img class="svg action"
-				src="<?php print_unescaped(image_path('core', 'actions/rename.svg'))?>"
-				alt="<?php p($l->t("set new password"))?>" title="<?php p($l->t("set new password"))?>"/>
-			</td>
-			<td class="groups"><select
-				class="groupsselect"
-				data-username="<?php p($user['name']) ;?>"
-				data-user-groups="<?php p(json_encode($user['groups'])) ;?>"
-				data-placeholder="groups" title="<?php p($l->t('Groups'))?>"
-				multiple="multiple">
-					<?php foreach($_["groups"] as $group): ?>
-					<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
-					<?php endforeach;?>
-			</select>
-			</td>
-			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
-			<td class="subadmins"><select
-				class="subadminsselect"
-				data-username="<?php p($user['name']) ;?>"
-				data-subadmin="<?php p(json_encode($user['subadmin']));?>"
-				data-placeholder="subadmins" title="<?php p($l->t('Group Admin'))?>"
-				multiple="multiple">
-					<?php foreach($_["subadmingroups"] as $group): ?>
-					<option value="<?php p($group);?>"><?php p($group);?></option>
-					<?php endforeach;?>
-			</select>
-			</td>
-			<?php endif;?>
-			<td class="quota">
-				<select class='quota-user' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
-					<option
-						<?php if($user['quota'] === 'default') print_unescaped('selected="selected"');?>
-							value='default'>
-						<?php p($l->t('Default'));?>
-					</option>
-					<option
-					<?php if($user['quota'] === 'none') print_unescaped('selected="selected"');?>
-							value='none'>
-						<?php p($l->t('Unlimited'));?>
-					</option>
-					<?php foreach($_['quota_preset'] as $preset):?>
-					<option
-					<?php if($user['quota']==$preset) print_unescaped('selected="selected"');?>
-						value='<?php p($preset);?>'>
-						<?php p($preset);?>
-					</option>
-					<?php endforeach;?>
-					<?php if($user['isQuotaUserDefined']):?>
-					<option selected="selected" value='<?php p($user['quota']);?>'>
-						<?php p($user['quota']);?>
-					</option>
-					<?php endif;?>
-					<option value='other' data-new>
-						<?php p($l->t('Other'));?>
-						...
-					</option>
-				</select>
-			</td>
-			<td class="remove">
-				<?php if($user['name']!=OC_User::getUser()):?>
-					<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
-						<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
-					</a>
-				<?php endif;?>
-			</td>
-		</tr>
-		<?php endforeach; ?>
-	</tbody>
-</table>
diff --git a/settings/templates/users/main.php b/settings/templates/users/main.php
new file mode 100644
index 00000000000..c5805d53476
--- /dev/null
+++ b/settings/templates/users/main.php
@@ -0,0 +1,32 @@
+<?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.
+ */
+$userlistParams = array();
+$allGroups=array();
+foreach($_["groups"] as $group) {
+	$allGroups[] = $group['name'];
+}
+foreach($_["adminGroup"] as $group) {
+	$allGroups[] = $group['name'];
+}
+$userlistParams['subadmingroups'] = $allGroups;
+$userlistParams['allGroups'] = json_encode($allGroups);
+$items = array_flip($userlistParams['subadmingroups']);
+unset($items['admin']);
+$userlistParams['subadmingroups'] = array_flip($items);
+?>
+
+<div id="app-navigation">
+	<?php print_unescaped($this->inc('users/part.grouplist')); ?>
+	<div id="app-settings">
+		<?php print_unescaped($this->inc('users/part.setquota')); ?>
+	</div>
+</div>
+
+<div id="app-content">
+	<?php print_unescaped($this->inc('users/part.createuser')); ?>
+	<?php print_unescaped($this->inc('users/part.userlist', $userlistParams)); ?>
+</div>
\ No newline at end of file
diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
new file mode 100644
index 00000000000..4d573168fc1
--- /dev/null
+++ b/settings/templates/users/part.createuser.php
@@ -0,0 +1,34 @@
+<div id="user-controls">
+	<form id="newuser" autocomplete="off">
+		<input id="newusername" type="text"
+			placeholder="<?php p($l->t('Login Name'))?>"
+			autocomplete="off" autocapitalize="off" autocorrect="off" />
+		<input
+			type="password" id="newuserpassword"
+			placeholder="<?php p($l->t('Password'))?>"
+			autocomplete="off" autocapitalize="off" autocorrect="off" />
+		<select
+			class="groupsselect" id="newusergroups" data-placeholder="groups"
+			title="<?php p($l->t('Groups'))?>" multiple="multiple">
+			<?php foreach($_["adminGroup"] as $adminGroup): ?>
+				<option value="<?php p($adminGroup['name']);?>"><?php p($adminGroup['name']); ?></option>
+			<?php endforeach; ?>
+			<?php foreach($_["groups"] as $group): ?>
+				<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
+			<?php endforeach;?>
+		</select>
+		<input type="submit" class="button" value="<?php p($l->t('Create'))?>" />
+	</form>
+	<?php if((bool)$_['recoveryAdminEnabled']): ?>
+	<div class="recoveryPassword">
+	<input id="recoveryPassword"
+		   type="password"
+		   placeholder="<?php p($l->t('Admin Recovery Password'))?>"
+		   title="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"
+		   alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
+	</div>
+	<?php endif; ?>
+	<form autocomplete="off" id="usersearchform">
+		<input type="text" class="input userFilter" placeholder="<?php p($l->t('Search Users and Groups')); ?>" />
+	</form>
+</div>
\ No newline at end of file
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
new file mode 100644
index 00000000000..593c202f2c9
--- /dev/null
+++ b/settings/templates/users/part.grouplist.php
@@ -0,0 +1,50 @@
+<ul id="usergrouplist">
+	<!-- Add new group -->
+	<li id="newgroup-init">
+		<a href="#">
+			<span><?php p($l->t('Add Group'))?></span>
+		</a>
+	</li>
+	<li id="newgroup-form">
+		<form>
+			<input type="text" id="newgroupname" placeholder="<?php p($l->t('Group')); ?>..." />
+			<input type="submit" class="button icon-add" value="" />
+		</form>
+	</li>
+	<!-- Everyone -->
+	<li data-gid="" class="isgroup">
+		<a href="#">
+			<span class="groupname">
+				<?php p($l->t('Everyone')); ?>
+			</span>
+		</a>
+		<span class="utils">
+			<span class="usercount"></span>
+		</span>
+	</li>
+
+	<!-- The Admin Group -->
+	<?php foreach($_["adminGroup"] as $adminGroup): ?>
+		<li data-gid="admin" class="isgroup">
+			<a href="#"><span class="groupname"><?php p($l->t('Admins')); ?></span></a>
+			<span class="utils">
+				<span class="usercount"><?php if($adminGroup['usercount'] > 0) { p($adminGroup['usercount']); } ?></span>
+			</span>
+		</li>
+	<?php endforeach; ?>
+
+	<!--List of Groups-->
+	<?php foreach($_["groups"] as $group): ?>
+		<li data-gid="<?php p($group['name']) ?>" data-usercount="<?php p($group['usercount']) ?>" class="isgroup">
+			<a href="#" class="dorename">
+				<span class="groupname"><?php p($group['name']); ?></span>
+			</a>
+			<span class="utils">
+				<span class="usercount"><?php if($group['usercount'] > 0) { p($group['usercount']); } ?></span>
+				<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
+					<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
+				</a>
+			</span>
+		</li>
+	<?php endforeach; ?>
+</ul>
diff --git a/settings/templates/users/part.setquota.php b/settings/templates/users/part.setquota.php
new file mode 100644
index 00000000000..fc5624d069a
--- /dev/null
+++ b/settings/templates/users/part.setquota.php
@@ -0,0 +1,39 @@
+<div id="app-settings-header">
+	<button class="settings-button" tabindex="0"></button>
+</div>
+<div id="app-settings-content">
+	<div class="quota">
+		<!-- Default storage -->
+		<span><?php p($l->t('Default Quota'));?></span>
+		<?php if((bool) $_['isAdmin']): ?>
+			<select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
+				<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
+					<?php p($l->t('Unlimited'));?>
+				</option>
+				<?php foreach($_['quota_preset'] as $preset):?>
+					<?php if($preset !== 'default'):?>
+						<option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'>
+							<?php p($preset);?>
+						</option>
+					<?php endif;?>
+				<?php endforeach;?>
+				<?php if($_['defaultQuotaIsUserDefined']):?>
+					<option selected="selected" value='<?php p($_['default_quota']);?>'>
+						<?php p($_['default_quota']);?>
+					</option>
+				<?php endif;?>
+				<option data-new value='other'>
+					<?php p($l->t('Other'));?>
+					...
+				</option>
+			</select>
+		<?php endif; ?>
+		<?php if((bool) !$_['isAdmin']): ?>
+			<select class='quota' disabled="disabled">
+				<option selected="selected">
+					<?php p($_['default_quota']);?>
+				</option>
+			</select>
+		<?php endif; ?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
new file mode 100644
index 00000000000..c74fdcc9efa
--- /dev/null
+++ b/settings/templates/users/part.userlist.php
@@ -0,0 +1,116 @@
+<table id="userlist" class="hascontrols grid" data-groups="<?php p($_['allGroups']);?>">
+	<thead>
+		<tr>
+			<?php if ($_['enableAvatars']): ?>
+			<th id='headerAvatar'></th>
+			<?php endif; ?>
+			<th id='headerName'><?php p($l->t('Username'))?></th>
+			<th id="headerDisplayName"><?php p($l->t( 'Full Name' )); ?></th>
+			<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
+			<th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th>
+			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
+			<th id="headerSubAdmins"><?php p($l->t('Group Admin')); ?></th>
+			<?php endif;?>
+			<th id="headerQuota"><?php p($l->t('Quota')); ?></th>
+			<th id="headerStorageLocation"><?php p($l->t('Storage Location')); ?></th>
+			<th id="headerLastLogin"><?php p($l->t('Last Login')); ?></th>
+			<th id="headerRemove">&nbsp;</th>
+		</tr>
+	</thead>
+	<tbody>
+		<?php foreach($_["users"] as $user): ?>
+		<tr data-uid="<?php p($user["name"]) ?>"
+			data-displayname="<?php p($user["displayName"]) ?>">
+			<?php if ($_['enableAvatars']): ?>
+			<td class="avatar"><div class="avatardiv"></div></td>
+			<?php endif; ?>
+			<td class="name"><?php p($user["name"]); ?></td>
+			<td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action"
+				src="<?php p(image_path('core', 'actions/rename.svg'))?>"
+				alt="<?php p($l->t("change full name"))?>" title="<?php p($l->t("change full name"))?>"/>
+			</td>
+			<td class="password"><span>●●●●●●●</span> <img class="svg action"
+				src="<?php print_unescaped(image_path('core', 'actions/rename.svg'))?>"
+				alt="<?php p($l->t("set new password"))?>" title="<?php p($l->t("set new password"))?>"/>
+			</td>
+			<td class="groups">
+				<select
+					class="groupsselect"
+					data-username="<?php p($user['name']) ;?>"
+					data-user-groups="<?php p(json_encode($user['groups'])) ;?>"
+					data-placeholder="groups" title="<?php p($l->t('Groups'))?>"
+					multiple="multiple">
+						<?php foreach($_["adminGroup"] as $adminGroup): ?>
+						<option value="<?php p($adminGroup['name']);?>"><?php p($adminGroup['name']); ?></option>
+						<?php endforeach; ?>
+						<?php foreach($_["groups"] as $group): ?>
+						<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
+						<?php endforeach;?>
+				</select>
+			</td>
+			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
+				<td class="subadmins">
+					<select
+						class="subadminsselect"
+						data-username="<?php p($user['name']) ;?>"
+						data-subadmin="<?php p(json_encode($user['subadmin']));?>"
+						data-placeholder="subadmins" title="<?php p($l->t('Group Admin'))?>"
+						multiple="multiple">
+						<?php foreach($_["subadmingroups"] as $group): ?>
+							<option value="<?php p($group);?>"><?php p($group);?></option>
+						<?php endforeach;?>
+					</select>
+				</td>
+			<?php endif;?>
+			<td class="quota">
+				<select class='quota-user' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
+					<option
+						<?php if($user['quota'] === 'default') print_unescaped('selected="selected"');?>
+							value='default'>
+						<?php p($l->t('Default'));?>
+					</option>
+					<option
+					<?php if($user['quota'] === 'none') print_unescaped('selected="selected"');?>
+							value='none'>
+						<?php p($l->t('Unlimited'));?>
+					</option>
+					<?php foreach($_['quota_preset'] as $preset):?>
+					<option
+					<?php if($user['quota']==$preset) print_unescaped('selected="selected"');?>
+						value='<?php p($preset);?>'>
+						<?php p($preset);?>
+					</option>
+					<?php endforeach;?>
+					<?php if($user['isQuotaUserDefined']):?>
+					<option selected="selected" value='<?php p($user['quota']);?>'>
+						<?php p($user['quota']);?>
+					</option>
+					<?php endif;?>
+					<option value='other' data-new>
+						<?php p($l->t('Other'));?>
+						...
+					</option>
+				</select>
+			</td>
+			<td class="storageLocation"><?php p($user["storageLocation"]); ?></td>
+			<?php
+			if($user["lastLogin"] === 0) {
+				$lastLogin = $l->t('never');
+				$lastLoginDate = '';
+			} else {
+				$lastLogin = relative_modified_date($user["lastLogin"]);
+				$lastLoginDate = \OC_Util::formatDate($user["lastLogin"]);
+			}
+			?>
+			<td class="lastLogin" title="<?php p('<span style="white-space: nowrap;">'.$lastLoginDate.'</span>'); ?>"><?php p($lastLogin); ?></td>
+			<td class="remove">
+				<?php if($user['name']!=OC_User::getUser()):?>
+					<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
+						<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
+					</a>
+				<?php endif;?>
+			</td>
+		</tr>
+		<?php endforeach; ?>
+	</tbody>
+</table>
diff --git a/settings/users.php b/settings/users.php
index f09d0e90d3c..8f72fc9d5c8 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -8,7 +8,10 @@
 OC_Util::checkSubAdminUser();
 
 // We have some javascript foo!
-OC_Util::addScript( 'settings', 'users' );
+OC_Util::addScript('settings', 'users/deleteHandler');
+OC_Util::addScript('settings', 'users/filter');
+OC_Util::addScript( 'settings', 'users/users' );
+OC_Util::addScript( 'settings', 'users/groups' );
 OC_Util::addScript( 'core', 'multiselect' );
 OC_Util::addScript( 'core', 'singleselect' );
 OC_Util::addScript('core', 'jquery.inview');
@@ -16,19 +19,23 @@ OC_Util::addStyle( 'settings', 'settings' );
 OC_App::setActiveNavigationEntry( 'core_users' );
 
 $users = array();
-$groups = array();
+$userManager = \OC_User::getManager();
+$groupManager = \OC_Group::getManager();
+
+$isAdmin = OC_User::isAdminUser(OC_User::getUser());
+
+$groupsInfo = new \OC\Group\MetaData(OC_User::getUser(), $isAdmin, $groupManager);
+$groupsInfo->setSorting($groupsInfo::SORT_USERCOUNT);
+list($adminGroup, $groups) = $groupsInfo->get();
 
-$isadmin = OC_User::isAdminUser(OC_User::getUser());
 $recoveryAdminEnabled = OC_App::isEnabled('files_encryption') &&
 					    OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
 
-if($isadmin) {
-	$accessiblegroups = OC_Group::getGroups();
-	$accessibleusers = OC_User::getDisplayNames('', 30);
+if($isAdmin) {
+	$accessibleUsers = OC_User::getDisplayNames('', 30);
 	$subadmins = OC_SubAdmin::getAllSubAdmins();
 }else{
-	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
-	$accessibleusers = OC_Group::displayNamesInGroups($accessiblegroups, '', 30);
+	$accessibleUsers = OC_Group::displayNamesInGroups($groups, '', 30);
 	$subadmins = false;
 }
 
@@ -45,7 +52,7 @@ $defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false
 	&& array_search($defaultQuota, array('none', 'default'))===false;
 
 // load users and quota
-foreach($accessibleusers as $uid => $displayName) {
+foreach($accessibleUsers as $uid => $displayName) {
 	$quota=OC_Preferences::getValue($uid, 'files', 'quota', 'default');
 	$isQuotaUserDefined=array_search($quota, $quotaPreset)===false
 		&& array_search($quota, array('none', 'default'))===false;
@@ -55,6 +62,7 @@ foreach($accessibleusers as $uid => $displayName) {
 		$name = $name . ' ('.$uid.')';
 	}
 
+	$user = $userManager->get($uid);
 	$users[] = array(
 		"name" => $uid,
 		"displayName" => $displayName,
@@ -62,23 +70,21 @@ foreach($accessibleusers as $uid => $displayName) {
 		'quota' => $quota,
 		'isQuotaUserDefined' => $isQuotaUserDefined,
 		'subadmin' => OC_SubAdmin::getSubAdminsGroups($uid),
+		'storageLocation' => $user->getHome(),
+		'lastLogin' => $user->getLastLogin(),
 	);
 }
 
-foreach( $accessiblegroups as $i ) {
-	// Do some more work here soon
-	$groups[] = array( "name" => $i );
-}
-
-$tmpl = new OC_Template( "settings", "users", "user" );
+$tmpl = new OC_Template( "settings", "users/main", "user" );
 $tmpl->assign( 'users', $users );
 $tmpl->assign( 'groups', $groups );
-$tmpl->assign( 'isadmin', (int) $isadmin);
+$tmpl->assign( 'adminGroup', $adminGroup );
+$tmpl->assign( 'isAdmin', (int) $isAdmin);
 $tmpl->assign( 'subadmins', $subadmins);
-$tmpl->assign( 'numofgroups', count($accessiblegroups));
+$tmpl->assign( 'numofgroups', count($groups) + count($adminGroup));
 $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);
 $tmpl->assign( 'defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined);
 $tmpl->assign( 'recoveryAdminEnabled', $recoveryAdminEnabled);
-$tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
+$tmpl->assign( 'enableAvatars', \OC_Config::getValue('enable_avatars', true));
 $tmpl->printPage();