From d3a8282bf6b3313450aa81b6eada2e07a9be870e Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 1 Apr 2019 21:31:00 +0200
Subject: add ability to kick user from room and not just ban them

---
 src/main/res/menu/muc_details_context.xml | 12 ++++++------
 src/main/res/values/strings.xml           |  9 +++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'src/main/res')

diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml
index c3d54e5c6..44522cf87 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -49,14 +49,14 @@
                 android:id="@+id/revoke_owner_privileges"
                 android:title="@string/remove_owner_privileges"
                 android:visible="false" />
-            <item
-                android:id="@+id/ban_from_conference"
-                android:title="@string/ban_from_conference"
-                android:visible="false" />
         </menu>
     </item>
     <item
-        android:id="@+id/remove_from_room"
-        android:title="@string/remove_from_room"
+        android:id="@+id/kick_from_room"
+        android:title="@string/kick_from_room"
+        android:visible="false" />
+    <item
+        android:id="@+id/ban_from_room"
+        android:title="@string/ban_from_conference"
         android:visible="false" />
 </menu>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 477c74ddc..90bcb50b7 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -365,11 +365,16 @@
     <string name="remove_membership">Revoke member privileges</string>
     <string name="grant_admin_privileges">Grant admin privileges</string>
     <string name="remove_admin_privileges">Revoke admin privileges</string>
-    <string name="remove_from_room">Remove from group chat</string>
+    <string name="kick_from_room">Kick from group chat</string>
     <string name="could_not_change_affiliation">Could not change affiliation of %s</string>
     <string name="ban_from_conference">Ban from group chat</string>
-    <string name="removing_from_public_conference">You are trying to remove %s from a public channel. The only way to do that is to ban that user for ever.</string>
+    <string name="kick_from_conference">Kick from group chat</string>
+    <string name="ban_from_public_conference_message">You are trying to ban %s for ever from a public channel.</string>
+    <string name="ban_from_conference_message">You are trying to ban %s for ever from a group chat</string>
+    <string name="kicking_from_public_conference">You are trying to kick %s from a public channel.</string>
+    <string name="kicking_from_conference">You are trying to kick %s from a group chat.</string>
     <string name="ban_now">Ban now</string>
+    <string name="kick_now">Kick now</string>
     <string name="non_anonymous">Make Jabber IDs visible to anyone</string>
     <string name="moderated">Make channel moderated</string>
     <string name="you_are_not_participating">You are not participating</string>
-- 
cgit v1.2.3