From be2f4ecdb4135256e3e513370614c1626e5a1354 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Mon, 23 Jun 2014 18:39:53 +0300
Subject: MAINT-4175 FIXED [Group Bans] When banning a list of multiple
 avatars, if an already banned avatar is included in the list, no avatars are
 added to the ban list and those avatars already group members are not ejected
 from the group.

---
 .../skins/default/xui/en/panel_group_bulk_ban.xml  | 26 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml b/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml
index 43449df1fd..31989f2e16 100644
--- a/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_bulk_ban.xml
@@ -15,10 +15,28 @@
      name="ban_selection_too_large">
     Group bans not sent: too many Residents selected. Group bans are limited to 100 per request.
   </panel.string>
-  <panel.string
-     name="already_banned">
-    Group Invitations not sent: resident '[RESIDENT]' already banned.
-  </panel.string>
+	<panel.string
+     name="ban_not_permitted">
+		Group ban not sent: you do not have 'Manage ban list' ability.
+	</panel.string>
+	<panel.string
+     name="partial_ban">
+		Some group bans were not sent:
+[REASONS]
+	</panel.string>
+	<panel.string
+     name="ban_failed">
+		Group bans were not sent:
+[REASONS]
+	</panel.string>
+	<panel.string
+     name="residents_already_banned">
+		- The following resident(s) are already banned: [RESIDENTS].
+	</panel.string>
+	<panel.string
+     name="cant_ban_yourself">
+		- You cannot ban yourself from a group.
+	</panel.string>
   <text
    type="string"
    length="1"
-- 
cgit v1.2.3