Merge branch 'master' into fixing-998-master

Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js

79 files changed, 317 insertions, 305 deletions

diff --git a/settings/admin.php b/settings/admin.php
index 04905391138..4d9685ab920 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -33,6 +33,16 @@ $tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking(
 $tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
 $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
+
+// Check if connected using HTTPS
+if (OC_Request::serverProtocol() == 'https') {
+	$connectedHTTPS = true; 
+} else {
+	$connectedHTTPS = false;
+} 
+$tmpl->assign('isConnectedViaHTTPS', $connectedHTTPS);
+$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false)); 
+
 $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
 $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
 $tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
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/disableapp.php b/settings/ajax/disableapp.php
index a39b06b9c7d..e89de928eac 100644
--- a/settings/ajax/disableapp.php
+++ b/settings/ajax/disableapp.php
@@ -1,7 +1,6 @@
 <?php
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
-OC_JSON::setContentTypeHeader();
 
 OC_App::disable($_POST['appid']);
 
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index f4d5c53adef..18202dc39e9 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -2,7 +2,6 @@
 
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
-OC_JSON::setContentTypeHeader();
 
 $appid = OC_App::enable($_POST['appid']);
 if($appid !== false) {
diff --git a/settings/ajax/openid.php b/settings/ajax/openid.php
deleted file mode 100644
index 23c43c3c48e..00000000000
--- a/settings/ajax/openid.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$l=OC_L10N::get('settings');
-
-OC_JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-OC_JSON::checkAppEnabled('user_openid');
-
-// Get data
-if( isset( $_POST['identity'] ) ) {
-	$identity=$_POST['identity'];
-	OC_Preferences::setValue(OC_User::getUser(), 'user_openid', 'identity', $identity);
-	OC_JSON::success(array("data" => array( "message" => $l->t("OpenID Changed") )));
-}else{
-	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));
-}
diff --git a/settings/ajax/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/setsecurity.php b/settings/ajax/setsecurity.php
new file mode 100644
index 00000000000..16a85aade81
--- /dev/null
+++ b/settings/ajax/setsecurity.php
@@ -0,0 +1,13 @@
+<?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.
+ */
+
+OC_Util::checkAdminUser();
+OCP\JSON::callCheck();
+
+OC_Config::setValue( 'forcessl', filter_var($_POST['enforceHTTPS'], FILTER_VALIDATE_BOOLEAN));
+
+echo 'true';
\ No newline at end of file
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/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/admin.js b/settings/js/admin.js
index 95b7a503c27..ab218377fb3 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -30,4 +30,8 @@ $(document).ready(function(){
 		}
 		OC.AppConfig.setValue('core', $(this).attr('name'), value);
 	});
+
+	$('#security').change(function(){
+		$.post(OC.filePath('settings','ajax','setsecurity.php'), { enforceHTTPS: $('#enforceHTTPSEnabled').val() },function(){} );
+	});
 });
diff --git a/settings/js/users.js b/settings/js/users.js
index 2ccb56ab0e3..9f0c1ffd111 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -176,9 +176,9 @@ var UserList = {
             } else {
                 checkHandeler = false;
             }
-            var addGroup = function (group) {
+            var addGroup = function (select, group) {
                 $('select[multiple]').each(function (index, element) {
-                    if ($(element).find('option[value="' + group + '"]').length == 0) {
+                    if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
                         $(element).append('<option value="' + group + '">' + group + '</option>');
                     }
                 })
@@ -192,6 +192,7 @@ var UserList = {
             element.multiSelect({
                 createCallback:addGroup,
                 createText:label,
+                selectedFirst:true,
                 checked:checked,
                 oncheck:checkHandeler,
                 onuncheck:checkHandeler,
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index d16e6ad10ea..20d4cced233 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "فشل عملية تفعيل التطبيق",
 "Email saved" => "تم حفظ البريد الإلكتروني",
 "Invalid email" => "البريد الإلكتروني غير صالح",
-"OpenID Changed" => "تم تغيير ال OpenID",
-"Invalid request" => "طلبك غير مفهوم",
 "Unable to delete group" => "فشل إزالة المجموعة",
 "Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
 "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",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 853e12812ed..dc4c1cf6431 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Authentication error" => "Възникна проблем с идентификацията",
+"Invalid request" => "Невалидна заявка",
 "Enable" => "Включено",
 "Password" => "Парола",
 "Email" => "E-mail",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index 49b86c0e5e7..bab6d9ec19c 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "অ্যপটি সক্রিয় করতে সক্ষম নয়।",
 "Email saved" => "ই-মেইল সংরক্ষন করা হয়েছে",
 "Invalid email" => "ই-মেইলটি সঠিক নয়",
-"OpenID Changed" => "OpenID পরিবর্তন করা হয়েছে",
-"Invalid request" => "অনুরোধটি যথাযথ নয়",
 "Unable to delete group" => "গোষ্ঠী মুছে ফেলা সম্ভব হলো না ",
 "Authentication error" => "অনুমোদন ঘটিত সমস্যা",
 "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 গোষ্ঠী থেকে ব্যবহারকারীকে অপসারণ করা সম্ভব হলো না",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index cde7fd1cbf1..35952475254 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "No s'ha pogut activar l'apliació",
 "Email saved" => "S'ha desat el correu electrònic",
 "Invalid email" => "El correu electrònic no és vàlid",
-"OpenID Changed" => "OpenID ha canviat",
-"Invalid request" => "Sol.licitud no vàlida",
 "Unable to delete group" => "No es pot eliminar el grup",
 "Authentication error" => "Error d'autenticació",
 "Unable to delete user" => "No es pot eliminar l'usuari",
 "Language changed" => "S'ha canviat l'idioma",
+"Invalid request" => "Sol.licitud no vàlida",
 "Admins can't remove themself from the admin group" => "Els administradors no es poden eliminar del grup admin",
 "Unable to add user to group %s" => "No es pot afegir l'usuari al grup %s",
 "Unable to remove user from group %s" => "No es pot eliminar l'usuari del grup %s",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index d86376d5672..d20861764a9 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Nelze povolit aplikaci.",
 "Email saved" => "E-mail uložen",
 "Invalid email" => "Neplatný e-mail",
-"OpenID Changed" => "OpenID změněno",
-"Invalid request" => "Neplatný požadavek",
 "Unable to delete group" => "Nelze smazat skupinu",
 "Authentication error" => "Chyba ověření",
 "Unable to delete user" => "Nelze smazat uživatele",
 "Language changed" => "Jazyk byl změněn",
+"Invalid request" => "Neplatný požadavek",
 "Admins can't remove themself from the admin group" => "Správci se nemohou odebrat sami ze skupiny správců",
 "Unable to add user to group %s" => "Nelze přidat uživatele do skupiny %s",
 "Unable to remove user from group %s" => "Nelze odstranit uživatele ze skupiny %s",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 7800bcfb6c4..021d7f814bb 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Applikationen kunne ikke aktiveres.",
 "Email saved" => "Email adresse gemt",
 "Invalid email" => "Ugyldig email adresse",
-"OpenID Changed" => "OpenID ændret",
-"Invalid request" => "Ugyldig forespørgsel",
 "Unable to delete group" => "Gruppen kan ikke slettes",
 "Authentication error" => "Adgangsfejl",
 "Unable to delete user" => "Bruger kan ikke slettes",
 "Language changed" => "Sprog ændret",
+"Invalid request" => "Ugyldig forespørgsel",
 "Admins can't remove themself from the admin group" => "Administratorer kan ikke fjerne dem selv fra admin gruppen",
 "Unable to add user to group %s" => "Brugeren kan ikke tilføjes til gruppen %s",
 "Unable to remove user from group %s" => "Brugeren kan ikke fjernes fra gruppen %s",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 6434d23a5ba..3bb53f99b2e 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "App konnte nicht aktiviert werden.",
 "Email saved" => "E-Mail Adresse gespeichert",
 "Invalid email" => "Ungültige E-Mail Adresse",
-"OpenID Changed" => "OpenID geändert",
-"Invalid request" => "Ungültige Anfrage",
 "Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
 "Authentication error" => "Fehler bei der Anmeldung",
 "Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
 "Language changed" => "Sprache geändert",
+"Invalid request" => "Ungültige Anfrage",
 "Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der Admin-Gruppe löschen.",
 "Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
 "Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 10914350d74..dd129fc59eb 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Die Anwendung konnte nicht aktiviert werden.",
 "Email saved" => "E-Mail-Adresse gespeichert",
 "Invalid email" => "Ungültige E-Mail-Adresse",
-"OpenID Changed" => "OpenID geändert",
-"Invalid request" => "Ungültige Anfrage",
 "Unable to delete group" => "Die Gruppe konnte nicht gelöscht werden",
 "Authentication error" => "Fehler bei der Anmeldung",
 "Unable to delete user" => "Der Benutzer konnte nicht gelöscht werden",
 "Language changed" => "Sprache geändert",
+"Invalid request" => "Ungültige Anfrage",
 "Admins can't remove themself from the admin group" => "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
 "Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
 "Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 1ecd2e269ff..ffd6d2a60bf 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Αδυναμία ενεργοποίησης εφαρμογής ",
 "Email saved" => "Το email αποθηκεύτηκε ",
 "Invalid email" => "Μη έγκυρο email",
-"OpenID Changed" => "Το OpenID άλλαξε",
-"Invalid request" => "Μη έγκυρο αίτημα",
 "Unable to delete group" => "Αδυναμία διαγραφής ομάδας",
 "Authentication error" => "Σφάλμα πιστοποίησης",
 "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",
@@ -53,7 +52,11 @@
 "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 4f8d58b1bb7..651403be68c 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Ne eblis kapabligi la aplikaĵon.",
 "Email saved" => "La retpoŝtadreso konserviĝis",
 "Invalid email" => "Nevalida retpoŝtadreso",
-"OpenID Changed" => "La agordo de OpenID estas ŝanĝita",
-"Invalid request" => "Nevalida peto",
 "Unable to delete group" => "Ne eblis forigi la grupon",
 "Authentication error" => "Aŭtentiga eraro",
 "Unable to delete user" => "Ne eblis forigi la uzanton",
 "Language changed" => "La lingvo estas ŝanĝita",
+"Invalid request" => "Nevalida peto",
 "Admins can't remove themself from the admin group" => "Administrantoj ne povas forigi sin mem el la administra grupo.",
 "Unable to add user to group %s" => "Ne eblis aldoni la uzanton al la grupo %s",
 "Unable to remove user from group %s" => "Ne eblis forigi la uzantan el la grupo %s",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index bd7d2866601..5434da7f981 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "No puedo habilitar la app.",
 "Email saved" => "Correo guardado",
 "Invalid email" => "Correo no válido",
-"OpenID Changed" => "OpenID cambiado",
-"Invalid request" => "Solicitud no válida",
 "Unable to delete group" => "No se pudo eliminar el grupo",
 "Authentication error" => "Error de autenticación",
 "Unable to delete user" => "No se pudo eliminar el usuario",
 "Language changed" => "Idioma cambiado",
+"Invalid request" => "Solicitud no válida",
 "Admins can't remove themself from the admin group" => "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
 "Unable to add user to group %s" => "Imposible añadir el usuario al grupo %s",
 "Unable to remove user from group %s" => "Imposible eliminar al usuario del grupo %s",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 03f6c5593d4..a652ee13103 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "No se puede  habilitar la aplicación.",
 "Email saved" => "e-mail guardado",
 "Invalid email" => "el e-mail no es válido ",
-"OpenID Changed" => "OpenID cambiado",
-"Invalid request" => "Solicitud no válida",
 "Unable to delete group" => "No fue posible eliminar el grupo",
 "Authentication error" => "Error al autenticar",
 "Unable to delete user" => "No fue posible eliminar el usuario",
 "Language changed" => "Idioma cambiado",
+"Invalid request" => "Solicitud no válida",
 "Admins can't remove themself from the admin group" => "Los administradores no se pueden quitar a ellos mismos del grupo administrador. ",
 "Unable to add user to group %s" => "No fue posible añadir el usuario al grupo %s",
 "Unable to remove user from group %s" => "No es posible eliminar al usuario del grupo %s",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index fdf9e35dfe2..53f61717282 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Rakenduse sisselülitamine ebaõnnestus.",
 "Email saved" => "Kiri on salvestatud",
 "Invalid email" => "Vigane e-post",
-"OpenID Changed" => "OpenID on muudetud",
-"Invalid request" => "Vigane päring",
 "Unable to delete group" => "Keela grupi kustutamine",
 "Authentication error" => "Autentimise viga",
 "Unable to delete user" => "Keela kasutaja kustutamine",
 "Language changed" => "Keel on muudetud",
+"Invalid request" => "Vigane päring",
 "Unable to add user to group %s" => "Kasutajat ei saa lisada gruppi %s",
 "Unable to remove user from group %s" => "Kasutajat ei saa eemaldada grupist %s",
 "Disable" => "Lülita välja",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index bcf80da33c1..78e3cc62488 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Ezin izan da aplikazioa gaitu.",
 "Email saved" => "Eposta gorde da",
 "Invalid email" => "Baliogabeko eposta",
-"OpenID Changed" => "OpenID aldatuta",
-"Invalid request" => "Baliogabeko eskaria",
 "Unable to delete group" => "Ezin izan da taldea ezabatu",
 "Authentication error" => "Autentifikazio errorea",
 "Unable to delete user" => "Ezin izan da erabiltzailea ezabatu",
 "Language changed" => "Hizkuntza aldatuta",
+"Invalid request" => "Baliogabeko eskaria",
 "Admins can't remove themself from the admin group" => "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik",
 "Unable to add user to group %s" => "Ezin izan da erabiltzailea %s taldera gehitu",
 "Unable to remove user from group %s" => "Ezin izan da erabiltzailea %s taldetik ezabatu",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 293a50ff291..44872e28f05 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -2,10 +2,9 @@
 "Unable to load list from App Store" => "قادر به بارگذاری لیست از فروشگاه اپ نیستم",
 "Email saved" => "ایمیل ذخیره شد",
 "Invalid email" => "ایمیل غیر قابل قبول",
-"OpenID Changed" => "OpenID تغییر کرد",
-"Invalid request" => "درخواست غیر قابل قبول",
 "Authentication error" => "خطا در اعتبار سنجی",
 "Language changed" => "زبان تغییر کرد",
+"Invalid request" => "درخواست غیر قابل قبول",
 "Disable" => "غیرفعال",
 "Enable" => "فعال",
 "Saving..." => "درحال ذخیره ...",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index cf80b5187ec..dbab88b97a0 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Sovelluksen käyttöönotto epäonnistui.",
 "Email saved" => "Sähköposti tallennettu",
 "Invalid email" => "Virheellinen sähköposti",
-"OpenID Changed" => "OpenID on vaihdettu",
-"Invalid request" => "Virheellinen pyyntö",
 "Unable to delete group" => "Ryhmän poisto epäonnistui",
 "Authentication error" => "Todennusvirhe",
 "Unable to delete user" => "Käyttäjän poisto epäonnistui",
 "Language changed" => "Kieli on vaihdettu",
+"Invalid request" => "Virheellinen pyyntö",
 "Admins can't remove themself from the admin group" => "Ylläpitäjät eivät poistaa omia tunnuksiaan ylläpitäjien ryhmästä",
 "Unable to add user to group %s" => "Käyttäjän tai ryhmän %s lisääminen ei onnistu",
 "Unable to remove user from group %s" => "Käyttäjän poistaminen ryhmästä %s ei onnistu",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 0004d24fc7b..03a61c69cf8 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Impossible d'activer l'Application",
 "Email saved" => "E-mail sauvegardé",
 "Invalid email" => "E-mail invalide",
-"OpenID Changed" => "Identifiant OpenID changé",
-"Invalid request" => "Requête invalide",
 "Unable to delete group" => "Impossible de supprimer le groupe",
 "Authentication error" => "Erreur d'authentification",
 "Unable to delete user" => "Impossible de supprimer l'utilisateur",
 "Language changed" => "Langue changée",
+"Invalid request" => "Requête invalide",
 "Admins can't remove themself from the admin group" => "Les administrateurs ne peuvent pas se retirer eux-mêmes du groupe admin",
 "Unable to add user to group %s" => "Impossible d'ajouter l'utilisateur au groupe %s",
 "Unable to remove user from group %s" => "Impossible de supprimer l'utilisateur du groupe %s",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 13088d0d8b2..ddd5661fe72 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Non é posíbel activar o aplicativo.",
 "Email saved" => "Correo gardado",
 "Invalid email" => "correo incorrecto",
-"OpenID Changed" => "Cambiou o OpenID",
-"Invalid request" => "Petición incorrecta",
 "Unable to delete group" => "Non é posíbel eliminar o grupo.",
 "Authentication error" => "Produciuse un erro de autenticación",
 "Unable to delete user" => "Non é posíbel eliminar o usuario",
 "Language changed" => "O idioma cambiou",
+"Invalid request" => "Petición incorrecta",
 "Admins can't remove themself from the admin group" => "Os administradores non se pode eliminar a si mesmos do grupo admin",
 "Unable to add user to group %s" => "Non é posíbel engadir o usuario ao grupo %s",
 "Unable to remove user from group %s" => "Non é posíbel eliminar o usuario do grupo %s",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 1d7a91ee523..bbfe437ba30 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "לא ניתן להפעיל את היישום",
 "Email saved" => "הדוא״ל נשמר",
 "Invalid email" => "דוא״ל לא חוקי",
-"OpenID Changed" => "OpenID השתנה",
-"Invalid request" => "בקשה לא חוקית",
 "Unable to delete group" => "לא ניתן למחוק את הקבוצה",
 "Authentication error" => "שגיאת הזדהות",
 "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",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index b6f7133f13f..14053cb98a4 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -2,10 +2,9 @@
 "Unable to load list from App Store" => "Nemogićnost učitavanja liste sa Apps Stora",
 "Email saved" => "Email spremljen",
 "Invalid email" => "Neispravan email",
-"OpenID Changed" => "OpenID promijenjen",
-"Invalid request" => "Neispravan zahtjev",
 "Authentication error" => "Greška kod autorizacije",
 "Language changed" => "Jezik promijenjen",
+"Invalid request" => "Neispravan zahtjev",
 "Disable" => "Isključi",
 "Enable" => "Uključi",
 "Saving..." => "Spremanje...",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 26a52bd616c..35c59bdb2d6 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "A program nem aktiválható.",
 "Email saved" => "Email mentve",
 "Invalid email" => "Hibás email",
-"OpenID Changed" => "OpenID megváltozott",
-"Invalid request" => "Érvénytelen kérés",
 "Unable to delete group" => "A csoport nem törölhető",
 "Authentication error" => "Azonosítási hiba",
 "Unable to delete user" => "A felhasználó nem törölhető",
 "Language changed" => "A nyelv megváltozott",
+"Invalid request" => "Érvénytelen kérés",
 "Admins can't remove themself from the admin group" => "Adminisztrátorok nem távolíthatják el magukat az admin csoportból.",
 "Unable to add user to group %s" => "A felhasználó nem adható hozzá ehhez a csoporthoz: %s",
 "Unable to remove user from group %s" => "A felhasználó nem távolítható el ebből a csoportból: %s",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index d5057275d2b..18428709098 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -1,7 +1,6 @@
 <?php $TRANSLATIONS = array(
-"OpenID Changed" => "OpenID cambiate",
-"Invalid request" => "Requesta invalide",
 "Language changed" => "Linguage cambiate",
+"Invalid request" => "Requesta invalide",
 "__language_name__" => "Interlingua",
 "Add your App" => "Adder tu application",
 "Select an App" => "Selectionar un app",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 575b0a233dd..132920a7a04 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,10 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Email saved" => "Email tersimpan",
 "Invalid email" => "Email tidak sah",
-"OpenID Changed" => "OpenID telah dirubah",
-"Invalid request" => "Permintaan tidak valid",
 "Authentication error" => "autentikasi bermasalah",
 "Language changed" => "Bahasa telah diganti",
+"Invalid request" => "Permintaan tidak valid",
 "Disable" => "NonAktifkan",
 "Enable" => "Aktifkan",
 "Saving..." => "Menyimpan...",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index 7f5fa384133..d978957ab48 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Gat ekki virkjað forrit",
 "Email saved" => "Netfang vistað",
 "Invalid email" => "Ógilt netfang",
-"OpenID Changed" => "OpenID breytt",
-"Invalid request" => "Ógild fyrirspurn",
 "Unable to delete group" => "Ekki tókst að eyða hóp",
 "Authentication error" => "Villa við auðkenningu",
 "Unable to delete user" => "Ekki tókst að eyða notenda",
 "Language changed" => "Tungumáli breytt",
+"Invalid request" => "Ógild fyrirspurn",
 "Admins can't remove themself from the admin group" => "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp",
 "Unable to add user to group %s" => "Ekki tókst að bæta notenda við hópinn %s",
 "Unable to remove user from group %s" => "Ekki tókst að fjarlægja notanda úr hópnum %s",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 043f1a2db9d..4980d585441 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Impossibile abilitare l'applicazione.",
 "Email saved" => "Email salvata",
 "Invalid email" => "Email non valida",
-"OpenID Changed" => "OpenID modificato",
-"Invalid request" => "Richiesta non valida",
 "Unable to delete group" => "Impossibile eliminare il gruppo",
 "Authentication error" => "Errore di autenticazione",
 "Unable to delete user" => "Impossibile eliminare l'utente",
 "Language changed" => "Lingua modificata",
+"Invalid request" => "Richiesta non valida",
 "Admins can't remove themself from the admin group" => "Gli amministratori non possono rimuovere se stessi dal gruppo di amministrazione",
 "Unable to add user to group %s" => "Impossibile aggiungere l'utente al gruppo %s",
 "Unable to remove user from group %s" => "Impossibile rimuovere l'utente dal gruppo %s",
@@ -56,7 +55,7 @@
 "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 4b1efe35f67..a660d21c780 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "アプリを有効にできませんでした。",
 "Email saved" => "メールアドレスを保存しました",
 "Invalid email" => "無効なメールアドレス",
-"OpenID Changed" => "OpenIDが変更されました",
-"Invalid request" => "無効なリクエストです",
 "Unable to delete group" => "グループを削除できません",
 "Authentication error" => "認証エラー",
 "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 から削除できません",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index a9d994f87c6..68dbc736dcd 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "ვერ მოხერხდა აპლიკაციის ჩართვა.",
 "Email saved" => "იმეილი შენახულია",
 "Invalid email" => "არასწორი იმეილი",
-"OpenID Changed" => "OpenID შეცვლილია",
-"Invalid request" => "არასწორი მოთხოვნა",
 "Unable to delete group" => "ჯგუფის წაშლა ვერ მოხერხდა",
 "Authentication error" => "ავთენტიფიკაციის შეცდომა",
 "Unable to delete user" => "მომხმარებლის წაშლა ვერ მოხერხდა",
 "Language changed" => "ენა შეცვლილია",
+"Invalid request" => "არასწორი მოთხოვნა",
 "Unable to add user to group %s" => "მომხმარებლის დამატება ვერ მოხეხდა ჯგუფში %s",
 "Unable to remove user from group %s" => "მომხმარებლის წაშლა ვერ მოხეხდა ჯგუფიდან %s",
 "Disable" => "გამორთვა",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 21724a1782e..4a7817b8401 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "앱을 활성화할 수 없습니다.",
 "Email saved" => "이메일 저장됨",
 "Invalid email" => "잘못된 이메일 주소",
-"OpenID Changed" => "OpenID 변경됨",
-"Invalid request" => "잘못된 요청",
 "Unable to delete group" => "그룹을 삭제할 수 없습니다.",
 "Authentication error" => "인증 오류",
 "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에서 사용자를 삭제할 수 없습니다.",
@@ -28,6 +27,7 @@
 "Online Documentation" => "온라인 문서",
 "Forum" => "포럼",
 "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" => "데스크탑 클라이언트 다운로드",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index db09bdc1280..1f9ea35e885 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -2,10 +2,9 @@
 "Unable to load list from App Store" => "Konnt Lescht net vum App Store lueden",
 "Email saved" => "E-mail gespäichert",
 "Invalid email" => "Ongülteg e-mail",
-"OpenID Changed" => "OpenID huet geännert",
-"Invalid request" => "Ongülteg Requête",
 "Authentication error" => "Authentifikatioun's Fehler",
 "Language changed" => "Sprooch huet geännert",
+"Invalid request" => "Ongülteg Requête",
 "Disable" => "Ofschalten",
 "Enable" => "Aschalten",
 "Saving..." => "Speicheren...",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 0430fface00..73af4f3b27b 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -3,10 +3,9 @@
 "Could not enable app. " => "Nepavyksta įjungti aplikacijos.",
 "Email saved" => "El. paštas išsaugotas",
 "Invalid email" => "Netinkamas el. paštas",
-"OpenID Changed" => "OpenID pakeistas",
-"Invalid request" => "Klaidinga užklausa",
 "Authentication error" => "Autentikacijos klaida",
 "Language changed" => "Kalba pakeista",
+"Invalid request" => "Klaidinga užklausa",
 "Disable" => "Išjungti",
 "Enable" => "Įjungti",
 "Saving..." => "Saugoma..",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 5ae9be48e4f..ba44fdbb3e2 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Nevar ieslēgt aplikāciju.",
 "Email saved" => "Epasts tika saglabāts",
 "Invalid email" => "Nepareizs epasts",
-"OpenID Changed" => "OpenID nomainīts",
-"Invalid request" => "Nepareizs vaicājums",
 "Unable to delete group" => "Nevar izdzēst grupu",
 "Authentication error" => "Ielogošanās kļūme",
 "Unable to delete user" => "Nevar izdzēst lietotāju",
 "Language changed" => "Valoda tika nomainīta",
+"Invalid request" => "Nepareizs vaicājums",
 "Unable to add user to group %s" => "Nevar pievienot lietotāju grupai %s",
 "Unable to remove user from group %s" => "Nevar noņemt lietotāju no grupas %s",
 "Disable" => "Atvienot",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 4c5f7bf549b..52fafc56479 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Неможе да овозможам апликација.",
 "Email saved" => "Електронската пошта е снимена",
 "Invalid email" => "Неисправна електронска пошта",
-"OpenID Changed" => "OpenID сменето",
-"Invalid request" => "неправилно барање",
 "Unable to delete group" => "Неможе да избришам група",
 "Authentication error" => "Грешка во автентикација",
 "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",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 27eb4c2df9f..87f45d3c9a0 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -1,10 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Email saved" => "Emel disimpan",
 "Invalid email" => "Emel tidak sah",
-"OpenID Changed" => "OpenID diubah",
-"Invalid request" => "Permintaan tidak sah",
 "Authentication error" => "Ralat pengesahan",
 "Language changed" => "Bahasa diubah",
+"Invalid request" => "Permintaan tidak sah",
 "Disable" => "Nyahaktif",
 "Enable" => "Aktif",
 "Saving..." => "Simpan...",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 24a6085b024..52cfc92040b 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Kan ikke aktivere app.",
 "Email saved" => "Epost lagret",
 "Invalid email" => "Ugyldig epost",
-"OpenID Changed" => "OpenID endret",
-"Invalid request" => "Ugyldig forespørsel",
 "Unable to delete group" => "Kan ikke slette gruppe",
 "Authentication error" => "Autentikasjonsfeil",
 "Unable to delete user" => "Kan ikke slette bruker",
 "Language changed" => "Språk endret",
+"Invalid request" => "Ugyldig forespørsel",
 "Unable to add user to group %s" => "Kan ikke legge bruker til gruppen %s",
 "Unable to remove user from group %s" => "Kan ikke slette bruker fra gruppen %s",
 "Disable" => "Slå avBehandle ",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index ca7e84ce6cb..2b6fdbd6082 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Kan de app. niet activeren",
 "Email saved" => "E-mail bewaard",
 "Invalid email" => "Ongeldige e-mail",
-"OpenID Changed" => "OpenID is aangepast",
-"Invalid request" => "Ongeldig verzoek",
 "Unable to delete group" => "Niet in staat om groep te verwijderen",
 "Authentication error" => "Authenticatie fout",
 "Unable to delete user" => "Niet in staat om gebruiker te verwijderen",
 "Language changed" => "Taal aangepast",
+"Invalid request" => "Ongeldig verzoek",
 "Admins can't remove themself from the admin group" => "Admins kunnen zichzelf niet uit de admin groep verwijderen",
 "Unable to add user to group %s" => "Niet in staat om gebruiker toe te voegen aan groep %s",
 "Unable to remove user from group %s" => "Niet in staat om gebruiker te verwijderen uit groep %s",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 9f54fc9ee5f..923f5481d5a 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -2,10 +2,9 @@
 "Unable to load list from App Store" => "Klarer ikkje å laste inn liste fra App Store",
 "Email saved" => "E-postadresse lagra",
 "Invalid email" => "Ugyldig e-postadresse",
-"OpenID Changed" => "OpenID endra",
-"Invalid request" => "Ugyldig førespurnad",
 "Authentication error" => "Feil i autentisering",
 "Language changed" => "Språk endra",
+"Invalid request" => "Ugyldig førespurnad",
 "Disable" => "Slå av",
 "Enable" => "Slå på",
 "__language_name__" => "Nynorsk",
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 358b44bbec3..39445570fdb 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Pòt pas activar app. ",
 "Email saved" => "Corrièl enregistrat",
 "Invalid email" => "Corrièl incorrècte",
-"OpenID Changed" => "OpenID cambiat",
-"Invalid request" => "Demanda invalida",
 "Unable to delete group" => "Pas capable d'escafar un grop",
 "Authentication error" => "Error d'autentificacion",
 "Unable to delete user" => "Pas capable d'escafar un usancièr",
 "Language changed" => "Lengas cambiadas",
+"Invalid request" => "Demanda invalida",
 "Unable to add user to group %s" => "Pas capable d'apondre un usancièr al grop %s",
 "Unable to remove user from group %s" => "Pas capable de tira un usancièr del grop %s",
 "Disable" => "Desactiva",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 87fd9fb3317..c9e49f57a3e 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Nie można włączyć aplikacji.",
 "Email saved" => "Email zapisany",
 "Invalid email" => "Niepoprawny email",
-"OpenID Changed" => "Zmieniono OpenID",
-"Invalid request" => "Nieprawidłowe żądanie",
 "Unable to delete group" => "Nie można usunąć grupy",
 "Authentication error" => "Błąd uwierzytelniania",
 "Unable to delete user" => "Nie można usunąć użytkownika",
 "Language changed" => "Język zmieniony",
+"Invalid request" => "Nieprawidłowe żądanie",
 "Admins can't remove themself from the admin group" => "Administratorzy nie mogą usunąć się sami z grupy administratorów.",
 "Unable to add user to group %s" => "Nie można dodać użytkownika do grupy %s",
 "Unable to remove user from group %s" => "Nie można usunąć użytkownika z grupy %s",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index a731d142ce3..3a1e6b86357 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Não pôde habilitar aplicação",
 "Email saved" => "Email gravado",
 "Invalid email" => "Email inválido",
-"OpenID Changed" => "Mudou OpenID",
-"Invalid request" => "Pedido inválido",
 "Unable to delete group" => "Não foi possivel remover grupo",
 "Authentication error" => "erro de autenticação",
 "Unable to delete user" => "Não foi possivel remover usuário",
 "Language changed" => "Mudou Idioma",
+"Invalid request" => "Pedido inválido",
 "Admins can't remove themself from the admin group" => "Admins não podem se remover do grupo admin",
 "Unable to add user to group %s" => "Não foi possivel adicionar usuário ao grupo %s",
 "Unable to remove user from group %s" => "Não foi possivel remover usuário ao grupo %s",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 32764a9cf36..6bccb49d649 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Não foi possível activar a app.",
 "Email saved" => "Email guardado",
 "Invalid email" => "Email inválido",
-"OpenID Changed" => "OpenID alterado",
-"Invalid request" => "Pedido inválido",
 "Unable to delete group" => "Impossível apagar grupo",
 "Authentication error" => "Erro de autenticação",
 "Unable to delete user" => "Impossível apagar utilizador",
 "Language changed" => "Idioma alterado",
+"Invalid request" => "Pedido inválido",
 "Admins can't remove themself from the admin group" => "Os administradores não se podem remover a eles mesmos do grupo admin.",
 "Unable to add user to group %s" => "Impossível acrescentar utilizador ao grupo %s",
 "Unable to remove user from group %s" => "Impossível apagar utilizador do grupo %s",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 4c8b1ac420a..a96a7368499 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Nu s-a putut activa aplicația.",
 "Email saved" => "E-mail salvat",
 "Invalid email" => "E-mail nevalid",
-"OpenID Changed" => "OpenID schimbat",
-"Invalid request" => "Cerere eronată",
 "Unable to delete group" => "Nu s-a putut șterge grupul",
 "Authentication error" => "Eroare de autentificare",
 "Unable to delete user" => "Nu s-a putut șterge utilizatorul",
 "Language changed" => "Limba a fost schimbată",
+"Invalid request" => "Cerere eronată",
 "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",
@@ -18,10 +17,20 @@
 "Saving..." => "Salvez...",
 "__language_name__" => "_language_name_",
 "Add your App" => "Adaugă aplicația ta",
+"More Apps" => "Mai multe aplicații",
 "Select an App" => "Selectează o aplicație",
 "See application page at apps.owncloud.com" => "Vizualizează pagina applicației pe apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>",
+"User Documentation" => "Documentație utilizator",
+"Administrator Documentation" => "Documentație administrator",
+"Online Documentation" => "Documentație online",
+"Forum" => "Forum",
+"Bugtracker" => "Urmărire bug-uri",
+"Commercial Support" => "Suport comercial",
 "Clients" => "Clienți",
+"Download Desktop Clients" => "Descarcă client desktop",
+"Download Android Client" => "Descarcă client Android",
+"Download iOS Client" => "Descarcă client iOS",
 "Password" => "Parolă",
 "Your password was changed" => "Parola a fost modificată",
 "Unable to change your password" => "Imposibil de-ați schimbat parola",
@@ -34,11 +43,17 @@
 "Fill in an email address to enable password recovery" => "Completează o adresă de mail pentru a-ți putea recupera parola",
 "Language" => "Limba",
 "Help translate" => "Ajută la traducere",
+"WebDAV" => "WebDAV",
+"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ă",
+"Unlimited" => "Nelimitată",
 "Other" => "Altele",
 "Group Admin" => "Grupul Admin ",
+"Storage" => "Stocare",
+"Default" => "Implicită",
 "Delete" => "Șterge"
 );
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 48965f9a684..5c05f32636a 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Не удалось включить приложение.",
 "Email saved" => "Email сохранен",
 "Invalid email" => "Неправильный Email",
-"OpenID Changed" => "OpenID изменён",
-"Invalid request" => "Неверный запрос",
 "Unable to delete group" => "Невозможно удалить группу",
 "Authentication error" => "Ошибка авторизации",
 "Unable to delete user" => "Невозможно удалить пользователя",
 "Language changed" => "Язык изменён",
+"Invalid request" => "Неверный запрос",
 "Admins can't remove themself from the admin group" => "Администратор не может удалить сам себя из группы admin",
 "Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s",
 "Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s",
@@ -23,7 +22,12 @@
 "Select an App" => "Выберите приложение",
 "See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>",
+"User Documentation" => "Пользовательская документация",
+"Administrator Documentation" => "Документация администратора",
+"Online Documentation" => "Online документация",
 "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" => "Загрузка приложений для компьютера",
@@ -48,7 +52,11 @@
 "Name" => "Имя",
 "Groups" => "Группы",
 "Create" => "Создать",
+"Default Storage" => "Хранилище по-умолчанию",
+"Unlimited" => "Неограниченно",
 "Other" => "Другое",
 "Group Admin" => "Группа Администраторы",
+"Storage" => "Хранилище",
+"Default" => "По-умолчанию",
 "Delete" => "Удалить"
 );
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index 38b736a5c18..26179eeb329 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Не удалось запустить приложение",
 "Email saved" => "Email сохранен",
 "Invalid email" => "Неверный email",
-"OpenID Changed" => "OpenID изменен",
-"Invalid request" => "Неверный запрос",
 "Unable to delete group" => "Невозможно удалить группу",
 "Authentication error" => "Ошибка авторизации",
 "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",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 4f4834921e9..45cb9a4a4fb 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -4,12 +4,11 @@
 "Could not enable app. " => "යෙදුම සක්‍රීය කළ නොහැකි විය.",
 "Email saved" => "වි-තැපෑල සුරකින ලදී",
 "Invalid email" => "අවලංගු වි-තැපෑල",
-"OpenID Changed" => "විවෘත හැඳුනුම නැතහොත් OpenID වෙනස්විය.",
-"Invalid request" => "අවලංගු අයදුම",
 "Unable to delete group" => "කණ්ඩායම මැකීමට නොහැක",
 "Authentication error" => "සත්‍යාපන දෝෂයක්",
 "Unable to delete user" => "පරිශීලකයා මැකීමට නොහැක",
 "Language changed" => "භාෂාව ාවනස් කිරීම",
+"Invalid request" => "අවලංගු අයදුම",
 "Unable to add user to group %s" => "පරිශීලකයා %s කණ්ඩායමට එකතු කළ නොහැක",
 "Unable to remove user from group %s" => "පරිශීලකයා %s කණ්ඩායමින් ඉවත් කළ නොහැක",
 "Disable" => "අක්‍රිය කරන්න",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index c3cf84f1fe8..ecf1a905008 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Nie je možné zapnúť aplikáciu.",
 "Email saved" => "Email uložený",
 "Invalid email" => "Neplatný email",
-"OpenID Changed" => "OpenID zmenené",
-"Invalid request" => "Neplatná požiadavka",
 "Unable to delete group" => "Nie je možné odstrániť skupinu",
 "Authentication error" => "Chyba pri autentifikácii",
 "Unable to delete user" => "Nie je možné odstrániť používateľa",
 "Language changed" => "Jazyk zmenený",
+"Invalid request" => "Neplatná požiadavka",
 "Admins can't remove themself from the admin group" => "Administrátori nesmú odstrániť sami seba zo skupiny admin",
 "Unable to add user to group %s" => "Nie je možné pridať užívateľa do skupiny %s",
 "Unable to remove user from group %s" => "Nie je možné odstrániť používateľa zo skupiny %s",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 88dc1dddba9..24bea147993 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Programa ni mogoče omogočiti.",
 "Email saved" => "Elektronski naslov je shranjen",
 "Invalid email" => "Neveljaven elektronski naslov",
-"OpenID Changed" => "OpenID je bil spremenjen",
-"Invalid request" => "Neveljavna zahteva",
 "Unable to delete group" => "Ni mogoče izbrisati skupine",
 "Authentication error" => "Napaka overitve",
 "Unable to delete user" => "Ni mogoče izbrisati uporabnika",
 "Language changed" => "Jezik je bil spremenjen",
+"Invalid request" => "Neveljavna zahteva",
 "Admins can't remove themself from the admin group" => "Administratorji sebe ne morejo odstraniti iz skupine admin",
 "Unable to add user to group %s" => "Uporabnika ni mogoče dodati k skupini %s",
 "Unable to remove user from group %s" => "Uporabnika ni mogoče odstraniti iz skupine %s",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 9fb495a9ebb..d230adb9275 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Не могу да укључим програм",
 "Email saved" => "Е-порука сачувана",
 "Invalid email" => "Неисправна е-адреса",
-"OpenID Changed" => "OpenID је измењен",
-"Invalid request" => "Неисправан захтев",
 "Unable to delete group" => "Не могу да уклоним групу",
 "Authentication error" => "Грешка при аутентификацији",
 "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",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 9ee84bc255a..7677fbcf33c 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -1,8 +1,7 @@
 <?php $TRANSLATIONS = array(
-"OpenID Changed" => "OpenID je izmenjen",
-"Invalid request" => "Neispravan zahtev",
 "Authentication error" => "Greška pri autentifikaciji",
 "Language changed" => "Jezik je izmenjen",
+"Invalid request" => "Neispravan zahtev",
 "Select an App" => "Izaberite program",
 "Clients" => "Klijenti",
 "Password" => "Lozinka",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 681db2099a1..e99fad96172 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Kunde inte aktivera appen.",
 "Email saved" => "E-post sparad",
 "Invalid email" => "Ogiltig e-post",
-"OpenID Changed" => "OpenID ändrat",
-"Invalid request" => "Ogiltig begäran",
 "Unable to delete group" => "Kan inte radera grupp",
 "Authentication error" => "Autentiseringsfel",
 "Unable to delete user" => "Kan inte radera användare",
 "Language changed" => "Språk ändrades",
+"Invalid request" => "Ogiltig begäran",
 "Admins can't remove themself from the admin group" => "Administratörer kan inte ta bort sig själva från admingruppen",
 "Unable to add user to group %s" => "Kan inte lägga till användare i gruppen %s",
 "Unable to remove user from group %s" => "Kan inte radera användare från gruppen %s",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 3b3b1f8dddf..9771e167e4b 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "செயலியை இயலுமைப்படுத்த முடியாது",
 "Email saved" => "மின்னஞ்சல் சேமிக்கப்பட்டது",
 "Invalid email" => "செல்லுபடியற்ற மின்னஞ்சல்",
-"OpenID Changed" => "OpenID மாற்றப்பட்டது",
-"Invalid request" => "செல்லுபடியற்ற வேண்டுகோள்",
 "Unable to delete group" => "குழுவை நீக்க முடியாது",
 "Authentication error" => "அத்தாட்சிப்படுத்தலில் வழு",
 "Unable to delete user" => "பயனாளரை நீக்க முடியாது",
 "Language changed" => "மொழி மாற்றப்பட்டது",
+"Invalid request" => "செல்லுபடியற்ற வேண்டுகோள்",
 "Unable to add user to group %s" => "குழு %s இல் பயனாளரை சேர்க்க முடியாது",
 "Unable to remove user from group %s" => "குழு %s இலிருந்து பயனாளரை நீக்கமுடியாது",
 "Disable" => "இயலுமைப்ப",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 558af48df14..f4e6398ae21 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "ไม่สามารถเปิดใช้งานแอปได้",
 "Email saved" => "อีเมลถูกบันทึกแล้ว",
 "Invalid email" => "อีเมลไม่ถูกต้อง",
-"OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
-"Invalid request" => "คำร้องขอไม่ถูกต้อง",
 "Unable to delete group" => "ไม่สามารถลบกลุ่มได้",
 "Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
 "Unable to delete user" => "ไม่สามารถลบผู้ใช้งานได้",
 "Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
+"Invalid request" => "คำร้องขอไม่ถูกต้อง",
 "Unable to add user to group %s" => "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้",
 "Unable to remove user from group %s" => "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้",
 "Disable" => "ปิดใช้งาน",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 295dbfab584..f754bb90fcf 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Uygulama devreye alınamadı",
 "Email saved" => "Eposta kaydedildi",
 "Invalid email" => "Geçersiz eposta",
-"OpenID Changed" => "OpenID Değiştirildi",
-"Invalid request" => "Geçersiz istek",
 "Unable to delete group" => "Grup silinemiyor",
 "Authentication error" => "Eşleşme hata",
 "Unable to delete user" => "Kullanıcı silinemiyor",
 "Language changed" => "Dil değiştirildi",
+"Invalid request" => "Geçersiz istek",
 "Unable to add user to group %s" => "Kullanıcı %s grubuna eklenemiyor",
 "Disable" => "Etkin değil",
 "Enable" => "Etkin",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index d6a9e9fa491..19b84edfc78 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "Не вдалося активувати програму. ",
 "Email saved" => "Адресу збережено",
 "Invalid email" => "Невірна адреса",
-"OpenID Changed" => "OpenID змінено",
-"Invalid request" => "Помилковий запит",
 "Unable to delete group" => "Не вдалося видалити групу",
 "Authentication error" => "Помилка автентифікації",
 "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",
@@ -53,7 +52,11 @@
 "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 9651bee1124..2354ba2a16e 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "không thể kích hoạt ứng dụng.",
 "Email saved" => "Lưu email",
 "Invalid email" => "Email không hợp lệ",
-"OpenID Changed" => "Đổi OpenID",
-"Invalid request" => "Yêu cầu không hợp lệ",
 "Unable to delete group" => "Không thể xóa nhóm",
 "Authentication error" => "Lỗi xác thực",
 "Unable to delete user" => "Không thể xóa người dùng",
 "Language changed" => "Ngôn ngữ đã được thay đổi",
+"Invalid request" => "Yêu cầu không hợp lệ",
 "Admins can't remove themself from the admin group" => "Quản trị viên không thể loại bỏ chính họ khỏi nhóm quản lý",
 "Unable to add user to group %s" => "Không thể thêm người dùng vào nhóm %s",
 "Unable to remove user from group %s" => "Không thể xóa người dùng từ nhóm %s",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index 6afcc1ecd56..b34b20d5aed 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "未能启用应用",
 "Email saved" => "Email 保存了",
 "Invalid email" => "非法Email",
-"OpenID Changed" => "OpenID 改变了",
-"Invalid request" => "非法请求",
 "Unable to delete group" => "未能删除群组",
 "Authentication error" => "认证错误",
 "Unable to delete user" => "未能删除用户",
 "Language changed" => "语言改变了",
+"Invalid request" => "非法请求",
 "Unable to add user to group %s" => "未能添加用户到群组 %s",
 "Unable to remove user from group %s" => "未能将用户从群组 %s 移除",
 "Disable" => "禁用",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 00e51d211c4..407177d2ac4 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "无法开启App",
 "Email saved" => "电子邮件已保存",
 "Invalid email" => "无效的电子邮件",
-"OpenID Changed" => "OpenID 已修改",
-"Invalid request" => "非法请求",
 "Unable to delete group" => "无法删除组",
 "Authentication error" => "认证错误",
 "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中移除用户",
@@ -53,7 +52,11 @@
 "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 255eb5ee2c1..7681b10affa 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -5,12 +5,11 @@
 "Could not enable app. " => "未能啟動此app",
 "Email saved" => "Email已儲存",
 "Invalid email" => "無效的email",
-"OpenID Changed" => "OpenID 已變更",
-"Invalid request" => "無效請求",
 "Unable to delete group" => "群組刪除錯誤",
 "Authentication error" => "認證錯誤",
 "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錯誤",
diff --git a/settings/routes.php b/settings/routes.php
index 8239fe005db..9b5bf809230 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -58,7 +58,5 @@ $this->create('settings_ajax_getlog', '/settings/ajax/getlog.php')
 	->actionInclude('settings/ajax/getlog.php');
 $this->create('settings_ajax_setloglevel', '/settings/ajax/setloglevel.php')
 	->actionInclude('settings/ajax/setloglevel.php');
-
-// apps/user_openid
-$this->create('settings_ajax_openid', '/settings/ajax/openid.php')
-	->actionInclude('settings/ajax/openid.php');
+$this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php')
+	->actionInclude('settings/ajax/setsecurity.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 26335063d4b..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,125 +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>
 </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 179ce9c5405..0490f63fb67 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -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" />
 	</div>
 </div>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index b697905f7ef..8f51cd87017 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,14 +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>
@@ -18,14 +18,14 @@
 <!--
 
 function pageY(elem) {
-    return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop;
+	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';
+	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;
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 80d8dc9cc86..6c6ac2dea54 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -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
@@ -125,16 +125,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..668d974693a 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -18,7 +18,8 @@ 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);
@@ -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'));
 
@@ -42,14 +43,14 @@ $defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===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;
+	$quota=OC_Preferences::getValue($i, 'files', 'quota', 'default');
+	$isQuotaUserDefined=array_search($quota, $quotaPreset)===false && array_search($quota, array('none', 'default'))===false;
 
 	$users[] = array(
 		"name" => $i,
 		"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
-        'quota'=>$quota,
-        'isQuotaUserDefined'=>$isQuotaUserDefined,
+		'quota'=>$quota,
+		'isQuotaUserDefined'=>$isQuotaUserDefined,
 		'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($i)));
 }