From 960e20123cf663ee4375acb5c385d43554f1b7e7 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 8 Feb 2019 23:25:29 +0100
Subject: brought back 'moderated' config in advanced mode

---
 src/main/res/menu/muc_details_context.xml | 11 ++++++-----
 src/main/res/values/strings.xml           |  9 +++++----
 2 files changed, 11 insertions(+), 9 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 0a8ad87c4..c3d54e5c6 100644
--- a/src/main/res/menu/muc_details_context.xml
+++ b/src/main/res/menu/muc_details_context.xml
@@ -22,7 +22,8 @@
         android:visible="false" />
     <item
         android:id="@+id/manage_permissions"
-        android:title="@string/manage_permission">
+        android:title="@string/manage_permission"
+        android:visible="false">
         <menu>
             <item
                 android:id="@+id/give_membership"
@@ -52,10 +53,10 @@
                 android:id="@+id/ban_from_conference"
                 android:title="@string/ban_from_conference"
                 android:visible="false" />
-            <item
-                android:id="@+id/remove_from_room"
-                android:title="@string/remove_from_room"
-                android:visible="false" />
         </menu>
     </item>
+    <item
+        android:id="@+id/remove_from_room"
+        android:title="@string/remove_from_room"
+        android:visible="false" />
 </menu>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0678c4710..5742775e0 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -361,16 +361,17 @@
     <string name="outcast">Outcast</string>
     <string name="member">Member</string>
     <string name="advanced_mode">Advanced mode</string>
-    <string name="grant_membership">Grant membership</string>
-    <string name="remove_membership">Revoke membership</string>
+    <string name="grant_membership">Grant member privileges</string>
+    <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="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 group chat. The only way to do that is to ban that user for ever.</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="ban_now">Ban 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>
     <string name="modified_conference_options">Modified group chat options!</string>
     <string name="could_not_modify_conference_options">Could not modify group chat options</string>
@@ -870,5 +871,5 @@
     <string name="remove_owner_privileges">Revoke owner privileges</string>
     <string name="remove_from_channel">Remove from channel</string>
     <string name="ban_from_channel">Ban from channel</string>
-    <string name="manage_permission">Manage permissions</string>
+    <string name="manage_permission">Manage privileges</string>
 </resources>
-- 
cgit v1.2.3