From b31a9daf992012be7fa839cc3d25a042c55f9c7a Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 7 Feb 2019 21:24:12 +0100
Subject: show different room settings for channels and groups

---
 src/main/res/layout/activity_muc_details.xml | 10 ++++++++++
 src/main/res/values/strings.xml              | 22 +++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

(limited to 'src/main/res')

diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index b9163eb33..355d5c1d0 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -428,6 +428,16 @@
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
 
+                        <TextView
+                            android:id="@+id/no_users_hints"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingStart="@dimen/card_padding_regular"
+                            android:paddingTop="@dimen/card_padding_regular"
+                            android:paddingEnd="@dimen/card_padding_regular"
+                            android:text="@string/no_users_hint_channel"
+                            android:textAppearance="@style/TextAppearance.Conversations.Body2" />
+
                         <android.support.v7.widget.RecyclerView
                             android:id="@+id/users"
                             android:layout_width="fill_parent"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 886f9a7ba..6c878cc7d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -383,9 +383,8 @@
     <string name="could_not_change_role">Could not change role of %s</string>
     <string name="public_conference">Publicly accessible group chat</string>
     <string name="private_conference">Private, members only group chat</string>
-    <string name="conference_options">Group chat options</string>
     <string name="members_only">Private, members only</string>
-    <string name="non_anonymous">Non-anonymous</string>
+    <string name="non_anonymous">Make Jabber IDs visible to anyone</string>
     <string name="moderated">Moderated</string>
     <string name="you_are_not_participating">You are not participating</string>
     <string name="modified_conference_options">Modified group chat options!</string>
@@ -848,7 +847,7 @@
     <string name="install_orbot">Install Orbot</string>
     <string name="start_orbot">Start Orbot</string>
     <string name="no_market_app_installed">No market app installed.</string>
-    <string name="group_chat_will_make_your_jabber_id_public">This group chat will make your Jabber ID public</string>
+    <string name="group_chat_will_make_your_jabber_id_public">This channel will make your Jabber ID public</string>
     <string name="ebook">e-book</string>
     <string name="your_name">Your name</string>
     <string name="enter_your_name">Enter your name</string>
@@ -868,8 +867,8 @@
     <string name="unable_to_decrypt_backup">Unable to decrypt backup. Is the password correct?</string>
     <string name="pref_prefer_xmpp_avatar_summary">Prefer the user\'s XMPP avatar instead of the one from your address book</string>
     <string name="pref_prefer_xmpp_avatar">Prefer XMPP avatar</string>
-    <string name="view_users">View members</string>
-    <string name="group_chat_members">Group chat members</string>
+    <string name="view_users">View participants</string>
+    <string name="group_chat_members">Participants</string>
     <string name="join_group_chat">Join group chat</string>
     <string name="create_group_chat">Create group chat</string>
     <string name="message_deleted">Message was deleted</string>
@@ -887,4 +886,17 @@
     <string name="joined_an_existing_channel">You\'ve joined an existing channel</string>
     <string name="unable_to_set_channel_configuration">Unable to set channel configuration</string>
     <string name="back">Back</string>
+    <string name="conference_options">Private group chat configuration</string>
+    <string name="channel_options">Public channel configuration</string>
+    <string name="allow_participants_to_edit_subject">Allow anyone to edit the topic</string>
+    <string name="allow_participants_to_invite_others">Allow anyone to invite others</string>
+    <string name="anyone_can_edit_subject">Anyone can edit the topic.</string>
+    <string name="owners_can_edit_subject">Owners can edit the topic.</string>
+    <string name="admins_can_edit_subject">Admins can edit the topic.</string>
+    <string name="owners_can_invite_others">Owners can invite others.</string>
+    <string name="anyone_can_invite_others">Anyone can invite others.</string>
+    <string name="jabber_ids_are_visible_to_admins">Jabber IDs are visible to admins.</string>
+    <string name="jabber_ids_are_visible_to_anyone">Jabber IDs are visible to anyone.</string>
+    <string name="no_users_hint_channel">This public channel has no participants.</string>
+    <string name="no_users_hint_group_chat">This private group chat has no participants.</string>
 </resources>
-- 
cgit v1.2.3