Merge branch 'develop' into feature/fga/waiting_ss_room
This commit is contained in:
commit
da27970116
249 changed files with 3147 additions and 677 deletions
|
|
@ -13,7 +13,7 @@
|
|||
<string name="screen_room_details_encryption_enabled_subtitle">"Messages are secured with locks. Only you and the recipients have the unique keys to unlock them."</string>
|
||||
<string name="screen_room_details_encryption_enabled_title">"Message encryption enabled"</string>
|
||||
<string name="screen_room_details_invite_people_title">"Invite people"</string>
|
||||
<string name="screen_room_details_notification_title">"Notification"</string>
|
||||
<string name="screen_room_details_notification_title">"Notifications"</string>
|
||||
<string name="screen_room_details_room_name_label">"Room name"</string>
|
||||
<string name="screen_room_details_share_room_title">"Share room"</string>
|
||||
<string name="screen_room_details_updating_room">"Updating room…"</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue