merge master

Merge branch 'master' into improved_appsmanagement

Conflicts:
	settings/apps.php
	settings/templates/apps.php

79 files changed, 423 insertions, 410 deletions

diff --git a/settings/ajax/changedisplayname.php b/settings/ajax/changedisplayname.php
new file mode 100644
index 00000000000..f80ecb7a0c9
--- /dev/null
+++ b/settings/ajax/changedisplayname.php
@@ -0,0 +1,28 @@
+<?php

+// Check if we are a user

+OCP\JSON::callCheck();

+OC_JSON::checkLoggedIn();

+

+$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();

+$displayName = $_POST["displayName"];

+

+$userstatus = null;

+if(OC_User::isAdminUser(OC_User::getUser())) {

+	$userstatus = 'admin';

+}

+if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {

+	$userstatus = 'subadmin';

+}

+

+if(is_null($userstatus)) {

+	OC_JSON::error( array( "data" => array( "message" => "Authentication error" )));

+	exit();

+}

+

+// Return Success story

+if( OC_User::setDisplayName( $username, $displayName )) {

+	OC_JSON::success(array("data" => array( "username" => $username )));

+}

+else{

+	OC_JSON::error(array("data" => array( "message" => "Unable to change display name" )));

+}
\ No newline at end of file
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index b2db2611518..8d45e62e4d8 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -9,7 +9,7 @@ $password = $_POST["password"];
 $oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
 
 $userstatus = null;
-if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
+if(OC_User::isAdminUser(OC_User::getUser())) {
 	$userstatus = 'admin';
 }
 if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
@@ -30,10 +30,6 @@ if(is_null($userstatus)) {
 	exit();
 }
 
-if($userstatus === 'admin' || $userstatus === 'subadmin') {
-	OC_JSON::verifyUser();
-}
-
 // Return Success story
 if( OC_User::setPassword( $username, $password )) {
 	OC_JSON::success(array("data" => array( "username" => $username )));
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index addae78517a..09ef25d92fa 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -3,9 +3,7 @@
 OCP\JSON::callCheck();
 OC_JSON::checkSubAdminUser();
 
-$isadmin = OC_Group::inGroup(OC_User::getUser(), 'admin')?true:false;
-
-if($isadmin) {
+if(OC_User::isAdminUser(OC_User::getUser())) {
 	$groups = array();
 	if( isset( $_POST["groups"] )) {
 		$groups = $_POST["groups"];
diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 9ffb32a0b23..bf3a34f1472 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -10,7 +10,7 @@ if(OC_User::getUser() === $username) {
 	exit;
 }
 
-if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
+if(!OC_User::isAdminUser(OC_User::getUser()) && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 	exit();
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 845f8ea408c..356466c0c00 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -10,7 +10,7 @@ OCP\JSON::callCheck();
 
 $username = isset($_POST["username"])?$_POST["username"]:'';
 
-if(($username == '' && !OC_Group::inGroup(OC_User::getUser(), 'admin')) || (!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
+if(($username == '' && !OC_User::isAdminUser(OC_User::getUser()))|| (!OC_User::isAdminUser(OC_User::getUser()) && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 	exit();
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 83d455550ae..9bba9c5269d 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -7,13 +7,13 @@ $success = true;
 $username = $_POST["username"];
 $group = $_POST["group"];
 
-if($username == OC_User::getUser() && $group == "admin" &&  OC_Group::inGroup($username, 'admin')) {
+if($username == OC_User::getUser() && $group == "admin" &&  OC_User::isAdminUser($username)) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
 	exit();
 }
 
-if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) {
+if(!OC_User::isAdminUser(OC_User::getUser()) && (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username) || !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 	exit();
@@ -31,8 +31,8 @@ $action = "add";
 // Toggle group
 if( OC_Group::inGroup( $username, $group )) {
 	$action = "remove";
-    $error = $l->t("Unable to remove user from group %s", $group);
-    $success = OC_Group::removeFromGroup( $username, $group );
+	$error = $l->t("Unable to remove user from group %s", $group);
+	$success = OC_Group::removeFromGroup( $username, $group );
 	$usersInGroup=OC_Group::usersInGroup($group);
 	if(count($usersInGroup)==0) {
 		OC_Group::deleteGroup($group);
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index eaeade60a39..9bbff80ea0c 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -28,7 +28,7 @@ if (isset($_GET['offset'])) {
 	$offset = 0;
 }
 $users = array();
-if (OC_Group::inGroup(OC_User::getUser(), 'admin')) {
+if (OC_User::isAdminUser(OC_User::getUser())) {
 	$batch = OC_User::getUsers('', 10, $offset);
 	foreach ($batch as $user) {
 		$users[] = array(
diff --git a/settings/apps.php b/settings/apps.php
index e28c8d5a359..4f8eba159c2 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -26,116 +26,21 @@ OC_App::loadApps();
 
 // Load the files we need
 OC_Util::addStyle( "settings", "settings" );
-OC_Util::addScript( "settings", "apps" );
 OC_App::setActiveNavigationEntry( "core_apps" );
 
-$installedApps = OC_App::getAllApps();
-
-//TODO which apps do we want to blacklist and how do we integrate blacklisting with the multi apps folder feature?
-
-$blacklist = array('files');//we dont want to show configuration for these
-
-$appList = array();
-
-foreach ( $installedApps as $app ) {
-
-	if ( array_search( $app, $blacklist ) === false ) {
-	
-		$info=OC_App::getAppInfo($app);
-		
-		if (!isset($info['name'])) {
-		
-			OC_Log::write('core', 'App id "'.$app.'" has no name in appinfo', OC_Log::ERROR);
-			
-			continue;
-			
-		}
-		
-		if ( OC_Appconfig::getValue( $app, 'enabled', 'no') == 'yes' ) {
-		
-			$active = true;
-			
-		} else {
-		
-			$active = false;
-			
-		}
-		
-		$info['active'] = $active;
-		
-		if(isset($info['shipped']) and ($info['shipped']=='true')) {
-		
-			$info['internal']=true;
-			
-			$info['internallabel']='Internal App';
-			$info['internalclass']='';
-
-			$info['update']=false;
-		
-		}else{
-		
-			$info['internal']=false;
-			
-			$info['internallabel']='3rd Party App';
-			$info['internalclass']='externalapp';
-
-			$info['update']=OC_Installer::isUpdateAvailable($app);
-		}
-		
-		$info['preview'] = OC_Helper::imagePath('settings', 'trans.png');
-		
-		$info['version'] = OC_App::getAppVersion($app);
-		
-		$appList[] = $info;
-		
-	}
-}
-
-$remoteApps = OC_App::getAppstoreApps();
-
-if ( $remoteApps ) {
-
-	// Remove duplicates
-	foreach ( $appList as $app ) {
-
-		foreach ( $remoteApps AS $key => $remote ) {
-		
-			if (
-			$app['name'] == $remote['name']
-			// To set duplicate detection to use OCS ID instead of string name,
-			// enable this code, remove the line of code above,
-			// and add <ocs_id>[ID]</ocs_id> to info.xml of each 3rd party app:
-			// OR $app['ocs_id'] == $remote['ocs_id']
-			) {
-				
-				unset( $remoteApps[$key]);
-			
-			}
-		
-		}
-		
-	}
-
-	$combinedApps = array_merge( $appList, $remoteApps );
-
-} else {
-
-	$combinedApps = $appList;
-	
-}
-
 function app_sort( $a, $b ) {
 
 	if ($a['active'] != $b['active']) {
-	
+
 		return $b['active'] - $a['active'];
-		
+
 	}
-	
+
 	return strcmp($a['name'], $b['name']);
-	
+
 }
 
+$combinedApps = OC_App::listAllApps();
 usort( $combinedApps, 'app_sort' );
 
 $tmpl = new OC_Template( "settings", "apps", "user" );
@@ -147,3 +52,4 @@ $appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
 $tmpl->assign('appid', $appid);
 
 $tmpl->printPage();
+
diff --git a/settings/help.php b/settings/help.php
index cd3d615425c..a5ac11ec9a3 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -27,7 +27,7 @@ $url1=OC_Helper::linkToRoute( "settings_help" ).'?mode=user';
 $url2=OC_Helper::linkToRoute( "settings_help" ).'?mode=admin';
 
 $tmpl = new OC_Template( "settings", "help", "user" );
-$tmpl->assign( "admin", OC_Group::inGroup(OC_User::getUser(), 'admin') );
+$tmpl->assign( "admin", OC_User::isAdminUser(OC_User::getUser()));
 $tmpl->assign( "url", $url );
 $tmpl->assign( "url1", $url1 );
 $tmpl->assign( "url2", $url2 );
diff --git a/settings/js/apps-custom.php b/settings/js/apps-custom.php
new file mode 100644
index 00000000000..9ec2a758ee3
--- /dev/null
+++ b/settings/js/apps-custom.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (c) 2013 Lukas Reschke <lukas@statuscode.ch>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// Check if admin user
+OC_Util::checkAdminUser();
+
+// Set the content type to JSON
+header('Content-type: application/json');
+
+// Disallow caching
+header("Cache-Control: no-cache, must-revalidate"); 
+header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); 
+
+$combinedApps = OC_App::listAllApps();
+
+foreach($combinedApps as $app) {
+	echo("appData_".$app['id']."=".json_encode($app));
+	echo("\n");
+}
+
+echo ("var appid =\"".$_GET['appid']."\";");
\ No newline at end of file
diff --git a/settings/js/isadmin.php b/settings/js/isadmin.php
new file mode 100644
index 00000000000..8b31f8a7cf9
--- /dev/null
+++ b/settings/js/isadmin.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright (c) 2013 Lukas Reschke <lukas@statuscode.ch>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// Set the content type to Javascript
+header("Content-type: text/javascript");
+
+// Disallow caching
+header("Cache-Control: no-cache, must-revalidate"); 
+header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); 
+
+if (OC_User::isAdminUser(OC_User::getUser())) {
+	echo("var isadmin = true;");
+} else {
+	echo("var isadmin = false;");
+}
\ No newline at end of file
diff --git a/settings/js/users.js b/settings/js/users.js
index fa6f058d923..424d00b51a7 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -26,9 +26,8 @@ var UserList = {
         UserList.deleteCanceled = false;
 
         // Provide user with option to undo
-        $('#notification').html(t('users', 'deleted') + ' ' + uid + '<span class="undo">' + t('users', 'undo') + '</span>');
         $('#notification').data('deleteuser', true);
-        $('#notification').fadeIn();
+        OC.Notification.showHtml(t('users', 'deleted') + ' ' + uid + '<span class="undo">' + t('users', 'undo') + '</span>');
     },
 
     /**
@@ -53,7 +52,7 @@ var UserList = {
                 success:function (result) {
                     if (result.status == 'success') {
                         // Remove undo option, & remove user from table
-                        $('#notification').fadeOut();
+                        OC.Notification.hide();
                         $('tr').filterAttr('data-uid', UserList.deleteUid).remove();
                         UserList.deleteCanceled = true;
                         if (ready) {
@@ -70,7 +69,9 @@ var UserList = {
     add:function (username, groups, subadmin, quota, sort) {
         var tr = $('tbody tr').first().clone();
         tr.attr('data-uid', username);
+        tr.attr('data-displayName', username);
         tr.find('td.name').text(username);
+        tr.find('td.displayName').text(username);
         var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
         tr.find('td.groups').empty();
         if (tr.find('td.subadmins').length > 0) {
@@ -197,7 +198,7 @@ var UserList = {
                 checked:checked,
                 oncheck:checkHandeler,
                 onuncheck:checkHandeler,
-                minWidth:100,
+                minWidth:100
             });
         }
         if ($(element).attr('class') == 'subadminsselect') {
@@ -232,7 +233,7 @@ var UserList = {
                 checked:checked,
                 oncheck:checkHandeler,
                 onuncheck:checkHandeler,
-                minWidth:100,
+                minWidth:100
             });
         }
     }
@@ -300,6 +301,40 @@ $(document).ready(function () {
     $('td.password').live('click', function (event) {
         $(this).children('img').click();
     });
+    
+    $('td.displayName>img').live('click', function (event) {
+        event.stopPropagation();
+        var img = $(this);
+        var uid = img.parent().parent().attr('data-uid');
+        var displayName = 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) {
+                        }
+                    );
+                    input.blur();
+                } else {
+                    input.blur();
+                }
+            }
+        });
+        input.blur(function () {
+            $(this).replaceWith($(this).val());
+            img.css('display', '');
+        });
+    });
+    $('td.displayName').live('click', function (event) {
+        $(this).children('img').click();
+    });
+    
 
     $('select.quota, select.quota-user').live('change', function () {
         var select = $(this);
@@ -389,7 +424,7 @@ $(document).ready(function () {
             {
                 username:username,
                 password:password,
-                groups:groups,
+                groups:groups
             },
             function (result) {
                 if (result.status != 'success') {
@@ -402,13 +437,13 @@ $(document).ready(function () {
         );
     });
     // Handle undo notifications
-    $('#notification').hide();
+    OC.Notification.hide();
     $('#notification .undo').live('click', function () {
         if ($('#notification').data('deleteuser')) {
             $('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
             UserList.deleteCanceled = true;
         }
-        $('#notification').fadeOut();
+        OC.Notification.hide();
     });
     UserList.useUndo = ('onbeforeunload' in window)
     $(window).bind('beforeunload', function () {
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 20d4cced233..2870527781a 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات",
 "Version" => "إصدار",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "طوّر من قبل <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud مجتمع</a>, الـ <a href=\"https://github.com/owncloud\" target=\"_blank\">النص المصدري</a> مرخص بموجب <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">رخصة أفيرو العمومية</abbr></a>.",
-"Name" => "الاسم",
 "Groups" => "مجموعات",
 "Create" => "انشئ",
 "Other" => "شيء آخر",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 853e12812ed..bee057a998f 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Authentication error" => "Възникна проблем с идентификацията",
+"Invalid request" => "Невалидна заявка",
 "Enable" => "Включено",
 "Password" => "Парола",
 "Email" => "E-mail",
-"Name" => "Име",
 "Groups" => "Групи",
 "Delete" => "Изтриване"
 );
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index bab6d9ec19c..fc85e705750 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "আপনার ownCloud এ সংযুক্ত হতে এই ঠিকানাটি আপনার ফাইল ব্যবস্থাপকে ব্যবহার করুন",
 "Version" => "ভার্সন",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "তৈলী করেছেন <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud সম্প্রদায়</a>, যার <a href=\"https://github.com/owncloud\" target=\"_blank\"> উৎস কোডটি <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।",
-"Name" => "রাম",
 "Groups" => "গোষ্ঠীসমূহ",
 "Create" => "তৈরী কর",
 "Default Storage" => "পূর্বনির্ধারিত সংরক্ষণাগার",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 35952475254..1f23c2cfd66 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers",
 "Version" => "Versió",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nom",
 "Groups" => "Grups",
 "Create" => "Crea",
 "Default Storage" => "Emmagatzemament per defecte",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index d20861764a9..be75a679c65 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Použijte tuto adresu pro připojení k vašemu ownCloud skrze správce souborů",
 "Version" => "Verze",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Jméno",
 "Groups" => "Skupiny",
 "Create" => "Vytvořit",
 "Default Storage" => "Výchozí úložiště",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 021d7f814bb..f0842922d62 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring",
 "Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Navn",
 "Groups" => "Grupper",
 "Create" => "Ny",
 "Default Storage" => "Standard opbevaring",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 3bb53f99b2e..d2a9a826aaf 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -29,7 +29,7 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommerzieller Support",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>",
-"Clients" => "Kunden",
+"Clients" => "Clients",
 "Download Desktop Clients" => "Desktop-Client herunterladen",
 "Download Android Client" => "Android-Client herunterladen",
 "Download iOS Client" => "iOS-Client herunterladen",
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden",
 "Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
-"Name" => "Name",
 "Groups" => "Gruppen",
 "Create" => "Anlegen",
 "Default Storage" => "Standard-Speicher",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index dd129fc59eb..cb735adfdf9 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -29,7 +29,7 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommerzieller Support",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
-"Clients" => "Kunden",
+"Clients" => "Clients",
 "Download Desktop Clients" => "Desktop-Client herunterladen",
 "Download Android Client" => "Android-Client herunterladen",
 "Download iOS Client" => "iOS-Client herunterladen",
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden",
 "Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
-"Name" => "Name",
 "Groups" => "Gruppen",
 "Create" => "Anlegen",
 "Default Storage" => "Standard-Speicher",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 29863389048..beacb5e6147 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -49,10 +49,13 @@
 "Use this address to connect to your ownCloud in your file manager" => "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας",
 "Version" => "Έκδοση",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>, ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Όνομα",
 "Groups" => "Ομάδες",
 "Create" => "Δημιουργία",
+"Default Storage" => "Προκαθορισμένη Αποθήκευση ",
+"Unlimited" => "Απεριόριστο",
 "Other" => "Άλλα",
 "Group Admin" => "Ομάδα Διαχειριστών",
+"Storage" => "Αποθήκευση",
+"Default" => "Προκαθορισμένο",
 "Delete" => "Διαγραφή"
 );
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 651403be68c..e17380441cf 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -22,8 +22,17 @@
 "Select an App" => "Elekti aplikaĵon",
 "See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
+"User Documentation" => "Dokumentaro por uzantoj",
+"Administrator Documentation" => "Dokumentaro por administrantoj",
+"Online Documentation" => "Reta dokumentaro",
+"Forum" => "Forumo",
+"Bugtracker" => "Cimoraportejo",
+"Commercial Support" => "Komerca subteno",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>",
 "Clients" => "Klientoj",
+"Download Desktop Clients" => "Elŝuti labortablajn klientojn",
+"Download Android Client" => "Elŝuti Android-klienton",
+"Download iOS Client" => "Elŝuti iOS-klienton",
 "Password" => "Pasvorto",
 "Your password was changed" => "Via pasvorto ŝanĝiĝis",
 "Unable to change your password" => "Ne eblis ŝanĝi vian pasvorton",
@@ -36,11 +45,17 @@
 "Fill in an email address to enable password recovery" => "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron",
 "Language" => "Lingvo",
 "Help translate" => "Helpu traduki",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Uzu ĉi tiun adreson por konekti al via ownCloud vian dosieradministrilon",
+"Version" => "Eldono",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nomo",
 "Groups" => "Grupoj",
 "Create" => "Krei",
+"Default Storage" => "Defaŭlta konservejo",
+"Unlimited" => "Senlima",
 "Other" => "Alia",
 "Group Admin" => "Grupadministranto",
+"Storage" => "Konservejo",
+"Default" => "Defaŭlta",
 "Delete" => "Forigi"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 5434da7f981..2bc2a12a5a9 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos",
 "Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nombre",
 "Groups" => "Grupos",
 "Create" => "Crear",
 "Default Storage" => "Almacenamiento Predeterminado",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index a652ee13103..bbf45bc5620 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos",
 "Version" => "Versión",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nombre",
 "Groups" => "Grupos",
 "Create" => "Crear",
 "Default Storage" => "Almacenamiento Predeterminado",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 53f61717282..751c88ecb59 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -34,7 +34,6 @@
 "Fill in an email address to enable password recovery" => "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress",
 "Language" => "Keel",
 "Help translate" => "Aita tõlkida",
-"Name" => "Nimi",
 "Groups" => "Grupid",
 "Create" => "Lisa",
 "Other" => "Muu",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 78e3cc62488..29e3a810ca4 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -49,10 +49,13 @@
 "Use this address to connect to your ownCloud in your file manager" => "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko",
 "Version" => "Bertsioa",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
-"Name" => "Izena",
 "Groups" => "Taldeak",
 "Create" => "Sortu",
+"Default Storage" => "Lehenetsitako Biltegiratzea",
+"Unlimited" => "Mugarik gabe",
 "Other" => "Besteak",
 "Group Admin" => "Talde administradorea",
+"Storage" => "Biltegiratzea",
+"Default" => "Lehenetsia",
 "Delete" => "Ezabatu"
 );
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 44872e28f05..59865c697cb 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -25,7 +25,6 @@
 "Fill in an email address to enable password recovery" => "پست الکترونیکی را پرکنید  تا بازیابی گذرواژه فعال شود",
 "Language" => "زبان",
 "Help translate" => "به ترجمه آن کمک کنید",
-"Name" => "نام",
 "Groups" => "گروه ها",
 "Create" => "ایجاد کردن",
 "Other" => "سایر",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index dbab88b97a0..84b18902b99 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Käytä tätä osoitetta yhdistäessäsi ownCloudiisi tiedostonhallintaa käyttäen",
 "Version" => "Versio",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
-"Name" => "Nimi",
 "Groups" => "Ryhmät",
 "Create" => "Luo",
 "Unlimited" => "Rajoittamaton",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 03a61c69cf8..5b9495b566d 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers",
 "Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nom",
 "Groups" => "Groupes",
 "Create" => "Créer",
 "Default Storage" => "Support de stockage par défaut",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index ddd5661fe72..d3359f19513 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros",
 "Version" => "Versión",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nome",
 "Groups" => "Grupos",
 "Create" => "Crear",
 "Default Storage" => "Almacenamento predeterminado",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index bbfe437ba30..b7e76fbaeda 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -47,7 +47,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים.",
 "Version" => "גרסא",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "פותח על די <a href=\"http://ownCloud.org/contact\" target=\"_blank\">קהילתownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">קוד המקור</a> מוגן ברישיון <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "שם",
 "Groups" => "קבוצות",
 "Create" => "יצירה",
 "Other" => "אחר",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 14053cb98a4..010303eb44f 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -24,7 +24,6 @@
 "Fill in an email address to enable password recovery" => "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke",
 "Language" => "Jezik",
 "Help translate" => "Pomoć prevesti",
-"Name" => "Ime",
 "Groups" => "Grupe",
 "Create" => "Izradi",
 "Other" => "ostali",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 35c59bdb2d6..2e096099360 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Ennek a címnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelőjével is is elérheti az állományait.",
 "Version" => "Verzió",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "A programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl.",
-"Name" => "Név",
 "Groups" => "Csoportok",
 "Create" => "Létrehozás",
 "Default Storage" => "Alapértelmezett tárhely",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index 18428709098..121a1175e79 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -15,7 +15,6 @@
 "Your email address" => "Tu adresse de e-posta",
 "Language" => "Linguage",
 "Help translate" => "Adjuta a traducer",
-"Name" => "Nomine",
 "Groups" => "Gruppos",
 "Create" => "Crear",
 "Other" => "Altere",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 132920a7a04..0f04563fa3e 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -23,7 +23,6 @@
 "Fill in an email address to enable password recovery" => "Masukkan alamat email untuk mengaktifkan pemulihan password",
 "Language" => "Bahasa",
 "Help translate" => "Bantu menerjemahkan",
-"Name" => "Nama",
 "Groups" => "Group",
 "Create" => "Buat",
 "Other" => "Lain-lain",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index d978957ab48..58730575343 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þínu",
 "Version" => "Útgáfa",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nafn",
 "Groups" => "Hópar",
 "Create" => "Búa til",
 "Default Storage" => "Sjálfgefin gagnageymsla",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index d485f7ccd13..2199f7d8db8 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -49,13 +49,12 @@
 "Use this address to connect to your ownCloud in your file manager" => "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file",
 "Version" => "Versione",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è licenziato nei termini della <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nome",
 "Groups" => "Gruppi",
 "Create" => "Crea",
 "Default Storage" => "Archiviazione predefinita",
 "Unlimited" => "Illimitata",
 "Other" => "Altro",
-"Group Admin" => "Gruppo di amministrazione",
+"Group Admin" => "Gruppi amministrati",
 "Storage" => "Archiviazione",
 "Default" => "Predefinito",
 "Delete" => "Elimina"
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index a660d21c780..dbf8d7d13e8 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください",
 "Version" => "バージョン",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>により開発されています、<a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>ライセンスは、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスにより提供されています。",
-"Name" => "名前",
 "Groups" => "グループ",
 "Create" => "作成",
 "Default Storage" => "デフォルトストレージ",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index 68dbc736dcd..2bc2e7d5de7 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -34,7 +34,6 @@
 "Fill in an email address to enable password recovery" => "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად",
 "Language" => "ენა",
 "Help translate" => "თარგმნის დახმარება",
-"Name" => "სახელი",
 "Groups" => "ჯგუფი",
 "Create" => "შექმნა",
 "Other" => "სხვა",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 4a7817b8401..3a794eb3ceb 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "파일 매니저에서 사용자의 ownCloud에 접속하기 위해 이 주소를 사용하십시요.",
 "Version" => "버젼",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커뮤니티</a>에 의해서 개발되었습니다. <a href=\"https://github.com/owncloud\" target=\"_blank\">원본 코드</a>는 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>에 따라 사용이 허가됩니다.",
-"Name" => "이름",
 "Groups" => "그룹",
 "Create" => "만들기",
 "Default Storage" => "기본 저장소",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index 6a4996e8252..ef9e806e595 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -3,6 +3,5 @@
 "Saving..." => "پاشکه‌وتده‌کات...",
 "Password" => "وشەی تێپەربو",
 "New password" => "وشەی نهێنی نوێ",
-"Email" => "ئیمه‌یل",
-"Name" => "ناو"
+"Email" => "ئیمه‌یل"
 );
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 1f9ea35e885..04acf53de43 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -24,7 +24,6 @@
 "Fill in an email address to enable password recovery" => "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben",
 "Language" => "Sprooch",
 "Help translate" => "Hëllef iwwersetzen",
-"Name" => "Numm",
 "Groups" => "Gruppen",
 "Create" => "Erstellen",
 "Other" => "Aner",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 73af4f3b27b..e8c1577c7fb 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -27,7 +27,6 @@
 "Fill in an email address to enable password recovery" => "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą",
 "Language" => "Kalba",
 "Help translate" => "Padėkite išversti",
-"Name" => "Vardas",
 "Groups" => "Grupės",
 "Create" => "Sukurti",
 "Other" => "Kita",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index ba44fdbb3e2..4cafe3ab71d 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -22,6 +22,7 @@
 "See application page at apps.owncloud.com" => "Apskatie aplikāciju 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>",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>",
+"Clients" => "Klienti",
 "Password" => "Parole",
 "Your password was changed" => "Jūru parole tika nomainīta",
 "Unable to change your password" => "Nav iespējams nomainīt jūsu paroli",
@@ -35,7 +36,6 @@
 "Language" => "Valoda",
 "Help translate" => "Palīdzi tulkot",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Vārds",
 "Groups" => "Grupas",
 "Create" => "Izveidot",
 "Other" => "Cits",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 52fafc56479..b041d41923a 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -48,7 +48,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Користете ја оваа адреса да ",
 "Version" => "Верзија",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Име",
 "Groups" => "Групи",
 "Create" => "Создај",
 "Other" => "Останато",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 87f45d3c9a0..e2537679a69 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -23,7 +23,6 @@
 "Fill in an email address to enable password recovery" => "Isi alamat emel anda untuk membolehkan pemulihan kata laluan",
 "Language" => "Bahasa",
 "Help translate" => "Bantu terjemah",
-"Name" => "Nama",
 "Groups" => "Kumpulan",
 "Create" => "Buat",
 "Other" => "Lain",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 52cfc92040b..ecd1466e7ee 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -42,7 +42,6 @@
 "Help translate" => "Bidra til oversettelsen",
 "WebDAV" => "WebDAV",
 "Version" => "Versjon",
-"Name" => "Navn",
 "Groups" => "Grupper",
 "Create" => "Opprett",
 "Other" => "Annet",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 2b6fdbd6082..af76f376683 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer",
 "Version" => "Versie",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Naam",
 "Groups" => "Groepen",
 "Create" => "Creëer",
 "Default Storage" => "Default opslag",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 923f5481d5a..778e7afc265 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -21,7 +21,6 @@
 "Fill in an email address to enable password recovery" => "Fyll inn din e-post addresse for og kunne motta passord tilbakestilling",
 "Language" => "Språk",
 "Help translate" => "Hjelp oss å oversett",
-"Name" => "Namn",
 "Groups" => "Grupper",
 "Create" => "Lag",
 "Other" => "Anna",
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 39445570fdb..e8ed2d52758 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -33,7 +33,6 @@
 "Fill in an email address to enable password recovery" => "Emplena una adreiça de corrièl per permetre lo mandadís del senhal perdut",
 "Language" => "Lenga",
 "Help translate" => "Ajuda a la revirada",
-"Name" => "Nom",
 "Groups" => "Grops",
 "Create" => "Crea",
 "Other" => "Autres",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index c9e49f57a3e..656636b258e 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -48,8 +48,7 @@
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików",
 "Version" => "Wersja",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Stwirzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nazwa",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Groups" => "Grupy",
 "Create" => "Utwórz",
 "Default Storage" => "Domyślny magazyn",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 3a1e6b86357..f14233d7e58 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -16,7 +16,7 @@
 "Disable" => "Desabilitado",
 "Enable" => "Habilitado",
 "Saving..." => "Gravando...",
-"__language_name__" => "Português",
+"__language_name__" => "Português do Brasil",
 "Add your App" => "Adicione seu Aplicativo",
 "More Apps" => "Mais Apps",
 "Select an App" => "Selecione uma Aplicação",
@@ -37,7 +37,6 @@
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nome",
 "Groups" => "Grupos",
 "Create" => "Criar",
 "Other" => "Outro",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 6bccb49d649..af5dfbf6e47 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud",
 "Version" => "Versão",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nome",
 "Groups" => "Grupos",
 "Create" => "Criar",
 "Default Storage" => "Armazenamento Padrão",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index a96a7368499..17a091c569c 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -10,6 +10,7 @@
 "Unable to delete user" => "Nu s-a putut șterge utilizatorul",
 "Language changed" => "Limba a fost schimbată",
 "Invalid request" => "Cerere eronată",
+"Admins can't remove themself from the admin group" => "Administratorii nu se pot șterge singuri din grupul admin",
 "Unable to add user to group %s" => "Nu s-a putut adăuga utilizatorul la grupul %s",
 "Unable to remove user from group %s" => "Nu s-a putut elimina utilizatorul din grupul %s",
 "Disable" => "Dezactivați",
@@ -27,6 +28,7 @@
 "Forum" => "Forum",
 "Bugtracker" => "Urmărire bug-uri",
 "Commercial Support" => "Suport comercial",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
 "Clients" => "Clienți",
 "Download Desktop Clients" => "Descarcă client desktop",
 "Download Android Client" => "Descarcă client Android",
@@ -44,9 +46,9 @@
 "Language" => "Limba",
 "Help translate" => "Ajută la traducere",
 "WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Folosește această adresă pentru a conecta ownCloud cu managerul de fișiere",
 "Version" => "Versiunea",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nume",
 "Groups" => "Grupuri",
 "Create" => "Crează",
 "Default Storage" => "Stocare implicită",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 5c05f32636a..2194c886f1d 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу",
 "Version" => "Версия",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Имя",
 "Groups" => "Группы",
 "Create" => "Создать",
 "Default Storage" => "Хранилище по-умолчанию",
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index 26179eeb329..50c3b136c47 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -30,6 +30,7 @@
 "Commercial Support" => "Коммерческая поддержка",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Вы использовали <strong>%s</strong> из возможных <strong>%s</strong>",
 "Clients" => "Клиенты",
+"Download Desktop Clients" => "Загрузка десктопных клиентов",
 "Download Android Client" => "Загрузить клиент под Android ",
 "Download iOS Client" => "Загрузить клиент под iOS ",
 "Password" => "Пароль",
@@ -48,10 +49,13 @@
 "Use this address to connect to your ownCloud in your file manager" => "Используйте этот адрес для подключения к ownCloud в Вашем файловом менеджере",
 "Version" => "Версия",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Разработанный <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Имя",
 "Groups" => "Группы",
 "Create" => "Создать",
+"Default Storage" => "Хранилище по умолчанию",
+"Unlimited" => "Неограниченный",
 "Other" => "Другой",
 "Group Admin" => "Группа Admin",
+"Storage" => "Хранилище",
+"Default" => "По умолчанию",
 "Delete" => "Удалить"
 );
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 45cb9a4a4fb..8d7bc7adf5a 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -31,7 +31,6 @@
 "Language" => "භාෂාව",
 "Help translate" => "පරිවර්ථන සහය",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">මුල් කේතය </a>ලයිසන්ස් කර ඇත්තේ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> යටතේ.",
-"Name" => "නාමය",
 "Groups" => "සමූහය",
 "Create" => "තනන්න",
 "Other" => "වෙනත්",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index ecf1a905008..3941bd51ae7 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -22,8 +22,17 @@
 "Select an App" => "Vyberte aplikáciu",
 "See application page at apps.owncloud.com" => "Pozrite si stránku aplikácií na apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>",
+"User Documentation" => "Príručka používateľa",
+"Administrator Documentation" => "Príručka správcu",
+"Online Documentation" => "Online príručka",
+"Forum" => "Fórum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Komerčná podpora",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných ",
 "Clients" => "Klienti",
+"Download Desktop Clients" => "Stiahnuť desktopového klienta",
+"Download Android Client" => "Stiahnuť Android klienta",
+"Download iOS Client" => "Stiahnuť iOS klienta",
 "Password" => "Heslo",
 "Your password was changed" => "Heslo bolo zmenené",
 "Unable to change your password" => "Nie je možné zmeniť vaše heslo",
@@ -36,11 +45,17 @@
 "Fill in an email address to enable password recovery" => "Vyplňte emailovú adresu pre aktivovanie obnovy hesla",
 "Language" => "Jazyk",
 "Help translate" => "Pomôcť s prekladom",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Použite túto adresu pre pripojenie vášho ownCloud k súborovému správcovi",
+"Version" => "Verzia",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Meno",
 "Groups" => "Skupiny",
 "Create" => "Vytvoriť",
+"Default Storage" => "Predvolené úložisko",
+"Unlimited" => "Nelimitované",
 "Other" => "Iné",
 "Group Admin" => "Správca skupiny",
+"Storage" => "Úložisko",
+"Default" => "Predvolené",
 "Delete" => "Odstrániť"
 );
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 24bea147993..98d34518478 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Uporabite ta naslov za povezavo do ownCloud v vašem upravljalniku datotek.",
 "Version" => "Različica",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji dovoljenja <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošno javno dovoljenje Affero\">AGPL</abbr></a>.",
-"Name" => "Ime",
 "Groups" => "Skupine",
 "Create" => "Ustvari",
 "Default Storage" => "Privzeta shramba",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index d230adb9275..9f0d428c2e1 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -37,7 +37,6 @@
 "Language" => "Језик",
 "Help translate" => " Помозите у превођењу",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Развијају <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Оунклауд (ownCloud) заједница</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворни код</a> је издат под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Аферо Јавном Лиценцом (Affero General Public License)\">АГПЛ лиценцом</abbr></a>.",
-"Name" => "Име",
 "Groups" => "Групе",
 "Create" => "Направи",
 "Other" => "Друго",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 7677fbcf33c..942594eb028 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -12,7 +12,6 @@
 "Change password" => "Izmeni lozinku",
 "Email" => "E-mail",
 "Language" => "Jezik",
-"Name" => "Ime",
 "Groups" => "Grupe",
 "Create" => "Napravi",
 "Other" => "Drugo",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index e99fad96172..4c30873b3ca 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Använd denna adress för att ansluta till ownCloud i din filhanterare",
 "Version" => "Version",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Namn",
 "Groups" => "Grupper",
 "Create" => "Skapa",
 "Default Storage" => "Förvald lagring",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 9771e167e4b..84f6026ca32 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -36,7 +36,6 @@
 "Language" => "மொழி",
 "Help translate" => "மொழிபெயர்க்க உதவி",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "பெயர்",
 "Groups" => "குழுக்கள்",
 "Create" => "உருவாக்குக",
 "Other" => "மற்றவை",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index f4e6398ae21..3ef68cf7fe4 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -10,6 +10,7 @@
 "Unable to delete user" => "ไม่สามารถลบผู้ใช้งานได้",
 "Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
 "Invalid request" => "คำร้องขอไม่ถูกต้อง",
+"Admins can't remove themself from the admin group" => "ผู้ดูแลระบบไม่สามารถลบตัวเองออกจากกลุ่มผู้ดูแลได้",
 "Unable to add user to group %s" => "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้",
 "Unable to remove user from group %s" => "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้",
 "Disable" => "ปิดใช้งาน",
@@ -21,8 +22,17 @@
 "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>",
+"User Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
+"Administrator Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
+"Online Documentation" => "เอกสารคู่มือการใช้งานออนไลน์",
+"Forum" => "กระดานสนทนา",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "บริการลูกค้าแบบเสียค่าใช้จ่าย",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>",
 "Clients" => "ลูกค้า",
+"Download Desktop Clients" => "ดาวน์โหลดโปรแกรมไคลเอนต์สำหรับเครื่องเดสก์ท็อป",
+"Download Android Client" => "ดาวน์โหลดโปรแกรมไคลเอนต์สำหรับแอนดรอยด์",
+"Download iOS Client" => "ดาวน์โหลดโปรแกรมไคลเอนต์สำหรับ iOS",
 "Password" => "รหัสผ่าน",
 "Your password was changed" => "รหัสผ่านของคุณถูกเปลี่ยนแล้ว",
 "Unable to change your password" => "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
@@ -35,11 +45,17 @@
 "Fill in an email address to enable password recovery" => "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้",
 "Language" => "ภาษา",
 "Help translate" => "ช่วยกันแปล",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "ใช้ที่อยู่นี้เพื่อเชื่อมต่อกับ ownCloud ในโปรแกรมจัดการไฟล์ของคุณ",
+"Version" => "รุ่น",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "ชื่อ",
 "Groups" => "กลุ่ม",
 "Create" => "สร้าง",
+"Default Storage" => "พื้นที่จำกัดข้อมูลเริ่มต้น",
+"Unlimited" => "ไม่จำกัดจำนวน",
 "Other" => "อื่นๆ",
 "Group Admin" => "ผู้ดูแลกลุ่ม",
+"Storage" => "พื้นที่จัดเก็บข้อมูล",
+"Default" => "ค่าเริ่มต้น",
 "Delete" => "ลบ"
 );
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index f754bb90fcf..281e01e1162 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -44,7 +44,6 @@
 "WebDAV" => "WebDAV",
 "Version" => "Sürüm",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Geliştirilen Taraf<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is altında lisanslanmıştır <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Ad",
 "Groups" => "Gruplar",
 "Create" => "Oluştur",
 "Other" => "Diğer",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index ce1ced031b1..dc2c537b4fb 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -49,10 +49,13 @@
 "Use this address to connect to your ownCloud in your file manager" => "Використовуйте цю адресу для під'єднання до вашого ownCloud у вашому файловому менеджері",
 "Version" => "Версія",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Ім'я",
 "Groups" => "Групи",
 "Create" => "Створити",
+"Default Storage" => "сховище за замовчуванням",
+"Unlimited" => "Необмежено",
 "Other" => "Інше",
 "Group Admin" => "Адміністратор групи",
+"Storage" => "Сховище",
+"Default" => "За замовчуванням",
 "Delete" => "Видалити"
 );
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 2354ba2a16e..39b09aa9382 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -37,7 +37,6 @@
 "Language" => "Ngôn ngữ",
 "Help translate" => "Hỗ trợ dịch thuật",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Tên",
 "Groups" => "Nhóm",
 "Create" => "Tạo",
 "Other" => "Khác",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index b34b20d5aed..f8e37ac749f 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -35,7 +35,6 @@
 "Language" => "语言",
 "Help translate" => "帮助翻译",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社区</a>开发，<a href=\"https://github.com/owncloud\" target=\"_blank\">s源代码</a> 以 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 许可协议发布。",
-"Name" => "名字",
 "Groups" => "组",
 "Create" => "新建",
 "Other" => "其他的",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 218095b78eb..dfcf7bf7bfe 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -49,10 +49,13 @@
 "Use this address to connect to your ownCloud in your file manager" => "用该地址来连接文件管理器中的 ownCloud",
 "Version" => "版本",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。",
-"Name" => "名称",
 "Groups" => "组",
 "Create" => "创建",
+"Default Storage" => "默认存储",
+"Unlimited" => "无限",
 "Other" => "其它",
 "Group Admin" => "组管理员",
+"Storage" => "存储",
+"Default" => "默认",
 "Delete" => "删除"
 );
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 7681b10affa..5fe555d14f0 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "在您的檔案管理員中使用這個地址來連線到 ownCloud",
 "Version" => "版本",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社區</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">源代碼</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>許可證下發布。",
-"Name" => "名稱",
 "Groups" => "群組",
 "Create" => "創造",
 "Default Storage" => "預設儲存區",
diff --git a/settings/personal.php b/settings/personal.php
index 47dbcc53ebc..4624bda8397 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -15,15 +15,7 @@ OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
 OC_Util::addStyle( '3rdparty', 'chosen' );
 OC_App::setActiveNavigationEntry( 'personal' );
 
-// calculate the disc space
-$rootInfo=OC_FileCache::get('');
-$sharedInfo=OC_FileCache::get('/Shared');
-$used=$rootInfo['size'];
-if($used<0) $used=0;
-$free=OC_Filesystem::free_space();
-$total=$free+$used;
-if($total==0) $total=1;  // prevent division by zero
-$relative=round(($used/$total)*10000)/100;
+$storageInfo=OC_Helper::getStorageInfo();
 
 $email=OC_Preferences::getValue(OC_User::getUser(), 'settings', 'email', '');
 
@@ -50,9 +42,9 @@ foreach($languageCodes as $lang) {
 
 // Return template
 $tmpl = new OC_Template( 'settings', 'personal', 'user');
-$tmpl->assign('usage', OC_Helper::humanFileSize($used));
-$tmpl->assign('total_space', OC_Helper::humanFileSize($total));
-$tmpl->assign('usage_relative', $relative);
+$tmpl->assign('usage', OC_Helper::humanFileSize($storageInfo['used']));
+$tmpl->assign('total_space', OC_Helper::humanFileSize($storageInfo['total']));
+$tmpl->assign('usage_relative', $storageInfo['relative']);
 $tmpl->assign('email', $email);
 $tmpl->assign('languages', $languages);
 
diff --git a/settings/routes.php b/settings/routes.php
index fa78f566525..0a8af0dde2b 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -39,6 +39,8 @@ $this->create('settings_ajax_removegroup', '/settings/ajax/removegroup.php')
 	->actionInclude('settings/ajax/removegroup.php');
 $this->create('settings_ajax_changepassword', '/settings/ajax/changepassword.php')
 	->actionInclude('settings/ajax/changepassword.php');
+$this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php')

+->actionInclude('settings/ajax/changedisplayname.php');
 // personel
 $this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php')
 	->actionInclude('settings/ajax/lostpassword.php');
@@ -55,6 +57,8 @@ $this->create('settings_ajax_updateapp', '/settings/ajax/updateapp.php')
 	->actionInclude('settings/ajax/updateapp.php');
 $this->create('settings_ajax_navigationdetect', '/settings/ajax/navigationdetect.php')
 	->actionInclude('settings/ajax/navigationdetect.php');
+$this->create('apps_custom', '/settings/js/apps-custom.js')
+	->actionInclude('settings/js/apps-custom.php');
 // admin
 $this->create('settings_ajax_getlog', '/settings/ajax/getlog.php')
 	->actionInclude('settings/ajax/getlog.php');
@@ -62,3 +66,5 @@ $this->create('settings_ajax_setloglevel', '/settings/ajax/setloglevel.php')
 	->actionInclude('settings/ajax/setloglevel.php');
 $this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php')
 	->actionInclude('settings/ajax/setsecurity.php');
+$this->create('isadmin', '/settings/js/isadmin.js')
+	->actionInclude('settings/js/isadmin.php');
diff --git a/settings/settings.php b/settings/settings.php
index add94b5b011..1e05452ec4d 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -6,7 +6,6 @@
  */
 
 OC_Util::checkLoggedIn();
-OC_Util::verifyUser();
 OC_App::loadApps();
 
 OC_Util::addStyle( 'settings', 'settings' );
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 5ee0147fbcb..0097489743f 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -10,13 +10,13 @@ $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');
 
 // is htaccess working ?
 if (!$_['htaccessworking']) {
-    ?>
+	?>
 <fieldset class="personalblock">
-    <legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
+	<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
 
 	<span class="securitywarning">
-        <?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.'); ?>
-    </span>
+		<?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.'); ?>
+	</span>
 
 </fieldset>
 <?php
@@ -24,13 +24,13 @@ if (!$_['htaccessworking']) {
 
 // is locale working ?
 if (!$_['islocaleworking']) {
-    ?>
+	?>
 <fieldset class="personalblock">
-    <legend><strong><?php echo $l->t('Locale not working');?></strong></legend>
+	<legend><strong><?php echo $l->t('Locale not working');?></strong></legend>
 
-        <span class="connectionwarning">
-        <?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8.'); ?>
-    </span>
+		<span class="connectionwarning">
+		<?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8". This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support en_US.UTF-8.'); ?>
+	</span>
 
 </fieldset>
 <?php
@@ -38,13 +38,13 @@ if (!$_['islocaleworking']) {
 
 // is internet connection working ?
 if (!$_['internetconnectionworking']) {
-    ?>
+	?>
 <fieldset class="personalblock">
-    <legend><strong><?php echo $l->t('Internet connection not working');?></strong></legend>
+	<legend><strong><?php echo $l->t('Internet connection not working');?></strong></legend>
 
-        <span class="connectionwarning">
-        <?php echo $l->t('This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud.'); ?>
-    </span>
+		<span class="connectionwarning">
+		<?php echo $l->t('This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud.'); ?>
+	</span>
 
 </fieldset>
 <?php
@@ -52,152 +52,152 @@ if (!$_['internetconnectionworking']) {
 ?>
 
 <?php foreach ($_['forms'] as $form) {
-    echo $form;
+	echo $form;
 }
 ;?>
 
 <fieldset class="personalblock" id="backgroundjobs">
-    <legend><strong><?php echo $l->t('Cron');?></strong></legend>
-    <table class="nostyle">
-        <tr>
-            <td>
-                <input type="radio" name="mode" value="ajax"
-                       id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") {
-                    echo 'checked="checked"';
-                } ?>>
-                <label for="backgroundjobs_ajax">AJAX</label><br/>
-                <em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <input type="radio" name="mode" value="webcron"
-                       id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") {
-                    echo 'checked="checked"';
-                } ?>>
-                <label for="backgroundjobs_webcron">Webcron</label><br/>
-                <em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <input type="radio" name="mode" value="cron"
-                       id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
-                    echo 'checked="checked"';
-                } ?>>
-                <label for="backgroundjobs_cron">Cron</label><br/>
-                <em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
-            </td>
-        </tr>
-    </table>
+	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
+	<table class="nostyle">
+		<tr>
+			<td>
+				<input type="radio" name="mode" value="ajax"
+					   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] == "ajax") {
+					echo 'checked="checked"';
+				} ?>>
+				<label for="backgroundjobs_ajax">AJAX</label><br/>
+				<em><?php echo $l->t("Execute one task with each page loaded"); ?></em>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="radio" name="mode" value="webcron"
+					   id="backgroundjobs_webcron" <?php if ($_['backgroundjobs_mode'] == "webcron") {
+					echo 'checked="checked"';
+				} ?>>
+				<label for="backgroundjobs_webcron">Webcron</label><br/>
+				<em><?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?></em>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="radio" name="mode" value="cron"
+					   id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
+					echo 'checked="checked"';
+				} ?>>
+				<label for="backgroundjobs_cron">Cron</label><br/>
+				<em><?php echo $l->t("Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?></em>
+			</td>
+		</tr>
+	</table>
 </fieldset>
 
 <fieldset class="personalblock" id="shareAPI">
-    <legend><strong><?php echo $l->t('Sharing');?></strong></legend>
-    <table class="shareAPI nostyle">
-        <tr>
-            <td id="enable">
-                <input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
-                       value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
-                <label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br/>
-                <em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
-            </td>
-        </tr>
-        <tr>
-            <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
-                <input type="checkbox" name="shareapi_allow_links" id="allowLinks"
-                       value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
-                <label for="allowLinks"><?php echo $l->t('Allow links');?></label><br/>
-                <em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
-            </td>
-        </tr>
-        <tr>
-            <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
-                <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
-                       value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
-                <label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br/>
-                <em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
-            </td>
-        </tr>
-        <tr>
-            <td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
-                <input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
-                       value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
-                <label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br/>
-                <input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
-                       value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
-                <label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br/>
-            </td>
-        </tr>
-    </table>
+	<legend><strong><?php echo $l->t('Sharing');?></strong></legend>
+	<table class="shareAPI nostyle">
+		<tr>
+			<td id="enable">
+				<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
+					   value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
+				<label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br/>
+				<em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
+			</td>
+		</tr>
+		<tr>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+				<input type="checkbox" name="shareapi_allow_links" id="allowLinks"
+					   value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
+				<label for="allowLinks"><?php echo $l->t('Allow links');?></label><br/>
+				<em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
+			</td>
+		</tr>
+		<tr>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
+					   value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
+				<label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br/>
+				<em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
+			</td>
+		</tr>
+		<tr>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+				<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
+					   value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
+				<label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br/>
+				<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly"
+					   value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
+				<label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br/>
+			</td>
+		</tr>
+	</table>
 </fieldset>
 
 <fieldset class="personalblock" id="security">
-    <legend><strong><?php echo $l->t('Security');?></strong></legend>
-    <table class="nostyle">
-        <tr>
-            <td id="enable">
-                <input type="checkbox" name="forcessl"  id="enforceHTTPSEnabled"
-                    <?php if ($_['enforceHTTPSEnabled']) {
-                        echo 'checked="checked" ';
-                        echo 'value="false"';
-                    }  else {
-                        echo 'value="true"';
-                    }
-                    ?> 
-                    <?php if (!$_['isConnectedViaHTTPS']) echo 'disabled'; ?> />
-                <label for="forcessl"><?php echo $l->t('Enforce HTTPS');?></label><br/>
-                <em><?php echo $l->t('Enforces the clients to connect to ownCloud via an encrypted connection.'); ?></em>
-                <?php if (!$_['isConnectedViaHTTPS']) {
-                    echo "<br/><em>"; 
-                    echo $l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.'); 
-                    echo "</em>"; 
-                } 
-                ?>
-            </td>
-        </tr>
-    </table>
+	<legend><strong><?php echo $l->t('Security');?></strong></legend>
+	<table class="nostyle">
+		<tr>
+			<td id="enable">
+				<input type="checkbox" name="forcessl"  id="enforceHTTPSEnabled"
+					<?php if ($_['enforceHTTPSEnabled']) {
+						echo 'checked="checked" ';
+						echo 'value="false"';
+					}  else {
+						echo 'value="true"';
+					}
+					?>
+					<?php if (!$_['isConnectedViaHTTPS']) echo 'disabled'; ?> />
+				<label for="forcessl"><?php echo $l->t('Enforce HTTPS');?></label><br/>
+				<em><?php echo $l->t('Enforces the clients to connect to ownCloud via an encrypted connection.'); ?></em>
+				<?php if (!$_['isConnectedViaHTTPS']) {
+					echo "<br/><em>";
+					echo $l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.');
+					echo "</em>";
+				}
+				?>
+			</td>
+		</tr>
+	</table>
 </fieldset>
 
 <fieldset class="personalblock">
-    <legend><strong><?php echo $l->t('Log');?></strong></legend>
-    <?php echo $l->t('Log level');?> <select name='loglevel' id='loglevel'>
-    <option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
-    <?php for ($i = 0; $i < 5; $i++):
-    if ($i != $_['loglevel']):?>
-        <option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
-        <?php endif;
+	<legend><strong><?php echo $l->t('Log');?></strong></legend>
+	<?php echo $l->t('Log level');?> <select name='loglevel' id='loglevel'>
+	<option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
+	<?php for ($i = 0; $i < 5; $i++):
+	if ($i != $_['loglevel']):?>
+		<option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
+		<?php endif;
 endfor;?>
 </select>
-    <table id='log'>
-        <?php foreach ($_['entries'] as $entry): ?>
-        <tr>
-            <td>
-                <?php echo $levels[$entry->level];?>
-            </td>
-            <td>
-                <?php echo $entry->app;?>
-            </td>
-            <td>
-                <?php echo $entry->message;?>
-            </td>
-            <td>
-                <?php echo OC_Util::formatDate($entry->time);?>
-            </td>
-        </tr>
-        <?php endforeach;?>
-    </table>
-    <?php if ($_['entriesremain']): ?>
-    <input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'></input>
-    <?php endif; ?>
+	<table id='log'>
+		<?php foreach ($_['entries'] as $entry): ?>
+		<tr>
+			<td>
+				<?php echo $levels[$entry->level];?>
+			</td>
+			<td>
+				<?php echo $entry->app;?>
+			</td>
+			<td>
+				<?php echo $entry->message;?>
+			</td>
+			<td>
+				<?php echo OC_Util::formatDate($entry->time);?>
+			</td>
+		</tr>
+		<?php endforeach;?>
+	</table>
+	<?php if ($_['entriesremain']): ?>
+	<input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'>
+	<?php endif; ?>
 
 </fieldset>
 
 
 <fieldset class="personalblock">
-    <legend><strong><?php echo $l->t('Version');?></strong></legend>
-    <strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?>
-    (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br/>
-    <?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
+	<legend><strong><?php echo $l->t('Version');?></strong></legend>
+	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?>
+	(<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br/>
+	<?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
 </fieldset>
 
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 7b5eaea9cd1..bbd5de1fcbd 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -3,9 +3,9 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */?>
-<script type='text/javascript'>
-	var appid = '<?php echo $_['appid']; ?>';
-</script>
+ <script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('apps_custom');?>?appid=<?php echo $_['appid']; ?>"></script>
+ <script type="text/javascript" src="<?php echo OC_Helper::linkTo('settings/js', 'apps.js');?>"></script>
+
 <div id="controls">
 	<a class="button" target="_blank" href="http://owncloud.org/dev"><?php echo $l->t('Add your App');?></a>
 	<a class="button" target="_blank" href="http://apps.owncloud.com"><?php echo $l->t('More Apps');?></a>
@@ -29,7 +29,7 @@
 	<p class="description"></p>
 	<img src="" class="preview" />
 	<p class="appslink hidden"><a href="#" target="_blank"><?php echo $l->t('See application page at apps.owncloud.com');?></a></p>
-    <p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p>
+	<p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p>
 	<input class="enable hidden" type="submit" />
 	<input class="update hidden" type="submit" value="<?php echo($l->t('Update')); ?>" />
 	</div>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index b697905f7ef..7383fdcf56a 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,35 +1,14 @@
 <div id="controls">
-        <?php if($_['admin']) { ?>
+	<?php if($_['admin']) { ?>
 		<a class="button newquestion <?php echo($_['style1']); ?>" href="<?php echo($_['url1']); ?>"><?php echo $l->t( 'User Documentation' ); ?></a>
-   	     	<a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a>
+		<a class="button newquestion <?php echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $l->t( 'Administrator Documentation' ); ?></a>
 	<?php } ?>
-        <a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a>
-        <a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a>
-        <?php if($_['admin']) { ?>
+	<a class="button newquestion" href="http://owncloud.org/support" target="_blank"><?php echo $l->t( 'Online Documentation' ); ?></a>
+	<a class="button newquestion" href="http://forum.owncloud.org" target="_blank"><?php echo $l->t( 'Forum' ); ?></a>
+	<?php if($_['admin']) { ?>
 		<a class="button newquestion" href="https://github.com/owncloud/core/issues" target="_blank"><?php echo $l->t( 'Bugtracker' ); ?></a>
 	<?php } ?>
-        <a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a>
+	<a class="button newquestion" href="http://owncloud.com" target="_blank"><?php echo $l->t( 'Commercial Support' ); ?></a>
 </div>
 <br /><br />
-<iframe src="<?php echo($_['url']); ?>" width="100%" id="ifm" ></iframe>
-
-
-<script language="JavaScript">
-<!--
-
-function pageY(elem) {
-    return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop;
-}
-var buffer = 5; //scroll bar buffer
-function resizeIframe() {
-    var height = document.documentElement.clientHeight;
-    height -= pageY(document.getElementById('ifm'))+ buffer ;
-    height = (height < 0) ? 0 : height;
-    document.getElementById('ifm').style.height = height + 'px';
-}
-
-document.getElementById('ifm').onload=resizeIframe;
-window.onresize = resizeIframe;
-
-//-->
-</script>
+<iframe src="<?php echo($_['url']); ?>" width="100%" id="ifm" ></iframe>
\ No newline at end of file
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 35eb0ef5e9a..0e1677bdea8 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -62,7 +62,7 @@
 <fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('Version');?></strong></legend>
 	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> <br />
-    <?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
+	<?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
 </fieldset>
 
 
diff --git a/settings/templates/users.php b/settings/templates/users.php
index e8bf9edf604..f30c21efaef 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -13,12 +13,12 @@ $items = array_flip($_['subadmingroups']);
 unset($items['admin']);
 $_['subadmingroups'] = array_flip($items);
 ?>
-<script>
-var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
-</script>
+
+<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('isadmin');?>"></script>
+
 <div id="controls">
 	<form id="newuser" autocomplete="off">
-		<input id="newusername" type="text" placeholder="<?php echo $l->t('Name')?>" /> <input
+		<input id="newusername" type="text" placeholder="<?php echo $l->t('Login Name')?>" /> <input
 			type="password" id="newuserpassword"
 			placeholder="<?php echo $l->t('Password')?>" /> <select
 			class="groupsselect"
@@ -36,11 +36,11 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 		<div class="quota-select-wrapper">
 			<?php if((bool) $_['isadmin']): ?>
 			<select class='quota'>
-                <option
-                    <?php if($_['default_quota']=='none') echo 'selected="selected"';?>
-                        value='none'>
-                    <?php echo $l->t('Unlimited');?>
-                </option>
+				<option
+					<?php if($_['default_quota']=='none') echo 'selected="selected"';?>
+						value='none'>
+					<?php echo $l->t('Unlimited');?>
+				</option>
 				<?php foreach($_['quota_preset'] as $preset):?>
 				<?php if($preset!='default'):?>
 				<option
@@ -73,12 +73,11 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 	</div>
 </div>
 
-<div id='notification'></div>
-
 <table data-groups="<?php echo implode(', ', $allGroups);?>">
 	<thead>
 		<tr>
-			<th id='headerName'><?php echo $l->t('Name')?></th>
+			<th id='headerName'><?php echo $l->t('Login Name')?></th>
+			<th id="headerDisplayName"><?php echo $l->t( 'Display Name' ); ?></th>
 			<th id="headerPassword"><?php echo $l->t( 'Password' ); ?></th>
 			<th id="headerGroups"><?php echo $l->t( 'Groups' ); ?></th>
 			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
@@ -90,8 +89,13 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 	</thead>
 	<tbody>
 		<?php foreach($_["users"] as $user): ?>
-		<tr data-uid="<?php echo $user["name"] ?>">
+		<tr data-uid="<?php echo $user["name"] ?>"
+			data-displayName="<?php echo $user["displayName"] ?>">
 			<td class="name"><?php echo $user["name"]; ?></td>
+			<td class="displayName"><span><?php echo $user["displayName"]; ?></span> <img class="svg action"
+				src="<?php echo image_path('core', 'actions/rename.svg')?>"
+				alt="change display name" title="change display name"/>
+			</td>
 			<td class="password"><span>●●●●●●●</span> <img class="svg action"
 				src="<?php echo image_path('core', 'actions/rename.svg')?>"
 				alt="set new password" title="set new password"/>
@@ -127,16 +131,16 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 			<td class="quota">
 				<div class="quota-select-wrapper">
 					<select class='quota-user'>
-                        <option
-                            <?php if($user['quota']=='default') echo 'selected="selected"';?>
-                                value='default'>
-                            <?php echo $l->t('Default');?>
-                        </option>
-                        <option
-                        <?php if($user['quota']=='none') echo 'selected="selected"';?>
-                                value='none'>
-                            <?php echo $l->t('Unlimited');?>
-                        </option>
+						<option
+							<?php if($user['quota']=='default') echo 'selected="selected"';?>
+								value='default'>
+							<?php echo $l->t('Default');?>
+						</option>
+						<option
+						<?php if($user['quota']=='none') echo 'selected="selected"';?>
+								value='none'>
+							<?php echo $l->t('Unlimited');?>
+						</option>
 						<?php foreach($_['quota_preset'] as $preset):?>
 						<option
 						<?php if($user['quota']==$preset) echo 'selected="selected"';?>
diff --git a/settings/users.php b/settings/users.php
index 07a7620d3c0..ab7a7aed734 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -18,14 +18,15 @@ OC_App::setActiveNavigationEntry( 'core_users' );
 $users = array();
 $groups = array();
 
-$isadmin = OC_Group::inGroup(OC_User::getUser(), 'admin')?true:false;
+$isadmin = OC_User::isAdminUser(OC_User::getUser());
+
 if($isadmin) {
 	$accessiblegroups = OC_Group::getGroups();
-	$accessibleusers = OC_User::getUsers('', 30);
+	$accessibleusers = OC_User::getDisplayNames('', 30);
 	$subadmins = OC_SubAdmin::getAllSubAdmins();
 }else{
 	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
-	$accessibleusers = OC_Group::usersInGroups($accessiblegroups, '', 30);
+	$accessibleusers = OC_Group::displayNamesInGroups($accessiblegroups, '', 30);
 	$subadmins = false;
 }
 
@@ -33,7 +34,7 @@ if($isadmin) {
 $quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB');
 $quotaPreset=explode(',', $quotaPreset);
 foreach($quotaPreset as &$preset) {
-    $preset=trim($preset);
+	$preset=trim($preset);
 }
 $quotaPreset=array_diff($quotaPreset, array('default', 'none'));
 
@@ -41,16 +42,22 @@ $defaultQuota=OC_Appconfig::getValue('files', 'default_quota', 'none');
 $defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false && array_search($defaultQuota, array('none', 'default'))===false;
 
 // load users and quota
-foreach($accessibleusers as $i) {
-    $quota=OC_Preferences::getValue($i, 'files', 'quota', 'default');
-    $isQuotaUserDefined=array_search($quota, $quotaPreset)===false && array_search($quota, array('none', 'default'))===false;
+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;
 
+	$name = $displayName;
+	if ( $displayName != $uid ) {
+		$name = $name . ' ('.$uid.')';
+	} 
+	
 	$users[] = array(
-		"name" => $i,
-		"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
-        'quota'=>$quota,
-        'isQuotaUserDefined'=>$isQuotaUserDefined,
-		'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($i)));
+		"name" => $uid,
+		"displayName" => $displayName, 
+		"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($uid)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
+		'quota'=>$quota,
+		'isQuotaUserDefined'=>$isQuotaUserDefined,
+		'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($uid)));
 }
 
 foreach( $accessiblegroups as $i ) {