Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: Add description to global OTR setting #24333

Merged
merged 4 commits into from
Feb 17, 2022
Merged

Chore: Add description to global OTR setting #24333

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cc06dc
add description to global otr setting
pedrogssouza Jan 27, 2022
abe83bc
Merge branch 'develop' into chore/otr-global-description
yash-rajpal Jan 28, 2022
d7177aa
Merge branch 'develop' into chore/otr-global-description
yash-rajpal Feb 2, 2022
ccc5067
Merge branch 'develop' into chore/otr-global-description
yash-rajpal Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3277,6 +3277,7 @@
"others": "others",
"Others": "Others",
"OTR": "OTR",
"OTR_Enable_Description": "Enable option to use off-the-record (OTR) messages in direct messages between 2 users. OTR messages are not recorded on the server and exchanged directly and encrypted between the 2 users.",
"OTR_is_only_available_when_both_users_are_online": "OTR is only available when both users are online",
"Out_of_seats": "Out of Seats",
"Outgoing": "Outgoing",
Expand Down