mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2025-02-09 08:38:43 +01:00
post rebase cleaning
This commit is contained in:
parent
e8d01becfe
commit
6f45ba575b
@ -251,7 +251,7 @@ class HomeActivity :
|
||||
if (it.canUserManageSpace && !popupAlertManager.hasAlertsToShow()) {
|
||||
if (!vectorPreferences.didPromoteNewRestrictedFeature()) {
|
||||
vectorPreferences.setDidPromoteNewRestrictedFeature()
|
||||
RestrictedPromoBottomSheet().show(supportFragmentManager, "FOO")
|
||||
RestrictedPromoBottomSheet().show(supportFragmentManager, "RestrictedPromoBottomSheet")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3536,11 +3536,10 @@
|
||||
<string name="upgrade_room_for_restricted_no_param">Anyone in a parent space will be able to find and join this room - no need to manually invite everyone. You’ll be able to change this in room settings anytime.</string>
|
||||
|
||||
<string name="upgrade_room_for_restricted_note">Please note upgrading will make a new version of the room. All current messages will stay in this archived room.</string>
|
||||
<string name="upgrade_room_for_restricted_note">Please note upgrading will make a new version of the room. All current messages will stay in this archived room.</string>
|
||||
|
||||
<string name="new_let_people_in_spaces_find_and_join">New: Let people in spaces find and join private rooms</string>
|
||||
<string name="help_people_in_spaces_find_and_join">Help people in spaces to find and join private rooms themselves, no need to manually invite everyone.</string>
|
||||
<string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.</string>
|
||||
<string name="this_makes_it_easy_for_rooms_to_stay_private_to_a_space">This makes it easy for rooms to stay private to a space, while letting people in the space find and join them. All new rooms in a space will have this option available.</string>
|
||||
<string name="help_space_members">Help space members find private rooms</string>
|
||||
<string name="to_help_space_members_find_and_join">To help space members find and join a private room, go to that room’s settings by tapping on the avatar.</string>
|
||||
</resources>
|
||||
|
Loading…
x
Reference in New Issue
Block a user