Skip to content

Commit

Permalink
Merge branch 'develop' into refactor/report-user-modal
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Sep 23, 2024
2 parents 4bf558a + 65d2a45 commit 55b4874
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/i18n/src/locales/en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -1788,8 +1788,8 @@
"Duplicated_Email_address_will_be_ignored": "Duplicated email address will be ignored.",
"Markdown_Marked_Tables": "Enable Marked Tables",
"duplicated-account": "Duplicated account",
"E2E_Allow_Unencrypted_Messages": "Unencrypted messages in encrypted rooms",
"E2E_Allow_Unencrypted_Messages_Description": "Allow plain text messages to be sent in encrypted rooms. These messages will not be encrypted.",
"E2E_Allow_Unencrypted_Messages": "Access unencrypted content in encrypted rooms",
"E2E_Allow_Unencrypted_Messages_Description": "Allow access to encrypted rooms to people without room encryption keys. They'll be able to see and send unencrypted messages.",
"E2E Encryption": "E2E Encryption",
"E2E_Encryption_enabled_for_room": "End-to-end encryption enabled for #{{roomName}}",
"E2E_Encryption_disabled_for_room": "End-to-end encryption disabled for #{{roomName}}",
Expand Down

0 comments on commit 55b4874

Please sign in to comment.