merge master into filesystem

5 files changed, 12 insertions, 7 deletions

diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index de941f99132..931ab2689e2 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -7,6 +7,12 @@ $success = true;
 $username = $_POST["username"];
 $group = OC_Util::sanitizeHTML($_POST["group"]);
 
+if($username == OC_User::getUser() && $group == "admin" &&  OC_Group::inGroup($username, 'admin')){
+	$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))) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
diff --git a/settings/js/users.js b/settings/js/users.js
index 517984f9247..f2ce69cf311 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -71,15 +71,10 @@ var UserList={
 		var tr = $('tbody tr').first().clone();
 		tr.attr('data-uid', username);
 		tr.find('td.name').text(username);
-		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">');
-		groupsSelect.data('username', username);
-		groupsSelect.data('userGroups', groups);
+		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups"></select>').attr('data-username', username).attr('data-user-groups', groups);
 		tr.find('td.groups').empty();
 		if (tr.find('td.subadmins').length > 0) {
-			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'Group Admin') + '">');
-			subadminSelect.data('username', username);
-			subadminSelect.data('userGroups', groups);
-			subadminSelect.data('subadmin', subadmin);
+			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('files', 'Group Admin') + '">').attr('data-username', username).attr('data-user-groups', groups).attr('data-subadmin', subadmin);
 			tr.find('td.subadmins').empty();
 		}
 		var allGroups = String($('#content table').attr('data-groups')).split(', ');
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index bfef1a0447d..d6c87e0928b 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -18,6 +18,7 @@
 "Saving..." => "Gordetzen...",
 "__language_name__" => "Euskera",
 "Add your App" => "Gehitu zure aplikazioa",
+"More Apps" => "App gehiago",
 "Select an App" => "Aukeratu programa bat",
 "See application page at apps.owncloud.com" => "Ikusi programen orria apps.owncloud.com en",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>",
@@ -27,6 +28,7 @@
 "Problems connecting to help database." => "Arazoak daude laguntza datubasera konektatzeko.",
 "Go there manually." => "Joan hara eskuz.",
 "Answer" => "Erantzun",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
 "Desktop and Mobile Syncing Clients" => "Mahaigain eta mugikorren sinkronizazio bezeroak",
 "Download" => "Deskargatu",
 "Your password was changed" => "Zere pasahitza aldatu da",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 1b63fdbfc01..dd8ed567a7b 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -26,6 +26,7 @@
 "Managing Big Files" => "Управління великими файлами",
 "Ask a question" => "Запитати",
 "Problems connecting to help database." => "Проблема при з'єднані з базою допомоги",
+"Go there manually." => "Перейти вручну.",
 "Answer" => "Відповідь",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Настільні та мобільні клієнти синхронізації",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 214ad24530d..35d77df214e 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -28,6 +28,7 @@
 "Problems connecting to help database." => "連接到求助資料庫時發生問題",
 "Go there manually." => "手動前往",
 "Answer" => "答案",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "桌機與手機同步客戶端",
 "Download" => "下載",
 "Your password was changed" => "你的密碼已更改",