diff options
| author | Christian Schneppe <christian@pix-art.de> | 2019-04-01 21:31:00 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2019-04-01 21:31:00 +0200 |
| commit | d3a8282bf6b3313450aa81b6eada2e07a9be870e (patch) | |
| tree | b2b902ae3c21a1b9df733842c5413e71492b5c71 /src/main/res | |
| parent | a2c2b2e658617e14342f95b3d467900778c309cd (diff) | |
add ability to kick user from room and not just ban them
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/menu/muc_details_context.xml | 12 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 9 |
2 files changed, 13 insertions, 8 deletions
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> |